refactor: update ObjectStackProtocolImplementation to use ObjectQL engine and improve registry interactions

- Changed the engine type in ObjectStackProtocolImplementation from IDataEngine to ObjectQL.
- Updated methods to utilize the new engine's registry for schema and item management.
- Refactored tests in registry.test.ts to instantiate SchemaRegistry instead of using static methods.
- Converted static methods in SchemaRegistry to instance methods for better encapsulation and testability.
- Improved logging and namespace management within SchemaRegistry.

Author: hotlong

packages/objectql/src/datasource-mapping.test.ts

@@ -2,7 +2,6 @@
 
 import { describe, it, expect, beforeEach } from 'vitest';
 import { ObjectQL } from './engine.js';
-import { SchemaRegistry } from './registry.js';
 
 // Mock driver for testing
 const createMockDriver = (name: string) => ({
@@ -35,7 +34,7 @@ describe('DatasourceMapping', () => {
 
   beforeEach(() => {
     engine = new ObjectQL();
-    SchemaRegistry.reset();
+    // registry is owned by engine
   });
 
   it('should route objects by namespace', async () => {
@@ -51,7 +50,7 @@ describe('DatasourceMapping', () => {
     ]);
 
     // Register an object in crm namespace
-    SchemaRegistry.registerObject(
+    engine.registry.registerObject(
       {
         name: 'account',
         fields: { name: { type: 'text' } },
@@ -81,7 +80,7 @@ describe('DatasourceMapping', () => {
     ]);
 
     // Register system objects
-    SchemaRegistry.registerObject(
+    engine.registry.registerObject(
       {
         name: 'sys_user',
         fields: { username: { type: 'text' } },
@@ -108,7 +107,7 @@ describe('DatasourceMapping', () => {
       { namespace: 'crm', datasource: 'turso', priority: 50 }, // Lower number = higher priority
     ]);
 
-    SchemaRegistry.registerObject(
+    engine.registry.registerObject(
       {
         name: 'account',
         fields: { name: { type: 'text' } },
@@ -136,7 +135,7 @@ describe('DatasourceMapping', () => {
     ]);
 
     // Register object in different namespace
-    SchemaRegistry.registerObject(
+    engine.registry.registerObject(
       {
         name: 'task',
         fields: { title: { type: 'text' } },
@@ -163,7 +162,7 @@ describe('DatasourceMapping', () => {
     ]);
 
     // Object explicitly sets datasource
-    SchemaRegistry.registerObject(
+    engine.registry.registerObject(
       {
         name: 'account',
         datasource: 'turso', // Explicit override

packages/objectql/src/engine.test.ts

@@ -3,47 +3,67 @@ import { ObjectQL } from './engine';
 import { SchemaRegistry } from './registry';
 import type { IDataDriver } from '@objectstack/spec/contracts';
 
-// Mock the SchemaRegistry to avoid side effects between tests
+// Mock the SchemaRegistry to avoid side effects between tests.
+// SchemaRegistry is now a per-instance class (one per ObjectQL engine), so the
+// mock has to satisfy both use-sites:
+//   1. engine.ts does `new SchemaRegistry()` — the constructor must return a
+//      mocked instance whose methods are the same vi.fn() references the
+//      tests configure via `vi.mocked(SchemaRegistry.X)`.
+//   2. Existing tests reach for `SchemaRegistry.getObject` as if it were a
+//      static — we preserve that by also attaching the same mocks to the
+//      class itself.
 vi.mock('./registry', () => {
   const mockObjects = new Map();
   const mockContributors = new Map();
-  return {
-    SchemaRegistry: {
-      getObject: vi.fn((name) => mockObjects.get(name)),
-      resolveObject: vi.fn((name) => mockObjects.get(name)),
-      registerObject: vi.fn((obj, packageId, namespace, ownership, priority) => {
-        const fqn = namespace ? `${namespace}__${obj.name}` : obj.name;
-        mockObjects.set(fqn, { ...obj, name: fqn });
-        // Also track contributors for getObjectOwner
-        if (!mockContributors.has(fqn)) {
-          mockContributors.set(fqn, []);
-        }
-        const contributors = mockContributors.get(fqn);
-        contributors.push({ packageId, namespace, ownership, priority, definition: obj });
-        return fqn;
-      }),
-      getObjectOwner: vi.fn((fqn) => {
-        const contributors = mockContributors.get(fqn);
-        return contributors?.find(c => c.ownership === 'own');
-      }),
-      registerNamespace: vi.fn(),
-      registerKind: vi.fn(),
-      registerItem: vi.fn(),
-      registerApp: vi.fn(),
-      installPackage: vi.fn((manifest) => ({
-        manifest,
-        status: 'installed',
-        enabled: true,
-        installedAt: new Date().toISOString(),
-      })),
-      reset: vi.fn(() => {
-        mockObjects.clear();
-        mockContributors.clear();
-      }),
-      metadata: {
-        get: vi.fn(() => mockObjects) // Expose for verification if needed
+  const instance: any = {
+    getObject: vi.fn((name) => mockObjects.get(name)),
+    resolveObject: vi.fn((name) => mockObjects.get(name)),
+    registerObject: vi.fn((obj, packageId, namespace, ownership, priority) => {
+      const fqn = namespace ? `${namespace}__${obj.name}` : obj.name;
+      mockObjects.set(fqn, { ...obj, name: fqn });
+      if (!mockContributors.has(fqn)) {
+        mockContributors.set(fqn, []);
       }
-    }
+      const contributors = mockContributors.get(fqn);
+      contributors.push({ packageId, namespace, ownership, priority, definition: obj });
+      return fqn;
+    }),
+    getObjectOwner: vi.fn((fqn) => {
+      const contributors = mockContributors.get(fqn);
+      return contributors?.find((c: any) => c.ownership === 'own');
+    }),
+    registerNamespace: vi.fn(),
+    registerKind: vi.fn(),
+    registerItem: vi.fn(),
+    registerApp: vi.fn(),
+    installPackage: vi.fn((manifest) => ({
+      manifest,
+      status: 'installed',
+      enabled: true,
+      installedAt: new Date().toISOString(),
+    })),
+    reset: vi.fn(() => {
+      mockObjects.clear();
+      mockContributors.clear();
+    }),
+    metadata: {
+      get: vi.fn(() => mockObjects),
+    },
+  };
+  function SchemaRegistry() {
+    return instance;
+  }
+  Object.assign(SchemaRegistry, instance);
+  return {
+    SchemaRegistry,
+    computeFQN: (ns: string | undefined, name: string) =>
+      (ns && ns !== 'base' && ns !== 'system') ? `${ns}__${name}` : name,
+    parseFQN: (fqn: string) => {
+      const idx = fqn.indexOf('__');
+      if (idx < 0) return { namespace: undefined, shortName: fqn };
+      return { namespace: fqn.slice(0, idx), shortName: fqn.slice(idx + 2) };
+    },
+    RESERVED_NAMESPACES: new Set(['base', 'system']),
   };
 });