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

Comparing version 1.32.0 to 1.32.1

CHANGELOG.md

 # @atlaskit/adf-schema-generator
 
-## 1.32.0
+## 1.32.1
 
-### Minor Changes
+### Patch Changes
 
-- 52bf2ea: [ED-23241] Set hardBreak as the Prosemirror `linebreakReplacement` which is used when converting between codeBlocks and other block types. Implementation of feature introduced to Prosemirror after [this GitHub discussion](https://github.com/ProseMirror/prosemirror/issues/1460)
+- 5c60258: remove getNodeNameOverrides from adfToValidatorSpec

dist/cjs/transforms/adfToValidatorSpec/adfToValidatorSpec.js

@@ -18,4 +18,2 @@ "use strict";
 var _buildMarks = require("./buildMarks");
-var _getNodeNameOverrides = require("./getNodeNameOverrides");
-var _getMarkNameOverrides = require("./getMarkNameOverrides");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, 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 o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
@@ -141,3 +139,3 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
       }
-      res[(0, _getNodeNameOverrides.getNodeNameOverrides)(_node.getName())] = processedNode;
+      res[_node.getName()] = processedNode;
       return processedNode;
@@ -149,3 +147,3 @@ },
       }
-      var groupName = (0, _getNodeNameOverrides.getNodeNameOverrides)(_group.group);
+      var groupName = _group.group;
       res[groupName] = {
@@ -155,3 +153,3 @@ json: _group.members.filter(function (member) {
         }).map(function (member) {
-          return (0, _getNodeNameOverrides.getNodeNameOverrides)(member.getName());
+          return member.getName();
         })
@@ -227,3 +225,3 @@ };
                 if (hasNodes && !member.node.isIgnored(_transformerNames.ValidatorSpecTransformerName)) {
-                  contentTypes.push((0, _getNodeNameOverrides.getNodeNameOverrides)(member.node.getName()));
+                  contentTypes.push(member.node.getName());
                 }
@@ -269,3 +267,3 @@ if (member.node.isIgnored(_transformerNames.ValidatorSpecTransformerName)) {
             }
-            contentTypes.push((0, _getNodeNameOverrides.getNodeNameOverrides)(child.node.getName()));
+            contentTypes.push(child.node.getName());
             var _iterator4 = _createForOfIteratorHelper(child.node.getMarks(child.node.hasStage0())),
@@ -278,3 +276,3 @@ _step4;
                   marks.add(_mark.getType());
