@dxos/plugin-script 0.8.3-main.672df60 → 0.8.3-main.7f5a14c

package/dist/types/src/components/TypescriptEditor/TypescriptEditor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TypescriptEditor.d.ts","sourceRoot":"","sources":["../../../../../src/components/TypescriptEditor/TypescriptEditor.tsx"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,4BAA4B,EAAE,MAAM,iBAAiB,CAAC;AAGpE,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAIL,KAAK,eAAe,EAMpB,KAAK,kBAAkB,EACxB,MAAM,uBAAuB,CAAC;AAG/B,MAAM,MAAM,qBAAqB,GAAG;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,GAAG,CAAC,EAAE,4BAA4B,CAAC;IACnC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,IAAI,CAAC,kBAAkB,EAAE,WAAW,GAAG,cAAc,GAAG,YAAY,GAAG,UAAU,GAAG,WAAW,CAAC,CAAC;AAErG,eAAO,MAAM,gBAAgB,GAAI,4FAU9B,qBAAqB,sBAsDvB,CAAC;AAqCF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"TypescriptEditor.d.ts","sourceRoot":"","sources":["../../../../../src/components/TypescriptEditor/TypescriptEditor.tsx"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,4BAA4B,EAAE,MAAM,iBAAiB,CAAC;AAGpE,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,KAAK,eAAe,EAAmC,MAAM,gBAAgB,CAAC;AACvF,OAAO,EACL,KAAK,eAAe,EAEpB,KAAK,kBAAkB,EAMxB,MAAM,uBAAuB,CAAC;AAI/B,MAAM,MAAM,qBAAqB,GAAG,eAAe,CACjD;IACE,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,GAAG,CAAC,EAAE,4BAA4B,CAAC;CACpC,GAAG,IAAI,CAAC,kBAAkB,EAAE,cAAc,GAAG,YAAY,GAAG,UAAU,GAAG,WAAW,CAAC,CACvF,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,6FAU9B,qBAAqB,sBA+CvB,CAAC;AAqCF,eAAe,gBAAgB,CAAC"}

package/dist/types/src/components/index.d.ts

@@ -1,7 +1,7 @@
 export * from './Settings';
 export * from './TestPanel';
 export { DEPLOYMENT_DIALOG } from './DeploymentDialog';
