@dxos/plugin-navtree 0.8.4-main.937b3ca → 0.8.4-main.9be5663bfe

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

@@ -7,8 +7,8 @@ import * as Effect from 'effect/Effect';
 
 import { type BuilderExtensions } from '@dxos/app-graph';
 import { log } from '@dxos/log';
-import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
-import { faker } from '@dxos/random';
+import { GraphBuilder, Node, NodeMatcher } from '@dxos/plugin-graph';
+import { random } from '@dxos/random';
 
 export const storybookGraphBuilders = (): BuilderExtensions => {
   const propertiesCache = new Map<string, Record<string, unknown>>();
@@ -31,13 +31,13 @@ export const storybookGraphBuilders = (): BuilderExtensions => {
         actions: () =>
           Effect.succeed(
             Array.from({ length: 5 }, (_, i) => ({
-              id: `app-menu/action-${i}`,
+              id: `action-${i}`,
               data: Effect.fnUntraced(function* () {
                 log.info('action', { id: 'app-menu', index: i });
               }),
               properties: {
                 label: `Action ${i}`,
-                icon: faker.properties.icon(),
+                icon: random.properties.icon(),
                 disposition: 'menu',
               },
             })),
@@ -49,7 +49,7 @@ export const storybookGraphBuilders = (): BuilderExtensions => {
         match: NodeMatcher.whenRoot,
         connector: () =>
           Effect.succeed([
-            {
+            Node.make({
               id: 'user-account',
               type: 'user-account',
               properties: {
@@ -57,37 +57,37 @@ export const storybookGraphBuilders = (): BuilderExtensions => {
                 icon: 'ph--user--regular',
                 disposition: 'user-account',
                 userId: '1234567890ABCDEF',
-                hue: faker.properties.hue(),
-                emoji: faker.properties.emoji(),
+                hue: random.properties.hue(),
+                emoji: random.properties.emoji(),
                 status: 'active',
               },
               nodes: [
-                {
+                Node.make({
                   id: 'profile',
                   type: 'profile',
                   properties: {
                     label: 'Profile',
                     icon: 'ph--user--regular',
                   },
-                },
-                {
+                }),
+                Node.make({
                   id: 'devices',
                   type: 'devices',
                   properties: {
                     label: 'Devices',
                     icon: 'ph--devices--regular',
                   },
-                },
-                {
+                }),
+                Node.make({
                   id: 'security',
                   type: 'security',
                   properties: {
                     label: 'Security',
                     icon: 'ph--key--regular',
                   },
-                },
+                }),
               ],
-            },
+            }),
           ]),
       }),
       // Create space (workspace) nodes directly under root.
@@ -111,16 +111,18 @@ export const storybookGraphBuilders = (): BuilderExtensions => {
               return value;
             });
 
-            return Array.from({ length: get(count) }, (_, i) => ({
-              id: `space-${i}`,
-              type: 'space',
-              properties: getProperties(`space-${i}`, {
-                label: `Space ${i}`,
-                icon: faker.properties.icon(),
-                hue: faker.properties.hue(),
-                disposition: 'workspace',
+            return Array.from({ length: get(count) }, (_, i) =>
+              Node.make({
+                id: `space-${i}`,
+                type: 'space',
+                properties: getProperties(`space-${i}`, {
+                  label: `Space ${i}`,
+                  icon: random.properties.icon(),
+                  hue: random.properties.hue(),
+                  disposition: 'workspace',
+                }),
               }),
-            }));
+            );
           }),
       }),
       // Create space actions.
