npm - @atlaskit/adf-schema - Versions diffs - 28.1.9 → 28.1.11 - Mend

@atlaskit/adf-schema 28.1.9 → 28.1.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (300) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
+## 28.1.11
+### Patch Changes
+- 54cb9cc: ADFEXP-542: rename @atlaskit/adf-schema-json to @atlassian/adf-schema-json
+## 28.1.10
+### Patch Changes
+- 1f0ccea: move JSON schema files from adf-schema to a new package adf-schema-json
 ## 28.1.9
 ### Patch Changes

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "28.1.9",
+  "version": "28.1.11",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -20,7 +20,7 @@
     "generate:json-schema:full": "json-schema-generator --outDir=./json-schema/v1/ ./src/schema/nodes/doc.ts",
     "ak-postbuild": "yarn build:json-schema",
     "test": "yarn test:unit",
-    "test:unit": "yarn jest --testPathPattern=adf-schema/src --config=../../jest.config.js",
+    "test:unit": "yarn workspace @atlaskit/editor-prosemirror build && jest --testPathPattern=adf-schema/src --config=../../jest.config.js",
     "build:cjs": "NODE_ENV=production BABEL_ENV=production:node-cjs babel --config-file ../../babel.config.js src --out-dir dist/cjs -x .ts,.tsx",
     "build:esm": "NODE_ENV=production BABEL_ENV=production:esm babel --config-file ../../babel.config.js src -d dist/esm -x .ts,.tsx",
     "build:es2019": "NODE_ENV=production BABEL_ENV=production:es2019 babel --config-file ../../babel.config.js src -d dist/es2019 -x .ts,.tsx",
