@atlaskit/adf-utils 19.0.22 → 19.0.23

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/adf-utils
 
+## 19.0.23
+
+### Patch Changes
+
+- [#80679](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/80679) [`104eb9443b7e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/104eb9443b7e) - ED-22553 Updating adf-schema version to 35.6.0
+
 ## 19.0.22
 
 ### Patch Changes

package/dist/cjs/builders/types.js

@@ -1,5 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+"use strict";

package/dist/cjs/types/index.js

@@ -1,5 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+"use strict";

package/dist/cjs/validator/entry.js

@@ -1,5 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+"use strict";

package/dist/cjs/validator/validator.js

@@ -20,7 +20,6 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var INLINE_NODES_SUPPORTING_COMMENTS = ['inlineCard'];
 function mapMarksItems(spec) {
   var fn = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function (x) {
     return x;
@@ -57,18 +56,18 @@ var partitionObject = function partitionObject(obj, predicate) {
  * We denormalised the spec to save bundle size.
  */
 function createSpec(nodes, marks) {
-  var allowCommentsOnInlineNodes = !!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes');
-  return Object.keys(specs).reduce(function (newSpecs, k) {
-    var spec = _objectSpread({}, specs[k]);
-    if (INLINE_NODES_SUPPORTING_COMMENTS.includes(k) && allowCommentsOnInlineNodes) {
-      spec.props = _inlineCardWithAnnotation.inlineCardWithAnnotation.props;
-    }
+  var _specs = _objectSpread({}, specs);
+  if (!!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes')) {
+    _specs.inlineCard = _inlineCardWithAnnotation.inlineCardWithAnnotation;
+  }
+  return Object.keys(_specs).reduce(function (newSpecs, k) {
+    var spec = _objectSpread({}, _specs[k]);
     if (spec.props) {
       spec.props = _objectSpread({}, spec.props);
       if (spec.props.content) {
         // 'tableCell_content' => { type: 'array', items: [ ... ] }
         if ((0, _utils.isString)(spec.props.content)) {
-          spec.props.content = specs[spec.props.content];
+          spec.props.content = _specs[spec.props.content];
         }
 
         // ['inline', 'emoji']
@@ -96,12 +95,12 @@ function createSpec(nodes, marks) {
         // ['inline'] => [['emoji', 'hr', ...]]
         // ['media'] => [['media']]
         .map(function (item) {
-          return (0, _utils.isString)(item) ? Array.isArray(specs[item]) ? specs[item] : [item] : item;
+          return (0, _utils.isString)(item) ? Array.isArray(_specs[item]) ? _specs[item] : [item] : item;
         })
         // [['emoji', 'hr', 'inline_code']] => [['emoji', 'hr', ['text', { marks: {} }]]]
         .map(function (item) {
           return item.map(function (subItem) {
-            return Array.isArray(specs[subItem]) ? specs[subItem] : (0, _utils.isString)(subItem) ? subItem :
+            return Array.isArray(_specs[subItem]) ? _specs[subItem] : (0, _utils.isString)(subItem) ? subItem :
             // Now `NoMark` produces `items: []`, should be fixed in generator
             ['text', subItem];
           })

package/dist/es2019/builders/types.js

@@ -1 +0,0 @@
-export {};

package/dist/es2019/types/index.js

@@ -1 +0,0 @@
-export {};

package/dist/es2019/validator/entry.js

@@ -1 +0,0 @@
-export {};

package/dist/es2019/validator/validator.js

@@ -3,7 +3,6 @@ import * as specs from './specs';
 import { inlineCardWithAnnotation } from './custom-specs/inline-card-with-annotation';
 import { copy, isBoolean, isDefined, isInteger, isNumber, isPlainObject, isString, makeArray } from './utils';
 import { validatorFnMap } from './rules';
-const INLINE_NODES_SUPPORTING_COMMENTS = ['inlineCard'];
 function mapMarksItems(spec, fn = x => x) {
   if (spec.props && spec.props.marks) {
     const {
@@ -39,14 +38,16 @@ const partitionObject = (obj, predicate) => Object.keys(obj).reduce((acc, key) =
  * We denormalised the spec to save bundle size.
  */
 function createSpec(nodes, marks) {
-  const allowCommentsOnInlineNodes = !!getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes');
-  return Object.keys(specs).reduce((newSpecs, k) => {
+  let _specs = {
+    ...specs
+  };
+  if (!!getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+    _specs.inlineCard = inlineCardWithAnnotation;
+  }
+  return Object.keys(_specs).reduce((newSpecs, k) => {
     const spec = {
-      ...specs[k]
+      ..._specs[k]
     };
-    if (INLINE_NODES_SUPPORTING_COMMENTS.includes(k) && allowCommentsOnInlineNodes) {
-      spec.props = inlineCardWithAnnotation.props;
-    }
     if (spec.props) {
       spec.props = {
         ...spec.props
@@ -54,7 +55,7 @@ function createSpec(nodes, marks) {
       if (spec.props.content) {
         // 'tableCell_content' => { type: 'array', items: [ ... ] }
         if (isString(spec.props.content)) {
-          spec.props.content = specs[spec.props.content];
+          spec.props.content = _specs[spec.props.content];
         }
 
         // ['inline', 'emoji']
@@ -81,9 +82,9 @@ function createSpec(nodes, marks) {
 
         // ['inline'] => [['emoji', 'hr', ...]]
         // ['media'] => [['media']]
-        .map(item => isString(item) ? Array.isArray(specs[item]) ? specs[item] : [item] : item)
+        .map(item => isString(item) ? Array.isArray(_specs[item]) ? _specs[item] : [item] : item)
         // [['emoji', 'hr', 'inline_code']] => [['emoji', 'hr', ['text', { marks: {} }]]]
-        .map(item => item.map(subItem => Array.isArray(specs[subItem]) ? specs[subItem] : isString(subItem) ? subItem :
+        .map(item => item.map(subItem => Array.isArray(_specs[subItem]) ? _specs[subItem] : isString(subItem) ? subItem :
         // Now `NoMark` produces `items: []`, should be fixed in generator
         ['text', subItem])
         // Remove unsupported nodes & marks

package/dist/esm/builders/types.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/types/index.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/validator/entry.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/validator/validator.js

@@ -9,7 +9,6 @@ import * as specs from './specs';
 import { inlineCardWithAnnotation } from './custom-specs/inline-card-with-annotation';
 import { copy, isBoolean, isDefined, isInteger, isNumber, isPlainObject, isString, makeArray } from './utils';
 import { validatorFnMap } from './rules';
-var INLINE_NODES_SUPPORTING_COMMENTS = ['inlineCard'];
 function mapMarksItems(spec) {
   var fn = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function (x) {
     return x;
@@ -46,18 +45,18 @@ var partitionObject = function partitionObject(obj, predicate) {
  * We denormalised the spec to save bundle size.
  */
 function createSpec(nodes, marks) {
-  var allowCommentsOnInlineNodes = !!getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes');
-  return Object.keys(specs).reduce(function (newSpecs, k) {
-    var spec = _objectSpread({}, specs[k]);
-    if (INLINE_NODES_SUPPORTING_COMMENTS.includes(k) && allowCommentsOnInlineNodes) {
-      spec.props = inlineCardWithAnnotation.props;
-    }
+  var _specs = _objectSpread({}, specs);
+  if (!!getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+    _specs.inlineCard = inlineCardWithAnnotation;
+  }
+  return Object.keys(_specs).reduce(function (newSpecs, k) {
+    var spec = _objectSpread({}, _specs[k]);
     if (spec.props) {
       spec.props = _objectSpread({}, spec.props);
       if (spec.props.content) {
         // 'tableCell_content' => { type: 'array', items: [ ... ] }
         if (isString(spec.props.content)) {
-          spec.props.content = specs[spec.props.content];
+          spec.props.content = _specs[spec.props.content];
         }
 
         // ['inline', 'emoji']
@@ -85,12 +84,12 @@ function createSpec(nodes, marks) {
         // ['inline'] => [['emoji', 'hr', ...]]
         // ['media'] => [['media']]
         .map(function (item) {
-          return isString(item) ? Array.isArray(specs[item]) ? specs[item] : [item] : item;
+          return isString(item) ? Array.isArray(_specs[item]) ? _specs[item] : [item] : item;
         })
         // [['emoji', 'hr', 'inline_code']] => [['emoji', 'hr', ['text', { marks: {} }]]]
         .map(function (item) {
           return item.map(function (subItem) {
-            return Array.isArray(specs[subItem]) ? specs[subItem] : isString(subItem) ? subItem :
+            return Array.isArray(_specs[subItem]) ? _specs[subItem] : isString(subItem) ? subItem :
             // Now `NoMark` produces `items: []`, should be fixed in generator
             ['text', subItem];
           })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-utils",
-  "version": "19.0.22",
+  "version": "19.0.23",
   "description": "Set of utilities to traverse, modify and create ADF documents.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -41,7 +41,7 @@
     "generate:spec": "rm -rf ./src/validator/specs/ && yarn json-schema-generator --outDir=./src/validator/specs/ --mode=Spec --stage=0 ./src/validator/entry.ts"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^35.5.2",
+    "@atlaskit/adf-schema": "^35.6.0",
     "@atlaskit/codemod-utils": "^4.2.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
     "@babel/runtime": "^7.0.0"