@dxos/plugin-registry 0.8.4-main.fd6878d → 0.8.4-staging.60fe92afc8

package/package.json

@@ -1,64 +1,103 @@
 {
   "name": "@dxos/plugin-registry",
-  "version": "0.8.4-main.fd6878d",
+  "version": "0.8.4-staging.60fe92afc8",
   "description": "Braneframe plugin gallery",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
-  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#capabilities": "./src/capabilities/index.ts",
+    "#components": "./src/components/index.ts",
+    "#containers": "./src/containers/index.ts",
+    "#meta": "./src/meta.ts",
+    "#operations": "./src/operations/index.ts",
+    "#plugin": {
+      "source": {
+        "workerd": "./src/RegistryPlugin.workerd.ts",
+        "node": "./src/RegistryPlugin.node.ts",
+        "default": "./src/RegistryPlugin.tsx"
+      },
+      "types": "./dist/types/src/RegistryPlugin.d.ts",
+      "workerd": "./dist/lib/neutral/RegistryPlugin.workerd.mjs",
+      "node": "./dist/lib/neutral/RegistryPlugin.node.mjs",
+      "default": "./dist/lib/neutral/RegistryPlugin.mjs"
+    },
+    "#translations": "./src/translations.ts",
+    "#types": "./src/types.ts"
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs"
+      "default": "./dist/lib/neutral/index.mjs"
+    },
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {}
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@preact-signals/safe-react": "^0.9.0",
-    "@dxos/app-framework": "0.8.4-main.fd6878d",
-    "@dxos/echo": "0.8.4-main.fd6878d",
-    "@dxos/echo-schema": "0.8.4-main.fd6878d",
-    "@dxos/live-object": "0.8.4-main.fd6878d",
-    "@dxos/invariant": "0.8.4-main.fd6878d",
-    "@dxos/react-ui-stack": "0.8.4-main.fd6878d",
-    "@dxos/plugin-observability": "0.8.4-main.fd6878d",
-    "@dxos/react-ui-form": "0.8.4-main.fd6878d",
-    "@dxos/plugin-graph": "0.8.4-main.fd6878d",
-    "@dxos/util": "0.8.4-main.fd6878d"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/cli": "0.75.2",
+    "yaml": "^2.8.2",
+    "@dxos/app-toolkit": "0.8.4-staging.60fe92afc8",
+    "@dxos/app-framework": "0.8.4-staging.60fe92afc8",
+    "@dxos/cli-util": "0.8.4-staging.60fe92afc8",
+    "@dxos/client-protocol": "0.8.4-staging.60fe92afc8",
+    "@dxos/compute": "0.8.4-staging.60fe92afc8",
+    "@dxos/effect": "0.8.4-staging.60fe92afc8",
+    "@dxos/log": "0.8.4-staging.60fe92afc8",
+    "@dxos/plugin-graph": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-ui-form": "0.8.4-staging.60fe92afc8",
+    "@dxos/keys": "0.8.4-staging.60fe92afc8",
+    "@dxos/invariant": "0.8.4-staging.60fe92afc8",
+    "@dxos/plugin-observability": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-ui-mosaic": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-ui-markdown": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-ui-stack": "0.8.4-staging.60fe92afc8",
+    "@dxos/util": "0.8.4-staging.60fe92afc8"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.90.2",
-    "@phosphor-icons/react": "^2.1.5",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "effect": "3.17.7",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/random": "0.8.4-main.fd6878d",
-    "@dxos/react-ui-theme": "0.8.4-main.fd6878d",
-    "@dxos/react-ui": "0.8.4-main.fd6878d",
-    "@dxos/storybook-utils": "0.8.4-main.fd6878d"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.96.1",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "effect": "3.21.3",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^8.0.16",
+    "@dxos/plugin-testing": "0.8.4-staging.60fe92afc8",
+    "@dxos/random": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-ui": "0.8.4-staging.60fe92afc8",
+    "@dxos/ui-theme": "0.8.4-staging.60fe92afc8",
+    "@dxos/storybook-utils": "0.8.4-staging.60fe92afc8"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "^0.80.12",
-    "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.fd6878d",
-    "@dxos/react-ui-theme": "0.8.4-main.fd6878d"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.96.1",
+    "effect": "3.21.3",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-staging.60fe92afc8",
+    "@dxos/ui-theme": "0.8.4-staging.60fe92afc8"
   },
   "publishConfig": {
     "access": "public"

package/src/RegistryPlugin.node.ts

@@ -0,0 +1,19 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+
+import { meta } from '#meta';
+
+import { plugin } from './commands';
+
+export const RegistryPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addCommandModule({
+    commands: [plugin],
+  }),
+  Plugin.make,
+);
+
+export default RegistryPlugin;