@@ -130,13 +132,13 @@ export const storybookGraphBuilders = (): BuilderExtensions => {
         actions: () =>
           Effect.succeed(
             Array.from({ length: 5 }, (_, i) => ({
-              id: `space-actions/action-${i}`,
+              id: `action-${i}`,
               data: Effect.fnUntraced(function* () {
                 log.info('action', { id: 'space-actions', index: i });
               }),
-              properties: getProperties(`space-actions/action-${i}`, {
+              properties: getProperties(`action-${i}`, {
                 label: `Action ${i}`,
-                icon: faker.properties.icon(),
+                icon: random.properties.icon(),
               }),
             })),
           ),
@@ -162,14 +164,16 @@ export const storybookGraphBuilders = (): BuilderExtensions => {
               return value;
             });
 
-            return Array.from({ length: get(count) }, (_, i) => ({
-              id: `object-${i}`,
-              type: 'object',
-              properties: getProperties(`object-${i}`, {
-                label: `Object ${i}`,
-                icon: faker.properties.icon(),
+            return Array.from({ length: get(count) }, (_, i) =>
+              Node.make({
+                id: `object-${i}`,
+                type: 'object',
+                properties: getProperties(`object-${i}`, {
+                  label: `Object ${i}`,
+                  icon: random.properties.icon(),
+                }),
               }),
-            }));
+            );
           }),
       }),
       // Create object actions.
@@ -179,13 +183,13 @@ export const storybookGraphBuilders = (): BuilderExtensions => {
         actions: () =>
           Effect.succeed(
             Array.from({ length: 5 }, (_, i) => ({
-              id: `object-actions/action-${i}`,
+              id: `action-${i}`,
               data: Effect.fnUntraced(function* () {
                 log.info('action', { id: 'object-actions', index: i });
               }),
-              properties: getProperties(`object-actions/action-${i}`, {
+              properties: getProperties(`action-${i}`, {
                 label: `Action ${i}`,
-                icon: faker.properties.icon(),
+                icon: random.properties.icon(),
               }),
             })),
           ),

package/src/testing/generator.ts

@@ -7,7 +7,7 @@ import * as Schema from 'effect/Schema';
 import { type Node } from '@dxos/app-graph';
 import { Obj, Type } from '@dxos/echo';
 import { TestSchema } from '@dxos/echo/testing';
-import { faker } from '@dxos/random';
+import { random } from '@dxos/random';
 import { range } from '@dxos/util';
 
 // TODO(burdon): Reconcile with @dxos/plugin-debug, @dxos/react-ui/testing.
@@ -17,12 +17,12 @@ import { range } from '@dxos/util';
 export type TestItem = { id: string; type: string } & Record<string, any>;
 
 type ObjectDataGenerator = {
-  createSchema?: () => Type.Obj.Any;
+  createSchema?: () => Type.AnyObj;
   createData: () => any;
 };
 
 type ObjectFactory<T> = {
-  schema?: Type.Obj.Any; // TODO(burdon): Support both typed and expando schema.
+  schema?: Type.AnyObj; // TODO(burdon): Support both typed and expando schema.
   createObject: () => T;
 };
 
@@ -43,16 +43,16 @@ export const Priority = [1, 2, 3, 4, 5];
 export const defaultGenerators: { [type: string]: ObjectDataGenerator } = {
   document: {
     createData: () => ({
-      title: faker.lorem.sentence(3),
-      body: faker.lorem.sentences({ min: 1, max: faker.number.int({ min: 1, max: 3 }) }),
+      title: random.lorem.sentence(3),
+      body: random.lorem.sentences({ min: 1, max: random.number.int({ min: 1, max: 3 }) }),
     }),
   },
 
   image: {
     createData: () => ({
-      title: faker.lorem.sentence(3),
-      image: faker.helpers.arrayElement(data.images),
-      body: faker.datatype.boolean() ? faker.lorem.sentences() : undefined,
+      title: random.lorem.sentence(3),
+      image: random.helpers.arrayElement(data.images),
+      body: random.datatype.boolean() ? random.lorem.sentences() : undefined,
     }),
   },
 
@@ -65,16 +65,16 @@ export const defaultGenerators: { [type: string]: ObjectDataGenerator } = {
         priority: Schema.Number,
       }).pipe(
         Type.object({
-          typename: 'example.com/type/Project',
+          typename: 'com.example.type.project',
           version: '0.1.0',
         }),
       ),
 
     createData: () => ({
-      title: faker.commerce.productName(),
-      repo: faker.datatype.boolean({ probability: 0.3 }) ? faker.internet.url() : undefined,
-      status: faker.helpers.arrayElement(Status),
-      priority: faker.helpers.arrayElement(Priority),
+      title: random.commerce.productName(),
+      repo: random.datatype.boolean({ probability: 0.3 }) ? random.internet.url() : undefined,
+      status: random.helpers.arrayElement(Status),
+      priority: random.helpers.arrayElement(Priority),
     }),
   },
 };
@@ -94,12 +94,12 @@ export class TestObjectGenerator {
       }, {});
   }
 
