@yuzhouu/canvas-kit 0.1.12 → 0.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuzhouu/canvas-kit",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "Extensible Land canvas runtime, standard React product profile, and typed API surface.",
   "type": "module",
   "main": "./index.mjs",

package/plugins/host/image/api/imageHostApi.d.ts

@@ -0,0 +1,11 @@
+import type { Editor } from "../../../../_vendor/canvas-core/index";
+import type { ProductServiceRegistry } from "../../../../_vendor/canvas-product-contracts/index";
+import { canvasKitImageHostApiToken, type CanvasKitImageHostApi } from "./imageHostApiContract";
+export interface CanvasKitImageHostApiRuntimeOptions {
+    flushSnapshot?: () => Promise<void>;
+}
+export declare function createCanvasKitImageHostApi({ editor, flushSnapshot, services, }: CanvasKitImageHostApiRuntimeOptions & {
+    editor: Editor;
+    services: ProductServiceRegistry;
+}): CanvasKitImageHostApi | null;
+export { canvasKitImageHostApiToken };

package/plugins/host/image/api/imageHostApiContract.d.ts

@@ -0,0 +1,60 @@
+import type { AssetId, ShapeId, Vec } from "../../../../_vendor/canvas-core/index";
+import type { ImageShapeCrop, ImageSmudgeBrush, ImageSmudgeStroke } from "../../../../_vendor/plugin-image/index";
+export type CanvasKitImageInsertStrategy = "auto" | "copy" | "link";
+export type CanvasKitImageInsertSource = {
+    type: "file";
+    file: File;
+} | {
+    type: "blob";
+    blob: Blob;
+    name?: string;
+    mimeType?: string;
+    originalUrl?: string;
+} | {
+    type: "url";
+    url: string;
+    name?: string;
+    altText?: string;
+};
+export interface CanvasKitImageInsertSize {
+    w: number;
+    h: number;
+}
+export interface CanvasKitImageInsertInput {
+    source: CanvasKitImageInsertSource;
+    pagePoint?: Vec;
+    size?: CanvasKitImageInsertSize;
+    strategy?: CanvasKitImageInsertStrategy;
+}
+export interface CanvasKitImageReplaceInput {
+    file: File;
+}
+export interface CanvasKitImageSmudgeConfirmPayload {
+    shapeId: ShapeId;
+    sourceAssetId: AssetId | null;
+    imageBlob: Blob;
+    maskBlob?: Blob;
+    width: number;
+    height: number;
+    crop: ImageShapeCrop | null;
+    strokes: ImageSmudgeStroke[];
+}
+export interface CanvasKitImageSmudgeController {
+    start(input?: {
+        shapeId?: ShapeId;
+        brush?: Partial<ImageSmudgeBrush>;
+    }): boolean;
+    setBrush(brush: Partial<ImageSmudgeBrush>): boolean;
+    cancel(): void;
+    confirm(input?: {
+        replace?: boolean;
+    }): Promise<CanvasKitImageSmudgeConfirmPayload | null>;
+    isActive(): boolean;
+}
+export interface CanvasKitImageHostApi {
+    insert(input: CanvasKitImageInsertInput): Promise<ShapeId | null>;
+    replaceSelection(input: CanvasKitImageReplaceInput): Promise<boolean>;
+    downloadSelectionOriginal(): Promise<void>;
+    smudge: CanvasKitImageSmudgeController;
+}
+export declare const canvasKitImageHostApiToken: import("../../../../_vendor/canvas-product-contracts/index").ProductApiToken<CanvasKitImageHostApi>;

package/{features → plugins/host}/image/asset/imageAssetService.d.ts

