@nshiab/simple-data-analysis-core 2.0.5 → 2.0.7

package/script/helpers/updateColumnsWithJS.js

@@ -0,0 +1,145 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = updateColumnsWithJS;
+const quoteIdentifier_js_1 = __importDefault(require("./quoteIdentifier.js"));
+const readMutationRows_js_1 = __importDefault(require("./readMutationRows.js"));
+const tableRegistry_js_1 = require("./tableRegistry.js");
+const loadArray_js_1 = require("../methods/loadArray.js");
+/**
+ * Generates columns from selected input columns, keeping other SQL values in
+ * DuckDB. Call from an asynchronous extension barrier. The callback must return
+ * one row per input row in the same order; only the declared output columns are
+ * stored. Existing output columns are replaced, with types inferred from the
+ * generated values. Generation runs sequentially in bounded batches (1,000 rows
+ * by default); callbacks must not depend on receiving the whole table. Non-null
+ * output types must agree across batches. All-null batches defer type inference.
+ * Only one batch of inputs and outputs is retained by this helper in JavaScript;
+ * callers must also bound their own buffering. Reads finish before callbacks or
+ * writes use the shared connection. The original table is replaced only after
+ * staging succeeds. Empty tables are unchanged and do not invoke the callback;
+ * outputs that remain null in every batch use VARCHAR.
+ *
+ * Untouched geometry columns remain in DuckDB, preserving their values, types
+ * and CRS without GeoJSON conversion. Geometry columns cannot be selected as
+ * inputs or overwritten as outputs; use updateWithJS() for editable GeoJSON.
+ * This SQL-only preservation path accepts any source CRS.
+ *
+ * @param table - Table to enrich.
+ * @param inputColumns - Columns available to the callback.
+ * @param outputColumns - Generated columns to add or replace.
+ * @param generate - Produces one result per input row, in input order.
+ * @param options - Controls the maximum rows read, generated, and staged at once.
+ * @returns Resolves after merging the generated columns into the table.
+ * @example
+ * ```ts
+ * queueAsyncBarrier(table, {
+ *   method: "label()",
+ *   parameters: null,
+ *   execute: () => updateColumnsWithJS(table, ["name"], ["label"], async (rows) =>
+ *     rows.map((row) => ({ label: String(row.name).toUpperCase() })),
+ *     { batchSize: 500 }),
+ * });
+ * await table.log();
+ * ```
+ */
+async function updateColumnsWithJS(table, inputColumns, outputColumns, generate, options = {}) {
+    const batchSize = options.batchSize ?? 1000;
+    if (!Number.isSafeInteger(batchSize) || batchSize < 1) {
+        throw new Error("batchSize must be a positive safe integer.");
+    }
+    if (inputColumns.length === 0 || outputColumns.length === 0) {
+        throw new Error("Input and output columns must not be empty.");
+    }
+    if (new Set(outputColumns.map((name) => name.toLowerCase())).size !==
+        outputColumns.length) {
+        throw new Error("Output columns must be unique.");
+    }
+    const types = await table.getTypes();
+    for (const [name, type] of Object.entries(types)) {
+        if (type.toUpperCase().startsWith("GEOMETRY") &&
+            [...inputColumns, ...outputColumns].some((column) => column.toLowerCase() === name.toLowerCase())) {
+            throw new Error(`Geometry column ${JSON.stringify(name)} cannot be an input or output of updateColumnsWithJS(); use updateWithJS() for editable GeoJSON.`);
+        }
+    }
+    const suffix = crypto.randomUUID().replaceAll("-", "");
+    const id = `__sda_id_${suffix}`;
+    const snapshot = `__sda_source_${suffix}`;
+    const staged = table.sdb.newTable(`__sda_generated_${suffix}`);
+    const batch = table.sdb.newTable(`__sda_batch_${suffix}`);
+    const q = quoteIdentifier_js_1.default;
+    try {
+        // A SQL snapshot gives every row a stable identity, including duplicate rows
+        // and user columns named rowid. No untouched values cross the JS boundary.
+        await table.sdb.customQuery(`CREATE TEMP TABLE ${q(snapshot)} AS SELECT *, row_number() OVER () AS ${q(id)} FROM ${q(table.name)}`);
+        const knownTypes = new Map();
+        let lastId = "0";
+        let hasRows = false;
+        while (true) {
+            const upperId = BigInt(lastId) + BigInt(batchSize);
+            const { rows } = await (0, readMutationRows_js_1.default)(table.connection, `SELECT ${q(id)}, ${inputColumns.map(q).join(", ")} FROM ${q(snapshot)} WHERE ${q(id)} > ${lastId} AND ${q(id)} <= ${upperId}
+        ORDER BY ${q(id)} LIMIT ${batchSize}`);
+            if (rows.length === 0)
+                break;
+            const ids = rows.map((row) => String(row[id]));
+            lastId = ids[ids.length - 1];
+            for (const row of rows)
+                delete row[id];
+            const generated = await generate(rows);
+            if (generated.length !== ids.length) {
+                throw new Error("Column generation must return one row per input row.");
+            }
+            // Generated vectors retain this helper's existing inference contract.
+            await (0, loadArray_js_1.executePreparedArray)(batch, (0, loadArray_js_1.prepareArray)(generated.map((row, i) => ({
+                ...Object.fromEntries(outputColumns.map((name) => [name, row[name]])),
+                [id]: ids[i],
+            }))));
+            const batchTypes = await batch.getTypes();
+            for (const name of outputColumns) {
+                const nonNull = generated.some((row) => row[name] !== null && row[name] !== undefined);
+                if (!nonNull)
+                    continue;
+                const previous = knownTypes.get(name);
+                const current = batchTypes[name];
+                if (previous !== undefined && previous !== current) {
+                    throw new Error(`Generated column ${JSON.stringify(name)} changed type from ${previous} to ${current}.`);
+                }
+                if (previous === undefined) {
+                    knownTypes.set(name, current);
+                    if (hasRows) {
+                        await table.sdb.customQuery(`ALTER TABLE ${q(staged.name)} ALTER COLUMN ${q(name)} TYPE ${current} USING NULL`);
+                    }
+                }
+            }
+            if (!hasRows) {
+                await table.sdb.customQuery(`CREATE TEMP TABLE ${q(staged.name)} AS SELECT * FROM ${q(batch.name)}`);
+                hasRows = true;
+            }
+            else {
+                await table.sdb.customQuery(`INSERT INTO ${q(staged.name)} SELECT * FROM ${q(batch.name)}`);
+            }
+        }
+        if (!hasRows)
+            return;
+        const outputs = new Map(outputColumns.map((name) => [name.toLowerCase(), name]));
+        const columns = Object.keys(types).map((name) => {
+            const replacement = outputs.get(name.toLowerCase());
+            return replacement === undefined
+                ? `original.${q(name)}`
+                : `generated.${q(replacement)} AS ${q(name)}`;
+        });
+        const existing = new Set(Object.keys(types).map((name) => name.toLowerCase()));
+        for (const name of outputColumns) {
+            if (!existing.has(name.toLowerCase())) {
+                columns.push(`generated.${q(name)}`);
+            }
+        }
+        await table.sdb.customQuery(`CREATE OR REPLACE TABLE ${q(table.name)} AS SELECT ${columns.join(", ")} FROM ${q(snapshot)} original JOIN ${q(staged.name)} generated ON original.${q(id)} = CAST(generated.${q(id)} AS BIGINT) ORDER BY original.${q(id)}`);
+    }
+    finally {
+        await table.sdb.customQuery(`DROP TABLE IF EXISTS ${q(snapshot)}; DROP TABLE IF EXISTS ${q(staged.name)}; DROP TABLE IF EXISTS ${q(batch.name)};`);
+        (0, tableRegistry_js_1.retainRegisteredTables)(table.sdb, (item) => item !== staged && item !== batch);
+    }
+}

