@platforma-sdk/model 1.65.9 → 1.66.2

package/dist/services/index.js

@@ -1,2 +1,3 @@
 import "./block_services.js";
 import "./service_bridge.js";
+import "./get_services.js";

package/dist/services/service_bridge.cjs

@@ -21,14 +21,14 @@ function buildServices(dispatch, registry) {
 	})));
 }
 /**
-* Builds a NodeServiceProxy from a ServiceDispatch.
+* Builds a ServiceProxy from a ServiceDispatch.
 * Each service method call is forwarded to dispatch.callServiceMethod.
 */
-function createNodeServiceProxy(dispatch) {
-	return ((serviceId) => Object.freeze(Object.fromEntries(dispatch.getServiceMethods(serviceId).map((method) => [method, async (...args) => dispatch.callServiceMethod(serviceId, method, ...args)]))));
+function createServiceProxy(dispatch) {
+	return ((serviceId) => Object.freeze(Object.fromEntries(dispatch.getServiceMethods(serviceId).map((method) => [method, (...args) => dispatch.callServiceMethod(serviceId, method, ...args)]))));
 }
 //#endregion
 exports.buildServices = buildServices;
-exports.createNodeServiceProxy = createNodeServiceProxy;
+exports.createServiceProxy = createServiceProxy;
 
 //# sourceMappingURL=service_bridge.cjs.map

package/dist/services/service_bridge.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"service_bridge.cjs","names":[],"sources":["../../src/services/service_bridge.ts"],"sourcesContent":["/**\n * Runtime service bridge — builds lazy service objects from dispatch + registry.\n * Used by the UI layer to provide typed service access.\n */\n\nimport type {\n  ServiceTypesLike,\n  InferServiceUi,\n  ServiceName,\n  ServiceDispatch,\n  UiServices as AllUiServices,\n} from \"@milaboratories/pl-model-common\";\nimport { UiServiceRegistry } from \"@milaboratories/pl-model-common\";\n\n// Makes a remote node service appear local.\n// Given a service ID, returns an object implementing the service's UI interface.\n// Provided by the desktop app (e.g. backed by Electron IPC).\nexport type NodeServiceProxy = <S extends ServiceTypesLike>(\n  serviceId: ServiceName<S>,\n) => InferServiceUi<S>;\n\n/**\n * Builds a lazy services object from ServiceDispatch and UiServiceRegistry.\n * Each service is instantiated on first access. Errors are cached to prevent\n * repeated factory calls on failure.\n */\nexport function buildServices<S extends Partial<AllUiServices> = Partial<AllUiServices>>(\n  dispatch: ServiceDispatch,\n  registry: UiServiceRegistry,\n): S {\n  return Object.create(\n    null,\n    Object.fromEntries(\n      dispatch.getServiceNames().map((id) => {\n        let fetched = false;\n        let cached: unknown;\n        return [\n          id,\n          {\n            enumerable: true,\n            get() {\n              if (!fetched) {\n                fetched = true;\n                cached = registry.get(id);\n              }\n              return cached;\n            },\n          },\n        ];\n      }),\n    ),\n  );\n}\n\n/**\n * Builds a NodeServiceProxy from a ServiceDispatch.\n * Each service method call is forwarded to dispatch.callServiceMethod.\n */\nexport function createNodeServiceProxy(dispatch: ServiceDispatch): NodeServiceProxy {\n  return ((serviceId: ServiceName) =>\n    Object.freeze(\n      Object.fromEntries(\n        dispatch\n          .getServiceMethods(serviceId)\n          .map((method) => [\n            method,\n            async (...args: unknown[]) => dispatch.callServiceMethod(serviceId, method, ...args),\n          ]),\n      ),\n    )) as NodeServiceProxy;\n}\n"],"mappings":";;;;;;AA0BA,SAAgB,cACd,UACA,UACG;AACH,QAAO,OAAO,OACZ,MACA,OAAO,YACL,SAAS,iBAAiB,CAAC,KAAK,OAAO;EACrC,IAAI,UAAU;EACd,IAAI;AACJ,SAAO,CACL,IACA;GACE,YAAY;GACZ,MAAM;AACJ,QAAI,CAAC,SAAS;AACZ,eAAU;AACV,cAAS,SAAS,IAAI,GAAG;;AAE3B,WAAO;;GAEV,CACF;GACD,CACH,CACF;;;;;;AAOH,SAAgB,uBAAuB,UAA6C;AAClF,UAAS,cACP,OAAO,OACL,OAAO,YACL,SACG,kBAAkB,UAAU,CAC5B,KAAK,WAAW,CACf,QACA,OAAO,GAAG,SAAoB,SAAS,kBAAkB,WAAW,QAAQ,GAAG,KAAK,CACrF,CAAC,CACL,CACF"}
+{"version":3,"file":"service_bridge.cjs","names":[],"sources":["../../src/services/service_bridge.ts"],"sourcesContent":["/**\n * Runtime service bridge — builds lazy service objects from dispatch + registry.\n * Used by the UI layer to provide typed service access.\n */\n\nimport type {\n  ServiceTypesLike,\n  InferServiceUi,\n  ServiceName,\n  ServiceDispatch,\n  UiServices as AllUiServices,\n} from \"@milaboratories/pl-model-common\";\nimport { UiServiceRegistry } from \"@milaboratories/pl-model-common\";\n\n// Makes a remote node service appear local.\n// Given a service ID, returns an object implementing the service's UI interface.\n// Provided by the desktop app (e.g. backed by Electron IPC).\nexport type ServiceProxy = <S extends ServiceTypesLike>(\n  serviceId: ServiceName<S>,\n) => InferServiceUi<S>;\n\n/**\n * Builds a lazy services object from ServiceDispatch and UiServiceRegistry.\n * Each service is instantiated on first access. Errors are cached to prevent\n * repeated factory calls on failure.\n */\nexport function buildServices<S extends Partial<AllUiServices> = Partial<AllUiServices>>(\n  dispatch: ServiceDispatch,\n  registry: UiServiceRegistry,\n): S {\n  return Object.create(\n    null,\n    Object.fromEntries(\n      dispatch.getServiceNames().map((id) => {\n        let fetched = false;\n        let cached: unknown;\n        return [\n          id,\n          {\n            enumerable: true,\n            get() {\n              if (!fetched) {\n                fetched = true;\n                cached = registry.get(id);\n              }\n              return cached;\n            },\n          },\n        ];\n      }),\n    ),\n  );\n}\n\n/**\n * Builds a ServiceProxy from a ServiceDispatch.\n * Each service method call is forwarded to dispatch.callServiceMethod.\n */\nexport function createServiceProxy(dispatch: ServiceDispatch): ServiceProxy {\n  return ((serviceId: ServiceName) =>\n    Object.freeze(\n      Object.fromEntries(\n        dispatch\n          .getServiceMethods(serviceId)\n          .map((method) => [\n            method,\n            (...args: unknown[]) => dispatch.callServiceMethod(serviceId, method, ...args),\n          ]),\n      ),\n    )) as ServiceProxy;\n}\n"],"mappings":";;;;;;AA0BA,SAAgB,cACd,UACA,UACG;AACH,QAAO,OAAO,OACZ,MACA,OAAO,YACL,SAAS,iBAAiB,CAAC,KAAK,OAAO;EACrC,IAAI,UAAU;EACd,IAAI;AACJ,SAAO,CACL,IACA;GACE,YAAY;GACZ,MAAM;AACJ,QAAI,CAAC,SAAS;AACZ,eAAU;AACV,cAAS,SAAS,IAAI,GAAG;;AAE3B,WAAO;;GAEV,CACF;GACD,CACH,CACF;;;;;;AAOH,SAAgB,mBAAmB,UAAyC;AAC1E,UAAS,cACP,OAAO,OACL,OAAO,YACL,SACG,kBAAkB,UAAU,CAC5B,KAAK,WAAW,CACf,SACC,GAAG,SAAoB,SAAS,kBAAkB,WAAW,QAAQ,GAAG,KAAK,CAC/E,CAAC,CACL,CACF"}

