@dxos/plugin-settings 0.9.0 → 0.9.1-main.c7dcc2e112

package/dx.config.ts

@@ -0,0 +1,14 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Config2 } from '@dxos/app-framework/config';
+
+export default Config2.make({
+  plugin: {
+    key: 'org.dxos.plugin.settings',
+    name: 'Settings',
+    author: 'DXOS',
+    tags: ['system'],
+  },
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-settings",
-  "version": "0.9.0",
+  "version": "0.9.1-main.c7dcc2e112",
   "description": "DXOS Settings plugin for managing application settings.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -45,22 +45,23 @@
   "types": "dist/types/src/index.d.ts",
   "files": [
     "dist",
+    "dx.config.ts",
     "src"
   ],
   "dependencies": {
-    "@dxos/app-framework": "0.9.0",
-    "@dxos/app-toolkit": "0.9.0",
-    "@dxos/app-graph": "0.9.0",
-    "@dxos/compute": "0.9.0",
-    "@dxos/react-ui-form": "0.9.0",
-    "@dxos/util": "0.9.0",
-    "@dxos/keys": "0.9.0"
+    "@dxos/app-framework": "0.9.1-main.c7dcc2e112",
+    "@dxos/app-graph": "0.9.1-main.c7dcc2e112",
+    "@dxos/app-toolkit": "0.9.1-main.c7dcc2e112",
+    "@dxos/keys": "0.9.1-main.c7dcc2e112",
+    "@dxos/compute": "0.9.1-main.c7dcc2e112",
+    "@dxos/react-ui-form": "0.9.1-main.c7dcc2e112",
+    "@dxos/util": "0.9.1-main.c7dcc2e112"
   },
   "devDependencies": {
     "@types/react": "~19.2.7",
     "effect": "3.21.3",
     "react": "~19.2.3",
-    "@dxos/plugin-graph": "0.9.0"
+    "@dxos/plugin-graph": "0.9.1-main.c7dcc2e112"
   },
   "peerDependencies": {
     "effect": "3.21.3",

package/src/SettingsPlugin.test.ts

@@ -13,7 +13,7 @@ import { SettingsPlugin } from '#plugin';
 
 import { meta } from './meta';
 
-const moduleId = (name: string) => `${meta.id}.module.${name}`;
+const moduleId = (name: string) => `${meta.profile.key}.module.${name}`;
 
 describe('SettingsPlugin', () => {
   test('modules activate on the expected events', async ({ expect }) => {

package/src/actions.ts

@@ -10,15 +10,18 @@ import { SETTINGS_ID, SETTINGS_KEY } from '#types';
 export { SETTINGS_ID, SETTINGS_KEY };
 
 export namespace SettingsAction {
-  export class Open extends Schema.TaggedClass<Open>()(`${meta.id}.open`, {
+  export class Open extends Schema.TaggedClass<Open>()(`${meta.profile.key}.open`, {
     input: Schema.Struct({
       plugin: Schema.optional(Schema.String),
     }),
     output: Schema.Void,
   }) {}
 
-  export class OpenPluginRegistry extends Schema.TaggedClass<OpenPluginRegistry>()(`${meta.id}.openPluginRegistry`, {
-    input: Schema.Void,
-    output: Schema.Void,
-  }) {}
+  export class OpenPluginRegistry extends Schema.TaggedClass<OpenPluginRegistry>()(
+    `${meta.profile.key}.openPluginRegistry`,
+    {
+      input: Schema.Void,
+      output: Schema.Void,
+    },
+  ) {}
 }

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

@@ -6,7 +6,7 @@ import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability, type Plugin as Plugin$ } from '@dxos/app-framework';
 import { GraphBuilder, Node, NodeMatcher } from '@dxos/app-graph';
-import { AppCapabilities, SettingsOperation, getSpacePath } from '@dxos/app-toolkit';
+import { AppCapabilities, Paths, SettingsOperation } from '@dxos/app-toolkit';
 import { Operation } from '@dxos/compute';
 import { isNonNullable } from '@dxos/util';
 
@@ -31,7 +31,7 @@ export default Capability.makeModule(
               id: 'root',
               data: () => Operation.invoke(SettingsOperation.Open, {}),
               properties: {
-                label: ['plugin-settings.label', { ns: meta.id }],
+                label: ['plugin-settings.label', { ns: meta.profile.key }],
                 icon: 'ph--gear--regular',
                 disposition: 'menu',
                 keyBinding: {
@@ -49,9 +49,9 @@ export default Capability.makeModule(
           Effect.succeed([
             Node.make({
               id: SETTINGS_ID,
-              type: meta.id,
+              type: meta.profile.key,
               properties: {
-                label: ['plugin-settings.label', { ns: meta.id }],
+                label: ['plugin-settings.label', { ns: meta.profile.key }],
                 icon: 'ph--gear--regular',
                 disposition: 'pin-end',
                 position: 'first',
@@ -62,7 +62,7 @@ export default Capability.makeModule(
       }),
       GraphBuilder.createExtension({
         id: 'plugins',
-        match: NodeMatcher.whenId(getSpacePath(SETTINGS_ID)),
+        match: NodeMatcher.whenId(Paths.getSpacePath(SETTINGS_ID)),
         connector: (node, get) => {
           const [manager] = get(managerAtom);
           const allSettings = get(settingsAtom);
@@ -70,7 +70,7 @@ export default Capability.makeModule(
             manager
               .getPlugins()
               .map((plugin: Plugin$.Plugin): [Plugin$.Meta, AppCapabilities.Settings] | null => {
-                const settings = allSettings.find((s) => s.prefix === plugin.meta.id);
+                const settings = allSettings.find((s) => s.prefix === plugin.meta.profile.key);
                 if (!settings) {
                   return null;
                 }
@@ -78,16 +78,20 @@ export default Capability.makeModule(
                 return [plugin.meta, settings];
               })
               .filter(isNonNullable)
-              .sort(([a], [b]) => (a.name ?? a.id).localeCompare(b.name ?? b.id, undefined, { sensitivity: 'base' }))
+              .sort(([a], [b]) =>
+                (a.profile.name ?? a.profile.key).localeCompare(b.profile.name ?? b.profile.key, undefined, {
+                  sensitivity: 'base',
+                }),
+              )
               .map(([meta, settings]: [Plugin$.Meta, AppCapabilities.Settings]) =>
                 Node.make({
-                  id: `${SETTINGS_KEY}:${meta.id.replaceAll('/', ':')}`,
+                  id: `${SETTINGS_KEY}:${meta.profile.key.replaceAll('/', ':')}`,
                   type: 'category',
                   data: settings,
                   properties: {
-                    label: meta.name ?? meta.id,
-                    icon: meta.icon ?? 'ph--circle--regular',
-                    iconHue: meta.iconHue,
+                    label: meta.profile.name ?? meta.profile.key,
+                    icon: meta.profile.icon?.key ?? 'ph--circle--regular',
+                    iconHue: meta.profile.icon?.hue,
                   },
                 }),
               ),

package/src/index.ts

@@ -4,4 +4,4 @@
 
 export * from './actions';
 export * from './meta';
-export { SETTINGS_ID, SETTINGS_KEY } from './types';
+export { SETTINGS_ID, SETTINGS_KEY, getPluginSettingsSectionPath, getPluginRegistrySectionPath } from './types';

package/src/meta.ts

@@ -3,11 +3,7 @@
 //
 
 import { Plugin } from '@dxos/app-framework';
-import { DXN } from '@dxos/keys';
 
-export const meta = Plugin.makeMeta({
-  key: DXN.make('org.dxos.plugin.settings'),
-  name: 'Settings',
-  author: 'DXOS',
-  tags: ['system'],
-});
+import config from '../dx.config';
+
+export const meta = Plugin.getMetaFromConfig(config);

package/src/operations/open-plugin-registry.ts

@@ -5,21 +5,21 @@
 import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import { LayoutOperation, SettingsOperation, getSpacePath } from '@dxos/app-toolkit';
+import { LayoutOperation, Paths, SettingsOperation } from '@dxos/app-toolkit';
 import { Operation } from '@dxos/compute';
 
-import { SETTINGS_ID, SETTINGS_KEY } from '../actions';
+import { SETTINGS_ID, getPluginRegistrySectionPath } from '../types';
 
 const handler: Operation.WithHandler<typeof SettingsOperation.OpenPluginRegistry> =
   SettingsOperation.OpenPluginRegistry.pipe(
     Operation.withHandler(() =>
       Effect.gen(function* () {
         const { invoke } = yield* Capability.get(Capabilities.OperationInvoker);
-        yield* invoke(LayoutOperation.SwitchWorkspace, { subject: getSpacePath(SETTINGS_ID) });
+        yield* invoke(LayoutOperation.SwitchWorkspace, { subject: Paths.getSpacePath(SETTINGS_ID) });
         // Await (don't fork): SwitchWorkspace selects the workspace's first child, so a forked Open
         // races/drops before its deck update applies. Awaiting guarantees the registry is selected.
         yield* invoke(LayoutOperation.Open, {
-          subject: [`${getSpacePath(SETTINGS_ID)}/${SETTINGS_KEY}:plugins`],
+          subject: [getPluginRegistrySectionPath()],
         });
       }),
     ),

package/src/operations/open.ts

@@ -5,22 +5,22 @@
 import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import { LayoutOperation, SettingsOperation, getSpacePath } from '@dxos/app-toolkit';
+import { LayoutOperation, Paths, SettingsOperation } from '@dxos/app-toolkit';
 import { Operation } from '@dxos/compute';
 
-import { SETTINGS_ID, SETTINGS_KEY } from '../actions';
+import { SETTINGS_ID, getPluginSettingsSectionPath } from '../types';
 
 const handler: Operation.WithHandler<typeof SettingsOperation.Open> = SettingsOperation.Open.pipe(
   Operation.withHandler((input) =>
     Effect.gen(function* () {
       const { invoke } = yield* Capability.get(Capabilities.OperationInvoker);
-      yield* invoke(LayoutOperation.SwitchWorkspace, { subject: getSpacePath(SETTINGS_ID) });
+      yield* invoke(LayoutOperation.SwitchWorkspace, { subject: Paths.getSpacePath(SETTINGS_ID) });
       if (input.plugin) {
         // Await (don't fork): SwitchWorkspace already selects the workspace's first child, so a
         // forked Open for the requested plugin races/drops before its deck update applies, leaving
         // the wrong plugin selected. Awaiting guarantees the requested plugin becomes the selection.
         yield* invoke(LayoutOperation.Open, {
-          subject: [`${getSpacePath(SETTINGS_ID)}/${SETTINGS_KEY}:${input.plugin.replaceAll('/', ':')}`],
+          subject: [getPluginSettingsSectionPath(input.plugin)],
         });
       }
     }),

package/src/translations.ts

@@ -2,16 +2,16 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Resource } from '@dxos/app-toolkit';
+import { Translations } from '@dxos/app-toolkit';
 
 import { meta } from '#meta';
 
 export const translations = [
   {
     'en-US': {
-      [meta.id]: {
+      [meta.profile.key]: {
         'plugin-settings.label': 'Plugin Settings',
       },
     },
   },
-] as const satisfies Resource[];
+] as const satisfies Translations.Resource[];

package/src/types/index.ts

@@ -2,7 +2,17 @@
 // Copyright 2025 DXOS.org
 //
 
-import { pinnedWorkspaceId } from '@dxos/app-toolkit';
+import { Paths } from '@dxos/app-toolkit';
 
-export const SETTINGS_ID = pinnedWorkspaceId('dxos:settings');
+export const SETTINGS_ID = Paths.pinnedWorkspaceId('dxos:settings');
 export const SETTINGS_KEY = 'settings';
+
+/**
+ * Canonical qualified path to a specific plugin's section in the settings workspace.
+ * Segments are joined using the `settings:plugin-id` convention.
+ */
+export const getPluginSettingsSectionPath = (pluginId: string): string =>
+  Paths.getSpacePath(SETTINGS_ID, `${SETTINGS_KEY}:${pluginId.replaceAll('/', ':')}`);
+
+/** Canonical qualified path to the plugin registry section in the settings workspace. */
+export const getPluginRegistrySectionPath = (): string => Paths.getSpacePath(SETTINGS_ID, `${SETTINGS_KEY}:plugins`);

package/dist/lib/neutral/chunk-3DJRTSII.mjs

@@ -1,16 +0,0 @@
-// src/meta.ts
-import { Plugin } from "@dxos/app-framework";
-import { DXN } from "@dxos/keys";
-var meta = Plugin.makeMeta({
-  key: DXN.make("org.dxos.plugin.settings"),
-  name: "Settings",
-  author: "DXOS",
-  tags: [
-    "system"
-  ]
-});
-
-export {
-  meta
-};
-//# sourceMappingURL=chunk-3DJRTSII.mjs.map

package/dist/lib/neutral/chunk-3DJRTSII.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/meta.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { Plugin } from '@dxos/app-framework';\nimport { DXN } from '@dxos/keys';\n\nexport const meta = Plugin.makeMeta({\n  key: DXN.make('org.dxos.plugin.settings'),\n  name: 'Settings',\n  author: 'DXOS',\n  tags: ['system'],\n});\n"],
-  "mappings": ";AAIA,SAASA,cAAc;AACvB,SAASC,WAAW;AAEb,IAAMC,OAAOF,OAAOG,SAAS;EAClCC,KAAKH,IAAII,KAAK,0BAAA;EACdC,MAAM;EACNC,QAAQ;EACRC,MAAM;IAAC;;AACT,CAAA;",
-  "names": ["Plugin", "DXN", "meta", "makeMeta", "key", "make", "name", "author", "tags"]
-}

package/dist/lib/neutral/chunk-J2FJOTAW.mjs

@@ -1,28 +0,0 @@
-// src/actions.ts
-import * as Schema from "effect/Schema";
-import { meta } from "#meta";
-import { SETTINGS_ID, SETTINGS_KEY } from "#types";
-(function(SettingsAction2) {
-  class Open extends Schema.TaggedClass()(`${meta.id}.open`, {
-    input: Schema.Struct({
-      plugin: Schema.optional(Schema.String)
-    }),
-    output: Schema.Void
-  }) {
-  }
-  SettingsAction2.Open = Open;
-  class OpenPluginRegistry extends Schema.TaggedClass()(`${meta.id}.openPluginRegistry`, {
-    input: Schema.Void,
-    output: Schema.Void
-  }) {
-  }
-  SettingsAction2.OpenPluginRegistry = OpenPluginRegistry;
-})(SettingsAction || (SettingsAction = {}));
-var SettingsAction;
-
-export {
-  SETTINGS_ID,
-  SETTINGS_KEY,
-  SettingsAction
-};
-//# sourceMappingURL=chunk-J2FJOTAW.mjs.map

package/dist/lib/neutral/chunk-J2FJOTAW.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/actions.ts"],
-  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport * as Schema from 'effect/Schema';\n\nimport { meta } from '#meta';\nimport { SETTINGS_ID, SETTINGS_KEY } from '#types';\n\nexport { SETTINGS_ID, SETTINGS_KEY };\n\nexport namespace SettingsAction {\n  export class Open extends Schema.TaggedClass<Open>()(`${meta.id}.open`, {\n    input: Schema.Struct({\n      plugin: Schema.optional(Schema.String),\n    }),\n    output: Schema.Void,\n  }) {}\n\n  export class OpenPluginRegistry extends Schema.TaggedClass<OpenPluginRegistry>()(`${meta.id}.openPluginRegistry`, {\n    input: Schema.Void,\n    output: Schema.Void,\n  }) {}\n}\n"],
-  "mappings": ";AAIA,YAAYA,YAAY;AAExB,SAASC,YAAY;AACrB,SAASC,aAAaC,oBAAoB;UAIzBC,iBAAAA;EACR,MAAMC,aAAoBC,mBAAW,EAAS,GAAGC,KAAKC,EAAE,SAAS;IACtEC,OAAcC,cAAO;MACnBC,QAAeC,gBAAgBC,aAAM;IACvC,CAAA;IACAC,QAAeC;EACjB,CAAA,EAAA;EAAI;kBALSV,OAAAA;EAON,MAAMW,2BAAkCV,mBAAW,EAAuB,GAAGC,KAAKC,EAAE,uBAAuB;IAChHC,OAAcM;IACdD,QAAeC;EACjB,CAAA,EAAA;EAAI;kBAHSC,qBAAAA;AAIf,GAZiBZ,mBAAAA,iBAAAA,CAAAA,EAAAA;;",
-  "names": ["Schema", "meta", "SETTINGS_ID", "SETTINGS_KEY", "SettingsAction", "Open", "TaggedClass", "meta", "id", "input", "Struct", "plugin", "optional", "String", "output", "Void", "OpenPluginRegistry"]
-}

package/dist/lib/neutral/open-NRUWKEGC.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/operations/open.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\n\nimport { Capabilities, Capability } from '@dxos/app-framework';\nimport { LayoutOperation, SettingsOperation, getSpacePath } from '@dxos/app-toolkit';\nimport { Operation } from '@dxos/compute';\n\nimport { SETTINGS_ID, SETTINGS_KEY } from '../actions';\n\nconst handler: Operation.WithHandler<typeof SettingsOperation.Open> = SettingsOperation.Open.pipe(\n  Operation.withHandler((input) =>\n    Effect.gen(function* () {\n      const { invoke } = yield* Capability.get(Capabilities.OperationInvoker);\n      yield* invoke(LayoutOperation.SwitchWorkspace, { subject: getSpacePath(SETTINGS_ID) });\n      if (input.plugin) {\n        // Await (don't fork): SwitchWorkspace already selects the workspace's first child, so a\n        // forked Open for the requested plugin races/drops before its deck update applies, leaving\n        // the wrong plugin selected. Awaiting guarantees the requested plugin becomes the selection.\n        yield* invoke(LayoutOperation.Open, {\n          subject: [`${getSpacePath(SETTINGS_ID)}/${SETTINGS_KEY}:${input.plugin.replaceAll('/', ':')}`],\n        });\n      }\n    }),\n  ),\n);\n\nexport default handler;\n"],
-  "mappings": ";;;;;;AAIA,YAAYA,YAAY;AAExB,SAASC,cAAcC,kBAAkB;AACzC,SAASC,iBAAiBC,mBAAmBC,oBAAoB;AACjE,SAASC,iBAAiB;AAI1B,IAAMC,UAAgEC,kBAAkBC,KAAKC,KAC3FC,UAAUC,YAAY,CAACC,UACdC,WAAI,aAAA;AACT,QAAM,EAAEC,OAAM,IAAK,OAAOC,WAAWC,IAAIC,aAAaC,gBAAgB;AACtE,SAAOJ,OAAOK,gBAAgBC,iBAAiB;IAAEC,SAASC,aAAaC,WAAAA;EAAa,CAAA;AACpF,MAAIX,MAAMY,QAAQ;AAIhB,WAAOV,OAAOK,gBAAgBX,MAAM;MAClCa,SAAS;QAAC,GAAGC,aAAaC,WAAAA,CAAAA,IAAgBE,YAAAA,IAAgBb,MAAMY,OAAOE,WAAW,KAAK,GAAA,CAAA;;IACzF,CAAA;EACF;AACF,CAAA,CAAA,CAAA;AAIJ,IAAA,eAAepB;",
-  "names": ["Effect", "Capabilities", "Capability", "LayoutOperation", "SettingsOperation", "getSpacePath", "Operation", "handler", "SettingsOperation", "Open", "pipe", "Operation", "withHandler", "input", "gen", "invoke", "Capability", "get", "Capabilities", "OperationInvoker", "LayoutOperation", "SwitchWorkspace", "subject", "getSpacePath", "SETTINGS_ID", "plugin", "SETTINGS_KEY", "replaceAll"]
-}

package/dist/lib/neutral/open-plugin-registry-XGFG2JWB.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/operations/open-plugin-registry.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\n\nimport { Capabilities, Capability } from '@dxos/app-framework';\nimport { LayoutOperation, SettingsOperation, getSpacePath } from '@dxos/app-toolkit';\nimport { Operation } from '@dxos/compute';\n\nimport { SETTINGS_ID, SETTINGS_KEY } from '../actions';\n\nconst handler: Operation.WithHandler<typeof SettingsOperation.OpenPluginRegistry> =\n  SettingsOperation.OpenPluginRegistry.pipe(\n    Operation.withHandler(() =>\n      Effect.gen(function* () {\n        const { invoke } = yield* Capability.get(Capabilities.OperationInvoker);\n        yield* invoke(LayoutOperation.SwitchWorkspace, { subject: getSpacePath(SETTINGS_ID) });\n        // Await (don't fork): SwitchWorkspace selects the workspace's first child, so a forked Open\n        // races/drops before its deck update applies. Awaiting guarantees the registry is selected.\n        yield* invoke(LayoutOperation.Open, {\n          subject: [`${getSpacePath(SETTINGS_ID)}/${SETTINGS_KEY}:plugins`],\n        });\n      }),\n    ),\n  );\n\nexport default handler;\n"],
-  "mappings": ";;;;;;AAIA,YAAYA,YAAY;AAExB,SAASC,cAAcC,kBAAkB;AACzC,SAASC,iBAAiBC,mBAAmBC,oBAAoB;AACjE,SAASC,iBAAiB;AAI1B,IAAMC,UACJC,kBAAkBC,mBAAmBC,KACnCC,UAAUC,YAAY,MACbC,WAAI,aAAA;AACT,QAAM,EAAEC,OAAM,IAAK,OAAOC,WAAWC,IAAIC,aAAaC,gBAAgB;AACtE,SAAOJ,OAAOK,gBAAgBC,iBAAiB;IAAEC,SAASC,aAAaC,WAAAA;EAAa,CAAA;AAGpF,SAAOT,OAAOK,gBAAgBK,MAAM;IAClCH,SAAS;MAAC,GAAGC,aAAaC,WAAAA,CAAAA,IAAgBE,YAAAA;;EAC5C,CAAA;AACF,CAAA,CAAA,CAAA;AAIN,IAAA,+BAAelB;",
-  "names": ["Effect", "Capabilities", "Capability", "LayoutOperation", "SettingsOperation", "getSpacePath", "Operation", "handler", "SettingsOperation", "OpenPluginRegistry", "pipe", "Operation", "withHandler", "gen", "invoke", "Capability", "get", "Capabilities", "OperationInvoker", "LayoutOperation", "SwitchWorkspace", "subject", "getSpacePath", "SETTINGS_ID", "Open", "SETTINGS_KEY"]
-}