@@ -1,4 +1,5 @@
-import { type ProductAssetResolverService, type ProductServiceFactory } from "../../../core";
+import { type ProductServiceFactory } from "../../../../_vendor/canvas-product-contracts/index";
+import type { ProductAssetResolverService } from "../../../../runtime/productAssetResolvers";
 import { type ImageObjectUrlStore } from "./imageBlobStore";
 export interface ImageAssetService extends ProductAssetResolverService {
     objectUrls: ImageObjectUrlStore;
@@ -6,5 +7,5 @@ export interface ImageAssetService extends ProductAssetResolverService {
 export interface ImageAssetServiceOptions {
     flushSnapshot?: () => Promise<void>;
 }
-export declare const imageAssetServiceToken: import("../../../_vendor/canvas-product-contracts/index").ProductServiceToken<ImageAssetService>;
+export declare const imageAssetServiceToken: import("../../../../_vendor/canvas-product-contracts/index").ProductServiceToken<ImageAssetService>;
 export declare function localImageAssetService({ flushSnapshot, }?: ImageAssetServiceOptions): ProductServiceFactory<ImageAssetService>;

package/{features → plugins/host}/image/asset/imageBlobStore.d.ts

@@ -1,5 +1,5 @@
-import type { AssetId, Editor } from "../../../_vendor/canvas-core/index";
-export { readBlobAsDataUrl } from "../../../_vendor/plugin-runtime-export/index";
+import type { AssetId, Editor } from "../../../../_vendor/canvas-core/index";
+export { readBlobAsDataUrl } from "../../../../_vendor/plugin-runtime-export/index";
 export interface ImageBlobWriteResult {
     storageKey: string;
 }

package/{features → plugins/host}/image/asset/imageFileHelpers.d.ts

@@ -1,4 +1,4 @@
-import type { ImageAssetSource } from "../../../_vendor/plugin-image/index";
+import type { ImageAssetSource } from "../../../../_vendor/plugin-image/index";
 export interface PreparedImageAssetInput {
     name: string;
     source: ImageAssetSource;

package/{features → plugins/host}/image/asset/svgImageAssetInliner.d.ts

@@ -1,3 +1,3 @@
-import { type SvgAssetInliner } from "../../../_vendor/plugin-runtime-export/index";
+import { type SvgAssetInliner } from "../../../../_vendor/plugin-runtime-export/index";
 import type { ImageAssetService } from "./imageAssetService";
 export declare function createImageSvgAssetInliner(imageAssetService: ImageAssetService): SvgAssetInliner;

package/{features → plugins/host}/image/import/ImageImportController.d.ts

@@ -1,5 +1,5 @@
-import type { Editor } from "../../../_vendor/canvas-core/index";
-import { type CanvasImportRegistry } from "../../../_vendor/canvas-product-contracts/index";
+import type { Editor } from "../../../../_vendor/canvas-core/index";
+import { type CanvasImportRegistry } from "../../../../_vendor/canvas-product-contracts/index";
 import type { ImageAssetService } from "../asset/imageAssetService";
 import type { ImageToolbarHostBridge } from "../toolbar/imageToolbarHostBridge";
 export declare const ImageImportController: import("react").NamedExoticComponent<{

package/{features → plugins/host}/image/index.d.ts

@@ -1,7 +1,7 @@
 export { ImageImportController } from "./import/ImageImportController";
-export { createImageProductController, imageProductControllerToken, } from "./controller/imageProductController";
-export type { ImageInsertInput, ImageProductController, ImageProductControllerRuntimeOptions, ImageReplaceInput, } from "./controller/imageProductController";
-export type { ImageShapeCrop, ImageSmudgeBrush, ImageSmudgeConfirmPayload, ImageSmudgeController, ImageSmudgeStroke, ImageSmudgeStrokePoint, } from "./smudge/imageSmudgeTypes";
+export { canvasKitImageHostApiToken, createCanvasKitImageHostApi, } from "./api/imageHostApi";
+export type { CanvasKitImageHostApiRuntimeOptions, } from "./api/imageHostApi";
+export type { CanvasKitImageHostApi, CanvasKitImageInsertInput, CanvasKitImageInsertSize, CanvasKitImageInsertSource, CanvasKitImageInsertStrategy, CanvasKitImageReplaceInput, CanvasKitImageSmudgeConfirmPayload, CanvasKitImageSmudgeController, } from "./api/imageHostApiContract";
 export { imageAssetServiceToken, localImageAssetService, } from "./asset/imageAssetService";
 export type { ImageAssetService } from "./asset/imageAssetService";
 export { createImageToolbarHostBridge, ImageToolbarHostBridge, imageToolbarHostBridgeService, imageToolbarHostBridgeToken, } from "./toolbar/imageToolbarHostBridge";
@@ -9,7 +9,7 @@ export type { ImageToolbarHostBridgeHandlers } from "./toolbar/imageToolbarHostB
 export { cleanupUnreferencedImageBlobs, createImageObjectUrlStore, createImageStorageKey, deleteImageBlob, getAllImageBlobStorageKeys, getLocalImageAssetStorageKey, getRemoteImageAssetUrl, getReferencedImageStorageKeys, readImageBlob, readImageBlobAsDataUrl, writeImageBlob, } from "./asset/imageBlobStore";
 export type { ImageBlobWriteResult, ImageObjectUrlStore, } from "./asset/imageBlobStore";
 export { downloadSelectedImageOriginal, createImageToolbarActions, getFirstImageFile, insertImageIntoEditor, replaceSelectedImageFromFile, } from "./toolbar/imageHostActions";
-export type { ImageInsertSource, ImageInsertSize, ImageInsertStrategy, InsertImageInput, ReplaceSelectedImageFileInput, } from "./toolbar/imageHostActions";
+export type { InsertImageInput, ReplaceSelectedImageFileInput, } from "./toolbar/imageHostActions";
 export { confirmImageSmudgeSession } from "./smudge/imageSmudgeHostActions";
 export type { ConfirmImageSmudgeSessionInput } from "./smudge/imageSmudgeHostActions";
 export { createImageSvgAssetInliner } from "./asset/svgImageAssetInliner";

package/plugins/host/image/plugin.d.ts

@@ -0,0 +1 @@
+export declare const ImageHostPlugin: import("../../..").CanvasPlugin;

package/{features → plugins/host}/image/smudge/imageSmudgeHostActions.d.ts

@@ -1,10 +1,10 @@
-import type { Editor } from "../../../_vendor/canvas-core/index";
+import type { Editor } from "../../../../_vendor/canvas-core/index";
+import type { CanvasKitImageSmudgeConfirmPayload } from "../api/imageHostApiContract";
 import { type ImageObjectUrlStore } from "../asset/imageBlobStore";
-import type { ImageSmudgeConfirmPayload } from "./imageSmudgeTypes";
 export interface ConfirmImageSmudgeSessionInput {
     editor: Editor;
     imageObjectUrls: ImageObjectUrlStore;
     flushSnapshot?: () => Promise<void>;
     replace?: boolean;
 }
-export declare function confirmImageSmudgeSession({ editor, imageObjectUrls, flushSnapshot, replace, }: ConfirmImageSmudgeSessionInput): Promise<ImageSmudgeConfirmPayload | null>;
+export declare function confirmImageSmudgeSession({ editor, imageObjectUrls, flushSnapshot, replace, }: ConfirmImageSmudgeSessionInput): Promise<CanvasKitImageSmudgeConfirmPayload | null>;

package/{features → plugins/host}/image/toolbar/imageHostActions.d.ts

@@ -1,34 +1,18 @@
-import { type CanvasAction } from "../../../_vendor/canvas-product-contracts/index";
-import { type AssetId, type Editor, type ShapeId, Vec } from "../../../_vendor/canvas-core/index";
-import { type ImageAssetRecord, type ImageShapeRecord } from "../../../_vendor/plugin-image/index";
+import { type CanvasAction } from "../../../../_vendor/canvas-product-contracts/index";
+import { type AssetId, type Editor, type ShapeId, Vec } from "../../../../_vendor/canvas-core/index";
+import { type ImageAssetRecord, type ImageShapeRecord } from "../../../../_vendor/plugin-image/index";
+import type { CanvasKitImageInsertSize, CanvasKitImageInsertSource, CanvasKitImageInsertStrategy } from "../api/imageHostApiContract";
 import { type ImageObjectUrlStore } from "../asset/imageBlobStore";
 import type { ImageToolbarHostBridge } from "./imageToolbarHostBridge";
-import { type LocalImageBlobInput } from "../asset/imageFileHelpers";
 export { getFirstImageFile } from "../asset/imageFileHelpers";
-export type ImageInsertStrategy = "auto" | "copy" | "link";
-export type ImageInsertSource = {
-    type: "file";
-    file: File;
-} | ({
-    type: "blob";
-} & LocalImageBlobInput) | {
-    type: "url";
-    url: string;
-    name?: string;
-    altText?: string;
-};
-export interface ImageInsertSize {
-    w: number;
-    h: number;
-}
 export interface InsertImageInput {
     editor: Editor;
     imageObjectUrls: ImageObjectUrlStore;
-    source: ImageInsertSource;
+    source: CanvasKitImageInsertSource;
     pagePoint?: Vec;
-    size?: ImageInsertSize;
+    size?: CanvasKitImageInsertSize;
     flushSnapshot?: () => Promise<void>;
-    strategy?: ImageInsertStrategy;
+    strategy?: CanvasKitImageInsertStrategy;
 }
 export interface ReplaceSelectedImageFileInput {
     editor: Editor;
@@ -46,7 +30,7 @@ export declare function localizeRemoteImageAsset({ assetId, editor, flushSnapsho
     editor: Editor;
     flushSnapshot?: () => Promise<void>;
     imageObjectUrls: ImageObjectUrlStore;
-    source: Extract<ImageInsertSource, {
+    source: Extract<CanvasKitImageInsertSource, {
         type: "url";
     }>;
 }): Promise<void>;

package/{features → plugins/host}/image/toolbar/imageToolbarHostBridge.d.ts

@@ -1,4 +1,4 @@
-import { type ProductServiceFactory } from "../../../core";
+import { type ProductServiceFactory } from "../../../../_vendor/canvas-product-contracts/index";
 export interface ImageToolbarHostBridgeHandlers {
     openInsertFilePicker(): void;
     openReplaceFilePicker(): void;
@@ -10,5 +10,5 @@ export declare class ImageToolbarHostBridge {
     openReplaceFilePicker(): void;
 }
 export declare function createImageToolbarHostBridge(): ImageToolbarHostBridge;
-export declare const imageToolbarHostBridgeToken: import("../../../_vendor/canvas-product-contracts/index").ProductServiceToken<ImageToolbarHostBridge>;
+export declare const imageToolbarHostBridgeToken: import("../../../../_vendor/canvas-product-contracts/index").ProductServiceToken<ImageToolbarHostBridge>;
 export declare function imageToolbarHostBridgeService(): ProductServiceFactory<ImageToolbarHostBridge>;

package/{features → plugins/host}/text/link/TextLinkHoverPopover.d.ts

@@ -1,5 +1,5 @@
 import { type ReactNode } from "react";
-import type { TextLinkPopoverPresenter } from "../../../_vendor/plugin-text/index";
+import type { TextLinkPopoverPresenter } from "../../../../_vendor/plugin-text/index";
 export interface TextLinkHoverPopoverIcons {
     open: ReactNode;
 }

package/plugins/host/text/textHostPlugin.d.ts

@@ -0,0 +1,5 @@
+import { type TextLinkPopoverPresenter } from "../../../_vendor/plugin-text/index";
+import { type CanvasPlugin } from "../../../runtime/canvasKitPluginContracts";
+export declare function createTextHostPlugin({ presenter, }: {
+    presenter: TextLinkPopoverPresenter;
+}): CanvasPlugin;

package/plugins/host/text/textSvgAssetInliner.d.ts

@@ -0,0 +1,3 @@
+import { type TextFontCatalog } from "../../../_vendor/plugin-text/index";
+import { type SvgAssetInliner } from "../../../_vendor/plugin-runtime-export/index";
+export declare function createTextSvgAssetInliner(fontCatalog: TextFontCatalog): SvgAssetInliner;

package/plugins/host/text/textSvgAssetPlugin.d.ts

@@ -0,0 +1,2 @@
+import { type CanvasPlugin } from "../../../runtime/canvasKitPluginContracts";
+export declare function createTextSvgAssetPlugin(): CanvasPlugin;

package/plugins/runtime/keyboard-shortcuts/useCanvasKeyboardShortcuts.d.ts

@@ -1,8 +1,6 @@
 import type { Editor } from "../../../_vendor/canvas-core/index";
-import { type CanvasActionRegistry } from "../../../_vendor/canvas-product-contracts/index";
-import type { ExecuteCanvasCommand } from "../../../runtime/canvasKitPluginUi";
-export declare function useCanvasKeyboardShortcuts({ actionRegistry, editor, executeCommand, }: {
-    actionRegistry: CanvasActionRegistry;
+import type { ExecuteCanvasKitAction } from "../../../runtime/canvasKitActionExecutor";
+export declare function useCanvasKeyboardShortcuts({ editor, executeAction, }: {
     editor: Editor;
-    executeCommand: ExecuteCanvasCommand;
+    executeAction: ExecuteCanvasKitAction;
 }): void;

package/plugins/standard/selection/actions.d.ts

@@ -1,18 +1,18 @@
 import { type CanvasAction, type CanvasActionContext } from "../../../_vendor/canvas-product-contracts/index";
 import type { KeyboardShortcutInput } from "../../../_vendor/canvas-core/index";
-export declare const SYSTEM_SELECTION_DELETE_ACTION_ID = "system.selection.delete";
-export declare const SYSTEM_SELECTION_DUPLICATE_ACTION_ID = "system.selection.duplicate";
-export declare const SYSTEM_SELECTION_SELECT_ALL_ACTION_ID = "system.selection.select-all";
-export declare const SYSTEM_SELECTION_RESET_ROTATION_ACTION_ID = "system.selection.reset-rotation";
-export declare const SYSTEM_SELECTION_FLIP_HORIZONTAL_ACTION_ID = "system.selection.flip-horizontal";
-export declare const SYSTEM_SELECTION_FLIP_VERTICAL_ACTION_ID = "system.selection.flip-vertical";
-export declare const SYSTEM_SELECTION_SEND_TO_BACK_ACTION_ID = "system.selection.send-to-back";
-export declare const SYSTEM_SELECTION_SEND_BACKWARD_ACTION_ID = "system.selection.send-backward";
-export declare const SYSTEM_SELECTION_BRING_FORWARD_ACTION_ID = "system.selection.bring-forward";
-export declare const SYSTEM_SELECTION_BRING_TO_FRONT_ACTION_ID = "system.selection.bring-to-front";
-export declare const SYSTEM_SELECTION_SET_OPACITY_ACTION_ID = "system.selection.set-opacity";
-export declare const SYSTEM_SELECTION_ALIGN_ACTION_ID = "system.selection.align";
-export declare const SYSTEM_SELECTION_DISTRIBUTE_ACTION_ID = "system.selection.distribute";
+export declare const SYSTEM_SELECTION_DELETE_ACTION_ID: "system.selection.delete";
+export declare const SYSTEM_SELECTION_DUPLICATE_ACTION_ID: "system.selection.duplicate";
+export declare const SYSTEM_SELECTION_SELECT_ALL_ACTION_ID: "system.selection.select-all";
+export declare const SYSTEM_SELECTION_RESET_ROTATION_ACTION_ID: "system.selection.reset-rotation";
+export declare const SYSTEM_SELECTION_FLIP_HORIZONTAL_ACTION_ID: "system.selection.flip-horizontal";
+export declare const SYSTEM_SELECTION_FLIP_VERTICAL_ACTION_ID: "system.selection.flip-vertical";
+export declare const SYSTEM_SELECTION_SEND_TO_BACK_ACTION_ID: "layer.send-to-back";
+export declare const SYSTEM_SELECTION_SEND_BACKWARD_ACTION_ID: "layer.send-backward";
+export declare const SYSTEM_SELECTION_BRING_FORWARD_ACTION_ID: "layer.bring-forward";
+export declare const SYSTEM_SELECTION_BRING_TO_FRONT_ACTION_ID: "layer.bring-to-front";
+export declare const SYSTEM_SELECTION_SET_OPACITY_ACTION_ID: "system.selection.set-opacity";
+export declare const SYSTEM_SELECTION_ALIGN_ACTION_ID: "system.selection.align";
+export declare const SYSTEM_SELECTION_DISTRIBUTE_ACTION_ID: "system.selection.distribute";
 export declare const selectionActionShortcuts: readonly {
     actionId: string;
     shortcut: KeyboardShortcutInput;

package/plugins/standard/tool-ui/contextMenu.d.ts

@@ -1,2 +1,2 @@
-import { type ContextMenuContribution } from "../../../_vendor/canvas-product-contracts/index";
+import type { ContextMenuContribution } from "../../../_vendor/canvas-product-contracts/index";
 export declare const toolContextMenuContributions: readonly ContextMenuContribution[];

package/plugins/standard/view/actions.d.ts

@@ -1,5 +1,5 @@
-import { type CanvasAction } from "../../../_vendor/canvas-product-contracts/index";
-export declare const SYSTEM_VIEW_ZOOM_IN_ACTION_ID = "system.view.zoom-in";
-export declare const SYSTEM_VIEW_ZOOM_OUT_ACTION_ID = "system.view.zoom-out";
-export declare const SYSTEM_VIEW_RESET_ZOOM_ACTION_ID = "system.view.reset-zoom";
+import type { CanvasAction } from "../../../_vendor/canvas-product-contracts/index";
+export declare const SYSTEM_VIEW_ZOOM_IN_ACTION_ID: "system.view.zoom-in";
+export declare const SYSTEM_VIEW_ZOOM_OUT_ACTION_ID: "system.view.zoom-out";
+export declare const SYSTEM_VIEW_RESET_ZOOM_ACTION_ID: "system.view.reset-zoom";
 export declare const viewActions: readonly CanvasAction[];

package/react/CanvasKitRoot.d.ts

@@ -1,8 +1,9 @@
-import type { CanvasKitController } from "../controller/canvasKitController";
+import type { CanvasKitToolId } from "../canvasKitTools";
+import type { CanvasProductController } from "../controller";
 import type { CanvasKitRuntime } from "../runtime/canvasKitRuntimeContracts";
 export interface CanvasKitRootProps {
     runtime: CanvasKitRuntime;
-    onControllerReady?: (controller: CanvasKitController) => void;
+    onControllerReady?: (controller: CanvasProductController<CanvasKitToolId>) => void;
     onControllerDispose?: () => void;
     exposeControllerOnWindow?: boolean;
     windowKey?: string;

package/react/useCanvasProductControllerLifecycle.d.ts

@@ -0,0 +1,9 @@
+import type { CanvasKitToolId } from "../canvasKitTools";
+import type { CanvasProductController } from "../controller";
+export declare function useCanvasProductControllerLifecycle({ controller, exposeControllerOnWindow, onControllerDispose, onControllerReady, windowKey, }: {
+    controller: CanvasProductController<CanvasKitToolId>;
+    exposeControllerOnWindow: boolean;
+    onControllerDispose?: () => void;
+    onControllerReady?: (controller: CanvasProductController<CanvasKitToolId>) => void;
+    windowKey: string;
+}): void;

package/runtime/canvasKitActionExecutor.d.ts

@@ -0,0 +1,12 @@
+import { type CanvasActionContext, type CanvasActionRegistry, type CanvasActionValue } from "../_vendor/canvas-product-contracts/index";
+import type { CanvasKitCommandExecutor } from "./canvasKitCommandExecutor";
+export interface CanvasKitActionExecutionInput {
+    actionId: string;
+    context: CanvasActionContext;
+    value?: CanvasActionValue;
+}
+export type ExecuteCanvasKitAction = (input: CanvasKitActionExecutionInput) => boolean;
+export declare function createCanvasKitActionExecutor({ actionRegistry, commandExecutor, }: {
+    actionRegistry: CanvasActionRegistry;
+    commandExecutor: CanvasKitCommandExecutor;
+}): ExecuteCanvasKitAction;

package/runtime/canvasKitCommandExecutor.d.ts

@@ -1,5 +1,6 @@
 import { type CanvasActionContext } from "../_vendor/canvas-product-contracts/index";
 import type { Editor } from "../_vendor/canvas-core/index";
+import type { CanvasKitCommand, ExecuteCanvasKitDefinedCommand } from "../commands";
 import type { CanvasPluginBeforeCommand } from "./canvasKitPluginContracts";
 export interface CanvasKitCommandInput<TResult> {
     commandId: string;
@@ -7,7 +8,15 @@ export interface CanvasKitCommandInput<TResult> {
     run(): TResult;
 }
 export type ExecuteCanvasKitCommand = <TResult>(input: CanvasKitCommandInput<TResult>) => TResult;
-export declare function createCanvasKitCommandExecutor({ editor, hooks, }: {
+export interface CanvasKitCommandExecutor {
+    execute: ExecuteCanvasKitDefinedCommand;
+    executeBootstrap: ExecuteCanvasKitDefinedCommand;
+    executeFromAction: <TArgs extends readonly unknown[], TResult>(command: CanvasKitCommand<TArgs, TResult>, context: CanvasActionContext, ...args: TArgs) => TResult;
+    executeAction: ExecuteCanvasKitCommand;
+}
+export declare function createCanvasKitCommandExecutor({ assertCanBootstrap, assertCanExecute, editor, hooks, }: {
+    assertCanBootstrap?: () => void;
+    assertCanExecute?: () => void;
     editor: Editor;
     hooks: readonly CanvasPluginBeforeCommand[];
-}): ExecuteCanvasKitCommand;
+}): CanvasKitCommandExecutor;

package/runtime/canvasKitPluginContracts.d.ts

@@ -1,7 +1,8 @@
-import { type CanvasPlugin as SdkCanvasPlugin, type CanvasPluginDefinition as SdkCanvasPluginDefinition, type CanvasPluginSetup as SdkCanvasPluginSetup, type CanvasPluginSetupContext as SdkCanvasPluginSetupContext, type CanvasPluginSetupExtension } from "../_vendor/canvas-plugin-sdk/index";
-import { type CanvasPluginApi as SdkCanvasPluginApi, type CanvasPluginApiContext, type CanvasPluginApiSetup } from "../_vendor/canvas-product-contracts/index";
-import type { ProductAssetResolverService, ProductServiceRegistry, ProductServiceToken } from "../core";
+import { type CanvasPlugin as SdkCanvasPlugin, type CanvasPluginDefinition as SdkCanvasPluginDefinition, type CanvasPluginSetup, type CanvasPluginSetupExtension } from "../_vendor/canvas-plugin-sdk/index";
+import { type CanvasPluginApi as SdkCanvasPluginApi, type CanvasPluginApiContext, type CanvasPluginApiSetup, type ProductServiceRegistry, type ProductServiceToken } from "../_vendor/canvas-product-contracts/index";
+import type { ProductAssetResolverService } from "./productAssetResolvers";
 import type { SvgAssetInliner } from "../_vendor/plugin-runtime-export/index";
+export type { CanvasPluginSetup, CanvasPluginSetupContext, } from "../_vendor/canvas-plugin-sdk/index";
 export type { CanvasPluginBeforeCommand, CanvasPluginBeforeCommandContext, CanvasPluginBeforeReady, CanvasPluginBeforeReadyContext, CanvasPluginLifecycleSetup, CanvasPluginPersistence, } from "./canvasKitPluginLifecycle";
 export { canvasKitLifecycleExtension, canvasKitPersistenceExtension, } from "./canvasKitPluginLifecycle";
 export type { CanvasPluginComponent, CanvasPluginComponentProps, CanvasPluginProvider, CanvasPluginUiSetup, } from "./canvasKitPluginUi";
@@ -17,16 +18,11 @@ export interface CanvasKitPluginAssetSetup {
     addSvgInliners(...inliners: readonly SvgAssetInliner[]): void;
 }
 export declare const canvasKitAssetsExtension: CanvasPluginSetupExtension<CanvasKitPluginAssetSetup>;
-export type CanvasKitPluginLifecycleSetup = import("./canvasKitPluginLifecycle").CanvasPluginLifecycleSetup;
-export type CanvasKitPluginUiSetup = import("./canvasKitPluginUi").CanvasPluginUiSetup;
-export type CanvasKitPluginPersistence = import("./canvasKitPluginLifecycle").CanvasPluginPersistence;
-export type CanvasKitPluginSetupContext = SdkCanvasPluginSetupContext;
-export type CanvasKitPluginSetup = SdkCanvasPluginSetup<CanvasKitPluginSetupContext>;
-export type CanvasPlugin = Omit<SdkCanvasPlugin<CanvasKitPluginSetup>, "editor" | "render" | "setup"> & {
+export type CanvasPlugin = Omit<SdkCanvasPlugin<CanvasPluginSetup>, "editor" | "render" | "setup"> & {
     readonly editor?: unknown;
     readonly render?: unknown;
     readonly setup?: (...args: never[]) => unknown;
 };
-export type CanvasPluginDefinition = SdkCanvasPluginDefinition<CanvasKitPluginSetup>;
+export type CanvasPluginDefinition = SdkCanvasPluginDefinition<CanvasPluginSetup>;
 export type CanvasPluginInput = CanvasPlugin | readonly CanvasPluginInput[];
 export declare function defineCanvasPlugin(plugin: CanvasPluginDefinition): CanvasPlugin;

package/runtime/canvasKitPluginLifecycle.d.ts

@@ -3,7 +3,7 @@ import { type CanvasActionContext, type ProductServiceRegistry } from "../_vendo
 export interface CanvasPluginPersistence {
     flush(): Promise<void>;
 }
-export interface CanvasPluginStartupResult {
+export interface CanvasKitStartupResult {
     documentSource: "restored" | "seeded" | "empty";
     sessionRestored: boolean;
     warnings: readonly unknown[];
@@ -13,7 +13,7 @@ export interface CanvasPluginBeforeReadyContext {
     persistence: CanvasPluginPersistence | null;
     productId: string;
     signal: AbortSignal;
-    startup: CanvasPluginStartupResult;
+    startup: CanvasKitStartupResult;
     services: ProductServiceRegistry;
 }
 export interface CanvasPluginBeforeCommandContext {

package/runtime/canvasKitPluginSetup.d.ts

@@ -1,9 +1,10 @@
 import { type CanvasPlugin as SdkCanvasPlugin } from "../_vendor/canvas-plugin-sdk/index";
-import { type CanvasActionContext, type CanvasChromeRegistry, type CanvasContextMenuRegistry, type CanvasImportRegistry, type CanvasToolbarRegistry, type ProductApiRegistry } from "../_vendor/canvas-product-contracts/index";
+import { type CanvasActionContext, type CanvasChromeRegistry, type CanvasContextMenuRegistry, type CanvasImportRegistry, type CanvasToolbarRegistry, type ProductApiRegistry, type ProductServiceToken } from "../_vendor/canvas-product-contracts/index";
 import type { Editor } from "../_vendor/canvas-core/index";
-import type { ProductAssetResolverService, ProductServiceRegistryRuntime, ProductServiceToken } from "../core";
+import type { ProductAssetResolverService } from "./productAssetResolvers";
+import type { ProductServiceRegistryRuntime } from "./productServiceRegistry";
 import type { SvgAssetInliner } from "../_vendor/plugin-runtime-export/index";
-import type { CanvasKitPluginSetup, CanvasKitPluginPersistence, CanvasPluginBeforeCommand, CanvasPluginBeforeReady, CanvasPluginComponent, CanvasPluginProvider } from "./canvasKitPluginContracts";
+import type { CanvasPluginBeforeCommand, CanvasPluginBeforeReady, CanvasPluginComponent, CanvasPluginPersistence, CanvasPluginProvider, CanvasPluginSetup } from "./canvasKitPluginContracts";
 import { createCanvasActionRegistry } from "./registries";
 export interface CanvasKitPluginSetupResult {
     readonly actionRegistry: ReturnType<typeof createCanvasActionRegistry>;
@@ -20,14 +21,14 @@ export interface CanvasKitPluginSetupResult {
     canShowPropertiesDuringEditing(context: CanvasActionContext): boolean;
 }
 export interface CanvasKitPluginSetupSession {
-    install(plugin: SdkCanvasPlugin<CanvasKitPluginSetup>): void;
+    install(plugin: SdkCanvasPlugin<CanvasPluginSetup>): void;
     seal(): CanvasKitPluginSetupResult;
 }
 export declare function createCanvasKitPluginSetupSession({ assetResolverTokens, defer, editor, persistence, productId, services, svgAssetInliners, }: {
     assetResolverTokens: ProductServiceToken<ProductAssetResolverService>[];
     defer(dispose: () => void): void;
     editor: Editor;
-    persistence: CanvasKitPluginPersistence | null;
+    persistence: CanvasPluginPersistence | null;
     productId: string;
     services: ProductServiceRegistryRuntime;
     svgAssetInliners: SvgAssetInliner[];

package/runtime/canvasKitPluginUi.d.ts

@@ -1,6 +1,7 @@
 import type { Editor } from "../_vendor/canvas-core/index";
 import { type CanvasActionContext, type CanvasActionRegistry, type CanvasImportRegistry, type ProductServiceRegistry } from "../_vendor/canvas-product-contracts/index";
 import type { ComponentType, ReactNode } from "react";
+import type { ExecuteCanvasKitAction } from "./canvasKitActionExecutor";
 export interface CanvasCommandInput<TResult> {
     commandId: string;
     context?: CanvasActionContext;
@@ -10,6 +11,7 @@ export type ExecuteCanvasCommand = <TResult>(input: CanvasCommandInput<TResult>)
 export interface CanvasPluginComponentProps {
     actionRegistry: CanvasActionRegistry;
     editor: Editor;
+    executeAction: ExecuteCanvasKitAction;
     executeCommand: ExecuteCanvasCommand;
     getHostElement(): HTMLElement | null;
     imports: CanvasImportRegistry;

package/runtime/canvasKitRuntime.d.ts

@@ -1,9 +1,13 @@
 import type { Editor } from "../_vendor/canvas-core/index";
-import { type CanvasActionContext, type CanvasActionRegistry, type CanvasChromeRegistry, type CanvasContextMenuRegistry, type CanvasImportRegistry, type CanvasToolbarRegistry } from "../_vendor/canvas-product-contracts/index";
+import { type CanvasActionContext, type CanvasActionRegistry, type CanvasChromeRegistry, type CanvasContextMenuRegistry, type CanvasImportRegistry, type CanvasToolbarRegistry, type ProductServiceToken } from "../_vendor/canvas-product-contracts/index";
 import { type CanvasRenderRuntime } from "../_vendor/canvas-react/host/index";
-import { type ProductAssetResolverService, type ProductPersistenceAdapter, type ProductServiceRegistryRuntime, type ProductServiceToken } from "../core";
-import { type CanvasKitController } from "../controller/canvasKitController";
+import { type CanvasProductController } from "../controller";
+import { type ProductAssetResolverService } from "./productAssetResolvers";
+import type { ProductPersistenceAdapter } from "./persistenceContracts";
+import { type ProductServiceRegistryRuntime } from "./productServiceRegistry";
+import { type CanvasKitToolId } from "../canvasKitTools";
 import { createCanvasKitCommandExecutor } from "./canvasKitCommandExecutor";
+import { createCanvasKitActionExecutor } from "./canvasKitActionExecutor";
 import type { CanvasPluginBeforeReady, CanvasPluginComponent, CanvasPluginProvider } from "./canvasKitPluginContracts";
 import { PersistenceCoordinator } from "./persistenceCoordinator";
 import { type CanvasKitResourceScope } from "./canvasKitResourceScope";
@@ -16,7 +20,10 @@ export interface CanvasKitRuntimeInternals {
     readonly beforeReadyHooks: readonly CanvasPluginBeforeReady[];
     readonly cleanDocumentSnapshot: unknown;
     readonly cleanSessionSnapshot: unknown;
-    readonly controller: CanvasKitController;
+    readonly commandBootstrap: {
+        active: boolean;
+    };
+    readonly controller: CanvasProductController<CanvasKitToolId>;
     readonly editor: Editor;
     mountedOwner: object | null;
     readonly persistence: ProductPersistenceAdapter | null;
@@ -30,13 +37,15 @@ export interface CanvasKitRuntimeInternals {
         readonly toolbarRegistry: CanvasToolbarRegistry;
         readonly contextMenuRegistry: CanvasContextMenuRegistry;
         readonly importRegistry: CanvasImportRegistry;
-        readonly executeCommand: ReturnType<typeof createCanvasKitCommandExecutor>;
+        readonly executeAction: ReturnType<typeof createCanvasKitActionExecutor>;
+        readonly executeCommand: ReturnType<typeof createCanvasKitCommandExecutor>["executeAction"];
         readonly providers: readonly CanvasPluginProvider[];
         readonly components: readonly CanvasPluginComponent[];
         readonly chrome?: CanvasKitChromeRenderer;
         canShowPropertiesDuringEditing(context: CanvasActionContext): boolean;
     };
     readonly seedDocument?: CanvasKitDocumentSeed;
+    readonly seedController: CanvasProductController<CanvasKitToolId>;
     readonly services: ProductServiceRegistryRuntime;
     readonly shouldSkipStoredSnapshots?: () => boolean;
     startPromise: Promise<CanvasKitStartupResult> | null;

package/runtime/canvasKitRuntimeContracts.d.ts

@@ -1,11 +1,13 @@
 import type { ReactNode } from "react";
-import type { ProductPersistenceAdapter } from "../core";
+import type { CanvasProductController } from "../controller";
+import type { ProductPersistenceAdapter } from "./persistenceContracts";
 import type { CanvasKitChromeContext } from "../chrome/types";
-import type { CanvasKitController } from "../controller/canvasKitController";
+import type { CanvasKitToolId } from "../canvasKitTools";
 import type { CanvasPluginInput } from "./canvasKitPluginContracts";
-import type { CanvasPluginStartupResult } from "./canvasKitPluginLifecycle";
-export type CanvasKitChromeRenderer = (context: CanvasKitChromeContext<CanvasKitController>) => ReactNode;
-export type CanvasKitDocumentSeed = (controller: CanvasKitController) => void;
+import type { CanvasKitStartupResult } from "./canvasKitPluginLifecycle";
+export type { CanvasKitStartupResult } from "./canvasKitPluginLifecycle";
+export type CanvasKitChromeRenderer = (context: CanvasKitChromeContext<CanvasKitToolId>) => ReactNode;
+export type CanvasKitDocumentSeed = (controller: CanvasProductController<CanvasKitToolId>) => void;
 export interface CanvasKitRuntimeOptions {
     id?: string;
     chrome?: CanvasKitChromeRenderer;
@@ -16,9 +18,8 @@ export interface CanvasKitRuntimeOptions {
     plugins?: readonly CanvasPluginInput[];
     storageNamespace?: string;
 }
-export type CanvasKitStartupResult = CanvasPluginStartupResult;
 export interface CanvasKitRuntime {
-    readonly controller: CanvasKitController;
+    readonly controller: CanvasProductController<CanvasKitToolId>;
     start(): Promise<CanvasKitStartupResult>;
     dispose(): void;
 }

package/runtime/createCanvasKitCommandAction.d.ts

@@ -0,0 +1,10 @@
+import type { CanvasAction, CanvasActionRunInput, CanvasActionValue } from "../_vendor/canvas-product-contracts/index";
+import type { CanvasKitCommand } from "../commands";
+import type { CanvasKitCommandExecutor } from "./canvasKitCommandExecutor";
+type CanvasActionBehavior<TValue extends CanvasActionValue> = Omit<CanvasAction<TValue>, "id" | "run">;
+export declare function createVoidCanvasKitCommandAction<TValue extends CanvasActionValue = CanvasActionValue>(command: CanvasKitCommand<[], unknown>, behavior?: CanvasActionBehavior<TValue>): CanvasAction<TValue>;
+export declare function createCanvasKitCommandAction<TArgs extends readonly unknown[], TValue extends CanvasActionValue = CanvasActionValue>(command: CanvasKitCommand<TArgs, unknown>, behavior: CanvasActionBehavior<TValue> & {
+    toCommandArgs(input: CanvasActionRunInput<TValue>): TArgs | null;
+}): CanvasAction<TValue>;
+export declare function executeCanvasKitCommandAction(executor: CanvasKitCommandExecutor, action: CanvasAction, input: CanvasActionRunInput<CanvasActionValue>): boolean | null;
+export {};

package/runtime/createCanvasKitEditor.d.ts

@@ -0,0 +1,7 @@
+import { type AssetId, type Editor, type EditorPlugin } from "../_vendor/canvas-core/index";
+export interface CreateCanvasKitEditorOptions {
+    editorPlugins: readonly EditorPlugin[];
+    documentMeta?: Record<string, unknown>;
+    resolveAssetUrl?: (assetId: AssetId) => string | null;
+}
+export declare function createCanvasKitEditor(options: CreateCanvasKitEditorOptions): Editor;

package/{core/runtime/runtimeContracts.d.ts → runtime/persistenceContracts.d.ts}

@@ -1,4 +1,4 @@
-import type { AssetId, DocumentSnapshot, EditorPlugin, SessionSnapshot } from "../../_vendor/canvas-core/index";
+import type { DocumentSnapshot, SessionSnapshot } from "../_vendor/canvas-core/index";
 export interface ProductPersistenceLoadResult {
     documentSnapshot: unknown | null;
     sessionSnapshot: unknown | null;
@@ -10,8 +10,3 @@ export interface ProductPersistenceAdapter {
     saveDocument?(snapshot: DocumentSnapshot): Promise<void>;
     saveSession?(snapshot: SessionSnapshot): Promise<void>;
 }
-export interface CreateCanvasProductEditorOptions {
-    editorPlugins: readonly EditorPlugin[];
-    documentMeta?: Record<string, unknown>;
-    resolveAssetUrl?: (assetId: AssetId) => string | null;
-}

package/runtime/persistenceCoordinator.d.ts

@@ -1,5 +1,5 @@
 import type { Editor } from "../_vendor/canvas-core/index";
-import type { ProductPersistenceAdapter } from "../core/runtime/runtimeContracts";
+import type { ProductPersistenceAdapter } from "./persistenceContracts";
 export declare class PersistenceCoordinator {
     private readonly editor;
     private readonly adapter;