@atlaskit/adf-schema-generator - npm Package Compare versions

Comparing version 1.17.1 to 1.17.2

CHANGELOG.md

 # @atlaskit/adf-schema-generator
 
-## 1.17.1
+## 1.17.2
 
 ### Patch Changes
 
-- 53dce02: Add autogenerated warning to the top of the autogenerated files
+- 3ed35ed: refacotor build attrs when build pm spec, unskip few tests of validation for mark spec

dist/cjs/index.js

@@ -36,2 +36,14 @@ "use strict";
 });
+Object.defineProperty(exports, "MarkExcludesAll", {
+  enumerable: true,
+  get: function get() {
+    return _ADFMarkSpec.MarkExcludesAll;
+  }
+});
+Object.defineProperty(exports, "MarkExcludesNone", {
+  enumerable: true,
+  get: function get() {
+    return _ADFMarkSpec.MarkExcludesNone;
+  }
+});
 Object.defineProperty(exports, "PMSpecTransformerName", {
@@ -122,2 +134,3 @@ enumerable: true,
 var _adfToValidatorSpec = require("./transforms/adfToValidatorSpec/adfToValidatorSpec");
-var _transformerNames = require("./transforms/transformerNames");
+var _transformerNames = require("./transforms/transformerNames");
+var _ADFMarkSpec = require("./types/ADFMarkSpec");

dist/cjs/transforms/adfToPm/buildPmSpec.js

@@ -13,2 +13,3 @@ "use strict";
 var _adfMark = require("../../adfMark");
+var _ADFMarkSpec = require("../../types/ADFMarkSpec");
 var _buildContentExpression = require("./buildContentExpression");
@@ -43,2 +44,5 @@ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
       value = _ref2[1];
+    if (value.default === undefined && value.optional) {
+      return acc;
+    }
     return _objectSpread(_objectSpread({}, acc), {}, (0, _defineProperty2.default)({}, key, _objectSpread(_objectSpread({}, acc[key]), value.default !== undefined && {
@@ -50,4 +54,10 @@ default: value.default
 var buildMarkExcludes = exports.buildMarkExcludes = function buildMarkExcludes(mark) {
-  var _mark$getSpec$exclude;
-  return (_mark$getSpec$exclude = mark.getSpec().excludes) === null || _mark$getSpec$exclude === void 0 ? void 0 : _mark$getSpec$exclude.filter(function (markOrGroup) {
+  var originalMarkExcludes = mark.getSpec().excludes;
+  if (originalMarkExcludes === undefined) {
+    return undefined;
+  }
+  if (originalMarkExcludes === _ADFMarkSpec.MarkExcludesAll || originalMarkExcludes === _ADFMarkSpec.MarkExcludesNone) {
+    return originalMarkExcludes;
+  }
+  return originalMarkExcludes.filter(function (markOrGroup) {
     if (markOrGroup) {
@@ -88,3 +98,3 @@ return true;
       value = _ref4[1];
-    if (value !== undefined && value !== null && value !== '') {
+    if (value !== undefined && value !== null) {
       acc[key] = value;
@@ -91,0 +101,0 @@ }

dist/cjs/types/ADFMarkSpec.js

@@ -5,2 +5,5 @@ "use strict";
   value: true
-});
+});
+exports.MarkExcludesNone = exports.MarkExcludesAll = void 0;
+var MarkExcludesAll = exports.MarkExcludesAll = '_';
+var MarkExcludesNone = exports.MarkExcludesNone = '';

dist/es2019/index.js

@@ -22,2 +22,3 @@ // ADF DSL API
 export { adfToValidatorSpec } from './transforms/adfToValidatorSpec/adfToValidatorSpec';
-export { JSONSchemaTransformerName, PMSpecTransformerName, ValidatorSpecTransformerName } from './transforms/transformerNames';
+export { JSONSchemaTransformerName, PMSpecTransformerName, ValidatorSpecTransformerName } from './transforms/transformerNames';
+export { MarkExcludesAll, MarkExcludesNone } from './types/ADFMarkSpec';

dist/es2019/transforms/adfToPm/buildPmSpec.js

 import merge from 'lodash/merge';
 import { ADFMark } from '../../adfMark';
+import { MarkExcludesAll, MarkExcludesNone } from '../../types/ADFMarkSpec';
 import { buildContentExpression } from './buildContentExpression';
@@ -24,2 +25,5 @@ const allowLinkMarkInNodes = ['mediaInline', 'media', 'mediaGroup', 'paragraph', 'mediaSingle'];
   return Object.entries(attributes).reduce((acc, [key, value]) => {
+    if (value.default === undefined && value.optional) {
+      return acc;
+    }
     return {
@@ -37,4 +41,10 @@ ...acc,
 export const buildMarkExcludes = mark => {
-  var _mark$getSpec$exclude;
-  return (_mark$getSpec$exclude = mark.getSpec().excludes) === null || _mark$getSpec$exclude === void 0 ? void 0 : _mark$getSpec$exclude.filter(markOrGroup => {
+  const originalMarkExcludes = mark.getSpec().excludes;
+  if (originalMarkExcludes === undefined) {
+    return undefined;
+  }
+  if (originalMarkExcludes === MarkExcludesAll || originalMarkExcludes === MarkExcludesNone) {
+    return originalMarkExcludes;
+  }
+  return originalMarkExcludes.filter(markOrGroup => {
     if (markOrGroup) {
@@ -70,3 +80,3 @@ return true;
   return Object.entries(pmMarkSpec).reduce((acc, [key, value]) => {
-    if (value !== undefined && value !== null && value !== '') {
+    if (value !== undefined && value !== null) {
       acc[key] = value;
@@ -73,0 +83,0 @@ }

dist/es2019/types/ADFMarkSpec.js

@@ -1,1 +0,2 @@
-export {};
+export const MarkExcludesAll = '_';
+export const MarkExcludesNone = '';

dist/esm/index.js

@@ -22,2 +22,3 @@ // ADF DSL API
 export { adfToValidatorSpec } from './transforms/adfToValidatorSpec/adfToValidatorSpec';
-export { JSONSchemaTransformerName, PMSpecTransformerName, ValidatorSpecTransformerName } from './transforms/transformerNames';
+export { JSONSchemaTransformerName, PMSpecTransformerName, ValidatorSpecTransformerName } from './transforms/transformerNames';
+export { MarkExcludesAll, MarkExcludesNone } from './types/ADFMarkSpec';

dist/esm/transforms/adfToPm/buildPmSpec.js

@@ -11,2 +11,3 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { ADFMark } from '../../adfMark';
+import { MarkExcludesAll, MarkExcludesNone } from '../../types/ADFMarkSpec';
 import { buildContentExpression } from './buildContentExpression';
@@ -36,2 +37,5 @@ var allowLinkMarkInNodes = ['mediaInline', 'media', 'mediaGroup', 'paragraph', 'mediaSingle'];
       value = _ref2[1];
+    if (value.default === undefined && value.optional) {
+      return acc;
+    }
     return _objectSpread(_objectSpread({}, acc), {}, _defineProperty({}, key, _objectSpread(_objectSpread({}, acc[key]), value.default !== undefined && {
@@ -43,4 +47,10 @@ default: value.default
 export var buildMarkExcludes = function buildMarkExcludes(mark) {
-  var _mark$getSpec$exclude;
-  return (_mark$getSpec$exclude = mark.getSpec().excludes) === null || _mark$getSpec$exclude === void 0 ? void 0 : _mark$getSpec$exclude.filter(function (markOrGroup) {
+  var originalMarkExcludes = mark.getSpec().excludes;
+  if (originalMarkExcludes === undefined) {
+    return undefined;
+  }
+  if (originalMarkExcludes === MarkExcludesAll || originalMarkExcludes === MarkExcludesNone) {
+    return originalMarkExcludes;
+  }
+  return originalMarkExcludes.filter(function (markOrGroup) {
     if (markOrGroup) {
@@ -81,3 +91,3 @@ return true;
       value = _ref4[1];
-    if (value !== undefined && value !== null && value !== '') {
+    if (value !== undefined && value !== null) {
       acc[key] = value;
@@ -84,0 +94,0 @@ }

dist/esm/types/ADFMarkSpec.js

@@ -1,1 +0,2 @@
-export {};
+export var MarkExcludesAll = '_';
+export var MarkExcludesNone = '';

dist/types/index.d.ts

@@ -16,1 +16,2 @@ export { adfNode } from './adfNode';
 export { JSONSchemaTransformerName, PMSpecTransformerName, ValidatorSpecTransformerName, } from './transforms/transformerNames';
+export { MarkExcludesAll, MarkExcludesNone } from './types/ADFMarkSpec';

dist/types/types/ADFMarkSpec.d.ts

@@ -5,2 +5,4 @@ import type { ADFMark } from '../adfMark';
 import type { ADFMarkGroup } from './ADFMarkGroup';
+export declare const MarkExcludesAll: "_";
+export declare const MarkExcludesNone: "";
 export type ADFMarkSpec = {
@@ -20,3 +22,3 @@ /**
      */
-    excludes?: Array<ADFMark<unknown> | ADFMarkGroup>;
+    excludes?: Array<ADFMark<unknown> | ADFMarkGroup> | typeof MarkExcludesAll | typeof MarkExcludesNone;
     /**
@@ -23,0 +25,0 @@ * https://prosemirror.net/docs/ref/#model.MarkSpec.group

package.json

 {
   "name": "@atlaskit/adf-schema-generator",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "description": "Generates ADF and PM schemas",
@@ -5,0 +5,0 @@ "repository": "https://bitbucket.org/atlassian/adf-schema",

src/index.ts

@@ -35,1 +35,3 @@ // ADF DSL API
 } from './transforms/transformerNames';
+
+export { MarkExcludesAll, MarkExcludesNone } from './types/ADFMarkSpec';

src/transforms/adfToPm/buildPmSpec.ts

 import { MarkSpec, NodeSpec } from '@atlaskit/editor-prosemirror/model';
 import merge from 'lodash/merge';
 import { ADFMark } from '../../adfMark';
-import { ADFMarkSpec } from '../../types/ADFMarkSpec';
+import {
+  ADFMarkSpec,
+  MarkExcludesAll,
+  MarkExcludesNone,
+} from '../../types/ADFMarkSpec';
 import { ADFNode } from '../../adfNode';
@@ -41,2 +45,5 @@ import { ADFAttributes } from '../../types/ADFAttribute';
   return Object.entries(attributes).reduce((acc, [key, value]) => {
+    if (value.default === undefined && value.optional) {
+      return acc;
+    }
     return {
@@ -53,5 +60,14 @@ ...acc,
 export const buildMarkExcludes = (mark: ADFMark<ADFMarkSpec>): string => {
-  return mark
-    .getSpec()
-    .excludes?.filter((markOrGroup) => {
+  const originalMarkExcludes = mark.getSpec().excludes;
+  if (originalMarkExcludes === undefined) {
+    return undefined;
+  }
+  if (
+    originalMarkExcludes === MarkExcludesAll ||
+    originalMarkExcludes === MarkExcludesNone
+  ) {
+    return originalMarkExcludes;
+  }
+  return originalMarkExcludes
+    .filter((markOrGroup) => {
       if (markOrGroup) {
@@ -97,3 +113,3 @@ return true;
   return Object.entries(pmMarkSpec).reduce((acc, [key, value]) => {
-    if (value !== undefined && value !== null && value !== '') {
+    if (value !== undefined && value !== null) {
       acc[key] = value;
@@ -100,0 +116,0 @@ }

src/types/ADFMarkSpec.ts

@@ -6,2 +6,5 @@ import type { ADFMark } from '../adfMark';
 
+export const MarkExcludesAll = '_' as const;
+export const MarkExcludesNone = '' as const;
+
 export type ADFMarkSpec = {
@@ -23,3 +26,6 @@ /**
    */
-  excludes?: Array<ADFMark<unknown> | ADFMarkGroup>;
+  excludes?:
+    | Array<ADFMark<unknown> | ADFMarkGroup>
+    | typeof MarkExcludesAll
+    | typeof MarkExcludesNone;
 
@@ -26,0 +32,0 @@ /**

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

386530

increased by0.6%

Lines of code

9797

increased by0.77%

No dependency changes