@@ -42,6 +42,7 @@
     "memoize-one": "^6.0.0"
   },
   "devDependencies": {
+    "@atlassian/adf-schema-json": "^1.0.2",
     "@babel/cli": "^7.22.9",
     "@babel/core": "^7.22.9",
     "@babel/plugin-proposal-class-properties": "^7.18.6",

package/src/__tests__/unit/json-schema/v1.ts CHANGED Viewed

@@ -1,9 +1,15 @@
 import { initialize } from 'adf-test-helpers/src/ajv';
-import { readFilesSync } from 'adf-test-helpers/src/adf-schema';
 import v1SchemaFull from '../../../../json-schema/v1/full.json';
 import v1SchemaStage0 from '../../../../json-schema/v1/stage-0.json';
+import {
+  fullValidJsonSchema,
+  fullInvalidJsonSchema,
+  stage0ValidJsonSchema,
+  stage0InvalidJsonSchema,
+} from '@atlassian/adf-schema-json';
 const ajv = initialize();
 const packageName = process.env._PACKAGE_NAME_ as string;
@@ -11,9 +17,8 @@ describe(`${packageName} json-schema v1`, () => {
   const validateFull = ajv.compile(v1SchemaFull);
   const validateStage0 = ajv.compile(v1SchemaStage0);
-  const valid = readFilesSync(`${__dirname}/v1-reference/full/valid`);
   describe('full', () => {
-    for (const file of valid) {
+    for (const file of fullValidJsonSchema) {
       it(`validates '${file.name}'`, () => {
         validateFull(file.data);
         expect(validateFull.errors).toEqual(null);
@@ -23,8 +28,7 @@ describe(`${packageName} json-schema v1`, () => {
       });
     }
-    const invalid = readFilesSync(`${__dirname}/v1-reference/full/invalid`);
-    for (const file of invalid) {
+    for (const file of fullInvalidJsonSchema) {
       it(`does not validate '${file.name}'`, () => {
         expect(validateFull(file.data)).toEqual(false);
       });
@@ -32,8 +36,7 @@ describe(`${packageName} json-schema v1`, () => {
   });
   describe('stage-0', () => {
-    const valid = readFilesSync(`${__dirname}/v1-reference/stage-0/valid`);
-    for (const file of valid) {
+    for (const file of stage0ValidJsonSchema) {
       it(`validates '${file.name}'`, () => {
         validateStage0(file.data);
         expect(validateStage0.errors).toEqual(null);
@@ -43,8 +46,7 @@ describe(`${packageName} json-schema v1`, () => {
       });
     }
-    const invalid = readFilesSync(`${__dirname}/v1-reference/stage-0/invalid`);
-    for (const file of invalid) {
+    for (const file of stage0InvalidJsonSchema) {
       it(`does not validate '${file.name}'`, () => {
         expect(validateStage0(file.data)).toEqual(false);
       });

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/blockQuote-with-attrs.json DELETED Viewed

@@ -1,17 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "blockquote",
-      "content": [{
-        "type": "paragraph",
-        "content": [{
-          "type": "text",
-          "text": "foo"
-        }]
-      }],
-      "attrs": {}
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/blockQuote-with-empty-content.json DELETED Viewed

@@ -1,10 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "blockquote",
-      "content": []
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/blockQuote-with-marks.json DELETED Viewed

@@ -1,17 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "blockquote",
-      "content": [{
-        "type": "paragraph",
-        "content": [{
-          "type": "text",
-          "text": "foo"
-        }]
-      }],
-      "marks": []
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/blockQuote-without-content.json DELETED Viewed

@@ -1,9 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "blockquote"
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/blockquote-with-list-inside.json DELETED Viewed

@@ -1,24 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "blockquote",
-      "content": [{
-        "type": "bulletList",
-        "content": [{
-          "type": "listItem",
-          "content": [
-            {
-              "type": "paragraph",
-              "content": [{
-                "type": "text",
-                "text": "foo"
-              }]
-            }
-          ]}
-        ]}
-      ]
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/bodied-extension-with-nested-bodiedExtension.json DELETED Viewed

@@ -1,28 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "bodiedExtension",
-      "attrs": {
-        "extensionType": "com.atlassian.confluence.macro.core",
-        "extensionKey": "expand"
-      },
-      "content": [
-        {
-          "type": "bodiedExtension",
-          "attrs": {
-            "extensionType": "com.atlassian.confluence.macro.core",
-            "extensionKey": "expand"
-          },
-          "content": [
-            {
-              "type": "paragraph",
-              "content": []
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/bodied-extension-without-content.json DELETED Viewed

@@ -1,13 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "bodiedExtension",
-      "attrs": {
-        "extensionType": "com.atlassian.confluence.macro",
-        "extensionKey": "expand"
-      }
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/bodied-extension-without-extensionKey.json DELETED Viewed

@@ -1,18 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "bodiedExtension",
-      "attrs": {
-        "extensionType": "com.atlassian.confluence.macro"
-      },
-      "content": [
-        {
-          "type": "paragraph",
-          "content": []
-        }
-      ]
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/bodied-extension-without-extensionType.json DELETED Viewed

@@ -1,18 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "bodiedExtension",
-      "attrs": {
-        "extensionKey": "expand"
-      },
-      "content": [
-        {
-          "type": "paragraph",
-          "content": []
-        }
-      ]
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/bulletList-with-attrs.json DELETED Viewed

@@ -1,17 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "bulletList",
-      "content": [{
-        "type": "paragraph",
-        "content": [{
-          "type": "text",
-          "text": "foo"
-        }]
-      }],
-      "attrs": {}
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/bulletList-with-empty-content.json DELETED Viewed

@@ -1,10 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "bulletList",
-      "content": []
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/bulletList-with-marks.json DELETED Viewed

@@ -1,24 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "bulletList",
-      "content": [
-        {
-          "type": "listItem",
-          "content": [
-            {
-              "type": "paragraph",
-              "content": [{
-                "type": "text",
-                "text": "foo"
-              }]
-            }
-          ]
-        }
-      ],
-      "marks": []
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/bulletList-with-not-listItem-content.json DELETED Viewed

@@ -1,18 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "bulletList",
-      "content": [
-        {
-          "type": "paragraph",
-          "content": [{
-            "type": "text",
-            "text": "foo"
-          }]
-        }
-      ]
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/bulletList-without-content.json DELETED Viewed

@@ -1,9 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "bulletList"
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/code-and-em.json DELETED Viewed

@@ -1,23 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "paragraph",
-      "content": [
-        {
-          "type": "text",
-          "text": "Foo",
-          "marks": [
-            {
-              "type": "code"
-            },
-            {
-              "type": "em"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/code-and-strike.json DELETED Viewed

@@ -1,23 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "paragraph",
-      "content": [
-        {
-          "type": "text",
-          "text": "Foo",
-          "marks": [
-            {
-              "type": "code"
-            },
-            {
-              "type": "strike"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/code-and-strong.json DELETED Viewed

@@ -1,23 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "paragraph",
-      "content": [
-        {
-          "type": "text",
-          "text": "Foo",
-          "marks": [
-            {
-              "type": "code"
-            },
-            {
-              "type": "strong"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/code-and-subsup.json DELETED Viewed

@@ -1,23 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "paragraph",
-      "content": [
-        {
-          "type": "text",
-          "text": "Foo",
-          "marks": [
-            {
-              "type": "code"
-            },
-            {
-              "type": "subsup"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/code-and-underline.json DELETED Viewed

@@ -1,23 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "paragraph",
-      "content": [
-        {
-          "type": "text",
-          "text": "Foo",
-          "marks": [
-            {
-              "type": "code"
-            },
-            {
-              "type": "underline"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/code-with-attrs.json DELETED Viewed

@@ -1,21 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "paragraph",
-      "content": [
-        {
-          "type": "text",
-          "text": "Foo",
-          "marks": [
-            {
-              "type": "code",
-              "attrs": {}
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/codeBlock-with-non-text.json DELETED Viewed

@@ -1,14 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "codeBlock",
-      "content": [
-        {
-          "type": "rule"
-        }
-      ]
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/codeBlock-with-strong.json DELETED Viewed

@@ -1,20 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "codeBlock",
-      "content": [
-        {
-          "type": "text",
-          "marks": [
-            {
-              "type": "strong"
-            }
-          ],
-          "text": "foo"
-        }
-      ]
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/codeBlock-with-unknown-attribute.json DELETED Viewed

@@ -1,13 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "codeBlock",
-      "content": [],
-      "attrs": {
-        "foo": "bar"
-      }
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/codeBlock-with-unsupported-marks.json DELETED Viewed

@@ -1,14 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "codeBlock",
-      "content": [],
-      "attrs": {
-        "language": "javascript"
-      },
-      "marks": [{ "type": "em" }]
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/decision-with-blockquote.json DELETED Viewed

@@ -1,31 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "decisionList",
-      "attrs": {
-        "localId": "test-list-id"
-      },
-      "content": [
-        {
-          "type": "decisionItem",
-          "attrs": {
-            "localId": "test-id",
-            "state": "DECIDED"
-          },
-          "content": [
-            {
-              "type": "blockquote",
-              "content": [
-                {
-                  "type": "rule"
-                }
-              ]
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/decisionList-with-empty-decision.json DELETED Viewed

@@ -1,23 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "decisionList",
-      "attrs": {
-        "order": 1,
-        "localId": "test-list-id"
-      },
-      "content": [
-        {
-          "type": "decisionItem",
-          "attrs": {
-            "localId": "test-id",
-            "state": "DECIDED"
-          },
-          "content": []
-        }
-      ]
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/decisionList-with-no-decision.json DELETED Viewed

@@ -1,13 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "decisionList",
-      "attrs": {
-        "order": 1
-      },
-      "content": []
-    }
-  ]
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/doc-with-attrs.json DELETED Viewed

@@ -1,10 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "rule"
-    }
-  ],
-  "attrs": {}
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/doc-with-marks.json DELETED Viewed

@@ -1,10 +0,0 @@
-{
-  "version": 1,
-  "type": "doc",
-  "content": [
-    {
-      "type": "rule"
-    }
-  ],
-  "marks": []
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/doc-without-content.json DELETED Viewed

@@ -1,4 +0,0 @@
-{
-  "version": 1,
-  "type": "doc"
-}

package/src/__tests__/unit/json-schema/v1-reference/full/invalid/doc-without-version.json DELETED Viewed

@@ -1,4 +0,0 @@
-{
-  "type": "doc",
-  "content": []
-}