@milaboratories/pl-model-common 1.24.6 → 1.24.7

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

@@ -0,0 +1,205 @@
+'use strict';
+
+var json = require('../../../json.cjs');
+var util = require('../../../util.cjs');
+
+const booleanTypesSet = new Set([
+    "numericComparison",
+    "stringEquals",
+    "stringContains",
+    "stringContainsFuzzy",
+    "stringRegex",
+    "isNull",
+    "not",
+    "and",
+    "or",
+    "isIn",
+]);
+function isBooleanExpression(expr) {
+    return booleanTypesSet.has(
+    // @ts-expect-error -- TypeScript doesn't understand the discriminated union here, but we do at runtime
+    expr.type);
+}
+/** Collects all column references from a SpecQuery tree. */
+function collectQueryColumns(query) {
+    const result = [];
+    collectQueryColumnsImpl(query, result);
+    return result;
+}
+function collectQueryColumnsImpl(query, result) {
+    switch (query.type) {
+        case "column":
+            result.push(query.column);
+            break;
+        case "sparseToDenseColumn":
+            result.push(query.column);
+            break;
+        case "inlineColumn":
+            break;
+        case "innerJoin":
+        case "fullJoin":
+            for (const e of query.entries)
+                collectQueryColumnsImpl(e.entry, result);
+            break;
+        case "outerJoin":
+            collectQueryColumnsImpl(query.primary.entry, result);
+            for (const e of query.secondary)
+                collectQueryColumnsImpl(e.entry, result);
+            break;
+        case "filter":
+        case "sort":
+        case "sliceAxes":
+            collectQueryColumnsImpl(query.input, result);
+            break;
+        default:
+            util.assertNever(query);
+    }
+}
+function sortQuerySpec(query) {
+    switch (query.type) {
+        case "column":
+        case "inlineColumn":
+            return query;
+        case "sparseToDenseColumn": {
+            const sortedAxesIndices = query.axesIndices.toSorted((lhs, rhs) => lhs - rhs);
+            return {
+                ...query,
+                axesIndices: sortedAxesIndices,
+            };
+        }
+        case "innerJoin":
+        case "fullJoin": {
+            const sortedEntries = query.entries.map(sortQueryJoinEntrySpec);
+            sortedEntries.sort(cmpQueryJoinEntrySpec);
+            return {
+                ...query,
+                entries: sortedEntries,
+            };
+        }
+        case "outerJoin": {
+            const sortedSecondary = query.secondary.map(sortQueryJoinEntrySpec);
+            sortedSecondary.sort(cmpQueryJoinEntrySpec);
+            return {
+                ...query,
+                primary: sortQueryJoinEntrySpec(query.primary),
+                secondary: sortedSecondary,
+            };
+        }
+        case "sliceAxes": {
+            const sortedAxisFilters = query.axisFilters.toSorted((lhs, rhs) => {
+                const lhsKey = json.canonicalizeJson(lhs.axisSelector);
+                const rhsKey = json.canonicalizeJson(rhs.axisSelector);
+                return lhsKey < rhsKey ? -1 : lhsKey === rhsKey ? 0 : 1;
+            });
+            return {
+                ...query,
+                input: sortQuerySpec(query.input),
+                axisFilters: sortedAxisFilters,
+            };
+        }
+        case "sort":
+            return {
+                ...query,
+                input: sortQuerySpec(query.input),
+            };
+        case "filter":
+            return {
+                ...query,
+                input: sortQuerySpec(query.input),
+            };
+        default:
+            util.assertNever(query);
+    }
+}
+function sortQueryJoinEntrySpec(entry) {
+    const sortedQualifications = entry.qualifications.toSorted((lhs, rhs) => {
+        const lhsKey = json.canonicalizeJson(lhs.axis);
+        const rhsKey = json.canonicalizeJson(rhs.axis);
+        return lhsKey < rhsKey ? -1 : lhsKey === rhsKey ? 0 : 1;
+    });
+    return {
+        entry: sortQuerySpec(entry.entry),
+        qualifications: sortedQualifications,
+    };
+}
+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 "sparseToDenseColumn":
+            return lhs.column < rhs.column
+                ? -1
+                : lhs.column === rhs.column
+                    ? 0
+                    : 1;
+        case "innerJoin":
+        case "fullJoin": {
+            const rhsJoin = rhs;
+            if (lhs.entries.length !== rhsJoin.entries.length) {
+                return lhs.entries.length - rhsJoin.entries.length;
+            }
+            for (let i = 0; i < lhs.entries.length; i++) {
+                const cmp = cmpQueryJoinEntrySpec(lhs.entries[i], rhsJoin.entries[i]);
+                if (cmp !== 0)
+                    return cmp;
+            }
+            return 0;
+        }
+        case "outerJoin": {
+            const rhsOuter = rhs;
+            const cmp = cmpQueryJoinEntrySpec(lhs.primary, rhsOuter.primary);
+            if (cmp !== 0)
+                return cmp;
+            if (lhs.secondary.length !== rhsOuter.secondary.length) {
+                return lhs.secondary.length - rhsOuter.secondary.length;
+            }
+            for (let i = 0; i < lhs.secondary.length; i++) {
+                const cmp = cmpQueryJoinEntrySpec(lhs.secondary[i], rhsOuter.secondary[i]);
+                if (cmp !== 0)
+                    return cmp;
+            }
+            return 0;
+        }
+        case "sliceAxes":
+            return cmpQuerySpec(lhs.input, rhs.input);
+        case "sort":
+            return cmpQuerySpec(lhs.input, rhs.input);
+        case "filter":
+            return cmpQuerySpec(lhs.input, rhs.input);
+        default:
+            util.assertNever(lhs);
+    }
+}
+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 = json.canonicalizeJson(lhs.qualifications[i]);
+        const rhsQ = json.canonicalizeJson(rhs.qualifications[i]);
+        if (lhsQ !== rhsQ)
+            return lhsQ < rhsQ ? -1 : 1;
+    }
+    return 0;
+}
+
+exports.collectQueryColumns = collectQueryColumns;
+exports.isBooleanExpression = isBooleanExpression;
+exports.sortQuerySpec = sortQuerySpec;
+//# sourceMappingURL=utils.cjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"utils.cjs","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/** Collects all column references from a SpecQuery tree. */\nexport function collectQueryColumns<C>(query: SpecQuery<C>): C[] {\n  const result: C[] = [];\n  collectQueryColumnsImpl(query, result);\n  return result;\n}\n\nfunction collectQueryColumnsImpl<C>(query: SpecQuery<C>, result: C[]): void {\n  switch (query.type) {\n    case \"column\":\n      result.push(query.column);\n      break;\n    case \"sparseToDenseColumn\":\n      result.push(query.column);\n      break;\n    case \"inlineColumn\":\n      break;\n    case \"innerJoin\":\n    case \"fullJoin\":\n      for (const e of query.entries) collectQueryColumnsImpl(e.entry, result);\n      break;\n    case \"outerJoin\":\n      collectQueryColumnsImpl(query.primary.entry, result);\n      for (const e of query.secondary) collectQueryColumnsImpl(e.entry, result);\n      break;\n    case \"filter\":\n    case \"sort\":\n    case \"sliceAxes\":\n      collectQueryColumnsImpl(query.input, result);\n      break;\n    default:\n      assertNever(query);\n  }\n}\n\nexport function sortQuerySpec(query: SpecQuery): SpecQuery {\n  switch (query.type) {\n    case \"column\":\n    case \"inlineColumn\":\n      return query;\n    case \"sparseToDenseColumn\": {\n      const sortedAxesIndices = query.axesIndices.toSorted((lhs, rhs) => lhs - rhs);\n      return {\n        ...query,\n        axesIndices: sortedAxesIndices,\n      };\n    }\n    case \"innerJoin\":\n    case \"fullJoin\": {\n      const sortedEntries = query.entries.map(sortQueryJoinEntrySpec);\n      sortedEntries.sort(cmpQueryJoinEntrySpec);\n      return {\n        ...query,\n        entries: sortedEntries,\n      };\n    }\n    case \"outerJoin\": {\n      const sortedSecondary = query.secondary.map(sortQueryJoinEntrySpec);\n      sortedSecondary.sort(cmpQueryJoinEntrySpec);\n      return {\n        ...query,\n        primary: sortQueryJoinEntrySpec(query.primary),\n        secondary: sortedSecondary,\n      };\n    }\n    case \"sliceAxes\": {\n      const sortedAxisFilters = query.axisFilters.toSorted((lhs, rhs) => {\n        const lhsKey = canonicalizeJson(lhs.axisSelector);\n        const rhsKey = canonicalizeJson(rhs.axisSelector);\n        return lhsKey < rhsKey ? -1 : lhsKey === rhsKey ? 0 : 1;\n      });\n      return {\n        ...query,\n        input: sortQuerySpec(query.input),\n        axisFilters: sortedAxisFilters,\n      };\n    }\n    case \"sort\":\n      return {\n        ...query,\n        input: sortQuerySpec(query.input),\n      };\n    case \"filter\":\n      return {\n        ...query,\n        input: sortQuerySpec(query.input),\n      };\n    default:\n      assertNever(query);\n  }\n}\n\nfunction sortQueryJoinEntrySpec(entry: SpecQueryJoinEntry): SpecQueryJoinEntry {\n  const sortedQualifications = entry.qualifications.toSorted((lhs, rhs) => {\n    const lhsKey = canonicalizeJson(lhs.axis);\n    const rhsKey = canonicalizeJson(rhs.axis);\n    return lhsKey < rhsKey ? -1 : lhsKey === rhsKey ? 0 : 1;\n  });\n  return {\n    entry: sortQuerySpec(entry.entry),\n    qualifications: sortedQualifications,\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 \"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"],"names":["assertNever","canonicalizeJson"],"mappings":"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"}

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

