@dxos/plugin-pipeline 0.8.4-main.9be5663bfe → 0.8.4-main.bc2380dfbc

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-pipeline",
-  "version": "0.8.4-main.9be5663bfe",
+  "version": "0.8.4-main.bc2380dfbc",
   "description": "Pipeline plugin for Composer",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,38 +8,76 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
   "imports": {
-    "#capabilities": "./src/capabilities/index.ts",
-    "#components": "./src/components/index.ts",
-    "#containers": "./src/containers/index.ts",
-    "#hooks": "./src/hooks/index.ts",
-    "#meta": "./src/meta.ts",
-    "#types": "./src/types/index.ts"
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
+    },
+    "#components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
+    },
+    "#containers": {
+      "source": "./src/containers/index.ts",
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/index.mjs"
+    },
+    "#hooks": {
+      "source": "./src/hooks/index.ts",
+      "types": "./dist/types/src/hooks/index.d.ts",
+      "default": "./dist/lib/neutral/hooks/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#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"
+    },
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
+    },
+    "#types": {
+      "source": "./src/types/index.ts",
+      "types": "./dist/types/src/types/index.d.ts",
+      "default": "./dist/lib/neutral/types/index.mjs"
+    }
   },
   "exports": {
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs"
+      "default": "./dist/lib/neutral/index.mjs"
     },
-    "./types": {
-      "source": "./src/types/index.ts",
-      "types": "./dist/types/src/types/index.d.ts",
-      "browser": "./dist/lib/browser/types/index.mjs"
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist",
     "src"
@@ -49,34 +87,33 @@
     "@radix-ui/react-context": "1.1.1",
     "@radix-ui/react-slot": "1.1.2",
     "effect": "3.20.0",
-    "@dxos/app-framework": "0.8.4-main.9be5663bfe",
-    "@dxos/app-toolkit": "0.8.4-main.9be5663bfe",
-    "@dxos/assistant-toolkit": "0.8.4-main.9be5663bfe",
-    "@dxos/async": "0.8.4-main.9be5663bfe",
-    "@dxos/devtools": "0.8.4-main.9be5663bfe",
-    "@dxos/echo": "0.8.4-main.9be5663bfe",
-    "@dxos/echo-query": "0.8.4-main.9be5663bfe",
-    "@dxos/functions": "0.8.4-main.9be5663bfe",
-    "@dxos/echo-atom": "0.8.4-main.9be5663bfe",
-    "@dxos/log": "0.8.4-main.9be5663bfe",
-    "@dxos/operation": "0.8.4-main.9be5663bfe",
-    "@dxos/plugin-client": "0.8.4-main.9be5663bfe",
-    "@dxos/plugin-deck": "0.8.4-main.9be5663bfe",
-    "@dxos/plugin-graph": "0.8.4-main.9be5663bfe",
-    "@dxos/plugin-markdown": "0.8.4-main.9be5663bfe",
-    "@dxos/react-client": "0.8.4-main.9be5663bfe",
-    "@dxos/plugin-inbox": "0.8.4-main.9be5663bfe",
-    "@dxos/plugin-space": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-attention": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-form": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-list": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-components": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-menu": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-mosaic": "0.8.4-main.9be5663bfe",
-    "@dxos/schema": "0.8.4-main.9be5663bfe",
-    "@dxos/util": "0.8.4-main.9be5663bfe",
-    "@dxos/types": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-stack": "0.8.4-main.9be5663bfe"
+    "@dxos/app-framework": "0.8.4-main.bc2380dfbc",
+    "@dxos/assistant-toolkit": "0.8.4-main.bc2380dfbc",
+    "@dxos/compute": "0.8.4-main.bc2380dfbc",
+    "@dxos/async": "0.8.4-main.bc2380dfbc",
+    "@dxos/echo": "0.8.4-main.bc2380dfbc",
+    "@dxos/echo-atom": "0.8.4-main.bc2380dfbc",
+    "@dxos/devtools": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-client": "0.8.4-main.bc2380dfbc",
+    "@dxos/echo-query": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-deck": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-graph": "0.8.4-main.bc2380dfbc",
+    "@dxos/app-toolkit": "0.8.4-main.bc2380dfbc",
+    "@dxos/log": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-inbox": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-space": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-markdown": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-client": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-form": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-components": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-attention": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-list": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-menu": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-mosaic": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-stack": "0.8.4-main.bc2380dfbc",
+    "@dxos/types": "0.8.4-main.bc2380dfbc",
+    "@dxos/util": "0.8.4-main.bc2380dfbc",
+    "@dxos/schema": "0.8.4-main.bc2380dfbc"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -84,25 +121,25 @@
     "@types/react-dom": "~19.2.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/echo-db": "0.8.4-main.9be5663bfe",
-    "@dxos/plugin-inbox": "0.8.4-main.9be5663bfe",
-    "@dxos/plugin-preview": "0.8.4-main.9be5663bfe",
-    "@dxos/plugin-attention": "0.8.4-main.9be5663bfe",
-    "@dxos/plugin-testing": "0.8.4-main.9be5663bfe",
-    "@dxos/random": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui": "0.8.4-main.9be5663bfe",
-    "@dxos/plugin-theme": "0.8.4-main.9be5663bfe",
-    "@dxos/storybook-utils": "0.8.4-main.9be5663bfe",
-    "@dxos/ui-theme": "0.8.4-main.9be5663bfe"
+    "vite": "^8.0.13",
+    "@dxos/plugin-inbox": "0.8.4-main.bc2380dfbc",
+    "@dxos/echo-db": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-attention": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-testing": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-preview": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-theme": "0.8.4-main.bc2380dfbc",
+    "@dxos/random": "0.8.4-main.bc2380dfbc",
+    "@dxos/ui-theme": "0.8.4-main.bc2380dfbc",
+    "@dxos/storybook-utils": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui": "0.8.4-main.bc2380dfbc"
   },
   "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.9be5663bfe",
