@milaboratories/pl-model-common 1.36.0 → 1.36.1

package/dist/drivers/pframe/query/query_common.d.ts

@@ -484,28 +484,6 @@ type InferBooleanExpressionUnion<E> = [E extends ExprNumericComparison<unknown>
 }> : never, E extends ExprIsIn<unknown, string | number> ? Extract<E, {
   type: "isIn";
 }> : never][number];
-/**
- * Selector for referencing an axis in queries.
- *
- * Used to identify a specific axis dimension in operations like:
- * - Sorting by axis values
- * - Partitioning for window functions
- * - Filtering/slicing axes
- *
- * @template A - Axis identifier type (typically string name or numeric index)
- *
- * @example
- * // Select axis by name
- * { type: 'axis', id: 'sample' }
- *
- * // Select axis by index
- * { type: 'axis', id: 0 }
- */
-interface QueryAxisSelector<A> {
-  type: "axis";
-  /** Axis identifier (name or index depending on context) */
-  id: A;
-}
 /**
  * Left outer join query operation.
  *
@@ -554,23 +532,31 @@ interface QueryOuterJoin<JE extends QueryJoinEntry<unknown>> {
  * @template A - Axis selector type
  *
  * @example
- * // Slice 3D data [sample, gene, condition] to 1D [gene]
+ * // Spec layer: axisSelector is a SingleAxisSelector.
  * {
  *   type: 'sliceAxes',
  *   input: fullDataQuery,
  *   axisFilters: [
- *     { type: 'constant', axisSelector: { type: 'axis', id: 'sample' }, constant: 'Sample1' },
- *     { type: 'constant', axisSelector: { type: 'axis', id: 'condition' }, constant: 'Treatment' }
+ *     { axisSelector: { name: 'sample' }, constant: 'Sample1' },
+ *     { axisSelector: { name: 'condition' }, constant: 'Treatment' }
  *   ]
  * }
+ *
+ * @example
+ * // Data layer: axisSelector is the axis index.
+ * {
+ *   type: 'sliceAxes',
+ *   input: fullDataQuery,
+ *   axisFilters: [{ axisSelector: 0, constant: 'Sample1' }]
+ * }
  */