@@ -0,0 +1,6 @@
+import type { SpecQueryBooleanExpression, SpecQueryExpression, SpecQuery } from "./query_spec";
+export declare function isBooleanExpression(expr: SpecQueryExpression): expr is SpecQueryBooleanExpression;
+/** Collects all column references from a SpecQuery tree. */
+export declare function collectQueryColumns<C>(query: SpecQuery<C>): C[];
+export declare function sortQuerySpec(query: SpecQuery): SpecQuery;
+//# sourceMappingURL=utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/drivers/pframe/query/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,0BAA0B,EAC1B,mBAAmB,EACnB,SAAS,EAEV,MAAM,cAAc,CAAC;AAetB,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,mBAAmB,GAAG,IAAI,IAAI,0BAA0B,CAKjG;AAED,4DAA4D;AAC5D,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAI/D;AA8BD,wBAAgB,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,SAAS,CAuDzD"}

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

@@ -0,0 +1,201 @@
+import { canonicalizeJson } from '../../../json.js';
+import { assertNever } from '../../../util.js';
+
+const booleanTypesSet = new Set([
+    "numericComparison",
+    "stringEquals",
+    "stringContains",
+    "stringContainsFuzzy",
+    "stringRegex",
+    "isNull",
+    "not",
+    "and",
+    "or",
+    "isIn",
+]);
+function isBooleanExpression(expr) {
+    return booleanTypesSet.has(
+    // @ts-expect-error -- TypeScript doesn't understand the discriminated union here, but we do at runtime
+    expr.type);
+}
+/** Collects all column references from a SpecQuery tree. */
+function collectQueryColumns(query) {
+    const result = [];
+    collectQueryColumnsImpl(query, result);
+    return result;
+}
+function collectQueryColumnsImpl(query, result) {
+    switch (query.type) {
+        case "column":
+            result.push(query.column);
+            break;
+        case "sparseToDenseColumn":
+            result.push(query.column);
+            break;
+        case "inlineColumn":
+            break;
+        case "innerJoin":
+        case "fullJoin":
+            for (const e of query.entries)
+                collectQueryColumnsImpl(e.entry, result);
+            break;
+        case "outerJoin":
+            collectQueryColumnsImpl(query.primary.entry, result);
+            for (const e of query.secondary)
+                collectQueryColumnsImpl(e.entry, result);
+            break;
+        case "filter":
+        case "sort":
+        case "sliceAxes":
+            collectQueryColumnsImpl(query.input, result);
+            break;
+        default:
+            assertNever(query);
+    }
+}
+function sortQuerySpec(query) {
+    switch (query.type) {
+        case "column":
+        case "inlineColumn":
+            return query;
+        case "sparseToDenseColumn": {
+            const sortedAxesIndices = query.axesIndices.toSorted((lhs, rhs) => lhs - rhs);
+            return {
+                ...query,
+                axesIndices: sortedAxesIndices,
+            };
+        }
+        case "innerJoin":
+        case "fullJoin": {
+            const sortedEntries = query.entries.map(sortQueryJoinEntrySpec);
+            sortedEntries.sort(cmpQueryJoinEntrySpec);
+            return {
+                ...query,
+                entries: sortedEntries,
+            };
+        }
+        case "outerJoin": {
+            const sortedSecondary = query.secondary.map(sortQueryJoinEntrySpec);
+            sortedSecondary.sort(cmpQueryJoinEntrySpec);
+            return {
+                ...query,
+                primary: sortQueryJoinEntrySpec(query.primary),
+                secondary: sortedSecondary,
+            };
+        }
+        case "sliceAxes": {
+            const sortedAxisFilters = query.axisFilters.toSorted((lhs, rhs) => {
+                const lhsKey = canonicalizeJson(lhs.axisSelector);
+                const rhsKey = canonicalizeJson(rhs.axisSelector);
+                return lhsKey < rhsKey ? -1 : lhsKey === rhsKey ? 0 : 1;
+            });
+            return {
+                ...query,
+                input: sortQuerySpec(query.input),
+                axisFilters: sortedAxisFilters,
+            };
+        }
+        case "sort":
+            return {
+                ...query,
+                input: sortQuerySpec(query.input),
+            };
+        case "filter":
+            return {
+                ...query,
+                input: sortQuerySpec(query.input),
+            };
+        default:
+            assertNever(query);
+    }
+}
+function sortQueryJoinEntrySpec(entry) {
+    const sortedQualifications = entry.qualifications.toSorted((lhs, rhs) => {
+        const lhsKey = canonicalizeJson(lhs.axis);
+        const rhsKey = canonicalizeJson(rhs.axis);
+        return lhsKey < rhsKey ? -1 : lhsKey === rhsKey ? 0 : 1;
+    });
+    return {
+        entry: sortQuerySpec(entry.entry),
+        qualifications: sortedQualifications,
+    };
+}
+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 "sparseToDenseColumn":
+            return lhs.column < rhs.column
+                ? -1
+                : lhs.column === rhs.column
+                    ? 0
+                    : 1;
+        case "innerJoin":
+        case "fullJoin": {
+            const rhsJoin = rhs;
+            if (lhs.entries.length !== rhsJoin.entries.length) {
+                return lhs.entries.length - rhsJoin.entries.length;
+            }
+            for (let i = 0; i < lhs.entries.length; i++) {
+                const cmp = cmpQueryJoinEntrySpec(lhs.entries[i], rhsJoin.entries[i]);
+                if (cmp !== 0)
+                    return cmp;
+            }
+            return 0;
+        }
+        case "outerJoin": {
+            const rhsOuter = rhs;
+            const cmp = cmpQueryJoinEntrySpec(lhs.primary, rhsOuter.primary);
+            if (cmp !== 0)
+                return cmp;
+            if (lhs.secondary.length !== rhsOuter.secondary.length) {
+                return lhs.secondary.length - rhsOuter.secondary.length;
+            }
+            for (let i = 0; i < lhs.secondary.length; i++) {
+                const cmp = cmpQueryJoinEntrySpec(lhs.secondary[i], rhsOuter.secondary[i]);
+                if (cmp !== 0)
+                    return cmp;
+            }
+            return 0;
+        }
+        case "sliceAxes":
+            return cmpQuerySpec(lhs.input, rhs.input);
+        case "sort":
+            return cmpQuerySpec(lhs.input, rhs.input);
+        case "filter":
+            return cmpQuerySpec(lhs.input, rhs.input);
+        default:
+            assertNever(lhs);
+    }
+}
+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;
+    }
+    return 0;
+}
+
+export { collectQueryColumns, isBooleanExpression, sortQuerySpec };
+//# sourceMappingURL=utils.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","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/** Collects all column references from a SpecQuery tree. */\nexport function collectQueryColumns<C>(query: SpecQuery<C>): C[] {\n  const result: C[] = [];\n  collectQueryColumnsImpl(query, result);\n  return result;\n}\n\nfunction collectQueryColumnsImpl<C>(query: SpecQuery<C>, result: C[]): void {\n  switch (query.type) {\n    case \"column\":\n      result.push(query.column);\n      break;\n    case \"sparseToDenseColumn\":\n      result.push(query.column);\n      break;\n    case \"inlineColumn\":\n      break;\n    case \"innerJoin\":\n    case \"fullJoin\":\n      for (const e of query.entries) collectQueryColumnsImpl(e.entry, result);\n      break;\n    case \"outerJoin\":\n      collectQueryColumnsImpl(query.primary.entry, result);\n      for (const e of query.secondary) collectQueryColumnsImpl(e.entry, result);\n      break;\n    case \"filter\":\n    case \"sort\":\n    case \"sliceAxes\":\n      collectQueryColumnsImpl(query.input, result);\n      break;\n    default:\n      assertNever(query);\n  }\n}\n\nexport function sortQuerySpec(query: SpecQuery): SpecQuery {\n  switch (query.type) {\n    case \"column\":\n    case \"inlineColumn\":\n      return query;\n    case \"sparseToDenseColumn\": {\n      const sortedAxesIndices = query.axesIndices.toSorted((lhs, rhs) => lhs - rhs);\n      return {\n        ...query,\n        axesIndices: sortedAxesIndices,\n      };\n    }\n    case \"innerJoin\":\n    case \"fullJoin\": {\n      const sortedEntries = query.entries.map(sortQueryJoinEntrySpec);\n      sortedEntries.sort(cmpQueryJoinEntrySpec);\n      return {\n        ...query,\n        entries: sortedEntries,\n      };\n    }\n    case \"outerJoin\": {\n      const sortedSecondary = query.secondary.map(sortQueryJoinEntrySpec);\n      sortedSecondary.sort(cmpQueryJoinEntrySpec);\n      return {\n        ...query,\n        primary: sortQueryJoinEntrySpec(query.primary),\n        secondary: sortedSecondary,\n      };\n    }\n    case \"sliceAxes\": {\n      const sortedAxisFilters = query.axisFilters.toSorted((lhs, rhs) => {\n        const lhsKey = canonicalizeJson(lhs.axisSelector);\n        const rhsKey = canonicalizeJson(rhs.axisSelector);\n        return lhsKey < rhsKey ? -1 : lhsKey === rhsKey ? 0 : 1;\n      });\n      return {\n        ...query,\n        input: sortQuerySpec(query.input),\n        axisFilters: sortedAxisFilters,\n      };\n    }\n    case \"sort\":\n      return {\n        ...query,\n        input: sortQuerySpec(query.input),\n      };\n    case \"filter\":\n      return {\n        ...query,\n        input: sortQuerySpec(query.input),\n      };\n    default:\n      assertNever(query);\n  }\n}\n\nfunction sortQueryJoinEntrySpec(entry: SpecQueryJoinEntry): SpecQueryJoinEntry {\n  const sortedQualifications = entry.qualifications.toSorted((lhs, rhs) => {\n    const lhsKey = canonicalizeJson(lhs.axis);\n    const rhsKey = canonicalizeJson(rhs.axis);\n    return lhsKey < rhsKey ? -1 : lhsKey === rhsKey ? 0 : 1;\n  });\n  return {\n    entry: sortQuerySpec(entry.entry),\n    qualifications: sortedQualifications,\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 \"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"],"names":[],"mappings":"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"}

