@atlaskit/adf-schema 56.7.1 → 56.7.2

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/adf-schema
 
+## 56.7.2
+
+### Patch Changes
+
+- [`21f16025e3e5c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/21f16025e3e5c) -
+  Internal refactor of the next-schema DSL: `panel_c1` and `panel_c1_root_only` now list `table`
+  directly in their content specs (single source of truth), referenced via a new import-cycle-free
+  `tableStub` leaf module instead of the removed `ADFNode#addContent` runtime wiring. The generated
+  ProseMirror, JSON, and validator schema output is unchanged.
+- Updated dependencies
+
 ## 56.7.1
 
 ### Patch Changes

package/dist/cjs/next-schema/full-schema.adf.js

@@ -18,11 +18,6 @@ var _extension = require("./nodes/extension");
 var _multiBodiedExtension = require("./nodes/multiBodiedExtension");
 var _panel = require("./nodes/panel");
 var _rule = require("./nodes/rule");
-var _tableNodes = require("./nodes/tableNodes");
-// Wire cross-container content after all node modules are fully evaluated,
-// so neither import is undefined when the $or() expression is constructed.
-_panel.panel.use('c1').addContent(_tableNodes.table);
-_panel.panel.use('c1_root_only').addContent(_tableNodes.table);
 var doc = (0, _adfSchemaGenerator.adfNode)('doc').define({
   root: true,
   version: 1,

package/dist/cjs/next-schema/nodes/panel.js

@@ -20,6 +20,7 @@ var _rule = require("./rule");
 var _task = require("./task");
 var _unsupportedBlock = require("./unsupportedBlock");
 var _extension = require("./extension");
+var _tableStub = require("./tableStub");
 var panelContent = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _heading.heading.use('with_no_marks'), _list.bulletList, _list.orderedList, _blockCard.blockCard, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock, _task.taskList, _rule.rule, _decisionList.decisionList, _unsupportedBlock.unsupportedBlock];
 var panel = exports.panel = (0, _adfSchemaGenerator.adfNode)('panel').define({
   selectable: true,
@@ -58,9 +59,8 @@ var panel = exports.panel = (0, _adfSchemaGenerator.adfNode)('panel').define({
   },
   content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, panelContent.concat([_extension.extension.use('with_marks')])))]
 }).variant('c1', {
-  // panel_c1 allows all standard panel content plus table (wired via addContent
-  // in full-schema.adf.ts to avoid a circular module import).
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, panelContent.concat([_extension.extension.use('with_marks')])))],
+  // panel_c1 allows all standard panel content plus table.
+  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, panelContent.concat([_extension.extension.use('with_marks'), _tableStub.table])))],
   ignore: ['json-schema', 'validator-spec'],
   preserveVariantNameInPm: true
 })
@@ -73,9 +73,8 @@ var panel = exports.panel = (0, _adfSchemaGenerator.adfNode)('panel').define({
 .variant('c1_root_only', {
   stage0: true,
   marks: [_breakout.breakout, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
-  // panel_c1 allows all standard panel content plus table (wired via addContent
-  // in full-schema.adf.ts to avoid a circular module import).
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, panelContent.concat([_extension.extension.use('with_marks')])))],
+  // panel_c1_root_only allows all standard panel content plus table.
+  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, panelContent.concat([_extension.extension.use('with_marks'), _tableStub.table])))],
   ignore: ['json-schema', 'validator-spec'],
   preserveVariantNameInPm: true
 });

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

@@ -4,7 +4,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.table = void 0;
+Object.defineProperty(exports, "table", {
+  enumerable: true,
+  get: function get() {
+    return _tableStub.table;
+  }
+});
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
 var _fragment = require("../marks/fragment");