package/dist/services/service_bridge.d.ts

@@ -1,7 +1,7 @@
 import { InferServiceUi, ServiceDispatch, ServiceName, ServiceTypesLike, UiServiceRegistry, UiServices } from "@milaboratories/pl-model-common";
 
 //#region src/services/service_bridge.d.ts
-type NodeServiceProxy = <S extends ServiceTypesLike>(serviceId: ServiceName<S>) => InferServiceUi<S>;
+type ServiceProxy = <S extends ServiceTypesLike>(serviceId: ServiceName<S>) => InferServiceUi<S>;
 /**
  * Builds a lazy services object from ServiceDispatch and UiServiceRegistry.
  * Each service is instantiated on first access. Errors are cached to prevent
@@ -9,10 +9,10 @@ type NodeServiceProxy = <S extends ServiceTypesLike>(serviceId: ServiceName<S>)
  */
 declare function buildServices<S extends Partial<UiServices> = Partial<UiServices>>(dispatch: ServiceDispatch, registry: UiServiceRegistry): S;
 /**
- * Builds a NodeServiceProxy from a ServiceDispatch.
+ * Builds a ServiceProxy from a ServiceDispatch.
  * Each service method call is forwarded to dispatch.callServiceMethod.
  */
-declare function createNodeServiceProxy(dispatch: ServiceDispatch): NodeServiceProxy;
+declare function createServiceProxy(dispatch: ServiceDispatch): ServiceProxy;
 //#endregion