-  get schema(): Type.Obj.Any[] {
+  get schema(): Type.AnyObj[] {
     return Object.values(this.factories).map((f) => f.schema!);
   }
 
   createObject({ types }: { types?: string[] } = {}) {
-    const type = faker.helpers.arrayElement(types ?? Object.keys(this.factories));
+    const type = random.helpers.arrayElement(types ?? Object.keys(this.factories));
     const factory = this.factories[type];
     return factory?.createObject();
   }
@@ -136,7 +136,7 @@ export const createTree = () => {
     nodes: [...Array(4)].map(() => {
       const l0 = generator.createObject();
       return {
-        id: faker.string.uuid(),
+        id: random.string.uuid(),
         data: null,
         type: 'category',
         properties: {
@@ -148,7 +148,7 @@ export const createTree = () => {
           ...[...Array(4)].map(() => {
             const l1 = generator.createObject();
             return {
-              id: faker.string.uuid(),
+              id: random.string.uuid(),
               data: null,
               type: 'document',
               properties: {
@@ -157,20 +157,20 @@ export const createTree = () => {
               },
               nodes: [
                 {
-                  id: `${faker.string.uuid()}__a1`,
+                  id: `${random.string.uuid()}__a1`,
                   data: () => {},
                   type: 'action',
                   properties: {
-                    label: faker.lorem.words(2),
+                    label: random.lorem.words(2),
                     icon: 'ph--boat--regular',
                   },
                 },
                 {
-                  id: `${faker.string.uuid()}__a2`,
+                  id: `${random.string.uuid()}__a2`,
                   data: () => {},
                   type: 'action',
                   properties: {
-                    label: faker.lorem.words(2),
+                    label: random.lorem.words(2),
                     icon: 'ph--train-simple--regular',
                   },
                 },
@@ -178,20 +178,20 @@ export const createTree = () => {
             } satisfies Node.NodeArg<any>;
           }),
           {
-            id: `${faker.string.uuid()}__a1`,
+            id: `${random.string.uuid()}__a1`,
             data: () => {},
             type: 'action',
             properties: {
-              label: faker.lorem.words(2),
+              label: random.lorem.words(2),
               icon: 'ph--boat--regular',
             },
           },
           {
-            id: `${faker.string.uuid()}__a2`,
+            id: `${random.string.uuid()}__a2`,
             data: () => {},
             type: 'action',
             properties: {
-              label: faker.lorem.words(2),
+              label: random.lorem.words(2),
               icon: 'ph--train-simple--regular',
             },
           },

package/src/translations.ts

@@ -4,21 +4,20 @@
 
 import { type Resource } from '@dxos/react-ui';
 
-import { meta } from './meta';
+import { meta } from '#meta';
 
 export const translations = [
   {
     'en-US': {
       [meta.id]: {
-        'app menu label': 'App menu',
-        'open settings label': 'Settings',
-        'open commands label': 'Search commands',
-        'commands dialog title': 'Commands',
-        'command list input placeholder': 'Search for commands…',
-        'node actions menu invoker label': 'More options',
-        'tree item actions label': 'More actions',
-        'empty branch message': ' ',
-        'button back': 'Back to Space',
+        'app-menu.label': 'App menu',
+        'open-settings.label': 'Settings',
+        'open-commands.label': 'Search commands',
+        'commands-dialog.title': 'Commands',
+        'command-list-input.placeholder': 'Search for commands…',
+        'node-actions-menu-invoker.label': 'More options',
+        'tree-item-actions.label': 'More actions',
+        'button-back.button': 'Back to Space',
       },
     },
   },

package/src/types/capabilities.ts

@@ -6,7 +6,7 @@ import { type Atom } from '@effect-atom/atom-react';
 
 import { Capability } from '@dxos/app-framework';
 
-import { meta } from '../meta';
+import { meta } from '#meta';
 
 export namespace NavTreeCapabilities {
   export type NavTreeItemState = { open: boolean; current: boolean; alternateTree?: boolean };
@@ -17,5 +17,5 @@ export namespace NavTreeCapabilities {
     setItem: (path: string[], key: 'open' | 'current' | 'alternateTree', next: boolean) => void;
   };
 
-  export const State = Capability.make<NavTreeStateStore>(`${meta.id}/capability/state`);
+  export const State = Capability.make<NavTreeStateStore>(`${meta.id}.capability.state`);
 }

package/src/types/events.ts

@@ -2,10 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type ActivationEvent, Common } from '@dxos/app-framework';
+import { type ActivationEvent } from '@dxos/app-framework';
+import { AppActivationEvents } from '@dxos/app-toolkit';
 
-import { meta } from '../meta';
+import { meta } from '#meta';
 
 export namespace NavTreeEvents {
-  export const StateReady: ActivationEvent.ActivationEvent = Common.ActivationEvent.createStateEvent(meta.id);
+  export const StateReady: ActivationEvent.ActivationEvent = AppActivationEvents.createStateEvent(meta.id);
 }

package/src/util.ts

@@ -5,7 +5,7 @@
 import { Graph, Node } from '@dxos/plugin-graph';
 import { isNonNullable } from '@dxos/util';
 
-import { type NavTreeItemGraphNode } from './types';
+import { type NavTreeItemGraphNode } from '#types';
 
 export const getParent = (
   graph: Graph.ReadableGraph,
@@ -13,9 +13,9 @@ export const getParent = (
   path: string[],
 ): NavTreeItemGraphNode | undefined => {
   const parentId = path[path.length - 2];
-  return Graph.getConnections(graph, node.id, 'inbound').find((n: Node.Node) => n.id === parentId) as
-    | NavTreeItemGraphNode
-    | undefined;
+  return Graph.getConnections(graph, node.id, Node.childRelation('inbound')).find(
+    (n: Node.Node) => n.id === parentId,
+  ) as NavTreeItemGraphNode | undefined;
 };
 
 export const getPersistenceParent = (
@@ -80,7 +80,7 @@ export const getChildren = (
   node: NavTreeItemGraphNode,
   path: readonly string[] = [],
 ): NavTreeItemGraphNode[] => {
-  return Graph.getConnections(graph, node.id, 'outbound')
+  return Graph.getConnections(graph, node.id, 'child')
     .map((n: Node.Node) => {
       // Break cycles.
       const nextPath = [...path, node.id];
@@ -89,6 +89,20 @@ export const getChildren = (
     .filter(isNonNullable) as NavTreeItemGraphNode[];
 };
 
+/**
+ * Determines whether a node should be visible based on its disposition.
+ */
+export const filterItems = (node: Node.Node, disposition?: string) => {
+  if (!disposition && (node.properties.disposition === 'hidden' || node.properties.disposition === 'alternate-tree')) {
+    return false;
+  } else if (!disposition) {
+    const action = Node.isAction(node);
+    return !action || node.properties.disposition === 'item';
+  } else {
+    return node.properties.disposition === disposition;
+  }
+};
+
 export const l0ItemType = (item: Node.Node) => {
   if (Node.isActionLike(item)) {
     return 'action';

package/dist/lib/browser/app-graph-builder-RSMA6I22.mjs

@@ -1,43 +0,0 @@
-import {
-  COMMANDS_DIALOG,
-  meta
-} from "./chunk-YKTYPINZ.mjs";
-
-// src/capabilities/app-graph-builder/app-graph-builder.ts
-import * as Effect from "effect/Effect";
-import { Capability, Common } from "@dxos/app-framework";
-import { Operation } from "@dxos/operation";
-import { GraphBuilder, NodeMatcher } from "@dxos/plugin-graph";
-var app_graph_builder_default = Capability.makeModule(Effect.fnUntraced(function* () {
-  const extensions = yield* GraphBuilder.createExtension({
-    id: meta.id,
-    match: NodeMatcher.whenRoot,
-    actions: () => Effect.succeed([
-      {
-        id: COMMANDS_DIALOG,
-        data: () => Operation.invoke(Common.LayoutOperation.UpdateDialog, {
-          subject: COMMANDS_DIALOG,
-          blockAlign: "start"
-        }),
-        properties: {
-          label: [
-            "open commands label",
-            {
-              ns: meta.id
-            }
-          ],
-          icon: "ph--magnifying-glass--regular",
-          keyBinding: {
-            macos: "meta+k",
-            windows: "ctrl+k"
-          }
-        }
-      }
-    ])
-  });
-  return Capability.contributes(Common.Capability.AppGraphBuilder, extensions);
-}));
-export {
-  app_graph_builder_default as default
-};
-//# sourceMappingURL=app-graph-builder-RSMA6I22.mjs.map

package/dist/lib/browser/app-graph-builder-RSMA6I22.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/capabilities/app-graph-builder/app-graph-builder.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\n\nimport { Capability, Common } from '@dxos/app-framework';\nimport { Operation } from '@dxos/operation';\nimport { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';\n\nimport { COMMANDS_DIALOG, meta } from '../../meta';\n\nexport default Capability.makeModule(\n  Effect.fnUntraced(function* () {\n    const extensions = yield* GraphBuilder.createExtension({\n      id: meta.id,\n      match: NodeMatcher.whenRoot,\n      actions: () =>\n        Effect.succeed([\n          {\n            id: COMMANDS_DIALOG,\n            data: () =>\n              Operation.invoke(Common.LayoutOperation.UpdateDialog, {\n                subject: COMMANDS_DIALOG,\n                blockAlign: 'start',\n              }),\n            properties: {\n              label: ['open commands label', { ns: meta.id }],\n              icon: 'ph--magnifying-glass--regular',\n              keyBinding: {\n                macos: 'meta+k',\n                windows: 'ctrl+k',\n              },\n            },\n          },\n        ]),\n    });\n\n    return Capability.contributes(Common.Capability.AppGraphBuilder, extensions);\n  }),\n);\n"],
-  "mappings": ";;;;;;AAIA,YAAYA,YAAY;AAExB,SAASC,YAAYC,cAAc;AACnC,SAASC,iBAAiB;AAC1B,SAASC,cAAcC,mBAAmB;AAI1C,IAAA,4BAAeC,WAAWC,WACjBC,kBAAW,aAAA;AAChB,QAAMC,aAAa,OAAOC,aAAaC,gBAAgB;IACrDC,IAAIC,KAAKD;IACTE,OAAOC,YAAYC;IACnBC,SAAS,MACAC,eAAQ;MACb;QACEN,IAAIO;QACJC,MAAM,MACJC,UAAUC,OAAOC,OAAOC,gBAAgBC,cAAc;UACpDC,SAASP;UACTQ,YAAY;QACd,CAAA;QACFC,YAAY;UACVC,OAAO;YAAC;YAAuB;cAAEC,IAAIjB,KAAKD;YAAG;;UAC7CmB,MAAM;UACNC,YAAY;YACVC,OAAO;YACPC,SAAS;UACX;QACF;MACF;KACD;EACL,CAAA;AAEA,SAAO5B,WAAW6B,YAAYZ,OAAOjB,WAAW8B,iBAAiB3B,UAAAA;AACnE,CAAA,CAAA;",
-  "names": ["Effect", "Capability", "Common", "Operation", "GraphBuilder", "NodeMatcher", "Capability", "makeModule", "fnUntraced", "extensions", "GraphBuilder", "createExtension", "id", "meta", "match", "NodeMatcher", "whenRoot", "actions", "succeed", "COMMANDS_DIALOG", "data", "Operation", "invoke", "Common", "LayoutOperation", "UpdateDialog", "subject", "blockAlign", "properties", "label", "ns", "icon", "keyBinding", "macos", "windows", "contributes", "AppGraphBuilder"]
-}