@dxos/plugin-pipeline 0.8.4-main.dfabb4ec29 → 0.8.4-main.effb148878

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-pipeline",
-  "version": "0.8.4-main.dfabb4ec29",
+  "version": "0.8.4-main.effb148878",
   "description": "Pipeline plugin for Composer",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
@@ -40,10 +40,12 @@
     },
     "#plugin": {
       "source": {
+        "workerd": "./src/PipelinePlugin.workerd.ts",
         "node": "./src/PipelinePlugin.node.ts",
         "default": "./src/PipelinePlugin.tsx"
       },
       "types": "./dist/types/src/PipelinePlugin.d.ts",
+      "workerd": "./dist/lib/neutral/PipelinePlugin.workerd.mjs",
       "node": "./dist/lib/neutral/PipelinePlugin.node.mjs",
       "default": "./dist/lib/neutral/PipelinePlugin.mjs"
     },
@@ -85,33 +87,33 @@
     "@radix-ui/react-context": "1.1.1",
     "@radix-ui/react-slot": "1.1.2",
     "effect": "3.20.0",
-    "@dxos/app-toolkit": "0.8.4-main.dfabb4ec29",
-    "@dxos/assistant-toolkit": "0.8.4-main.dfabb4ec29",
-    "@dxos/async": "0.8.4-main.dfabb4ec29",
-    "@dxos/compute": "0.8.4-main.dfabb4ec29",
-    "@dxos/devtools": "0.8.4-main.dfabb4ec29",
-    "@dxos/echo": "0.8.4-main.dfabb4ec29",
-    "@dxos/echo-atom": "0.8.4-main.dfabb4ec29",
-    "@dxos/log": "0.8.4-main.dfabb4ec29",
-    "@dxos/echo-query": "0.8.4-main.dfabb4ec29",
-    "@dxos/plugin-client": "0.8.4-main.dfabb4ec29",
-    "@dxos/plugin-deck": "0.8.4-main.dfabb4ec29",
-    "@dxos/plugin-graph": "0.8.4-main.dfabb4ec29",
-    "@dxos/plugin-markdown": "0.8.4-main.dfabb4ec29",
-    "@dxos/plugin-inbox": "0.8.4-main.dfabb4ec29",
-    "@dxos/plugin-space": "0.8.4-main.dfabb4ec29",
-    "@dxos/react-client": "0.8.4-main.dfabb4ec29",
-    "@dxos/react-ui-attention": "0.8.4-main.dfabb4ec29",
-    "@dxos/react-ui-components": "0.8.4-main.dfabb4ec29",
-    "@dxos/react-ui-form": "0.8.4-main.dfabb4ec29",
-    "@dxos/react-ui-list": "0.8.4-main.dfabb4ec29",
-    "@dxos/react-ui-menu": "0.8.4-main.dfabb4ec29",
-    "@dxos/react-ui-mosaic": "0.8.4-main.dfabb4ec29",
-    "@dxos/react-ui-stack": "0.8.4-main.dfabb4ec29",
-    "@dxos/types": "0.8.4-main.dfabb4ec29",
-    "@dxos/schema": "0.8.4-main.dfabb4ec29",
-    "@dxos/util": "0.8.4-main.dfabb4ec29",
-    "@dxos/app-framework": "0.8.4-main.dfabb4ec29"
+    "@dxos/app-framework": "0.8.4-main.effb148878",
+    "@dxos/app-toolkit": "0.8.4-main.effb148878",
+    "@dxos/assistant-toolkit": "0.8.4-main.effb148878",
+    "@dxos/async": "0.8.4-main.effb148878",
+    "@dxos/compute": "0.8.4-main.effb148878",
+    "@dxos/devtools": "0.8.4-main.effb148878",
+    "@dxos/echo": "0.8.4-main.effb148878",
+    "@dxos/echo-atom": "0.8.4-main.effb148878",
+    "@dxos/echo-query": "0.8.4-main.effb148878",
+    "@dxos/plugin-deck": "0.8.4-main.effb148878",
+    "@dxos/plugin-inbox": "0.8.4-main.effb148878",
+    "@dxos/plugin-client": "0.8.4-main.effb148878",
+    "@dxos/plugin-graph": "0.8.4-main.effb148878",
+    "@dxos/plugin-space": "0.8.4-main.effb148878",
+    "@dxos/log": "0.8.4-main.effb148878",
+    "@dxos/react-client": "0.8.4-main.effb148878",
+    "@dxos/plugin-markdown": "0.8.4-main.effb148878",
+    "@dxos/react-ui-components": "0.8.4-main.effb148878",
+    "@dxos/react-ui-form": "0.8.4-main.effb148878",
+    "@dxos/react-ui-attention": "0.8.4-main.effb148878",
+    "@dxos/react-ui-list": "0.8.4-main.effb148878",
+    "@dxos/react-ui-stack": "0.8.4-main.effb148878",
+    "@dxos/react-ui-menu": "0.8.4-main.effb148878",
+    "@dxos/react-ui-mosaic": "0.8.4-main.effb148878",
+    "@dxos/types": "0.8.4-main.effb148878",
+    "@dxos/util": "0.8.4-main.effb148878",
+    "@dxos/schema": "0.8.4-main.effb148878"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -119,25 +121,25 @@
     "@types/react-dom": "~19.2.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^8.0.10",
