@atlaskit/adf-schema 28.1.7 → 28.1.8

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/adf-schema
 
+## 28.1.8
+
+### Patch Changes
+
+- 29390f0: ADFEXP-516: fix import in set-selection test helper and fix override document unit test
+
 ## 28.1.7
 
 ### Patch Changes

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' | 'border' | 'unsupportedMark' | 'unsupportedNodeAttribute' | 'typeAheadQuery' | 'dataConsumer' | 'fragment';
 export declare const defaultSchemaConfig: SchemaConfig<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 declare const getSchemaBasedOnStage: import("memoize-one").MemoizedFn<(this: any, stage?: any) => Schema<N, M>>;
+export declare const defaultSchema: Schema<N, M>;
 export {};

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

@@ -18,7 +18,7 @@ export interface JIRASchemaConfig {
 /**
  * @deprecated [ED-15676] We have stopped supporting product specific schemas. Use `@atlaskit/adf-schema/schema-default` instead.
  **/
-export default function makeSchema(config: JIRASchemaConfig): Schema<string, string>;
+export default function makeSchema(config: JIRASchemaConfig): Schema<N, M>;
 /**
  * @deprecated [ED-15676] We have stopped supporting product specific schemas. Use `@atlaskit/adf-schema/schema-default` instead.
  **/

package/dist/types/schema/marks/data-consumer.d.ts

@@ -40,7 +40,7 @@ export declare const dataConsumer: MarkSpec;
  * `editor-json-transformer`(?)
  */
 export declare const toJSON: (mark: Mark) => {
-    type: string;
-    attrs: import("prosemirror-model").Attrs;
+    type: any;
+    attrs: any;
 };
 export {};

package/dist/types/schema/marks/fragment.d.ts

@@ -21,7 +21,7 @@ export interface FragmentMark extends Mark {
 }
 export declare const fragment: MarkSpec;
 export declare const toJSON: (mark: Mark) => {
-    type: string;
+    type: any;
     attrs: {
         name?: any;
         localId: any;

package/dist/types/schema/marks/link.d.ts

@@ -1,4 +1,4 @@
-import { MarkSpec, Mark } from '@atlaskit/editor-prosemirror/model';
+import { MarkSpec } from '@atlaskit/editor-prosemirror/model';
 export interface ConfluenceLinkMetadata {
     linkType: string;
     versionAtSave?: string | null;
@@ -30,6 +30,6 @@ export interface LinkDefinition {
 }
 export declare const link: MarkSpec;
 export declare const toJSON: (mark: Mark) => {
-    type: string;
+    type: any;
     attrs: Record<string, string>;
 };

package/dist/types/schema/nodes/bodied-extension.d.ts

@@ -1,4 +1,3 @@
-import { NodeSpec } from '@atlaskit/editor-prosemirror/model';
 import { ExtensionAttributes } from './types/extensions';
 import { MarksObject } from './types/mark';
 import { NonNestableBlockContent } from './types/non-nestable-block-content';

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

@@ -1,4 +1,4 @@
-import { NodeSpec, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { NodeSpec } from '@atlaskit/editor-prosemirror/model';
 import { TextDefinition as Text } from './text';
 import { BreakoutMarkDefinition } from '../marks/breakout';
 import { MarksObject, NoMark } from './types/mark';

package/dist/types/schema/nodes/expand.d.ts

@@ -1,4 +1,4 @@
-import { NodeSpec, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { NodeSpec } from '@atlaskit/editor-prosemirror/model';
 import { BreakoutMarkDefinition } from '../marks';
 import { MarksObject, NoMark } from './types/mark';
 import { NonNestableBlockContent } from './types/non-nestable-block-content';
@@ -27,5 +27,5 @@ export type ExpandDefinition = ExpandBaseDefinition & NoMark;
 export type ExpandWithBreakoutDefinition = ExpandBaseDefinition & MarksObject<BreakoutMarkDefinition>;
 export declare const expand: NodeSpec;
 export declare const toJSON: (node: PMNode) => {
-    attrs: import("prosemirror-model").Attrs;
+    attrs: any;
 };

package/dist/types/schema/nodes/extension.d.ts

@@ -1,4 +1,3 @@
-import { NodeSpec } from '@atlaskit/editor-prosemirror/model';
 import { ExtensionAttributes } from './types/extensions';
 import { MarksObject } from './types/mark';
 import { DataConsumerDefinition } from '../marks/data-consumer';

package/dist/types/schema/nodes/inline-extension.d.ts

@@ -1,4 +1,3 @@
-import { NodeSpec } from '@atlaskit/editor-prosemirror/model';
 import { InlineExtensionAttributes } from './types/extensions';
 import { MarksObject } from './types/mark';
 import { DataConsumerDefinition } from '../marks/data-consumer';

package/dist/types/schema/nodes/media-single.d.ts

@@ -1,4 +1,4 @@
-import { NodeSpec, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { NodeSpec } from '@atlaskit/editor-prosemirror/model';
 import { MediaDefinition as Media } from './media';
 import { LinkDefinition } from '../marks/link';
 import { ExtendedMediaAttributes } from './types/rich-media-common';

package/dist/types/schema/nodes/media.d.ts

@@ -1,4 +1,4 @@
-import { NodeSpec, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { NodeSpec } from '@atlaskit/editor-prosemirror/model';
 import { BorderMarkDefinition } from '../marks/border';
 import { LinkDefinition } from '../marks/link';
 export type MediaType = 'file' | 'link' | 'external';
@@ -53,7 +53,7 @@ export interface ExternalMediaAttributes {
 }
 export type MediaADFAttrs = MediaAttributes | ExternalMediaAttributes;
 export declare const defaultAttrs: DefaultAttributes<MediaADFAttrs>;
-export declare const createMediaSpec: (attributes: Partial<NodeSpec['attrs']>, inline?: boolean) => NodeSpec;
+export declare const createMediaSpec: (attributes: NodeSpec, inline?: boolean) => NodeSpec;
 export declare const media: NodeSpec;
 export declare const camelCaseToKebabCase: (str: string) => string;
 export declare const copyPrivateAttributes: (from: Record<string, any>, to: Record<string, any>, map?: ((str: string) => string) | undefined) => void;

package/dist/types/schema/nodes/mention.d.ts

@@ -1,4 +1,4 @@
-import { NodeSpec, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { NodeSpec } from '@atlaskit/editor-prosemirror/model';
 export declare enum USER_TYPES {
     DEFAULT = "DEFAULT",
     SPECIAL = "SPECIAL",
@@ -20,5 +20,5 @@ export interface MentionDefinition {
 }
 export declare const mention: NodeSpec;
 export declare const toJSON: (node: PMNode) => {
-    attrs: import("prosemirror-model").Attrs;
+    attrs: any;
 };

package/dist/types/schema/nodes/panel.d.ts

@@ -1,4 +1,3 @@
-import { NodeSpec } from '@atlaskit/editor-prosemirror/model';
 import { ParagraphDefinition as Paragraph } from './paragraph';
 import { OrderedListDefinition as OrderedList } from './types/list';
 import { BulletListDefinition as BulletList } from './types/list';

package/dist/types/schema/nodes/tableNodes.d.ts

@@ -1,4 +1,4 @@
-import { Node as PmNode, NodeSpec } from '@atlaskit/editor-prosemirror/model';
+import { NodeSpec } from '@atlaskit/editor-prosemirror/model';
 import { CellAttributes } from '@atlaskit/editor-tables/types';
 import { PanelDefinition as Panel } from './panel';
 import { ParagraphDefinition as Paragraph, ParagraphWithAlignmentDefinition as ParagraphWithMarks } from './paragraph';
@@ -104,7 +104,7 @@ export interface TableHeader {
 export declare const table: NodeSpec;
 export declare const tableWithCustomWidth: NodeSpec;
 export declare const tableToJSON: (node: PmNode) => {
-    attrs: import("prosemirror-model").Attrs;
+    attrs: any;
 };
 export declare const tableRow: NodeSpec;
 export declare const tableCell: NodeSpec;

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

@@ -1,3 +1,2 @@
-import { NodeSpec } from '@atlaskit/editor-prosemirror/model';
 declare const _default: NodeSpec;
 export default _default;

package/dist/types/steps/analytics.d.ts

@@ -1,5 +1,5 @@
 import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import { Step, StepResult, StepMap, ReplaceStep, Mappable } from '@atlaskit/editor-prosemirror/transform';
+import { Step, Mappable } from '@atlaskit/editor-prosemirror/transform';
 export declare const analyticsStepType = "atlaskit-analytics";
 export declare const analyticsInvertStepType = "atlaskit-analytics-invert";
 export interface AnalyticsPayload {
@@ -47,13 +47,13 @@ export declare class AnalyticsStep<P extends AnalyticsPayload> extends Step {
      * Generate new undo/redo analytics event when step is inverted
      */
     invert(): AnalyticsStep<AnalyticsInvertPayload>;
-    apply(doc: PMNode): StepResult;
+    apply(doc: PMNode): any;
     map(mapping: Mappable): AnalyticsStep<P>;
-    getMap(): StepMap;
+    getMap(): any;
     merge(other: Step): AnalyticsStep<P> | null;
     toJSON(): {
         stepType: string;
     };
-    static fromJSON(): ReplaceStep;
+    static fromJSON(): any;
 }
 export {};

package/dist/types/steps/link-meta-step.d.ts

@@ -1,5 +1,5 @@
 import { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
-import { ReplaceStep, Step, StepMap, StepResult, Mappable } from '@atlaskit/editor-prosemirror/transform';
+import { Step, Mappable } from '@atlaskit/editor-prosemirror/transform';
 export declare const stepType = "editor-linking-meta";
 export declare const invertStepType = "editor-linking-meta-invert";
 export type LinkStepMetadata = {
@@ -36,9 +36,9 @@ export declare class LinkMetaStep extends Step {
      * Generate new undo/redo analytics event when step is inverted
      */
     invert(): LinkMetaStep;
-    apply(doc: PMNode): StepResult;
+    apply(doc: PMNode): any;
     map(mapping: Mappable): LinkMetaStep;
-    getMap(): StepMap;
+    getMap(): any;
     merge(): null;
     toJSON(): {
         stepType: string;
@@ -47,5 +47,5 @@ export declare class LinkMetaStep extends Step {
     };
     static fromJSON<S extends Schema = any>(_: S, __: {
         [key: string]: any;
-    }): ReplaceStep;
+    }): any;
 }

package/dist/types/steps/set-attrs.d.ts

@@ -1,4 +1,4 @@
-import { Mappable, Step, StepResult } from '@atlaskit/editor-prosemirror/transform';
+import { Mappable, Step } from '@atlaskit/editor-prosemirror/transform';
 import { Node as ProseMirrorNode, Schema } from '@atlaskit/editor-prosemirror/model';
 /**
  * For more context on what this is about:
@@ -8,7 +8,7 @@ export declare class SetAttrsStep extends Step {
     pos: number;
     attrs: object;
     constructor(pos: number, attrs: object);
-    apply(doc: ProseMirrorNode): StepResult;
+    apply(doc: ProseMirrorNode): any;
     invert(doc: ProseMirrorNode): SetAttrsStep;
     map(mapping: Mappable): SetAttrsStep | null;
     toJSON(): {

package/dist/types/steps/table/sort-column.d.ts

@@ -1,5 +1,5 @@
 import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import { ReplaceStep, Step, StepMap, StepResult } from '@atlaskit/editor-prosemirror/transform';
+import { Step } from '@atlaskit/editor-prosemirror/transform';
 import { TableColumnOrdering } from './types';
 export declare const tableSortingStepType = "atlaskit-table-sorting-ordering";
 export declare class TableSortStep extends Step {
@@ -8,11 +8,11 @@ export declare class TableSortStep extends Step {
     pos: number;
     constructor(pos: number, prev?: TableColumnOrdering, next?: TableColumnOrdering);
     invert(): TableSortStep;
-    apply(doc: PMNode): StepResult;
+    apply(doc: PMNode): any;
     map(): null;
-    getMap(): StepMap;
+    getMap(): any;
     toJSON(): {
         stepType: string;
     };
-    static fromJSON(): ReplaceStep;
+    static fromJSON(): any;
 }

package/dist/types/steps/type-ahead.d.ts

@@ -1,5 +1,5 @@
 import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import { Mappable, ReplaceStep, Step, StepMap, StepResult } from '@atlaskit/editor-prosemirror/transform';
+import { Mappable, Step } from '@atlaskit/editor-prosemirror/transform';
 export declare const insertTypeAheadStepType = "atlaskit-insert-type-ahead";
 export declare enum InsertTypeAheadStages {
     DELETING_RAW_QUERY = "DELETING_RAW_QUERY",
@@ -19,17 +19,17 @@ export declare class InsertTypeAheadStep extends Step {
     trigger: string;
     constructor({ stage, query, trigger, selectedIndex }: Config, isInvertStep?: boolean);
     invert(): InsertTypeAheadStep;
-    apply(doc: PMNode): StepResult;
+    apply(doc: PMNode): any;
     merge(): null;
     isInsertionStep(): boolean;
     isUndoingStep(): boolean;
     map(mapping: Mappable): InsertTypeAheadStep;
-    getMap(): StepMap;
+    getMap(): any;
     toJSON(): {
         stepType: string;
         from: number;
         to: number;
     };
-    static fromJSON(): ReplaceStep;
+    static fromJSON(): any;
 }
 export {};

package/package.json

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

package/src/steps/__tests__/unit/override-document-step.ts

@@ -23,8 +23,8 @@ describe('Override Document Step', () => {
         }),
       );
 
-      expect(tr.doc).toEqualDocument(nextDocument);
-      expect(tr.docs[0]).toEqualDocument(currentDocument(defaultSchema));
+      expect(tr.doc).toEqual(nextDocument);
+      expect(tr.docs[0]).toEqual(currentDocument(defaultSchema));
     });
 
     describe('when the inverted step is applied', () => {
@@ -40,9 +40,9 @@ describe('Override Document Step', () => {
         tr.step(step);
         tr.step(stepInverted);
 
-        expect(tr.doc).toEqualDocument(currentDocument(defaultSchema));
-        expect(tr.docs[1]).toEqualDocument(nextDocument);
-        expect(tr.docs[0]).toEqualDocument(currentDocument(defaultSchema));
+        expect(tr.doc).toEqual(currentDocument(defaultSchema));
+        expect(tr.docs[1]).toEqual(nextDocument);
+        expect(tr.docs[0]).toEqual(currentDocument(defaultSchema));
       });
     });
 
@@ -166,7 +166,7 @@ describe('Override Document Step', () => {
         currentDocument(defaultSchema),
       );
 
-      expect(stepAppliedResult.doc).toEqualDocument(
+      expect(stepAppliedResult.doc).toMatchObject(
         deserializedStepAppliedResult.doc,
       );
     });