@@ -14,8 +19,7 @@ var _tableCellContentPseudoGroup = require("../groups/tableCellContentPseudoGrou
 var _tableCellContent = require("./tableCellContent");
 var _nestedExpand = require("./nestedExpand");
 var _unsupportedBlock = require("./unsupportedBlock");
-// Declare early to allow for circular references within the file
-var table = exports.table = (0, _adfSchemaGenerator.adfNode)('table');
+var _tableStub = require("./tableStub");
 var valign = {
   type: 'enum',
   values: ['top', 'middle', 'bottom'],
@@ -69,7 +73,7 @@ var tableCell = (0, _adfSchemaGenerator.adfNode)('tableCell').define({
     }
   }
 }).variant('with_nested_table', {
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, (0, _toConsumableArray2.default)(_tableCellContentPseudoGroup.tableCellContentNodes).concat([_unsupportedBlock.unsupportedBlock, table])))],
+  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, (0, _toConsumableArray2.default)(_tableCellContentPseudoGroup.tableCellContentNodes).concat([_unsupportedBlock.unsupportedBlock, _tableStub.table])))],
   ignore: ['json-schema', 'validator-spec']
 });
 var tableHeader = (0, _adfSchemaGenerator.adfNode)('tableHeader').define({
@@ -88,7 +92,7 @@ var tableHeader = (0, _adfSchemaGenerator.adfNode)('tableHeader').define({
     }
   }
 }).variant('with_nested_table', {
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, (0, _toConsumableArray2.default)(_tableCellContentPseudoGroup.tableCellContentNodes).concat([_nestedExpand.nestedExpand, table])))],
+  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, (0, _toConsumableArray2.default)(_tableCellContentPseudoGroup.tableCellContentNodes).concat([_nestedExpand.nestedExpand, _tableStub.table])))],
   ignore: ['json-schema', 'validator-spec']
 });
 var tableRow = (0, _adfSchemaGenerator.adfNode)('tableRow').define({
@@ -115,7 +119,7 @@ var tableRow = (0, _adfSchemaGenerator.adfNode)('tableRow').define({
   content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(tableCell.use('with_nested_table'), tableHeader.use('with_nested_table')))],
   ignore: ['json-schema', 'validator-spec']
 });
-table.define({
+_tableStub.table.define({
   isolating: true,
   selectable: true,
   tableRole: 'table',
@@ -159,4 +163,9 @@ table.define({
 }).variant('with_nested_table', {
   content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(tableRow.use('with_nested_table')))],
   ignore: ['json-schema', 'validator-spec']
-});
+});
+
+// Re-export the now-defined `table` stub as this module's public API. Importing `table` from here
+// (rather than from `./tableStub`) forces this definition module to evaluate first, so consumers
+// that eagerly call `table.use('with_nested_table')` see the defined variant.
+// eslint-disable-next-line @atlaskit/editor/no-re-export

package/dist/cjs/next-schema/nodes/tableStub.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.table = void 0;
+var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+// A bare `table` node stub, declared in an import-cycle-free leaf module so that other node
+// modules (e.g. `panel`) can reference `table` in their content WITHOUT importing the heavy
+// `tableNodes.ts` definition module. Importing `tableNodes.ts` from `panel.ts` would form a
+// module import cycle (panel -> tableNodes -> nestedExpand / tableCellContentPseudoGroup ->
+// panel) and crash at module-eval time.
+//
+// `tableNodes.ts` imports this same stub and calls `.define()` / `.variant()` on it, so the
+// object here is the one and only `table` node. Spec resolution is deferred to codegen traversal,
+// which is cycle-aware, so referencing this stub before it is defined is safe.
+var table = exports.table = (0, _adfSchemaGenerator.adfNode)('table');

package/dist/es2019/next-schema/full-schema.adf.js

@@ -12,12 +12,6 @@ import { extension } from './nodes/extension';
 import { multiBodiedExtension } from './nodes/multiBodiedExtension';
 import { panel } from './nodes/panel';
 import { rule } from './nodes/rule';
