@atlaskit/adf-schema 37.1.26 → 37.1.28

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 37.1.28
+
+### Patch Changes
+
+- 9f0af09: Fix inlineCard validator spec from DSL.
+
+## 37.1.27
+
+### Patch Changes
+
+- 8d8dd32: Fix exception to layoutSection node for validator spec from DSL.
+
 ## 37.1.26
 
 ### Patch Changes

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

@@ -17,7 +17,8 @@ var inlineCard = exports.inlineCard = (0, _adfSchemaGenerator.adfNode)('inlineCa
     anyOf: [{
       url: {
         type: 'string',
-        default: null
+        default: null,
+        validatorFn: 'safeUrl'
       }
     }, {
       data: {
@@ -25,6 +26,18 @@ var inlineCard = exports.inlineCard = (0, _adfSchemaGenerator.adfNode)('inlineCa
         default: null
       }
     }]
+  },
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      'props.marks': {
+        reason: '@DSLCompatibilityException - Annotation mark is in variant, but not full schema. However this has been added for compatibility with current validator.',
+        value: {
+          items: ['annotation'],
+          optional: true,
+          type: 'array'
+        }
+      }
+    }
   }
 }).variant('with_annotation', {
   marks: [_annotation.annotation, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark]

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

@@ -20,6 +20,12 @@ var layoutSection = exports.layoutSection = (0, _adfSchemaGenerator.adfNode)('la
         value: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
         reason: "The content expression is not correct or redundant around 'unsupportedBlock* | unsupportedBlock+'. This case is not supported by the DSL. Also in JSON schema there is no range for the items, so theres a mismatch between JSON and PM."
       }
+    },
+    'validator-spec': {
+      'props.content.allowUnsupportedBlock': {
+        remove: true,
+        reason: '@DSLCompatibilityException - mismatch for layoutSection'
+      }
     }
   }
 }).variant('full', {

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

@@ -11,7 +11,8 @@ export const inlineCard = adfNode('inlineCard').define({
     anyOf: [{
       url: {
         type: 'string',
-        default: null
+        default: null,
+        validatorFn: 'safeUrl'
       }
     }, {
       data: {
@@ -19,6 +20,18 @@ export const inlineCard = adfNode('inlineCard').define({
         default: null
       }
     }]
+  },
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      'props.marks': {
+        reason: '@DSLCompatibilityException - Annotation mark is in variant, but not full schema. However this has been added for compatibility with current validator.',
+        value: {
+          items: ['annotation'],
+          optional: true,
+          type: 'array'
+        }
+      }
+    }
   }
 }).variant('with_annotation', {
   marks: [annotation, unsupportedNodeAttribute, unsupportedMark]

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

@@ -14,6 +14,12 @@ export const layoutSection = adfNode('layoutSection').define({
         value: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
         reason: `The content expression is not correct or redundant around 'unsupportedBlock* | unsupportedBlock+'. This case is not supported by the DSL. Also in JSON schema there is no range for the items, so theres a mismatch between JSON and PM.`
       }
+    },
+    'validator-spec': {
+      'props.content.allowUnsupportedBlock': {
+        remove: true,
+        reason: '@DSLCompatibilityException - mismatch for layoutSection'
+      }
     }
   }
 }).variant('full', {

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

@@ -11,7 +11,8 @@ export var inlineCard = adfNode('inlineCard').define({
     anyOf: [{
       url: {
         type: 'string',
-        default: null
+        default: null,
+        validatorFn: 'safeUrl'
       }
     }, {
       data: {
@@ -19,6 +20,18 @@ export var inlineCard = adfNode('inlineCard').define({
         default: null
       }
     }]
+  },
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      'props.marks': {
+        reason: '@DSLCompatibilityException - Annotation mark is in variant, but not full schema. However this has been added for compatibility with current validator.',
+        value: {
+          items: ['annotation'],
+          optional: true,
+          type: 'array'
+        }
+      }
+    }
   }
 }).variant('with_annotation', {
   marks: [annotation, unsupportedNodeAttribute, unsupportedMark]

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

@@ -14,6 +14,12 @@ export var layoutSection = adfNode('layoutSection').define({
         value: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
         reason: "The content expression is not correct or redundant around 'unsupportedBlock* | unsupportedBlock+'. This case is not supported by the DSL. Also in JSON schema there is no range for the items, so theres a mismatch between JSON and PM."
       }
+    },
+    'validator-spec': {
+      'props.content.allowUnsupportedBlock': {
+        remove: true,
+        reason: '@DSLCompatibilityException - mismatch for layoutSection'
+      }
     }
   }
 }).variant('full', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "37.1.26",
+  "version": "37.1.28",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

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

@@ -9,10 +9,7 @@ const SKIP_LIST = [
   'doc', // doesn't match existing spec, need to flatten groups
   'expand', // doesn't match existing spec
   'extensionFrame', // doesn't match existing spec
-  'inlineCard', // doesn't match existing spec
-  'inlineExtension', // doesn't exist in the output
   'inline_comment_marker', // doesn't exist in the output
-  'layoutSection', // doesn't match existing spec, maxItem/minItem, extra marks
   'layoutSection_full', // doesn't match existing spec, allowUnsupportedBlock, extra marks
   'layoutSection_with_single_column', // doesn't exist in the output
   'media', // doesn't match existing spec