-interface QuerySliceAxes<Q, A extends QueryAxisSelector<unknown>> {
+interface QuerySliceAxes<Q, A> {
   type: "sliceAxes";
   /** Input query to slice */
   input: Q;
   /** List of axis filters to apply (at least one required) */
   axisFilters: {
-    /** Selector identifying which axis to filter */axisSelector: A; /** The constant value to filter the axis to */
+    /** Axis to filter. `SingleAxisSelector` at the spec layer; axis index at the data layer. */axisSelector: A; /** The constant value to filter the axis to */
     constant: string | number;
   }[];
 }
@@ -832,5 +818,5 @@ interface QueryLinkerJoin<L, JE extends QueryJoinEntry<unknown>> {
   secondary: JE[];
 }
 //#endregion
-export { ExprAxisRef, ExprColumnRef, ExprConstant, ExprIfNull, ExprIsIn, ExprIsNull, ExprLogicalUnary, ExprLogicalVariadic, ExprNumericBinary, ExprNumericComparison, ExprNumericUnary, ExprStringContains, ExprStringContainsFuzzy, ExprStringEquals, ExprStringRegex, InferBooleanExpressionUnion, QueryAxisSelector, QueryColumn, QueryFilter, QueryInlineColumn, QueryJoinEntry, QueryLinkerJoin, QueryOuterJoin, QuerySliceAxes, QuerySort, QuerySparseToDenseColumn, QuerySymmetricJoin, TypeSpec };
+export { ExprAxisRef, ExprColumnRef, ExprConstant, ExprIfNull, ExprIsIn, ExprIsNull, ExprLogicalUnary, ExprLogicalVariadic, ExprNumericBinary, ExprNumericComparison, ExprNumericUnary, ExprStringContains, ExprStringContainsFuzzy, ExprStringEquals, ExprStringRegex, InferBooleanExpressionUnion, QueryColumn, QueryFilter, QueryInlineColumn, QueryJoinEntry, QueryLinkerJoin, QueryOuterJoin, QuerySliceAxes, QuerySort, QuerySparseToDenseColumn, QuerySymmetricJoin, TypeSpec };
 //# sourceMappingURL=query_common.d.ts.map

package/dist/drivers/pframe/query/query_common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query_common.d.ts","names":[],"sources":["../../../../src/drivers/pframe/query/query_common.ts"],"mappings":"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"}
+{"version":3,"file":"query_common.d.ts","names":[],"sources":["../../../../src/drivers/pframe/query/query_common.ts"],"mappings":"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"}

package/dist/drivers/pframe/query/query_data.d.ts

@@ -1,4 +1,4 @@
-import { ExprAxisRef, ExprColumnRef, ExprConstant, ExprIfNull, ExprIsIn, ExprIsNull, ExprLogicalUnary, ExprLogicalVariadic, ExprNumericBinary, ExprNumericComparison, ExprNumericUnary, ExprStringContains, ExprStringContainsFuzzy, ExprStringEquals, ExprStringRegex, InferBooleanExpressionUnion, QueryAxisSelector, QueryColumn, QueryFilter, QueryInlineColumn, QueryJoinEntry, QueryLinkerJoin, QueryOuterJoin, QuerySliceAxes, QuerySort, QuerySparseToDenseColumn, QuerySymmetricJoin, TypeSpec } from "./query_common.js";
+import { ExprAxisRef, ExprColumnRef, ExprConstant, ExprIfNull, ExprIsIn, ExprIsNull, ExprLogicalUnary, ExprLogicalVariadic, ExprNumericBinary, ExprNumericComparison, ExprNumericUnary, ExprStringContains, ExprStringContainsFuzzy, ExprStringEquals, ExprStringRegex, InferBooleanExpressionUnion, QueryColumn, QueryFilter, QueryInlineColumn, QueryJoinEntry, QueryLinkerJoin, QueryOuterJoin, QuerySliceAxes, QuerySort, QuerySparseToDenseColumn, QuerySymmetricJoin, TypeSpec } from "./query_common.js";
 import { PObjectId } from "../../../pool/spec.js";
 //#region src/drivers/pframe/query/query_data.d.ts
 /**
@@ -9,7 +9,7 @@ import { PObjectId } from "../../../pool/spec.js";
  */
 type ColumnIdAndTypeSpec = {
   /** Unique identifier of the column */id: PObjectId; /** Type specification defining axes and column types */
-  typeSpec: TypeSpec;
+  spec: TypeSpec;
 };
 /**
  * Join entry for data layer queries.
@@ -53,7 +53,7 @@ type DataQueryLinkerJoinLinker = {
 /** @see QueryLinkerJoin */
 type DataQueryLinkerJoin = QueryLinkerJoin<DataQueryLinkerJoinLinker, DataQueryJoinEntry>;
 /** @see QuerySliceAxes */
-type DataQuerySliceAxes = QuerySliceAxes<DataQuery, QueryAxisSelector<number>>;
+type DataQuerySliceAxes = QuerySliceAxes<DataQuery, number>;
 /** @see QuerySort */
 type DataQuerySort = QuerySort<DataQuery, DataQueryExpression>;
 /** @see QueryFilter */

package/dist/drivers/pframe/query/query_data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query_data.d.ts","names":[],"sources":["../../../../src/drivers/pframe/query/query_data.ts"],"mappings":";;;;;;AA8BwB;;;KAQnB,mBAAA;EAEH,sCAAA,EAAA,EAAI,SAAA,EAEJ;EAAA,QAAA,EAAU,QAAA;AAAA;;AAeZ;;;;;;;;;AAMA;;UANiB,kBAAA,SAA2B,cAAA,CAAe,SAAA;EAM7B;EAJ5B,WAAA;AAAA;;KAIU,eAAA,GAAkB,WAAA;;KAElB,qBAAA,GAAwB,iBAAA,CAAkB,mBAAA;AAEtD;AAAA,KAAY,4BAAA,GAA+B,wBAAA,CAAyB,SAAA,EAAW,mBAAA;;KAEnE,sBAAA,GAAyB,kBAAA,CAAmB,kBAAA;;KAE5C,kBAAA,GAAqB,cAAA,CAAe,kBAAA;;;;;;;;AAFhD;KAWY,yBAAA;iCAEV,MAAA,EAAQ,SAAA,EAbgE;EAexE,WAAA,YAb4B;EAe5B,kBAAA;AAAA;;KAGU,mBAAA,GAAsB,eAAA,CAAgB,yBAAA,EAA2B,kBAAA;;KAEjE,kBAAA,GAAqB,cAAA,CAAe,SAAA,EAAW,iBAAA;;KAE/C,aAAA,GAAgB,SAAA,CAAU,SAAA,EAAW,mBAAA;;KAErC,eAAA,GAAkB,WAAA,CAAY,SAAA,EAAW,0BAAA;;;;AANrD;;;;;;;;KAmBY,SAAA,GACR,eAAA,GACA,qBAAA,GACA,4BAAA,GACA,sBAAA,GACA,kBAAA,GACA,mBAAA,GACA,kBAAA,GACA,aAAA,GACA,eAAA;;KAGQ,eAAA,GAAkB,WAAA;;KAElB,iBAAA,GAAoB,aAAA;AAAA,KAEpB,mBAAA,GACR,iBAAA,GACA,eAAA,GACA,YAAA,GACA,iBAAA,CAAkB,mBAAA,IAClB,qBAAA,CAAsB,mBAAA,IACtB,gBAAA,CAAiB,mBAAA,IACjB,gBAAA,CAAiB,mBAAA,IACjB,kBAAA,CAAmB,mBAAA,IACnB,eAAA,CAAgB,mBAAA,IAChB,uBAAA,CAAwB,mBAAA,IACxB,UAAA,CAAW,mBAAA,IACX,UAAA,CAAW,mBAAA,IACX,gBAAA,CAAiB,mBAAA,IACjB,mBAAA,CAAoB,mBAAA,IACpB,QAAA,CAAS,mBAAA,YACT,QAAA,CAAS,mBAAA;AAAA,KAED,0BAAA,GAA6B,2BAAA,CAA4B,mBAAA"}
+{"version":3,"file":"query_data.d.ts","names":[],"sources":["../../../../src/drivers/pframe/query/query_data.ts"],"mappings":";;;;;;AA6BwB;;;KAQnB,mBAAA;EAEH,sCAAA,EAAA,EAAI,SAAA,EAEJ;EAAA,IAAA,EAAM,QAAA;AAAA;;AAeR;;;;;;;;;AAMA;;UANiB,kBAAA,SAA2B,cAAA,CAAe,SAAA;EAM7B;EAJ5B,WAAA;AAAA;;KAIU,eAAA,GAAkB,WAAA;;KAElB,qBAAA,GAAwB,iBAAA,CAAkB,mBAAA;AAEtD;AAAA,KAAY,4BAAA,GAA+B,wBAAA,CAAyB,SAAA,EAAW,mBAAA;;KAEnE,sBAAA,GAAyB,kBAAA,CAAmB,kBAAA;;KAE5C,kBAAA,GAAqB,cAAA,CAAe,kBAAA;;;;;;;;AAFhD;KAWY,yBAAA;iCAEV,MAAA,EAAQ,SAAA,EAbgE;EAexE,WAAA,YAb4B;EAe5B,kBAAA;AAAA;;KAGU,mBAAA,GAAsB,eAAA,CAAgB,yBAAA,EAA2B,kBAAA;;KAEjE,kBAAA,GAAqB,cAAA,CAAe,SAAA;;KAEpC,aAAA,GAAgB,SAAA,CAAU,SAAA,EAAW,mBAAA;;KAErC,eAAA,GAAkB,WAAA,CAAY,SAAA,EAAW,0BAAA;;;;AANrD;;;;;;;;KAmBY,SAAA,GACR,eAAA,GACA,qBAAA,GACA,4BAAA,GACA,sBAAA,GACA,kBAAA,GACA,mBAAA,GACA,kBAAA,GACA,aAAA,GACA,eAAA;;KAGQ,eAAA,GAAkB,WAAA;;KAElB,iBAAA,GAAoB,aAAA;AAAA,KAEpB,mBAAA,GACR,iBAAA,GACA,eAAA,GACA,YAAA,GACA,iBAAA,CAAkB,mBAAA,IAClB,qBAAA,CAAsB,mBAAA,IACtB,gBAAA,CAAiB,mBAAA,IACjB,gBAAA,CAAiB,mBAAA,IACjB,kBAAA,CAAmB,mBAAA,IACnB,eAAA,CAAgB,mBAAA,IAChB,uBAAA,CAAwB,mBAAA,IACxB,UAAA,CAAW,mBAAA,IACX,UAAA,CAAW,mBAAA,IACX,gBAAA,CAAiB,mBAAA,IACjB,mBAAA,CAAoB,mBAAA,IACpB,QAAA,CAAS,mBAAA,YACT,QAAA,CAAS,mBAAA;AAAA,KAED,0BAAA,GAA6B,2BAAA,CAA4B,mBAAA"}

package/dist/drivers/pframe/query/query_spec.d.ts

@@ -1,44 +1,28 @@
-import { Domain, PColumnIdAndSpec, PColumnSpec } from "../spec/spec.js";
+import { Domain, PColumnIdAndSpec } from "../spec/spec.js";
 import { SingleAxisSelector } from "../spec/selectors.js";
-import { ExprAxisRef, ExprColumnRef, ExprConstant, ExprIfNull, ExprIsIn, ExprIsNull, ExprLogicalUnary, ExprLogicalVariadic, ExprNumericBinary, ExprNumericComparison, ExprNumericUnary, ExprStringContains, ExprStringContainsFuzzy, ExprStringEquals, ExprStringRegex, InferBooleanExpressionUnion, QueryAxisSelector, QueryColumn, QueryFilter, QueryInlineColumn, QueryJoinEntry, QueryLinkerJoin, QueryOuterJoin, QuerySliceAxes, QuerySort, QuerySparseToDenseColumn, QuerySymmetricJoin } from "./query_common.js";
+import { ExprAxisRef, ExprColumnRef, ExprConstant, ExprIfNull, ExprIsIn, ExprIsNull, ExprLogicalUnary, ExprLogicalVariadic, ExprNumericBinary, ExprNumericComparison, ExprNumericUnary, ExprStringContains, ExprStringContainsFuzzy, ExprStringEquals, ExprStringRegex, InferBooleanExpressionUnion, QueryColumn, QueryFilter, QueryInlineColumn, QueryJoinEntry, QueryLinkerJoin, QueryOuterJoin, QuerySliceAxes, QuerySort, QuerySparseToDenseColumn, QuerySymmetricJoin } from "./query_common.js";
 import { PObjectId } from "../../../pool/spec.js";
 //#region src/drivers/pframe/query/query_spec.d.ts
 /**
- * Column identifier with specification.
- *
- * Pairs a column ID with its full PColumnSpec.
- * Used in spec layer to carry column specification alongside references.
- */
-type ColumnIdAndSpec = {
-  /** Unique identifier of the column */id: PObjectId; /** Full column specification including axes and value type */
-  spec: PColumnSpec;
-};
-/**
- * Join entry for spec layer queries.
- *
- * Extends the base join entry with axis qualifications.
- * Qualifications specify additional domain constraints for each axis,
- * enabling more precise control over how columns are joined.
+ * Join entry for spec-layer queries — the base join entry extended with
+ * per-axis domain constraints. Absent `qualifications` is equivalent to `[]`.
  *
  * @example
- * // Join entry with axis qualifications
  * {
  *   entry: querySpec,
- *   qualifications: [
- *     { axis: { name: 'sample' }, contextDomain: { ... } }
- *   ]
+ *   qualifications: [{ axis: { name: 'sample' }, contextDomain: { ... } }]
  * }
  */
 type SpecQueryJoinEntry<C = PObjectId> = QueryJoinEntry<SpecQuery<C>> & {
-  /** Axis qualifications with additional domain constraints */qualifications: {
-    /** Axis selector identifying which axis to qualify */axis: SingleAxisSelector; /** Additional domain constraints for this axis */
+  qualifications?: {
+    /** Axis to qualify. */axis: SingleAxisSelector; /** Additional domain constraints for this axis. */
     contextDomain: Domain;
   }[];
 };
 /** @see QueryColumn */
 type SpecQueryColumn<C = PObjectId> = QueryColumn<C>;
 /** @see QueryInlineColumn */
-type SpecQueryInlineColumn = QueryInlineColumn<ColumnIdAndSpec>;
+type SpecQueryInlineColumn = QueryInlineColumn<PColumnIdAndSpec>;
 /** @see QuerySparseToDenseColumn */
 type SpecQuerySparseToDenseColumn<C = PObjectId> = QuerySparseToDenseColumn<C, PColumnIdAndSpec>;
 /** @see QuerySymmetricJoin */
@@ -57,7 +41,7 @@ type SpecQueryLinkerJoinLinker<C = PObjectId> = {
 /** @see QueryLinkerJoin */
 type SpecQueryLinkerJoin<C = PObjectId> = QueryLinkerJoin<SpecQueryLinkerJoinLinker<C>, SpecQueryJoinEntry<C>>;
 /** @see QuerySliceAxes */
-type SpecQuerySliceAxes<C = PObjectId> = QuerySliceAxes<SpecQuery<C>, QueryAxisSelector<SingleAxisSelector>>;
+type SpecQuerySliceAxes<C = PObjectId> = QuerySliceAxes<SpecQuery<C>, SingleAxisSelector>;
 /** @see QuerySort */
 type SpecQuerySort<C = PObjectId> = QuerySort<SpecQuery<C>, SpecQueryExpression>;
 /** @see QueryFilter */

package/dist/drivers/pframe/query/query_spec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query_spec.d.ts","names":[],"sources":["../../../../src/drivers/pframe/query/query_spec.ts"],"mappings":";;;;;;;;;;AA8ByF;KAQpF,eAAA;wCAEH,EAAA,EAAI,SAAA,EAAJ;EAEA,IAAA,EAAM,WAAA;AAAA;;;;AAmBR;;;;;;;;;;;;;KAAY,kBAAA,KAAuB,SAAA,IAAa,cAAA,CAAe,SAAA,CAAU,CAAA;EAAV,6DAE7D,cAAA;IAAA,sDAEE,IAAA,EAAM,kBAAA,EAAA;IAEN,aAAA,EAAe,MAAA;EAAA;AAAA;;KAKP,eAAA,KAAoB,SAAA,IAAa,WAAA,CAAY,CAAA;;KAE7C,qBAAA,GAAwB,iBAAA,CAAkB,eAAA;;KAE1C,4BAAA,KAAiC,SAAA,IAAa,wBAAA,CACxD,CAAA,EACA,gBAAA;;KAGU,sBAAA,KAA2B,SAAA,IAAa,kBAAA,CAAmB,kBAAA,CAAmB,CAAA;;KAE9E,kBAAA,KAAuB,SAAA,IAAa,cAAA,CAAe,kBAAA,CAAmB,CAAA;;;;;;AATlF;KAgBY,yBAAA,KAA8B,SAAA;iCAExC,MAAA,EAAQ,CAAA;AAAA;AAhBV;AAAA,KAmBY,mBAAA,KAAwB,SAAA,IAAa,eAAA,CAC/C,yBAAA,CAA0B,CAAA,GAC1B,kBAAA,CAAmB,CAAA;;KAGT,kBAAA,KAAuB,SAAA,IAAa,cAAA,CAC9C,SAAA,CAAU,CAAA,GACV,iBAAA,CAAkB,kBAAA;;KAGR,aAAA,KAAkB,SAAA,IAAa,SAAA,CAAU,SAAA,CAAU,CAAA,GAAI,mBAAA;;KAEvD,eAAA,KAAoB,SAAA,IAAa,WAAA,CAAY,SAAA,CAAU,CAAA,GAAI,0BAAA;;;;;;;;;AA1BvE;;;;;;;KA2CY,SAAA,KAAc,SAAA,IACtB,eAAA,CAAgB,CAAA,IAChB,qBAAA,GACA,4BAAA,CAA6B,CAAA,IAC7B,sBAAA,CAAuB,CAAA,IACvB,kBAAA,CAAmB,CAAA,IACnB,mBAAA,CAAoB,CAAA,IACpB,kBAAA,CAAmB,CAAA,IACnB,aAAA,CAAc,CAAA,IACd,eAAA,CAAgB,CAAA;;KAGR,eAAA,GAAkB,WAAA,CAAY,kBAAA;;KAE9B,iBAAA,GAAoB,aAAA,CAAc,SAAA;AAAA,KAElC,mBAAA,GACR,iBAAA,GACA,eAAA,GACA,YAAA,GACA,iBAAA,CAAkB,mBAAA,IAClB,qBAAA,CAAsB,mBAAA,IACtB,gBAAA,CAAiB,mBAAA,IACjB,gBAAA,CAAiB,mBAAA,IACjB,kBAAA,CAAmB,mBAAA,IACnB,eAAA,CAAgB,mBAAA,IAChB,uBAAA,CAAwB,mBAAA,IACxB,UAAA,CAAW,mBAAA,IACX,UAAA,CAAW,mBAAA,IACX,gBAAA,CAAiB,mBAAA,IACjB,mBAAA,CAAoB,mBAAA,IACpB,QAAA,CAAS,mBAAA,YACT,QAAA,CAAS,mBAAA;AAAA,KAED,0BAAA,GAA6B,2BAAA,CAA4B,mBAAA"}
+{"version":3,"file":"query_spec.d.ts","names":[],"sources":["../../../../src/drivers/pframe/query/query_spec.ts"],"mappings":";;;;;;;;;;AAyCA;;;;;KAAY,kBAAA,KAAuB,SAAA,IAAa,cAAA,CAAe,SAAA,CAAU,CAAA;EACvE,cAAA;IAEQ,uBAAN,IAAA,EAAM,kBAAA,EAEe;IAArB,aAAA,EAAe,MAAA;EAAA;AAAA;;KAKP,eAAA,KAAoB,SAAA,IAAa,WAAA,CAAY,CAAA;;KAE7C,qBAAA,GAAwB,iBAAA,CAAkB,gBAAA;;KAE1C,4BAAA,KAAiC,SAAA,IAAa,wBAAA,CACxD,CAAA,EACA,gBAAA;;KAGU,sBAAA,KAA2B,SAAA,IAAa,kBAAA,CAAmB,kBAAA,CAAmB,CAAA;;KAE9E,kBAAA,KAAuB,SAAA,IAAa,cAAA,CAAe,kBAAA,CAAmB,CAAA;AAXlF;;;;;;AAAA,KAkBY,yBAAA,KAA8B,SAAA;EAlBc,+BAoBtD,MAAA,EAAQ,CAAA;AAAA;;KAGE,mBAAA,KAAwB,SAAA,IAAa,eAAA,CAC/C,yBAAA,CAA0B,CAAA,GAC1B,kBAAA,CAAmB,CAAA;;KAGT,kBAAA,KAAuB,SAAA,IAAa,cAAA,CAAe,SAAA,CAAU,CAAA,GAAI,kBAAA;AA1B7E;AAAA,KA4BY,aAAA,KAAkB,SAAA,IAAa,SAAA,CAAU,SAAA,CAAU,CAAA,GAAI,mBAAA;;KAEvD,eAAA,KAAoB,SAAA,IAAa,WAAA,CAAY,SAAA,CAAU,CAAA,GAAI,0BAAA;;AA5BvE;;;;;;;;;;;;;;KA6CY,SAAA,KAAc,SAAA,IACtB,eAAA,CAAgB,CAAA,IAChB,qBAAA,GACA,4BAAA,CAA6B,CAAA,IAC7B,sBAAA,CAAuB,CAAA,IACvB,kBAAA,CAAmB,CAAA,IACnB,mBAAA,CAAoB,CAAA,IACpB,kBAAA,CAAmB,CAAA,IACnB,aAAA,CAAc,CAAA,IACd,eAAA,CAAgB,CAAA;;KAGR,eAAA,GAAkB,WAAA,CAAY,kBAAA;;KAE9B,iBAAA,GAAoB,aAAA,CAAc,SAAA;AAAA,KAElC,mBAAA,GACR,iBAAA,GACA,eAAA,GACA,YAAA,GACA,iBAAA,CAAkB,mBAAA,IAClB,qBAAA,CAAsB,mBAAA,IACtB,gBAAA,CAAiB,mBAAA,IACjB,gBAAA,CAAiB,mBAAA,IACjB,kBAAA,CAAmB,mBAAA,IACnB,eAAA,CAAgB,mBAAA,IAChB,uBAAA,CAAwB,mBAAA,IACxB,UAAA,CAAW,mBAAA,IACX,UAAA,CAAW,mBAAA,IACX,gBAAA,CAAiB,mBAAA,IACjB,mBAAA,CAAoB,mBAAA,IACpB,QAAA,CAAS,mBAAA,YACT,QAAA,CAAS,mBAAA;AAAA,KAED,0BAAA,GAA6B,2BAAA,CAA4B,mBAAA"}

package/dist/drivers/pframe/query/utils.cjs

@@ -142,21 +142,24 @@ function sortSpecQuery(query) {
 				default: return node;
 			}
 		},
-		joinEntry: (entry) => ({
-			...entry,
-			qualifications: entry.qualifications.toSorted((a, b) => {
-				const ak = require_json.canonicalizeJson(a.axis);
-				const bk = require_json.canonicalizeJson(b.axis);
-				return ak < bk ? -1 : ak === bk ? 0 : 1;
-			})
-		})
+		joinEntry: (entry) => {
+			if (entry.qualifications === void 0 || entry.qualifications.length === 0) return entry;
+			return {
+				...entry,
+				qualifications: entry.qualifications.toSorted((a, b) => {
+					const ak = require_json.canonicalizeJson(a.axis);
+					const bk = require_json.canonicalizeJson(b.axis);
+					return ak < bk ? -1 : ak === bk ? 0 : 1;
+				})
+			};
+		}
 	});
 }
 function cmpQuerySpec(lhs, rhs) {
 	if (lhs.type !== rhs.type) return lhs.type < rhs.type ? -1 : 1;
 	switch (lhs.type) {
 		case "column": return lhs.column < rhs.column ? -1 : lhs.column === rhs.column ? 0 : 1;
-		case "inlineColumn": return lhs.spec.id < rhs.spec.id ? -1 : lhs.spec.id === rhs.spec.id ? 0 : 1;
+		case "inlineColumn": return lhs.spec.columnId < rhs.spec.columnId ? -1 : lhs.spec.columnId === rhs.spec.columnId ? 0 : 1;
 		case "sparseToDenseColumn": return lhs.column < rhs.column ? -1 : lhs.column === rhs.column ? 0 : 1;
 		case "innerJoin":
 		case "fullJoin": {
@@ -198,11 +201,13 @@ function cmpQuerySpec(lhs, rhs) {
 function cmpQueryJoinEntrySpec(lhs, rhs) {
 	const cmp = cmpQuerySpec(lhs.entry, rhs.entry);
 	if (cmp !== 0) return cmp;
-	if (lhs.qualifications.length !== rhs.qualifications.length) return lhs.qualifications.length - rhs.qualifications.length;
-	for (let i = 0; i < lhs.qualifications.length; i++) {
-		const lhsQ = require_json.canonicalizeJson(lhs.qualifications[i]);
-		const rhsQ = require_json.canonicalizeJson(rhs.qualifications[i]);
-		if (lhsQ !== rhsQ) return lhsQ < rhsQ ? -1 : 1;
+	const lhsQ = lhs.qualifications ?? [];
+	const rhsQ = rhs.qualifications ?? [];
+	if (lhsQ.length !== rhsQ.length) return lhsQ.length - rhsQ.length;
+	for (let i = 0; i < lhsQ.length; i++) {
+		const l = require_json.canonicalizeJson(lhsQ[i]);
+		const r = require_json.canonicalizeJson(rhsQ[i]);
+		if (l !== r) return l < r ? -1 : 1;
 	}
 	return 0;
 }

package/dist/drivers/pframe/query/utils.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"utils.cjs","names":["canonicalizeJson"],"sources":["../../../../src/drivers/pframe/query/utils.ts"],"sourcesContent":["import { canonicalizeJson } from \"../../../json\";\nimport { assertNever } from \"../../../util\";\nimport type {\n  SpecQueryBooleanExpression,\n  SpecQueryExpression,\n  SpecQuery,\n  SpecQueryJoinEntry,\n} from \"./query_spec\";\n\nconst booleanTypesSet = new Set<SpecQueryBooleanExpression[\"type\"]>([\n  \"numericComparison\",\n  \"stringEquals\",\n  \"stringContains\",\n  \"stringContainsFuzzy\",\n  \"stringRegex\",\n  \"isNull\",\n  \"not\",\n  \"and\",\n  \"or\",\n  \"isIn\",\n]);\n\nexport function isBooleanExpression(expr: SpecQueryExpression): expr is SpecQueryBooleanExpression {\n  return booleanTypesSet.has(\n    // @ts-expect-error -- TypeScript doesn't understand the discriminated union here, but we do at runtime\n    expr.type,\n  );\n}\n\n/**\n * Recursively traverses a SpecQuery tree bottom-up, applying visitor callbacks.\n *\n * Traversal order:\n * 1. Recurse into child queries\n * 2. Apply `column` to transform column references in leaf nodes\n * 3. Apply `joinEntry` to each join entry (with inner query already traversed)\n * 4. Assemble node with transformed children\n * 5. Apply `node` to the assembled node\n */\nexport function traverseQuerySpec<C1, C2>(\n  query: SpecQuery<C1>,\n  visitor: {\n    /** Transform column references in leaf nodes (column, sparseToDenseColumn). */\n    column: (c: C1) => C2;\n    /** Visit a node after its children have been traversed. */\n    node?: (node: SpecQuery<C2>) => SpecQuery<C2>;\n    /** Visit a join entry after its inner query has been traversed. */\n    joinEntry?: (entry: SpecQueryJoinEntry<C2>) => SpecQueryJoinEntry<C2>;\n  },\n): SpecQuery<C2> {\n  const traverseEntry = (entry: SpecQueryJoinEntry<C1>): SpecQueryJoinEntry<C2> => {\n    const traversed: SpecQueryJoinEntry<C2> = {\n      ...entry,\n      entry: traverseQuerySpec(entry.entry, visitor),\n    };\n    return visitor.joinEntry ? visitor.joinEntry(traversed) : traversed;\n  };\n\n  let result: SpecQuery<C2>;\n  switch (query.type) {\n    case \"column\":\n      result = { type: \"column\", column: visitor.column(query.column) };\n      break;\n    case \"sparseToDenseColumn\":\n      result = { ...query, column: visitor.column(query.column) };\n      break;\n    case \"inlineColumn\":\n      result = query;\n      break;\n    case \"innerJoin\":\n    case \"fullJoin\":\n      result = { ...query, entries: query.entries.map(traverseEntry) };\n      break;\n    case \"outerJoin\":\n      result = {\n        ...query,\n        primary: traverseEntry(query.primary),\n        secondary: query.secondary.map(traverseEntry),\n      };\n      break;\n    case \"linkerJoin\":\n      result = {\n        ...query,\n        linker: { ...query.linker, column: visitor.column(query.linker.column) },\n        secondary: query.secondary.map(traverseEntry),\n      };\n      break;\n    case \"filter\":\n    case \"sort\":\n    case \"sliceAxes\":\n      result = { ...query, input: traverseQuerySpec(query.input, visitor) };\n      break;\n    default:\n      assertNever(query);\n  }\n\n  return visitor.node ? visitor.node(result) : result;\n}\n\n/** Recursively maps all column references in a SpecQuery tree. */\nexport function mapSpecQueryColumns<C1, C2>(\n  query: SpecQuery<C1>,\n  cb: (c: C1) => C2,\n): SpecQuery<C2> {\n  return traverseQuerySpec(query, { column: cb });\n}\n\n/** Collects all column references from a SpecQuery tree. */\nexport function collectSpecQueryColumns<C>(query: SpecQuery<C>): C[] {\n  const result: C[] = [];\n  traverseQuerySpec(query, {\n    column: (c: C) => {\n      result.push(c);\n      return c;\n    },\n  });\n  return result;\n}\n\nexport function sortSpecQuery(query: SpecQuery): SpecQuery {\n  return traverseQuerySpec(query, {\n    column: (c) => c,\n    node: (node) => {\n      switch (node.type) {\n        case \"sparseToDenseColumn\":\n          return { ...node, axesIndices: node.axesIndices.toSorted((a, b) => a - b) };\n        case \"innerJoin\":\n        case \"fullJoin\": {\n          const sorted = [...node.entries].sort(cmpQueryJoinEntrySpec);\n          return { ...node, entries: sorted };\n        }\n        case \"outerJoin\": {\n          const sorted = [...node.secondary].sort(cmpQueryJoinEntrySpec);\n          return { ...node, secondary: sorted };\n        }\n        case \"linkerJoin\": {\n          const sorted = [...node.secondary].sort(cmpQueryJoinEntrySpec);\n          return { ...node, secondary: sorted };\n        }\n        case \"sliceAxes\":\n          return {\n            ...node,\n            axisFilters: node.axisFilters.toSorted((a, b) => {\n              const ak = canonicalizeJson(a.axisSelector);\n              const bk = canonicalizeJson(b.axisSelector);\n              return ak < bk ? -1 : ak === bk ? 0 : 1;\n            }),\n          };\n        default:\n          return node;\n      }\n    },\n    joinEntry: (entry) => ({\n      ...entry,\n      qualifications: entry.qualifications.toSorted((a, b) => {\n        const ak = canonicalizeJson(a.axis);\n        const bk = canonicalizeJson(b.axis);\n        return ak < bk ? -1 : ak === bk ? 0 : 1;\n      }),\n    }),\n  });\n}\n\nfunction cmpQuerySpec(lhs: SpecQuery, rhs: SpecQuery): number {\n  if (lhs.type !== rhs.type) {\n    return lhs.type < rhs.type ? -1 : 1;\n  }\n  switch (lhs.type) {\n    case \"column\":\n      return lhs.column < (rhs as typeof lhs).column\n        ? -1\n        : lhs.column === (rhs as typeof lhs).column\n          ? 0\n          : 1;\n    case \"inlineColumn\":\n      return lhs.spec.id < (rhs as typeof lhs).spec.id\n        ? -1\n        : lhs.spec.id === (rhs as typeof lhs).spec.id\n          ? 0\n          : 1;\n    case \"sparseToDenseColumn\":\n      return lhs.column < (rhs as typeof lhs).column\n        ? -1\n        : lhs.column === (rhs as typeof lhs).column\n          ? 0\n          : 1;\n    case \"innerJoin\":\n    case \"fullJoin\": {\n      const rhsJoin = rhs as typeof lhs;\n      if (lhs.entries.length !== rhsJoin.entries.length) {\n        return lhs.entries.length - rhsJoin.entries.length;\n      }\n      for (let i = 0; i < lhs.entries.length; i++) {\n        const cmp = cmpQueryJoinEntrySpec(lhs.entries[i], rhsJoin.entries[i]);\n        if (cmp !== 0) return cmp;\n      }\n      return 0;\n    }\n    case \"outerJoin\": {\n      const rhsOuter = rhs as typeof lhs;\n      const cmp = cmpQueryJoinEntrySpec(lhs.primary, rhsOuter.primary);\n      if (cmp !== 0) return cmp;\n      if (lhs.secondary.length !== rhsOuter.secondary.length) {\n        return lhs.secondary.length - rhsOuter.secondary.length;\n      }\n      for (let i = 0; i < lhs.secondary.length; i++) {\n        const cmp = cmpQueryJoinEntrySpec(lhs.secondary[i], rhsOuter.secondary[i]);\n        if (cmp !== 0) return cmp;\n      }\n      return 0;\n    }\n    case \"linkerJoin\": {\n      const rhsLinker = rhs as typeof lhs;\n      if (lhs.linker.column !== rhsLinker.linker.column) {\n        return lhs.linker.column < rhsLinker.linker.column ? -1 : 1;\n      }\n      if (lhs.secondary.length !== rhsLinker.secondary.length) {\n        return lhs.secondary.length - rhsLinker.secondary.length;\n      }\n      for (let i = 0; i < lhs.secondary.length; i++) {\n        const cmp = cmpQueryJoinEntrySpec(lhs.secondary[i], rhsLinker.secondary[i]);\n        if (cmp !== 0) return cmp;\n      }\n      return 0;\n    }\n    case \"sliceAxes\":\n      return cmpQuerySpec(lhs.input, (rhs as typeof lhs).input);\n    case \"sort\":\n      return cmpQuerySpec(lhs.input, (rhs as typeof lhs).input);\n    case \"filter\":\n      return cmpQuerySpec(lhs.input, (rhs as typeof lhs).input);\n    default:\n      assertNever(lhs);\n  }\n}\n\nfunction cmpQueryJoinEntrySpec(lhs: SpecQueryJoinEntry, rhs: SpecQueryJoinEntry): number {\n  const cmp = cmpQuerySpec(lhs.entry, rhs.entry);\n  if (cmp !== 0) return cmp;\n  if (lhs.qualifications.length !== rhs.qualifications.length) {\n    return lhs.qualifications.length - rhs.qualifications.length;\n  }\n  for (let i = 0; i < lhs.qualifications.length; i++) {\n    const lhsQ = canonicalizeJson(lhs.qualifications[i]);\n    const rhsQ = canonicalizeJson(rhs.qualifications[i]);\n    if (lhsQ !== rhsQ) return lhsQ < rhsQ ? -1 : 1;\n  }\n  return 0;\n}\n"],"mappings":"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"}
+{"version":3,"file":"utils.cjs","names":["canonicalizeJson"],"sources":["../../../../src/drivers/pframe/query/utils.ts"],"sourcesContent":["import { canonicalizeJson } from \"../../../json\";\nimport { assertNever } from \"../../../util\";\nimport type {\n  SpecQueryBooleanExpression,\n  SpecQueryExpression,\n  SpecQuery,\n  SpecQueryJoinEntry,\n} from \"./query_spec\";\n\nconst booleanTypesSet = new Set<SpecQueryBooleanExpression[\"type\"]>([\n  \"numericComparison\",\n  \"stringEquals\",\n  \"stringContains\",\n  \"stringContainsFuzzy\",\n  \"stringRegex\",\n  \"isNull\",\n  \"not\",\n  \"and\",\n  \"or\",\n  \"isIn\",\n]);\n\nexport function isBooleanExpression(expr: SpecQueryExpression): expr is SpecQueryBooleanExpression {\n  return booleanTypesSet.has(\n    // @ts-expect-error -- TypeScript doesn't understand the discriminated union here, but we do at runtime\n    expr.type,\n  );\n}\n\n/**\n * Recursively traverses a SpecQuery tree bottom-up, applying visitor callbacks.\n *\n * Traversal order:\n * 1. Recurse into child queries\n * 2. Apply `column` to transform column references in leaf nodes\n * 3. Apply `joinEntry` to each join entry (with inner query already traversed)\n * 4. Assemble node with transformed children\n * 5. Apply `node` to the assembled node\n */\nexport function traverseQuerySpec<C1, C2>(\n  query: SpecQuery<C1>,\n  visitor: {\n    /** Transform column references in leaf nodes (column, sparseToDenseColumn). */\n    column: (c: C1) => C2;\n    /** Visit a node after its children have been traversed. */\n    node?: (node: SpecQuery<C2>) => SpecQuery<C2>;\n    /** Visit a join entry after its inner query has been traversed. */\n    joinEntry?: (entry: SpecQueryJoinEntry<C2>) => SpecQueryJoinEntry<C2>;\n  },\n): SpecQuery<C2> {\n  const traverseEntry = (entry: SpecQueryJoinEntry<C1>): SpecQueryJoinEntry<C2> => {\n    const traversed: SpecQueryJoinEntry<C2> = {\n      ...entry,\n      entry: traverseQuerySpec(entry.entry, visitor),\n    };\n    return visitor.joinEntry ? visitor.joinEntry(traversed) : traversed;\n  };\n\n  let result: SpecQuery<C2>;\n  switch (query.type) {\n    case \"column\":\n      result = { type: \"column\", column: visitor.column(query.column) };\n      break;\n    case \"sparseToDenseColumn\":\n      result = { ...query, column: visitor.column(query.column) };\n      break;\n    case \"inlineColumn\":\n      result = query;\n      break;\n    case \"innerJoin\":\n    case \"fullJoin\":\n      result = { ...query, entries: query.entries.map(traverseEntry) };\n      break;\n    case \"outerJoin\":\n      result = {\n        ...query,\n        primary: traverseEntry(query.primary),\n        secondary: query.secondary.map(traverseEntry),\n      };\n      break;\n    case \"linkerJoin\":\n      result = {\n        ...query,\n        linker: { ...query.linker, column: visitor.column(query.linker.column) },\n        secondary: query.secondary.map(traverseEntry),\n      };\n      break;\n    case \"filter\":\n    case \"sort\":\n    case \"sliceAxes\":\n      result = { ...query, input: traverseQuerySpec(query.input, visitor) };\n      break;\n    default:\n      assertNever(query);\n  }\n\n  return visitor.node ? visitor.node(result) : result;\n}\n\n/** Recursively maps all column references in a SpecQuery tree. */\nexport function mapSpecQueryColumns<C1, C2>(\n  query: SpecQuery<C1>,\n  cb: (c: C1) => C2,\n): SpecQuery<C2> {\n  return traverseQuerySpec(query, { column: cb });\n}\n\n/** Collects all column references from a SpecQuery tree. */\nexport function collectSpecQueryColumns<C>(query: SpecQuery<C>): C[] {\n  const result: C[] = [];\n  traverseQuerySpec(query, {\n    column: (c: C) => {\n      result.push(c);\n      return c;\n    },\n  });\n  return result;\n}\n\nexport function sortSpecQuery(query: SpecQuery): SpecQuery {\n  return traverseQuerySpec(query, {\n    column: (c) => c,\n    node: (node) => {\n      switch (node.type) {\n        case \"sparseToDenseColumn\":\n          return { ...node, axesIndices: node.axesIndices.toSorted((a, b) => a - b) };\n        case \"innerJoin\":\n        case \"fullJoin\": {\n          const sorted = [...node.entries].sort(cmpQueryJoinEntrySpec);\n          return { ...node, entries: sorted };\n        }\n        case \"outerJoin\": {\n          const sorted = [...node.secondary].sort(cmpQueryJoinEntrySpec);\n          return { ...node, secondary: sorted };\n        }\n        case \"linkerJoin\": {\n          const sorted = [...node.secondary].sort(cmpQueryJoinEntrySpec);\n          return { ...node, secondary: sorted };\n        }\n        case \"sliceAxes\":\n          return {\n            ...node,\n            axisFilters: node.axisFilters.toSorted((a, b) => {\n              const ak = canonicalizeJson(a.axisSelector);\n              const bk = canonicalizeJson(b.axisSelector);\n              return ak < bk ? -1 : ak === bk ? 0 : 1;\n            }),\n          };\n        default:\n          return node;\n      }\n    },\n    joinEntry: (entry) => {\n      // Preserve absence of `qualifications` (absent == `[]`) so canonical\n      // output is stable across both input forms.\n      if (entry.qualifications === undefined || entry.qualifications.length === 0) {\n        return entry;\n      }\n      return {\n        ...entry,\n        qualifications: entry.qualifications.toSorted((a, b) => {\n          const ak = canonicalizeJson(a.axis);\n          const bk = canonicalizeJson(b.axis);\n          return ak < bk ? -1 : ak === bk ? 0 : 1;\n        }),\n      };\n    },\n  });\n}\n\nfunction cmpQuerySpec(lhs: SpecQuery, rhs: SpecQuery): number {\n  if (lhs.type !== rhs.type) {\n    return lhs.type < rhs.type ? -1 : 1;\n  }\n  switch (lhs.type) {\n    case \"column\":\n      return lhs.column < (rhs as typeof lhs).column\n        ? -1\n        : lhs.column === (rhs as typeof lhs).column\n          ? 0\n          : 1;\n    case \"inlineColumn\":\n      return lhs.spec.columnId < (rhs as typeof lhs).spec.columnId\n        ? -1\n        : lhs.spec.columnId === (rhs as typeof lhs).spec.columnId\n          ? 0\n          : 1;\n    case \"sparseToDenseColumn\":\n      return lhs.column < (rhs as typeof lhs).column\n        ? -1\n        : lhs.column === (rhs as typeof lhs).column\n          ? 0\n          : 1;\n    case \"innerJoin\":\n    case \"fullJoin\": {\n      const rhsJoin = rhs as typeof lhs;\n      if (lhs.entries.length !== rhsJoin.entries.length) {\n        return lhs.entries.length - rhsJoin.entries.length;\n      }\n      for (let i = 0; i < lhs.entries.length; i++) {\n        const cmp = cmpQueryJoinEntrySpec(lhs.entries[i], rhsJoin.entries[i]);\n        if (cmp !== 0) return cmp;\n      }\n      return 0;\n    }\n    case \"outerJoin\": {\n      const rhsOuter = rhs as typeof lhs;\n      const cmp = cmpQueryJoinEntrySpec(lhs.primary, rhsOuter.primary);\n      if (cmp !== 0) return cmp;\n      if (lhs.secondary.length !== rhsOuter.secondary.length) {\n        return lhs.secondary.length - rhsOuter.secondary.length;\n      }\n      for (let i = 0; i < lhs.secondary.length; i++) {\n        const cmp = cmpQueryJoinEntrySpec(lhs.secondary[i], rhsOuter.secondary[i]);\n        if (cmp !== 0) return cmp;\n      }\n      return 0;\n    }\n    case \"linkerJoin\": {\n      const rhsLinker = rhs as typeof lhs;\n      if (lhs.linker.column !== rhsLinker.linker.column) {\n        return lhs.linker.column < rhsLinker.linker.column ? -1 : 1;\n      }\n      if (lhs.secondary.length !== rhsLinker.secondary.length) {\n        return lhs.secondary.length - rhsLinker.secondary.length;\n      }\n      for (let i = 0; i < lhs.secondary.length; i++) {\n        const cmp = cmpQueryJoinEntrySpec(lhs.secondary[i], rhsLinker.secondary[i]);\n        if (cmp !== 0) return cmp;\n      }\n      return 0;\n    }\n    case \"sliceAxes\":\n      return cmpQuerySpec(lhs.input, (rhs as typeof lhs).input);\n    case \"sort\":\n      return cmpQuerySpec(lhs.input, (rhs as typeof lhs).input);\n    case \"filter\":\n      return cmpQuerySpec(lhs.input, (rhs as typeof lhs).input);\n    default:\n      assertNever(lhs);\n  }\n}\n\nfunction cmpQueryJoinEntrySpec(lhs: SpecQueryJoinEntry, rhs: SpecQueryJoinEntry): number {\n  const cmp = cmpQuerySpec(lhs.entry, rhs.entry);\n  if (cmp !== 0) return cmp;\n  // Absent `qualifications` is equivalent to an empty list.\n  const lhsQ = lhs.qualifications ?? [];\n  const rhsQ = rhs.qualifications ?? [];\n  if (lhsQ.length !== rhsQ.length) {\n    return lhsQ.length - rhsQ.length;\n  }\n  for (let i = 0; i < lhsQ.length; i++) {\n    const l = canonicalizeJson(lhsQ[i]);\n    const r = canonicalizeJson(rhsQ[i]);\n    if (l !== r) return l < r ? -1 : 1;\n  }\n  return 0;\n}\n"],"mappings":"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"}

package/dist/drivers/pframe/query/utils.js

@@ -142,21 +142,24 @@ function sortSpecQuery(query) {
 				default: return node;
 			}
 		},
-		joinEntry: (entry) => ({
-			...entry,
-			qualifications: entry.qualifications.toSorted((a, b) => {
-				const ak = canonicalizeJson(a.axis);
-				const bk = canonicalizeJson(b.axis);
-				return ak < bk ? -1 : ak === bk ? 0 : 1;
-			})
-		})
+		joinEntry: (entry) => {
+			if (entry.qualifications === void 0 || entry.qualifications.length === 0) return entry;
+			return {
+				...entry,
+				qualifications: entry.qualifications.toSorted((a, b) => {
+					const ak = canonicalizeJson(a.axis);
+					const bk = canonicalizeJson(b.axis);
+					return ak < bk ? -1 : ak === bk ? 0 : 1;
+				})
+			};
+		}
 	});
 }
 function cmpQuerySpec(lhs, rhs) {
 	if (lhs.type !== rhs.type) return lhs.type < rhs.type ? -1 : 1;
 	switch (lhs.type) {
 		case "column": return lhs.column < rhs.column ? -1 : lhs.column === rhs.column ? 0 : 1;
-		case "inlineColumn": return lhs.spec.id < rhs.spec.id ? -1 : lhs.spec.id === rhs.spec.id ? 0 : 1;
+		case "inlineColumn": return lhs.spec.columnId < rhs.spec.columnId ? -1 : lhs.spec.columnId === rhs.spec.columnId ? 0 : 1;
 		case "sparseToDenseColumn": return lhs.column < rhs.column ? -1 : lhs.column === rhs.column ? 0 : 1;
 		case "innerJoin":
 		case "fullJoin": {
@@ -198,11 +201,13 @@ function cmpQuerySpec(lhs, rhs) {
 function cmpQueryJoinEntrySpec(lhs, rhs) {
 	const cmp = cmpQuerySpec(lhs.entry, rhs.entry);
 	if (cmp !== 0) return cmp;
-	if (lhs.qualifications.length !== rhs.qualifications.length) return lhs.qualifications.length - rhs.qualifications.length;
-	for (let i = 0; i < lhs.qualifications.length; i++) {
-		const lhsQ = canonicalizeJson(lhs.qualifications[i]);
-		const rhsQ = canonicalizeJson(rhs.qualifications[i]);
-		if (lhsQ !== rhsQ) return lhsQ < rhsQ ? -1 : 1;
+	const lhsQ = lhs.qualifications ?? [];
+	const rhsQ = rhs.qualifications ?? [];
+	if (lhsQ.length !== rhsQ.length) return lhsQ.length - rhsQ.length;
+	for (let i = 0; i < lhsQ.length; i++) {
+		const l = canonicalizeJson(lhsQ[i]);
+		const r = canonicalizeJson(rhsQ[i]);
+		if (l !== r) return l < r ? -1 : 1;
 	}
 	return 0;
 }

package/dist/drivers/pframe/query/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","names":[],"sources":["../../../../src/drivers/pframe/query/utils.ts"],"sourcesContent":["import { canonicalizeJson } from \"../../../json\";\nimport { assertNever } from \"../../../util\";\nimport type {\n  SpecQueryBooleanExpression,\n  SpecQueryExpression,\n  SpecQuery,\n  SpecQueryJoinEntry,\n} from \"./query_spec\";\n\nconst booleanTypesSet = new Set<SpecQueryBooleanExpression[\"type\"]>([\n  \"numericComparison\",\n  \"stringEquals\",\n  \"stringContains\",\n  \"stringContainsFuzzy\",\n  \"stringRegex\",\n  \"isNull\",\n  \"not\",\n  \"and\",\n  \"or\",\n  \"isIn\",\n]);\n\nexport function isBooleanExpression(expr: SpecQueryExpression): expr is SpecQueryBooleanExpression {\n  return booleanTypesSet.has(\n    // @ts-expect-error -- TypeScript doesn't understand the discriminated union here, but we do at runtime\n    expr.type,\n  );\n}\n\n/**\n * Recursively traverses a SpecQuery tree bottom-up, applying visitor callbacks.\n *\n * Traversal order:\n * 1. Recurse into child queries\n * 2. Apply `column` to transform column references in leaf nodes\n * 3. Apply `joinEntry` to each join entry (with inner query already traversed)\n * 4. Assemble node with transformed children\n * 5. Apply `node` to the assembled node\n */\nexport function traverseQuerySpec<C1, C2>(\n  query: SpecQuery<C1>,\n  visitor: {\n    /** Transform column references in leaf nodes (column, sparseToDenseColumn). */\n    column: (c: C1) => C2;\n    /** Visit a node after its children have been traversed. */\n    node?: (node: SpecQuery<C2>) => SpecQuery<C2>;\n    /** Visit a join entry after its inner query has been traversed. */\n    joinEntry?: (entry: SpecQueryJoinEntry<C2>) => SpecQueryJoinEntry<C2>;\n  },\n): SpecQuery<C2> {\n  const traverseEntry = (entry: SpecQueryJoinEntry<C1>): SpecQueryJoinEntry<C2> => {\n    const traversed: SpecQueryJoinEntry<C2> = {\n      ...entry,\n      entry: traverseQuerySpec(entry.entry, visitor),\n    };\n    return visitor.joinEntry ? visitor.joinEntry(traversed) : traversed;\n  };\n\n  let result: SpecQuery<C2>;\n  switch (query.type) {\n    case \"column\":\n      result = { type: \"column\", column: visitor.column(query.column) };\n      break;\n    case \"sparseToDenseColumn\":\n      result = { ...query, column: visitor.column(query.column) };\n      break;\n    case \"inlineColumn\":\n      result = query;\n      break;\n    case \"innerJoin\":\n    case \"fullJoin\":\n      result = { ...query, entries: query.entries.map(traverseEntry) };\n      break;\n    case \"outerJoin\":\n      result = {\n        ...query,\n        primary: traverseEntry(query.primary),\n        secondary: query.secondary.map(traverseEntry),\n      };\n      break;\n    case \"linkerJoin\":\n      result = {\n        ...query,\n        linker: { ...query.linker, column: visitor.column(query.linker.column) },\n        secondary: query.secondary.map(traverseEntry),\n      };\n      break;\n    case \"filter\":\n    case \"sort\":\n    case \"sliceAxes\":\n      result = { ...query, input: traverseQuerySpec(query.input, visitor) };\n      break;\n    default:\n      assertNever(query);\n  }\n\n  return visitor.node ? visitor.node(result) : result;\n}\n\n/** Recursively maps all column references in a SpecQuery tree. */\nexport function mapSpecQueryColumns<C1, C2>(\n  query: SpecQuery<C1>,\n  cb: (c: C1) => C2,\n): SpecQuery<C2> {\n  return traverseQuerySpec(query, { column: cb });\n}\n\n/** Collects all column references from a SpecQuery tree. */\nexport function collectSpecQueryColumns<C>(query: SpecQuery<C>): C[] {\n  const result: C[] = [];\n  traverseQuerySpec(query, {\n    column: (c: C) => {\n      result.push(c);\n      return c;\n    },\n  });\n  return result;\n}\n\nexport function sortSpecQuery(query: SpecQuery): SpecQuery {\n  return traverseQuerySpec(query, {\n    column: (c) => c,\n    node: (node) => {\n      switch (node.type) {\n        case \"sparseToDenseColumn\":\n          return { ...node, axesIndices: node.axesIndices.toSorted((a, b) => a - b) };\n        case \"innerJoin\":\n        case \"fullJoin\": {\n          const sorted = [...node.entries].sort(cmpQueryJoinEntrySpec);\n          return { ...node, entries: sorted };\n        }\n        case \"outerJoin\": {\n          const sorted = [...node.secondary].sort(cmpQueryJoinEntrySpec);\n          return { ...node, secondary: sorted };\n        }\n        case \"linkerJoin\": {\n          const sorted = [...node.secondary].sort(cmpQueryJoinEntrySpec);\n          return { ...node, secondary: sorted };\n        }\n        case \"sliceAxes\":\n          return {\n            ...node,\n            axisFilters: node.axisFilters.toSorted((a, b) => {\n              const ak = canonicalizeJson(a.axisSelector);\n              const bk = canonicalizeJson(b.axisSelector);\n              return ak < bk ? -1 : ak === bk ? 0 : 1;\n            }),\n          };\n        default:\n          return node;\n      }\n    },\n    joinEntry: (entry) => ({\n      ...entry,\n      qualifications: entry.qualifications.toSorted((a, b) => {\n        const ak = canonicalizeJson(a.axis);\n        const bk = canonicalizeJson(b.axis);\n        return ak < bk ? -1 : ak === bk ? 0 : 1;\n      }),\n    }),\n  });\n}\n\nfunction cmpQuerySpec(lhs: SpecQuery, rhs: SpecQuery): number {\n  if (lhs.type !== rhs.type) {\n    return lhs.type < rhs.type ? -1 : 1;\n  }\n  switch (lhs.type) {\n    case \"column\":\n      return lhs.column < (rhs as typeof lhs).column\n        ? -1\n        : lhs.column === (rhs as typeof lhs).column\n          ? 0\n          : 1;\n    case \"inlineColumn\":\n      return lhs.spec.id < (rhs as typeof lhs).spec.id\n        ? -1\n        : lhs.spec.id === (rhs as typeof lhs).spec.id\n          ? 0\n          : 1;\n    case \"sparseToDenseColumn\":\n      return lhs.column < (rhs as typeof lhs).column\n        ? -1\n        : lhs.column === (rhs as typeof lhs).column\n          ? 0\n          : 1;\n    case \"innerJoin\":\n    case \"fullJoin\": {\n      const rhsJoin = rhs as typeof lhs;\n      if (lhs.entries.length !== rhsJoin.entries.length) {\n        return lhs.entries.length - rhsJoin.entries.length;\n      }\n      for (let i = 0; i < lhs.entries.length; i++) {\n        const cmp = cmpQueryJoinEntrySpec(lhs.entries[i], rhsJoin.entries[i]);\n        if (cmp !== 0) return cmp;\n      }\n      return 0;\n    }\n    case \"outerJoin\": {\n      const rhsOuter = rhs as typeof lhs;\n      const cmp = cmpQueryJoinEntrySpec(lhs.primary, rhsOuter.primary);\n      if (cmp !== 0) return cmp;\n      if (lhs.secondary.length !== rhsOuter.secondary.length) {\n        return lhs.secondary.length - rhsOuter.secondary.length;\n      }\n      for (let i = 0; i < lhs.secondary.length; i++) {\n        const cmp = cmpQueryJoinEntrySpec(lhs.secondary[i], rhsOuter.secondary[i]);\n        if (cmp !== 0) return cmp;\n      }\n      return 0;\n    }\n    case \"linkerJoin\": {\n      const rhsLinker = rhs as typeof lhs;\n      if (lhs.linker.column !== rhsLinker.linker.column) {\n        return lhs.linker.column < rhsLinker.linker.column ? -1 : 1;\n      }\n      if (lhs.secondary.length !== rhsLinker.secondary.length) {\n        return lhs.secondary.length - rhsLinker.secondary.length;\n      }\n      for (let i = 0; i < lhs.secondary.length; i++) {\n        const cmp = cmpQueryJoinEntrySpec(lhs.secondary[i], rhsLinker.secondary[i]);\n        if (cmp !== 0) return cmp;\n      }\n      return 0;\n    }\n    case \"sliceAxes\":\n      return cmpQuerySpec(lhs.input, (rhs as typeof lhs).input);\n    case \"sort\":\n      return cmpQuerySpec(lhs.input, (rhs as typeof lhs).input);\n    case \"filter\":\n      return cmpQuerySpec(lhs.input, (rhs as typeof lhs).input);\n    default:\n      assertNever(lhs);\n  }\n}\n\nfunction cmpQueryJoinEntrySpec(lhs: SpecQueryJoinEntry, rhs: SpecQueryJoinEntry): number {\n  const cmp = cmpQuerySpec(lhs.entry, rhs.entry);\n  if (cmp !== 0) return cmp;\n  if (lhs.qualifications.length !== rhs.qualifications.length) {\n    return lhs.qualifications.length - rhs.qualifications.length;\n  }\n  for (let i = 0; i < lhs.qualifications.length; i++) {\n    const lhsQ = canonicalizeJson(lhs.qualifications[i]);\n    const rhsQ = canonicalizeJson(rhs.qualifications[i]);\n    if (lhsQ !== rhsQ) return lhsQ < rhsQ ? -1 : 1;\n  }\n  return 0;\n}\n"],"mappings":"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"}
+{"version":3,"file":"utils.js","names":[],"sources":["../../../../src/drivers/pframe/query/utils.ts"],"sourcesContent":["import { canonicalizeJson } from \"../../../json\";\nimport { assertNever } from \"../../../util\";\nimport type {\n  SpecQueryBooleanExpression,\n  SpecQueryExpression,\n  SpecQuery,\n  SpecQueryJoinEntry,\n} from \"./query_spec\";\n\nconst booleanTypesSet = new Set<SpecQueryBooleanExpression[\"type\"]>([\n  \"numericComparison\",\n  \"stringEquals\",\n  \"stringContains\",\n  \"stringContainsFuzzy\",\n  \"stringRegex\",\n  \"isNull\",\n  \"not\",\n  \"and\",\n  \"or\",\n  \"isIn\",\n]);\n\nexport function isBooleanExpression(expr: SpecQueryExpression): expr is SpecQueryBooleanExpression {\n  return booleanTypesSet.has(\n    // @ts-expect-error -- TypeScript doesn't understand the discriminated union here, but we do at runtime\n    expr.type,\n  );\n}\n\n/**\n * Recursively traverses a SpecQuery tree bottom-up, applying visitor callbacks.\n *\n * Traversal order:\n * 1. Recurse into child queries\n * 2. Apply `column` to transform column references in leaf nodes\n * 3. Apply `joinEntry` to each join entry (with inner query already traversed)\n * 4. Assemble node with transformed children\n * 5. Apply `node` to the assembled node\n */\nexport function traverseQuerySpec<C1, C2>(\n  query: SpecQuery<C1>,\n  visitor: {\n    /** Transform column references in leaf nodes (column, sparseToDenseColumn). */\n    column: (c: C1) => C2;\n    /** Visit a node after its children have been traversed. */\n    node?: (node: SpecQuery<C2>) => SpecQuery<C2>;\n    /** Visit a join entry after its inner query has been traversed. */\n    joinEntry?: (entry: SpecQueryJoinEntry<C2>) => SpecQueryJoinEntry<C2>;\n  },\n): SpecQuery<C2> {\n  const traverseEntry = (entry: SpecQueryJoinEntry<C1>): SpecQueryJoinEntry<C2> => {\n    const traversed: SpecQueryJoinEntry<C2> = {\n      ...entry,\n      entry: traverseQuerySpec(entry.entry, visitor),\n    };\n    return visitor.joinEntry ? visitor.joinEntry(traversed) : traversed;\n  };\n\n  let result: SpecQuery<C2>;\n  switch (query.type) {\n    case \"column\":\n      result = { type: \"column\", column: visitor.column(query.column) };\n      break;\n    case \"sparseToDenseColumn\":\n      result = { ...query, column: visitor.column(query.column) };\n      break;\n    case \"inlineColumn\":\n      result = query;\n      break;\n    case \"innerJoin\":\n    case \"fullJoin\":\n      result = { ...query, entries: query.entries.map(traverseEntry) };\n      break;\n    case \"outerJoin\":\n      result = {\n        ...query,\n        primary: traverseEntry(query.primary),\n        secondary: query.secondary.map(traverseEntry),\n      };\n      break;\n    case \"linkerJoin\":\n      result = {\n        ...query,\n        linker: { ...query.linker, column: visitor.column(query.linker.column) },\n        secondary: query.secondary.map(traverseEntry),\n      };\n      break;\n    case \"filter\":\n    case \"sort\":\n    case \"sliceAxes\":\n      result = { ...query, input: traverseQuerySpec(query.input, visitor) };\n      break;\n    default:\n      assertNever(query);\n  }\n\n  return visitor.node ? visitor.node(result) : result;\n}\n\n/** Recursively maps all column references in a SpecQuery tree. */\nexport function mapSpecQueryColumns<C1, C2>(\n  query: SpecQuery<C1>,\n  cb: (c: C1) => C2,\n): SpecQuery<C2> {\n  return traverseQuerySpec(query, { column: cb });\n}\n\n/** Collects all column references from a SpecQuery tree. */\nexport function collectSpecQueryColumns<C>(query: SpecQuery<C>): C[] {\n  const result: C[] = [];\n  traverseQuerySpec(query, {\n    column: (c: C) => {\n      result.push(c);\n      return c;\n    },\n  });\n  return result;\n}\n\nexport function sortSpecQuery(query: SpecQuery): SpecQuery {\n  return traverseQuerySpec(query, {\n    column: (c) => c,\n    node: (node) => {\n      switch (node.type) {\n        case \"sparseToDenseColumn\":\n          return { ...node, axesIndices: node.axesIndices.toSorted((a, b) => a - b) };\n        case \"innerJoin\":\n        case \"fullJoin\": {\n          const sorted = [...node.entries].sort(cmpQueryJoinEntrySpec);\n          return { ...node, entries: sorted };\n        }\n        case \"outerJoin\": {\n          const sorted = [...node.secondary].sort(cmpQueryJoinEntrySpec);\n          return { ...node, secondary: sorted };\n        }\n        case \"linkerJoin\": {\n          const sorted = [...node.secondary].sort(cmpQueryJoinEntrySpec);\n          return { ...node, secondary: sorted };\n        }\n        case \"sliceAxes\":\n          return {\n            ...node,\n            axisFilters: node.axisFilters.toSorted((a, b) => {\n              const ak = canonicalizeJson(a.axisSelector);\n              const bk = canonicalizeJson(b.axisSelector);\n              return ak < bk ? -1 : ak === bk ? 0 : 1;\n            }),\n          };\n        default:\n          return node;\n      }\n    },\n    joinEntry: (entry) => {\n      // Preserve absence of `qualifications` (absent == `[]`) so canonical\n      // output is stable across both input forms.\n      if (entry.qualifications === undefined || entry.qualifications.length === 0) {\n        return entry;\n      }\n      return {\n        ...entry,\n        qualifications: entry.qualifications.toSorted((a, b) => {\n          const ak = canonicalizeJson(a.axis);\n          const bk = canonicalizeJson(b.axis);\n          return ak < bk ? -1 : ak === bk ? 0 : 1;\n        }),\n      };\n    },\n  });\n}\n\nfunction cmpQuerySpec(lhs: SpecQuery, rhs: SpecQuery): number {\n  if (lhs.type !== rhs.type) {\n    return lhs.type < rhs.type ? -1 : 1;\n  }\n  switch (lhs.type) {\n    case \"column\":\n      return lhs.column < (rhs as typeof lhs).column\n        ? -1\n        : lhs.column === (rhs as typeof lhs).column\n          ? 0\n          : 1;\n    case \"inlineColumn\":\n      return lhs.spec.columnId < (rhs as typeof lhs).spec.columnId\n        ? -1\n        : lhs.spec.columnId === (rhs as typeof lhs).spec.columnId\n          ? 0\n          : 1;\n    case \"sparseToDenseColumn\":\n      return lhs.column < (rhs as typeof lhs).column\n        ? -1\n        : lhs.column === (rhs as typeof lhs).column\n          ? 0\n          : 1;\n    case \"innerJoin\":\n    case \"fullJoin\": {\n      const rhsJoin = rhs as typeof lhs;\n      if (lhs.entries.length !== rhsJoin.entries.length) {\n        return lhs.entries.length - rhsJoin.entries.length;\n      }\n      for (let i = 0; i < lhs.entries.length; i++) {\n        const cmp = cmpQueryJoinEntrySpec(lhs.entries[i], rhsJoin.entries[i]);\n        if (cmp !== 0) return cmp;\n      }\n      return 0;\n    }\n    case \"outerJoin\": {\n      const rhsOuter = rhs as typeof lhs;\n      const cmp = cmpQueryJoinEntrySpec(lhs.primary, rhsOuter.primary);\n      if (cmp !== 0) return cmp;\n      if (lhs.secondary.length !== rhsOuter.secondary.length) {\n        return lhs.secondary.length - rhsOuter.secondary.length;\n      }\n      for (let i = 0; i < lhs.secondary.length; i++) {\n        const cmp = cmpQueryJoinEntrySpec(lhs.secondary[i], rhsOuter.secondary[i]);\n        if (cmp !== 0) return cmp;\n      }\n      return 0;\n    }\n    case \"linkerJoin\": {\n      const rhsLinker = rhs as typeof lhs;\n      if (lhs.linker.column !== rhsLinker.linker.column) {\n        return lhs.linker.column < rhsLinker.linker.column ? -1 : 1;\n      }\n      if (lhs.secondary.length !== rhsLinker.secondary.length) {\n        return lhs.secondary.length - rhsLinker.secondary.length;\n      }\n      for (let i = 0; i < lhs.secondary.length; i++) {\n        const cmp = cmpQueryJoinEntrySpec(lhs.secondary[i], rhsLinker.secondary[i]);\n        if (cmp !== 0) return cmp;\n      }\n      return 0;\n    }\n    case \"sliceAxes\":\n      return cmpQuerySpec(lhs.input, (rhs as typeof lhs).input);\n    case \"sort\":\n      return cmpQuerySpec(lhs.input, (rhs as typeof lhs).input);\n    case \"filter\":\n      return cmpQuerySpec(lhs.input, (rhs as typeof lhs).input);\n    default:\n      assertNever(lhs);\n  }\n}\n\nfunction cmpQueryJoinEntrySpec(lhs: SpecQueryJoinEntry, rhs: SpecQueryJoinEntry): number {\n  const cmp = cmpQuerySpec(lhs.entry, rhs.entry);\n  if (cmp !== 0) return cmp;\n  // Absent `qualifications` is equivalent to an empty list.\n  const lhsQ = lhs.qualifications ?? [];\n  const rhsQ = rhs.qualifications ?? [];\n  if (lhsQ.length !== rhsQ.length) {\n    return lhsQ.length - rhsQ.length;\n  }\n  for (let i = 0; i < lhsQ.length; i++) {\n    const l = canonicalizeJson(lhsQ[i]);\n    const r = canonicalizeJson(rhsQ[i]);\n    if (l !== r) return l < r ? -1 : 1;\n  }\n  return 0;\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-model-common",
-  "version": "1.36.0",
+  "version": "1.36.1",
   "description": "Platforma SDK Model",
   "files": [
     "./dist/**/*",

package/src/drivers/pframe/query/query_common.ts

@@ -632,23 +632,31 @@ export interface QueryOuterJoin<JE extends QueryJoinEntry<unknown>> {
  * @template A - Axis selector type
  *
  * @example
- * // Slice 3D data [sample, gene, condition] to 1D [gene]
+ * // Spec layer: axisSelector is a SingleAxisSelector.
  * {
  *   type: 'sliceAxes',
  *   input: fullDataQuery,
  *   axisFilters: [
- *     { type: 'constant', axisSelector: { type: 'axis', id: 'sample' }, constant: 'Sample1' },
- *     { type: 'constant', axisSelector: { type: 'axis', id: 'condition' }, constant: 'Treatment' }
+ *     { axisSelector: { name: 'sample' }, constant: 'Sample1' },
+ *     { axisSelector: { name: 'condition' }, constant: 'Treatment' }
  *   ]
  * }
+ *
+ * @example
+ * // Data layer: axisSelector is the axis index.
+ * {
+ *   type: 'sliceAxes',
+ *   input: fullDataQuery,
+ *   axisFilters: [{ axisSelector: 0, constant: 'Sample1' }]
+ * }
  */
-export interface QuerySliceAxes<Q, A extends QueryAxisSelector<unknown>> {
+export interface QuerySliceAxes<Q, A> {
   type: "sliceAxes";
   /** Input query to slice */
   input: Q;
   /** List of axis filters to apply (at least one required) */
   axisFilters: {
-    /** Selector identifying which axis to filter */
+    /** Axis to filter. `SingleAxisSelector` at the spec layer; axis index at the data layer. */
     axisSelector: A;
     /** The constant value to filter the axis to */
     constant: string | number;

package/src/drivers/pframe/query/query_data.ts

@@ -15,7 +15,6 @@ import type {
   ExprStringEquals,
   ExprStringRegex,
   ExprNumericUnary,
-  QueryAxisSelector,
   QueryColumn,
   QuerySparseToDenseColumn,
   QueryFilter,
@@ -40,7 +39,7 @@ type ColumnIdAndTypeSpec = {
   /** Unique identifier of the column */
   id: PObjectId;
   /** Type specification defining axes and column types */
-  typeSpec: TypeSpec;
+  spec: TypeSpec;
 };
 
 /**
@@ -89,7 +88,7 @@ export type DataQueryLinkerJoinLinker = {
 /** @see QueryLinkerJoin */
 export type DataQueryLinkerJoin = QueryLinkerJoin<DataQueryLinkerJoinLinker, DataQueryJoinEntry>;
 /** @see QuerySliceAxes */
-export type DataQuerySliceAxes = QuerySliceAxes<DataQuery, QueryAxisSelector<number>>;
+export type DataQuerySliceAxes = QuerySliceAxes<DataQuery, number>;
 /** @see QuerySort */
 export type DataQuerySort = QuerySort<DataQuery, DataQueryExpression>;
 /** @see QueryFilter */

package/src/drivers/pframe/query/query_spec.ts

@@ -15,7 +15,6 @@ import type {
   ExprStringEquals,
   ExprStringRegex,
   ExprNumericUnary,
-  QueryAxisSelector,
   QueryColumn,
   QuerySparseToDenseColumn,
   QueryFilter,
@@ -28,43 +27,23 @@ import type {
   QuerySymmetricJoin,
   InferBooleanExpressionUnion,
 } from "./query_common";
-import type { Domain, PColumnIdAndSpec, PColumnSpec, SingleAxisSelector } from "../spec";
+import type { Domain, PColumnIdAndSpec, SingleAxisSelector } from "../spec";
 
 /**
- * Column identifier with specification.
- *
- * Pairs a column ID with its full PColumnSpec.
- * Used in spec layer to carry column specification alongside references.
- */
-type ColumnIdAndSpec = {
-  /** Unique identifier of the column */
-  id: PObjectId;
-  /** Full column specification including axes and value type */
-  spec: PColumnSpec;
-};
-
-/**
- * Join entry for spec layer queries.
- *
- * Extends the base join entry with axis qualifications.
- * Qualifications specify additional domain constraints for each axis,
- * enabling more precise control over how columns are joined.
+ * Join entry for spec-layer queries — the base join entry extended with
+ * per-axis domain constraints. Absent `qualifications` is equivalent to `[]`.
  *
  * @example
- * // Join entry with axis qualifications
  * {
  *   entry: querySpec,
- *   qualifications: [
- *     { axis: { name: 'sample' }, contextDomain: { ... } }
- *   ]
+ *   qualifications: [{ axis: { name: 'sample' }, contextDomain: { ... } }]
  * }
  */
 export type SpecQueryJoinEntry<C = PObjectId> = QueryJoinEntry<SpecQuery<C>> & {
-  /** Axis qualifications with additional domain constraints */
-  qualifications: {
-    /** Axis selector identifying which axis to qualify */
+  qualifications?: {
+    /** Axis to qualify. */
     axis: SingleAxisSelector;
-    /** Additional domain constraints for this axis */
+    /** Additional domain constraints for this axis. */
     contextDomain: Domain;
   }[];
 };
@@ -72,7 +51,7 @@ export type SpecQueryJoinEntry<C = PObjectId> = QueryJoinEntry<SpecQuery<C>> & {
 /** @see QueryColumn */
 export type SpecQueryColumn<C = PObjectId> = QueryColumn<C>;
 /** @see QueryInlineColumn */
-export type SpecQueryInlineColumn = QueryInlineColumn<ColumnIdAndSpec>;
+export type SpecQueryInlineColumn = QueryInlineColumn<PColumnIdAndSpec>;
 /** @see QuerySparseToDenseColumn */
 export type SpecQuerySparseToDenseColumn<C = PObjectId> = QuerySparseToDenseColumn<
   C,
@@ -98,10 +77,7 @@ export type SpecQueryLinkerJoin<C = PObjectId> = QueryLinkerJoin<
   SpecQueryJoinEntry<C>
 >;
 /** @see QuerySliceAxes */
-export type SpecQuerySliceAxes<C = PObjectId> = QuerySliceAxes<
-  SpecQuery<C>,
-  QueryAxisSelector<SingleAxisSelector>
->;
+export type SpecQuerySliceAxes<C = PObjectId> = QuerySliceAxes<SpecQuery<C>, SingleAxisSelector>;
 /** @see QuerySort */
 export type SpecQuerySort<C = PObjectId> = QuerySort<SpecQuery<C>, SpecQueryExpression>;
 /** @see QueryFilter */

package/src/drivers/pframe/query/utils.ts

@@ -150,14 +150,21 @@ export function sortSpecQuery(query: SpecQuery): SpecQuery {
           return node;
       }
     },
-    joinEntry: (entry) => ({
-      ...entry,
-      qualifications: entry.qualifications.toSorted((a, b) => {
-        const ak = canonicalizeJson(a.axis);
-        const bk = canonicalizeJson(b.axis);
-        return ak < bk ? -1 : ak === bk ? 0 : 1;
-      }),
-    }),
+    joinEntry: (entry) => {
+      // Preserve absence of `qualifications` (absent == `[]`) so canonical
+      // output is stable across both input forms.
+      if (entry.qualifications === undefined || entry.qualifications.length === 0) {
+        return entry;
+      }
+      return {
+        ...entry,
+        qualifications: entry.qualifications.toSorted((a, b) => {
+          const ak = canonicalizeJson(a.axis);
+          const bk = canonicalizeJson(b.axis);
+          return ak < bk ? -1 : ak === bk ? 0 : 1;
+        }),
+      };
+    },
   });
 }
 
@@ -173,9 +180,9 @@ function cmpQuerySpec(lhs: SpecQuery, rhs: SpecQuery): number {
           ? 0
           : 1;
     case "inlineColumn":
-      return lhs.spec.id < (rhs as typeof lhs).spec.id
+      return lhs.spec.columnId < (rhs as typeof lhs).spec.columnId
         ? -1
-        : lhs.spec.id === (rhs as typeof lhs).spec.id
+        : lhs.spec.columnId === (rhs as typeof lhs).spec.columnId
           ? 0
           : 1;
     case "sparseToDenseColumn":
@@ -237,13 +244,16 @@ function cmpQuerySpec(lhs: SpecQuery, rhs: SpecQuery): number {
 function cmpQueryJoinEntrySpec(lhs: SpecQueryJoinEntry, rhs: SpecQueryJoinEntry): number {
   const cmp = cmpQuerySpec(lhs.entry, rhs.entry);
   if (cmp !== 0) return cmp;
-  if (lhs.qualifications.length !== rhs.qualifications.length) {
-    return lhs.qualifications.length - rhs.qualifications.length;
+  // Absent `qualifications` is equivalent to an empty list.
+  const lhsQ = lhs.qualifications ?? [];
+  const rhsQ = rhs.qualifications ?? [];
+  if (lhsQ.length !== rhsQ.length) {
+    return lhsQ.length - rhsQ.length;
   }
-  for (let i = 0; i < lhs.qualifications.length; i++) {
-    const lhsQ = canonicalizeJson(lhs.qualifications[i]);
-    const rhsQ = canonicalizeJson(rhs.qualifications[i]);
-    if (lhsQ !== rhsQ) return lhsQ < rhsQ ? -1 : 1;
+  for (let i = 0; i < lhsQ.length; i++) {
+    const l = canonicalizeJson(lhsQ[i]);
+    const r = canonicalizeJson(rhsQ[i]);
+    if (l !== r) return l < r ? -1 : 1;
   }
   return 0;
 }