@atlaskit/adf-schema 36.5.0 → 36.6.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/adf-schema
 
+## 36.6.0
+
+### Minor Changes
+
+- 14fa4c0: Bootstrap ADF DSL nodes and marks
+
+### Patch Changes
+
+- d21d4ab: fix: alignment and indentation cycle results in one of them being undefined
+
 ## 36.5.0
 
 ### Minor Changes

package/dist/cjs/next-schema/marks/alignmentAndIndentation.js

@@ -0,0 +1,32 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.indentation = exports.alignment = void 0;
+var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+// These marks defined together because they form a cycle within the excludes.
+var alignment = exports.alignment = (0, _adfSchemaGenerator.adfMark)('alignment');
+var indentation = exports.indentation = (0, _adfSchemaGenerator.adfMark)('indentation');
+var alignementMarkExclusionGroup = (0, _adfSchemaGenerator.adfMarkGroup)('alignmentMarkExclusion', [alignment]);
+var indentationMarkExclusionGroup = (0, _adfSchemaGenerator.adfMarkGroup)('indentationMarkExclusion', [indentation]);
+alignment.define({
+  excludes: [indentationMarkExclusionGroup],
+  attrs: {
+    align: {
+      type: 'enum',
+      values: ['center', 'end'],
+      default: 'center'
+    }
+  }
+});
+indentation.define({
+  excludes: [alignementMarkExclusionGroup],
+  attrs: {
+    level: {
+      type: 'number',
+      minimum: 0,
+      maximum: 6
+    }
+  }
+});

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

@@ -6,8 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.headingWithMarks = exports.heading = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
 var _inlineGroup = require("../groups/inlineGroup");
-var _alignment = require("../marks/alignment");
-var _indentation = require("../marks/indentation");
+var _alignmentAndIndentation = require("../marks/alignmentAndIndentation");
 var heading = exports.heading = (0, _adfSchemaGenerator.adfNode)('heading').define({
   defining: true,
   selectable: false,
@@ -21,8 +20,8 @@ var heading = exports.heading = (0, _adfSchemaGenerator.adfNode)('heading').defi
   },
   content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup))]
 }).variant('with_alignment', {
-  marks: [_alignment.alignment]
+  marks: [_alignmentAndIndentation.alignment]
 }).variant('with_indentation', {
-  marks: [_indentation.indentation]
+  marks: [_alignmentAndIndentation.indentation]
 });
 var headingWithMarks = exports.headingWithMarks = heading;

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

@@ -6,16 +6,15 @@ Object.defineProperty(exports, "__esModule", {
 exports.paragraph = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
 var _inlineGroup = require("../groups/inlineGroup");
-var _alignment = require("../marks/alignment");
-var _indentation = require("../marks/indentation");
+var _alignmentAndIndentation = require("../marks/alignmentAndIndentation");
 var paragraph = exports.paragraph = (0, _adfSchemaGenerator.adfNode)('paragraph').define({
   selectable: false,
-  marks: [_alignment.alignment],
+  marks: [_alignmentAndIndentation.alignment],
   content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup))]
 }).variant('with_alignment', {
-  marks: [_alignment.alignment]
+  marks: [_alignmentAndIndentation.alignment]
 }).variant('with_indentation', {
-  marks: [_indentation.indentation]
+  marks: [_alignmentAndIndentation.indentation]
 }).variant('with_marks', {
-  marks: [_alignment.alignment, _indentation.indentation]
+  marks: [_alignmentAndIndentation.alignment, _alignmentAndIndentation.indentation]
 });

package/dist/es2019/next-schema/marks/alignmentAndIndentation.js

@@ -0,0 +1,28 @@
+import { adfMark } from '@atlaskit/adf-schema-generator';
+import { adfMarkGroup } from '@atlaskit/adf-schema-generator';
+
+// These marks defined together because they form a cycle within the excludes.
+export const alignment = adfMark('alignment');
+export const indentation = adfMark('indentation');
+const alignementMarkExclusionGroup = adfMarkGroup('alignmentMarkExclusion', [alignment]);
+const indentationMarkExclusionGroup = adfMarkGroup('indentationMarkExclusion', [indentation]);
+alignment.define({
+  excludes: [indentationMarkExclusionGroup],
+  attrs: {
+    align: {
+      type: 'enum',
+      values: ['center', 'end'],
+      default: 'center'
+    }
+  }
+});
+indentation.define({
+  excludes: [alignementMarkExclusionGroup],
+  attrs: {
+    level: {
+      type: 'number',
+      minimum: 0,
+      maximum: 6
+    }
+  }
+});

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

