@atlaskit/adf-schema 36.9.0 → 36.9.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 36.9.2
+
+### Patch Changes
+
+- 6e9e5d6: migrated uuid function to use uuid npm package instead of custom random logic
+
+## 36.9.1
+
+### Patch Changes
+
+- c55acf7: fix circlue deps issue in link mark | minor dsl update
+
 ## 36.9.0
 
 ### Minor Changes

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

@@ -15,4 +15,6 @@ var _text = require("../nodes/text");
 var _status = require("../nodes/status");
 var _inlineExtension = require("../nodes/inlineExtension");
 var _mediaInline = require("../nodes/mediaInline");
-var inlineGroup = exports.inlineGroup = (0, _adfSchemaGenerator.adfNodeGroup)('inline', [_text.text, _date.date, _emoji.emoji, _hardBreak.hardBreak, _inlineCard.inlineCard, _mention.mention, _placeholder.placeholder, _status.status, _text.text.use('code_inline'), _inlineExtension.inlineExtension, _inlineExtension.inlineExtension.use('with_marks'), _mediaInline.mediaInline]);
+var inlineGroup = exports.inlineGroup = (0, _adfSchemaGenerator.adfNodeGroup)('inline', [
+// text,
+_text.text.use('formatted'), _text.text.use('code_inline'), _date.date, _emoji.emoji, _hardBreak.hardBreak, _inlineCard.inlineCard, _mention.mention, _placeholder.placeholder, _status.status, _inlineExtension.inlineExtension, _inlineExtension.inlineExtension.use('with_marks'), _mediaInline.mediaInline]);

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

