@milaboratories/pl-model-middle-layer 1.12.12 → 1.13.1

package/dist/block_registry/registry_spec.d.ts

@@ -5,11 +5,11 @@ declare const LocalDevFolder: z.ZodObject<{
   type: z.ZodLiteral<"local-dev">;
   path: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-  path: string;
   type: "local-dev";
-}, {
   path: string;
+}, {
   type: "local-dev";
+  path: string;
 }>;
 type LocalDevFolder = z.infer<typeof LocalDevFolder>;
 /** @deprecated don't use */
@@ -58,11 +58,11 @@ declare const RegistrySpec: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
   type: z.ZodLiteral<"local-dev">;
   path: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-  path: string;
   type: "local-dev";
-}, {
   path: string;
+}, {
   type: "local-dev";
+  path: string;
 }>]>;
 type RegistrySpec = z.infer<typeof RegistrySpec>;
 declare const RegistryEntry: z.ZodObject<{
@@ -90,36 +90,36 @@ declare const RegistryEntry: z.ZodObject<{
     type: z.ZodLiteral<"local-dev">;
     path: z.ZodString;
   }, "strip", z.ZodTypeAny, {
-    path: string;
     type: "local-dev";
-  }, {
     path: string;
+  }, {
     type: "local-dev";
+    path: string;
   }>]>;
 }, "strip", z.ZodTypeAny, {
   id: string;
   spec: {
+    type: "local-dev";
+    path: string;
+  } | {
     type: "remote-v1";
     url: string;
   } | {
     type: "remote-v2";
     url: string;
-  } | {
-    path: string;
-    type: "local-dev";
   };
   title?: string | undefined;
 }, {
   id: string;
   spec: {
+    type: "local-dev";
+    path: string;
+  } | {
     type: "remote-v1";
     url: string;
   } | {
     type: "remote-v2";
     url: string;
-  } | {
-    path: string;
-    type: "local-dev";
   };
   title?: string | undefined;
 }>;
@@ -149,36 +149,36 @@ declare const RegistryList: z.ZodArray<z.ZodObject<{
     type: z.ZodLiteral<"local-dev">;
     path: z.ZodString;
   }, "strip", z.ZodTypeAny, {
-    path: string;
     type: "local-dev";
-  }, {
     path: string;
+  }, {
     type: "local-dev";
+    path: string;
   }>]>;
 }, "strip", z.ZodTypeAny, {
   id: string;
   spec: {
+    type: "local-dev";
+    path: string;
+  } | {
     type: "remote-v1";
     url: string;
   } | {
     type: "remote-v2";
     url: string;
-  } | {
-    path: string;
-    type: "local-dev";
   };
   title?: string | undefined;
 }, {
   id: string;
   spec: {
+    type: "local-dev";
+    path: string;
+  } | {
     type: "remote-v1";
     url: string;
   } | {
     type: "remote-v2";
     url: string;
-  } | {
-    path: string;
-    type: "local-dev";
   };
   title?: string | undefined;
 }>, "many">;

package/dist/pframe/internal_api/api_wasm.d.ts

@@ -1,5 +1,6 @@
 import { FindColumnsRequest, FindColumnsResponse } from "./find_columns.js";
 import { DeleteColumnFromColumnsRequest, DeleteColumnFromColumnsResponse } from "./delete_column.js";
+import { DiscoverColumnsRequest, DiscoverColumnsResponse } from "./discover_columns.js";
 import { AxesId, AxesSpec, DataQuery, JoinEntry, PColumnSpec, PObjectId, PTableColumnId, PTableColumnSpec, PTableRecordFilter, PTableSorting, SingleAxisSelector, SpecQuery } from "@milaboratories/pl-model-common";
 
 //#region src/pframe/internal_api/api_wasm.d.ts