-import { table } from './nodes/tableNodes';
-
-// Wire cross-container content after all node modules are fully evaluated,
-// so neither import is undefined when the $or() expression is constructed.
-panel.use('c1').addContent(table);
-panel.use('c1_root_only').addContent(table);
 const doc = adfNode('doc').define({
   root: true,
   version: 1,

package/dist/es2019/next-schema/nodes/panel.js

@@ -14,6 +14,7 @@ import { rule } from './rule';
 import { taskList } from './task';
 import { unsupportedBlock } from './unsupportedBlock';
 import { extension } from './extension';
+import { table } from './tableStub';
 const panelContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, rule, decisionList, unsupportedBlock];
 export const panel = adfNode('panel').define({
   selectable: true,
@@ -52,9 +53,8 @@ export const panel = adfNode('panel').define({
   },
   content: [$onePlus($or(...panelContent, extension.use('with_marks')))]
 }).variant('c1', {
-  // panel_c1 allows all standard panel content plus table (wired via addContent
-  // in full-schema.adf.ts to avoid a circular module import).
-  content: [$onePlus($or(...panelContent, extension.use('with_marks')))],
+  // panel_c1 allows all standard panel content plus table.
+  content: [$onePlus($or(...panelContent, extension.use('with_marks'), table))],
   ignore: ['json-schema', 'validator-spec'],
   preserveVariantNameInPm: true
 })
@@ -67,9 +67,8 @@ export const panel = adfNode('panel').define({
 .variant('c1_root_only', {
   stage0: true,
   marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
-  // panel_c1 allows all standard panel content plus table (wired via addContent
-  // in full-schema.adf.ts to avoid a circular module import).
-  content: [$onePlus($or(...panelContent, extension.use('with_marks')))],
+  // panel_c1_root_only allows all standard panel content plus table.
+  content: [$onePlus($or(...panelContent, extension.use('with_marks'), table))],
   ignore: ['json-schema', 'validator-spec'],
   preserveVariantNameInPm: true
 });

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

@@ -6,9 +6,7 @@ import { tableCellContentPseudoGroup, tableCellContentNodes, tableHeaderContentP
 import { tableCellContent } from './tableCellContent';
 import { nestedExpand } from './nestedExpand';
 import { unsupportedBlock } from './unsupportedBlock';
-
-// Declare early to allow for circular references within the file
-const table = adfNode('table');
+import { table } from './tableStub';
 const valign = {
   type: 'enum',
   values: ['top', 'middle', 'bottom'],
@@ -153,4 +151,9 @@ table.define({
   content: [$onePlus($or(tableRow.use('with_nested_table')))],
   ignore: ['json-schema', 'validator-spec']
 });
+
+// Re-export the now-defined `table` stub as this module's public API. Importing `table` from here
+// (rather than from `./tableStub`) forces this definition module to evaluate first, so consumers
+// that eagerly call `table.use('with_nested_table')` see the defined variant.
+// eslint-disable-next-line @atlaskit/editor/no-re-export
 export { table };

package/dist/es2019/next-schema/nodes/tableStub.js

@@ -0,0 +1,12 @@
+import { adfNode } from '@atlaskit/adf-schema-generator';
+
+// A bare `table` node stub, declared in an import-cycle-free leaf module so that other node
+// modules (e.g. `panel`) can reference `table` in their content WITHOUT importing the heavy
+// `tableNodes.ts` definition module. Importing `tableNodes.ts` from `panel.ts` would form a
+// module import cycle (panel -> tableNodes -> nestedExpand / tableCellContentPseudoGroup ->
+// panel) and crash at module-eval time.
+//
+// `tableNodes.ts` imports this same stub and calls `.define()` / `.variant()` on it, so the
+// object here is the one and only `table` node. Spec resolution is deferred to codegen traversal,
+// which is cycle-aware, so referencing this stub before it is defined is safe.
+export const table = adfNode('table');

package/dist/esm/next-schema/full-schema.adf.js

@@ -12,12 +12,6 @@ import { extension } from './nodes/extension';
 import { multiBodiedExtension } from './nodes/multiBodiedExtension';
 import { panel } from './nodes/panel';
 import { rule } from './nodes/rule';
-import { table } from './nodes/tableNodes';
-
-// Wire cross-container content after all node modules are fully evaluated,
-// so neither import is undefined when the $or() expression is constructed.
-panel.use('c1').addContent(table);
-panel.use('c1_root_only').addContent(table);
 var doc = adfNode('doc').define({
   root: true,
   version: 1,

package/dist/esm/next-schema/nodes/panel.js

@@ -14,6 +14,7 @@ import { rule } from './rule';
 import { taskList } from './task';
 import { unsupportedBlock } from './unsupportedBlock';
 import { extension } from './extension';
+import { table } from './tableStub';
 var panelContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, rule, decisionList, unsupportedBlock];
 export var panel = adfNode('panel').define({
   selectable: true,
@@ -52,9 +53,8 @@ export var panel = adfNode('panel').define({
   },
   content: [$onePlus($or.apply(void 0, panelContent.concat([extension.use('with_marks')])))]
 }).variant('c1', {
-  // panel_c1 allows all standard panel content plus table (wired via addContent
-  // in full-schema.adf.ts to avoid a circular module import).
-  content: [$onePlus($or.apply(void 0, panelContent.concat([extension.use('with_marks')])))],
+  // panel_c1 allows all standard panel content plus table.
+  content: [$onePlus($or.apply(void 0, panelContent.concat([extension.use('with_marks'), table])))],
   ignore: ['json-schema', 'validator-spec'],
   preserveVariantNameInPm: true
 })
@@ -67,9 +67,8 @@ export var panel = adfNode('panel').define({
 .variant('c1_root_only', {
   stage0: true,
   marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
-  // panel_c1 allows all standard panel content plus table (wired via addContent
-  // in full-schema.adf.ts to avoid a circular module import).
-  content: [$onePlus($or.apply(void 0, panelContent.concat([extension.use('with_marks')])))],
+  // panel_c1_root_only allows all standard panel content plus table.
+  content: [$onePlus($or.apply(void 0, panelContent.concat([extension.use('with_marks'), table])))],
   ignore: ['json-schema', 'validator-spec'],
   preserveVariantNameInPm: true
 });

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

@@ -7,9 +7,7 @@ import { tableCellContentPseudoGroup, tableCellContentNodes, tableHeaderContentP
 import { tableCellContent } from './tableCellContent';
 import { nestedExpand } from './nestedExpand';
 import { unsupportedBlock } from './unsupportedBlock';
-
-// Declare early to allow for circular references within the file
-var table = adfNode('table');
+import { table } from './tableStub';
 var valign = {
   type: 'enum',
   values: ['top', 'middle', 'bottom'],
@@ -154,4 +152,9 @@ table.define({
   content: [$onePlus($or(tableRow.use('with_nested_table')))],
   ignore: ['json-schema', 'validator-spec']
 });
+
+// Re-export the now-defined `table` stub as this module's public API. Importing `table` from here
+// (rather than from `./tableStub`) forces this definition module to evaluate first, so consumers
+// that eagerly call `table.use('with_nested_table')` see the defined variant.
+// eslint-disable-next-line @atlaskit/editor/no-re-export
 export { table };

package/dist/esm/next-schema/nodes/tableStub.js

@@ -0,0 +1,12 @@
+import { adfNode } from '@atlaskit/adf-schema-generator';
+
+// A bare `table` node stub, declared in an import-cycle-free leaf module so that other node
+// modules (e.g. `panel`) can reference `table` in their content WITHOUT importing the heavy
+// `tableNodes.ts` definition module. Importing `tableNodes.ts` from `panel.ts` would form a
+// module import cycle (panel -> tableNodes -> nestedExpand / tableCellContentPseudoGroup ->
+// panel) and crash at module-eval time.
+//
+// `tableNodes.ts` imports this same stub and calls `.define()` / `.variant()` on it, so the
+// object here is the one and only `table` node. Spec resolution is deferred to codegen traversal,
+// which is cycle-aware, so referencing this stub before it is defined is safe.
+export var table = adfNode('table');

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

@@ -1,3 +1,2 @@
-import type { ADFNode, ADFCommonNodeSpec } from '@atlaskit/adf-schema-generator';
-declare const table: ADFNode<[string], ADFCommonNodeSpec>;
+import { table } from './tableStub';
 export { table };

package/dist/types/next-schema/nodes/tableStub.d.ts

@@ -0,0 +1,2 @@
+import type { ADFCommonNodeSpec, ADFNode } from '@atlaskit/adf-schema-generator';
+export declare const table: ADFNode<[string], ADFCommonNodeSpec>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "56.7.1",
+	"version": "56.7.2",
 	"description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -37,7 +37,7 @@
 		"build:schema:all": "yarn build:schema:pm && yarn build:schema:json && yarn build:schema:validator"
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema-generator": "^3.1.0",
+		"@atlaskit/adf-schema-generator": "^4.0.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
 		"@atlaskit/tmp-editor-statsig": "^146.0.0",