package/src/RegistryPlugin.test.ts

@@ -0,0 +1,24 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { RegistryPlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('RegistryPlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [RegistryPlugin()],
+    });
+
+    // CLI commands activate on startup.
+    expect(harness.manager.getActive()).toContain(moduleId('cli-commands'));
+  });
+});

package/src/RegistryPlugin.tsx

@@ -2,32 +2,25 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Capabilities, Events, contributes, defineModule, definePlugin } from '@dxos/app-framework';
+import { ActivationEvents, Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
 
-import { AppGraphBuilder, IntentResolver, ReactSurface } from './capabilities';
-import { meta } from './meta';
-import { translations } from './translations';
+import { AppGraphBuilder, DevPluginLoader, OperationHandler, ReactSurface, RegistrySettings } from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
 
-export const RegistryPlugin = () =>
-  definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, translations),
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      activate: ReactSurface,
-    }),
-    defineModule({
-      id: `${meta.id}/module/intent-resolver`,
-      activatesOn: Events.SetupIntentResolver,
-      activate: IntentResolver,
-    }),
-    defineModule({
-      id: `${meta.id}/module/app-graph-builder`,
-      activatesOn: Events.SetupAppGraph,
-      activate: AppGraphBuilder,
-    }),
-  ]);
+export const RegistryPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSettingsModule({ activate: RegistrySettings }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
+  Plugin.addModule({
+    id: 'dev-plugin-loader',
+    activatesOn: ActivationEvents.Startup,
+    activate: DevPluginLoader,
+  }),
+  Plugin.make,
+);
+
+export default RegistryPlugin;

package/src/RegistryPlugin.workerd.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+
+import { meta } from '#meta';
+
+export const RegistryPlugin = Plugin.define(meta).pipe(Plugin.make);
+
+export default RegistryPlugin;

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

@@ -2,154 +2,218 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Rx } from '@effect-rx/rx-react';
-import { Option, pipe } from 'effect';
+import * as Effect from 'effect/Effect';
 
