@dxos/plugin-tldraw 0.10.0 → 0.11.1

package/src/model/scene.test.ts

@@ -7,7 +7,7 @@ import { describe, test } from 'vitest';
 
 import { type Scene } from '@dxos/plugin-illustrator/model';
 
-import { applyCommands } from './apply';
+import { applyCommands } from './builder';
 import { readScene } from './read';
 
 /** A face made of every element category: boxes, circles, arc sugar, polyline, text. */

package/src/types/Tldraw.ts

@@ -4,35 +4,8 @@
 
 // @import-as-namespace
 
-import * as Schema from 'effect/Schema';
-
-import { DXN, Obj, Type } from '@dxos/echo';
-import { HiddenAnnotation } from '@dxos/echo/Annotation';
-
-export const TLDRAW_SCHEMA = 'tldraw.com/2';
-
-/**
- * Persisted tldraw canvas: an opaque map of RecordId → TLRecord managed by the store adapter.
- * Referenced by the base `Sketch` (plugin-illustrator) as its renderer-specific canvas.
- * Keeps the pre-variant typename (`org.dxos.type.canvas`) so existing stored sketches load
- * without a data migration.
- */
-export class Canvas extends Type.makeObject<Canvas>(DXN.make('org.dxos.type.canvas', '0.1.0'))(
-  Schema.Struct({
-    /** Fully qualified external schema reference. */
-    // TODO(wittjosiah): Remove once the schema is fully internalized.
-    schema: Schema.String.pipe(Schema.optional),
-    content: Schema.Record({ key: Schema.String, value: Schema.Any }),
-  }).pipe(HiddenAnnotation.set(true)),
-) {}
-
-export type MakeOptions = Partial<Obj.MakeProps<typeof Canvas>>;
-
 /**
- * Creates an empty {@link Canvas}.
+ * Renderer dialect stored on `Drawing.Canvas.schema`; how a canvas is matched to this variant.
+ * The canvas type itself is the base `Drawing.Canvas` — tldraw adds no fields of its own.
  */
-export const makeCanvas = ({ schema = TLDRAW_SCHEMA, content = {} }: MakeOptions = {}): Canvas =>
-  Obj.make(Canvas, { schema, content });
-
-/** Type guard for {@link Canvas} objects. */
-export const isCanvas = (object: unknown): object is Canvas => Obj.instanceOf(Canvas, object);
+export const TLDRAW_SCHEMA = 'tldraw.com/2';

package/src/types/TldrawCapabilities.ts

@@ -4,7 +4,7 @@
 
 // @import-as-namespace
 
-import { type Atom } from '@effect-atom/atom-react';
+import { type Atom } from '@effect-atom/atom';
 
 import { Capability } from '@dxos/app-framework';
 

package/src/variant.test.ts

@@ -11,17 +11,17 @@ import { describe } from 'vitest';
 import { AssistantTestLayer } from '@dxos/agent-runtime/testing';
 import { Capability, CapabilityManager } from '@dxos/app-framework';
 import { Operation } from '@dxos/compute';
-import { Database, Ref, Type } from '@dxos/echo';
+import { Database, Ref } from '@dxos/echo';
 import { TestHelpers } from '@dxos/effect/testing';
 import { EntityId } from '@dxos/keys';
 import {
+  Drawing,
+  DrawingOperation,
   IllustratorCapabilities,
   IllustratorOperationHandlerSet,
-  Sketch,
-  SketchOperation,
 } from '@dxos/plugin-illustrator';
 
-import { tldrawBuilder } from '#model';
+import { TldrawBuilder } from '#model';
 
 import { Tldraw } from './types';
 
@@ -30,21 +30,19 @@ EntityId.dangerouslyDisableRandomness();
 const TestLayer = AssistantTestLayer({
   operationHandlers: IllustratorOperationHandlerSet,
   extraServices: Layer.sync(Capability.Service, () => capabilityService()),
-  types: [Sketch.Sketch, Tldraw.Canvas],
+  types: [Drawing.Drawing, Drawing.Canvas],
   disableLlmMemoization: true,
 });
 