@@ -36,6 +37,12 @@ interface PFrameWasm extends Disposable {
    * Deletes columns from a columns specification.
    */
   deleteColumns(request: DeleteColumnFromColumnsRequest): DeleteColumnFromColumnsResponse;
+  /**
+   * Discovers columns compatible with a given axes integration.
+   * Returns columns that could be integrated with the provided column set,
+   * along with possible mapping variants describing how to integrate them.
+   */
+  discoverColumns(request: DiscoverColumnsRequest): DiscoverColumnsResponse;
   /**
    * Finds columns in the PFrame matching the given filter criteria.
    */

package/dist/pframe/internal_api/common.d.ts

@@ -6,7 +6,7 @@ type PFrameId = PFrameHandle;
 type PTableId = PTableHandle;
 interface AxisQualification {
   axis: SingleAxisSelector;
-  additionalDomains: Record<string, string>;
+  contextDomain: Record<string, string>;
 }
 interface ColumnAxesWithQualifications {
   axesSpec: AxisSpec[];

package/dist/pframe/internal_api/discover_columns.d.ts

@@ -0,0 +1,94 @@
+import { AxisQualification, ColumnAxesWithQualifications } from "./common.js";
+import { PColumnIdAndSpec } from "@milaboratories/pl-model-common";
+
+//#region src/pframe/internal_api/discover_columns.d.ts
+/** Matches a string value either exactly or by regex pattern */
+type StringMatcher = {
+  type: "exact";
+  value: string;
+} | {
+  type: "regex";
+  value: string;
+};
+/** Map of key to array of string matchers (OR-ed per key, AND-ed across keys) */
+type MatcherMap = Record<string, StringMatcher[]>;
+/** Selector for matching axes by various criteria */
+interface MultiAxisSelector {
+  /** Match any of the axis types listed here */
+  readonly type?: string[];
+  /** Match any of the axis names listed here */
+  readonly name?: StringMatcher[];
+  /** Match requires all the domains listed here */
+  readonly domain?: MatcherMap;
+  /** Match requires all the context domains listed here */
+  readonly contextDomain?: MatcherMap;
+  /** Match requires all the annotations listed here */
+  readonly annotations?: MatcherMap;
+}
+/** Column selector for discover columns request, matching columns by various criteria.
+ * Multiple selectors are OR-ed: a column matches if it satisfies any selector. */
+interface MultiColumnSelector {
+  /** Match any of the value types listed here */
+  readonly type?: string[];
+  /** Match any of the names listed here */
+  readonly name?: StringMatcher[];
+  /** Match requires all the domains listed here */
+  readonly domain?: MatcherMap;
+  /** Match requires all the context domains listed here */
+  readonly contextDomain?: MatcherMap;
+  /** Match requires all the annotations listed here */
+  readonly annotations?: MatcherMap;
+  /** Match any of the axis selectors listed here */
+  readonly axes?: MultiAxisSelector[];
+  /** When true (default), allows matching if only a subset of axes match */
+  readonly partialAxesMatch?: boolean;
+}
+/** Fine-grained constraints controlling axes matching and qualification behavior */
+interface DiscoverColumnsConstraints {
+  /** Allow source (query) axes that have no match in the hit column */
+  allowFloatingSourceAxes: boolean;
+  /** Allow hit column axes that have no match in the source (query) */
+  allowFloatingHitAxes: boolean;
+  /** Allow source (query) axes to be qualified (contextDomain extended) */
+  allowSourceQualifications: boolean;
+  /** Allow hit column axes to be qualified (contextDomain extended) */
+  allowHitQualifications: boolean;
+}
+/** Request for discovering columns compatible with a given axes integration */
+interface DiscoverColumnsRequest {
+  /** Column filters (OR-ed); empty array matches all columns */
+  columnFilter?: MultiColumnSelector[];
+  /** Already integrated axes with qualifications */
+  axes: ColumnAxesWithQualifications[];
+  /** Constraints controlling axes matching and qualification behavior */
+  constraints: DiscoverColumnsConstraints;
+}
+/** Qualifications info for a discover columns response mapping variant */
+interface DiscoverColumnsResponseQualifications {
+  /** Qualifications for each query (already-integrated) column set */
+  forQueries: AxisQualification[][];
+  /** Qualifications for the hit column */
+  forHit: AxisQualification[];
+}
+/** A single mapping variant describing how a hit column can be integrated */
+interface DiscoverColumnsMappingVariant {
+  /** Full qualifications needed for integration */
+  qualifications: DiscoverColumnsResponseQualifications;
+  /** Distinctive (minimal) qualifications needed for integration */
+  distinctiveQualifications: DiscoverColumnsResponseQualifications;
+}
+/** A single hit in the discover columns response */
+interface DiscoverColumnsResponseHit {
+  /** The column that was found compatible */
+  hit: PColumnIdAndSpec;
+  /** Possible ways to integrate this column with the existing set */
+  mappingVariants: DiscoverColumnsMappingVariant[];
+}
+/** Response from discover columns */
+interface DiscoverColumnsResponse {
+  /** Columns that could be integrated and possible ways to integrate them */
+  hits: DiscoverColumnsResponseHit[];
+}
+//#endregion
+export { DiscoverColumnsConstraints, DiscoverColumnsMappingVariant, DiscoverColumnsRequest, DiscoverColumnsResponse, DiscoverColumnsResponseHit, DiscoverColumnsResponseQualifications, MatcherMap, MultiAxisSelector, MultiColumnSelector, StringMatcher };
+//# sourceMappingURL=discover_columns.d.ts.map

package/dist/pframe/internal_api/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","names":[],"sources":["../../../src/pframe/internal_api/index.ts"],"sourcesContent":["export * from \"./api_read\";\nexport * from \"./api_factory\";\nexport * from \"./api_wasm\";\nexport * from \"./common\";\nexport * from \"./create_table\";\nexport * from \"./delete_column\";\nexport * from \"./find_columns\";\nexport * from \"./table\";\n\nexport * from \"./pframe\";\nexport * from \"./http_helpers\";\n\nexport type { SingleAxisSelector } from \"@milaboratories/pl-model-common\";\n"],"mappings":""}
+{"version":3,"file":"index.cjs","names":[],"sources":["../../../src/pframe/internal_api/index.ts"],"sourcesContent":["export * from \"./api_read\";\nexport * from \"./api_factory\";\nexport * from \"./api_wasm\";\nexport * from \"./common\";\nexport * from \"./create_table\";\nexport * from \"./delete_column\";\nexport * from \"./discover_columns\";\nexport * from \"./find_columns\";\nexport * from \"./table\";\n\nexport * from \"./pframe\";\nexport * from \"./http_helpers\";\n\nexport type { SingleAxisSelector } from \"@milaboratories/pl-model-common\";\n"],"mappings":""}