-export declare const ScriptContainer: import("react").LazyExoticComponent<({ classNames, role, script, settings, env, }: import("./ScriptContainer").ScriptEditorProps) => import("react").JSX.Element>;
+export declare const ScriptContainer: import("react").LazyExoticComponent<({ role, script, settings, env }: import("./ScriptContainer").ScriptEditorProps) => import("react").JSX.Element>;
 export declare const DeploymentDialog: import("react").LazyExoticComponent<({ accessToken, scriptTemplates }: {
     accessToken: import("@dxos/schema").DataType.AccessToken;
     scriptTemplates: import("../templates").Template[];

package/dist/types/src/components/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/index.ts"],"names":[],"mappings":"AAMA,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,eAAO,MAAM,eAAe,mKAA0C,CAAC;AACvE,eAAO,MAAM,gBAAgB;;;kCAA2C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/index.ts"],"names":[],"mappings":"AAMA,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,eAAO,MAAM,eAAe,sJAA0C,CAAC;AACvE,eAAO,MAAM,gBAAgB;;;kCAA2C,CAAC"}

package/dist/types/src/hooks/format.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../../../src/hooks/format.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAMlD,MAAM,MAAM,sBAAsB,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC;AAExD,eAAO,MAAM,YAAY,GAAI,QAAQ,UAAU;;;;;;;;;;;;;;;;CA8B9C,CAAC"}
+{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../../../src/hooks/format.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAMlD,MAAM,MAAM,sBAAsB,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC;AAExD,eAAO,MAAM,YAAY,GAAI,QAAQ,UAAU;;;;;;;;;;;;;;;;CAmC9C,CAAC"}

package/dist/types/src/util/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../src/util/deploy.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EACL,YAAY,EACZ,KAAK,UAAU,EAIhB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAA0B,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAI7E,eAAO,MAAM,gBAAgB,GAAI,gBAAgB;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,EAAE,EAAE,GAAG,CAAA;CAAE,KAAG,OAGlF,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,CAAC;IACb,EAAE,CAAC,EAAE,YAAY,CAAC;IAClB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,KAAK,kBAAkB,GAAG;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEpF;;GAEG;AACH,eAAO,MAAM,YAAY,GAAU,qDAMhC,iBAAiB,KAAG,OAAO,CAAC,kBAAkB,CAsChD,CAAC"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../src/util/deploy.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EACL,YAAY,EACZ,KAAK,UAAU,EAIhB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAIrD,eAAO,MAAM,gBAAgB,GAAI,gBAAgB;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,EAAE,EAAE,GAAG,CAAA;CAAE,KAAG,OAGlF,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,CAAC;IACb,EAAE,CAAC,EAAE,YAAY,CAAC;IAClB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,KAAK,kBAAkB,GAAG;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEpF;;GAEG;AACH,eAAO,MAAM,YAAY,GAAU,qDAMhC,iBAAiB,KAAG,OAAO,CAAC,kBAAkB,CAsChD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-script",
-  "version": "0.8.3-main.672df60",
+  "version": "0.8.3-main.7f5a14c",
   "description": "Braneframe notebook plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -54,48 +54,48 @@
     "prettier": "^3.2.4",
     "react-syntax-highlighter": "^15.5.0",
     "typescript": "^5.8.3",
-    "@dxos/ai": "0.8.3-main.672df60",
-    "@dxos/app-framework": "0.8.3-main.672df60",
-    "@dxos/artifact": "0.8.3-main.672df60",
-    "@dxos/assistant": "0.8.3-main.672df60",
-    "@dxos/async": "0.8.3-main.672df60",
-    "@dxos/client": "0.8.3-main.672df60",
-    "@dxos/client-protocol": "0.8.3-main.672df60",
-    "@dxos/debug": "0.8.3-main.672df60",
-    "@dxos/compute": "0.8.3-main.672df60",
-    "@dxos/devtools": "0.8.3-main.672df60",
-    "@dxos/echo": "0.8.3-main.672df60",
-    "@dxos/echo-protocol": "0.8.3-main.672df60",
-    "@dxos/echo-schema": "0.8.3-main.672df60",
-    "@dxos/functions": "0.8.3-main.672df60",
-    "@dxos/invariant": "0.8.3-main.672df60",
-    "@dxos/keys": "0.8.3-main.672df60",
-    "@dxos/live-object": "0.8.3-main.672df60",
-    "@dxos/local-storage": "0.8.3-main.672df60",
-    "@dxos/plugin-deck": "0.8.3-main.672df60",
-    "@dxos/plugin-explorer": "0.8.3-main.672df60",
-    "@dxos/plugin-markdown": "0.8.3-main.672df60",
-    "@dxos/log": "0.8.3-main.672df60",
-    "@dxos/plugin-graph": "0.8.3-main.672df60",
-    "@dxos/plugin-client": "0.8.3-main.672df60",
-    "@dxos/plugin-space": "0.8.3-main.672df60",
-    "@dxos/plugin-theme": "0.8.3-main.672df60",
-    "@dxos/plugin-stack": "0.8.3-main.672df60",
-    "@dxos/plugin-token-manager": "0.8.3-main.672df60",
-    "@dxos/react-client": "0.8.3-main.672df60",
-    "@dxos/react-edge-client": "0.8.3-main.672df60",
-    "@dxos/react-ui-attention": "0.8.3-main.672df60",
-    "@dxos/react-ui-editor": "0.8.3-main.672df60",
-    "@dxos/protocols": "0.8.3-main.672df60",
-    "@dxos/react-ui-form": "0.8.3-main.672df60",
-    "@dxos/react-ui-list": "0.8.3-main.672df60",
-    "@dxos/react-ui-menu": "0.8.3-main.672df60",
-    "@dxos/react-ui-syntax-highlighter": "0.8.3-main.672df60",
-    "@dxos/rpc-tunnel": "0.8.3-main.672df60",
-    "@dxos/react-ui-stack": "0.8.3-main.672df60",
-    "@dxos/rpc": "0.8.3-main.672df60",
-    "@dxos/schema": "0.8.3-main.672df60",
-    "@dxos/util": "0.8.3-main.672df60"
+    "@dxos/ai": "0.8.3-main.7f5a14c",
+    "@dxos/app-framework": "0.8.3-main.7f5a14c",
+    "@dxos/assistant": "0.8.3-main.7f5a14c",
+    "@dxos/async": "0.8.3-main.7f5a14c",
+    "@dxos/artifact": "0.8.3-main.7f5a14c",
+    "@dxos/client": "0.8.3-main.7f5a14c",
+    "@dxos/compute": "0.8.3-main.7f5a14c",
+    "@dxos/debug": "0.8.3-main.7f5a14c",
+    "@dxos/echo": "0.8.3-main.7f5a14c",
+    "@dxos/client-protocol": "0.8.3-main.7f5a14c",
+    "@dxos/devtools": "0.8.3-main.7f5a14c",
+    "@dxos/echo-protocol": "0.8.3-main.7f5a14c",
+    "@dxos/echo-schema": "0.8.3-main.7f5a14c",
+    "@dxos/functions": "0.8.3-main.7f5a14c",
+    "@dxos/invariant": "0.8.3-main.7f5a14c",
+    "@dxos/live-object": "0.8.3-main.7f5a14c",
+    "@dxos/keys": "0.8.3-main.7f5a14c",
+    "@dxos/local-storage": "0.8.3-main.7f5a14c",
+    "@dxos/log": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-client": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-deck": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-explorer": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-graph": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-markdown": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-stack": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-theme": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-space": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-token-manager": "0.8.3-main.7f5a14c",
+    "@dxos/react-client": "0.8.3-main.7f5a14c",
+    "@dxos/react-edge-client": "0.8.3-main.7f5a14c",
+    "@dxos/protocols": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-attention": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-editor": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-form": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-menu": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-list": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-stack": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-syntax-highlighter": "0.8.3-main.7f5a14c",
+    "@dxos/rpc": "0.8.3-main.7f5a14c",
+    "@dxos/rpc-tunnel": "0.8.3-main.7f5a14c",
+    "@dxos/util": "0.8.3-main.7f5a14c",
+    "@dxos/schema": "0.8.3-main.7f5a14c"
   },
   "devDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -107,10 +107,10 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/react-ui": "0.8.3-main.672df60",
-    "@dxos/react-ui-theme": "0.8.3-main.672df60",
-    "@dxos/storybook-utils": "0.8.3-main.672df60",
-    "@dxos/random": "0.8.3-main.672df60"
+    "@dxos/react-ui": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-theme": "0.8.3-main.7f5a14c",
+    "@dxos/storybook-utils": "0.8.3-main.7f5a14c",
+    "@dxos/random": "0.8.3-main.7f5a14c"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -119,8 +119,8 @@
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui-theme": "0.8.3-main.672df60",
-    "@dxos/react-ui": "0.8.3-main.672df60"
+    "@dxos/react-ui": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-theme": "0.8.3-main.7f5a14c"
   },
   "publishConfig": {
     "access": "public"

package/src/capabilities/app-graph-builder.ts

@@ -6,7 +6,7 @@ import { Rx } from '@effect-rx/rx-react';
 import { Option, pipe } from 'effect';
 
 import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
-import { isInstanceOf } from '@dxos/echo-schema';
+import { Obj } from '@dxos/echo';
 import { ScriptType } from '@dxos/functions';
 import { PLANK_COMPANION_TYPE, ATTENDABLE_PATH_SEPARATOR } from '@dxos/plugin-deck/types';
 import { createExtension } from '@dxos/plugin-graph';
@@ -21,7 +21,7 @@ export default (context: PluginContext) =>
         Rx.make((get) =>
           pipe(
             get(node),
-            Option.flatMap((node) => (isInstanceOf(ScriptType, node.data) ? Option.some(node) : Option.none())),
+            Option.flatMap((node) => (Obj.instanceOf(ScriptType, node.data) ? Option.some(node) : Option.none())),
             Option.map((node) => [
               {
                 id: [node.id, 'execute'].join(ATTENDABLE_PATH_SEPARATOR),
@@ -44,7 +44,7 @@ export default (context: PluginContext) =>
         Rx.make((get) =>
           pipe(
             get(node),
-            Option.flatMap((node) => (isInstanceOf(ScriptType, node.data) ? Option.some(node) : Option.none())),
+            Option.flatMap((node) => (Obj.instanceOf(ScriptType, node.data) ? Option.some(node) : Option.none())),
             Option.map((node) => [
               {
                 id: [node.id, 'logs'].join(ATTENDABLE_PATH_SEPARATOR),

package/src/capabilities/artifact-definition.ts

@@ -8,10 +8,11 @@ import { createTool, ToolResult } from '@dxos/ai';
 import { Capabilities, contributes, createIntent, type PromiseIntentDispatcher } from '@dxos/app-framework';
 import { ArtifactId, defineArtifact } from '@dxos/artifact';
 import { createArtifactElement } from '@dxos/assistant';
+import { Filter, Obj, Ref } from '@dxos/echo';
 import { ScriptType } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 import { SpaceAction } from '@dxos/plugin-space/types';
-import { Filter, live, makeRef, type Space } from '@dxos/react-client/echo';
+import { type Space } from '@dxos/react-client/echo';
 import { DataType } from '@dxos/schema';
 
 import { meta } from '../meta';
@@ -154,10 +155,10 @@ export default () => {
         execute: async ({ name, code }, { extensions }) => {
           invariant(extensions?.space, 'No space');
           invariant(extensions?.dispatch, 'No intent dispatcher');
-          const script = live(ScriptType, {
+          const script = Obj.make(ScriptType, {
             name,
-            source: makeRef(
-              live(DataType.Text, {
+            source: Ref.make(
+              Obj.make(DataType.Text, {
                 content: code,
               }),
             ),

package/src/capabilities/intent-resolver.ts

@@ -6,8 +6,8 @@ import { Octokit } from '@octokit/core';
 import { Predicate } from 'effect';
 
 import { contributes, Capabilities, createResolver, createIntent, LayoutAction } from '@dxos/app-framework';
+import { Obj, Ref } from '@dxos/echo';
 import { ScriptType } from '@dxos/functions';
-import { live, makeRef } from '@dxos/live-object';
 import { TokenManagerAction } from '@dxos/plugin-token-manager/types';
 import { DataType } from '@dxos/schema';
 
@@ -47,9 +47,9 @@ export default () =>
 
         return {
           data: {
-            object: live(ScriptType, {
+            object: Obj.make(ScriptType, {
               name,
-              source: makeRef(live(DataType.Text, { content })),
+              source: Ref.make(Obj.make(DataType.Text, { content })),
             }),
           },
         };

package/src/capabilities/react-surface.tsx

@@ -6,7 +6,7 @@ import React from 'react';
 
 import { Capabilities, contributes, createSurface, useCapability } from '@dxos/app-framework';
 import { InvocationTraceContainer } from '@dxos/devtools';
-import { isInstanceOf } from '@dxos/echo-schema';
+import { Obj } from '@dxos/echo';
 import { ScriptType } from '@dxos/functions';
 import { SettingsStore } from '@dxos/local-storage';
 import { getSpace } from '@dxos/react-client/echo';
@@ -38,7 +38,7 @@ export default () =>
     createSurface({
       id: `${meta.id}/article`,
       role: 'article',
-      filter: (data): data is { subject: ScriptType } => isInstanceOf(ScriptType, data.subject),
+      filter: (data): data is { subject: ScriptType } => Obj.instanceOf(ScriptType, data.subject),
       component: ({ data, role }) => {
         const compiler = useCapability(ScriptCapabilities.Compiler);
         // TODO(dmaretskyi): Since settings store is not reactive, this would break on the script plugin being enabled without a page reload.
@@ -49,27 +49,27 @@ export default () =>
     createSurface({
       id: `${meta.id}/companion/base-settings`,
       role: 'base-object-settings',
-      filter: (data): data is { subject: ScriptType } => isInstanceOf(ScriptType, data.subject),
+      filter: (data): data is { subject: ScriptType } => Obj.instanceOf(ScriptType, data.subject),
       component: ({ data }) => <ScriptProperties object={data.subject} />,
     }),
     createSurface({
       id: `${meta.id}/companion/settings`,
       role: 'object-settings',
-      filter: (data): data is { subject: ScriptType } => isInstanceOf(ScriptType, data.subject),
+      filter: (data): data is { subject: ScriptType } => Obj.instanceOf(ScriptType, data.subject),
       component: ({ data }) => <ScriptObjectSettings object={data.subject} />,
     }),
     createSurface({
       id: `${meta.id}/companion/execute`,
       role: 'article',
       filter: (data): data is { companionTo: ScriptType } =>
-        isInstanceOf(ScriptType, data.companionTo) && data.subject === 'execute',
+        Obj.instanceOf(ScriptType, data.companionTo) && data.subject === 'execute',
       component: ({ data, role }) => <TestContainer script={data.companionTo} role={role} />,
     }),
     createSurface({
       id: `${meta.id}/companion/logs`,
       role: 'article',
       filter: (data): data is { companionTo: ScriptType } =>
-        isInstanceOf(ScriptType, data.companionTo) && data.subject === 'logs',
+        Obj.instanceOf(ScriptType, data.companionTo) && data.subject === 'logs',
       component: ({ data, role }) => {
         const space = getSpace(data.companionTo);
         return (

package/src/capabilities/settings.ts

@@ -9,6 +9,13 @@ import { meta } from '../meta';
 import { ScriptSettingsSchema } from '../types';
 
 export default () => {
-  const settings = live(ScriptSettingsSchema, { editorInputMode: 'vscode' });
-  return contributes(Capabilities.Settings, { schema: ScriptSettingsSchema, prefix: meta.id, value: settings });
+  const settings = live(ScriptSettingsSchema, {
+    editorInputMode: 'vscode',
+  });
+
+  return contributes(Capabilities.Settings, {
+    prefix: meta.id,
+    schema: ScriptSettingsSchema,
+    value: settings,
+  });
 };

package/src/components/ScriptContainer.tsx

@@ -7,52 +7,44 @@ import React, { useMemo } from 'react';
 import { type ScriptType } from '@dxos/functions';
 import { createDocAccessor, getSpace } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
-import { type ThemedClassName } from '@dxos/react-ui';
 import { createDataExtensions, listener, stackItemContentEditorClassNames } from '@dxos/react-ui-editor';
-import { StackItem } from '@dxos/react-ui-stack';
-import { mx } from '@dxos/react-ui-theme';
+import { StackItem, type StackItemContentProps } from '@dxos/react-ui-stack';
 
 import { ScriptToolbar } from './ScriptToolbar';
 import { TypescriptEditor, type TypescriptEditorProps } from './TypescriptEditor';
 import { useDeployState, useToolbarState } from '../hooks';
 import { type ScriptSettingsProps } from '../types';
 
-export type ScriptEditorProps = ThemedClassName<
-  {
-    role?: string;
-    script: ScriptType;
-    settings?: ScriptSettingsProps;
-  } & Pick<TypescriptEditorProps, 'env'>
->;
+export type ScriptEditorProps = Pick<StackItemContentProps, 'role'> & {
+  script: ScriptType;
+  settings?: ScriptSettingsProps;
+} & Pick<TypescriptEditorProps, 'env'>;
 
-export const ScriptContainer = ({
-  classNames,
-  role,
-  script,
-  settings = { editorInputMode: 'vscode' },
-  env,
-}: ScriptEditorProps) => {
+export const ScriptContainer = ({ role, script, settings = { editorInputMode: 'vscode' }, env }: ScriptEditorProps) => {
   const identity = useIdentity();
   const space = getSpace(script);
   const state = useToolbarState();
   useDeployState({ state, script });
 
   const extensions = useMemo(
-    () => [
-      listener({
-        onChange: (text) => {
-          if (script.source.target && script.source.target.content !== text) {
-            script.changed = true;
-          }
-        },
-      }),
-      createDataExtensions({
-        id: script.id,
-        text: script.source.target && createDocAccessor(script.source.target, ['content']),
-        space,
-        identity,
-      }),
-    ],
+    () =>
+      script.source.target
+        ? [
+            listener({
+              onChange: (text) => {
+                if (script.source.target?.content !== text) {
+                  script.changed = true;
+                }
+              },
+            }),
+            createDataExtensions({
+              id: script.id,
+              text: createDocAccessor(script.source.target, ['content']),
+              space,
+              identity,
+            }),
+          ]
+        : [],
     [identity, space, script, script.source.target],
   );
 
@@ -64,7 +56,7 @@ export const ScriptContainer = ({
         env={env}
         initialValue={script.source?.target?.content}
         extensions={extensions}
-        className={mx(stackItemContentEditorClassNames(role))}
+        classNames={stackItemContentEditorClassNames(role)}
         inputMode={settings.editorInputMode}
         toolbar
       />

package/src/components/ScriptToolbar/ScriptToolbar.tsx

@@ -21,12 +21,6 @@ import {
 } from '../../hooks';
 import { SCRIPT_PLUGIN } from '../../meta';
 
-export type ScriptToolbarProps = ThemedClassName<{
-  role?: string;
-  script: ScriptType;
-  state: ScriptToolbarState;
-}>;
-
 const createToolbar = ({ state, script, ...options }: CreateDeployOptions) =>
   Rx.make((get) =>
     get(
@@ -43,6 +37,12 @@ const createToolbar = ({ state, script, ...options }: CreateDeployOptions) =>
     ),
   );
 
+export type ScriptToolbarProps = ThemedClassName<{
+  role?: string;
+  script: ScriptType;
+  state: ScriptToolbarState;
+}>;
+
 export const ScriptToolbar = ({ script, role, state, classNames }: ScriptToolbarProps) => {
   const { t } = useTranslation(SCRIPT_PLUGIN);
   const options = useDeployDeps({ script });

package/src/components/TypescriptEditor/TypescriptEditor.tsx

@@ -13,44 +13,47 @@ import { continueKeymap } from '@valtown/codemirror-continue';
 import { tsSync, tsFacet, tsLinter, tsAutocomplete, tsHover, type HoverInfo } from '@valtown/codemirror-ts';
 import React from 'react';
 
-import { type ThemeMode, useThemeContext } from '@dxos/react-ui';
+import { type ThemedClassName, type ThemeMode, useThemeContext } from '@dxos/react-ui';
 import {
+  type EditorInputMode,
+  InputModeExtensions,
+  type UseTextEditorProps,
   autocomplete,
   createBasicExtensions,
   createThemeExtensions,
-  type EditorInputMode,
-  editorMonospace,
-  EditorView,
   folding,
-  InputModeExtensions,
   useTextEditor,
-  type UseTextEditorProps,
 } from '@dxos/react-ui-editor';
+import { mx } from '@dxos/react-ui-theme';
 import { isNonNullable } from '@dxos/util';
 
-export type TypescriptEditorProps = {
-  id: string;
-  inputMode?: EditorInputMode;
-  env?: VirtualTypeScriptEnvironment;
-  toolbar?: boolean;
-} & Pick<UseTextEditorProps, 'className' | 'initialValue' | 'extensions' | 'scrollTo' | 'selection'>;
+export type TypescriptEditorProps = ThemedClassName<
+  {
+    id: string;
+    inputMode?: EditorInputMode;
+    toolbar?: boolean;
+    env?: VirtualTypeScriptEnvironment;
+  } & Pick<UseTextEditorProps, 'initialValue' | 'extensions' | 'scrollTo' | 'selection'>
+>;
 
 export const TypescriptEditor = ({
+  classNames,
   id,
+  inputMode = 'vscode',
+  toolbar,
   env,
-  className,
   initialValue,
   extensions,
   scrollTo,
   selection,
-  toolbar,
-  inputMode = 'vscode',
 }: TypescriptEditorProps) => {
   const { themeMode } = useThemeContext();
   const { parentRef, focusAttributes } = useTextEditor(
     () => ({
       id,
       initialValue,
+      selection,
+      scrollTo,
       extensions: [
         extensions,
         createBasicExtensions({
@@ -58,46 +61,37 @@ export const TypescriptEditor = ({
           indentWithTab: true,
           lineNumbers: true,
           lineWrapping: false,
+          monospace: true,
           scrollPastEnd: true,
         }),
-        createThemeExtensions({
-          themeMode,
-          syntaxHighlighting: true,
-        }),
-        // NOTE: Not using default editor gutter because folding for code works best right beside text.
-        EditorView.theme({
-          '.cm-gutters': {
-            background: 'var(--dx-baseSurface)',
-          },
-        }),
+        createThemeExtensions({ themeMode, syntaxHighlighting: true }),
         InputModeExtensions[inputMode],
         folding(),
-        // Continues block comments when you hit Enter.
+        // Continues block comments when pressing Enter.
         Prec.high(keymap.of(continueKeymap)),
+
         // TODO(burdon): Factor out.
-        [
-          editorMonospace,
-          javascript({ typescript: true }),
-          // https://github.com/val-town/codemirror-ts
-          autocomplete({ override: env ? [tsAutocomplete()] : [] }),
-          env
-            ? [
-                tsFacet.of({ env, path: `/src/${id}.ts` }),
-                tsSync(),
-                tsLinter(),
-                tsHover({ renderTooltip: createTooltipRenderer(themeMode) }),
-              ]
-            : [],
+        javascript({ typescript: true }),
+        // https://github.com/val-town/codemirror-ts
+        autocomplete({ override: env ? [tsAutocomplete()] : undefined }),
+        env && [
+          tsFacet.of({ env, path: `/src/${id}.ts` }),
+          tsSync(),
+          tsLinter(),
+          tsHover({ renderTooltip: createTooltipRenderer(themeMode) }),
         ],
       ].filter(isNonNullable),
-      selection,
-      scrollTo,
     }),
     [id, extensions, themeMode, inputMode, selection, scrollTo],
   );
 
   return (
-    <div ref={parentRef} data-toolbar={toolbar ? 'enabled' : 'disabled'} className={className} {...focusAttributes} />
+    <div
+      ref={parentRef}
+      data-toolbar={toolbar ? 'enabled' : 'disabled'}
+      className={mx(classNames)}
+      {...focusAttributes}
+    />
   );
 };
 

package/src/hooks/format.ts

@@ -42,6 +42,11 @@ export const createFormat = (script: ScriptType) => {
 
   return {
     nodes: [formatAction],
-    edges: [{ source: 'root', target: 'format' }],
+    edges: [
+      {
+        source: 'root',
+        target: 'format',
+      },
+    ],
   };
 };

package/src/hooks/useCreateAndDeployScriptTemplates.ts

@@ -6,7 +6,7 @@ import { pipe } from 'effect/Function';
 import { useCallback, useState } from 'react';
 
 import { chain, createIntent, useIntentDispatcher } from '@dxos/app-framework';
-import { isInstanceOf } from '@dxos/echo-schema';
+import { Obj } from '@dxos/echo';
 import { ScriptType } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 import { SpaceAction } from '@dxos/plugin-space/types';
@@ -45,7 +45,7 @@ export const useCreateAndDeployScriptTemplates = (space: Space | undefined, scri
             chain(SpaceAction.AddObject, { target: space }),
           ),
         );
-        invariant(isInstanceOf(ScriptType, result.data?.object));
+        invariant(Obj.instanceOf(ScriptType, result.data?.object));
 
         return deployScript({ space, client, script: result.data.object });
       }),

package/src/util/deploy.ts

@@ -3,6 +3,7 @@
 //
 
 import { type Client } from '@dxos/client';
+import { Obj, Ref } from '@dxos/echo';
 import {
   FunctionType,
   type ScriptType,
@@ -13,12 +14,12 @@ import {
 import { Bundler } from '@dxos/functions/bundler';
 import { incrementSemverPatch, uploadWorkerFunction } from '@dxos/functions/edge';
 import { log } from '@dxos/log';
-import { live, getMeta, makeRef, type Space } from '@dxos/react-client/echo';
+import { type Space } from '@dxos/react-client/echo';
 
 import { updateFunctionMetadata } from './functions';
 
 export const isScriptDeployed = ({ script, fn }: { script: ScriptType; fn: any }): boolean => {
-  const existingFunctionUrl = fn && getUserFunctionUrlInMetadata(getMeta(fn));
+  const existingFunctionUrl = fn && getUserFunctionUrlInMetadata(Obj.getMeta(fn));
   return Boolean(existingFunctionUrl) && !script.changed;
 };
 
@@ -72,7 +73,7 @@ export const deployScript = async ({
     updateFunctionMetadata(script, storedFunction, meta, functionId);
 
     const functionUrl = makeFunctionUrl({ functionId });
-    setUserFunctionUrlInMetadata(getMeta(storedFunction), functionUrl);
+    setUserFunctionUrlInMetadata(Obj.getMeta(storedFunction), functionUrl);
 
     return { success: true, functionUrl };
   } catch (err: any) {
@@ -117,6 +118,6 @@ const createOrUpdateFunctionInSpace = (
     fn.version = version;
     return fn;
   } else {
-    return space.db.add(live(FunctionType, { name: functionId, version, source: makeRef(script) }));
+    return space.db.add(Obj.make(FunctionType, { name: functionId, version, source: Ref.make(script) }));
   }
 };