@dxos/plugin-debug 0.6.14-main.2b6a0f3 → 0.6.14-main.f49f251

package/dist/lib/browser/{DebugSpace-2G2PBGCC.mjs → DebugSpace-I6BNZKI2.mjs}

@@ -1,6 +1,6 @@
 import {
   DebugContext
-} from "./chunk-6Y463JSP.mjs";
+} from "./chunk-NHHLZV45.mjs";
 import "./chunk-2HTS7SNO.mjs";
 import {
   DebugPanel
@@ -408,4 +408,4 @@ var DebugSpace_default = DebugSpace;
 export {
   DebugSpace_default as default
 };
-//# sourceMappingURL=DebugSpace-2G2PBGCC.mjs.map
+//# sourceMappingURL=DebugSpace-I6BNZKI2.mjs.map

package/dist/lib/browser/{chunk-6Y463JSP.mjs → chunk-NHHLZV45.mjs}

@@ -4,6 +4,7 @@ import {
 
 // packages/plugins/plugin-debug/src/types.ts
 import { createContext } from "react";
+import { S } from "@dxos/echo-schema";
 var DEBUG_ACTION = `${DEBUG_PLUGIN}/action`;
 var DebugAction;
 (function(DebugAction2) {
@@ -16,9 +17,15 @@ var DebugContext = createContext({
   stop: () => {
   }
 });
+var DebugSettingsSchema = S.mutable(S.Struct({
+  devtools: S.optional(S.Boolean),
+  debug: S.optional(S.Boolean),
+  wireframe: S.optional(S.Boolean)
+}));
 
 export {
   DebugAction,
-  DebugContext
+  DebugContext,
+  DebugSettingsSchema
 };
-//# sourceMappingURL=chunk-6Y463JSP.mjs.map
+//# sourceMappingURL=chunk-NHHLZV45.mjs.map

package/dist/lib/browser/chunk-NHHLZV45.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/types.ts"],
+  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { type Context, createContext } from 'react';\n\nimport type {\n  GraphBuilderProvides,\n  IntentResolverProvides,\n  SettingsProvides,\n  SurfaceProvides,\n  TranslationsProvides,\n} from '@dxos/app-framework';\nimport type { TimerCallback, TimerOptions } from '@dxos/async';\nimport { S } from '@dxos/echo-schema';\n\nimport { DEBUG_PLUGIN } from './meta';\n\nconst DEBUG_ACTION = `${DEBUG_PLUGIN}/action`;\nexport enum DebugAction {\n  OPEN_DEVTOOLS = `${DEBUG_ACTION}/open-devtools`,\n}\n\nexport type DebugContextType = {\n  running: boolean;\n  start: (cb: TimerCallback, options: TimerOptions) => void;\n  stop: () => void;\n};\n\nexport const DebugContext: Context<DebugContextType> = createContext<DebugContextType>({\n  running: false,\n  start: () => {},\n  stop: () => {},\n});\n\nexport const DebugSettingsSchema = S.mutable(\n  S.Struct({\n    devtools: S.optional(S.Boolean),\n    debug: S.optional(S.Boolean),\n    wireframe: S.optional(S.Boolean),\n  }),\n);\n\nexport interface DebugSettingsProps extends S.Schema.Type<typeof DebugSettingsSchema> {}\n\nexport type DebugPluginProvides = SurfaceProvides &\n  IntentResolverProvides &\n  GraphBuilderProvides &\n  SettingsProvides<DebugSettingsProps> &\n  TranslationsProvides;\n"],
+  "mappings": ";;;;;AAIA,SAAuBA,qBAAqB;AAU5C,SAASC,SAAS;AAIlB,IAAMC,eAAe,GAAGC,YAAAA;;UACZC,cAAAA;+CACM,GAAGF,YAAAA,gBAA4B,IAAA;GADrCE,gBAAAA,cAAAA,CAAAA,EAAAA;AAUL,IAAMC,eAA0CC,cAAgC;EACrFC,SAAS;EACTC,OAAO,MAAA;EAAO;EACdC,MAAM,MAAA;EAAO;AACf,CAAA;AAEO,IAAMC,sBAAsBC,EAAEC,QACnCD,EAAEE,OAAO;EACPC,UAAUH,EAAEI,SAASJ,EAAEK,OAAO;EAC9BC,OAAON,EAAEI,SAASJ,EAAEK,OAAO;EAC3BE,WAAWP,EAAEI,SAASJ,EAAEK,OAAO;AACjC,CAAA,CAAA;",
+  "names": ["createContext", "S", "DEBUG_ACTION", "DEBUG_PLUGIN", "DebugAction", "DebugContext", "createContext", "running", "start", "stop", "DebugSettingsSchema", "S", "mutable", "Struct", "devtools", "optional", "Boolean", "debug", "wireframe"]
+}

package/dist/lib/browser/index.mjs

@@ -1,7 +1,8 @@
 import {
   DebugAction,
-  DebugContext
-} from "./chunk-6Y463JSP.mjs";
+  DebugContext,
+  DebugSettingsSchema
+} from "./chunk-NHHLZV45.mjs";
 import {
   DEBUG_PLUGIN,
   meta_default
@@ -9,14 +10,15 @@ import {
 
 // packages/plugins/plugin-debug/src/DebugPlugin.tsx
 import React5, { useEffect as useEffect3, useState as useState3 } from "react";
-import { getPlugin, parseGraphPlugin as parseGraphPlugin2, parseIntentPlugin, resolvePlugin } from "@dxos/app-framework";
+import { definePlugin, parseGraphPlugin as parseGraphPlugin2, parseIntentPlugin, parseMetadataResolverPlugin, parseSettingsPlugin, resolvePlugin } from "@dxos/app-framework";
 import { Timer } from "@dxos/async";
 import { Devtools } from "@dxos/devtools";
-import { LocalStorageStore } from "@dxos/local-storage";
-import { createExtension, Graph } from "@dxos/plugin-graph";
+import { invariant } from "@dxos/invariant";
+import { parseClientPlugin } from "@dxos/plugin-client";
+import { createExtension, Graph, toSignal } from "@dxos/plugin-graph";
 import { SpaceAction } from "@dxos/plugin-space";
 import { CollectionType } from "@dxos/plugin-space/types";
-import { SpaceState, isEchoObject, isSpace } from "@dxos/react-client/echo";
+import { create, getTypename, isEchoObject, isSpace, parseId, SpaceState } from "@dxos/react-client/echo";
 import { Main } from "@dxos/react-ui";
 import { baseSurface, bottombarBlockPaddingEnd, fixedInsetFlexLayout, topbarBlockPaddingStart } from "@dxos/react-ui-theme";
 
@@ -42,9 +44,9 @@ import React2, { useEffect, useState } from "react";
 import { parseFileManagerPlugin, useResolvePlugin } from "@dxos/app-framework";
 import { defs, SaveConfig, Storage } from "@dxos/config";
 import { log } from "@dxos/log";
-import { SettingsValue } from "@dxos/plugin-settings";
 import { useClient } from "@dxos/react-client";
 import { useTranslation, Button, Toast, Input, useFileDownload, Select } from "@dxos/react-ui";
+import { FormInput } from "@dxos/react-ui-data";
 import { getSize, mx } from "@dxos/react-ui-theme";
 import { setDeep } from "@dxos/util";
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/plugins/plugin-debug/src/components/DebugSettings.tsx";
@@ -124,28 +126,28 @@ var DebugSettings = ({ settings }) => {
       });
     }
   };
-  return /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement(SettingsValue, {
+  return /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement(FormInput, {
     label: t("settings show debug panel")
   }, /* @__PURE__ */ React2.createElement(Input.Switch, {
     checked: settings.debug,
     onCheckedChange: (checked) => settings.debug = !!checked
-  })), /* @__PURE__ */ React2.createElement(SettingsValue, {
+  })), /* @__PURE__ */ React2.createElement(FormInput, {
     label: t("settings show devtools panel")
   }, /* @__PURE__ */ React2.createElement(Input.Switch, {
     checked: settings.devtools,
     onCheckedChange: (checked) => settings.devtools = !!checked
-  })), /* @__PURE__ */ React2.createElement(SettingsValue, {
+  })), /* @__PURE__ */ React2.createElement(FormInput, {
     label: t("settings wireframe")
   }, /* @__PURE__ */ React2.createElement(Input.Switch, {
     checked: settings.wireframe,
     onCheckedChange: (checked) => settings.wireframe = !!checked
-  })), /* @__PURE__ */ React2.createElement(SettingsValue, {
+  })), /* @__PURE__ */ React2.createElement(FormInput, {
     label: t("settings download diagnostics")
   }, /* @__PURE__ */ React2.createElement(Button, {
     onClick: handleDownload
   }, /* @__PURE__ */ React2.createElement(DownloadSimple, {
     className: getSize(5)
-  }))), /* @__PURE__ */ React2.createElement(SettingsValue, {
+  }))), /* @__PURE__ */ React2.createElement(FormInput, {
     label: t("settings repair")
   }, /* @__PURE__ */ React2.createElement(Button, {
     onClick: handleRepair
@@ -154,7 +156,7 @@ var DebugSettings = ({ settings }) => {
   }))), toast && /* @__PURE__ */ React2.createElement(Toast.Root, null, /* @__PURE__ */ React2.createElement(Toast.Body, null, /* @__PURE__ */ React2.createElement(Toast.Title, null, /* @__PURE__ */ React2.createElement(Gift, {
     className: mx(getSize(5), "inline mr-1"),
     weight: "duotone"
-  }), /* @__PURE__ */ React2.createElement("span", null, toast.title)), toast.description && /* @__PURE__ */ React2.createElement(Toast.Description, null, toast.description))), /* @__PURE__ */ React2.createElement(SettingsValue, {
+  }), /* @__PURE__ */ React2.createElement("span", null, toast.title)), toast.description && /* @__PURE__ */ React2.createElement(Toast.Description, null, toast.description))), /* @__PURE__ */ React2.createElement(FormInput, {
     label: t("settings choose storage adaptor")
   }, /* @__PURE__ */ React2.createElement(Select.Root, {
     value: Object.entries(StorageAdapters).find(([name, value]) => value === storageConfig?.runtime?.client?.storage?.dataStore)?.[0],
@@ -319,7 +321,7 @@ var PerformanceIndicator = () => {
     icon: "ph--chart-bar--regular",
     size: 4
   })), visible && /* @__PURE__ */ React3.createElement("div", {
-    className: mx2("z-20 absolute bottom-[--statusbar-size] right-2 w-[450px] max-h-[600px]", "overflow-x-hidden overflow-y-auto scrollbar-thin", "border-x border-y border-separator")
+    className: mx2("z-20 absolute bottom-[--statusbar-size] right-4 w-[450px]", "overflow-x-hidden overflow-y-auto scrollbar-thin", "border-x border-y border-separator")
   }, /* @__PURE__ */ React3.createElement(StatsPanel, {
     stats,
     onRefresh: refreshStats
@@ -386,7 +388,7 @@ var Wireframe = ({ classNames, label, object }) => {
 
 // packages/plugins/plugin-debug/src/components/index.ts
 var DebugGlobal = lazy(() => import("./DebugGlobal-ZTCBF3XR.mjs"));
-var DebugSpace = lazy(() => import("./DebugSpace-2G2PBGCC.mjs"));
+var DebugSpace = lazy(() => import("./DebugSpace-I6BNZKI2.mjs"));
 
 // packages/plugins/plugin-debug/src/translations.ts
 var translations_default = [
@@ -420,32 +422,20 @@ var translations_default = [
 ];
 
 // packages/plugins/plugin-debug/src/DebugPlugin.tsx
-var SETTINGS_KEY = DEBUG_PLUGIN + "/settings";
-var DebugPlugin = () => {
-  const settings = new LocalStorageStore(DEBUG_PLUGIN, {
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-debug/src/DebugPlugin.tsx";
+var DebugPlugin = definePlugin((context) => {
+  const settings = create({
     debug: true,
     devtools: true
   });
-  let intentPlugin;
   return {
     meta: meta_default,
     ready: async (plugins) => {
-      intentPlugin = resolvePlugin(plugins, parseIntentPlugin);
-      settings.prop({
-        key: "debug",
-        type: LocalStorageStore.bool({
-          allowUndefined: true
-        })
-      }).prop({
-        key: "devtools",
-        type: LocalStorageStore.bool({
-          allowUndefined: true
-        })
-      }).prop({
-        key: "wireframe",
-        type: LocalStorageStore.bool({
-          allowUndefined: true
-        })
+      context.init(plugins);
+      context.resolvePlugin(parseSettingsPlugin).provides.settingsStore.createStore({
+        schema: DebugSettingsSchema,
+        prefix: DEBUG_PLUGIN,
+        value: settings
       });
       const composer = window.composer;
       composer.changeStorageVersionInMetadata = async (version) => {
@@ -460,10 +450,10 @@ var DebugPlugin = () => {
       };
     },
     unload: async () => {
-      settings.close();
+      context.dispose();
     },
     provides: {
-      settings: settings.values,
+      settings,
       translations: translations_default,
       context: ({ children }) => {
         const [timer, setTimer] = useState3();
@@ -486,12 +476,34 @@ var DebugPlugin = () => {
       },
       graph: {
         builder: (plugins) => {
+          const clientPlugin = resolvePlugin(plugins, parseClientPlugin);
+          const metadataPlugin = resolvePlugin(plugins, parseMetadataResolverPlugin);
           const graphPlugin = resolvePlugin(plugins, parseGraphPlugin2);
+          const resolve = metadataPlugin?.provides.metadata.resolver;
+          const client = clientPlugin?.provides.client;
+          invariant(resolve, void 0, {
+            F: __dxlog_file3,
+            L: 108,
+            S: void 0,
+            A: [
+              "resolve",
+              ""
+            ]
+          });
+          invariant(client, void 0, {
+            F: __dxlog_file3,
+            L: 109,
+            S: void 0,
+            A: [
+              "client",
+              ""
+            ]
+          });
           return [
             // Devtools node.
             createExtension({
               id: "dxos.org/plugin/debug/devtools",
-              filter: (node) => !!settings.values.devtools && node.id === "root",
+              filter: (node) => !!settings.devtools && node.id === "root",
               connector: () => [
                 {
                   // TODO(zan): Removed `/` because it breaks deck layout reload. Fix?
@@ -513,7 +525,7 @@ var DebugPlugin = () => {
             // Debug node.
             createExtension({
               id: "dxos.org/plugin/debug/debug",
-              filter: (node) => !!settings.values.debug && node.id === "root",
+              filter: (node) => !!settings.debug && node.id === "root",
               connector: () => [
                 {
                   id: "dxos.org/plugin/debug/debug",
@@ -536,7 +548,7 @@ var DebugPlugin = () => {
             // Space debug nodes.
             createExtension({
               id: "dxos.org/plugin/debug/spaces",
-              filter: (node) => !!settings.values.debug && isSpace(node.data),
+              filter: (node) => !!settings.debug && isSpace(node.data),
               connector: ({ node }) => {
                 const space = node.data;
                 return [
@@ -558,6 +570,72 @@ var DebugPlugin = () => {
                   }
                 ];
               }
+            }),
+            // Create nodes for debug sidebar.
+            createExtension({
+              id: `${DEBUG_PLUGIN}/debug-for-subject`,
+              resolver: ({ id }) => {
+                if (!id.endsWith("~debug")) {
+                  return;
+                }
+                const type = "orphan-settings-for-subject";
+                const icon = "ph--bug--regular";
+                const [subjectId] = id.split("~");
+                const { spaceId, objectId } = parseId(subjectId);
+                const space = client.spaces.get().find((space2) => space2.id === spaceId);
+                if (!objectId) {
+                  const label2 = space ? space.properties.name || [
+                    "unnamed space label",
+                    {
+                      ns: DEBUG_PLUGIN
+                    }
+                  ] : [
+                    "unnamed object settings label",
+                    {
+                      ns: DEBUG_PLUGIN
+                    }
+                  ];
+                  return {
+                    id,
+                    type,
+                    data: null,
+                    properties: {
+                      icon,
+                      label: label2,
+                      showResolvedThreads: false,
+                      object: null,
+                      space
+                    }
+                  };
+                }
+                const object = toSignal((onChange) => {
+                  const timeout = setTimeout(async () => {
+                    await space?.db.loadObjectById(objectId);
+                    onChange();
+                  });
+                  return () => clearTimeout(timeout);
+                }, () => space?.db.getObjectById(objectId), subjectId);
+                if (!object || !subjectId) {
+                  return;
+                }
+                const meta = resolve(getTypename(object) ?? "");
+                const label = meta.label?.(object) || object.name || meta.placeholder || [
+                  "unnamed object settings label",
+                  {
+                    ns: DEBUG_PLUGIN
+                  }
+                ];
+                return {
+                  id,
+                  type,
+                  data: null,
+                  properties: {
+                    icon,
+                    label,
+                    object
+                  }
+                };
+              }
             })
           ];
         }
@@ -566,7 +644,7 @@ var DebugPlugin = () => {
         resolver: async (intent, plugins) => {
           switch (intent.action) {
             case DebugAction.OPEN_DEVTOOLS: {
-              const clientPlugin = getPlugin(plugins, "dxos.org/plugin/client");
+              const clientPlugin = context.getPlugin("dxos.org/plugin/client");
               const client = clientPlugin.provides.client;
               const vaultUrl = client.config.values?.runtime?.client?.remoteSource ?? "https://halo.dxos.org";
               let devtoolsUrl = "http://localhost:5174";
@@ -589,7 +667,7 @@ var DebugPlugin = () => {
           switch (role) {
             case "settings":
               return data.plugin === meta_default.id ? /* @__PURE__ */ React5.createElement(DebugSettings, {
-                settings: settings.values
+                settings
               }) : null;
             case "status":
               return /* @__PURE__ */ React5.createElement(DebugStatus, null);
@@ -601,9 +679,9 @@ var DebugPlugin = () => {
           const primary = data.active ?? data.object;
           let component;
           if (role === "main" || role === "article") {
-            if (primary === "devtools" && settings.values.devtools) {
+            if (primary === "devtools" && settings.devtools) {
               component = /* @__PURE__ */ React5.createElement(Devtools, null);
-            } else if (!primary || typeof primary !== "object" || !settings.values.debug) {
+            } else if (!primary || typeof primary !== "object" || !settings.debug) {
               component = null;
             } else if ("space" in primary && isSpace(primary.space)) {
               component = /* @__PURE__ */ React5.createElement(DebugSpace, {
@@ -616,7 +694,7 @@ var DebugPlugin = () => {
                   if (!(collection instanceof CollectionType)) {
                     return;
                   }
-                  void intentPlugin?.provides.intent.dispatch(objects.map((object) => ({
+                  void context.resolvePlugin(parseIntentPlugin).provides.intent.dispatch(objects.map((object) => ({
                     action: SpaceAction.ADD_OBJECT,
                     data: {
                       target: collection,
@@ -634,18 +712,18 @@ var DebugPlugin = () => {
             }
           }
           if (!component) {
-            if (settings.values.wireframe) {
+            if (settings.wireframe) {
               if (role === "main" || role === "article" || role === "section") {
                 const primary2 = data.active ?? data.object;
                 const isCollection = primary2 instanceof CollectionType;
                 if (!isCollection) {
                   return {
-                    disposition: "hoist",
                     node: /* @__PURE__ */ React5.createElement(Wireframe, {
                       label: `${role}:${name}`,
                       object: primary2,
                       classNames: "row-span-2 overflow-hidden"
-                    })
+                    }),
+                    disposition: "hoist"
                   };
                 }
               }
@@ -673,13 +751,12 @@ var DebugPlugin = () => {
       }
     }
   };
-};
+});
 
 // packages/plugins/plugin-debug/src/index.ts
 var src_default = DebugPlugin;
 export {
   DebugPlugin,
-  SETTINGS_KEY,
   src_default as default
 };
 //# sourceMappingURL=index.mjs.map