package/dist/drivers/pframe/table_calculate.cjs

@@ -1,10 +1,75 @@
 'use strict';
 
 var util = require('../../util.cjs');
+var spec = require('./spec/spec.cjs');
+var json = require('../../json.cjs');
 
 function mapPTableDef(def, cb) {
     return { ...def, src: mapJoinEntry(def.src, cb) };
 }
+function sortPTableDef(def) {
+    function sortFilters(filters) {
+        return filters.toSorted((lhs, rhs) => {
+            if (lhs.column.type === "axis" && rhs.column.type === "axis") {
+                const lhsId = json.canonicalizeJson(spec.getAxisId(lhs.column.id));
+                const rhsId = json.canonicalizeJson(spec.getAxisId(rhs.column.id));
+                return lhsId < rhsId ? -1 : 1;
+            }
+            else if (lhs.column.type === "column" && rhs.column.type === "column") {
+                return lhs.column.id < rhs.column.id ? -1 : 1;
+            }
+            else {
+                return lhs.column.type === "axis" ? -1 : 1;
+            }
+        });
+    }
+    return {
+        src: sortJoinEntry(def.src),
+        partitionFilters: sortFilters(def.partitionFilters),
+        filters: sortFilters(def.filters),
+        sorting: def.sorting,
+    };
+}
+function mapPTableDefV2(def, cb) {
+    return { query: mapQuerySpec(def.query, cb) };
+}
+/** Recursively maps all column references in a SpecQuery tree. */
+function mapQuerySpec(query, cb) {
+    switch (query.type) {
+        case "column":
+            return { type: "column", column: cb(query.column) };
+        case "sparseToDenseColumn":
+            return { ...query, column: cb(query.column) };
+        case "inlineColumn":
+            return query;
+        case "innerJoin":
+        case "fullJoin":
+            return {
+                ...query,
+                entries: query.entries.map((e) => mapQueryJoinEntrySpec(e, cb)),
+            };
+        case "outerJoin":
+            return {
+                ...query,
+                primary: mapQueryJoinEntrySpec(query.primary, cb),
+                secondary: query.secondary.map((e) => mapQueryJoinEntrySpec(e, cb)),
+            };
+        case "filter":
+            return { ...query, input: mapQuerySpec(query.input, cb) };
+        case "sort":
+            return { ...query, input: mapQuerySpec(query.input, cb) };
+        case "sliceAxes":
+            return { ...query, input: mapQuerySpec(query.input, cb) };
+        default:
+            util.assertNever(query);
+    }
+}
+function mapQueryJoinEntrySpec(entry, cb) {
+    return {
+        ...entry,
+        entry: mapQuerySpec(entry.entry, cb),
+    };
+}
 function mapJoinEntry(entry, cb) {
     switch (entry.type) {
         case "column":
@@ -44,7 +109,95 @@ function mapJoinEntry(entry, cb) {
             util.assertNever(entry);
     }
 }
+function cmpJoinEntries(lhs, rhs) {
+    if (lhs.type !== rhs.type) {
+        return lhs.type < rhs.type ? -1 : 1;
+    }
+    const type = lhs.type;
+    switch (type) {
+        case "column":
+            return lhs.column < rhs.column ? -1 : 1;
+        case "slicedColumn":
+        case "artificialColumn":
+            return lhs.newId < rhs.newId ? -1 : 1;
+        case "inlineColumn": {
+            return lhs.column.id < rhs.column.id ? -1 : 1;
+        }
+        case "inner":
+        case "full": {
+            const rhsInner = rhs;
+            if (lhs.entries.length !== rhsInner.entries.length) {
+                return lhs.entries.length - rhsInner.entries.length;
+            }
+            for (let i = 0; i < lhs.entries.length; i++) {
+                const cmp = cmpJoinEntries(lhs.entries[i], rhsInner.entries[i]);
+                if (cmp !== 0) {
+                    return cmp;
+                }
+            }
+            return 0;
+        }
+        case "outer": {
+            const rhsOuter = rhs;
+            const cmp = cmpJoinEntries(lhs.primary, rhsOuter.primary);
+            if (cmp !== 0) {
+                return cmp;
+            }
+            if (lhs.secondary.length !== rhsOuter.secondary.length) {
+                return lhs.secondary.length - rhsOuter.secondary.length;
+            }
+            for (let i = 0; i < lhs.secondary.length; i++) {
+                const cmp = cmpJoinEntries(lhs.secondary[i], rhsOuter.secondary[i]);
+                if (cmp !== 0) {
+                    return cmp;
+                }
+            }
+            return 0;
+        }
+        default:
+            util.assertNever(type);
+    }
+}
+function sortJoinEntry(entry) {
+    switch (entry.type) {
+        case "column":
+        case "slicedColumn":
+        case "inlineColumn":
+            return entry;
+        case "artificialColumn": {
+            const sortedAxesIndices = entry.axesIndices.toSorted((lhs, rhs) => lhs - rhs);
+            return {
+                ...entry,
+                axesIndices: sortedAxesIndices,
+            };
+        }
+        case "inner":
+        case "full": {
+            const sortedEntries = entry.entries.map(sortJoinEntry);
+            sortedEntries.sort(cmpJoinEntries);
+            return {
+                ...entry,
+                entries: sortedEntries,
+            };
+        }
+        case "outer": {
+            const sortedSecondary = entry.secondary.map(sortJoinEntry);
+            sortedSecondary.sort(cmpJoinEntries);
+            return {
+                ...entry,
+                primary: sortJoinEntry(entry.primary),
+                secondary: sortedSecondary,
+            };
+        }
+        default:
+            util.assertNever(entry);
+    }
+}
 
 exports.mapJoinEntry = mapJoinEntry;
 exports.mapPTableDef = mapPTableDef;
+exports.mapPTableDefV2 = mapPTableDefV2;
+exports.mapQuerySpec = mapQuerySpec;
+exports.sortJoinEntry = sortJoinEntry;
+exports.sortPTableDef = sortPTableDef;
 //# sourceMappingURL=table_calculate.cjs.map