@atlaskit/adf-schema 29.1.1 → 29.2.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 29.2.0
+
+### Minor Changes
+
+- e5770f4: Promote table width attribute to full schema
+
+## 29.1.2
+
+### Patch Changes
+
+- 8f56e32: ADFEXP-524: move code into root index file
+
 ## 29.1.1
 
 ### Patch Changes

package/dist/cjs/schema/default-schema.js

@@ -25,7 +25,6 @@ var getSchemaBasedOnStage = (0, _memoizeOne.default)(function () {
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
       layoutSection: _nodes.layoutSectionWithSingleColumn,
-      table: _nodes.tableWithCustomWidth,
       mediaSingle: _nodes.mediaSingleFull
     };
   }

package/dist/cjs/schema/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -346,7 +345,6 @@ Object.defineProperty(exports, "listItem", {
     return _nodes.listItem;
   }
 });
-exports.marks = void 0;
 Object.defineProperty(exports, "media", {
   enumerable: true,
   get: function get() {
@@ -425,7 +423,6 @@ Object.defineProperty(exports, "nestedExpand", {
     return _nodes.nestedExpand;
   }
 });
-exports.nodes = void 0;
 Object.defineProperty(exports, "orderedList", {
   enumerable: true,
   get: function get() {
@@ -672,21 +669,8 @@ Object.defineProperty(exports, "unsupportedNodeTypesForMediaCards", {
     return _unsupported.unsupportedNodeTypesForMediaCards;
   }
 });
-var _fs = _interopRequireDefault(require("fs"));
-var _path = _interopRequireDefault(require("path"));
 var _nodes = require("./nodes");
 var _marks = require("./marks");
 var _unsupported = require("./unsupported");
 var _inlineNodes = require("./inline-nodes");
-var _createSchema = require("./create-schema");
-var buildFilesList = function buildFilesList(dirPath) {
-  return _fs.default.readdirSync(dirPath).filter(function (node) {
-    return !node.startsWith('.') && node !== 'index';
-  }).map(function (node) {
-    return _path.default.basename(node, _path.default.extname(node));
-  });
-};
-var nodes = buildFilesList(_path.default.join(__dirname, 'nodes'));
-exports.nodes = nodes;
-var marks = buildFilesList(_path.default.join(__dirname, 'marks'));
-exports.marks = marks;
+var _createSchema = require("./create-schema");

package/dist/cjs/schema/nodes/tableNodes.js

@@ -159,7 +159,6 @@ exports.tableBackgroundColorNames = tableBackgroundColorNames;
 
 // TODO: Fix any, potential issue. ED-5048
 var createTableSpec = function createTableSpec() {
-  var allowCustomWidth = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
   var attrs = {
     isNumberColumnEnabled: {
       default: false
@@ -172,16 +171,14 @@ var createTableSpec = function createTableSpec() {
     },
     localId: {
       default: ''
-    }
-  };
-  var finalAttrs = allowCustomWidth ? _objectSpread(_objectSpread({}, attrs), {}, {
+    },
     width: {
       default: null
     }
-  }) : attrs;
+  };
   var tableNodeSpec = {
     content: 'tableRow+',
-    attrs: finalAttrs,
+    attrs: attrs,
     marks: 'unsupportedMark unsupportedNodeAttribute',
     tableRole: 'table',
     isolating: true,
@@ -218,9 +215,13 @@ var createTableSpec = function createTableSpec() {
   };
   return tableNodeSpec;
 };
-var table = createTableSpec(false);
+
+// TODO: assuming breaking changes aren't allowed, so retaining both exports
+/** Includes table width attribute */
+var table = createTableSpec();
+/** @deprecated Do not use, instead use the regular `table` export */
 exports.table = table;
-var tableWithCustomWidth = createTableSpec(true);
+var tableWithCustomWidth = createTableSpec();
 exports.tableWithCustomWidth = tableWithCustomWidth;
 var shouldIncludeAttribute = function shouldIncludeAttribute(key, value) {
   return !key.startsWith('__') && (key !== 'localId' || !!value);

package/dist/es2019/schema/default-schema.js

@@ -1,5 +1,5 @@
 import memoizeOne from 'memoize-one';
-import { mediaSingleFull, layoutSectionWithSingleColumn, tableWithCustomWidth } from './nodes';
+import { mediaSingleFull, layoutSectionWithSingleColumn } from './nodes';
 import { createSchema } from './create-schema';
 const getDefaultSchemaConfig = () => {
   let defaultSchemaConfig = {
@@ -16,7 +16,6 @@ export const getSchemaBasedOnStage = memoizeOne((stage = 'final') => {
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
       layoutSection: layoutSectionWithSingleColumn,
-      table: tableWithCustomWidth,
       mediaSingle: mediaSingleFull
     };
   }

package/dist/es2019/schema/index.js

@@ -1,12 +1,6 @@
-import fs from 'fs';
-import path from 'path';
 export { PanelType, blockCard, blockquote, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline } from './nodes';
 export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
 colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette } from './marks';
 export { unsupportedNodeTypesForMediaCards } from './unsupported';
 export { inlineNodes } from './inline-nodes';
-export { sanitizeNodes, createSchema } from './create-schema';
-const buildFilesList = dirPath => fs.readdirSync(dirPath).filter(node => !node.startsWith('.') && node !== 'index').map(node => path.basename(node, path.extname(node)));
-const nodes = buildFilesList(path.join(__dirname, 'nodes'));
-const marks = buildFilesList(path.join(__dirname, 'marks'));
-export { nodes, marks };
+export { sanitizeNodes, createSchema } from './create-schema';

package/dist/es2019/schema/nodes/tableNodes.js

@@ -135,7 +135,7 @@ export const tableBackgroundColorNames = new Map();
  */
 
 // TODO: Fix any, potential issue. ED-5048
-const createTableSpec = (allowCustomWidth = false) => {
+const createTableSpec = () => {
   const attrs = {
     isNumberColumnEnabled: {
       default: false
@@ -148,17 +148,14 @@ const createTableSpec = (allowCustomWidth = false) => {
     },
     localId: {
       default: ''
-    }
-  };
-  const finalAttrs = allowCustomWidth ? {
-    ...attrs,
+    },
     width: {
       default: null
     }
-  } : attrs;
+  };
   const tableNodeSpec = {
     content: 'tableRow+',
-    attrs: finalAttrs,
+    attrs: attrs,
     marks: 'unsupportedMark unsupportedNodeAttribute',
     tableRole: 'table',
     isolating: true,
@@ -195,8 +192,12 @@ const createTableSpec = (allowCustomWidth = false) => {
   };
   return tableNodeSpec;
 };
-export const table = createTableSpec(false);
-export const tableWithCustomWidth = createTableSpec(true);
+
+// TODO: assuming breaking changes aren't allowed, so retaining both exports
+/** Includes table width attribute */
+export const table = createTableSpec();
+/** @deprecated Do not use, instead use the regular `table` export */
+export const tableWithCustomWidth = createTableSpec();
 const shouldIncludeAttribute = (key, value) => !key.startsWith('__') && (key !== 'localId' || !!value);
 export const tableToJSON = node => ({
   attrs: Object.keys(node.attrs).filter(key => shouldIncludeAttribute(key, node.attrs[key])).reduce((obj, key) => {

package/dist/esm/schema/default-schema.js

@@ -1,5 +1,5 @@
 import memoizeOne from 'memoize-one';
-import { mediaSingleFull, layoutSectionWithSingleColumn, tableWithCustomWidth } from './nodes';
+import { mediaSingleFull, layoutSectionWithSingleColumn } from './nodes';
 import { createSchema } from './create-schema';
 var getDefaultSchemaConfig = function getDefaultSchemaConfig() {
   var defaultSchemaConfig = {
@@ -17,7 +17,6 @@ export var getSchemaBasedOnStage = memoizeOne(function () {
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
       layoutSection: layoutSectionWithSingleColumn,
-      table: tableWithCustomWidth,
       mediaSingle: mediaSingleFull
     };
   }

package/dist/esm/schema/index.js

@@ -1,18 +1,6 @@
-import fs from 'fs';
-import path from 'path';
 export { PanelType, blockCard, blockquote, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline } from './nodes';
 export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
 colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette } from './marks';
 export { unsupportedNodeTypesForMediaCards } from './unsupported';
 export { inlineNodes } from './inline-nodes';
-export { sanitizeNodes, createSchema } from './create-schema';
-var buildFilesList = function buildFilesList(dirPath) {
-  return fs.readdirSync(dirPath).filter(function (node) {
-    return !node.startsWith('.') && node !== 'index';
-  }).map(function (node) {
-    return path.basename(node, path.extname(node));
-  });
-};
-var nodes = buildFilesList(path.join(__dirname, 'nodes'));
-var marks = buildFilesList(path.join(__dirname, 'marks'));
-export { nodes, marks };
+export { sanitizeNodes, createSchema } from './create-schema';

package/dist/esm/schema/nodes/tableNodes.js

@@ -142,7 +142,6 @@ export var tableBackgroundColorNames = new Map();
 
 // TODO: Fix any, potential issue. ED-5048
 var createTableSpec = function createTableSpec() {
-  var allowCustomWidth = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
   var attrs = {
     isNumberColumnEnabled: {
       default: false
@@ -155,16 +154,14 @@ var createTableSpec = function createTableSpec() {
     },
     localId: {
       default: ''
-    }
-  };
-  var finalAttrs = allowCustomWidth ? _objectSpread(_objectSpread({}, attrs), {}, {
+    },
     width: {
       default: null
     }
-  }) : attrs;
+  };
   var tableNodeSpec = {
     content: 'tableRow+',
-    attrs: finalAttrs,
+    attrs: attrs,
     marks: 'unsupportedMark unsupportedNodeAttribute',
     tableRole: 'table',
     isolating: true,
@@ -201,8 +198,12 @@ var createTableSpec = function createTableSpec() {
   };
   return tableNodeSpec;
 };
-export var table = createTableSpec(false);
-export var tableWithCustomWidth = createTableSpec(true);
+
+// TODO: assuming breaking changes aren't allowed, so retaining both exports
+/** Includes table width attribute */
+export var table = createTableSpec();
+/** @deprecated Do not use, instead use the regular `table` export */
+export var tableWithCustomWidth = createTableSpec();
 var shouldIncludeAttribute = function shouldIncludeAttribute(key, value) {
   return !key.startsWith('__') && (key !== 'localId' || !!value);
 };

package/dist/json-schema/v1/full.json

@@ -2045,6 +2045,9 @@
             "localId": {
               "type": "string",
               "minLength": 1
+            },
+            "width": {
+              "type": "number"
             }
           },
           "additionalProperties": false

package/dist/types/schema/index.d.ts

@@ -7,6 +7,3 @@ export type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttrib
 export { unsupportedNodeTypesForMediaCards } from './unsupported';
 export { inlineNodes } from './inline-nodes';
 export { sanitizeNodes, createSchema } from './create-schema';
-declare const nodes: string[];
-declare const marks: string[];
-export { nodes, marks };

package/dist/types/schema/nodes/tableNodes.d.ts

@@ -55,9 +55,6 @@ export interface TableAttributes {
      * @minLength 1
      */
     localId?: string;
-    /**
-     * @stage 0
-     */
     width?: number;
 }
 /**
@@ -101,7 +98,9 @@ export interface TableHeader {
     attrs?: CellAttributes;
     content: TableCellContent;
 }
+/** Includes table width attribute */
 export declare const table: NodeSpec;
+/** @deprecated Do not use, instead use the regular `table` export */
 export declare const tableWithCustomWidth: NodeSpec;
 export declare const tableToJSON: (node: PmNode) => {
     attrs: import("prosemirror-model").Attrs;

package/json-schema/v1/full.json

@@ -2045,6 +2045,9 @@
             "localId": {
               "type": "string",
               "minLength": 1
+            },
+            "width": {
+              "type": "number"
             }
           },
           "additionalProperties": false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "29.1.1",
+  "version": "29.2.0",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"