@dxos/plugin-space 0.8.4-main.5ea62a8 → 0.8.4-main.72ec0f3

package/dist/lib/node-esm/RecordArticle-NACBH42P.mjs

@@ -0,0 +1,117 @@
+import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
+import {
+  meta
+} from "./chunk-BDEFTL6K.mjs";
+
+// src/components/RecordArticle.tsx
+import { useSignals as _useSignals } from "@preact-signals/safe-react/tracking";
+import React, { useMemo } from "react";
+import { Surface } from "@dxos/app-framework/react";
+import { Filter, Ref, Relation } from "@dxos/echo";
+import { getSpace, useQuery } from "@dxos/react-client/echo";
+import { useTranslation } from "@dxos/react-ui";
+import { Masonry } from "@dxos/react-ui-masonry";
+import { StackItem } from "@dxos/react-ui-stack";
+import { mx } from "@dxos/react-ui-theme";
+import { isNonNullable } from "@dxos/util";
+var RecordArticle = ({ subject }) => {
+  var _effect = _useSignals();
+  try {
+    const { t } = useTranslation(meta.id);
+    const space = getSpace(subject);
+    const data = useMemo(() => ({
+      subject
+    }), [
+      subject
+    ]);
+    const related = useRelatedObjects(space, subject, {
+      references: true,
+      relations: true
+    });
+    const singleColumn = related.length === 1;
+    return /* @__PURE__ */ React.createElement(StackItem.Content, null, /* @__PURE__ */ React.createElement("div", {
+      role: "none",
+      className: mx("flex flex-col gap-4 p-4 is-full overflow-y-auto")
+    }, /* @__PURE__ */ React.createElement("div", {
+      role: "none",
+      className: mx("flex is-full card-max-width")
+    }, /* @__PURE__ */ React.createElement(Surface, {
+      role: "section",
+      data,
+      limit: 1
+    })), related.length > 0 && /* @__PURE__ */ React.createElement("div", {
+      role: "none",
+      className: mx("flex flex-col gap-1", singleColumn ? "card-max-width" : "is-full")
+    }, /* @__PURE__ */ React.createElement("label", {
+      className: "mbs-2 text-sm text-description"
+    }, t("related objects label")), /* @__PURE__ */ React.createElement(Masonry.Root, {
+      items: related,
+      render: Card,
+      columnCount: singleColumn ? 1 : void 0,
+      intrinsicHeight: true
+    }))));
+  } finally {
+    _effect.f();
+  }
+};
+var Card = ({ data: subject }) => {
+  var _effect = _useSignals();
+  try {
+    const data = useMemo(() => ({
+      subject
+    }), [
+      subject
+    ]);
+    return /* @__PURE__ */ React.createElement(Surface, {
+      role: "card",
+      data,
+      limit: 1
+    });
+  } finally {
+    _effect.f();
+  }
+};
+var useRelatedObjects = (space, record, options = {}) => {
+  const objects = useQuery(space, Filter.everything());
+  return useMemo(() => {
+    if (!record) {
+      return [];
+    }
+    const related = [];
+    if (options.references) {
+      const getReferences = (obj) => {
+        return Object.getOwnPropertyNames(obj).map((name) => obj[name]).filter((value) => Ref.isRef(value));
+      };
+      const references = getReferences(record);
+      const referenceTargets = references.map((ref) => ref.target).filter(isNonNullable);
+      const referenceSources = objects.filter((obj) => {
+        const refs = getReferences(obj);
+        return refs.some((ref) => ref.target === record);
+      });
+      related.push(...referenceTargets, ...referenceSources);
+    }
+    if (options.relations) {
+      const isValidRelation = (obj) => {
+        try {
+          return Relation.isRelation(obj) && Relation.getSource(obj) && Relation.getTarget(obj);
+        } catch {
+          return false;
+        }
+      };
+      const relations = objects.filter((obj) => Relation.isRelation(obj)).filter((obj) => isValidRelation(obj));
+      const targetObjects = relations.filter((relation) => Relation.getTarget(relation) === record).map((relation) => Relation.getSource(relation));
+      const sourceObjects = relations.filter((relation) => Relation.getSource(relation) === record).map((relation) => Relation.getTarget(relation));
+      related.push(...targetObjects, ...sourceObjects);
+    }
+    return related;
+  }, [
+    record,
+    objects
+  ]);
+};
+var RecordArticle_default = RecordArticle;
+export {
+  RecordArticle,
+  RecordArticle_default as default
+};
+//# sourceMappingURL=RecordArticle-NACBH42P.mjs.map