@@ -5,9 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.link = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var _linkMarkGroup = require("../groups/linkMarkGroup");
-var link = exports.link = (0, _adfSchemaGenerator.adfMark)('link').define({
-  excludes: [_linkMarkGroup.linkMarkGroup],
+var link = exports.link = (0, _adfSchemaGenerator.adfMark)('link');
+
+// import { linkMarketGroup } from '../groups/linkMarkGroup' would cause circular deps issue
+var linkMarkGroup = (0, _adfSchemaGenerator.adfMarkGroup)('link', [link]);
+link.define({
+  // it seems unnessary to have it here?
+  excludes: [linkMarkGroup],
   inclusive: false,
   attrs: {
     href: {

package/dist/cjs/utils/uuid.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.uuid = exports.generateUuid = void 0;
-/* eslint-disable no-bitwise */
+var _uuid = require("uuid");
 var generateUuid = exports.generateUuid = function generateUuid() {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-    var r = Math.random() * 16 | 0;
-    return (c === 'x' ? r : r & 0x3 | 0x8).toString(16);
-  });
+  return (0, _uuid.v4)();
 };
-/* eslint-enable no-bitwise */
-
 var staticValue = false;
 var uuid = exports.uuid = {
   setStatic: function setStatic(value) {

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

@@ -9,4 +9,6 @@ import { text } from '../nodes/text';
 import { status } from '../nodes/status';
 import { inlineExtension } from '../nodes/inlineExtension';
 import { mediaInline } from '../nodes/mediaInline';
-export const inlineGroup = adfNodeGroup('inline', [text, date, emoji, hardBreak, inlineCard, mention, placeholder, status, text.use('code_inline'), inlineExtension, inlineExtension.use('with_marks'), mediaInline]);
+export const inlineGroup = adfNodeGroup('inline', [
+// text,
+text.use('formatted'), text.use('code_inline'), date, emoji, hardBreak, inlineCard, mention, placeholder, status, inlineExtension, inlineExtension.use('with_marks'), mediaInline]);

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

@@ -1,6 +1,10 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
-import { linkMarkGroup } from '../groups/linkMarkGroup';
-export const link = adfMark('link').define({
+import { adfMark, adfMarkGroup } from '@atlaskit/adf-schema-generator';
+export const link = adfMark('link');
+
+// import { linkMarketGroup } from '../groups/linkMarkGroup' would cause circular deps issue
+const linkMarkGroup = adfMarkGroup('link', [link]);
+link.define({
+  // it seems unnessary to have it here?
   excludes: [linkMarkGroup],
   inclusive: false,
   attrs: {

package/dist/es2019/utils/uuid.js

@@ -1,10 +1,7 @@
-/* eslint-disable no-bitwise */
-export const generateUuid = () => 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
-  const r = Math.random() * 16 | 0;
-  return (c === 'x' ? r : r & 0x3 | 0x8).toString(16);
-});
-/* eslint-enable no-bitwise */
-
+import { v4 as uuidGen } from 'uuid';
+export const generateUuid = () => {
+  return uuidGen();
+};
 let staticValue = false;
 export const uuid = {
   setStatic(value) {

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

@@ -9,4 +9,6 @@ import { text } from '../nodes/text';
 import { status } from '../nodes/status';
 import { inlineExtension } from '../nodes/inlineExtension';
 import { mediaInline } from '../nodes/mediaInline';
-export var inlineGroup = adfNodeGroup('inline', [text, date, emoji, hardBreak, inlineCard, mention, placeholder, status, text.use('code_inline'), inlineExtension, inlineExtension.use('with_marks'), mediaInline]);
+export var inlineGroup = adfNodeGroup('inline', [
+// text,
+text.use('formatted'), text.use('code_inline'), date, emoji, hardBreak, inlineCard, mention, placeholder, status, inlineExtension, inlineExtension.use('with_marks'), mediaInline]);

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

@@ -1,6 +1,10 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
-import { linkMarkGroup } from '../groups/linkMarkGroup';
-export var link = adfMark('link').define({
+import { adfMark, adfMarkGroup } from '@atlaskit/adf-schema-generator';
+export var link = adfMark('link');
+
+// import { linkMarketGroup } from '../groups/linkMarkGroup' would cause circular deps issue
+var linkMarkGroup = adfMarkGroup('link', [link]);
+link.define({
+  // it seems unnessary to have it here?
   excludes: [linkMarkGroup],
   inclusive: false,
   attrs: {

package/dist/esm/utils/uuid.js

@@ -1,12 +1,7 @@
-/* eslint-disable no-bitwise */
+import { v4 as uuidGen } from 'uuid';
 export var generateUuid = function generateUuid() {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-    var r = Math.random() * 16 | 0;
-    return (c === 'x' ? r : r & 0x3 | 0x8).toString(16);
-  });
+  return uuidGen();
 };
-/* eslint-enable no-bitwise */
-
 var staticValue = false;
 export var uuid = {
   setStatic: function setStatic(value) {

package/dist/types/utils/uuid.d.ts

@@ -1,5 +1,5 @@
-export declare const generateUuid: () => string;
+export declare const generateUuid: () => any;
 export declare const uuid: {
     setStatic(value: string | false): void;
-    generate(): string;
+    generate(): any;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "36.9.0",
+  "version": "36.9.2",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -28,7 +28,7 @@
     "build:jsontypes": "mkdir -p dist/types/json-schema && cp src/json-schema/index.ts dist/types/json-schema/index.d.ts",
     "build:all": "yarn build:cjs && yarn build:esm && yarn build:es2019 && yarn build:types",
     "build": "yarn workspace @atlaskit/editor-prosemirror build && yarn workspace @atlaskit/adf-schema-generator build && yarn run build:all && yarn run generate:json-schema && yarn run build:json-schema",
-    "build:pm:full": "yarn ts-node ./schema-generators/pm-full-schema.ts",
+    "build:pm:full": "yarn ts-node ./schema-generators/pm-full-schema.ts && prettier --write '../adf-schema-generator/src/generated/**/*.ts'",
     "build:json:full": "yarn ts-node ./schema-generators/json-full-schema.ts",
     "clean": "../../scripts/build-clean.sh",
     "link:afe": "yarn build:all && node ./copy-dist-to-afe.js"
@@ -40,11 +40,12 @@
     "@babel/runtime": "^7.0.0",
     "css-color-names": "0.0.4",
     "linkify-it": "^2.0.3",
-    "memoize-one": "^6.0.0"
+    "memoize-one": "^6.0.0",
+    "uuid": "^9.0.1"
   },
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.15.0",
-    "@atlaskit/adf-schema-generator": "^1.7.4",
+    "@atlaskit/adf-schema-generator": "^1.7.5",
     "@babel/cli": "^7.22.9",
     "@babel/core": "^7.22.9",
     "@babel/plugin-proposal-class-properties": "^7.18.6",

package/schema-generators/pm-full-schema.ts

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