@atlaskit/adf-schema 37.1.39 → 37.1.41

package/dist/types/validator-schema/utils/sortNestedArrays.d.ts

@@ -0,0 +1 @@
+export declare function sortNestedArrays<T>(obj: T): T;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "37.1.39",
+  "version": "37.1.41",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -35,6 +35,7 @@
     "build": "yarn clean: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 && prettier --write './src/next-schema/generated/**/*.ts'",
     "build:json:full": "yarn ts-node ./schema-generators/json-full-schema.ts",
+    "build:validator:full": "yarn ts-node ./schema-generators/validator-full-schema.ts && prettier --write './src/validator-schema/generated/**/*.ts'",
     "clean": "../../scripts/build-clean.sh",
     "link:afe": "yarn build:all && node ./copy-dist-to-afe.js"
   },
@@ -47,7 +48,7 @@
   },
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.16.0",
-    "@atlaskit/adf-schema-generator": "^1.25.9",
+    "@atlaskit/adf-schema-generator": "^1.25.10",
     "@atlaskit/adf-utils": "^19.2.2",
     "@atlaskit/codemod-utils": "^4.2.4",
     "@atlaskit/json-schema-generator": "^3.3.9",

package/schema-generators/__tests__/unit/adfToValidatorSpecValidation.unit.ts

@@ -1,12 +1,10 @@
 import { adfToValidatorSpec } from '@atlaskit/adf-schema-generator';
 import * as currentSpecs from '@atlaskit/adf-utils/dist/cjs/validator/specs';
 import adfNode from '../../../src/next-schema/full-schema.adf';
+import { sortNestedArrays } from '../../../src/validator-schema/utils/sortNestedArrays';
 
 const newSpecs = sortNestedArrays(adfToValidatorSpec(adfNode));
 const SKIP_LIST = [
-  'layoutSection_with_single_column', // doesn't exist in the output
-  'nestedExpand', // doesn't match existing spec
-
   'atomic_inline', // doesn't exist in the output, not even used anywhere...
   'nestedExpand_content', // doesn't exist in the output, completely different format from other groups
   'tableCell_content', // doesn't exist in the output, completely different format from other groups
@@ -26,38 +24,3 @@ testCases.forEach(({ name, currentSpec, newSpec }) => {
     expect(newSpec).toEqual(currentSpec);
   });
 });
-
-function sortNestedArrays(obj: any): any {
-  if (obj === null || obj === undefined) {
-    return obj;
-  }
-
-  if (
-    Array.isArray(obj) &&
-    typeof obj[0] === 'string' &&
-    typeof obj[1] === 'object'
-  ) {
-    // 1. tuple of object + string
-    obj[1] = sortNestedArrays(obj[1]);
-  } else if (Array.isArray(obj) && Array.isArray(obj[0])) {
-    // 2. array of arrays
-    for (let i = 0; i < obj.length; i++) {
-      obj[i] = sortNestedArrays(obj[i]);
-    }
-  } else if (
-    Array.isArray(obj) &&
-    !Array.isArray(obj[0]) &&
-    typeof obj[0] !== 'object'
-  ) {
-    // 3. simple array
-    obj.sort();
-  }
-  if (typeof obj === 'object') {
-    // 4. object
-    for (const key of Object.keys(obj)) {
-      obj[key] = sortNestedArrays(obj[key]);
-    }
-  }
-
-  return obj;
-}

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

@@ -0,0 +1,22 @@
+import {
+  adfToValidatorSpec,
+  writeToFile,
+} from '@atlaskit/adf-schema-generator';
+import adfNode from 'src/next-schema/full-schema.adf';
+import { sortNestedArrays } from 'src/validator-schema/utils/sortNestedArrays';
+
+function generateValidatorSpec() {
+  const output = sortNestedArrays(adfToValidatorSpec(adfNode));
+  return Object.entries(output)
+    .map(
+      ([key, value]) => `export const ${key} = ${JSON.stringify(value.json)};`,
+    )
+    .join('\n\n');
+}
+
+function main() {
+  const spec = generateValidatorSpec();
+  writeToFile('validatorSpec', spec, 'validator-schema');
+}
+
+main();