-    "@dxos/echo-db": "0.8.4-main.dfabb4ec29",
-    "@dxos/plugin-inbox": "0.8.4-main.dfabb4ec29",
-    "@dxos/plugin-preview": "0.8.4-main.dfabb4ec29",
-    "@dxos/plugin-testing": "0.8.4-main.dfabb4ec29",
-    "@dxos/plugin-theme": "0.8.4-main.dfabb4ec29",
-    "@dxos/plugin-attention": "0.8.4-main.dfabb4ec29",
-    "@dxos/react-ui": "0.8.4-main.dfabb4ec29",
-    "@dxos/random": "0.8.4-main.dfabb4ec29",
-    "@dxos/storybook-utils": "0.8.4-main.dfabb4ec29",
-    "@dxos/ui-theme": "0.8.4-main.dfabb4ec29"
+    "vite": "^8.0.14",
+    "@dxos/echo-db": "0.8.4-main.effb148878",
+    "@dxos/plugin-attention": "0.8.4-main.effb148878",
+    "@dxos/plugin-inbox": "0.8.4-main.effb148878",
+    "@dxos/plugin-preview": "0.8.4-main.effb148878",
+    "@dxos/plugin-theme": "0.8.4-main.effb148878",
+    "@dxos/random": "0.8.4-main.effb148878",
+    "@dxos/react-ui": "0.8.4-main.effb148878",
+    "@dxos/storybook-utils": "0.8.4-main.effb148878",
+    "@dxos/ui-theme": "0.8.4-main.effb148878",
+    "@dxos/plugin-testing": "0.8.4-main.effb148878"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.dfabb4ec29",
-    "@dxos/ui-theme": "0.8.4-main.dfabb4ec29"
+    "@dxos/ui-theme": "0.8.4-main.effb148878",
+    "@dxos/react-ui": "0.8.4-main.effb148878"
   },
   "publishConfig": {
     "access": "public"

package/src/PipelinePlugin.workerd.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Pipeline } from '@dxos/types';
+
+import { meta } from '#meta';
+
+export const PipelinePlugin = Plugin.define(meta).pipe(
+  AppPlugin.addSchemaModule({ schema: [Pipeline.Pipeline] }),
+  Plugin.make,
+);
+
+export default PipelinePlugin;

package/src/capabilities/create-object.ts

@@ -6,6 +6,7 @@ import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
 import { Operation } from '@dxos/compute';
+import { Type } from '@dxos/echo';
 import { SpaceOperation } from '@dxos/plugin-space';
 import { SpaceCapabilities } from '@dxos/plugin-space';
 import { Pipeline } from '@dxos/types';