package/dist/lib/node-esm/RecordArticle-NACBH42P.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/components/RecordArticle.tsx"],
+  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport React, { useMemo } from 'react';\n\nimport { Surface } from '@dxos/app-framework/react';\nimport { type SurfaceComponentProps } from '@dxos/app-framework/react';\nimport { Filter, type Obj, Ref, Relation } from '@dxos/echo';\nimport { type Space, getSpace, useQuery } from '@dxos/react-client/echo';\nimport { useTranslation } from '@dxos/react-ui';\nimport { Masonry } from '@dxos/react-ui-masonry';\nimport { StackItem } from '@dxos/react-ui-stack';\nimport { mx } from '@dxos/react-ui-theme';\nimport { isNonNullable } from '@dxos/util';\n\nimport { meta } from '../meta';\n\nexport const RecordArticle = ({ subject }: SurfaceComponentProps) => {\n  const { t } = useTranslation(meta.id);\n  const space = getSpace(subject);\n  const data = useMemo(() => ({ subject }), [subject]);\n  const related = useRelatedObjects(space, subject, {\n    references: true,\n    relations: true,\n  });\n  const singleColumn = related.length === 1;\n\n  return (\n    <StackItem.Content>\n      <div role='none' className={mx('flex flex-col gap-4 p-4 is-full overflow-y-auto')}>\n        <div role='none' className={mx('flex is-full card-max-width')}>\n          <Surface role='section' data={data} limit={1} />\n        </div>\n\n        {related.length > 0 && (\n          <div role='none' className={mx('flex flex-col gap-1', singleColumn ? 'card-max-width' : 'is-full')}>\n            <label className='mbs-2 text-sm text-description'>{t('related objects label')}</label>\n            <Masonry.Root<Obj.Any>\n              items={related}\n              render={Card}\n              columnCount={singleColumn ? 1 : undefined}\n              intrinsicHeight\n            />\n          </div>\n        )}\n      </div>\n    </StackItem.Content>\n  );\n};\n\nconst Card = ({ data: subject }: { data: Obj.Any }) => {\n  const data = useMemo(() => ({ subject }), [subject]);\n  return <Surface role='card' data={data} limit={1} />;\n};\n\n// TODO(wittjosiah): This is a hack. ECHO needs to have a back reference index to easily query for related objects.\nconst useRelatedObjects = (\n  space?: Space,\n  record?: Obj.Any,\n  options: { references?: boolean; relations?: boolean } = {},\n) => {\n  const objects = useQuery(space, Filter.everything());\n  return useMemo(() => {\n    if (!record) {\n      return [];\n    }\n\n    const related: Obj.Any[] = [];\n\n    // TODO(burdon): Change Person => Organization to relations.\n    if (options.references) {\n      const getReferences = (obj: Obj.Any): Ref.Any[] => {\n        return Object.getOwnPropertyNames(obj)\n          .map((name) => obj[name as keyof Obj.Any])\n          .filter((value) => Ref.isRef(value)) as Ref.Any[];\n      };\n\n      const references = getReferences(record);\n      const referenceTargets = references.map((ref) => ref.target).filter(isNonNullable);\n      const referenceSources = objects.filter((obj) => {\n        const refs = getReferences(obj);\n        return refs.some((ref) => ref.target === record);\n      });\n\n      related.push(...referenceTargets, ...referenceSources);\n    }\n\n    if (options.relations) {\n      // TODO(dmaretskyi): Workaround until https://github.com/dxos/dxos/pull/10100 lands.\n      const isValidRelation = (obj: Obj.Any) => {\n        try {\n          return Relation.isRelation(obj) && Relation.getSource(obj) && Relation.getTarget(obj);\n        } catch {\n          return false;\n        }\n      };\n\n      const relations = objects.filter((obj) => Relation.isRelation(obj)).filter((obj) => isValidRelation(obj));\n      const targetObjects = relations\n        .filter((relation) => Relation.getTarget(relation) === record)\n        .map((relation) => Relation.getSource(relation));\n      const sourceObjects = relations\n        .filter((relation) => Relation.getSource(relation) === record)\n        .map((relation) => Relation.getTarget(relation));\n\n      related.push(...targetObjects, ...sourceObjects);\n    }\n\n    return related;\n  }, [record, objects]);\n};\n\nexport default RecordArticle;\n"],
+  "mappings": "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",
+  "names": ["React", "useMemo", "Surface", "Filter", "Ref", "Relation", "getSpace", "useQuery", "useTranslation", "Masonry", "StackItem", "mx", "isNonNullable", "RecordArticle", "subject", "t", "useTranslation", "meta", "id", "space", "getSpace", "data", "useMemo", "related", "useRelatedObjects", "references", "relations", "singleColumn", "length", "StackItem", "Content", "div", "role", "className", "mx", "Surface", "limit", "label", "Masonry", "Root", "items", "render", "Card", "columnCount", "undefined", "intrinsicHeight", "record", "options", "objects", "useQuery", "Filter", "everything", "getReferences", "obj", "Object", "getOwnPropertyNames", "map", "name", "filter", "value", "Ref", "isRef", "referenceTargets", "ref", "target", "isNonNullable", "referenceSources", "refs", "some", "push", "isValidRelation", "Relation", "isRelation", "getSource", "getTarget", "targetObjects", "relation", "sourceObjects"]
+}

