@kubohiroya/turbowarp-extension-data-editor 0.8.0 → 0.8.2

package/dist/turbowarp/fixed-transaction.js

@@ -4,7 +4,7 @@ import { initializeFixedFields, inspectFixedArgument, prepareFixedChange, restor
 import { snapshotJson } from '../schema-json.js';
 import { validateFixedBranchChanges } from '../fixed-input-branches.js';
 const own = (object, name) => {
-    const descriptor = object && Object.getOwnPropertyDescriptor(object, name);
+    const descriptor = object ? Object.getOwnPropertyDescriptor(object, name) : undefined;
     if (!descriptor || !Object.prototype.hasOwnProperty.call(descriptor, 'value')) {
         throw new TypeError('Expected an own data property.');
     }
@@ -21,9 +21,10 @@ const inheritedData = (object, key) => {
     }
     return undefined;
 };
-const ensureNativeHistory = stack => {
+const ensureNativeHistory = (stack) => {
+    var _a;
     if (!Array.isArray(stack) || !Object.isExtensible(stack) ||
-        Object.getOwnPropertySymbols(stack).length || !Object.getOwnPropertyDescriptor(stack, 'length').writable) {
+        Object.getOwnPropertySymbols(stack).length || !((_a = Object.getOwnPropertyDescriptor(stack, 'length')) === null || _a === void 0 ? void 0 : _a.writable)) {
         throw new TypeError('Unsupported undo history.');
     }
     if (Object.getOwnPropertyNames(stack).length !== stack.length + 1)
@@ -35,7 +36,7 @@ const ensureNativeHistory = stack => {
         }
     }
 };
-const copyHistory = stack => {
+const copyHistory = (stack) => {
     const copy = [];
     for (let index = 0; index < stack.length; index++)
         copy.push(own(stack, String(index)));
@@ -46,11 +47,11 @@ const replaceHistory = (stack, values) => {
     for (const value of values)
         Array.prototype.push.call(stack, value);
 };
-const conflict = () => { throw new BlockEditorConflictError(); };
+function conflict() { throw new BlockEditorConflictError(); }
 const aborted = Object.getOwnPropertyDescriptor(AbortSignal.prototype, 'aborted').get;
-const isAborted = signal => aborted.call(signal);
+const isAborted = (signal) => aborted.call(signal);
 const optionalOwn = (object, name) => {
-    const descriptor = object && Object.getOwnPropertyDescriptor(object, name);
+    const descriptor = object ? Object.getOwnPropertyDescriptor(object, name) : undefined;
     if (descriptor && !Object.prototype.hasOwnProperty.call(descriptor, 'value')) {
         throw new TypeError('VM state must contain data properties.');
     }
@@ -79,7 +80,7 @@ const untouchedState = (block, vmBlock, target, bindings, identify) => {
     }
     const seen = new Set();
     const records = [];
-    const capture = item => {
+    const capture = (item) => {
         if (!item || seen.has(item))
             return;
         seen.add(item);
@@ -112,8 +113,7 @@ const untouchedState = (block, vmBlock, target, bindings, identify) => {
     });
     return JSON.stringify([records, connections, statementConnections]);
 };
-const sameDeclaration = (left, right) => JSON.stringify(captureFixedInputDeclaration(left)) ===
-    JSON.stringify(captureFixedInputDeclaration(right));
+const sameDeclaration = (left, right) => JSON.stringify(captureFixedInputDeclaration(left)) === JSON.stringify(captureFixedInputDeclaration(right));
 // Fixed inputs deliberately use a separate transaction from the legacy TEXT adapter.
 export default function createFixedInputPort({ ScratchBlocks, workspace, vm, registry, identify, getState, begin, markEvent, finish, onError, subscribeScope }) {
     initializeFixedFields(ScratchBlocks);
@@ -162,7 +162,7 @@ export default function createFixedInputPort({ ScratchBlocks, workspace, vm, reg
             } }, reference, declaration);
         return { snapshot, bindings, declaration, target, block, vmBlock, state, untouched, runtime: vm.runtime };
     };
-    const commit = request => {
+    const commit = (request) => {
         var _a;
         const expectedInput = own(request, 'expected');
         const changesInput = own(request, 'changes');
@@ -238,7 +238,7 @@ export default function createFixedInputPort({ ScratchBlocks, workspace, vm, reg
         ensureNativeHistory(redoStack);
         const configuredMaxUndo = inheritedData(workspace, 'MAX_UNDO');
         const maxUndo = configuredMaxUndo === undefined ? Infinity : configuredMaxUndo;
-        if (maxUndo !== Infinity && (!Number.isSafeInteger(maxUndo) || maxUndo < 0)) {
+        if (typeof maxUndo !== 'number' || (maxUndo !== Infinity && (!Number.isSafeInteger(maxUndo) || maxUndo < 0))) {
             throw new TypeError('Unsupported undo configuration.');
         }
         const undo = copyHistory(undoStack);
@@ -290,7 +290,7 @@ export default function createFixedInputPort({ ScratchBlocks, workspace, vm, reg
                         const fields = edited.vmBlock.fields;
                         const field = fields && fields[edited.fieldName];
                         externalWrites.set(edited.field, { binding: captureFixedFieldState(edited),
-                            fields, field, descriptors: field && Object.getOwnPropertyDescriptors(field) });
+                            field, descriptors: field && Object.getOwnPropertyDescriptors(field) });
                     }
                     activeEvent = previous;
                 }

package/dist/turbowarp/host.d.ts

@@ -1,19 +1,3 @@
+import type { TurboWarpHostOptions, TurboWarpBlockEditorHost } from '../turbowarp.js';
+declare const createBlockEditorHost: ({ ScratchBlocks: nativeBlocks, workspace: nativeWorkspace, vm: nativeVM, registry, enableDescendants, enableFixedInputs, onError }: TurboWarpHostOptions) => TurboWarpBlockEditorHost;
 export default createBlockEditorHost;
-declare function createBlockEditorHost({ ScratchBlocks, workspace, vm, registry, enableDescendants, enableFixedInputs, onError }: {
-    ScratchBlocks: any;
-    workspace: any;
-    vm: any;
-    registry: any;
-    enableDescendants?: boolean | undefined;
-    enableFixedInputs?: boolean | undefined;
-    onError?: ((...data: any[]) => void) | undefined;
-}): {
-    isCommitting: () => boolean;
-    readBlock: (reference: any) => any;
-    commit: ({ expected, changes }: {
-        expected: any;
-        changes: any;
-    }) => void;
-    invalidate: () => void;
-    dispose: () => void;
-};

package/dist/turbowarp/host.js

@@ -3,7 +3,10 @@ import collectBlockEditorSubtree from './subtree.js';
 import createFixedInputPort from './fixed-transaction.js';
 const owns = (object, key) => Object.prototype.hasOwnProperty.call(object, key);
 // Adapt only standard, unvalidated text shadows; never evaluate connected reporters.
-const createBlockEditorHost = ({ ScratchBlocks, workspace, vm, registry, enableDescendants = false, enableFixedInputs = false, onError = console.error }) => {
+const createBlockEditorHost = ({ ScratchBlocks: nativeBlocks, workspace: nativeWorkspace, vm: nativeVM, registry, enableDescendants = false, enableFixedInputs = false, onError = console.error }) => {
+    const ScratchBlocks = nativeBlocks;
+    const workspace = nativeWorkspace;
+    const vm = nativeVM;
     let disposed = false;
     let committing = false;
     let revision = 0;
@@ -30,12 +33,12 @@ const createBlockEditorHost = ({ ScratchBlocks, workspace, vm, registry, enableD
     };
     let notifyInvalidations = () => { };
     const identities = new WeakMap();
-    const identify = object => {
+    const identify = (object) => {
         if (!identities.has(object))
             identities.set(object, ++identity);
         return identities.get(object);
     };
-    const invalidate = event => {
+    const invalidate = (event) => {
         if (event && event.isUiEvent)
             return;
         revision++;
@@ -163,7 +166,7 @@ const createBlockEditorHost = ({ ScratchBlocks, workspace, vm, registry, enableD
             vmBlock
         };
     };
-    const collect = reference => collectBlockEditorSubtree({ ScratchBlocks, reference, inspect, generation });
+    const collect = (reference) => collectBlockEditorSubtree({ ScratchBlocks, reference, inspect, generation });
     notifyInvalidations = () => {
         if (committing)
             return;
@@ -171,7 +174,7 @@ const createBlockEditorHost = ({ ScratchBlocks, workspace, vm, registry, enableD
             let matches = false;
             try {
                 const current = collect(item.reference);
-                matches = current && JSON.stringify(current.snapshot) === JSON.stringify(item.snapshot);
+                matches = current !== null && JSON.stringify(current.snapshot) === JSON.stringify(item.snapshot);
             }
             catch (error) {
                 // A malformed replacement graph invalidates an already open session too.
@@ -201,7 +204,7 @@ const createBlockEditorHost = ({ ScratchBlocks, workspace, vm, registry, enableD
         Events.disable();
         committing = true;
         try {
-            if (signal && signal.aborted)
+            if (!target || (signal && signal.aborted))
                 throw new BlockEditorConflictError();
             for (const item of prepared) {
                 item.field.setValue(item.next);

package/dist/turbowarp/icon.d.ts

@@ -1,9 +1,2 @@
+declare const bindBlockEditorIcon: ({ element, label, canOpen, onOpen, onHover, onLeave }: Parameters<typeof import("../turbowarp.js").bindBlockEditorIcon>[0]) => () => void;
 export default bindBlockEditorIcon;
-declare function bindBlockEditorIcon({ element, label, canOpen, onOpen, onHover, onLeave }: {
-    element: any;
-    label: any;
-    canOpen: any;
-    onOpen: any;
-    onHover?: (() => void) | undefined;
-    onLeave?: (() => void) | undefined;
-}): () => void;

package/dist/turbowarp/icon.js

@@ -4,13 +4,13 @@ const bindBlockEditorIcon = ({ element, label, canOpen, onOpen, onHover = () =>
     const previous = attributes.map(name => element.getAttribute(name));
     const oldCursor = element.style.cursor;
     let press = null;
-    const stop = event => {
+    const stop = (event) => {
         if (!canOpen())
             return;
         event.stopPropagation();
         event.preventDefault();
     };
-    const down = event => {
+    const down = (event) => {
         if (!canOpen() || event.button !== 0 || event.isPrimary === false)
             return;
         stop(event);
@@ -19,14 +19,14 @@ const bindBlockEditorIcon = ({ element, label, canOpen, onOpen, onHover = () =>
         if (element.setPointerCapture)
             element.setPointerCapture(event.pointerId);
     };
-    const move = event => {
+    const move = (event) => {
         if (!press || press.id !== event.pointerId)
             return;
         stop(event);
         if (Math.hypot(event.clientX - press.x, event.clientY - press.y) > 4)
             press.moved = true;
     };
-    const up = event => {
+    const up = (event) => {
         if (!press || press.id !== event.pointerId)
             return;
         move(event);
@@ -41,7 +41,7 @@ const bindBlockEditorIcon = ({ element, label, canOpen, onOpen, onHover = () =>
     const cancel = () => {
         press = null;
     };
-    const key = event => {
+    const key = (event) => {
         if ((event.key === 'Enter' || event.key === ' ') && canOpen()) {
             stop(event);
             if (!event.repeat)
@@ -68,7 +68,7 @@ const bindBlockEditorIcon = ({ element, label, canOpen, onOpen, onHover = () =>
         for (const [type, listener] of listeners)
             element.removeEventListener(type, listener);
         attributes.forEach((name, index) => {
-            if (previous[index] === null)
+            if (previous[index] == null)
                 element.removeAttribute(name);
             else
                 element.setAttribute(name, previous[index]);

package/dist/turbowarp/native-types.d.ts

@@ -0,0 +1,136 @@
+import type { BlockSnapshot } from '../types.js';
+export interface NativeField {
+    name?: string;
+    getValue(): unknown;
+    getText(): string;
+    setValue(value: string): void;
+    getValidator(): unknown;
+}
+interface ImageField extends NativeField {
+    fieldGroup_: SVGElement;
+    imageElement_: {
+        tooltip: unknown;
+    };
+    setTooltip(label: string): void;
+}
+export interface NativeFieldClass {
+    new (...args: never[]): NativeField;
+    prototype: NativeField;
+}
+interface Connection {
+    targetConnection: Connection | null;
+    targetBlock(): NativeBlock | null;
+}
+export interface NativeBlock {
+    id: string;
+    type: string;
+    isInFlyout?: boolean;
+    inputList: Array<{
+        name: string;
+        type: number;
+        fieldRow: NativeField[];
+        connection: Connection | null;
+    }>;
+    previousConnection: Connection | null;
+    nextConnection: Connection | null;
+    outputConnection: Connection | null;
+    isShadow(): boolean;
+    isEditable(): boolean;
+    getInput(name: string): NativeBlock['inputList'][number] | null;
+    getField(name: string): NativeField | null;
+    getParent(): NativeBlock | null;
+    getNextBlock(): NativeBlock | null;
+    getColour(): unknown;
+    getColourSecondary(): unknown;
+    getColourTertiary(): unknown;
+    getColourQuaternary(): unknown;
+    setColour(...colors: string[]): void;
+}
+export interface NativeChange {
+    type: string;
+    element?: string;
+    name?: string;
+    blockId?: string;
+    ids?: string[];
+    isUiEvent?: boolean;
+    oldValue?: unknown;
+    recordUndo: boolean;
+}
+export interface NativeScratchBlocks {
+    INPUT_VALUE: number;
+    NEXT_STATEMENT: number;
+    FieldImage: new (...args: never[]) => ImageField;
+    FieldTextInput: NativeFieldClass;
+    FieldNumber: NativeFieldClass;
+    FieldDropdown: NativeFieldClass;
+    FieldColourSlider: NativeFieldClass;
+    hideChaff(): void;
+    Events: {
+        Change: new (block: NativeBlock, element: string, name: string, before: string, after: string) => NativeChange;
+        recordUndo: boolean;
+        isEnabled(): boolean;
+        getGroup(): string | boolean;
+        setGroup(group: string | boolean): void;
+        disable(): void;
+        enable(): void;
+    };
+}
+export interface NativeWorkspace {
+    isFlyout?: boolean;
+    options: {
+        readOnly?: boolean;
+    };
+    isDragging?(): boolean;
+    getBlockById(id: string): NativeBlock | null;
+    getAllBlocks(ordered: boolean): NativeBlock[];
+    addChangeListener(listener: (event: NativeChange) => void): void;
+    removeChangeListener(listener: (event: NativeChange) => void): void;
+    undoStack_: NativeChange[];
+    redoStack_: NativeChange[];
+    fireChangeListener(event: NativeChange): void;
+}
+export interface VMField {
+    [name: string]: unknown;
+    id?: string;
+    value: unknown;
+}
+export interface VMBlock {
+    opcode: string;
+    parent?: string | null;
+    next?: string | null;
+    fields: Record<string, VMField>;
+    inputs: Record<string, {
+        block?: string;
+        shadow?: string;
+    }>;
+    mutation?: unknown;
+}
+export interface NativeTarget {
+    id: string;
+    blocks: {
+        getBlock(id: string): VMBlock | null;
+        blocklyListen(event: NativeChange): void;
+        resetCache?(): void;
+    };
+}
+export interface NativeVM {
+    editingTarget: NativeTarget | null;
+    runtime: {
+        emitProjectChanged(): void;
+    };
+    on(name: string, listener: () => void): void;
+    removeListener(name: string, listener: () => void): void;
+}
+export interface TextBinding {
+    shadow: NativeBlock;
+    field: NativeField;
+    value: string;
+}
+export interface BlockRecord {
+    block: NativeBlock;
+    vmBlock: VMBlock;
+    fields: Map<string, TextBinding>;
+    snapshot: BlockSnapshot;
+}
+export type Identify = (value: object) => number;
+export {};

package/dist/turbowarp/native-types.js

@@ -0,0 +1 @@
+export {};

package/dist/turbowarp/subtree.d.ts

@@ -1,10 +1,13 @@
-export default collectBlockEditorSubtree;
-declare function collectBlockEditorSubtree({ ScratchBlocks, reference, inspect, generation }: {
-    ScratchBlocks: any;
-    reference: any;
-    inspect: any;
-    generation: any;
-}): {
-    snapshot: any;
-    records: Map<any, any>;
+import type { SubtreeSnapshot } from '../descendant-types.js';
+import type { BlockReference } from '../types.js';
+import type { BlockRecord, NativeScratchBlocks } from './native-types.js';
+declare const collectBlockEditorSubtree: ({ ScratchBlocks, reference, inspect, generation }: {
+    ScratchBlocks: NativeScratchBlocks;
+    reference: BlockReference;
+    inspect(reference: BlockReference, structural: boolean): BlockRecord | null;
+    generation: number;
+}) => {
+    snapshot: SubtreeSnapshot;
+    records: Map<string, BlockRecord>;
 } | null;
+export default collectBlockEditorSubtree;

package/dist/turbowarp/subtree.js

@@ -4,9 +4,10 @@ const collectBlockEditorSubtree = ({ ScratchBlocks, reference, inspect, generati
     const nodes = [];
     const records = new Map();
     const pending = {};
-    const invalid = message => {
+    function invalid(message) {
         throw new BlockEditorStructureError(message, 'invalid-structure');
-    };
+    }
+    ;
     const visit = (id, depth) => {
         if (records.has(id)) {
             throw new BlockEditorStructureError('A statement block is connected more than once.', 'cycle');

package/dist/webpack4/metafile.json

@@ -2098,7 +2098,7 @@
       "format": "esm"
     },
     "dist/form-presentation.js": {
-      "bytes": 7473,
+      "bytes": 8114,
       "imports": [
         {
           "path": "react",
@@ -14186,7 +14186,7 @@
       "format": "esm"
     },
     "dist/react.js": {
-      "bytes": 14863,
+      "bytes": 15083,
       "imports": [
         {
           "path": "dist/field-errors.js",
@@ -14222,7 +14222,7 @@
       "format": "esm"
     },
     "dist/turbowarp/subtree.js": {
-      "bytes": 2690,
+      "bytes": 2694,
       "imports": [
         {
           "path": "dist/index.js",
@@ -14233,12 +14233,12 @@
       "format": "esm"
     },
     "dist/turbowarp/fixed-fields.js": {
-      "bytes": 15532,
+      "bytes": 15540,
       "imports": [],
       "format": "esm"
     },
     "dist/turbowarp/fixed-transaction.js": {
-      "bytes": 23459,
+      "bytes": 23569,
       "imports": [
         {
           "path": "dist/index.js",
@@ -14269,7 +14269,7 @@
       "format": "esm"
     },
     "dist/turbowarp/host.js": {
-      "bytes": 16247,
+      "bytes": 16420,
       "imports": [
         {
           "path": "dist/index.js",
@@ -14290,7 +14290,7 @@
       "format": "esm"
     },
     "dist/turbowarp/icon.js": {
-      "bytes": 3218,
+      "bytes": 3227,
       "imports": [],
       "format": "esm"
     },
@@ -14300,12 +14300,12 @@
       "format": "esm"
     },
     "dist/turbowarp/error-session.js": {
-      "bytes": 988,
+      "bytes": 992,
       "imports": [],
       "format": "esm"
     },
     "dist/turbowarp/bridge.js": {
-      "bytes": 10982,
+      "bytes": 11447,
       "imports": [
         {
           "path": "dist/turbowarp/host.js",
@@ -14425,7 +14425,7 @@
       "imports": [],
       "exports": [],
       "inputs": {},
-      "bytes": 1929265
+      "bytes": 1929924
     },
     "dist/webpack4/rjsf.js": {
       "imports": [
@@ -15512,7 +15512,7 @@
           "bytesInOutput": 7705
         },
         "dist/form-presentation.js": {
-          "bytesInOutput": 7248
+          "bytesInOutput": 7889
         },
         "dist/layout.js": {
           "bytesInOutput": 2839
@@ -16829,13 +16829,13 @@
           "bytesInOutput": 11025
         }
       },
-      "bytes": 897209
+      "bytes": 897850
     },
     "dist/webpack4/react.js.map": {
       "imports": [],
       "exports": [],
       "inputs": {},
-      "bytes": 43883
+      "bytes": 44147
     },
     "dist/webpack4/react.js": {
       "imports": [
@@ -16866,16 +16866,16 @@
           "bytesInOutput": 6802
         },
         "dist/react.js": {
-          "bytesInOutput": 13396
+          "bytesInOutput": 13448
         }
       },
-      "bytes": 24283
+      "bytes": 24335
     },
     "dist/webpack4/turbowarp.js.map": {
       "imports": [],
       "exports": [],
       "inputs": {},
-      "bytes": 122586
+      "bytes": 123816
     },
     "dist/webpack4/turbowarp.js": {
       "imports": [
@@ -16914,16 +16914,16 @@
           "bytesInOutput": 2252
         },
         "dist/turbowarp/fixed-fields.js": {
-          "bytesInOutput": 13606
+          "bytesInOutput": 13608
         },
         "dist/turbowarp/fixed-transaction.js": {
-          "bytesInOutput": 19836
+          "bytesInOutput": 19918
         },
         "dist/turbowarp/host.js": {
-          "bytesInOutput": 13371
+          "bytesInOutput": 13530
         },
         "dist/turbowarp/icon.js": {
-          "bytesInOutput": 2917
+          "bytesInOutput": 2916
         },
         "dist/turbowarp/appearance.js": {
           "bytesInOutput": 1884
@@ -16932,13 +16932,13 @@
           "bytesInOutput": 835
         },
         "dist/turbowarp/bridge.js": {
-          "bytesInOutput": 8571
+          "bytesInOutput": 8994
         },
         "dist/turbowarp.js": {
           "bytesInOutput": 1134
         }
       },
-      "bytes": 65531
+      "bytes": 66196
     },
     "dist/webpack4/shared-FYUILHED.js.map": {
       "imports": [],

package/dist/webpack4/react.js

@@ -472,6 +472,7 @@ var BlockEditorDialog = class extends React.Component {
         this.stopFieldErrors = field_errors_default(this.body);
       if (typeof this.props.session.getNodes !== "function")
         this.unmountBody = this.props.session.mount(this.body);
+      this.setState(this.props.session.getState());
       this.focusFrame = requestAnimationFrame(() => {
         if (!this.mounted)
           return;