-export { NodeServiceProxy, buildServices, createNodeServiceProxy };
+export { ServiceProxy, buildServices, createServiceProxy };
 //# sourceMappingURL=service_bridge.d.ts.map

package/dist/services/service_bridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service_bridge.d.ts","names":[],"sources":["../../src/services/service_bridge.ts"],"mappings":";;;KAiBY,gBAAA,cAA8B,gBAAA,EACxC,SAAA,EAAW,WAAA,CAAY,CAAA,MACpB,cAAA,CAAe,CAAA;;;;;;iBAOJ,aAAA,WAAwB,OAAA,CAAQ,UAAA,IAAiB,OAAA,CAAQ,UAAA,EAAA,CACvE,QAAA,EAAU,eAAA,EACV,QAAA,EAAU,iBAAA,GACT,CAAA;;;;;iBA6Ba,sBAAA,CAAuB,QAAA,EAAU,eAAA,GAAkB,gBAAA"}
+{"version":3,"file":"service_bridge.d.ts","names":[],"sources":["../../src/services/service_bridge.ts"],"mappings":";;;KAiBY,YAAA,cAA0B,gBAAA,EACpC,SAAA,EAAW,WAAA,CAAY,CAAA,MACpB,cAAA,CAAe,CAAA;;;;;;iBAOJ,aAAA,WAAwB,OAAA,CAAQ,UAAA,IAAiB,OAAA,CAAQ,UAAA,EAAA,CACvE,QAAA,EAAU,eAAA,EACV,QAAA,EAAU,iBAAA,GACT,CAAA;;;;;iBA6Ba,kBAAA,CAAmB,QAAA,EAAU,eAAA,GAAkB,YAAA"}

package/dist/services/service_bridge.js

@@ -21,13 +21,13 @@ function buildServices(dispatch, registry) {
 	})));
 }
 /**
-* Builds a NodeServiceProxy from a ServiceDispatch.
+* Builds a ServiceProxy from a ServiceDispatch.
 * Each service method call is forwarded to dispatch.callServiceMethod.
 */