@@ -13,7 +14,7 @@ import { Pipeline } from '@dxos/types';
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     return Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
-      id: Pipeline.Pipeline.typename,
+      id: Type.getTypename(Pipeline.Pipeline),
       createObject: (props, options) =>
         Effect.gen(function* () {
           const object = Pipeline.make(props);

package/src/capabilities/react-surface.tsx

@@ -13,7 +13,7 @@ import { Obj } from '@dxos/echo';
 import { Panel } from '@dxos/react-ui';
 import { Pipeline } from '@dxos/types';
 
-import { PipelineContainer, PipelineProperties } from '#containers';
+import { PipelineArticle, PipelineProperties } from '#containers';
 
 export default Capability.makeModule(() =>
   Effect.succeed(
@@ -22,7 +22,7 @@ export default Capability.makeModule(() =>
         id: 'root',
         filter: AppSurface.object(AppSurface.Article, Pipeline.Pipeline),
         component: ({ data, role }) => (
-          <PipelineContainer role={role} subject={data.subject} attendableId={data.attendableId} />
+          <PipelineArticle role={role} subject={data.subject} attendableId={data.attendableId} />
         ),
       }),
       Surface.create({

package/src/components/PipelineComponent/PipelineColumn.tsx

@@ -5,12 +5,11 @@
 import { useComposedRefs } from '@radix-ui/react-compose-refs';
 import * as Function from 'effect/Function';
 import * as Option from 'effect/Option';
-import type * as Schema from 'effect/Schema';
 import React, { forwardRef, useMemo, useRef, useState } from 'react';
 
 import { resolveSchemaWithRegistry } from '@dxos/app-toolkit/query';
-import { Annotation, JsonSchema, Obj, Query, Type } from '@dxos/echo';
-import { Filter, getSpace, useObject } from '@dxos/react-client/echo';
+import { Annotation, Filter, Obj, Query, Type } from '@dxos/echo';
+import { useObject } from '@dxos/react-client/echo';
 import { Panel, Toolbar, useAsyncEffect, useTranslation } from '@dxos/react-ui';
 import { Card } from '@dxos/react-ui';
 import { Menu } from '@dxos/react-ui-menu';
@@ -37,9 +36,9 @@ export const PipelineColumn = ({ data: column, location, classNames, debug }: Pi
   // Subscribe to the view target for reactivity.
   const [viewSnapshot] = useObject(column.view);
   const view = column.view.target;
-  const space = getSpace(view);
+  const db = view && Obj.getDatabase(view);
   const { Item } = usePipeline(PIPELINE_COLUMN_NAME);
-  const [schema, setSchema] = useState<Schema.Schema.AnyNoContext>();
+  const [type, setType] = useState<Type.AnyEntity>();
   const query = useMemo(() => {
     if (!view) {
       return Query.select(Filter.nothing());
@@ -51,24 +50,23 @@ export const PipelineColumn = ({ data: column, location, classNames, debug }: Pi
   }, [JSON.stringify(viewSnapshot?.query.ast)]);
 
   useAsyncEffect(async () => {
-    if (!query || !space?.db) {
+    if (!query || !db) {
       return;
     }
 
-    const schema = await resolveSchemaWithRegistry(space.db.schemaRegistry, query.ast);
-    setSchema(() => schema);
-  }, [space, query]);
+    const type = await resolveSchemaWithRegistry(db.schemaRegistry, query.ast);
+    setType(() => type);
+  }, [db, query]);
 
   const projectionModel = useMemo(() => {
-    if (!schema || !view) {
+    if (!type || !view) {
       return undefined;
     }
 
-    // For mutable schemas (EchoSchema), use the live jsonSchema reference for reactivity.
-    const jsonSchema = Type.isMutable(schema) ? schema.jsonSchema : JsonSchema.toJsonSchema(schema);
-    const change = createEchoChangeCallback(view, Type.isMutable(schema) ? schema : undefined);
-    return new ProjectionModel({ view, baseSchema: jsonSchema, change });
-  }, [schema, view]);
+    // Use the live jsonSchema reference for reactivity.
+    const change = createEchoChangeCallback(view, Type.getDatabase(type) != null ? type : undefined);
+    return new ProjectionModel({ view, baseSchema: type.jsonSchema, change });
+  }, [type, view]);
 
   const PipelineTile = useMemo(() => {
     return forwardRef<HTMLDivElement, Pick<MosaicTileProps<Obj.Unknown>, 'classNames' | 'location' | 'data' | 'debug'>>(
@@ -122,11 +120,12 @@ const ItemTile = forwardRef<HTMLDivElement, ItemTileProps>(
     const composedRef = useComposedRefs<HTMLDivElement>(rootRef, forwardedRef);
     const { Item } = usePipeline(ITEM_TILE_NAME);
     const icon = Function.pipe(
-      Obj.getSchema(data),
+      Obj.getType(data),
       Option.fromNullable,
+      Option.map(Type.getSchema),
       Option.flatMap(Annotation.IconAnnotation.get),
       Option.map(({ icon }) => icon),
-      Option.getOrElse(() => 'ph--placeholder--regular'),
+      Option.getOrElse(() => 'ph--circle-dashed--regular'),
     );
 
     return (
@@ -134,9 +133,9 @@ const ItemTile = forwardRef<HTMLDivElement, ItemTileProps>(
         <Mosaic.Tile asChild id={data.id} data={data} location={location} debug={debug}>
           <Focus.Item asChild>
             <Card.Root classNames={classNames} ref={composedRef}>
-              <Card.Toolbar>
+              <Card.Header>
                 <Card.Icon icon={icon} />
-                <Card.Title>{Obj.getLabel(data)}</Card.Title>
+                <Card.Title>{Obj.getLabel(data, { fallback: 'typename' })}</Card.Title>
                 {/* TODO(wittjosiah): Reconcile with Card.Menu. */}
                 <Card.IconBlock padding>
                   <Menu.Trigger asChild>
@@ -149,10 +148,10 @@ const ItemTile = forwardRef<HTMLDivElement, ItemTileProps>(
                   </Menu.Trigger>
                   <Menu.Content />
                 </Card.IconBlock>
-              </Card.Toolbar>
-              <Card.Content>
+              </Card.Header>
+              <Card.Body>
                 <Item {...itemProps} />
-              </Card.Content>
+              </Card.Body>
             </Card.Root>
           </Focus.Item>
         </Mosaic.Tile>

package/src/components/PipelineComponent/PipelineComponent.stories.tsx

@@ -6,9 +6,7 @@ import { RegistryContext } from '@effect-atom/atom-react';
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useCallback, useContext, useEffect, useMemo } from 'react';
 
-import { Filter, Ref } from '@dxos/client/echo';
-import { JsonSchema, Obj, Query } from '@dxos/echo';
-import { Collection, View } from '@dxos/echo';
+import { Collection, Filter, JsonSchema, Obj, Query, Ref, Type, View } from '@dxos/echo';
 import { random } from '@dxos/random';
 import { useQuery } from '@dxos/react-client/echo';
 import { useClientStory, withClientProvider } from '@dxos/react-client/testing';
@@ -26,7 +24,7 @@ import { translations } from '#translations';
 import { type ItemProps, PipelineComponent } from './PipelineComponent';
 
 const StorybookProjectItem = ({ item, projectionModel }: ItemProps) => {
-  const personSchema = useMemo(() => omitId(Person.Person), []);
+  const personSchema = useMemo(() => omitId(Type.getSchema(Person.Person)), []);
 
   if (Obj.instanceOf(Person.Person, item)) {
     const contact = item as Obj.OfShape<Person.Person>;

package/src/components/PipelineComponent/PipelineComponent.tsx

@@ -9,10 +9,10 @@ import React, { type FC, type PropsWithChildren } from 'react';
 
 import { Obj } from '@dxos/echo';
 import { Toolbar, type ToolbarRootProps, useTranslation } from '@dxos/react-ui';
+import { composable, composableProps, slottable } from '@dxos/react-ui';
 import { Board, type BoardModel, useBoard, useEventHandlerAdapter } from '@dxos/react-ui-mosaic';
 import { type ProjectionModel } from '@dxos/schema';
 import { type Pipeline } from '@dxos/types';
-import { composable, composableProps, slottable } from '@dxos/ui-theme';
 
 import { meta } from '#meta';
 

package/src/containers/{PipelineContainer/PipelineContainer.stories.tsx → PipelineArticle/PipelineArticle.stories.tsx}

@@ -8,9 +8,7 @@ import * as Layer from 'effect/Layer';
 import React from 'react';
 
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { Filter, Ref } from '@dxos/client/echo';
-import { Database, Feed, JsonSchema, Obj, Query, Tag } from '@dxos/echo';
-import { Collection, View } from '@dxos/echo';
+import { Collection, Database, Feed, Filter, JsonSchema, Obj, Query, Ref, Tag, View } from '@dxos/echo';
 import { createFeedServiceLayer } from '@dxos/echo-db';
 import { ClientPlugin } from '@dxos/plugin-client/plugin';
 import { initializeIdentity } from '@dxos/plugin-client/testing';
@@ -28,7 +26,7 @@ import { Message, Organization, Person, Pipeline, Task } from '@dxos/types';
 import { translations } from '#translations';
 
 import PipelineProperties from '../PipelineProperties';
-import { PipelineContainer } from './PipelineContainer';
+import { PipelineArticle } from './PipelineArticle';
 
 random.seed(0);
 
@@ -43,14 +41,14 @@ const DefaultStory = () => {
 
   return (
     <div className='grow grid grid-cols-[1fr_350px] overflow-hidden h-full w-full'>
-      <PipelineContainer role='article' subject={pipeline} attendableId='test' />
+      <PipelineArticle role='article' subject={pipeline} attendableId='test' />
       <PipelineProperties pipeline={pipeline} classNames='border-s border-separator' />
     </div>
   );
 };
 
 const meta = {
-  title: 'plugins/plugin-pipeline/containers/PipelineContainer',
+  title: 'plugins/plugin-pipeline/containers/PipelineArticle',
   render: DefaultStory,
   decorators: [
     withLayout({ layout: 'fullscreen' }),
@@ -75,7 +73,7 @@ const meta = {
 
             yield* Effect.gen(function* () {
               const tag = yield* Database.add(Tag.make({ label: 'important', hue: 'green' }));
-              const tagDxn = Obj.getDXN(tag).toString();
+              const tagUri = Obj.getURI(tag);
 
               // Create a view for Contacts.
               const personView = ViewModel.make({
@@ -85,13 +83,13 @@ const meta = {
 
               // Create a view for Organizations.
               const organizationView = ViewModel.make({
-                query: Query.select(Filter.type(Organization.Organization)).select(Filter.tag(tagDxn)),
+                query: Query.select(Filter.type(Organization.Organization)).select(Filter.tag(tagUri)),
                 jsonSchema: JsonSchema.toJsonSchema(Organization.Organization),
               });
 
               // Create a view for Tasks.
               const taskView = ViewModel.make({
-                query: Query.select(Filter.type(Task.Task)).select(Filter.tag(tagDxn)),
+                query: Query.select(Filter.type(Task.Task)).select(Filter.tag(tagUri)),
                 jsonSchema: JsonSchema.toJsonSchema(Task.Task),
               });
 
@@ -112,10 +110,10 @@ const meta = {
               );
               yield* Feed.append(messageFeed, messages);
 
-              const messageQueueDxn = Feed.getQueueDxn(messageFeed)!.toString();
+              const messageQueueDxn = Feed.getQueueUri(messageFeed)!;
               const messageView = ViewModel.make({
                 query: Query.select(Filter.type(Message.Message)).from({
-                  queues: [messageQueueDxn],
+                  feeds: [messageQueueDxn],
                 }),
                 jsonSchema: JsonSchema.toJsonSchema(Message.Message),
               });
@@ -168,7 +166,7 @@ const meta = {
                 yield* Database.add(
                   Obj.make(Organization.Organization, {
                     [Obj.Meta]: {
-                      tags: random.datatype.boolean() ? [tagDxn] : [],
+                      tags: random.datatype.boolean() ? [tagUri] : [],
                     },
                     name: random.company.name(),
                     website: random.internet.url(),
@@ -183,7 +181,7 @@ const meta = {
                 yield* Database.add(
                   Obj.make(Task.Task, {
                     [Obj.Meta]: {
-                      tags: random.datatype.boolean() ? [tagDxn] : [],
+                      tags: random.datatype.boolean() ? [tagUri] : [],
                     },
                     title: random.lorem.sentence(),
                     status: random.helpers.arrayElement(['todo', 'in-progress', 'done']) as any,
@@ -221,7 +219,7 @@ const meta = {
     layout: 'fullscreen',
     translations: [...translations, ...stackTranslations],
   },
-} satisfies Meta<typeof PipelineContainer>;
+} satisfies Meta<typeof PipelineArticle>;
 
 export default meta;
 

package/src/containers/{PipelineContainer/PipelineContainer.tsx → PipelineArticle/PipelineArticle.tsx}

@@ -24,9 +24,9 @@ import { usePipelineBoardModel } from '#hooks';
 
 const PIPELINE_ITEM = 'PipelineItem';
 
-export type PipelineContainerProps = AppSurface.ObjectArticleProps<Pipeline.Pipeline>;
+export type PipelineArticleProps = AppSurface.ObjectArticleProps<Pipeline.Pipeline>;
 
-export const PipelineContainer = ({ role, subject: pipeline, attendableId }: PipelineContainerProps) => {
+export const PipelineArticle = ({ role, subject: pipeline, attendableId }: PipelineArticleProps) => {
   const registry = useCapability(Capabilities.AtomRegistry);
   const model = usePipelineBoardModel(pipeline, registry);
   const { invokePromise } = useOperationInvoker();

package/src/containers/PipelineArticle/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+export { PipelineArticle as default } from './PipelineArticle';