package/dist/lib/node-esm/{app-graph-builder-D5YPOJS5.mjs → app-graph-builder-24JCLJPX.mjs}

@@ -1,44 +1,47 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
 import {
   getActiveSpace
-} from "./chunk-Q6AAQLQG.mjs";
+} from "./chunk-TJPQDQNI.mjs";
 import {
   SpaceCapabilities
-} from "./chunk-HC677WUJ.mjs";
+} from "./chunk-Z7BB6HC2.mjs";
 import {
   SHARED,
   SPACES,
+  atomFromQuery,
   constructObjectActions,
   constructSpaceActions,
   constructSpaceNode,
   createObjectNode,
   createStaticSchemaActions,
-  createStaticSchemaNode,
-  rxFromQuery
-} from "./chunk-AUQ3SKL2.mjs";
+  createStaticSchemaNode
+} from "./chunk-VH2EBZEV.mjs";
 import {
   SPACE_TYPE,
   SpaceAction
-} from "./chunk-WKQTO37U.mjs";
+} from "./chunk-2PN7QNGV.mjs";
 import {
-  SPACE_PLUGIN
-} from "./chunk-HWNG4MEU.mjs";
+  meta
+} from "./chunk-BDEFTL6K.mjs";
 
 // src/capabilities/app-graph-builder.ts
-import { Rx } from "@effect-rx/rx-react";
-import { Array, Option, Schema, pipe } from "effect";
+import { Atom } from "@effect-atom/atom-react";
+import * as Array from "effect/Array";
+import * as Function from "effect/Function";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
 import { Capabilities, contributes, createIntent } from "@dxos/app-framework";
-import { SpaceState, getSpace, isSpace, parseId } from "@dxos/client/echo";
-import { Filter, Obj, Query, Type } from "@dxos/echo";
+import { SpaceState, getSpace, isSpace } from "@dxos/client/echo";
+import { DXN, Filter, Obj, Query, Type } from "@dxos/echo";
 import { log } from "@dxos/log";
 import { ClientCapabilities } from "@dxos/plugin-client";
 import { ATTENDABLE_PATH_SEPARATOR, PLANK_COMPANION_TYPE } from "@dxos/plugin-deck/types";
-import { ROOT_ID, createExtension, rxFromObservable, rxFromSignal } from "@dxos/plugin-graph";
-import { DataType } from "@dxos/schema";
+import { ROOT_ID, atomFromObservable, atomFromSignal, createExtension } from "@dxos/plugin-graph";
+import { Collection, StoredSchema, View, getTypenameFromQuery } from "@dxos/schema";
 import { isNonNullable } from "@dxos/util";
 var __dxlog_file = "/__w/dxos/dxos/packages/plugins/plugin-space/src/capabilities/app-graph-builder.ts";