-    "@dxos/ui-theme": "0.8.4-main.9be5663bfe"
+    "@dxos/ui-theme": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui": "0.8.4-main.bc2380dfbc"
   },
   "publishConfig": {
     "access": "public"

package/src/PipelinePlugin.node.ts

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

package/src/PipelinePlugin.test.ts

@@ -0,0 +1,27 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { PipelinePlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('PipelinePlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [ClientPlugin({}), PipelinePlugin()],
+    });
+
+    // After autoStart: AppGraphBuilder, CreateObject, schema all auto-cascade.
+    expect(harness.manager.getActive()).toEqual(
+      expect.arrayContaining([moduleId('AppGraphBuilder'), moduleId('CreateObject'), moduleId('schema')]),
+    );
+  });
+});

package/src/PipelinePlugin.tsx

@@ -2,46 +2,21 @@
 // Copyright 2023 DXOS.org
 //
 
-import * as Effect from 'effect/Effect';
-import * as Option from 'effect/Option';
-
 import { Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
-import { Annotation } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
-import { SpaceOperation } from '@dxos/plugin-space/operations';
-import { type CreateObject } from '@dxos/plugin-space/types';
 import { Pipeline } from '@dxos/types';
 
-import { AppGraphBuilder, ReactSurface } from '#capabilities';
+import { AppGraphBuilder, CreateObject, ReactSurface } from '#capabilities';
 import { meta } from '#meta';
-
-import { translations } from './translations';
+import { translations } from '#translations';
 
 export const PipelinePlugin = Plugin.define(meta).pipe(
   AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
-  AppPlugin.addMetadataModule({
-    metadata: {
-      id: Pipeline.Pipeline.typename,
-      metadata: {
-        icon: Annotation.IconAnnotation.get(Pipeline.Pipeline).pipe(Option.getOrThrow).icon,
-        iconHue: Annotation.IconAnnotation.get(Pipeline.Pipeline).pipe(Option.getOrThrow).hue ?? 'white',
-        createObject: ((props, options) =>
-          Effect.gen(function* () {
-            const object = Pipeline.make(props);
-            return yield* Operation.invoke(SpaceOperation.AddObject, {
-              object,
-              target: options.target,
-              hidden: true,
-              targetNodeId: options.targetNodeId,
-            });
-          })) satisfies CreateObject,
-      },
-    },
-  }),
-
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
   AppPlugin.addSchemaModule({ schema: [Pipeline.Pipeline] }),
   AppPlugin.addSurfaceModule({ activate: ReactSurface }),
   AppPlugin.addTranslationsModule({ translations }),
   Plugin.make,
 );
+
+export default PipelinePlugin;

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

@@ -0,0 +1,29 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { Operation } from '@dxos/compute';
+import { SpaceOperation } from '@dxos/plugin-space';
+import { SpaceCapabilities } from '@dxos/plugin-space';
+import { Pipeline } from '@dxos/types';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
+      id: Pipeline.Pipeline.typename,
+      createObject: (props, options) =>
+        Effect.gen(function* () {
+          const object = Pipeline.make(props);
+          return yield* Operation.invoke(SpaceOperation.AddObject, {
+            object,
+            target: options.target,
+            hidden: true,
+            targetNodeId: options.targetNodeId,
+          });
+        }),
+    });
+  }),
+);