-/** Capability manager pre-loaded with the tldraw sketch variant, as the plugin would contribute it. */
+/** Capability manager pre-loaded with the tldraw drawing variant, as the plugin would contribute it. */
 const capabilityService = () => {
   const manager = CapabilityManager.make({ registry: Registry.make() });
   manager.contribute({
     interface: IllustratorCapabilities.VariantProvider,
     implementation: {
-      id: Type.getTypename(Tldraw.Canvas),
+      id: Tldraw.TLDRAW_SCHEMA,
       label: 'tldraw',
-      canvasType: Tldraw.Canvas,
-      createCanvas: () => Effect.sync(() => Tldraw.makeCanvas()),
-      builder: tldrawBuilder,
+      builder: TldrawBuilder,
     },
     module: 'test',
   });
@@ -56,19 +54,19 @@ const capabilityService = () => {
  * add a hat and edit the smile by id, and confirm the untouched face elements survive.
  * Exercises the illustrator operations end-to-end through the tldraw builder.
  */
-describe('tldraw sketch variant', () => {
+describe('tldraw drawing variant', () => {
   it.effect(
     'create → edit → read round-trip preserves untouched objects',
     Effect.fnUntraced(
       function* ({ expect }) {
-        const { object: sketch } = yield* Operation.invoke(SketchOperation.Create, { name: 'Portrait' });
-        yield* Database.add(sketch);
+        const { object: drawing } = yield* Operation.invoke(DrawingOperation.Create, { name: 'Portrait' });
+        yield* Database.add(drawing);
         yield* Database.flush();
-        const ref = Ref.make(sketch);
+        const ref = Ref.make(drawing);
 
         // Draw a face.
-        const face = yield* Operation.invoke(SketchOperation.Edit, {
-          sketch: ref,
+        const face = yield* Operation.invoke(DrawingOperation.Edit, {
+          drawing: ref,
           commands: [
             {
               op: 'upsert-object',
@@ -90,14 +88,14 @@ describe('tldraw sketch variant', () => {
         expect(face.scene.objects).toHaveLength(1);
 
         // Read the scene (what the agent would do before a follow-up edit).
-        const read = yield* Operation.invoke(SketchOperation.Read, { sketch: ref });
+        const read = yield* Operation.invoke(DrawingOperation.Read, { drawing: ref });
         const readFace = read.scene.objects.find((object) => object.id === 'face');
         expect(readFace?.origin).toEqual({ x: 100, y: 100 });
         expect(readFace?.elements.map((element) => element.id)).toEqual(['head', 'left-eye', 'right-eye', 'smile']);
 
         // Add a hat above the face and turn the smile into a frown — by id, without resending the face.
-        const edit = yield* Operation.invoke(SketchOperation.Edit, {
-          sketch: ref,
+        const edit = yield* Operation.invoke(DrawingOperation.Edit, {
+          drawing: ref,
           commands: [
             {
               op: 'upsert-object',
@@ -128,8 +126,8 @@ describe('tldraw sketch variant', () => {
         );
 
         // Remove the hat again.
-        const removed = yield* Operation.invoke(SketchOperation.Edit, {
-          sketch: ref,
+        const removed = yield* Operation.invoke(DrawingOperation.Edit, {
+          drawing: ref,
           commands: [{ op: 'remove-object', objectId: 'hat' }],
         });
         expect(removed.scene.objects.map((object) => object.id)).toEqual(['face']);

package/dist/lib/chunk-sketch-variant.mjs

@@ -1,23 +0,0 @@
-import { i as makeCanvas, n as Canvas } from "./chunk-types.mjs";
-import { Capability } from "@dxos/app-framework";
-import { Type } from "@dxos/echo";
-import * as Effect from "effect/Effect";
-import { IllustratorCapabilities } from "@dxos/plugin-illustrator/types";
-import { TldrawArticle, TldrawCard } from "#containers";
-import { tldrawBuilder } from "#model";
-//#region src/capabilities/sketch-variant.ts
-var variant = {
-	id: Type.getTypename(Canvas),
-	label: "tldraw",
-	icon: "ph--compass-tool--regular",
-	canvasType: Canvas,
-	createCanvas: () => Effect.sync(() => makeCanvas()),
-	builder: tldrawBuilder,
-	card: TldrawCard,
-	article: TldrawArticle
-};
-var sketch_variant_default = Capability.makeModule(() => Effect.succeed(Capability.contributes(IllustratorCapabilities.VariantProvider, variant)));
-//#endregion
-export { sketch_variant_default as default };
-
-//# sourceMappingURL=chunk-sketch-variant.mjs.map

package/dist/lib/chunk-sketch-variant.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"chunk-sketch-variant.mjs","names":[],"sources":["../../src/capabilities/sketch-variant.ts"],"sourcesContent":["//\n// Copyright 2026 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\n\nimport { Capability } from '@dxos/app-framework';\nimport { Type } from '@dxos/echo';\nimport { IllustratorCapabilities, type SketchVariant } from '@dxos/plugin-illustrator/types';\n\nimport { TldrawArticle, TldrawCard } from '#containers';\nimport { tldrawBuilder } from '#model';\n\nimport { Tldraw } from '../types';\n\nconst variant: SketchVariant = {\n  id: Type.getTypename(Tldraw.Canvas),\n  label: 'tldraw',\n  icon: 'ph--compass-tool--regular',\n  canvasType: Tldraw.Canvas,\n  createCanvas: () => Effect.sync(() => Tldraw.makeCanvas()),\n  builder: tldrawBuilder,\n  card: TldrawCard,\n  article: TldrawArticle,\n};\n\nexport default Capability.makeModule(() =>\n  Effect.succeed(Capability.contributes(IllustratorCapabilities.VariantProvider, variant)),\n);\n"],"mappings":";;;;;;;;AAeA,IAAM,UAAyB;CAC7B,IAAI,KAAK,YAAY,MAAa;CAClC,OAAO;CACP,MAAM;CACN,YAAY;CACZ,oBAAoB,OAAO,WAAW,WAAkB,CAAC;CACzD,SAAS;CACT,MAAM;CACN,SAAS;AACX;AAEA,IAAA,yBAAe,WAAW,iBACxB,OAAO,QAAQ,WAAW,YAAY,wBAAwB,iBAAiB,OAAO,CAAC,CACzF"}

package/dist/types/src/capabilities/sketch-variant.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"sketch-variant.d.ts","sourceRoot":"","sources":["../../../../src/capabilities/sketch-variant.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC"}

package/dist/types/src/model/TldrawBuilder.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=TldrawBuilder.test.d.ts.map

package/dist/types/src/model/TldrawBuilder.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"TldrawBuilder.test.d.ts","sourceRoot":"","sources":["../../../../src/model/TldrawBuilder.test.ts"],"names":[],"mappings":""}

package/dist/types/src/model/apply.d.ts

@@ -1,5 +0,0 @@
-import { type ApplyResult, type Scene } from '@dxos/plugin-illustrator/model';
-import { type CanvasContent } from './TldrawBuilder';
-/** Apply a batch of edit commands to the canvas content (mutates `content`). */
-export declare const applyCommands: (content: CanvasContent, commands: readonly Scene.Command[]) => ApplyResult;
-//# sourceMappingURL=apply.d.ts.map

package/dist/types/src/model/apply.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../../../src/model/apply.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAI9E,OAAO,EAAE,KAAK,aAAa,EAAwB,MAAM,iBAAiB,CAAC;AAE3E,gFAAgF;AAChF,eAAO,MAAM,aAAa,YAAa,aAAa,YAAY,SAAS,KAAK,CAAC,OAAO,EAAE,KAAG,WA8D1F,CAAC"}

package/src/model/apply.ts

@@ -1,132 +0,0 @@
-//
-// Copyright 2026 DXOS.org
-//
-
-//
-// Applies scene DSL edit commands to canvas content by mutating the record map in place
-// (callers wrap the call in `Obj.update` so a batch commits atomically).
-//
-
-import { invariant } from '@dxos/invariant';
-import { type ApplyResult, type Scene } from '@dxos/plugin-illustrator/model';
-
-import { elementBoxes, readScene } from './read';
-import { renderObject } from './render';
-import { type CanvasContent, DOCUMENT_ID, PAGE_ID } from './TldrawBuilder';
-
-/** Apply a batch of edit commands to the canvas content (mutates `content`). */
-export const applyCommands = (content: CanvasContent, commands: readonly Scene.Command[]): ApplyResult => {
-  ensurePage(content);
-  const upserted = new Set<string>();
-  let removed = 0;
-
-  for (const command of commands) {
-    switch (command.op) {
-      case 'upsert-object': {
-        const previous = readScene(content).scene.objects.find((object) => object.id === command.object.id);
-        removed += remove(content, (record) => record.meta?.object === command.object.id);
-        merge(content, command.object, {
-          origin: command.object.origin ?? previous?.origin ?? { x: 0, y: 0 },
-          scale: command.object.scale ?? previous?.scale ?? 1,
-        });
-        upserted.add(command.object.id);
-        break;
-      }
-      case 'upsert-elements': {
-        const previous = readScene(content).scene.objects.find((object) => object.id === command.objectId);
-        invariant(previous, `unknown object: ${command.objectId} (use upsert-object to create it)`);
-        const ids = new Set(command.elements.map((element) => element.id));
-        removed += remove(
-          content,
-          (record) => record.meta?.object === command.objectId && ids.has(record.meta?.element),
-        );
-        merge(
-          content,
-          { id: command.objectId, elements: command.elements },
-          { origin: previous.origin, scale: previous.scale },
-        );
-        upserted.add(command.objectId);
-        break;
-      }
-      case 'remove-elements': {
-        const ids = new Set(command.elementIds);
-        removed += remove(
-          content,
-          (record) => record.meta?.object === command.objectId && ids.has(record.meta?.element),
-        );
-        break;
-      }
-      case 'remove-object': {
-        removed += remove(content, (record) => record.meta?.object === command.objectId);
-        break;
-      }
-      case 'move-object': {
-        const previous = readScene(content).scene.objects.find((object) => object.id === command.objectId);
-        invariant(previous, `unknown object: ${command.objectId}`);
-        const delta = { x: command.origin.x - previous.origin.x, y: command.origin.y - previous.origin.y };
-        for (const record of Object.values(content)) {
-          if (record?.typeName === 'shape' && record.meta?.object === command.objectId) {
-            record.x += delta.x;
-            record.y += delta.y;
-          }
-        }
-        upserted.add(command.objectId);
-        break;
-      }
-    }
-  }
-
-  return { upserted: [...upserted], removed };
-};
-
-const merge = (
-  content: CanvasContent,
-  object: Scene.WorldObject | { id: string; elements: readonly Scene.Element[] },
-  placement: { origin: Scene.Point; scale: number },
-): void => {
-  const records = renderObject(object, {
-    ...placement,
-    indexStart: nextIndex(content),
-    external: elementBoxes(content),
-  });
-  Object.assign(content, records);
-};
-
-/** Delete matching shape records, then any bindings left dangling. */
-const remove = (content: CanvasContent, predicate: (record: any) => boolean): number => {
-  let removed = 0;
-  for (const [key, record] of Object.entries(content)) {
-    if (record?.typeName === 'shape' && predicate(record)) {
-      delete content[key];
-      removed++;
-    }
-  }
-  for (const [key, record] of Object.entries(content)) {
-    if (record?.typeName === 'binding' && (!content[record.fromId] || !content[record.toId])) {
-      delete content[key];
-    }
-  }
-  return removed;
-};
-
-/** Seed the fractional-index counter past any existing `a<n>` indexes. */
-const nextIndex = (content: CanvasContent): number => {
-  let max = 0;
-  let shapes = 0;
-  for (const record of Object.values(content)) {
-    if (record?.typeName !== 'shape') {
-      continue;
-    }
-    shapes++;
-    const match = /^a(\d+)$/.exec(record.index ?? '');
-    if (match) {
-      max = Math.max(max, Number(match[1]));
-    }
-  }
-  return Math.max(max, shapes);
-};
-
-const ensurePage = (content: CanvasContent): void => {
-  content[DOCUMENT_ID] ??= { gridSize: 10, name: '', meta: {}, id: DOCUMENT_ID, typeName: 'document' };
-  content[PAGE_ID] ??= { meta: {}, id: PAGE_ID, name: 'Page 1', index: 'a1', typeName: 'page' };
-};