@@ -1,7 +1,6 @@
 import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
 import { inlineGroup } from '../groups/inlineGroup';
-import { alignment } from '../marks/alignment';
-import { indentation } from '../marks/indentation';
+import { alignment, indentation } from '../marks/alignmentAndIndentation';
 export const heading = adfNode('heading').define({
   defining: true,
   selectable: false,

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

@@ -1,7 +1,6 @@
 import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
 import { inlineGroup } from '../groups/inlineGroup';
-import { alignment } from '../marks/alignment';
-import { indentation } from '../marks/indentation';
+import { alignment, indentation } from '../marks/alignmentAndIndentation';
 export const paragraph = adfNode('paragraph').define({
   selectable: false,
   marks: [alignment],

package/dist/esm/next-schema/marks/alignmentAndIndentation.js

@@ -0,0 +1,28 @@
+import { adfMark } from '@atlaskit/adf-schema-generator';
+import { adfMarkGroup } from '@atlaskit/adf-schema-generator';
+
+// These marks defined together because they form a cycle within the excludes.
+export var alignment = adfMark('alignment');
+export var indentation = adfMark('indentation');
+var alignementMarkExclusionGroup = adfMarkGroup('alignmentMarkExclusion', [alignment]);
+var indentationMarkExclusionGroup = adfMarkGroup('indentationMarkExclusion', [indentation]);
+alignment.define({
+  excludes: [indentationMarkExclusionGroup],
+  attrs: {
+    align: {
+      type: 'enum',
+      values: ['center', 'end'],
+      default: 'center'
+    }
+  }
+});
+indentation.define({
+  excludes: [alignementMarkExclusionGroup],
+  attrs: {
+    level: {
+      type: 'number',
+      minimum: 0,
+      maximum: 6
+    }
+  }
+});

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

@@ -1,7 +1,6 @@
 import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
 import { inlineGroup } from '../groups/inlineGroup';
-import { alignment } from '../marks/alignment';
-import { indentation } from '../marks/indentation';
+import { alignment, indentation } from '../marks/alignmentAndIndentation';
 export var heading = adfNode('heading').define({
   defining: true,
   selectable: false,

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

@@ -1,7 +1,6 @@
 import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
 import { inlineGroup } from '../groups/inlineGroup';
-import { alignment } from '../marks/alignment';
-import { indentation } from '../marks/indentation';
+import { alignment, indentation } from '../marks/alignmentAndIndentation';
 export var paragraph = adfNode('paragraph').define({
   selectable: false,
   marks: [alignment],

package/dist/types/next-schema/marks/{indentation.d.ts → alignmentAndIndentation.d.ts}

@@ -1 +1,2 @@
+export declare const alignment: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>;
 export declare const indentation: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "36.5.0",
+  "version": "36.6.0",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.14.0",
-    "@atlaskit/adf-schema-generator": "^1.5.0",
+    "@atlaskit/adf-schema-generator": "^1.6.0",
     "@babel/cli": "^7.22.9",
     "@babel/core": "^7.22.9",
     "@babel/plugin-proposal-class-properties": "^7.18.6",

package/schema-generators/full-schema.ts

@@ -1,7 +1,13 @@
 import { adfToPm } from '@atlaskit/adf-schema-generator';
+import adfNode from 'src/next-schema/full-schema.adf';
 
 function main() {
-  console.log(adfToPm);
+  const output = adfToPm(adfNode);
+
+  // TODO - remove console log
+  Object.entries(output).forEach(([key, value]) => {
+    console.log(key, value.pmNodeSpec);
+  });
 }
 
 main();

package/dist/cjs/next-schema/groups/alignementMarkExclusionGroup.js

@@ -1,9 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.alignementMarkExclusionGroup = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var _alignment = require("../marks/alignment");
-var alignementMarkExclusionGroup = exports.alignementMarkExclusionGroup = (0, _adfSchemaGenerator.adfMarkGroup)('alignmentMarkExclusion', [_alignment.alignment]);

package/dist/cjs/next-schema/groups/indentationMarkExclusionGroup.js

@@ -1,9 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.indentationMarkExclusionGroup = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var _indentation = require("../marks/indentation");
-var indentationMarkExclusionGroup = exports.indentationMarkExclusionGroup = (0, _adfSchemaGenerator.adfMarkGroup)('indentationMarkExclusion', [_indentation.indentation]);

package/dist/cjs/next-schema/marks/alignment.js

@@ -1,18 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.alignment = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var _indentationMarkExclusionGroup = require("../groups/indentationMarkExclusionGroup");
-var alignment = exports.alignment = (0, _adfSchemaGenerator.adfMark)('alignment').define({
-  excludes: [_indentationMarkExclusionGroup.indentationMarkExclusionGroup],
-  attrs: {
-    align: {
-      type: 'enum',
-      values: ['center', 'end'],
-      default: 'center'
-    }
-  }
-});

package/dist/cjs/next-schema/marks/indentation.js

@@ -1,18 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.indentation = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var _alignementMarkExclusionGroup = require("../groups/alignementMarkExclusionGroup");
-var indentation = exports.indentation = (0, _adfSchemaGenerator.adfMark)('indentation').define({
-  excludes: [_alignementMarkExclusionGroup.alignementMarkExclusionGroup],
-  attrs: {
-    level: {
-      type: 'number',
-      minimum: 0,
-      maximum: 6
-    }
-  }
-});

package/dist/es2019/next-schema/groups/alignementMarkExclusionGroup.js

@@ -1,3 +0,0 @@
-import { adfMarkGroup } from '@atlaskit/adf-schema-generator';
-import { alignment } from '../marks/alignment';
-export const alignementMarkExclusionGroup = adfMarkGroup('alignmentMarkExclusion', [alignment]);

package/dist/es2019/next-schema/groups/indentationMarkExclusionGroup.js

@@ -1,3 +0,0 @@
-import { adfMarkGroup } from '@atlaskit/adf-schema-generator';
-import { indentation } from '../marks/indentation';
-export const indentationMarkExclusionGroup = adfMarkGroup('indentationMarkExclusion', [indentation]);

package/dist/es2019/next-schema/marks/alignment.js

@@ -1,12 +0,0 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
-import { indentationMarkExclusionGroup } from '../groups/indentationMarkExclusionGroup';
-export const alignment = adfMark('alignment').define({
-  excludes: [indentationMarkExclusionGroup],
-  attrs: {
-    align: {
-      type: 'enum',
-      values: ['center', 'end'],
-      default: 'center'
-    }
-  }
-});

package/dist/es2019/next-schema/marks/indentation.js

@@ -1,12 +0,0 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
-import { alignementMarkExclusionGroup } from '../groups/alignementMarkExclusionGroup';
-export const indentation = adfMark('indentation').define({
-  excludes: [alignementMarkExclusionGroup],
-  attrs: {
-    level: {
-      type: 'number',
-      minimum: 0,
-      maximum: 6
-    }
-  }
-});

package/dist/esm/next-schema/groups/alignementMarkExclusionGroup.js

@@ -1,3 +0,0 @@
-import { adfMarkGroup } from '@atlaskit/adf-schema-generator';
-import { alignment } from '../marks/alignment';
-export var alignementMarkExclusionGroup = adfMarkGroup('alignmentMarkExclusion', [alignment]);

package/dist/esm/next-schema/groups/indentationMarkExclusionGroup.js

@@ -1,3 +0,0 @@
-import { adfMarkGroup } from '@atlaskit/adf-schema-generator';
-import { indentation } from '../marks/indentation';
-export var indentationMarkExclusionGroup = adfMarkGroup('indentationMarkExclusion', [indentation]);

package/dist/esm/next-schema/marks/alignment.js

@@ -1,12 +0,0 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
-import { indentationMarkExclusionGroup } from '../groups/indentationMarkExclusionGroup';
-export var alignment = adfMark('alignment').define({
-  excludes: [indentationMarkExclusionGroup],
-  attrs: {
-    align: {
-      type: 'enum',
-      values: ['center', 'end'],
-      default: 'center'
-    }
-  }
-});

package/dist/esm/next-schema/marks/indentation.js

@@ -1,12 +0,0 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
-import { alignementMarkExclusionGroup } from '../groups/alignementMarkExclusionGroup';
-export var indentation = adfMark('indentation').define({
-  excludes: [alignementMarkExclusionGroup],
-  attrs: {
-    level: {
-      type: 'number',
-      minimum: 0,
-      maximum: 6
-    }
-  }
-});

package/dist/types/next-schema/groups/alignementMarkExclusionGroup.d.ts

@@ -1 +0,0 @@
-export declare const alignementMarkExclusionGroup: import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkGroup").ADFMarkGroup;

package/dist/types/next-schema/groups/indentationMarkExclusionGroup.d.ts

@@ -1 +0,0 @@
-export declare const indentationMarkExclusionGroup: import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkGroup").ADFMarkGroup;

package/dist/types/next-schema/marks/alignment.d.ts

@@ -1 +0,0 @@
-export declare const alignment: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>;