-var app_graph_builder_default = (context) => {
-  const resolve = (typename) => context.getCapabilities(Capabilities.Metadata).find(({ id }) => id === typename)?.metadata ?? {};
+var app_graph_builder_default = ((context) => {
+  const resolve = (get) => (typename) => context.getCapabilities(Capabilities.Metadata).find(({ id }) => id === typename)?.metadata ?? {};
   const spacesNode = {
     id: SPACES,
     type: SPACES,
@@ -50,7 +53,7 @@ var app_graph_builder_default = (context) => {
       label: [
         "spaces label",
         {
-          ns: SPACE_PLUGIN
+          ns: meta.id
         }
       ],
       icon: "ph--planet--regular",
@@ -71,7 +74,7 @@ var app_graph_builder_default = (context) => {
         } else {
           log.warn("spaces order object not found", void 0, {
             F: __dxlog_file,
-            L: 71,
+            L: 74,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -82,9 +85,9 @@ var app_graph_builder_default = (context) => {
   return contributes(Capabilities.AppGraphBuilder, [
     // Primary actions.
     createExtension({
-      id: `${SPACE_PLUGIN}/primary-actions`,
+      id: `${meta.id}/primary-actions`,
       position: "hoist",
-      actions: (node) => Rx.make((get) => pipe(get(node), Option.flatMap((node2) => node2.id === ROOT_ID ? Option.some(node2) : Option.none()), Option.map(() => [
+      actions: (node) => Atom.make((get) => Function.pipe(get(node), Option.flatMap((node2) => node2.id === ROOT_ID ? Option.some(node2) : Option.none()), Option.map(() => [
         {
           id: SpaceAction.OpenCreateSpace._tag,
           data: async () => {
@@ -95,7 +98,7 @@ var app_graph_builder_default = (context) => {
             label: [
               "create space label",
               {
-                ns: SPACE_PLUGIN
+                ns: meta.id
               }
             ],
             icon: "ph--plus--regular",
@@ -113,7 +116,7 @@ var app_graph_builder_default = (context) => {
             label: [
               "join space label",
               {
-                ns: SPACE_PLUGIN
+                ns: meta.id
               }
             ],
             icon: "ph--sign-in--regular",
@@ -135,7 +138,7 @@ var app_graph_builder_default = (context) => {
             label: [
               "share space label",
               {
-                ns: SPACE_PLUGIN
+                ns: meta.id
               }
             ],
             icon: "ph--users--regular",
@@ -160,7 +163,7 @@ var app_graph_builder_default = (context) => {
             label: [
               "open current space settings label",
               {
-                ns: SPACE_PLUGIN
+                ns: meta.id
               }
             ],
             icon: "ph--faders--regular",
@@ -174,9 +177,9 @@ var app_graph_builder_default = (context) => {
     }),
     // Create spaces group node.
     createExtension({
-      id: `${SPACE_PLUGIN}/root`,
+      id: `${meta.id}/root`,
       position: "hoist",
-      connector: (node) => Rx.make((get) => pipe(get(node), Option.flatMap((node2) => node2.id === ROOT_ID ? Option.some(node2) : Option.none()), Option.map(() => [
+      connector: (node) => Atom.make((get) => Function.pipe(get(node), Option.flatMap((node2) => node2.id === ROOT_ID ? Option.some(node2) : Option.none()), Option.map(() => [
         spacesNode
       ]), Option.getOrElse(() => [])))
     }),
@@ -185,25 +188,25 @@ var app_graph_builder_default = (context) => {
       id: SPACES,
       connector: (node) => {
         let query;
-        return Rx.make((get) => pipe(get(node), Option.flatMap((node2) => node2.id === SPACES ? Option.some(node2) : Option.none()), Option.map(() => {
+        return Atom.make((get) => Function.pipe(get(node), Option.flatMap((node2) => node2.id === SPACES ? Option.some(node2) : Option.none()), Option.map(() => {
           const state = context.getCapability(SpaceCapabilities.State);
           const client = context.getCapability(ClientCapabilities.Client);
-          const spacesRx = rxFromObservable(client.spaces);
-          const isReadyRx = rxFromObservable(client.spaces.isReady);
-          const spaces = get(spacesRx);
-          const isReady = get(isReadyRx);
+          const spacesAtom = atomFromObservable(client.spaces);
+          const isReadyAtom = atomFromObservable(client.spaces.isReady);
+          const spaces = get(spacesAtom);
+          const isReady = get(isReadyAtom);
           if (!spaces || !isReady) {
             return [];
           }
-          const settings = get(context.capabilities(Capabilities.SettingsStore))[0]?.getStore(SPACE_PLUGIN)?.value;
+          const settings = get(context.capabilities(Capabilities.SettingsStore))[0]?.getStore(meta.id)?.value;
           try {
             if (!query) {
               query = client.spaces.default.db.query(Filter.type(Type.Expando, {
                 key: SHARED
               }));
             }
-            const [spacesOrder] = get(rxFromQuery(query));
-            return get(rxFromSignal(() => {
+            const [spacesOrder] = get(atomFromQuery(query));
+            return get(atomFromSignal(() => {
               const order = spacesOrder?.order ?? [];
               const orderMap = new Map(order.map((id, index) => [
                 id,
@@ -217,7 +220,7 @@ var app_graph_builder_default = (context) => {
                 navigable: state.navigableCollections,
                 personal: space === client.spaces.default,
                 namesCache: state.spaceNames,
-                resolve
+                resolve: resolve(get)
               }));
             }));
           } catch {
@@ -228,8 +231,8 @@ var app_graph_builder_default = (context) => {
     }),
     // Create space actions.
     createExtension({
-      id: `${SPACE_PLUGIN}/actions`,
-      actions: (node) => Rx.make((get) => pipe(get(node), Option.flatMap((node2) => node2.type === SPACE_TYPE && isSpace(node2.data) ? Option.some(node2.data) : Option.none()), Option.flatMap((space) => {
+      id: `${meta.id}/actions`,
+      actions: (node) => Atom.make((get) => Function.pipe(get(node), Option.flatMap((node2) => node2.type === SPACE_TYPE && isSpace(node2.data) ? Option.some(node2.data) : Option.none()), Option.flatMap((space) => {
         const [dispatcher] = get(context.capabilities(Capabilities.IntentDispatcher));
         const [client] = get(context.capabilities(ClientCapabilities.Client));
         const [state] = get(context.capabilities(SpaceCapabilities.State));
@@ -247,48 +250,49 @@ var app_graph_builder_default = (context) => {
     }),
     // Create nodes for objects in the root collection of a space.
     createExtension({
-      id: `${SPACE_PLUGIN}/root-collection`,
-      connector: (node) => Rx.make((get) => pipe(get(node), Option.flatMap((node2) => node2.type === SPACE_TYPE && isSpace(node2.data) ? Option.some(node2.data) : Option.none()), Option.map((space) => {
+      id: `${meta.id}/root-collection`,
+      connector: (node) => Atom.make((get) => Function.pipe(get(node), Option.flatMap((node2) => node2.type === SPACE_TYPE && isSpace(node2.data) ? Option.some(node2.data) : Option.none()), Option.map((space) => {
         const state = context.getCapability(SpaceCapabilities.State);
-        const spaceState = get(rxFromObservable(space.state));
+        const spaceState = get(atomFromObservable(space.state));
         if (spaceState !== SpaceState.SPACE_READY) {
           return [];
         }
-        const collection = get(rxFromSignal(() => space.properties[DataType.Collection.typename]?.target));
+        const collection = get(atomFromSignal(() => space.properties[Collection.Collection.typename]?.target));
         if (!collection) {
           return [];
         }
-        return get(rxFromSignal(() => pipe(collection.objects, Array.map((object) => object.target), Array.filter(isNonNullable), Array.map((object) => createObjectNode({
+        return get(atomFromSignal(() => Function.pipe(collection.objects, Array.map((object) => object.target), Array.filter(isNonNullable), Array.map((object) => createObjectNode({
           space,
           object,
-          resolve,
+          resolve: resolve(get),
           navigable: state.navigableCollections
         })), Array.filter(isNonNullable))));
       }), Option.getOrElse(() => [])))
     }),
     // Create nodes for objects in a collection or by its fully qualified id.
     createExtension({
-      id: `${SPACE_PLUGIN}/objects`,
-      connector: (node) => Rx.make((get) => pipe(get(node), Option.flatMap((node2) => Obj.instanceOf(DataType.Collection, node2.data) ? Option.some(node2.data) : Option.none()), Option.map((collection) => {
+      id: `${meta.id}/objects`,
+      connector: (node) => Atom.make((get) => Function.pipe(get(node), Option.flatMap((node2) => Obj.instanceOf(Collection.Collection, node2.data) ? Option.some(node2.data) : Option.none()), Option.map((collection) => {
         const state = context.getCapability(SpaceCapabilities.State);
         const space = getSpace(collection);
-        return get(rxFromSignal(() => pipe(collection.objects, Array.map((object) => object.target), Array.filter(isNonNullable), Array.map((object) => space && createObjectNode({
+        return get(atomFromSignal(() => Function.pipe(collection.objects, Array.map((object) => object.target), Array.filter(isNonNullable), Array.map((object) => space && createObjectNode({
           object,
           space,
-          resolve,
+          resolve: resolve(get),
           navigable: state.navigableCollections
         })), Array.filter(isNonNullable))));
       }), Option.getOrElse(() => [])))
     }),
     // Create nodes for objects in a query collection.
     createExtension({
-      id: `${SPACE_PLUGIN}/query-collection-objects`,
+      id: `${meta.id}/query-collection-objects`,
       connector: (node) => {
         let query;
-        return Rx.make((get) => pipe(get(node), Option.flatMap((node2) => Obj.instanceOf(DataType.QueryCollection, node2.data) ? Option.some(node2.data) : Option.none()), Option.flatMap((collection) => {
+        return Atom.make((get) => Function.pipe(get(node), Option.flatMap((node2) => Obj.instanceOf(Collection.QueryCollection, node2.data) ? Option.some(node2.data) : Option.none()), Option.flatMap((collection) => {
           const space = getSpace(collection);
-          return collection.query.typename && space ? Option.some({
-            typename: collection.query.typename,
+          const typename = getTypenameFromQuery(collection.query);
+          return typename && space ? Option.some({
+            typename,
             space
           }) : Option.none();
         }), Option.map(({ typename, space }) => {
@@ -299,13 +303,13 @@ var app_graph_builder_default = (context) => {
               // TODO(wittjosiah): This query is broader than it should be.
               //   It will return all objects in the collection, not just the ones of the given type.
               //   However this works fine for now because this query is only used for exclusions.
-              Query.select(Filter.typename(typename)).referencedBy(DataType.Collection, "objects").reference("objects")
+              Query.select(Filter.typename(typename)).referencedBy(Collection.Collection, "objects").reference("objects")
             ));
           }
-          return get(rxFromQuery(query)).toSorted((a, b) => a.id.localeCompare(b.id)).map((object) => get(rxFromSignal(() => createObjectNode({
+          return get(atomFromQuery(query)).toSorted((a, b) => a.id.localeCompare(b.id)).map((object) => get(atomFromSignal(() => createObjectNode({
             object,
             space,
-            resolve,
+            resolve: resolve(get),
             droppable: false,
             navigable: state.navigableCollections
           })))).filter(isNonNullable);
@@ -314,14 +318,14 @@ var app_graph_builder_default = (context) => {
     }),
     // Static schema records.
     createExtension({
-      id: `${SPACE_PLUGIN}/static-schemas`,
+      id: `${meta.id}/static-schemas`,
       connector: (node) => {
         const client = context.getCapability(ClientCapabilities.Client);
-        return Rx.make((get) => pipe(get(node), Option.flatMap((node2) => Obj.instanceOf(DataType.QueryCollection, node2.data) && node2.data.query.typename === DataType.StoredSchema.typename ? Option.some(node2.data) : Option.none()), Option.flatMap((collection) => {
+        return Atom.make((get) => Function.pipe(get(node), Option.flatMap((node2) => Obj.instanceOf(Collection.QueryCollection, node2.data) && getTypenameFromQuery(node2.data.query) === StoredSchema.typename ? Option.some(node2.data) : Option.none()), Option.flatMap((collection) => {
           const space = getSpace(collection);
           return space?.properties.staticRecords ? Option.some(space) : Option.none();
         }), Option.map((space) => {
-          return get(rxFromSignal(() => space.properties.staticRecords ?? [])).map((typename) => client.graph.schemaRegistry.schemas.find((schema) => Type.getTypename(schema) === typename)).filter(isNonNullable).map((schema) => createStaticSchemaNode({
+          return get(atomFromSignal(() => space.properties.staticRecords ?? [])).map((typename) => client.graph.schemaRegistry.schemas.find((schema) => Type.getTypename(schema) === typename)).filter(isNonNullable).map((schema) => createStaticSchemaNode({
             schema,
             space
           }));
@@ -330,10 +334,10 @@ var app_graph_builder_default = (context) => {
     }),
     // Create static schema actions.
     createExtension({
-      id: `${SPACE_PLUGIN}/static-schema-actions`,
+      id: `${meta.id}/static-schema-actions`,
       actions: (node) => {
         let query;
-        return Rx.make((get) => pipe(get(node), Option.flatMap((node2) => {
+        return Atom.make((get) => Function.pipe(get(node), Option.flatMap((node2) => {
           const space = isSpace(node2.properties.space) ? node2.properties.space : void 0;
           return space && Schema.isSchema(node2.data) ? Option.some({
             space,
@@ -341,12 +345,12 @@ var app_graph_builder_default = (context) => {
           }) : Option.none();
         }), Option.map(({ space, schema }) => {
           if (!query) {
-            query = space.db.query(Filter.type(DataType.View));
+            query = space.db.query(Filter.type(View.View));
           }
-          const views = get(rxFromQuery(query));
-          const filteredViews = get(rxFromSignal(() => (
+          const views = get(atomFromQuery(query));
+          const filteredViews = get(atomFromSignal(() => (
             // TODO(wittjosiah): Remove cast.
-            views.filter((view) => view.query.typename === Type.getTypename(schema))
+            views.filter((view) => getTypenameFromQuery(view.query.ast) === Type.getTypename(schema))
           )));
           const deletable = filteredViews.length === 0;
           const [dispatcher] = get(context.capabilities(Capabilities.IntentDispatcher));
@@ -364,24 +368,32 @@ var app_graph_builder_default = (context) => {
     }),
     // Create nodes for schema views.
     createExtension({
-      id: `${SPACE_PLUGIN}/schema-views`,
+      id: `${meta.id}/schema-views`,
       connector: (node) => {
         let query;
-        return Rx.make((get) => pipe(get(node), Option.flatMap((node2) => {
+        return Atom.make((get) => Function.pipe(get(node), Option.flatMap((node2) => {
           const space = getSpace(node2.data) ?? (isSpace(node2.properties.space) ? node2.properties.space : void 0);
-          return space && (Obj.instanceOf(DataType.StoredSchema, node2.data) || Schema.isSchema(node2.data)) ? Option.some({
+          return space && (Obj.instanceOf(StoredSchema, node2.data) || Schema.isSchema(node2.data)) ? Option.some({
             space,
             schema: node2.data
           }) : Option.none();
         }), Option.map(({ space, schema }) => {
           if (!query) {
-            query = space.db.query(Filter.type(DataType.View));
+            query = space.db.query(Filter.type(View.View));
           }
           const typename = Schema.isSchema(schema) ? Type.getTypename(schema) : schema.typename;
-          return get(rxFromQuery(query)).filter((view) => view.query.typename === typename).map((view) => get(rxFromSignal(() => createObjectNode({
+          return get(atomFromQuery(query)).filter((view) => getTypenameFromQuery(view.query.ast) === typename).filter((view) => get(atomFromSignal(() => {
+            const presentation = view.presentation.target;
+            if (presentation) {
+              const typename2 = Obj.getTypename(presentation);
+              return typename2 !== Collection.Collection.typename;
+            } else {
+              return false;
+            }
+          }))).map((view) => get(atomFromSignal(() => createObjectNode({
             object: view,
             space,
-            resolve,
+            resolve: resolve(get),
             droppable: false
           })))).filter(isNonNullable);
         }), Option.getOrElse(() => [])));
@@ -389,30 +401,30 @@ var app_graph_builder_default = (context) => {
     }),
     // Create record nodes.
     createExtension({
-      id: `${SPACE_PLUGIN}/records`,
+      id: `${meta.id}/records`,
       resolver: (id) => {
         let query;
-        return Rx.make((get) => {
+        return Atom.make((get) => {
           const client = context.getCapability(ClientCapabilities.Client);
-          const { spaceId, objectId } = parseId(id);
-          if (!spaceId || !objectId) {
+          const dxn = DXN.tryParse(id)?.asEchoDXN();
+          if (!dxn || !dxn.spaceId) {
             return null;
           }
-          const space = client.spaces.get(spaceId);
+          const space = client.spaces.get(dxn.spaceId);
           if (!space) {
             return null;
           }
           if (!query) {
-            query = space.db.query(Filter.ids(objectId));
+            query = space.db.query(Filter.ids(dxn.echoId));
           }
-          const object = get(rxFromQuery(query)).at(0);
+          const object = get(atomFromQuery(query)).at(0);
           if (!object) {
             return null;
           }
           return createObjectNode({
             object,
             space,
-            resolve,
+            resolve: resolve(get),
             disposition: "hidden"
           });
         });
@@ -420,25 +432,25 @@ var app_graph_builder_default = (context) => {
     }),
     // Create collection actions and action groups.
     createExtension({
-      id: `${SPACE_PLUGIN}/object-actions`,
+      id: `${meta.id}/object-actions`,
       actions: (node) => {
         let query;
-        return Rx.make((get) => pipe(get(node), Option.flatMap((node2) => {
+        return Atom.make((get) => Function.pipe(get(node), Option.flatMap((node2) => {
           const space = getSpace(node2.data);
-          return space && Obj.isObject(node2.data) ? Option.some({
+          return space && Obj.isObject(node2.data) && Obj.getTypename(node2.data) === node2.type ? Option.some({
             space,
             object: node2.data
           }) : Option.none();
         }), Option.flatMap(({ space, object }) => {
-          const isSchema = Obj.instanceOf(DataType.StoredSchema, object);
-          if (!query && isSchema) {
-            query = space.db.query(Filter.type(DataType.View));
+          const isSchema2 = Obj.instanceOf(StoredSchema, object);
+          if (!query && isSchema2) {
+            query = space.db.query(Filter.type(View.View));
           }
-          let deletable = !isSchema && // Don't allow the Records smart collection to be deleted.
-          !(Obj.instanceOf(DataType.QueryCollection, object) && object.query.typename === DataType.StoredSchema.typename);
-          if (isSchema && query) {
-            const views = get(rxFromQuery(query));
-            const filteredViews = get(rxFromSignal(() => views.filter((view) => view.query.typename === object.typename)));
+          let deletable = !isSchema2 && // Don't allow the Records smart collection to be deleted.
+          !(Obj.instanceOf(Collection.QueryCollection, object) && getTypenameFromQuery(object.query) === StoredSchema.typename);
+          if (isSchema2 && query) {
+            const views = get(atomFromQuery(query));
+            const filteredViews = get(atomFromSignal(() => views.filter((view) => getTypenameFromQuery(view.query.ast) === object.typename)));
             deletable = filteredViews.length === 0;
           }
           const [dispatcher] = get(context.capabilities(Capabilities.IntentDispatcher));
@@ -454,7 +466,7 @@ var app_graph_builder_default = (context) => {
               dispatch: dispatcher.dispatchPromise,
               objectForms,
               deletable,
-              navigable: get(rxFromSignal(() => state.navigableCollections))
+              navigable: get(atomFromSignal(() => state.navigableCollections))
             });
           }
         }), Option.map((params) => constructObjectActions(params)), Option.getOrElse(() => [])));
@@ -462,8 +474,8 @@ var app_graph_builder_default = (context) => {
     }),
     // View selected objects.
     createExtension({
-      id: `${SPACE_PLUGIN}/selected-objects`,
-      connector: (node) => Rx.make((get) => pipe(get(node), Option.flatMap((node2) => Obj.instanceOf(DataType.View, node2.data) ? Option.some(node2) : Option.none()), Option.map((node2) => [
+      id: `${meta.id}/selected-objects`,
+      connector: (node) => Atom.make((get) => Function.pipe(get(node), Option.flatMap((node2) => Obj.instanceOf(View.View, node2.data) ? Option.some(node2) : Option.none()), Option.map((node2) => [
         {
           id: [
             node2.id,
@@ -475,7 +487,7 @@ var app_graph_builder_default = (context) => {
             label: [
               "companion selected objects label",
               {
-                ns: SPACE_PLUGIN
+                ns: meta.id
               }
             ],
             icon: "ph--tree-view--regular",
@@ -486,8 +498,8 @@ var app_graph_builder_default = (context) => {
     }),
     // Object settings plank companion.
     createExtension({
-      id: `${SPACE_PLUGIN}/settings`,
-      connector: (node) => Rx.make((get) => pipe(get(node), Option.flatMap((node2) => Obj.isObject(node2.data) ? Option.some(node2) : Option.none()), Option.map((node2) => [
+      id: `${meta.id}/settings`,
+      connector: (node) => Atom.make((get) => Function.pipe(get(node), Option.flatMap((node2) => Obj.isObject(node2.data) ? Option.some(node2) : Option.none()), Option.map((node2) => [
         {
           id: [
             node2.id,
@@ -499,7 +511,7 @@ var app_graph_builder_default = (context) => {
             label: [
               "object settings label",
               {
-                ns: SPACE_PLUGIN
+                ns: meta.id
               }
             ],
             icon: "ph--sliders--regular",
@@ -510,8 +522,8 @@ var app_graph_builder_default = (context) => {
       ]), Option.getOrElse(() => [])))
     })
   ]);
-};
+});
 export {
   app_graph_builder_default as default
 };
-//# sourceMappingURL=app-graph-builder-D5YPOJS5.mjs.map
+//# sourceMappingURL=app-graph-builder-24JCLJPX.mjs.map