package/dist/pframe/internal_api/index.d.ts

@@ -6,13 +6,14 @@ import { PTableV8 } from "./table.js";
 import { PFrameReadAPIV11 } from "./api_read.js";
 import { BaseObjectStore, FileRange, FsStoreOptions, HttpAuthorizationToken, HttpHelpers, HttpMethod, HttpRange, HttpServer, HttpServerInfo, HttpServerOptions, ObjectStore, ObjectStoreOptions, ObjectStoreResponse, ObjectStoreUrl, ParquetExtension, ParquetFileName, PemCertificate, RequestHandlerOptions } from "./http_helpers.js";
 import { DataInfo, DataInfoExtension, FilePath, PFrameBlobId, PFrameDataSourceV2, PFrameFactoryAPIV4, SpecExtension } from "./api_factory.js";
+import { DiscoverColumnsConstraints, DiscoverColumnsMappingVariant, DiscoverColumnsRequest, DiscoverColumnsResponse, DiscoverColumnsResponseHit, DiscoverColumnsResponseQualifications, MatcherMap, MultiAxisSelector, MultiColumnSelector, StringMatcher } from "./discover_columns.js";
 import { EvaluateQueryResponse, LegacyQuery, PFrameWasm, PFrameWasmAPI } from "./api_wasm.js";
 import { PFrameFactoryV4, PFrameOptionsV2, PFrameV13 } from "./pframe.js";
 import { SingleAxisSelector as SingleAxisSelector$1 } from "@milaboratories/pl-model-common";
 
 //#region src/pframe/internal_api/index.d.ts
 declare namespace index_d_exports {
-  export { ArtificialColumnJoinEntry, AxisQualification, BaseObjectStore, ColumnAxesWithQualifications, ColumnJoinEntry, ConstantAxisFilter, CreateTableRequestV4, DataInfo, DataInfoExtension, DeleteColumnFromColumnsRequest, DeleteColumnFromColumnsResponse, EvaluateQueryResponse, FilePath, FileRange, FindColumnResponseQualifications, FindColumnsMappingVariant, FindColumnsRequest, FindColumnsResponse, FindColumnsResponseHit, FsStoreOptions, FullJoinV4, HttpAuthorizationToken, HttpHelpers, HttpMethod, HttpRange, HttpServer, HttpServerInfo, HttpServerOptions, InlineColumnJoinEntry, InnerJoinV4, JoinEntryV4, LegacyQuery, Logger, ObjectStore, ObjectStoreOptions, ObjectStoreResponse, ObjectStoreUrl, OuterJoinV4, PFrameBlobId, PFrameDataSourceV2, PFrameFactoryAPIV4, PFrameFactoryV4, PFrameId, PFrameOptionsV2, PFrameReadAPIV11, PFrameV13, PFrameWasm, PFrameWasmAPI, PTableId, PTableV8, ParquetExtension, ParquetFileName, PemCertificate, RequestHandlerOptions, SingleAxisSelector$1 as SingleAxisSelector, SlicedColumnJoinEntry, SpecExtension };
+  export { ArtificialColumnJoinEntry, AxisQualification, BaseObjectStore, ColumnAxesWithQualifications, ColumnJoinEntry, ConstantAxisFilter, CreateTableRequestV4, DataInfo, DataInfoExtension, DeleteColumnFromColumnsRequest, DeleteColumnFromColumnsResponse, DiscoverColumnsConstraints, DiscoverColumnsMappingVariant, DiscoverColumnsRequest, DiscoverColumnsResponse, DiscoverColumnsResponseHit, DiscoverColumnsResponseQualifications, EvaluateQueryResponse, FilePath, FileRange, FindColumnResponseQualifications, FindColumnsMappingVariant, FindColumnsRequest, FindColumnsResponse, FindColumnsResponseHit, FsStoreOptions, FullJoinV4, HttpAuthorizationToken, HttpHelpers, HttpMethod, HttpRange, HttpServer, HttpServerInfo, HttpServerOptions, InlineColumnJoinEntry, InnerJoinV4, JoinEntryV4, LegacyQuery, Logger, MatcherMap, MultiAxisSelector, MultiColumnSelector, ObjectStore, ObjectStoreOptions, ObjectStoreResponse, ObjectStoreUrl, OuterJoinV4, PFrameBlobId, PFrameDataSourceV2, PFrameFactoryAPIV4, PFrameFactoryV4, PFrameId, PFrameOptionsV2, PFrameReadAPIV11, PFrameV13, PFrameWasm, PFrameWasmAPI, PTableId, PTableV8, ParquetExtension, ParquetFileName, PemCertificate, RequestHandlerOptions, SingleAxisSelector$1 as SingleAxisSelector, SlicedColumnJoinEntry, SpecExtension, StringMatcher };
 }
 //#endregion
 export { index_d_exports };