-function createNodeServiceProxy(dispatch) {
-	return ((serviceId) => Object.freeze(Object.fromEntries(dispatch.getServiceMethods(serviceId).map((method) => [method, async (...args) => dispatch.callServiceMethod(serviceId, method, ...args)]))));
+function createServiceProxy(dispatch) {
+	return ((serviceId) => Object.freeze(Object.fromEntries(dispatch.getServiceMethods(serviceId).map((method) => [method, (...args) => dispatch.callServiceMethod(serviceId, method, ...args)]))));
 }
 //#endregion
-export { buildServices, createNodeServiceProxy };
+export { buildServices, createServiceProxy };
 
 //# sourceMappingURL=service_bridge.js.map

package/dist/services/service_bridge.js.map

@@ -1 +1 @@
-{"version":3,"file":"service_bridge.js","names":[],"sources":["../../src/services/service_bridge.ts"],"sourcesContent":["/**\n * Runtime service bridge — builds lazy service objects from dispatch + registry.\n * Used by the UI layer to provide typed service access.\n */\n\nimport type {\n  ServiceTypesLike,\n  InferServiceUi,\n  ServiceName,\n  ServiceDispatch,\n  UiServices as AllUiServices,\n} from \"@milaboratories/pl-model-common\";\nimport { UiServiceRegistry } from \"@milaboratories/pl-model-common\";\n\n// Makes a remote node service appear local.\n// Given a service ID, returns an object implementing the service's UI interface.\n// Provided by the desktop app (e.g. backed by Electron IPC).\nexport type NodeServiceProxy = <S extends ServiceTypesLike>(\n  serviceId: ServiceName<S>,\n) => InferServiceUi<S>;\n\n/**\n * Builds a lazy services object from ServiceDispatch and UiServiceRegistry.\n * Each service is instantiated on first access. Errors are cached to prevent\n * repeated factory calls on failure.\n */\nexport function buildServices<S extends Partial<AllUiServices> = Partial<AllUiServices>>(\n  dispatch: ServiceDispatch,\n  registry: UiServiceRegistry,\n): S {\n  return Object.create(\n    null,\n    Object.fromEntries(\n      dispatch.getServiceNames().map((id) => {\n        let fetched = false;\n        let cached: unknown;\n        return [\n          id,\n          {\n            enumerable: true,\n            get() {\n              if (!fetched) {\n                fetched = true;\n                cached = registry.get(id);\n              }\n              return cached;\n            },\n          },\n        ];\n      }),\n    ),\n  );\n}\n\n/**\n * Builds a NodeServiceProxy from a ServiceDispatch.\n * Each service method call is forwarded to dispatch.callServiceMethod.\n */\nexport function createNodeServiceProxy(dispatch: ServiceDispatch): NodeServiceProxy {\n  return ((serviceId: ServiceName) =>\n    Object.freeze(\n      Object.fromEntries(\n        dispatch\n          .getServiceMethods(serviceId)\n          .map((method) => [\n            method,\n            async (...args: unknown[]) => dispatch.callServiceMethod(serviceId, method, ...args),\n          ]),\n      ),\n    )) as NodeServiceProxy;\n}\n"],"mappings":";;;;;;AA0BA,SAAgB,cACd,UACA,UACG;AACH,QAAO,OAAO,OACZ,MACA,OAAO,YACL,SAAS,iBAAiB,CAAC,KAAK,OAAO;EACrC,IAAI,UAAU;EACd,IAAI;AACJ,SAAO,CACL,IACA;GACE,YAAY;GACZ,MAAM;AACJ,QAAI,CAAC,SAAS;AACZ,eAAU;AACV,cAAS,SAAS,IAAI,GAAG;;AAE3B,WAAO;;GAEV,CACF;GACD,CACH,CACF;;;;;;AAOH,SAAgB,uBAAuB,UAA6C;AAClF,UAAS,cACP,OAAO,OACL,OAAO,YACL,SACG,kBAAkB,UAAU,CAC5B,KAAK,WAAW,CACf,QACA,OAAO,GAAG,SAAoB,SAAS,kBAAkB,WAAW,QAAQ,GAAG,KAAK,CACrF,CAAC,CACL,CACF"}
+{"version":3,"file":"service_bridge.js","names":[],"sources":["../../src/services/service_bridge.ts"],"sourcesContent":["/**\n * Runtime service bridge — builds lazy service objects from dispatch + registry.\n * Used by the UI layer to provide typed service access.\n */\n\nimport type {\n  ServiceTypesLike,\n  InferServiceUi,\n  ServiceName,\n  ServiceDispatch,\n  UiServices as AllUiServices,\n} from \"@milaboratories/pl-model-common\";\nimport { UiServiceRegistry } from \"@milaboratories/pl-model-common\";\n\n// Makes a remote node service appear local.\n// Given a service ID, returns an object implementing the service's UI interface.\n// Provided by the desktop app (e.g. backed by Electron IPC).\nexport type ServiceProxy = <S extends ServiceTypesLike>(\n  serviceId: ServiceName<S>,\n) => InferServiceUi<S>;\n\n/**\n * Builds a lazy services object from ServiceDispatch and UiServiceRegistry.\n * Each service is instantiated on first access. Errors are cached to prevent\n * repeated factory calls on failure.\n */\nexport function buildServices<S extends Partial<AllUiServices> = Partial<AllUiServices>>(\n  dispatch: ServiceDispatch,\n  registry: UiServiceRegistry,\n): S {\n  return Object.create(\n    null,\n    Object.fromEntries(\n      dispatch.getServiceNames().map((id) => {\n        let fetched = false;\n        let cached: unknown;\n        return [\n          id,\n          {\n            enumerable: true,\n            get() {\n              if (!fetched) {\n                fetched = true;\n                cached = registry.get(id);\n              }\n              return cached;\n            },\n          },\n        ];\n      }),\n    ),\n  );\n}\n\n/**\n * Builds a ServiceProxy from a ServiceDispatch.\n * Each service method call is forwarded to dispatch.callServiceMethod.\n */\nexport function createServiceProxy(dispatch: ServiceDispatch): ServiceProxy {\n  return ((serviceId: ServiceName) =>\n    Object.freeze(\n      Object.fromEntries(\n        dispatch\n          .getServiceMethods(serviceId)\n          .map((method) => [\n            method,\n            (...args: unknown[]) => dispatch.callServiceMethod(serviceId, method, ...args),\n          ]),\n      ),\n    )) as ServiceProxy;\n}\n"],"mappings":";;;;;;AA0BA,SAAgB,cACd,UACA,UACG;AACH,QAAO,OAAO,OACZ,MACA,OAAO,YACL,SAAS,iBAAiB,CAAC,KAAK,OAAO;EACrC,IAAI,UAAU;EACd,IAAI;AACJ,SAAO,CACL,IACA;GACE,YAAY;GACZ,MAAM;AACJ,QAAI,CAAC,SAAS;AACZ,eAAU;AACV,cAAS,SAAS,IAAI,GAAG;;AAE3B,WAAO;;GAEV,CACF;GACD,CACH,CACF;;;;;;AAOH,SAAgB,mBAAmB,UAAyC;AAC1E,UAAS,cACP,OAAO,OACL,OAAO,YACL,SACG,kBAAkB,UAAU,CAC5B,KAAK,WAAW,CACf,SACC,GAAG,SAAoB,SAAS,kBAAkB,WAAW,QAAQ,GAAG,KAAK,CAC/E,CAAC,CACL,CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/model",
-  "version": "1.65.9",
+  "version": "1.66.2",
   "description": "Platforma.bio SDK / Block Model",
   "files": [
     "./dist/**/*",
@@ -30,20 +30,20 @@
     "fast-json-patch": "^3.1.1",
     "utility-types": "^3.11.0",
     "zod": "~3.25.76",
-    "@milaboratories/pl-model-common": "1.33.0",
-    "@milaboratories/pl-model-middle-layer": "1.18.1",
     "@milaboratories/pl-error-like": "1.12.9",
     "@milaboratories/helpers": "1.14.1",
-    "@milaboratories/ptabler-expression-js": "1.2.11"
+    "@milaboratories/pl-model-common": "1.34.1",
+    "@milaboratories/pl-model-middle-layer": "1.18.3",
+    "@milaboratories/ptabler-expression-js": "1.2.13"
   },
   "devDependencies": {
     "@vitest/coverage-istanbul": "^4.1.3",
     "fast-json-patch": "^3.1.1",
     "typescript": "~5.9.3",
     "vitest": "^4.1.3",
-    "@milaboratories/pf-driver": "1.3.8",
+    "@milaboratories/pf-driver": "1.3.10",
     "@milaboratories/build-configs": "2.0.0",
-    "@milaboratories/pf-spec-driver": "1.3.0",
+    "@milaboratories/pf-spec-driver": "1.3.2",
     "@milaboratories/ts-builder": "1.3.2",
     "@milaboratories/ts-configs": "1.2.3"
   },

package/src/block_model.ts

@@ -6,12 +6,11 @@ import type {
   BlockCodeKnownFeatureFlags,
   BlockConfigContainer,
 } from "@milaboratories/pl-model-common";
-import { resolveRequiredServices } from "@milaboratories/pl-model-common";
 import { getPlatformaInstance, isInUI, createAndRegisterRenderLambda } from "./internal";
 import type { DataModel } from "./block_migrations";
 import type { PlatformaV3 } from "./platforma";
 import type { BlockDefaultUiServices } from "./services/service_resolve";
-import { blockServiceNames, BLOCK_SERVICE_FLAGS } from "./services/block_services";
+import { BLOCK_SERVICE_FLAGS } from "./services/block_services";
 import type { InferRenderFunctionReturn, RenderFunction } from "./render";
 import { BlockRenderCtx, PluginRenderCtx } from "./render";
 import type { PluginData, PluginModel, PluginOutputs, PluginParams } from "./plugin_model";
@@ -237,7 +236,7 @@ export class BlockModelV3<
         ...this.config.outputs,
         [key]: createAndRegisterRenderLambda({
           handle: `block-output#${key}`,
-          lambda: () => cfgOrRf(new BlockRenderCtx<Args, Data>(blockServiceNames)),
+          lambda: () => cfgOrRf(new BlockRenderCtx<Args, Data>()),
           ...flags,
         }),
       },
@@ -335,7 +334,7 @@ export class BlockModelV3<
         sections: createAndRegisterRenderLambda(
           {
             handle: "sections",
-            lambda: () => rf(new BlockRenderCtx<Args, Data>(blockServiceNames)),
+            lambda: () => rf(new BlockRenderCtx<Args, Data>()),
           },
           true,
         ),
@@ -351,7 +350,7 @@ export class BlockModelV3<
       ...this.config,
       title: createAndRegisterRenderLambda({
         handle: "title",
-        lambda: () => rf(new BlockRenderCtx<Args, Data>(blockServiceNames)),
+        lambda: () => rf(new BlockRenderCtx<Args, Data>()),
       }),
     });
   }
