@atlaskit/adf-schema 25.9.2 → 25.10.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 25.10.1
+
+### Patch Changes
+
+- [`54c95071cce`](https://bitbucket.org/atlassian/atlassian-frontend/commits/54c95071cce) - Move around order of BlockCardDefinition attribute variations.
+
+## 25.10.0
+
+### Minor Changes
+
+- [`d85c737c1e9`](https://bitbucket.org/atlassian/atlassian-frontend/commits/d85c737c1e9) - Memoize getSchemaBasedOnStage for improved performance on repeated invocations
+
 ## 25.9.2
 
 ### Patch Changes

package/dist/cjs/schema/default-schema.js

@@ -1,9 +1,11 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getSchemaBasedOnStage = exports.defaultSchemaConfig = exports.defaultSchema = void 0;
+var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _nodes = require("./nodes");
 var _marks = require("./marks");
 var _createSchema = require("./create-schema");
@@ -18,7 +20,7 @@ var getDefaultSchemaConfig = function getDefaultSchemaConfig() {
 };
 var defaultSchemaConfig = getDefaultSchemaConfig();
 exports.defaultSchemaConfig = defaultSchemaConfig;
-var getSchemaBasedOnStage = function getSchemaBasedOnStage() {
+var getSchemaBasedOnStage = (0, _memoizeOne.default)(function () {
   var stage = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'final';
   var defaultSchemaConfig = getDefaultSchemaConfig();
   if (stage === 'stage0') {
@@ -31,7 +33,7 @@ var getSchemaBasedOnStage = function getSchemaBasedOnStage() {
     };
   }
   return (0, _createSchema.createSchema)(defaultSchemaConfig);
-};
+});
 exports.getSchemaBasedOnStage = getSchemaBasedOnStage;
 var defaultSchema = getSchemaBasedOnStage();
 exports.defaultSchema = defaultSchema;

package/dist/cjs/schema/nodes/block-card.js

@@ -42,10 +42,10 @@ var blockCard = {
     datasource: {
       default: null
     },
-    layout: {
+    width: {
       default: null
     },
-    width: {
+    layout: {
       default: null
     }
   },

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "25.9.2",
+	"version": "25.10.1",
 	"sideEffects": false
 }

package/dist/es2019/schema/default-schema.js

@@ -1,3 +1,4 @@
+import memoizeOne from 'memoize-one';
 import { layoutSectionWithSingleColumn, tableWithCustomWidth } from './nodes';
 import { border } from './marks';
 import { createSchema } from './create-schema';
@@ -11,7 +12,7 @@ const getDefaultSchemaConfig = () => {
   return defaultSchemaConfig;
 };
 export const defaultSchemaConfig = getDefaultSchemaConfig();
-export const getSchemaBasedOnStage = (stage = 'final') => {
+export const getSchemaBasedOnStage = memoizeOne((stage = 'final') => {
   const defaultSchemaConfig = getDefaultSchemaConfig();
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
@@ -23,5 +24,5 @@ export const getSchemaBasedOnStage = (stage = 'final') => {
     };
   }
   return createSchema(defaultSchemaConfig);
-};
+});
 export const defaultSchema = getSchemaBasedOnStage();

package/dist/es2019/schema/nodes/block-card.js

@@ -32,10 +32,10 @@ export const blockCard = {
     datasource: {
       default: null
     },
-    layout: {
+    width: {
       default: null
     },
-    width: {
+    layout: {
       default: null
     }
   },

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "25.9.2",
+	"version": "25.10.1",
 	"sideEffects": false
 }

package/dist/esm/schema/default-schema.js

@@ -1,3 +1,4 @@
+import memoizeOne from 'memoize-one';
 import { layoutSectionWithSingleColumn, tableWithCustomWidth } from './nodes';
 import { border } from './marks';
 import { createSchema } from './create-schema';
@@ -11,7 +12,7 @@ var getDefaultSchemaConfig = function getDefaultSchemaConfig() {
   return defaultSchemaConfig;
 };
 export var defaultSchemaConfig = getDefaultSchemaConfig();
-export var getSchemaBasedOnStage = function getSchemaBasedOnStage() {
+export var getSchemaBasedOnStage = memoizeOne(function () {
   var stage = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'final';
   var defaultSchemaConfig = getDefaultSchemaConfig();
   if (stage === 'stage0') {
@@ -24,5 +25,5 @@ export var getSchemaBasedOnStage = function getSchemaBasedOnStage() {
     };
   }
   return createSchema(defaultSchemaConfig);
-};
+});
 export var defaultSchema = getSchemaBasedOnStage();

package/dist/esm/schema/nodes/block-card.js

@@ -35,10 +35,10 @@ export var blockCard = {
     datasource: {
       default: null
     },
-    layout: {
+    width: {
       default: null
     },
-    width: {
+    layout: {
       default: null
     }
   },

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "25.9.2",
+	"version": "25.10.1",
 	"sideEffects": false
 }

package/dist/json-schema/v1/stage-0.json

@@ -725,28 +725,6 @@
         },
         "attrs": {
           "anyOf": [
-            {
-              "type": "object",
-              "properties": {
-                "url": {
-                  "type": "string"
-                }
-              },
-              "required": [
-                "url"
-              ],
-              "additionalProperties": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "data": {}
-              },
-              "required": [
-                "data"
-              ],
-              "additionalProperties": false
-            },
             {
               "type": "object",
               "properties": {
@@ -804,6 +782,28 @@
               "required": [
                 "datasource"
               ]
+            },
+            {
+              "type": "object",
+              "properties": {
+                "url": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "url"
+              ],
+              "additionalProperties": false
+            },
+            {
+              "type": "object",
+              "properties": {
+                "data": {}
+              },
+              "required": [
+                "data"
+              ],
+              "additionalProperties": false
             }
           ]
         }

package/dist/types/schema/default-schema.d.ts

@@ -2,6 +2,6 @@ import { SchemaConfig } from './create-schema';
 type DefaultSchemaNodes = 'doc' | 'paragraph' | 'text' | 'bulletList' | 'orderedList' | 'listItem' | 'heading' | 'blockquote' | 'codeBlock' | 'panel' | 'rule' | 'image' | 'mention' | 'media' | 'caption' | 'mediaGroup' | 'mediaSingle' | 'mediaInline' | 'confluenceUnsupportedBlock' | 'confluenceUnsupportedInline' | 'confluenceJiraIssue' | 'expand' | 'nestedExpand' | 'extension' | 'inlineExtension' | 'bodiedExtension' | 'hardBreak' | 'emoji' | 'table' | 'tableCell' | 'tableHeader' | 'tableRow' | 'decisionList' | 'decisionItem' | 'taskList' | 'taskItem' | 'unknownBlock' | 'date' | 'status' | 'placeholder' | 'layoutSection' | 'layoutColumn' | 'inlineCard' | 'blockCard' | 'embedCard' | 'unsupportedBlock' | 'unsupportedInline';
 type DefaultSchemaMarks = 'link' | 'em' | 'strong' | 'strike' | 'subsup' | 'underline' | 'code' | 'textColor' | 'confluenceInlineComment' | 'breakout' | 'alignment' | 'indentation' | 'annotation' | 'unsupportedMark' | 'unsupportedNodeAttribute' | 'typeAheadQuery' | 'dataConsumer' | 'fragment';
 export declare const defaultSchemaConfig: SchemaConfig<DefaultSchemaNodes, DefaultSchemaMarks>;
-export declare const getSchemaBasedOnStage: (stage?: string) => import("prosemirror-model").Schema<DefaultSchemaNodes, DefaultSchemaMarks>;
+export declare const getSchemaBasedOnStage: import("memoize-one").MemoizedFn<(this: any, stage?: any) => import("prosemirror-model").Schema<DefaultSchemaNodes, DefaultSchemaMarks>>;
 export declare const defaultSchema: import("prosemirror-model").Schema<DefaultSchemaNodes, DefaultSchemaMarks>;
 export {};

package/dist/types/schema/nodes/block-card.d.ts

@@ -39,6 +39,6 @@ export type CardAttributes = UrlType | DataType;
  */
 export interface BlockCardDefinition {
     type: 'blockCard';
-    attrs: CardAttributes | DatasourceAttributes;
+    attrs: DatasourceAttributes | CardAttributes;
 }
 export declare const blockCard: NodeSpec;

package/dist/types-ts4.5/schema/default-schema.d.ts

@@ -2,6 +2,6 @@ import { SchemaConfig } from './create-schema';
 type DefaultSchemaNodes = 'doc' | 'paragraph' | 'text' | 'bulletList' | 'orderedList' | 'listItem' | 'heading' | 'blockquote' | 'codeBlock' | 'panel' | 'rule' | 'image' | 'mention' | 'media' | 'caption' | 'mediaGroup' | 'mediaSingle' | 'mediaInline' | 'confluenceUnsupportedBlock' | 'confluenceUnsupportedInline' | 'confluenceJiraIssue' | 'expand' | 'nestedExpand' | 'extension' | 'inlineExtension' | 'bodiedExtension' | 'hardBreak' | 'emoji' | 'table' | 'tableCell' | 'tableHeader' | 'tableRow' | 'decisionList' | 'decisionItem' | 'taskList' | 'taskItem' | 'unknownBlock' | 'date' | 'status' | 'placeholder' | 'layoutSection' | 'layoutColumn' | 'inlineCard' | 'blockCard' | 'embedCard' | 'unsupportedBlock' | 'unsupportedInline';
 type DefaultSchemaMarks = 'link' | 'em' | 'strong' | 'strike' | 'subsup' | 'underline' | 'code' | 'textColor' | 'confluenceInlineComment' | 'breakout' | 'alignment' | 'indentation' | 'annotation' | 'unsupportedMark' | 'unsupportedNodeAttribute' | 'typeAheadQuery' | 'dataConsumer' | 'fragment';
 export declare const defaultSchemaConfig: SchemaConfig<DefaultSchemaNodes, DefaultSchemaMarks>;
-export declare const getSchemaBasedOnStage: (stage?: string) => import("prosemirror-model").Schema<DefaultSchemaNodes, DefaultSchemaMarks>;
+export declare const getSchemaBasedOnStage: import("memoize-one").MemoizedFn<(this: any, stage?: any) => import("prosemirror-model").Schema<DefaultSchemaNodes, DefaultSchemaMarks>>;
 export declare const defaultSchema: import("prosemirror-model").Schema<DefaultSchemaNodes, DefaultSchemaMarks>;
 export {};

package/dist/types-ts4.5/schema/nodes/block-card.d.ts

@@ -39,6 +39,6 @@ export type CardAttributes = UrlType | DataType;
  */
 export interface BlockCardDefinition {
     type: 'blockCard';
-    attrs: CardAttributes | DatasourceAttributes;
+    attrs: DatasourceAttributes | CardAttributes;
 }
 export declare const blockCard: NodeSpec;

package/json-schema/v1/stage-0.json

@@ -725,28 +725,6 @@
         },
         "attrs": {
           "anyOf": [
-            {
-              "type": "object",
-              "properties": {
-                "url": {
-                  "type": "string"
-                }
-              },
-              "required": [
-                "url"
-              ],
-              "additionalProperties": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "data": {}
-              },
-              "required": [
-                "data"
-              ],
-              "additionalProperties": false
-            },
             {
               "type": "object",
               "properties": {
@@ -804,6 +782,28 @@
               "required": [
                 "datasource"
               ]
+            },
+            {
+              "type": "object",
+              "properties": {
+                "url": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "url"
+              ],
+              "additionalProperties": false
+            },
+            {
+              "type": "object",
+              "properties": {
+                "data": {}
+              },
+              "required": [
+                "data"
+              ],
+              "additionalProperties": false
             }
           ]
         }

package/package.json

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