-                  res[(0, _getMarkNameOverrides.getMarkNameOverrides)(_mark.getType())] = {
+                  res[_mark.getType()] = {
                     mark: _mark,
@@ -335,13 +333,2 @@ json: buildMarkValidatorSpec(_mark)
 // @DSLCompatibilityException
-// Table cell content is a pseudo group that has a unique output format.
-function unwrapTableCellContentPseudoGroup(node, json) {
-  if (node.getName() !== 'tableCellContent') {
-    return;
-  }
-  var props = json.props;
-  delete json.props;
-  Object.assign(json, props.content);
-}
-
-// @DSLCompatibilityException
 // Nested expand content is a pseudo group that has a unique output format.
@@ -369,3 +356,3 @@ function handleNestedExpandContent(node, json, content) {
   // nestedExpand_content is a pseudo group and needs to be ignored in the validator spec.
-  if (node.getName() === 'tableCellContent') {
+  if (node.getName() === 'tableCell' || node.getName() === 'tableHeader' || node.getName() === 'tableCellContent') {
     filterItemsFromContent(json, ['nestedExpand_content']);
@@ -383,3 +370,2 @@ }
   }
-  unwrapTableCellContentPseudoGroup(node, json);
   if (node.getName() === 'nestedExpand_content' && content.length) {
@@ -386,0 +372,0 @@ handleNestedExpandContent(node, json, content);

dist/es2019/transforms/adfToValidatorSpec/adfToValidatorSpec.js

@@ -9,4 +9,2 @@ import unset from 'lodash/unset';
 import { buildMarks } from './buildMarks';
-import { getNodeNameOverrides } from './getNodeNameOverrides';
-import { getMarkNameOverrides } from './getMarkNameOverrides';
 function isNodeReturnValue(value) {
@@ -126,3 +124,3 @@ return value && 'node' in value;
       }
-      res[getNodeNameOverrides(node.getName())] = processedNode;
+      res[node.getName()] = processedNode;
       return processedNode;
@@ -134,5 +132,5 @@ },
       }
-      const groupName = getNodeNameOverrides(group.group);
+      const groupName = group.group;
       res[groupName] = {
-        json: group.members.filter(member => !member.isIgnored(ValidatorSpecTransformerName)).map(member => getNodeNameOverrides(member.getName()))
+        json: group.members.filter(member => !member.isIgnored(ValidatorSpecTransformerName)).map(member => member.getName())
       };
@@ -199,3 +197,3 @@ return {
             if (hasNodes && !member.node.isIgnored(ValidatorSpecTransformerName)) {
-              contentTypes.push(getNodeNameOverrides(member.node.getName()));
+              contentTypes.push(member.node.getName());
             }
@@ -227,7 +225,7 @@ if (member.node.isIgnored(ValidatorSpecTransformerName)) {
           }
-          contentTypes.push(getNodeNameOverrides(child.node.getName()));
+          contentTypes.push(child.node.getName());
           for (const mark of child.node.getMarks(child.node.hasStage0())) {
             if (!mark.isIgnored(ValidatorSpecTransformerName)) {
               marks.add(mark.getType());
-              res[getMarkNameOverrides(mark.getType())] = {
+              res[mark.getType()] = {
                 mark: mark,
@@ -276,13 +274,2 @@ json: buildMarkValidatorSpec(mark)
 // @DSLCompatibilityException
-// Table cell content is a pseudo group that has a unique output format.
-function unwrapTableCellContentPseudoGroup(node, json) {
-  if (node.getName() !== 'tableCellContent') {
-    return;
-  }
-  const props = json.props;
-  delete json.props;
-  Object.assign(json, props.content);
-}
-
-// @DSLCompatibilityException
 // Nested expand content is a pseudo group that has a unique output format.
@@ -310,3 +297,3 @@ function handleNestedExpandContent(node, json, content) {
   // nestedExpand_content is a pseudo group and needs to be ignored in the validator spec.
-  if (node.getName() === 'tableCellContent') {
+  if (node.getName() === 'tableCell' || node.getName() === 'tableHeader' || node.getName() === 'tableCellContent') {
     filterItemsFromContent(json, ['nestedExpand_content']);
@@ -324,3 +311,2 @@ }
   }
-  unwrapTableCellContentPseudoGroup(node, json);
   if (node.getName() === 'nestedExpand_content' && content.length) {
@@ -327,0 +313,0 @@ handleNestedExpandContent(node, json, content);

dist/esm/transforms/adfToValidatorSpec/adfToValidatorSpec.js

@@ -13,4 +13,2 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { buildMarks } from './buildMarks';
-import { getNodeNameOverrides } from './getNodeNameOverrides';
-import { getMarkNameOverrides } from './getMarkNameOverrides';
 function isNodeReturnValue(value) {
@@ -133,3 +131,3 @@ return value && 'node' in value;
       }
-      res[getNodeNameOverrides(_node.getName())] = processedNode;
+      res[_node.getName()] = processedNode;
       return processedNode;
@@ -141,3 +139,3 @@ },
       }
-      var groupName = getNodeNameOverrides(_group.group);
+      var groupName = _group.group;
       res[groupName] = {
@@ -147,3 +145,3 @@ json: _group.members.filter(function (member) {
         }).map(function (member) {
-          return getNodeNameOverrides(member.getName());
+          return member.getName();
         })
@@ -219,3 +217,3 @@ };
                 if (hasNodes && !member.node.isIgnored(ValidatorSpecTransformerName)) {
-                  contentTypes.push(getNodeNameOverrides(member.node.getName()));
+                  contentTypes.push(member.node.getName());
                 }
@@ -261,3 +259,3 @@ if (member.node.isIgnored(ValidatorSpecTransformerName)) {
             }
-            contentTypes.push(getNodeNameOverrides(child.node.getName()));
+            contentTypes.push(child.node.getName());
             var _iterator4 = _createForOfIteratorHelper(child.node.getMarks(child.node.hasStage0())),
@@ -270,3 +268,3 @@ _step4;
                   marks.add(_mark.getType());
-                  res[getMarkNameOverrides(_mark.getType())] = {
+                  res[_mark.getType()] = {
                     mark: _mark,
@@ -327,13 +325,2 @@ json: buildMarkValidatorSpec(_mark)
 // @DSLCompatibilityException
-// Table cell content is a pseudo group that has a unique output format.
-function unwrapTableCellContentPseudoGroup(node, json) {
-  if (node.getName() !== 'tableCellContent') {
-    return;
-  }
-  var props = json.props;
-  delete json.props;
-  Object.assign(json, props.content);
-}
-
-// @DSLCompatibilityException
 // Nested expand content is a pseudo group that has a unique output format.
@@ -361,3 +348,3 @@ function handleNestedExpandContent(node, json, content) {
   // nestedExpand_content is a pseudo group and needs to be ignored in the validator spec.
-  if (node.getName() === 'tableCellContent') {
+  if (node.getName() === 'tableCell' || node.getName() === 'tableHeader' || node.getName() === 'tableCellContent') {
     filterItemsFromContent(json, ['nestedExpand_content']);
@@ -375,3 +362,2 @@ }
   }
-  unwrapTableCellContentPseudoGroup(node, json);
   if (node.getName() === 'nestedExpand_content' && content.length) {
@@ -378,0 +364,0 @@ handleNestedExpandContent(node, json, content);

package.json

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

src/transforms/adfToValidatorSpec/adfToValidatorSpec.ts

@@ -14,4 +14,2 @@ import { ADFMark } from '../../adfMark';
 import { buildMarks } from './buildMarks';
-import { getNodeNameOverrides } from './getNodeNameOverrides';
-import { getMarkNameOverrides } from './getMarkNameOverrides';
 import {
@@ -202,3 +200,3 @@ ValidatorSpec,
 
-      res[getNodeNameOverrides(node.getName())] = processedNode;
+      res[node.getName()] = processedNode;
       return processedNode;
@@ -211,3 +209,3 @@ },
 
-      const groupName = getNodeNameOverrides(group.group);
+      const groupName = group.group;
 
@@ -217,3 +215,3 @@ res[groupName] = {
           .filter((member) => !member.isIgnored(ValidatorSpecTransformerName))
-          .map((member) => getNodeNameOverrides(member.getName())),
+          .map((member) => member.getName()),
       };
@@ -286,3 +284,3 @@
             ) {
-              contentTypes.push(getNodeNameOverrides(member.node.getName()));
+              contentTypes.push(member.node.getName());
             }
@@ -317,3 +315,3 @@
 
-          contentTypes.push(getNodeNameOverrides(child.node.getName()));
+          contentTypes.push(child.node.getName());
 
@@ -324,3 +322,3 @@ for (const mark of child.node.getMarks(child.node.hasStage0())) {
 
-              res[getMarkNameOverrides(mark.getType())] = {
+              res[mark.getType()] = {
                 mark: mark,
@@ -378,17 +376,2 @@ json: buildMarkValidatorSpec(mark),
 // @DSLCompatibilityException
-// Table cell content is a pseudo group that has a unique output format.
-function unwrapTableCellContentPseudoGroup(
-  node: ADFNode<any>,
-  json: Record<string, any>,
-) {
-  if (node.getName() !== 'tableCellContent') {
-    return;
-  }
-
-  const props = json.props;
-  delete json.props;
-  Object.assign(json, props.content);
-}
-
-// @DSLCompatibilityException
 // Nested expand content is a pseudo group that has a unique output format.
@@ -425,3 +408,7 @@ function handleNestedExpandContent(
   // nestedExpand_content is a pseudo group and needs to be ignored in the validator spec.
-  if (node.getName() === 'tableCellContent') {
+  if (
+    node.getName() === 'tableCell' ||
+    node.getName() === 'tableHeader' ||
+    node.getName() === 'tableCellContent'
+  ) {
     filterItemsFromContent(json, ['nestedExpand_content']);
@@ -442,4 +429,2 @@ }
 
-  unwrapTableCellContentPseudoGroup(node, json);
-
   if (node.getName() === 'nestedExpand_content' && content.length) {
@@ -446,0 +431,0 @@ handleNestedExpandContent(node, json, content);

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

Worsened metrics

Total package byte prevSize

580964

decreased by-1.02%

Number of package files

260

decreased by-3.7%

Lines of code

15272

decreased by-1.04%

No dependency changes