@@ -363,7 +362,7 @@ export class BlockModelV3<
       ...this.config,
       subtitle: createAndRegisterRenderLambda({
         handle: "subtitle",
-        lambda: () => rf(new BlockRenderCtx<Args, Data>(blockServiceNames)),
+        lambda: () => rf(new BlockRenderCtx<Args, Data>()),
       }),
     });
   }
@@ -375,7 +374,7 @@ export class BlockModelV3<
       ...this.config,
       tags: createAndRegisterRenderLambda({
         handle: "tags",
-        lambda: () => rf(new BlockRenderCtx<Args, Data>(blockServiceNames)),
+        lambda: () => rf(new BlockRenderCtx<Args, Data>()),
       }),
     });
   }
@@ -536,8 +535,6 @@ export class BlockModelV3<
 
     const { dataModel, argsFunction, prerunArgsFunction } = this.config;
 
-    const mergedServiceNames = resolveRequiredServices(this.config.featureFlags);
-
     function getPlugin(handle: PluginHandle): PluginRecord {
       const plugin = plugins[handle];
       if (!plugin) throw new Error(`Plugin model not found for '${handle}'`);
@@ -577,7 +574,7 @@ export class BlockModelV3<
       // Wrap plugin param lambdas: close over BlockRenderCtx creation
       const wrappedInputs: Record<string, () => unknown> = {};
       for (const [paramKey, paramFn] of Object.entries(inputs)) {
-        wrappedInputs[paramKey] = () => paramFn(new BlockRenderCtx(mergedServiceNames));
+        wrappedInputs[paramKey] = () => paramFn(new BlockRenderCtx());
       }
 
       // Register plugin outputs (in config pack, evaluated by middle layer)
@@ -587,7 +584,7 @@ export class BlockModelV3<
         const key = pluginOutputKey(handle, outputKey);
         pluginOutputs[key] = createAndRegisterRenderLambda({
           handle: key,
-          lambda: () => outputFn(new PluginRenderCtx(handle, wrappedInputs, mergedServiceNames)),
+          lambda: () => outputFn(new PluginRenderCtx(handle, wrappedInputs)),
           withStatus: outputFlags[outputKey]?.withStatus,
         });
       }