-import { Capabilities, type PluginContext, SettingsAction, contributes, createIntent } from '@dxos/app-framework';
-import { createExtension } from '@dxos/plugin-graph';
+import { Capabilities, Capability, type Registry, Plugin } from '@dxos/app-framework';
+import { AppCapabilities, LayoutOperation, SettingsOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+import { DXN } from '@dxos/keys';
+import { GraphBuilder, Node, NodeMatcher } from '@dxos/plugin-graph';
 
-import { REGISTRY_ID, REGISTRY_KEY, REGISTRY_PLUGIN } from '../meta';
+import { REGISTRY_ID, REGISTRY_KEY, registryCategoryId, meta } from '#meta';
 
-export default (context: PluginContext) =>
-  contributes(Capabilities.AppGraphBuilder, [
-    createExtension({
-      id: REGISTRY_PLUGIN,
-      actions: (node) =>
-        Rx.make((get) =>
-          pipe(
-            get(node),
-            Option.flatMap((node) => (node.id === 'root' ? Option.some(node) : Option.none())),
-            Option.map((node) => [
-              {
-                id: REGISTRY_PLUGIN,
-                data: async () => {
-                  const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-                  await dispatch(createIntent(SettingsAction.OpenPluginRegistry));
-                },
-                properties: {
-                  label: ['open plugin registry label', { ns: REGISTRY_PLUGIN }],
-                  icon: 'ph--squares-four--regular',
-                  disposition: 'menu',
-                },
-              },
-            ]),
-            Option.getOrElse(() => []),
-          ),
-        ),
+import { getCategoryPredicate, getRemotePluginIds } from '../categories';
+import { LOAD_PLUGIN_DIALOG } from '../containers';
+
+/**
+ * Turns a registry catalog entry into a minimal {@link Plugin.Plugin} so it
+ * can be attached as the graph node's `data`. The synthesized plugin has no
+ * modules and only exists so the article surface can render details for
+ * registry plugins that haven't been installed yet.
+ */
+const toDisplayPlugin = (entry: Registry.Plugin): Plugin.Plugin =>
+  ({
+    [Plugin.PluginTypeId]: Plugin.PluginTypeId,
+    meta: Plugin.makeMeta({
+      key: DXN.make(entry.id),
+      name: entry.name,
+      description: entry.description,
+      homePage: entry.homePage,
+      source: entry.source,
+      screenshots: entry.screenshots,
+      tags: entry.tags,
+      icon: entry.icon,
+      iconHue: entry.iconHue,
     }),
-    createExtension({
-      id: REGISTRY_PLUGIN,
-      connector: (node) =>
-        Rx.make((get) =>
-          pipe(
-            get(node),
-            Option.flatMap((node) => (node.id === 'root' ? Option.some(node) : Option.none())),
-            Option.map((node) => [
-              {
-                id: REGISTRY_ID,
-                type: REGISTRY_PLUGIN,
-                properties: {
-                  label: ['plugin registry label', { ns: REGISTRY_PLUGIN }],
-                  icon: 'ph--squares-four--regular',
-                  disposition: 'pin-end',
-                  testId: 'treeView.pluginRegistry',
-                },
-                nodes: [
-                  {
-                    id: `${REGISTRY_KEY}+all`,
-                    type: 'category',
-                    data: `${REGISTRY_KEY}+all`,
-                    properties: {
-                      label: ['all plugins label', { ns: REGISTRY_PLUGIN }],
-                      icon: 'ph--squares-four--regular',
-                      key: REGISTRY_KEY,
-                      testId: 'pluginRegistry.all',
-                    },
+    modules: [],
+  }) as Plugin.Plugin;
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const capabilities = yield* Capability.Service;
+
+    const extensions = yield* Effect.all([
+      GraphBuilder.createExtension({
+        id: 'openRegistry',
+        match: NodeMatcher.whenRoot,
+        actions: () =>
+          Effect.succeed([
+            {
+              id: 'openRegistry',
+              data: () => Operation.invoke(SettingsOperation.OpenPluginRegistry),
+              properties: {
+                label: ['open-plugin-registry.label', { ns: meta.id }],
+                icon: 'ph--squares-four--regular',
+                disposition: 'menu',
+              },
+            },
+          ]),
+      }),
+      GraphBuilder.createExtension({
+        id: 'registry',
+        match: NodeMatcher.whenRoot,
+        connector: (_node, get) => {
+          const manager = capabilities.get(Capabilities.PluginManager);
+          const plugins = get(manager.plugins);
+          const filterContext = {
+            core: get(manager.core),
+            enabled: get(manager.enabled),
+            remoteIds: getRemotePluginIds(),
+          };
+          const categoryCount = (category: string) =>
+            plugins.filter(getCategoryPredicate(category, filterContext)).length;
+          const registryCount = get(manager.pluginRegistry.plugins).entries.length;
+
+          return Effect.succeed([
+            Node.make({
+              id: REGISTRY_ID,
+              type: meta.id,
+              properties: {
+                label: ['plugin-registry.label', { ns: meta.id }],
+                icon: 'ph--squares-four--regular',
+                disposition: 'pin-end',
+                position: 'first',
+                testId: 'treeView.pluginRegistry',
+              },
+              nodes: [
+                Node.make({
+                  id: registryCategoryId('bundled'),
+                  type: 'category',
+                  data: registryCategoryId('bundled'),
+                  properties: {
+                    label: ['bundled-plugins.label', { ns: meta.id }],
+                    icon: 'ph--squares-four--regular',
+                    key: REGISTRY_KEY,
+                    testId: 'pluginRegistry.bundled',
+                    count: categoryCount(registryCategoryId('bundled')),
+                  },
+                }),
+                Node.make({
+                  id: registryCategoryId('installed'),
+                  type: 'category',
+                  data: registryCategoryId('installed'),
+                  properties: {
+                    label: ['installed-plugins.label', { ns: meta.id }],
+                    icon: 'ph--check--regular',
+                    key: REGISTRY_KEY,
+                    testId: 'pluginRegistry.installed',
+                    count: categoryCount(registryCategoryId('installed')),
                   },
-                  {
-                    id: `${REGISTRY_KEY}+installed`,
-                    type: 'category',
-                    data: `${REGISTRY_KEY}+installed`,
-                    properties: {
-                      label: ['installed plugins label', { ns: REGISTRY_PLUGIN }],
-                      icon: 'ph--check--regular',
-                      key: REGISTRY_KEY,
-                      testId: 'pluginRegistry.installed',
-                    },
+                }),
+                Node.make({
+                  id: registryCategoryId('recommended'),
+                  type: 'category',
+                  data: registryCategoryId('recommended'),
+                  properties: {
+                    label: ['recommended-plugins.label', { ns: meta.id }],
+                    icon: 'ph--star--regular',
+                    key: REGISTRY_KEY,
+                    testId: 'pluginRegistry.recommended',
+                    count: categoryCount(registryCategoryId('recommended')),
                   },
-                  {
-                    id: `${REGISTRY_KEY}+recommended`,
-                    type: 'category',
-                    data: `${REGISTRY_KEY}+recommended`,
-                    properties: {
-                      label: ['recommended plugins label', { ns: REGISTRY_PLUGIN }],
-                      icon: 'ph--star--regular',
-                      key: REGISTRY_KEY,
-                      testId: 'pluginRegistry.recommended',
-                    },
+                }),
+                Node.make({
+                  id: registryCategoryId('labs'),
+                  type: 'category',
+                  data: registryCategoryId('labs'),
+                  properties: {
+                    label: ['labs-plugins.label', { ns: meta.id }],
+                    icon: 'ph--flask--regular',
+                    key: REGISTRY_KEY,
+                    testId: 'pluginRegistry.labs',
+                    count: categoryCount(registryCategoryId('labs')),
                   },
-                  {
-                    id: `${REGISTRY_KEY}+labs`,
-                    type: 'category',
-                    data: `${REGISTRY_KEY}+labs`,
-                    properties: {
-                      label: ['labs plugins label', { ns: REGISTRY_PLUGIN }],
-                      icon: 'ph--flask--regular',
-                      key: REGISTRY_KEY,
-                      testId: 'pluginRegistry.labs',
-                    },
+                }),
+                Node.make({
+                  id: registryCategoryId('registry'),
+                  type: 'category',
+                  data: registryCategoryId('registry'),
+                  properties: {
+                    label: ['registry-plugins.label', { ns: meta.id }],
+                    icon: 'ph--users-three--regular',
+                    key: REGISTRY_KEY,
+                    testId: 'pluginRegistry.registry',
+                    count: registryCount,
                   },
-                ],
+                }),
+              ],
+            }),
+          ]);
+        },
+      }),
+      GraphBuilder.createExtension({
+        id: 'actions',
+        match: NodeMatcher.whenId(`root/${REGISTRY_ID}`),
+        actions: () =>
+          Effect.succeed([
+            {
+              id: 'loadByUrl',
+              data: Effect.fnUntraced(function* () {
+                yield* Operation.invoke(LayoutOperation.UpdateDialog, {
+                  subject: LOAD_PLUGIN_DIALOG,
+                  state: true,
+                });
+              }),
+              properties: {
+                label: ['load-by-url.label', { ns: meta.id }],
+                icon: 'ph--cloud-arrow-down--regular',
+                disposition: 'list-item-primary',
               },
-            ]),
-            Option.getOrElse(() => []),
-          ),
-        ),
-    }),
-    createExtension({
-      id: `${REGISTRY_PLUGIN}/actions`,
-      actions: (node) =>
-        Rx.make((get) =>
-          pipe(
-            get(node),
-            Option.flatMap((node) => (node.id === REGISTRY_ID ? Option.some(node) : Option.none())),
-            Option.map(() => [
-              {
-                id: `${REGISTRY_PLUGIN}/load-by-url`,
-                data: async () => {},
-                properties: {
-                  label: ['load by url label', { ns: REGISTRY_PLUGIN }],
-                  icon: 'ph--cloud-arrow-down--regular',
-                  disabled: true,
-                },
+            },
+          ]),
+      }),
+      GraphBuilder.createExtension({
+        id: 'plugins',
+        match: NodeMatcher.whenId(`root/${REGISTRY_ID}`),
+        connector: (_node, get) => {
+          const manager = capabilities.get(Capabilities.PluginManager);
+          const installedIds = new Set(manager.getPlugins().map((plugin) => plugin.meta.id));
+
+          const installedNodes = manager.getPlugins().map((plugin) =>
+            Node.make({
+              id: plugin.meta.id,
+              type: 'org.dxos.plugin',
+              data: plugin,
+              properties: {
+                label: plugin.meta.name ?? plugin.meta.id,
+                icon: plugin.meta.icon ?? 'ph--circle--regular',
+                disposition: 'hidden',
               },
-            ]),
-            Option.getOrElse(() => []),
-          ),
-        ),
-    }),
-    createExtension({
-      id: `${REGISTRY_PLUGIN}/plugins`,
-      connector: (node) =>
-        Rx.make((get) =>
-          pipe(
-            get(node),
-            Option.flatMap((node) => (node.id === REGISTRY_ID ? Option.some(node) : Option.none())),
-            Option.map(() => {
-              const manager = context.getCapability(Capabilities.PluginManager);
-              return manager.plugins.map((plugin) => ({
-                id: plugin.meta.id.replaceAll('/', ':'),
-                type: 'dxos.org/plugin',
+            }),
+          );
+
+          const registryEntries = get(manager.pluginRegistry.plugins).entries;
+          const registryNodes = registryEntries
+            .filter((entry) => !installedIds.has(DXN.make(entry.id)))
+            .map((entry) => {
+              const plugin = toDisplayPlugin(entry);
+              return Node.make({
+                id: plugin.meta.id,
+                type: 'org.dxos.plugin',
                 data: plugin,
                 properties: {
                   label: plugin.meta.name ?? plugin.meta.id,
                   icon: plugin.meta.icon ?? 'ph--circle--regular',
                   disposition: 'hidden',
                 },
-              }));
-            }),
-            Option.getOrElse(() => []),
-          ),
-        ),
-    }),
-  ]);
+              });
+            });
+
+          return Effect.succeed([...installedNodes, ...registryNodes]);
+        },
+      }),
+    ]);
+
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
+  }),
+);

package/src/capabilities/dev-plugin-loader.ts

@@ -0,0 +1,39 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { log } from '@dxos/log';
+
+import { RegistryCapabilities } from '../types';
+
+/**
+ * Startup module that auto-loads a locally-served dev plugin when the user has
+ * the toggle enabled in registry settings. Failures (dev server offline, 404,
+ * timeout) are logged and swallowed so a stale dev URL never blocks app boot —
+ * the toggle stays on, the next reload retries.
+ */
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const manager = yield* Capability.get(Capabilities.PluginManager);
+    const registry = yield* Capability.get(Capabilities.AtomRegistry);
+    const settingsAtom = yield* Capability.get(RegistryCapabilities.Settings);
+
+    const settings = registry.get(settingsAtom);
+    const url = settings.devPluginUrl?.trim();
+    if (!settings.devPluginEnabled || !url) {
+      return [];
+    }
+
+    log.info('loading dev plugin from registry settings', { url });
+    yield* manager.add(url).pipe(
+      Effect.flatMap((plugin) => manager.enable(plugin.meta.id)),
+      Effect.tapError((error) => Effect.sync(() => log.warn('dev plugin auto-load failed', { url, error }))),
+      Effect.ignore,
+    );
+
+    return [];
+  }),
+);