package/dist/pframe/internal_api/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../../src/pframe/internal_api/index.ts"],"sourcesContent":["export * from \"./api_read\";\nexport * from \"./api_factory\";\nexport * from \"./api_wasm\";\nexport * from \"./common\";\nexport * from \"./create_table\";\nexport * from \"./delete_column\";\nexport * from \"./find_columns\";\nexport * from \"./table\";\n\nexport * from \"./pframe\";\nexport * from \"./http_helpers\";\n\nexport type { SingleAxisSelector } from \"@milaboratories/pl-model-common\";\n"],"mappings":""}
+{"version":3,"file":"index.js","names":[],"sources":["../../../src/pframe/internal_api/index.ts"],"sourcesContent":["export * from \"./api_read\";\nexport * from \"./api_factory\";\nexport * from \"./api_wasm\";\nexport * from \"./common\";\nexport * from \"./create_table\";\nexport * from \"./delete_column\";\nexport * from \"./discover_columns\";\nexport * from \"./find_columns\";\nexport * from \"./table\";\n\nexport * from \"./pframe\";\nexport * from \"./http_helpers\";\n\nexport type { SingleAxisSelector } from \"@milaboratories/pl-model-common\";\n"],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-model-middle-layer",
-  "version": "1.12.12",
+  "version": "1.13.1",
   "description": "Common model between middle layer and non-block UI code",
   "files": [
     "./dist/**/*",
@@ -20,15 +20,15 @@
     "es-toolkit": "^1.39.10",
     "utility-types": "^3.11.0",
     "zod": "~3.23.8",
-    "@milaboratories/pl-model-common": "1.25.3",
-    "@platforma-sdk/model": "1.58.22"
+    "@milaboratories/pl-model-common": "1.26.1",
+    "@platforma-sdk/model": "1.59.3"
   },
   "devDependencies": {
     "@types/node": "~24.5.2",
     "typescript": "~5.9.3",
-    "@milaboratories/ts-configs": "1.2.2",
+    "@milaboratories/build-configs": "1.5.2",
     "@milaboratories/ts-builder": "1.3.0",
-    "@milaboratories/build-configs": "1.5.2"
+    "@milaboratories/ts-configs": "1.2.2"
   },
   "scripts": {
     "build": "ts-builder build --target node",

package/src/pframe/internal_api/api_wasm.ts

@@ -16,6 +16,7 @@ import type {
   DeleteColumnFromColumnsRequest,
   DeleteColumnFromColumnsResponse,
 } from "./delete_column";
+import type { DiscoverColumnsRequest, DiscoverColumnsResponse } from "./discover_columns";
 import type { FindColumnsRequest, FindColumnsResponse } from "./find_columns";
 
 export interface PFrameWasmAPI {
@@ -57,6 +58,13 @@ export interface PFrameWasm extends Disposable {
    */
   deleteColumns(request: DeleteColumnFromColumnsRequest): DeleteColumnFromColumnsResponse;
 
+  /**
+   * Discovers columns compatible with a given axes integration.
+   * Returns columns that could be integrated with the provided column set,
+   * along with possible mapping variants describing how to integrate them.
+   */
+  discoverColumns(request: DiscoverColumnsRequest): DiscoverColumnsResponse;
+
   /**
    * Finds columns in the PFrame matching the given filter criteria.
    */

package/src/pframe/internal_api/common.ts

@@ -13,7 +13,7 @@ export type PTableId = PTableHandle;
 
 export interface AxisQualification {
   axis: SingleAxisSelector;
-  additionalDomains: Record<string, string>;
+  contextDomain: Record<string, string>;
 }
 
 export interface ColumnAxesWithQualifications {

package/src/pframe/internal_api/discover_columns.ts

@@ -0,0 +1,93 @@
+import type { PColumnIdAndSpec } from "@milaboratories/pl-model-common";
+import type { AxisQualification, ColumnAxesWithQualifications } from "./common";
+
+/** Matches a string value either exactly or by regex pattern */
+export type StringMatcher = { type: "exact"; value: string } | { type: "regex"; value: string };
+
+/** Map of key to array of string matchers (OR-ed per key, AND-ed across keys) */
+export type MatcherMap = Record<string, StringMatcher[]>;
+
+/** Selector for matching axes by various criteria */
+export interface MultiAxisSelector {
+  /** Match any of the axis types listed here */
+  readonly type?: string[];
+  /** Match any of the axis names listed here */
+  readonly name?: StringMatcher[];
+  /** Match requires all the domains listed here */
+  readonly domain?: MatcherMap;
+  /** Match requires all the context domains listed here */
+  readonly contextDomain?: MatcherMap;
+  /** Match requires all the annotations listed here */
+  readonly annotations?: MatcherMap;
+}
+
+/** Column selector for discover columns request, matching columns by various criteria.
+ * Multiple selectors are OR-ed: a column matches if it satisfies any selector. */
+export interface MultiColumnSelector {
+  /** Match any of the value types listed here */
+  readonly type?: string[];
+  /** Match any of the names listed here */
+  readonly name?: StringMatcher[];
+  /** Match requires all the domains listed here */
+  readonly domain?: MatcherMap;
+  /** Match requires all the context domains listed here */
+  readonly contextDomain?: MatcherMap;
+  /** Match requires all the annotations listed here */
+  readonly annotations?: MatcherMap;
+  /** Match any of the axis selectors listed here */
+  readonly axes?: MultiAxisSelector[];
+  /** When true (default), allows matching if only a subset of axes match */
+  readonly partialAxesMatch?: boolean;
+}
+
+/** Fine-grained constraints controlling axes matching and qualification behavior */
+export interface DiscoverColumnsConstraints {
+  /** Allow source (query) axes that have no match in the hit column */
+  allowFloatingSourceAxes: boolean;
+  /** Allow hit column axes that have no match in the source (query) */
+  allowFloatingHitAxes: boolean;
+  /** Allow source (query) axes to be qualified (contextDomain extended) */
+  allowSourceQualifications: boolean;
+  /** Allow hit column axes to be qualified (contextDomain extended) */
+  allowHitQualifications: boolean;
+}
+
+/** Request for discovering columns compatible with a given axes integration */
+export interface DiscoverColumnsRequest {
+  /** Column filters (OR-ed); empty array matches all columns */
+  columnFilter?: MultiColumnSelector[];
+  /** Already integrated axes with qualifications */
+  axes: ColumnAxesWithQualifications[];
+  /** Constraints controlling axes matching and qualification behavior */
+  constraints: DiscoverColumnsConstraints;
+}
+
+/** Qualifications info for a discover columns response mapping variant */
+export interface DiscoverColumnsResponseQualifications {
+  /** Qualifications for each query (already-integrated) column set */
+  forQueries: AxisQualification[][];
+  /** Qualifications for the hit column */
+  forHit: AxisQualification[];
+}
+
+/** A single mapping variant describing how a hit column can be integrated */
+export interface DiscoverColumnsMappingVariant {
+  /** Full qualifications needed for integration */
+  qualifications: DiscoverColumnsResponseQualifications;
+  /** Distinctive (minimal) qualifications needed for integration */
+  distinctiveQualifications: DiscoverColumnsResponseQualifications;
+}
+
+/** A single hit in the discover columns response */
+export interface DiscoverColumnsResponseHit {
+  /** The column that was found compatible */
+  hit: PColumnIdAndSpec;
+  /** Possible ways to integrate this column with the existing set */
+  mappingVariants: DiscoverColumnsMappingVariant[];
+}
+
+/** Response from discover columns */
+export interface DiscoverColumnsResponse {
+  /** Columns that could be integrated and possible ways to integrate them */
+  hits: DiscoverColumnsResponseHit[];
+}

package/src/pframe/internal_api/index.ts

@@ -4,6 +4,7 @@ export * from "./api_wasm";
 export * from "./common";
 export * from "./create_table";
 export * from "./delete_column";
+export * from "./discover_columns";
 export * from "./find_columns";
 export * from "./table";