package/src/columns/column_collection_builder.test.ts

@@ -1,10 +1,4 @@
-import type {
-  AxisSpec,
-  PColumnSpec,
-  PObjectId,
-  SUniversalPColumnId,
-} from "@milaboratories/pl-model-common";
-import { AnchoredIdDeriver } from "@milaboratories/pl-model-common";
+import type { AxisSpec, PColumnSpec, PObjectId } from "@milaboratories/pl-model-common";
 import { SpecDriver } from "@milaboratories/pf-spec-driver";
 
 import { afterEach, describe, expect, test } from "vitest";
@@ -122,25 +116,26 @@ describe("ColumnCollectionBuilder", () => {
   });
 });
 
-describe("ColumnCollection.getColumn", () => {
-  test("returns snapshot for existing id", () => {
+describe("ColumnCollection lookup by id", () => {
+  test("findColumns includes snapshot with existing id", () => {
     const spec = createSpec("col1");
     const snap = createSnapshot("id1", spec);
     const builder = new ColumnCollectionBuilder(createSpecFrameCtx());
     builder.addSource([snap]);
 
     const collection = builder.build()!;
-    const found = collection.getColumn("id1" as PObjectId);
+    const found = collection.findColumns().find((c) => c.id === ("id1" as PObjectId));
     expect(found).toBeDefined();
     expect(found!.spec.name).toBe("col1");
   });
 
-  test("returns undefined for missing id", () => {
+  test("findColumns does not include missing id", () => {
     const builder = new ColumnCollectionBuilder(createSpecFrameCtx());
     builder.addSource([createSnapshot("id1", createSpec("col1"))]);
 
     const collection = builder.build()!;
-    expect(collection.getColumn("missing" as PObjectId)).toBeUndefined();
+    const found = collection.findColumns().find((c) => c.id === ("missing" as PObjectId));
+    expect(found).toBeUndefined();
   });
 });
 
@@ -232,7 +227,7 @@ describe("data status handling", () => {
     builder.addSource([snap]);
     const collection = builder.build()!;
 
-    const found = collection.getColumn("id1" as PObjectId)!;
+    const found = collection.findColumns().find((c) => c.id === ("id1" as PObjectId))!;
     expect(found.dataStatus).toBe("ready");
     expect(found.data).toBeDefined();
     expect(found.data!.get()).toBe(data);
@@ -245,7 +240,7 @@ describe("data status handling", () => {
     builder.addSource([snap]);
     const collection = builder.build()!;
 
-    const found = collection.getColumn("id1" as PObjectId)!;
+    const found = collection.findColumns().find((c) => c.id === ("id1" as PObjectId))!;
     expect(found.dataStatus).toBe("computing");
     expect(found.data).toBeDefined();
 
@@ -260,7 +255,7 @@ describe("data status handling", () => {
     builder.addSource([snap]);
     const collection = builder.build()!;
 
-    const found = collection.getColumn("id1" as PObjectId)!;
+    const found = collection.findColumns().find((c) => c.id === ("id1" as PObjectId))!;
     expect(found.dataStatus).toBe("absent");
     expect(found.data).toBeUndefined();
   });
@@ -338,7 +333,7 @@ describe("AnchoredColumnCollection", () => {
     );
   });
 
-  test("getColumn returns snapshot by SUniversalPColumnId", () => {
+  test("findColumns surfaces column by original PObjectId", () => {
     const spec = createSpec("col1", { axesSpec: [sampleAxis("sample")] });
     const snap = createSnapshot("id1", spec);
     const builder = new ColumnCollectionBuilder(createSpecFrameCtx());
@@ -346,22 +341,22 @@ describe("AnchoredColumnCollection", () => {
 
     const collection = builder.build({ anchors: { main: anchorSpec } })!;
 
-    const idDeriver = new AnchoredIdDeriver({ main: anchorSpec });
-    const expectedId = idDeriver.deriveS(spec);
-
-    const found = collection.getColumn(expectedId);
+    const matches = collection.findColumns();
+    const found = matches.find((m) => m.column.id === ("id1" as PObjectId));
     expect(found).toBeDefined();
-    expect(found!.spec.name).toBe("col1");
-    expect(found!.id).toBe(expectedId);
+    expect(found!.column.spec.name).toBe("col1");
   });
 
-  test("getColumn returns undefined for unknown id", () => {
+  test("findColumns does not include unknown id", () => {
     const snap = createSnapshot("id1", createSpec("col1", { axesSpec: [sampleAxis("sample")] }));
     const builder = new ColumnCollectionBuilder(createSpecFrameCtx());
     builder.addSource([snap, anchorSnap]);
 
     const collection = builder.build({ anchors: { main: anchorSpec } })!;
-    expect(collection.getColumn("not-a-real-id" as SUniversalPColumnId)).toBeUndefined();
+    const found = collection
+      .findColumns()
+      .find((m) => m.column.id === ("not-a-real-id" as PObjectId));
+    expect(found).toBeUndefined();
   });
 
   test("getAnchors returns resolved anchor map", () => {
@@ -377,7 +372,7 @@ describe("AnchoredColumnCollection", () => {
     expect(anchors.get("main")!.spec.name).toBe("anchor-col");
   });
 
-  test("findColumns returns ColumnMatch with originalId and variants", () => {
+  test("findColumns returns ColumnMatch with column id and variants", () => {
     const spec = createSpec("col1", { axesSpec: [sampleAxis("sample")] });
     const snap = createSnapshot("id1", spec);
     const builder = new ColumnCollectionBuilder(createSpecFrameCtx());
@@ -391,10 +386,61 @@ describe("AnchoredColumnCollection", () => {
     expect(matches.length).toBeGreaterThanOrEqual(1);
     const col1Match = matches.find((m) => m.column.spec.name === "col1")!;
     expect(col1Match).toBeDefined();
-    expect(col1Match.originalId).toBe("id1");
+    expect(col1Match.column.id).toBe("id1");
     expect(col1Match.variants).toBeDefined();
   });
 
+  test("variants carry forQueries keyed by anchor PObjectId", () => {
+    const spec = createSpec("col1", { axesSpec: [sampleAxis("sample")] });
+    const snap = createSnapshot("id1", spec);
+    const builder = new ColumnCollectionBuilder(createSpecFrameCtx());
+    builder.addSource([snap, anchorSnap]);
+
+    const collection = builder.build({ anchors: { main: anchorSpec } })!;
+    const matches = collection.findColumns();
+    const col1Match = matches.find((m) => m.column.spec.name === "col1")!;
+
+    expect(col1Match.variants.length).toBeGreaterThan(0);
+    for (const v of col1Match.variants) {
+      expect(v.qualifications.forQueries).toBeDefined();
+      expect(v.qualifications.forHit).toBeDefined();
+      expect(v.distinctiveQualifications.forQueries).toBeDefined();
+      expect(v.distinctiveQualifications.forHit).toBeDefined();
+      // forQueries keys are a subset of anchor ids
+      for (const key of Object.keys(v.qualifications.forQueries)) {
+        expect([anchorSnap.id]).toContain(key);
+      }
+    }
+  });
+
+  test("anchors sharing same axes group produce forQueries entries pointing to same array", () => {
+    // Two anchors with identical axesSpec share an axes-group bucket in the reverse index.
+    const sharedAxes = [sampleAxis("sample"), sampleAxis("gene")];
+    const anchorA = createSpec("anchor-a", { axesSpec: sharedAxes });
+    const anchorB = createSpec("anchor-b", { axesSpec: sharedAxes });
+    const anchorASnap = createSnapshot("anchor-a-id", anchorA);
+    const anchorBSnap = createSnapshot("anchor-b-id", anchorB);
+
+    const colSpec = createSpec("c1", { axesSpec: [sampleAxis("sample")] });
+    const colSnap = createSnapshot("c1-id", colSpec);
+
+    const builder = new ColumnCollectionBuilder(createSpecFrameCtx());
+    builder.addSource([colSnap, anchorASnap, anchorBSnap]);
+
+    const collection = builder.build({ anchors: { a: anchorA, b: anchorB } })!;
+    const matches = collection.findColumns();
+    const c1 = matches.find((m) => m.column.spec.name === "c1")!;
+    expect(c1).toBeDefined();
+
+    for (const v of c1.variants) {
+      const forQueries = v.qualifications.forQueries;
+      if (anchorASnap.id in forQueries && anchorBSnap.id in forQueries) {
+        // Shared axes group → equal qualifications for both anchor keys.
+        expect(forQueries[anchorASnap.id]).toStrictEqual(forQueries[anchorBSnap.id]);
+      }
+    }
+  });
+
   test("findColumns exclude filters out matching columns", () => {
     const snap1 = createSnapshot("id1", createSpec("col1", { axesSpec: [sampleAxis("sample")] }));
     const snap2 = createSnapshot("id2", createSpec("col2", { axesSpec: [sampleAxis("sample")] }));
@@ -437,9 +483,8 @@ describe("AnchoredColumnCollection", () => {
 
     const collection = builder.build({ anchors: { main: anchorSpec } })!;
 
-    const idDeriver = new AnchoredIdDeriver({ main: anchorSpec });
-    const found = collection.getColumn(idDeriver.deriveS(spec))!;
-    expect(found.dataStatus).toBe("computing");
-    expect(found.data!.get()).toBeUndefined();
+    const found = collection.findColumns().find((m) => m.column.id === ("id1" as PObjectId))!;
+    expect(found.column.dataStatus).toBe("computing");
+    expect(found.column.data!.get()).toBeUndefined();
   });
 });