@object-ui/core 3.1.1 → 3.1.3

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> @object-ui/core@3.1.1 build /home/runner/work/objectui/objectui/packages/core
+> @object-ui/core@3.1.3 build /home/runner/work/objectui/objectui/packages/core
 > tsc
 

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @object-ui/core
 
+## 3.1.3
+
+### Patch Changes
+
+- @object-ui/types@3.1.3
+
+## 3.1.2
+
+### Patch Changes
+
+- @object-ui/types@3.1.2
+
 ## 3.1.1
 
 ### Patch Changes

package/dist/adapters/ValueDataSource.d.ts

@@ -12,7 +12,7 @@ import type { DataSource, QueryParams, QueryResult, AggregateParams, AggregateRe
 export interface ValueDataSourceConfig<T = any> {
     /** The static data array */
     items: T[];
-    /** Optional ID field name for findOne/update/delete (defaults to '_id' then 'id') */
+    /** Optional ID field name for findOne/update/delete (defaults to 'id' then '_id') */
     idField?: string;
 }
 /**

package/dist/adapters/ValueDataSource.js

@@ -15,7 +15,7 @@
 function getRecordId(record, idField) {
     if (idField)
         return record[idField];
-    return record._id ?? record.id;
+    return record.id ?? record._id;
 }
 /**
  * Evaluate an AST-format filter node against a record.
@@ -273,7 +273,7 @@ export class ValueDataSource {
         const record = { ...data };
         // Auto-generate an ID if missing
         if (!getRecordId(record, this.idField)) {
-            const field = this.idField ?? '_id';
+            const field = this.idField ?? 'id';
             record[field] = `auto_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
         }
         this.items.push(record);

package/dist/index.d.ts

@@ -25,4 +25,12 @@ export * from './data-scope/index.js';
 export * from './errors/index.js';
 export * from './utils/debug.js';
 export * from './utils/debug-collector.js';
+export * from './utils/merge-views-into-objects.js';
 export * from './protocols/index.js';
+/**
+ * @deprecated Import `composeStacks` from `@objectstack/spec` instead.
+ *
+ * This re-export is kept only for backward compatibility and will be removed
+ * in the next major version of `@object-ui/core`.
+ */
+export { composeStacks } from '@objectstack/spec';

package/dist/index.js

@@ -24,4 +24,12 @@ export * from './data-scope/index.js';
 export * from './errors/index.js';
 export * from './utils/debug.js';
 export * from './utils/debug-collector.js';
+export * from './utils/merge-views-into-objects.js';
 export * from './protocols/index.js';
+/**
+ * @deprecated Import `composeStacks` from `@objectstack/spec` instead.
+ *
+ * This re-export is kept only for backward compatibility and will be removed
+ * in the next major version of `@object-ui/core`.
+ */
+export { composeStacks } from '@objectstack/spec';

package/dist/registry/PluginSystem.d.ts

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { Registry } from './Registry.js';
-import type { PluginScope, PluginScopeConfig } from '@object-ui/types';
+import type { PluginScope, PluginScopeConfig, AppMetadataPlugin, AppPluginContext } from '@object-ui/types';
 export interface PluginDefinition {
     name: string;
     version: string;
@@ -63,4 +63,24 @@ export declare class PluginSystem {
      * @returns Array of all plugin definitions
      */
     getAllPlugins(): PluginDefinition[];
+    /**
+     * Install an AppMetadataPlugin at runtime.
+     *
+     * Wraps the plugin as a PluginDefinition, calls its `init()` and `start()`
+     * lifecycle hooks, and loads it into the system.
+     *
+     * @param plugin - An AppMetadataPlugin instance
+     * @param registry - The component registry
+     * @param ctx - Optional context passed to the plugin's start() hook
+     */
+    install(plugin: AppMetadataPlugin, registry: Registry, ctx?: AppPluginContext): Promise<void>;
+    /**
+     * Uninstall an AppMetadataPlugin at runtime.
+     *
+     * Calls the plugin's `stop()` lifecycle hook (via onUnload) and
+     * removes it from the system.
+     *
+     * @param pluginName - Name of the plugin to uninstall
+     */
+    uninstall(pluginName: string): Promise<void>;
 }

package/dist/registry/PluginSystem.js

@@ -139,4 +139,44 @@ export class PluginSystem {
     getAllPlugins() {
         return Array.from(this.plugins.values());
     }
+    /**
+     * Install an AppMetadataPlugin at runtime.
+     *
+     * Wraps the plugin as a PluginDefinition, calls its `init()` and `start()`
+     * lifecycle hooks, and loads it into the system.
+     *
+     * @param plugin - An AppMetadataPlugin instance
+     * @param registry - The component registry
+     * @param ctx - Optional context passed to the plugin's start() hook
+     */
+    async install(plugin, registry, ctx) {
+        if (this.loaded.has(plugin.name)) {
+            console.warn(`Plugin "${plugin.name}" is already installed. Skipping.`);
+            return;
+        }
+        await plugin.init();
+        const definition = {
+            name: plugin.name,
+            version: plugin.version,
+            register: () => { },
+            onLoad: async () => {
+                await plugin.start(ctx ?? { logger: console });
+            },
+            onUnload: async () => {
+                await plugin.stop();
+            },
+        };
+        await this.loadPlugin(definition, registry);
+    }
+    /**
+     * Uninstall an AppMetadataPlugin at runtime.
+     *
+     * Calls the plugin's `stop()` lifecycle hook (via onUnload) and
+     * removes it from the system.
+     *
+     * @param pluginName - Name of the plugin to uninstall
+     */
+    async uninstall(pluginName) {
+        await this.unloadPlugin(pluginName);
+    }
 }

package/dist/utils/merge-views-into-objects.d.ts

@@ -0,0 +1,19 @@
+/**
+ * ObjectUI
+ * Copyright (c) 2024-present ObjectStack Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+/**
+ * Adapter: merge stack-level views into object definitions.
+ *
+ * Views are defined at the stack level (views[].listViews) but the runtime
+ * expects listViews on each object definition. This bridges the gap until
+ * the runtime/provider layer handles it natively.
+ *
+ * @param objects - Object definitions from composed stack
+ * @param views   - View definitions containing listViews keyed by object name
+ * @returns Objects with listViews merged in from matching views
+ */
+export declare function mergeViewsIntoObjects(objects: any[], views: any[]): any[];

package/dist/utils/merge-views-into-objects.js

@@ -0,0 +1,39 @@
+/**
+ * ObjectUI
+ * Copyright (c) 2024-present ObjectStack Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+/**
+ * Adapter: merge stack-level views into object definitions.
+ *
+ * Views are defined at the stack level (views[].listViews) but the runtime
+ * expects listViews on each object definition. This bridges the gap until
+ * the runtime/provider layer handles it natively.
+ *
+ * @param objects - Object definitions from composed stack
+ * @param views   - View definitions containing listViews keyed by object name
+ * @returns Objects with listViews merged in from matching views
+ */
+export function mergeViewsIntoObjects(objects, views) {
+    const viewsByObject = {};
+    for (const view of views) {
+        if (!view.listViews)
+            continue;
+        for (const [viewName, listView] of Object.entries(view.listViews)) {
+            const objectName = listView?.data?.object;
+            if (!objectName)
+                continue;
+            if (!viewsByObject[objectName])
+                viewsByObject[objectName] = {};
+            viewsByObject[objectName][viewName] = listView;
+        }
+    }
+    return objects.map((obj) => {
+        const v = viewsByObject[obj.name];
+        if (!v)
+            return obj;
+        return { ...obj, listViews: { ...(obj.listViews || {}), ...v } };
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@object-ui/core",
-  "version": "3.1.1",
+  "version": "3.1.3",
   "type": "module",
   "sideEffects": false,
   "license": "MIT",
@@ -25,10 +25,10 @@
     }
   },
   "dependencies": {
-    "@objectstack/spec": "^3.2.1",
+    "@objectstack/spec": "^3.2.6",
     "lodash": "^4.17.23",
     "zod": "^4.3.6",
-    "@object-ui/types": "3.1.1"
+    "@object-ui/types": "3.1.3"
   },
   "devDependencies": {
     "typescript": "^5.9.3",

package/src/adapters/ValueDataSource.ts

@@ -24,7 +24,7 @@ import type {
 export interface ValueDataSourceConfig<T = any> {
   /** The static data array */
   items: T[];
-  /** Optional ID field name for findOne/update/delete (defaults to '_id' then 'id') */
+  /** Optional ID field name for findOne/update/delete (defaults to 'id' then '_id') */
   idField?: string;
 }
 
@@ -35,7 +35,7 @@ export interface ValueDataSourceConfig<T = any> {
 /** Resolve the ID of a record given possible field names */
 function getRecordId(record: any, idField?: string): string | number | undefined {
   if (idField) return record[idField];
-  return record._id ?? record.id;
+  return record.id ?? record._id;
 }
 
 /**
@@ -304,7 +304,7 @@ export class ValueDataSource<T = any> implements DataSource<T> {
     const record = { ...data } as T;
     // Auto-generate an ID if missing
     if (!getRecordId(record, this.idField)) {
-      const field = this.idField ?? '_id';
+      const field = this.idField ?? 'id';
       (record as any)[field] = `auto_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
     }
     this.items.push(record);

package/src/adapters/__tests__/ValueDataSource.test.ts

@@ -10,11 +10,11 @@ import { describe, it, expect } from 'vitest';
 import { ValueDataSource } from '../ValueDataSource';
 
 const sampleData = [
-  { _id: '1', name: 'Alice', age: 30, role: 'admin' },
-  { _id: '2', name: 'Bob', age: 25, role: 'user' },
-  { _id: '3', name: 'Charlie', age: 35, role: 'admin' },
-  { _id: '4', name: 'Diana', age: 28, role: 'user' },
-  { _id: '5', name: 'Eve', age: 22, role: 'guest' },
+  { id: '1', name: 'Alice', age: 30, role: 'admin' },
+  { id: '2', name: 'Bob', age: 25, role: 'user' },
+  { id: '3', name: 'Charlie', age: 35, role: 'admin' },
+  { id: '4', name: 'Diana', age: 28, role: 'user' },
+  { id: '5', name: 'Eve', age: 22, role: 'guest' },
 ];
 
 function createDS() {
@@ -132,7 +132,7 @@ describe('ValueDataSource — find', () => {
     const first = result.data[0] as any;
     expect(first.name).toBeDefined();
     expect(first.age).toBeDefined();
-    expect(first._id).toBeUndefined();
+    expect(first.id).toBeUndefined();
     expect(first.role).toBeUndefined();
   });
 
@@ -252,7 +252,7 @@ describe('ValueDataSource — AST filter', () => {
 // ---------------------------------------------------------------------------
 
 describe('ValueDataSource — findOne', () => {
-  it('should find a record by _id', async () => {
+  it('should find a record by id', async () => {
     const ds = createDS();
     const record = await ds.findOne('users', '3');
     expect(record).not.toBeNull();
@@ -299,14 +299,14 @@ describe('ValueDataSource — create', () => {
   it('should auto-generate an ID if missing', async () => {
     const ds = createDS();
     const created = await ds.create('users', { name: 'Grace' });
-    expect((created as any)._id).toBeDefined();
-    expect(String((created as any)._id).startsWith('auto_')).toBe(true);
+    expect((created as any).id).toBeDefined();
+    expect(String((created as any).id).startsWith('auto_')).toBe(true);
   });
 
   it('should preserve existing ID', async () => {
     const ds = createDS();
-    const created = await ds.create('users', { _id: 'custom-id', name: 'Heidi' });
-    expect((created as any)._id).toBe('custom-id');
+    const created = await ds.create('users', { id: 'custom-id', name: 'Heidi' });
+    expect((created as any).id).toBe('custom-id');
   });
 });
 
@@ -374,7 +374,7 @@ describe('ValueDataSource — bulk', () => {
 
   it('should bulk delete records', async () => {
     const ds = createDS();
-    await ds.bulk!('users', 'delete', [{ _id: '1' }, { _id: '2' }]);
+    await ds.bulk!('users', 'delete', [{ id: '1' }, { id: '2' }]);
     expect(ds.count).toBe(3);
   });
 });
@@ -388,7 +388,7 @@ describe('ValueDataSource — getObjectSchema', () => {
     const ds = createDS();
     const schema = await ds.getObjectSchema('users');
     expect(schema.name).toBe('users');
-    expect(schema.fields._id).toBeDefined();
+    expect(schema.fields.id).toBeDefined();
     expect(schema.fields.name.type).toBe('string');
     expect(schema.fields.age.type).toBe('number');
   });
@@ -406,7 +406,7 @@ describe('ValueDataSource — getObjectSchema', () => {
 
 describe('ValueDataSource — isolation', () => {
   it('should not mutate the original items array', async () => {
-    const original = [{ _id: '1', name: 'Test' }];
+    const original = [{ id: '1', name: 'Test' }];
     const ds = new ValueDataSource({ items: original });
     await ds.create('x', { name: 'New' });
     expect(original).toHaveLength(1); // original untouched
@@ -420,11 +420,11 @@ describe('ValueDataSource — isolation', () => {
 
 describe('ValueDataSource — aggregate', () => {
   const aggData = [
-    { _id: '1', category: 'A', amount: 10 },
-    { _id: '2', category: 'A', amount: 20 },
-    { _id: '3', category: 'B', amount: 30 },
-    { _id: '4', category: 'B', amount: 40 },
-    { _id: '5', category: 'B', amount: 50 },
+    { id: '1', category: 'A', amount: 10 },
+    { id: '2', category: 'A', amount: 20 },
+    { id: '3', category: 'B', amount: 30 },
+    { id: '4', category: 'B', amount: 40 },
+    { id: '5', category: 'B', amount: 50 },
   ];
 
   function createAggDS() {

package/src/index.ts

@@ -26,4 +26,13 @@ export * from './data-scope/index.js';
 export * from './errors/index.js';
 export * from './utils/debug.js';
 export * from './utils/debug-collector.js';
+export * from './utils/merge-views-into-objects.js';
 export * from './protocols/index.js';
+
+/**
+ * @deprecated Import `composeStacks` from `@objectstack/spec` instead.
+ *
+ * This re-export is kept only for backward compatibility and will be removed
+ * in the next major version of `@object-ui/core`.
+ */
+export { composeStacks } from '@objectstack/spec';

package/src/registry/PluginSystem.ts

@@ -7,7 +7,7 @@
  */
 
 import type { Registry } from './Registry.js';
-import type { PluginScope, PluginScopeConfig } from '@object-ui/types';
+import type { PluginScope, PluginScopeConfig, AppMetadataPlugin, AppPluginContext } from '@object-ui/types';
 import { PluginScopeImpl } from './PluginScopeImpl.js';
 
 export interface PluginDefinition {
@@ -158,4 +158,49 @@ export class PluginSystem {
   getAllPlugins(): PluginDefinition[] {
     return Array.from(this.plugins.values());
   }
+
+  /**
+   * Install an AppMetadataPlugin at runtime.
+   *
+   * Wraps the plugin as a PluginDefinition, calls its `init()` and `start()`
+   * lifecycle hooks, and loads it into the system.
+   *
+   * @param plugin - An AppMetadataPlugin instance
+   * @param registry - The component registry
+   * @param ctx - Optional context passed to the plugin's start() hook
+   */
+  async install(plugin: AppMetadataPlugin, registry: Registry, ctx?: AppPluginContext): Promise<void> {
+    if (this.loaded.has(plugin.name)) {
+      console.warn(`Plugin "${plugin.name}" is already installed. Skipping.`);
+      return;
+    }
+
+    await plugin.init();
+
+    const definition: PluginDefinition = {
+      name: plugin.name,
+      version: plugin.version,
+      register: () => {},
+      onLoad: async () => {
+        await plugin.start(ctx ?? { logger: console });
+      },
+      onUnload: async () => {
+        await plugin.stop();
+      },
+    };
+
+    await this.loadPlugin(definition, registry);
+  }
+
+  /**
+   * Uninstall an AppMetadataPlugin at runtime.
+   *
+   * Calls the plugin's `stop()` lifecycle hook (via onUnload) and
+   * removes it from the system.
+   *
+   * @param pluginName - Name of the plugin to uninstall
+   */
+  async uninstall(pluginName: string): Promise<void> {
+    await this.unloadPlugin(pluginName);
+  }
 }

package/src/registry/__tests__/PluginSystem.test.ts

@@ -223,4 +223,87 @@ describe('PluginSystem', () => {
     expect(pluginSystem.isLoaded('failing-plugin')).toBe(false);
     expect(pluginSystem.getPlugin('failing-plugin')).toBeUndefined();
   });
+
+  describe('install / uninstall (AppMetadataPlugin)', () => {
+    it('should install an AppMetadataPlugin and call init + start', async () => {
+      const initFn = vi.fn();
+      const startFn = vi.fn();
+      const stopFn = vi.fn();
+
+      const appPlugin = {
+        name: '@test/my-plugin',
+        version: '1.0.0',
+        type: 'app-metadata' as const,
+        description: 'Test metadata plugin',
+        init: initFn,
+        start: startFn,
+        stop: stopFn,
+        getConfig: () => ({ objects: [] }),
+      };
+
+      await pluginSystem.install(appPlugin, registry, { logger: console });
+
+      expect(initFn).toHaveBeenCalledTimes(1);
+      expect(startFn).toHaveBeenCalledTimes(1);
+      expect(startFn).toHaveBeenCalledWith({ logger: console });
+      expect(pluginSystem.isLoaded('@test/my-plugin')).toBe(true);
+    });
+
+    it('should not install the same plugin twice', async () => {
+      const appPlugin = {
+        name: '@test/dup-plugin',
+        version: '1.0.0',
+        type: 'app-metadata' as const,
+        init: vi.fn(),
+        start: vi.fn(),
+        stop: vi.fn(),
+      };
+
+      await pluginSystem.install(appPlugin, registry);
+      await pluginSystem.install(appPlugin, registry);
+
+      expect(appPlugin.init).toHaveBeenCalledTimes(1);
+    });
+
+    it('should uninstall a plugin and call stop', async () => {
+      const stopFn = vi.fn();
+      const appPlugin = {
+        name: '@test/removable',
+        version: '1.0.0',
+        type: 'app-metadata' as const,
+        init: vi.fn(),
+        start: vi.fn(),
+        stop: stopFn,
+      };
+
+      await pluginSystem.install(appPlugin, registry);
+      expect(pluginSystem.isLoaded('@test/removable')).toBe(true);
+
+      await pluginSystem.uninstall('@test/removable');
+      expect(pluginSystem.isLoaded('@test/removable')).toBe(false);
+      expect(stopFn).toHaveBeenCalledTimes(1);
+    });
+
+    it('should throw when uninstalling a plugin that is not installed', async () => {
+      await expect(pluginSystem.uninstall('@test/nonexistent')).rejects.toThrow(
+        'Plugin "@test/nonexistent" is not loaded'
+      );
+    });
+
+    it('should provide default context when none is given', async () => {
+      const startFn = vi.fn();
+      const appPlugin = {
+        name: '@test/default-ctx',
+        version: '1.0.0',
+        type: 'app-metadata' as const,
+        init: vi.fn(),
+        start: startFn,
+        stop: vi.fn(),
+      };
+
+      await pluginSystem.install(appPlugin, registry);
+
+      expect(startFn).toHaveBeenCalledWith({ logger: console });
+    });
+  });
 });

package/src/utils/__tests__/merge-views-into-objects.test.ts

@@ -0,0 +1,110 @@
+/**
+ * ObjectUI
+ * Copyright (c) 2024-present ObjectStack Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import { describe, it, expect } from 'vitest';
+import { mergeViewsIntoObjects } from '../merge-views-into-objects';
+
+describe('mergeViewsIntoObjects', () => {
+  it('should merge listViews from views into corresponding objects', () => {
+    const objects = [{ name: 'account', label: 'Account', fields: {} }];
+    const views = [
+      {
+        listViews: {
+          all_accounts: {
+            name: 'all_accounts',
+            label: 'All Accounts',
+            type: 'grid',
+            data: { provider: 'object', object: 'account' },
+          },
+        },
+      },
+    ];
+
+    const result = mergeViewsIntoObjects(objects, views);
+    expect(result[0].listViews.all_accounts).toBeDefined();
+    expect(result[0].listViews.all_accounts.label).toBe('All Accounts');
+  });
+
+  it('should preserve existing listViews on objects', () => {
+    const objects = [
+      {
+        name: 'todo_task',
+        label: 'Task',
+        fields: {},
+        listViews: {
+          existing: { name: 'existing', label: 'Existing View', type: 'grid', data: { provider: 'object', object: 'todo_task' } },
+        },
+      },
+    ];
+    const views = [
+      {
+        listViews: {
+          new_view: {
+            name: 'new_view',
+            label: 'New View',
+            type: 'grid',
+            data: { provider: 'object', object: 'todo_task' },
+          },
+        },
+      },
+    ];
+
+    const result = mergeViewsIntoObjects(objects, views);
+    const task = result[0];
+    expect(task.listViews.existing).toBeDefined();
+    expect(task.listViews.new_view).toBeDefined();
+  });
+
+  it('should ignore listViews without data.object', () => {
+    const objects = [{ name: 'account', label: 'Account', fields: {} }];
+    const views = [
+      {
+        listViews: {
+          orphan: { name: 'orphan', label: 'Orphan View', type: 'grid' },
+        },
+      },
+    ];
+
+    const result = mergeViewsIntoObjects(objects, views);
+    expect(result[0].listViews).toBeUndefined();
+  });
+
+  it('should return objects unchanged when views is empty', () => {
+    const objects = [{ name: 'account', label: 'Account', fields: {} }];
+
+    const result = mergeViewsIntoObjects(objects, []);
+    expect(result).toEqual(objects);
+  });
+
+  it('should ignore views without listViews property', () => {
+    const objects = [{ name: 'account', label: 'Account', fields: {} }];
+    const views = [{ someOtherProp: true }];
+
+    const result = mergeViewsIntoObjects(objects, views);
+    expect(result).toEqual(objects);
+  });
+
+  it('should merge views from multiple view entries into different objects', () => {
+    const objects = [
+      { name: 'account', label: 'Account', fields: {} },
+      { name: 'contact', label: 'Contact', fields: {} },
+    ];
+    const views = [
+      {
+        listViews: {
+          all_accounts: { name: 'all_accounts', label: 'All Accounts', type: 'grid', data: { provider: 'object', object: 'account' } },
+          all_contacts: { name: 'all_contacts', label: 'All Contacts', type: 'grid', data: { provider: 'object', object: 'contact' } },
+        },
+      },
+    ];
+
+    const result = mergeViewsIntoObjects(objects, views);
+    expect(result[0].listViews.all_accounts).toBeDefined();
+    expect(result[1].listViews.all_contacts).toBeDefined();
+  });
+});

package/src/utils/merge-views-into-objects.ts

@@ -0,0 +1,36 @@
+/**
+ * ObjectUI
+ * Copyright (c) 2024-present ObjectStack Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * Adapter: merge stack-level views into object definitions.
+ *
+ * Views are defined at the stack level (views[].listViews) but the runtime
+ * expects listViews on each object definition. This bridges the gap until
+ * the runtime/provider layer handles it natively.
+ *
+ * @param objects - Object definitions from composed stack
+ * @param views   - View definitions containing listViews keyed by object name
+ * @returns Objects with listViews merged in from matching views
+ */
+export function mergeViewsIntoObjects(objects: any[], views: any[]): any[] {
+  const viewsByObject: Record<string, Record<string, any>> = {};
+  for (const view of views) {
+    if (!view.listViews) continue;
+    for (const [viewName, listView] of Object.entries(view.listViews as Record<string, any>)) {
+      const objectName = listView?.data?.object;
+      if (!objectName) continue;
+      if (!viewsByObject[objectName]) viewsByObject[objectName] = {};
+      viewsByObject[objectName][viewName] = listView;
+    }
+  }
+  return objects.map((obj: any) => {
+    const v = viewsByObject[obj.name];
+    if (!v) return obj;
+    return { ...obj, listViews: { ...(obj.listViews || {}), ...v } };
+  });
+}