package/src/capabilities/index.ts

@@ -5,4 +5,5 @@
 import { Capability } from '@dxos/app-framework';
 
 export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
+export const CreateObject = Capability.lazy('CreateObject', () => import('./create-object'));
 export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));

package/src/capabilities/react-surface.tsx

@@ -13,25 +13,23 @@ 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(
     Capability.contributes(Capabilities.ReactSurface, [
       Surface.create({
         id: 'root',
-        role: 'article',
-        filter: AppSurface.objectArticle(Pipeline.Pipeline),
+        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({
         id: 'companion.invocations',
-        role: 'article',
-        filter: AppSurface.and(
-          AppSurface.literalArticle('invocations'),
-          AppSurface.companionArticle(Pipeline.Pipeline),
+        filter: AppSurface.allOf(
+          AppSurface.literal(AppSurface.Article, 'invocations'),
+          AppSurface.companion(AppSurface.Article, Pipeline.Pipeline),
         ),
         component: ({ data, role }) => {
           const db = Obj.getDatabase(data.companionTo);
@@ -47,8 +45,7 @@ export default Capability.makeModule(() =>
       }),
       Surface.create({
         id: 'object-properties',
-        role: 'object-properties',
-        filter: AppSurface.objectProperties(Pipeline.Pipeline),
+        filter: AppSurface.object(AppSurface.ObjectProperties, Pipeline.Pipeline),
         component: ({ data }) => <PipelineProperties pipeline={data.subject} />,
       }),
     ]),

package/src/components/PipelineComponent/PipelineColumn.tsx

@@ -9,8 +9,8 @@ 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, JsonSchema, 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';
@@ -33,11 +33,11 @@ export type PipelineColumnProps = Pick<MosaicTileProps<Pipeline.Column>, 'classN
 // TODO(wittjosiah): Support item DnD reordering (ordering needs to be stored on the view presentation collection).
 export const PipelineColumn = ({ data: column, location, classNames, debug }: PipelineColumnProps) => {
   const { t } = useTranslation(meta.id);
-  const dragHandleRef = useRef<HTMLButtonElement>(null);
+  const [dragHandle, setDragHandle] = useState<HTMLButtonElement | null>(null);
   // 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 query = useMemo(() => {
@@ -51,13 +51,13 @@ 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);
+    const schema = await resolveSchemaWithRegistry(db.schemaRegistry, query.ast);
     setSchema(() => schema);
-  }, [space, query]);
+  }, [db, query]);
 
   const projectionModel = useMemo(() => {
     if (!schema || !view) {
@@ -87,13 +87,13 @@ export const PipelineColumn = ({ data: column, location, classNames, debug }: Pi
         data={column}
         location={location}
         classNames={classNames}
-        dragHandleRef={dragHandleRef}
+        dragHandle={dragHandle}
       >
         <Panel.Toolbar asChild>
           <Board.Column.Header
             classNames='_opacity-10'
             label={column.name || t('untitled-view.title')}
-            dragHandleRef={dragHandleRef}
+            dragHandleRef={setDragHandle}
           />
         </Panel.Toolbar>
         <Panel.Content asChild>

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, View } from '@dxos/echo';
 import { random } from '@dxos/random';
 import { useQuery } from '@dxos/react-client/echo';
 import { useClientStory, withClientProvider } from '@dxos/react-client/testing';
@@ -21,8 +19,8 @@ import { withRegistry } from '@dxos/storybook-utils';
 import { Person, Pipeline } from '@dxos/types';
 
 import { usePipelineBoardModel } from '#hooks';
+import { translations } from '#translations';
 
-import { translations } from '../../translations';
 import { type ItemProps, PipelineComponent } from './PipelineComponent';
 
 const StorybookProjectItem = ({ item, projectionModel }: ItemProps) => {
@@ -64,7 +62,7 @@ const DefaultStory = () => {
       fields: ['fullName'],
     });
 
-    Obj.change(pipeline, (pipeline) => {
+    Obj.update(pipeline, (pipeline) => {
       pipeline.columns.push({
         name: 'New Contacts',
         view: Ref.make(view) as (typeof pipeline.columns)[number]['view'],
@@ -108,7 +106,7 @@ const MutationsStory = () => {
       fields: ['fullName'],
     });
 
-    Obj.change(pipeline, (pipeline) => {
+    Obj.update(pipeline, (pipeline) => {
       pipeline.columns.push({
         name: 'New Contacts',
         view: Ref.make(view) as (typeof pipeline.columns)[number]['view'],
@@ -131,7 +129,7 @@ const MutationsStory = () => {
       if (p < 0.4) {
         // Append to the name
         const contactToAdjust = random.helpers.arrayElement(contacts);
-        Obj.change(contactToAdjust, (contactToAdjust) => {
+        Obj.update(contactToAdjust, (contactToAdjust) => {
           contactToAdjust.fullName = (contactToAdjust.fullName ?? '') + ' X';
         });
         return;

package/src/components/PipelineComponent/PipelineComponent.tsx

@@ -97,7 +97,7 @@ const PipelineColumns = composable<HTMLDivElement, PipelineColumnsProps>(({ pipe
     get: (data) => data as unknown as Obj.Unknown,
     make: (object) => object as unknown as Pipeline.Column,
     canDrop: ({ source }) => model.isColumn(source.data),
-    onChange: (mutate) => Obj.change(pipeline, (pipeline) => mutate(pipeline.columns)),
+    onChange: (mutate) => Obj.update(pipeline, (pipeline) => mutate(pipeline.columns)),
   });
 
   return <Board.Content {...props} id='pipeline' eventHandler={eventHandler} Tile={PipelineColumn} />;

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

@@ -8,26 +8,25 @@ 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';
+import { ClientPlugin } from '@dxos/plugin-client/testing';
 import { initializeIdentity } from '@dxos/plugin-client/testing';
-import { InboxPlugin } from '@dxos/plugin-inbox';
-import { PreviewPlugin } from '@dxos/plugin-preview';
+import { InboxPlugin } from '@dxos/plugin-inbox/testing';
+import { PreviewPlugin } from '@dxos/plugin-preview/testing';
 import { StorybookPlugin, corePlugins } from '@dxos/plugin-testing';
 import { random } from '@dxos/random';
 import { useDatabase, useQuery } from '@dxos/react-client/echo';
-import { translations as stackTranslations } from '@dxos/react-ui-stack';
+import { translations as stackTranslations } from '@dxos/react-ui-stack/translations';
 import { withLayout } from '@dxos/react-ui/testing';
 import { ViewModel } from '@dxos/schema';
 import { createObjectFactory } from '@dxos/schema/testing';
 import { Message, Organization, Person, Pipeline, Task } from '@dxos/types';
 
-import { translations } from '../../translations';
+import { translations } from '#translations';
+
 import PipelineProperties from '../PipelineProperties';
-import { PipelineContainer } from './PipelineContainer';
+import { PipelineArticle } from './PipelineArticle';
 
 random.seed(0);
 
@@ -42,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' }),
@@ -74,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 tagDXN = Obj.getDXN(tag).toString();
 
               // Create a view for Contacts.
               const personView = ViewModel.make({
@@ -84,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(tagDXN)),
                 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(tagDXN)),
                 jsonSchema: JsonSchema.toJsonSchema(Task.Task),
               });
 
@@ -111,10 +110,10 @@ const meta = {
               );
               yield* Feed.append(messageFeed, messages);
 
-              const messageQueueDxn = Feed.getQueueDxn(messageFeed)!.toString();
+              const messageQueueDXN = Feed.getQueueDxn(messageFeed)!.toString();
               const messageView = ViewModel.make({
                 query: Query.select(Filter.type(Message.Message)).from({
-                  queues: [messageQueueDxn],
+                  feeds: [messageQueueDXN],
                 }),
                 jsonSchema: JsonSchema.toJsonSchema(Message.Message),
               });
@@ -167,7 +166,7 @@ const meta = {
                 yield* Database.add(
                   Obj.make(Organization.Organization, {
                     [Obj.Meta]: {
-                      tags: random.datatype.boolean() ? [tagDxn] : [],
+                      tags: random.datatype.boolean() ? [tagDXN] : [],
                     },
                     name: random.company.name(),
                     website: random.internet.url(),
@@ -182,7 +181,7 @@ const meta = {
                 yield* Database.add(
                   Obj.make(Task.Task, {
                     [Obj.Meta]: {
-                      tags: random.datatype.boolean() ? [tagDxn] : [],
+                      tags: random.datatype.boolean() ? [tagDXN] : [],
                     },
                     title: random.lorem.sentence(),
                     status: random.helpers.arrayElement(['todo', 'in-progress', 'done']) as any,
@@ -220,7 +219,7 @@ const meta = {
     layout: 'fullscreen',
     translations: [...translations, ...stackTranslations],
   },
-} satisfies Meta<typeof PipelineContainer>;
+} satisfies Meta<typeof PipelineArticle>;
 
 export default meta;