package/script/methods/addColumn.d.ts

@@ -1,3 +1,3 @@
 import type SimpleTable from "../class/SimpleTable.js";
-export default function addColumn(simpleTable: SimpleTable, newColumn: string, type: "integer" | "float" | "number" | "string" | "date" | "time" | "datetime" | "datetimeTz" | "bigint" | "double" | "varchar" | "timestamp" | "timestamp with time zone" | "boolean" | `geometry('${string}')` | `GEOMETRY('${string}')`, definition: string): void;
+export default function addColumn(simpleTable: SimpleTable, newColumn: string, type: "integer" | "float" | "number" | "string" | "date" | "time" | "datetime" | "datetimeTz" | "bigint" | "double" | "varchar" | "timestamp" | "timestamp with time zone" | "boolean" | "json" | "JSON" | `float[${number}]` | `FLOAT[${number}]` | `geometry('${string}')` | `GEOMETRY('${string}')`, definition: string): void;
 //# sourceMappingURL=addColumn.d.ts.map

package/script/methods/addColumn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addColumn.d.ts","sourceRoot":"","sources":["../../src/methods/addColumn.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAEvD,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,MAAM,EACjB,IAAI,EACA,SAAS,GACT,OAAO,GACP,QAAQ,GACR,QAAQ,GACR,MAAM,GACN,MAAM,GACN,UAAU,GACV,YAAY,GACZ,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,WAAW,GACX,0BAA0B,GAC1B,SAAS,GACT,aAAa,MAAM,IAAI,GACvB,aAAa,MAAM,IAAI,EAC3B,UAAU,EAAE,MAAM,QAuBnB"}
+{"version":3,"file":"addColumn.d.ts","sourceRoot":"","sources":["../../src/methods/addColumn.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAEvD,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,MAAM,EACjB,IAAI,EACA,SAAS,GACT,OAAO,GACP,QAAQ,GACR,QAAQ,GACR,MAAM,GACN,MAAM,GACN,UAAU,GACV,YAAY,GACZ,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,WAAW,GACX,0BAA0B,GAC1B,SAAS,GACT,MAAM,GACN,MAAM,GACN,SAAS,MAAM,GAAG,GAClB,SAAS,MAAM,GAAG,GAClB,aAAa,MAAM,IAAI,GACvB,aAAa,MAAM,IAAI,EAC3B,UAAU,EAAE,MAAM,QAuBnB"}

package/script/methods/bins.d.ts

@@ -1,5 +1,5 @@
 import type SimpleTable from "../class/SimpleTable.js";
-export default function bins(simpleTable: SimpleTable, column: string, interval: number, newColumn: string, options?: {
+export default function bins(simpleTable: SimpleTable, column: string, interval: number, startColumn: string, endColumn: string, options?: {
     startValue?: number;
 }): void;
 //# sourceMappingURL=bins.d.ts.map

package/script/methods/bins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bins.d.ts","sourceRoot":"","sources":["../../src/methods/bins.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAEvD,MAAM,CAAC,OAAO,UAAU,IAAI,CAC1B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;IACP,UAAU,CAAC,EAAE,MAAM,CAAC;CAChB,QAiCP"}
+{"version":3,"file":"bins.d.ts","sourceRoot":"","sources":["../../src/methods/bins.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAEvD,MAAM,CAAC,OAAO,UAAU,IAAI,CAC1B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;IACP,UAAU,CAAC,EAAE,MAAM,CAAC;CAChB,QAsDP"}

package/script/methods/bins.js

@@ -9,11 +9,20 @@ const assertNewColumns_js_1 = __importDefault(require("../helpers/assertNewColum
 const mergeOptions_js_1 = __importDefault(require("../helpers/mergeOptions.js"));
 const queryDB_js_1 = __importDefault(require("../helpers/queryDB.js"));
 const queueOp_js_1 = __importDefault(require("../helpers/queueOp.js"));
-function bins(simpleTable, column, interval, newColumn, options = {}) {
+function bins(simpleTable, column, interval, startColumn, endColumn, options = {}) {
     // This validation does not need the database, so it stays at call time.
     if (!Number.isFinite(interval) || interval <= 0) {
         throw new Error("bins() interval must be a finite number greater than 0.");
     }
+    if (typeof startColumn !== "string" || typeof endColumn !== "string") {
+        throw new Error("bins() requires start and end output column names.");
+    }
+    if (startColumn.toLowerCase() === endColumn.toLowerCase()) {
+        throw new Error("bins() start and end output column names must be distinct.");
+    }
+    if (options.startValue !== undefined && !Number.isFinite(options.startValue)) {
+        throw new Error("bins() startValue must be a finite number.");
+    }
     // The intervals depend on the minimum and maximum values of the data, so
     // bins can't be expressed as a single SELECT over its input: it executes
     // as a barrier.
@@ -21,37 +30,40 @@ function bins(simpleTable, column, interval, newColumn, options = {}) {
     (0, queueOp_js_1.default)(simpleTable, {
         kind: "barrier",
         method: "bins()",
-        parameters: { column, interval, newColumn, options },
+        parameters: { column, interval, startColumn, endColumn, options },
         execute: async () => {
-            await (0, queryDB_js_1.default)(simpleTable, await binsQuery(simpleTable, column, interval, newColumn, options), (0, mergeOptions_js_1.default)(simpleTable, {
+            await (0, queryDB_js_1.default)(simpleTable, await binsQuery(simpleTable, column, interval, startColumn, endColumn, options), (0, mergeOptions_js_1.default)(simpleTable, {
                 table: simpleTable.name,
                 method: "bins()",
                 parameters: {
                     column,
                     interval,
-                    newColumn,
+                    startColumn,
+                    endColumn,
                     options,
                 },
             }));
         },
     });
 }
-async function binsQuery(SimpleTable, column, interval, newColumn, options = {}) {
+async function binsQuery(SimpleTable, column, interval, startColumn, endColumn, options = {}) {
     // A SELECT *, expr AS col colliding with an existing column would be
     // silently renamed by DuckDB (col -> col_1) instead of erroring, unlike
     // the ALTER TABLE ADD this used to run.
-    (0, assertNewColumns_js_1.default)(await SimpleTable.getTypes(), [newColumn], "bins()");
+    const types = await SimpleTable.getTypes();
+    const existingColumns = Object.keys(types);
+    (0, assertNewColumns_js_1.default)(types, [startColumn, endColumn].map((column) => existingColumns.find((existing) => existing.toLowerCase() === column.toLowerCase()) ?? column), "bins()");
     // The minimum and maximum are computed in one scan instead of one
     // getMin/getMax query each.
     const minMax = await (0, queryDB_js_1.default)(SimpleTable, `SELECT MIN(${(0, quoteIdentifier_js_1.default)(column)}) AS "min", MAX(${(0, quoteIdentifier_js_1.default)(column)}) AS "max" FROM ${(0, quoteIdentifier_js_1.default)(SimpleTable.name)}`, (0, mergeOptions_js_1.default)(SimpleTable, {
         table: SimpleTable.name,
         method: "bins()",
-        parameters: { column, interval, newColumn, options },
+        parameters: { column, interval, startColumn, endColumn, options },
         returnData: true,
     }));
     const minValue = minMax?.[0]?.min;
-    if (typeof minValue !== "number") {
-        throw new Error(`minValue of ${column} is not a number`);
+    if (typeof minValue !== "number" || !Number.isFinite(minValue)) {
+        throw new Error(`minValue of ${column} is not a finite number`);
     }
     let startValue;
     if (typeof options.startValue === "number") {
@@ -64,30 +76,34 @@ async function binsQuery(SimpleTable, column, interval, newColumn, options = {})
         startValue = minValue;
     }
     const maxValue = minMax?.[0]?.max;
-    if (typeof maxValue !== "number") {
-        throw new Error(`maxValue of ${column} is not a number`);
+    if (typeof maxValue !== "number" || !Number.isFinite(maxValue)) {
+        throw new Error(`maxValue of ${column} is not a finite number`);
     }
-    const endValue = maxValue;
-    let increment = 1;
-    let decimals = 0;
-    const intervalAsString = interval.toString();
-    const decimalIndex = intervalAsString.indexOf(".");
-    if (decimalIndex > 0) {
-        decimals = intervalAsString.substring(decimalIndex + 1).length;
-        increment = 1.0 / (10.0 * decimals);
+    const starts = [];
+    const ends = [];
+    // Include the bin beginning at the maximum, even if floating-point division
+    // places an exact boundary slightly below its integer index.
+    const lastBin = Math.ceil((maxValue - startValue) / interval);
+    if (!Number.isSafeInteger(lastBin)) {
+        throw new Error("bins() range contains too many intervals.");
     }
-    const intervals = [];
-    for (let i = startValue; i <= endValue; i += interval) {
-        const start = i;
-        const end = (i + interval - increment).toFixed(decimals);
-        intervals.push(`WHEN ${(0, quoteIdentifier_js_1.default)(column)} >= ${start} AND ${(0, quoteIdentifier_js_1.default)(column)} <= ${end} THEN '[${start}-${end}]'`);
+    for (let i = 0; i <= lastBin; i++) {
+        // Let SQL evaluate the boundaries from numeric literals, avoiding repeated
+        // floating-point addition in JavaScript for fractional intervals.
+        // Decimal indices also prevent integer-only expressions from overflowing
+        // DuckDB's inferred INT32 type when an end exceeds that range.
+        const start = `(${startValue} + ${i}.0 * ${interval})`;
+        const end = `(${startValue} + ${i + 1}.0 * ${interval})`;
+        const condition = `WHEN ${(0, quoteIdentifier_js_1.default)(column)} >= ${start} AND ${(0, quoteIdentifier_js_1.default)(column)} < ${end}`;
+        starts.push(`${condition} THEN ${start}`);
+        ends.push(`${condition} THEN ${end}`);
     }
-    // A single rewrite, so the table is scanned once instead of once for the
-    // ALTER and once for the UPDATE.
+    // Keep both outputs numeric, including fractional boundaries. Null source
+    // values match no interval and yield null in both output columns.
     const query = `CREATE OR REPLACE TABLE ${(0, quoteIdentifier_js_1.default)(SimpleTable.name)} AS
-    SELECT *, CASE
-    ${intervals.join("\n")}
-    END AS ${(0, quoteIdentifier_js_1.default)(newColumn)}
+    SELECT *,
+      CAST(CASE ${starts.join("\n")} END AS DOUBLE) AS ${(0, quoteIdentifier_js_1.default)(startColumn)},
+      CAST(CASE ${ends.join("\n")} END AS DOUBLE) AS ${(0, quoteIdentifier_js_1.default)(endColumn)}
     FROM ${(0, quoteIdentifier_js_1.default)(SimpleTable.name)}`;
     return query;
 }

package/script/methods/bm25.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bm25.d.ts","sourceRoot":"","sources":["../../src/methods/bm25.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAMvD,MAAM,CAAC,OAAO,UAAU,IAAI,CAC1B,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,OAAO,GAAE;IACP,OAAO,CAAC,EACJ,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,QAAQ,GACR,OAAO,GACP,SAAS,GACT,SAAS,GACT,QAAQ,GACR,QAAQ,GACR,OAAO,GACP,OAAO,GACP,WAAW,GACX,YAAY,GACZ,OAAO,GACP,SAAS,GACT,YAAY,GACZ,QAAQ,GACR,WAAW,GACX,QAAQ,GACR,YAAY,GACZ,UAAU,GACV,SAAS,GACT,SAAS,GACT,SAAS,GACT,SAAS,GACT,OAAO,GACP,SAAS,GACT,MAAM,CAAC;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;CACd,GACL,WAAW,CA4Bb"}
+{"version":3,"file":"bm25.d.ts","sourceRoot":"","sources":["../../src/methods/bm25.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAMvD,MAAM,CAAC,OAAO,UAAU,IAAI,CAC1B,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,OAAO,GAAE;IACP,OAAO,CAAC,EACJ,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,QAAQ,GACR,OAAO,GACP,SAAS,GACT,SAAS,GACT,QAAQ,GACR,QAAQ,GACR,OAAO,GACP,OAAO,GACP,WAAW,GACX,YAAY,GACZ,OAAO,GACP,SAAS,GACT,YAAY,GACZ,QAAQ,GACR,WAAW,GACX,QAAQ,GACR,YAAY,GACZ,UAAU,GACV,SAAS,GACT,SAAS,GACT,SAAS,GACT,SAAS,GACT,OAAO,GACP,SAAS,GACT,MAAM,CAAC;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;CACd,GACL,WAAW,CA4Bb"}

package/script/methods/bm25.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = bm25;
 const quoteIdentifier_js_1 = __importDefault(require("../helpers/quoteIdentifier.js"));
-const camelCase_js_1 = __importDefault(require("../helpers/camelCase.js"));
 const queryDB_js_1 = __importDefault(require("../helpers/queryDB.js"));
 const mergeOptions_js_1 = __importDefault(require("../helpers/mergeOptions.js"));
 const queueOp_js_1 = __importDefault(require("../helpers/queueOp.js"));
@@ -45,7 +44,7 @@ async function executeBm25(simpleTable, outputTable, text, idColumn, textColumn,
     const selectClause = typeof options.scoreColumn === "string"
         ? `* EXCLUDE(score), score AS ${(0, quoteIdentifier_js_1.default)(options.scoreColumn)}`
         : `* EXCLUDE(score)`;
-    await (0, queryDB_js_1.default)(simpleTable, `CREATE OR REPLACE TABLE ${(0, quoteIdentifier_js_1.default)(outputTable.name)} AS SELECT ${selectClause} FROM (SELECT *, ${(0, quoteIdentifier_js_1.default)(`fts_main_${(0, camelCase_js_1.default)(simpleTable.name)}`)}.match_bm25(${(0, quoteIdentifier_js_1.default)(idColumn)}, ?${typeof options.k === "number" ? `, k := ${options.k}` : ""}${typeof options.b === "number" ? `, b := ${options.b}` : ""}${options.conjunctive === true ? `, conjunctive := 1` : ""}) AS score FROM ${(0, quoteIdentifier_js_1.default)(simpleTable.name)}) sq WHERE score NOT NULL${minScoreCondition} ORDER BY score DESC LIMIT ${count};`, (0, mergeOptions_js_1.default)(simpleTable, {
+    await (0, queryDB_js_1.default)(simpleTable, `CREATE OR REPLACE TABLE ${(0, quoteIdentifier_js_1.default)(outputTable.name)} AS SELECT ${selectClause} FROM (SELECT *, ${(0, quoteIdentifier_js_1.default)(`fts_main_${simpleTable.name}`)}.match_bm25(${(0, quoteIdentifier_js_1.default)(idColumn)}, ?${typeof options.k === "number" ? `, k := ${options.k}` : ""}${typeof options.b === "number" ? `, b := ${options.b}` : ""}${options.conjunctive === true ? `, conjunctive := 1` : ""}) AS score FROM ${(0, quoteIdentifier_js_1.default)(simpleTable.name)}) sq WHERE score NOT NULL${minScoreCondition} ORDER BY score DESC LIMIT ${count};`, (0, mergeOptions_js_1.default)(simpleTable, {
         table: simpleTable.name,
         method: "bm25",
         parameters: {

package/script/methods/cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/methods/cache.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AA2DvD,wBAA8B,KAAK,CAAC,KAAK,SAAS,WAAW,EAC3D,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAC/C,OAAO,GAAE;IACP,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,SAAS,OAAO,EAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;CACd,iBAwLP"}
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/methods/cache.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AA4DvD,wBAA8B,KAAK,CAAC,KAAK,SAAS,WAAW,EAC3D,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAC/C,OAAO,GAAE;IACP,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,SAAS,OAAO,EAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;CACd,iBA4LP"}

package/script/methods/cache.js

@@ -50,6 +50,7 @@ const CACHE_FORMAT_VERSION = "duckdb-v4";
 async function cache(table, compute, options = {}) {
     // If cache() is itself called from another cache computation, the outer
     // computation depends on the table produced here.
+    (0, cacheTableDependencies_js_1.assertCacheTableMutation)(table);
     (0, cacheTableDependencies_js_1.recordCacheTableAccess)(table);
     options.verbose &&
         console.log(`\ncache() for ${table.name}`);
@@ -70,12 +71,13 @@ async function cache(table, compute, options = {}) {
     const inputs = options.inputs?.filter((input) => input !== table) ?? [];
     const hasInputs = inputs.length > 0;
     const serializedInputs = hasInputs ? (0, serializeCacheInputs_js_1.default)(inputs) : null;
-    const codeHash = createHash(functionBody);
+    const codeHash = createHash(JSON.stringify([table.sdb.expressionSyntax, functionBody]));
     const inputHashes = hasInputs
         ? inputs.map((input) => createHash((0, serializeCacheInputs_js_1.default)([input])))
         : [];
     const hash = createHash(JSON.stringify([
         CACHE_FORMAT_VERSION,
+        table.sdb.expressionSyntax,
         table.name,
         entryGeneration,
         functionBody,
@@ -158,10 +160,6 @@ async function runAndWrite(table, compute, cacheSources, cacheSourcesPath, cache
     const start = Date.now();
     const tableDependencies = await (0, cacheTableDependencies_js_1.captureCacheTableDependencies)(table, async () => {
         await compute(table);
-        // run() only queues the sync builders in the user's callback; the actual
-        // computation happens at the flush, so it must be included in the timing
-        // that decides how much the cache saves on later hits.
-        await (0, flushAllTables_js_1.default)(table.sdb);
     });
     const end = Date.now();
     const duration = end - start;

package/script/methods/convert.d.ts

@@ -1,12 +1,12 @@
 import type SimpleTable from "../class/SimpleTable.js";
 import type { TableSchema } from "../helpers/pendingOps.js";
 export default function convert(simpleTable: SimpleTable, types: {
-    [key: string]: "integer" | "float" | "number" | "string" | "date" | "time" | "datetime" | "datetimeTz" | "bigint" | "double" | "varchar" | "timestamp" | "timestamp with time zone" | "boolean";
+    [key: string]: "integer" | "float" | "number" | "string" | "date" | "time" | "datetime" | "datetimeTz" | "bigint" | "double" | "varchar" | "timestamp" | "timestamp with time zone" | "boolean" | "json" | "JSON" | `float[${number}]` | `FLOAT[${number}]` | `geometry('${string}')` | `GEOMETRY('${string}')`;
 }, options?: {
     strict?: boolean;
     datetimeFormat?: string;
 }): void;
-export declare function convertSelect(input: string, columns: string[], columnsTypes: ("integer" | "float" | "number" | "string" | "date" | "time" | "datetime" | "datetimeTz" | "bigint" | "double" | "varchar" | "timestamp" | "timestamp with time zone" | "boolean")[], allColumns: string[], allTypes: TableSchema, options: {
+export declare function convertSelect(input: string, columns: string[], columnsTypes: ("integer" | "float" | "number" | "string" | "date" | "time" | "datetime" | "datetimeTz" | "bigint" | "double" | "varchar" | "timestamp" | "timestamp with time zone" | "boolean" | "json" | "JSON" | `float[${number}]` | `FLOAT[${number}]` | `geometry('${string}')` | `GEOMETRY('${string}')`)[], allColumns: string[], allTypes: TableSchema, options: {
     datetimeFormat?: string;
     strict?: boolean;
 }): string;

package/script/methods/convert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../src/methods/convert.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,CAAC,OAAO,UAAU,OAAO,CAC7B,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE;IACL,CAAC,GAAG,EAAE,MAAM,GACR,SAAS,GACT,OAAO,GACP,QAAQ,GACR,QAAQ,GACR,MAAM,GACN,MAAM,GACN,UAAU,GACV,YAAY,GACZ,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,WAAW,GACX,0BAA0B,GAC1B,SAAS,CAAC;CACf,EACD,OAAO,GAAE;IACP,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACpB,QA+CP;AAED,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EAAE,EACjB,YAAY,EAAE,CACV,SAAS,GACT,OAAO,GACP,QAAQ,GACR,QAAQ,GACR,MAAM,GACN,MAAM,GACN,UAAU,GACV,YAAY,GACZ,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,WAAW,GACX,0BAA0B,GAC1B,SAAS,CACZ,EAAE,EACH,UAAU,EAAE,MAAM,EAAE,EACpB,QAAQ,EAAE,WAAW,EACrB,OAAO,EAAE;IAAE,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,UAgFvD"}
+{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../src/methods/convert.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,CAAC,OAAO,UAAU,OAAO,CAC7B,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE;IACL,CAAC,GAAG,EAAE,MAAM,GACR,SAAS,GACT,OAAO,GACP,QAAQ,GACR,QAAQ,GACR,MAAM,GACN,MAAM,GACN,UAAU,GACV,YAAY,GACZ,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,WAAW,GACX,0BAA0B,GAC1B,SAAS,GACT,MAAM,GACN,MAAM,GACN,SAAS,MAAM,GAAG,GAClB,SAAS,MAAM,GAAG,GAClB,aAAa,MAAM,IAAI,GACvB,aAAa,MAAM,IAAI,CAAC;CAC7B,EACD,OAAO,GAAE;IACP,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACpB,QAkDP;AAED,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EAAE,EACjB,YAAY,EAAE,CACV,SAAS,GACT,OAAO,GACP,QAAQ,GACR,QAAQ,GACR,MAAM,GACN,MAAM,GACN,UAAU,GACV,YAAY,GACZ,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,WAAW,GACX,0BAA0B,GAC1B,SAAS,GACT,MAAM,GACN,MAAM,GACN,SAAS,MAAM,GAAG,GAClB,SAAS,MAAM,GAAG,GAClB,aAAa,MAAM,IAAI,GACvB,aAAa,MAAM,IAAI,CAC1B,EAAE,EACH,UAAU,EAAE,MAAM,EAAE,EACpB,QAAQ,EAAE,WAAW,EACrB,OAAO,EAAE;IAAE,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,UAuFvD"}

package/script/methods/convert.js

@@ -16,6 +16,7 @@ function convert(simpleTable, types, options = {}) {
         method: "convert()",
         parameters: { types, options },
         needsSchema: true,
+        needsSpatial: Object.values(types).some((type) => type.toLowerCase().startsWith("geometry")),
         outputSchema: (allTypes) => ({
             ...allTypes,
             ...Object.fromEntries(Object.entries(types).map(([column, type]) => [
@@ -85,6 +86,10 @@ function convertSelect(input, columns, columnsTypes, allColumns, allTypes, optio
             else if (msToTimestamp) {
                 query += ` TIMESTAMP '1970-01-01 00:00:00' + to_milliseconds(${(0, quoteIdentifier_js_1.default)(column)}) AS ${(0, quoteIdentifier_js_1.default)(column)},`;
             }
+            else if (options.strict === false && expectedType.startsWith("GEOMETRY")) {
+                // DuckDB's geometry parser can throw even inside TRY_CAST.
+                query += ` TRY(CAST(${(0, quoteIdentifier_js_1.default)(column)} AS ${expectedType})) AS ${(0, quoteIdentifier_js_1.default)(column)},`;
+            }
             else if (stringToNumber) {
                 // Thousand separators would make the cast fail.
                 query += ` ${cast}(REPLACE(${(0, quoteIdentifier_js_1.default)(column)}, ',', '') AS ${(0, parseTypes_js_1.default)(columnsTypes[indexOf])}) AS ${(0, quoteIdentifier_js_1.default)(column)},`;

package/script/methods/getBottom.d.ts

@@ -2,7 +2,7 @@ import type SimpleTable from "../class/SimpleTable.js";
 export default function getBottom(simpleTable: SimpleTable, count: number, options?: {
     originalOrder?: boolean;
     conditions?: string;
-}): Promise<{
+}, method?: "getBottom()" | "logBottom()"): Promise<{
     [key: string]: unknown;
 }[]>;
 //# sourceMappingURL=getBottom.d.ts.map

package/script/methods/getBottom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getBottom.d.ts","sourceRoot":"","sources":["../../src/methods/getBottom.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAEvD,wBAA8B,SAAS,CACrC,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,MAAM,EACb,OAAO,GAAE;IACP,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;CAChB;;KA6BP"}
+{"version":3,"file":"getBottom.d.ts","sourceRoot":"","sources":["../../src/methods/getBottom.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAEvD,wBAA8B,SAAS,CACrC,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,MAAM,EACb,OAAO,GAAE;IACP,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;CAChB,EACN,MAAM,GAAE,aAAa,GAAG,aAA6B;;KA6BtD"}

package/script/methods/getBottom.js

@@ -7,14 +7,14 @@ exports.default = getBottom;
 const quoteIdentifier_js_1 = __importDefault(require("../helpers/quoteIdentifier.js"));
 const mergeOptions_js_1 = __importDefault(require("../helpers/mergeOptions.js"));
 const queryDB_js_1 = __importDefault(require("../helpers/queryDB.js"));
-async function getBottom(simpleTable, count, options = {}) {
+async function getBottom(simpleTable, count, options = {}, method = "getBottom()") {
     const queryResult = await (0, queryDB_js_1.default)(simpleTable, `WITH "numberedRowsForGetBottom" AS (
                 SELECT *, row_number() OVER () as "rowNumberForGetBottom" FROM ${(0, quoteIdentifier_js_1.default)(simpleTable.name)}${options.conditions ? ` WHERE ${options.conditions}` : ""}
             )
             SELECT * FROM "numberedRowsForGetBottom" ORDER BY "rowNumberForGetBottom" DESC LIMIT ${count};`, (0, mergeOptions_js_1.default)(simpleTable, {
         table: simpleTable.name,
         returnData: true,
-        method: "getBottom()",
+        method,
         parameters: { count, options },
     }));
     if (!queryResult) {

package/script/methods/getData.d.ts

@@ -3,7 +3,7 @@ export default function getData(simpleTable: SimpleTable, options?: {
     columns?: string | string[];
     conditions?: string;
     limit?: number;
-}): Promise<{
+}, method?: "getData()" | "log()"): Promise<{
     [key: string]: unknown;
 }[]>;
 //# sourceMappingURL=getData.d.ts.map

package/script/methods/getData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../src/methods/getData.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAIvD,wBAA8B,OAAO,CACnC,WAAW,EAAE,WAAW,EACxB,OAAO,GAAE;IACP,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CACX;;KAmCP"}
+{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../src/methods/getData.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAIvD,wBAA8B,OAAO,CACnC,WAAW,EAAE,WAAW,EACxB,OAAO,GAAE;IACP,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CACX,EACN,MAAM,GAAE,WAAW,GAAG,OAAqB;;KAmC5C"}

package/script/methods/getData.js

@@ -8,7 +8,7 @@ const mergeOptions_js_1 = __importDefault(require("../helpers/mergeOptions.js"))
 const queryDB_js_1 = __importDefault(require("../helpers/queryDB.js"));
 const quoteIdentifier_js_1 = __importDefault(require("../helpers/quoteIdentifier.js"));
 const quoteQualifiedIdentifier_js_1 = __importDefault(require("../helpers/quoteQualifiedIdentifier.js"));
-async function getData(simpleTable, options = {}) {
+async function getData(simpleTable, options = {}, method = "getData()") {
     if (options.limit !== undefined &&
         (!Number.isInteger(options.limit) || options.limit < 0)) {
         throw new Error("getData() limit must be an integer greater than or equal to 0.");
@@ -23,7 +23,7 @@ async function getData(simpleTable, options = {}) {
         : "*"} from ${(0, quoteIdentifier_js_1.default)(simpleTable.name)}${options.conditions ? ` WHERE ${options.conditions}` : ""}${options.limit === undefined ? "" : ` LIMIT ${options.limit}`}`, (0, mergeOptions_js_1.default)(simpleTable, {
         returnData: true,
         table: simpleTable.name,
-        method: "getData()",
+        method,
         parameters: { options },
     })));
 }

package/script/methods/join.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"join.d.ts","sourceRoot":"","sources":["../../src/methods/join.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAOvD,MAAM,CAAC,OAAO,UAAU,IAAI,CAC1B,SAAS,EAAE,WAAW,EACtB,UAAU,EAAE,WAAW,EACvB,OAAO,GAAE;IACP,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACvB,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IAC3C,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CAC3B,GACL,WAAW,CAiBb"}
+{"version":3,"file":"join.d.ts","sourceRoot":"","sources":["../../src/methods/join.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAKvD,MAAM,CAAC,OAAO,UAAU,IAAI,CAC1B,SAAS,EAAE,WAAW,EACtB,UAAU,EAAE,WAAW,EACvB,OAAO,GAAE;IACP,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACvB,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IAC3C,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CAC3B,GACL,WAAW,CAkBb"}

package/script/methods/join.js

@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = join;
 const quoteIdentifier_js_1 = __importDefault(require("../helpers/quoteIdentifier.js"));
 const getIdenticalColumns_js_1 = __importDefault(require("../helpers/getIdenticalColumns.js"));
-const mergeOptions_js_1 = __importDefault(require("../helpers/mergeOptions.js"));
-const queryDB_js_1 = __importDefault(require("../helpers/queryDB.js"));
 const queueOp_js_1 = __importDefault(require("../helpers/queueOp.js"));
 const assertSameDatabase_js_1 = __importDefault(require("../helpers/assertSameDatabase.js"));
 function join(leftTable, rightTable, options = {}) {
@@ -19,14 +17,15 @@ function join(leftTable, rightTable, options = {}) {
         ? leftTable.sdb.newTable(options.outputTable)
         : leftTable;
     (0, queueOp_js_1.default)(outputTable, {
-        kind: "barrier",
+        kind: "source",
+        rawSQL: [(0, quoteIdentifier_js_1.default)(leftTable.name), (0, quoteIdentifier_js_1.default)(rightTable.name)],
         method: "join()",
         parameters: { rightTable: rightTable.name, options },
-        execute: () => executeJoin(leftTable, rightTable, outputTable, options),
+        buildSelect: () => buildJoinSelect(leftTable, rightTable, options),
     });
     return outputTable;
 }
-async function executeJoin(leftTable, rightTable, outputTable, options) {
+async function buildJoinSelect(leftTable, rightTable, options) {
     const leftTableColumns = await leftTable.getColumns();
     const rightTableColumns = await rightTable.getColumns();
     const identicalColumns = (0, getIdenticalColumns_js_1.default)(leftTableColumns, rightTableColumns);
@@ -80,17 +79,10 @@ async function executeJoin(leftTable, rightTable, outputTable, options) {
             .filter((d) => !on.includes(d))
             .map((d) => `${(0, quoteIdentifier_js_1.default)(rightTable.name)}.${(0, quoteIdentifier_js_1.default)(d)}`),
     ].join(", ");
-    await (0, queryDB_js_1.default)(leftTable, joinQuery(leftTable.name, rightTable.name, on, type, outputTable.name, selectList), (0, mergeOptions_js_1.default)(leftTable, {
-        table: outputTable.name,
-        method: "join()",
-        parameters: {
-            rightTable: rightTable.name,
-            options,
-        },
-    }));
+    return joinQuery(leftTable.name, rightTable.name, on, type, selectList);
 }
-function joinQuery(leftTable, rightTable, on, join, outputTable, selectList) {
-    let query = `CREATE OR REPLACE TABLE ${(0, quoteIdentifier_js_1.default)(outputTable)} AS SELECT ${selectList}`;
+function joinQuery(leftTable, rightTable, on, join, selectList) {
+    let query = `SELECT ${selectList}`;
     if (join === "inner") {
         query += ` FROM ${(0, quoteIdentifier_js_1.default)(leftTable)} JOIN ${(0, quoteIdentifier_js_1.default)(rightTable)}`;
     }
@@ -107,6 +99,6 @@ function joinQuery(leftTable, rightTable, on, join, outputTable, selectList) {
         throw new Error(`Unknown ${join} join.`);
     }
     query += ` ON (${on.map((d) => `${(0, quoteIdentifier_js_1.default)(leftTable)}.${(0, quoteIdentifier_js_1.default)(d)} = ${(0, quoteIdentifier_js_1.default)(rightTable)}.${(0, quoteIdentifier_js_1.default)(d)}`)
-        .join(" AND ")});\n`;
+        .join(" AND ")})`;
     return query;
 }

package/script/methods/joinGeo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"joinGeo.d.ts","sourceRoot":"","sources":["../../src/methods/joinGeo.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAQvD,MAAM,CAAC,OAAO,UAAU,OAAO,CAC7B,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,gBAAgB,EACjD,UAAU,EAAE,WAAW,EACvB,OAAO,GAAE;IACP,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IAC3C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,KAAK,GAAG,WAAW,GAAG,UAAU,CAAC;IAClD,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CAC3B,GACL,WAAW,CAmBb"}
+{"version":3,"file":"joinGeo.d.ts","sourceRoot":"","sources":["../../src/methods/joinGeo.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAMvD,MAAM,CAAC,OAAO,UAAU,OAAO,CAC7B,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,gBAAgB,EACjD,UAAU,EAAE,WAAW,EACvB,OAAO,GAAE;IACP,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IAC3C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,KAAK,GAAG,WAAW,GAAG,UAAU,CAAC;IAClD,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CAC3B,GACL,WAAW,CAqBb"}

package/script/methods/joinGeo.js

@@ -8,8 +8,6 @@ const quoteIdentifier_js_1 = __importDefault(require("../helpers/quoteIdentifier
 const capitalize_js_1 = __importDefault(require("../helpers/capitalize.js"));
 const findGeoColumnFromSchema_js_1 = __importDefault(require("../helpers/findGeoColumnFromSchema.js"));
 const getIdenticalColumns_js_1 = __importDefault(require("../helpers/getIdenticalColumns.js"));
-const mergeOptions_js_1 = __importDefault(require("../helpers/mergeOptions.js"));
-const queryDB_js_1 = __importDefault(require("../helpers/queryDB.js"));
 const queueOp_js_1 = __importDefault(require("../helpers/queueOp.js"));
 const assertSameDatabase_js_1 = __importDefault(require("../helpers/assertSameDatabase.js"));
 function joinGeo(leftTable, method, rightTable, options = {}) {
@@ -22,10 +20,12 @@ function joinGeo(leftTable, method, rightTable, options = {}) {
         ? leftTable.sdb.newTable(options.outputTable)
         : leftTable;
     (0, queueOp_js_1.default)(outputTable, {
-        kind: "barrier",
+        kind: "source",
+        rawSQL: [(0, quoteIdentifier_js_1.default)(leftTable.name), (0, quoteIdentifier_js_1.default)(rightTable.name)],
+        needsSpatial: true,
         method: "joinGeo()",
         parameters: { method, rightTable: rightTable.name, options },
-        execute: () => executeJoinGeo(leftTable, method, rightTable, outputTable, options),
+        buildSelect: () => buildJoinGeoSelect(leftTable, method, rightTable, options),
     });
     return outputTable;
 }
@@ -49,7 +49,7 @@ function validateJoinGeoOptions(method, options) {
 function formatReceivedValue(value) {
     return JSON.stringify(value) ?? String(value);
 }
-async function executeJoinGeo(leftTable, method, rightTable, outputTable, options) {
+async function buildJoinGeoSelect(leftTable, method, rightTable, options) {
     const leftTypes = await leftTable.getTypes();
     const rightTypes = await rightTable.getTypes();
     const leftColumn = options.leftColumn ??
@@ -89,19 +89,10 @@ async function executeJoinGeo(leftTable, method, rightTable, outputTable, option
         ]),
     ].join(", ");
     const type = options.type ?? "left";
-    await (0, queryDB_js_1.default)(leftTable, joinGeoQuery(leftTable.name, leftColumn, method, rightTable.name, rightColumn, type, outputTable.name, selectList, options.distance, options.distanceMethod), (0, mergeOptions_js_1.default)(leftTable, {
-        table: outputTable.name,
-        method: "joinGeo()",
-        parameters: {
-            leftTable: leftTable.name,
-            method,
-            rightTable: rightTable.name,
-            options,
-        },
-    }));
+    return joinGeoQuery(leftTable.name, leftColumn, method, rightTable.name, rightColumn, type, selectList, options.distance, options.distanceMethod);
 }
-function joinGeoQuery(leftTable, leftColumn, method, rightTable, rightColumn, join, outputTable, selectList, distance, distanceMethod) {
-    let query = `CREATE OR REPLACE TABLE ${(0, quoteIdentifier_js_1.default)(outputTable)} AS SELECT ${selectList}`;
+function joinGeoQuery(leftTable, leftColumn, method, rightTable, rightColumn, join, selectList, distance, distanceMethod) {
+    let query = `SELECT ${selectList}`;
     if (join === "inner") {
         query += ` FROM ${(0, quoteIdentifier_js_1.default)(leftTable)} JOIN ${(0, quoteIdentifier_js_1.default)(rightTable)}`;
     }
@@ -118,11 +109,11 @@ function joinGeoQuery(leftTable, leftColumn, method, rightTable, rightColumn, jo
         throw new Error(`Unknown ${join} join.`);
     }
     if (method === "intersect") {
-        query += ` ON ST_Intersects(${(0, quoteIdentifier_js_1.default)(leftTable)}.${(0, quoteIdentifier_js_1.default)(leftColumn)}, ${(0, quoteIdentifier_js_1.default)(rightTable)}.${(0, quoteIdentifier_js_1.default)(rightColumn)});`;
+        query += ` ON ST_Intersects(${(0, quoteIdentifier_js_1.default)(leftTable)}.${(0, quoteIdentifier_js_1.default)(leftColumn)}, ${(0, quoteIdentifier_js_1.default)(rightTable)}.${(0, quoteIdentifier_js_1.default)(rightColumn)})`;
     }
     else if (method === "inside") {
         // Order is important
-        query += ` ON ST_Covers(${(0, quoteIdentifier_js_1.default)(rightTable)}.${(0, quoteIdentifier_js_1.default)(rightColumn)}, ${(0, quoteIdentifier_js_1.default)(leftTable)}.${(0, quoteIdentifier_js_1.default)(leftColumn)});`;
+        query += ` ON ST_Covers(${(0, quoteIdentifier_js_1.default)(rightTable)}.${(0, quoteIdentifier_js_1.default)(rightColumn)}, ${(0, quoteIdentifier_js_1.default)(leftTable)}.${(0, quoteIdentifier_js_1.default)(leftColumn)})`;
     }
     else if (method === "withinDistance") {
         if (typeof distance === "number") {