@nshiab/simple-data-analysis-core 1.0.1 → 2.0.1

package/script/methods/join.js

@@ -4,60 +4,109 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 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 joinQuery_js_1 = __importDefault(require("./joinQuery.js"));
-async function join(leftTable, rightTable, options = {}) {
+const queueOp_js_1 = __importDefault(require("../helpers/queueOp.js"));
+const assertSameDatabase_js_1 = __importDefault(require("../helpers/assertSameDatabase.js"));
+function join(leftTable, rightTable, options = {}) {
+    (0, assertSameDatabase_js_1.default)(leftTable.sdb, [rightTable], "join()");
+    options = structuredClone(options);
+    // The output table instance is created at call time so it can be returned
+    // synchronously and chained on right away.
+    const outputTable = typeof options.outputTable === "string"
+        ? leftTable.sdb.newTable(options.outputTable)
+        : leftTable;
+    (0, queueOp_js_1.default)(outputTable, {
+        kind: "barrier",
+        method: "join()",
+        parameters: { rightTable: rightTable.name, options },
+        execute: () => executeJoin(leftTable, rightTable, outputTable, options),
+    });
+    return outputTable;
+}
+async function executeJoin(leftTable, rightTable, outputTable, options) {
     const leftTableColumns = await leftTable.getColumns();
     const rightTableColumns = await rightTable.getColumns();
     const identicalColumns = (0, getIdenticalColumns_js_1.default)(leftTableColumns, rightTableColumns);
-    let commonColumn;
-    if (typeof options.commonColumn === "string") {
-        commonColumn = [options.commonColumn];
+    let on;
+    if (typeof options.on === "string") {
+        on = [options.on];
     }
-    else if (Array.isArray(options.commonColumn)) {
-        commonColumn = options.commonColumn;
+    else if (Array.isArray(options.on)) {
+        on = options.on;
     }
     else {
         if (identicalColumns.length === 0) {
-            throw new Error("No common column");
+            throw new Error(`join() cannot infer a join column because tables ${(0, quoteIdentifier_js_1.default)(leftTable.name)} and ${(0, quoteIdentifier_js_1.default)(rightTable.name)} have no columns in common. Pass { on: "column" } after ensuring that column exists in both tables.`);
         }
         else if (identicalColumns.length === 1) {
-            commonColumn = identicalColumns;
+            on = identicalColumns;
         }
         else {
-            throw new Error("Multiple columns with identical names in the tables. You need to pick the ones you want.");
+            throw new Error(`join() found ${identicalColumns.length} possible join columns shared by tables ${(0, quoteIdentifier_js_1.default)(leftTable.name)} and ${(0, quoteIdentifier_js_1.default)(rightTable.name)}: ${identicalColumns.map(quoteIdentifier_js_1.default).join(", ")}. Pass { on: "column" } or { on: ["column1", "column2"] } to choose.`);
         }
     }
-    const identicalColumnsForError = identicalColumns.filter((d) => !commonColumn.includes(d));
+    const identicalColumnsForError = identicalColumns.filter((d) => !on.includes(d));
     if (identicalColumnsForError.length > 0) {
         if (identicalColumnsForError.length === 1) {
-            throw new Error(`The tables have columns with identical names (excluding ${commonColumn.map((d) => `"${d}"`).join(", ")} used for the join). Rename or remove ${identicalColumnsForError.map((d) => `"${d}"`).join(", ")} in one of the two tables before doing the join. If relevant, you can also add it to the commonColumn option.`);
+            throw new Error(`The tables have columns with identical names (excluding ${on.map((d) => `${(0, quoteIdentifier_js_1.default)(d)}`).join(", ")} used for the join). Rename or remove ${identicalColumnsForError.map((d) => `${(0, quoteIdentifier_js_1.default)(d)}`).join(", ")} in one of the two tables before doing the join. If relevant, you can also add it to the on option.`);
         }
         else {
-            throw new Error(`The tables have columns with identical names (excluding ${commonColumn.map((d) => `"${d}"`).join(", ")} used for the join). Rename or remove ${identicalColumnsForError.map((d) => `"${d}"`).join(", ")} in one of the two tables before doing the join. If relevant, you can also add them to the commonColumn option.`);
+            throw new Error(`The tables have columns with identical names (excluding ${on.map((d) => `${(0, quoteIdentifier_js_1.default)(d)}`).join(", ")} used for the join). Rename or remove ${identicalColumnsForError.map((d) => `${(0, quoteIdentifier_js_1.default)(d)}`).join(", ")} in one of the two tables before doing the join. If relevant, you can also add them to the on option.`);
         }
     }
-    await (0, queryDB_js_1.default)(leftTable, (0, joinQuery_js_1.default)(leftTable.name, rightTable.name, commonColumn, options.type ?? "left", typeof options.outputTable === "string"
-        ? options.outputTable
-        : leftTable.name), (0, mergeOptions_js_1.default)(leftTable, {
-        table: typeof options.outputTable === "string"
-            ? options.outputTable
-            : leftTable.name,
+    // The right table's copies of the join columns are excluded from the
+    // SELECT directly, instead of dropping them with a rewrite after the join.
+    // The join columns come from the side that has a value for every row of
+    // the result: the left table for inner and left joins, the right table for
+    // right joins, and whichever side matched for full joins.
+    const type = options.type ?? "left";
+    const joinColumn = (d) => {
+        if (type === "right") {
+            return `${(0, quoteIdentifier_js_1.default)(rightTable.name)}.${(0, quoteIdentifier_js_1.default)(d)} AS ${(0, quoteIdentifier_js_1.default)(d)}`;
+        }
+        if (type === "full") {
+            return `COALESCE(${(0, quoteIdentifier_js_1.default)(leftTable.name)}.${(0, quoteIdentifier_js_1.default)(d)}, ${(0, quoteIdentifier_js_1.default)(rightTable.name)}.${(0, quoteIdentifier_js_1.default)(d)}) AS ${(0, quoteIdentifier_js_1.default)(d)}`;
+        }
+        return `${(0, quoteIdentifier_js_1.default)(leftTable.name)}.${(0, quoteIdentifier_js_1.default)(d)}`;
+    };
+    const selectList = [
+        ...leftTableColumns.map((d) => on.includes(d)
+            ? joinColumn(d)
+            : `${(0, quoteIdentifier_js_1.default)(leftTable.name)}.${(0, quoteIdentifier_js_1.default)(d)}`),
+        ...rightTableColumns
+            .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: rightTable.name,
             options,
         },
     }));
-    const outputTable = typeof options.outputTable === "string"
-        ? leftTable.sdb.newTable(options.outputTable)
-        : leftTable;
-    const columns = await outputTable.getColumns();
-    const extraCommonColumns = columns.filter((d) => commonColumn.map((c) => `${c}_1`).includes(d));
-    if (extraCommonColumns.length > 0) {
-        await outputTable.removeColumns(extraCommonColumns);
+}
+function joinQuery(leftTable, rightTable, on, join, outputTable, selectList) {
+    let query = `CREATE OR REPLACE TABLE ${(0, quoteIdentifier_js_1.default)(outputTable)} AS SELECT ${selectList}`;
+    if (join === "inner") {
+        query += ` FROM ${(0, quoteIdentifier_js_1.default)(leftTable)} JOIN ${(0, quoteIdentifier_js_1.default)(rightTable)}`;
     }
-    return outputTable;
+    else if (join === "left") {
+        query += ` FROM ${(0, quoteIdentifier_js_1.default)(leftTable)} LEFT JOIN ${(0, quoteIdentifier_js_1.default)(rightTable)}`;
+    }
+    else if (join === "right") {
+        query += ` FROM ${(0, quoteIdentifier_js_1.default)(leftTable)} RIGHT JOIN ${(0, quoteIdentifier_js_1.default)(rightTable)}`;
+    }
+    else if (join === "full") {
+        query += ` FROM ${(0, quoteIdentifier_js_1.default)(leftTable)} FULL JOIN ${(0, quoteIdentifier_js_1.default)(rightTable)}`;
+    }
+    else {
+        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`;
+    return query;
 }

package/script/methods/joinGeo.d.ts

@@ -1,10 +1,12 @@
 import type SimpleTable from "../class/SimpleTable.js";
-export default function joinGeo(leftTable: SimpleTable, method: "intersect" | "inside" | "within", rightTable: SimpleTable, options?: {
-    leftTableColumn?: string;
-    rightTableColumn?: string;
+export default function joinGeo(leftTable: SimpleTable, method: "intersect" | "inside" | "withinDistance", rightTable: SimpleTable, options?: {
+    leftColumn?: string;
+    rightColumn?: string;
     type?: "inner" | "left" | "right" | "full";
     distance?: number;
     distanceMethod?: "srs" | "haversine" | "spheroid";
+    excludeLeftGeometry?: boolean;
+    excludeRightGeometry?: boolean;
     outputTable?: string | boolean;
-}): Promise<SimpleTable>;
+}): SimpleTable;
 //# sourceMappingURL=joinGeo.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"joinGeo.d.ts","sourceRoot":"","sources":["../../src/methods/joinGeo.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAOvD,wBAA8B,OAAO,CACnC,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,QAAQ,EACzC,UAAU,EAAE,WAAW,EACvB,OAAO,GAAE;IACP,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,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,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CAC3B,wBA4FP"}
+{"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"}

package/script/methods/joinGeo.js

@@ -4,45 +4,93 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = joinGeo;
+const quoteIdentifier_js_1 = __importDefault(require("../helpers/quoteIdentifier.js"));
 const capitalize_js_1 = __importDefault(require("../helpers/capitalize.js"));
-const findGeoColumn_js_1 = __importDefault(require("../helpers/findGeoColumn.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 joinGeoQuery_js_1 = __importDefault(require("./joinGeoQuery.js"));
-async function joinGeo(leftTable, method, rightTable, options = {}) {
-    const leftTableColumn = options.leftTableColumn ??
-        (await (0, findGeoColumn_js_1.default)(leftTable));
-    const rightTableColumn = options.rightTableColumn ??
-        (await (0, findGeoColumn_js_1.default)(rightTable));
-    const commonColumn = leftTableColumn === rightTableColumn
-        ? leftTableColumn
-        : "";
-    const identicalColumns = ((0, getIdenticalColumns_js_1.default)(await leftTable.getColumns(), await rightTable.getColumns())).filter((d) => d !== commonColumn);
+const queueOp_js_1 = __importDefault(require("../helpers/queueOp.js"));
+const assertSameDatabase_js_1 = __importDefault(require("../helpers/assertSameDatabase.js"));
+function joinGeo(leftTable, method, rightTable, options = {}) {
+    (0, assertSameDatabase_js_1.default)(leftTable.sdb, [rightTable], "joinGeo()");
+    options = structuredClone(options);
+    validateJoinGeoOptions(method, options);
+    // The output table instance is created at call time so it can be returned
+    // synchronously and chained on right away.
+    const outputTable = typeof options.outputTable === "string"
+        ? leftTable.sdb.newTable(options.outputTable)
+        : leftTable;
+    (0, queueOp_js_1.default)(outputTable, {
+        kind: "barrier",
+        method: "joinGeo()",
+        parameters: { method, rightTable: rightTable.name, options },
+        execute: () => executeJoinGeo(leftTable, method, rightTable, outputTable, options),
+    });
+    return outputTable;
+}
+function validateJoinGeoOptions(method, options) {
+    if (!["intersect", "inside", "withinDistance"].includes(method)) {
+        throw new Error(`joinGeo() method must be "intersect", "inside", or "withinDistance". Received ${formatReceivedValue(method)}.`);
+    }
+    if (options.type !== undefined &&
+        !["inner", "left", "right", "full"].includes(options.type)) {
+        throw new Error(`joinGeo() options.type must be "inner", "left", "right", or "full". Received ${formatReceivedValue(options.type)}.`);
+    }
+    if (options.distanceMethod !== undefined &&
+        !["srs", "haversine", "spheroid"].includes(options.distanceMethod)) {
+        throw new Error(`joinGeo() options.distanceMethod must be "srs", "haversine", or "spheroid". Received ${formatReceivedValue(options.distanceMethod)}.`);
+    }
+    if (method === "withinDistance" &&
+        (typeof options.distance !== "number" || !Number.isFinite(options.distance))) {
+        throw new Error(`joinGeo() options.distance must be a finite number when method is "withinDistance". Received ${formatReceivedValue(options.distance)}.`);
+    }
+}
+function formatReceivedValue(value) {
+    return JSON.stringify(value) ?? String(value);
+}
+async function executeJoinGeo(leftTable, method, rightTable, outputTable, options) {
+    const leftTypes = await leftTable.getTypes();
+    const rightTypes = await rightTable.getTypes();
+    const leftColumn = options.leftColumn ??
+        (0, findGeoColumnFromSchema_js_1.default)(leftTypes, "joinGeo()", leftTable.name);
+    const rightColumn = options.rightColumn ??
+        (0, findGeoColumnFromSchema_js_1.default)(rightTypes, "joinGeo()", rightTable.name);
+    const leftTableColumns = Object.keys(leftTypes);
+    const rightTableColumns = Object.keys(rightTypes);
+    const sharedColumn = leftColumn === rightColumn ? leftColumn : "";
+    const identicalColumns = ((0, getIdenticalColumns_js_1.default)(leftTableColumns, rightTableColumns)).filter((d) => d !== sharedColumn);
     if (identicalColumns.length > 0) {
-        throw new Error(`The tables have columns with identical names ${commonColumn !== ""
-            ? `(excluding the columns "${commonColumn}" used for the geospatial join)`
-            : ""}. Rename or remove ${identicalColumns.map((d) => `"${d}"`).join(", ")} in one of the two tables before doing the join.`);
+        throw new Error(`The tables have columns with identical names ${sharedColumn !== ""
+            ? `(excluding the columns ${(0, quoteIdentifier_js_1.default)(sharedColumn)} used for the geospatial join)`
+            : ""}. Rename or remove ${identicalColumns.map((d) => `${(0, quoteIdentifier_js_1.default)(d)}`).join(", ")} in one of the two tables before doing the join.`);
     }
-    let leftTableColumnForQuery = leftTableColumn;
-    let rightTableColumnForQuery = rightTableColumn;
-    // We change the column names for geometries
-    if (leftTableColumn === rightTableColumn) {
-        leftTableColumnForQuery = `${leftTableColumn}${(0, capitalize_js_1.default)(leftTable.name)}`;
-        const leftObj = {};
-        leftObj[leftTableColumn] = leftTableColumnForQuery;
-        await leftTable.renameColumns(leftObj);
-        rightTableColumnForQuery = `${rightTableColumn}${(0, capitalize_js_1.default)(rightTable.name)}`;
-        const rightObj = {};
-        rightObj[rightTableColumn] = rightTableColumnForQuery;
-        await rightTable.renameColumns(rightObj);
+    const excludeLeftGeometry = options.excludeLeftGeometry ?? false;
+    const excludeRightGeometry = options.excludeRightGeometry ?? false;
+    const retainSharedGeometries = sharedColumn !== "" &&
+        !excludeLeftGeometry && !excludeRightGeometry;
+    const rightGeometryOutputColumn = retainSharedGeometries
+        ? `${rightColumn}${(0, capitalize_js_1.default)(rightTable.name)}`
+        : undefined;
+    if (rightGeometryOutputColumn !== undefined &&
+        [...leftTableColumns, ...rightTableColumns]
+            .filter((column) => column !== rightColumn)
+            .includes(rightGeometryOutputColumn)) {
+        throw new Error(`Cannot name the right geometry column ${(0, quoteIdentifier_js_1.default)(rightGeometryOutputColumn)} because a column with that name already exists. Rename the existing ${(0, quoteIdentifier_js_1.default)(rightGeometryOutputColumn)} column before calling joinGeo(), or call joinGeo() with { excludeRightGeometry: true }.`);
     }
+    const leftSelect = `${(0, quoteIdentifier_js_1.default)(leftTable.name)}.*${excludeLeftGeometry ? ` EXCLUDE (${(0, quoteIdentifier_js_1.default)(leftColumn)})` : ""}`;
+    const excludeRightFromStar = excludeRightGeometry || retainSharedGeometries;
+    const rightSelect = `${(0, quoteIdentifier_js_1.default)(rightTable.name)}.*${excludeRightFromStar ? ` EXCLUDE (${(0, quoteIdentifier_js_1.default)(rightColumn)})` : ""}`;
+    const selectList = [
+        leftSelect,
+        rightSelect,
+        ...(rightGeometryOutputColumn === undefined ? [] : [
+            `${(0, quoteIdentifier_js_1.default)(rightTable.name)}.${(0, quoteIdentifier_js_1.default)(rightColumn)} AS ${(0, quoteIdentifier_js_1.default)(rightGeometryOutputColumn)}`,
+        ]),
+    ].join(", ");
     const type = options.type ?? "left";
-    const outputTable = typeof options.outputTable === "string"
-        ? options.outputTable
-        : leftTable.name;
-    await (0, queryDB_js_1.default)(leftTable, (0, joinGeoQuery_js_1.default)(leftTable.name, leftTableColumnForQuery, method, rightTable.name, rightTableColumnForQuery, type, outputTable, options.distance, options.distanceMethod), (0, mergeOptions_js_1.default)(leftTable, {
-        table: outputTable,
+    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,
@@ -51,19 +99,54 @@ async function joinGeo(leftTable, method, rightTable, options = {}) {
             options,
         },
     }));
-    // We bring back the column names for geometries
-    if (leftTableColumn === rightTableColumn) {
-        const leftObj = {};
-        leftObj[leftTableColumnForQuery] = leftTableColumn;
-        await leftTable.renameColumns(leftObj);
-        const rightObj = {};
-        rightObj[rightTableColumnForQuery] = rightTableColumn;
-        await rightTable.renameColumns(rightObj);
+}
+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}`;
+    if (join === "inner") {
+        query += ` FROM ${(0, quoteIdentifier_js_1.default)(leftTable)} JOIN ${(0, quoteIdentifier_js_1.default)(rightTable)}`;
+    }
+    else if (join === "left") {
+        query += ` FROM ${(0, quoteIdentifier_js_1.default)(leftTable)} LEFT JOIN ${(0, quoteIdentifier_js_1.default)(rightTable)}`;
+    }
+    else if (join === "right") {
+        query += ` FROM ${(0, quoteIdentifier_js_1.default)(leftTable)} RIGHT JOIN ${(0, quoteIdentifier_js_1.default)(rightTable)}`;
+    }
+    else if (join === "full") {
+        query += ` FROM ${(0, quoteIdentifier_js_1.default)(leftTable)} FULL JOIN ${(0, quoteIdentifier_js_1.default)(rightTable)}`;
+    }
+    else {
+        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)});`;
+    }
+    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)});`;
     }
-    if (typeof options.outputTable === "string") {
-        return leftTable.sdb.newTable(options.outputTable);
+    else if (method === "withinDistance") {
+        if (typeof distance === "number") {
+            if (distanceMethod === undefined || distanceMethod === "srs") {
+                query += ` ON ST_DWithin(${(0, quoteIdentifier_js_1.default)(leftTable)}.${(0, quoteIdentifier_js_1.default)(leftColumn)}, ${(0, quoteIdentifier_js_1.default)(rightTable)}.${(0, quoteIdentifier_js_1.default)(rightColumn)}, ${distance})`;
+            }
+            else if (distanceMethod === "haversine") {
+                // Maybe ST_DWithin_Sphere will be available soon?
+                query += ` ON ST_Distance_Sphere(${(0, quoteIdentifier_js_1.default)(leftTable)}.${(0, quoteIdentifier_js_1.default)(leftColumn)}, ${(0, quoteIdentifier_js_1.default)(rightTable)}.${(0, quoteIdentifier_js_1.default)(rightColumn)}) < ${distance}`;
+            }
+            else if (distanceMethod === "spheroid") {
+                // Should be using ST_DWithin_Spheroid but doesn't work?
+                query += ` ON ST_Distance_Spheroid(${(0, quoteIdentifier_js_1.default)(leftTable)}.${(0, quoteIdentifier_js_1.default)(leftColumn)}::GEOMETRY, ${(0, quoteIdentifier_js_1.default)(rightTable)}.${(0, quoteIdentifier_js_1.default)(rightColumn)}::GEOMETRY) < ${distance}`;
+            }
+            else {
+                throw new Error(`Unknown ${distanceMethod}`);
+            }
+        }
+        else {
+            throw new Error("options.distance must be a number");
+        }
     }
     else {
-        return leftTable;
+        throw new Error(`Unknown ${method} method`);
     }
+    return query;
 }

package/script/methods/keepValues.d.ts

@@ -0,0 +1,5 @@
+import type SimpleTable from "../class/SimpleTable.js";
+export default function keepValues(simpleTable: SimpleTable, columnsAndValues: {
+    [key: string]: unknown;
+}): void;
+//# sourceMappingURL=keepValues.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"keepValues.d.ts","sourceRoot":"","sources":["../../src/methods/keepValues.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAMvD,MAAM,CAAC,OAAO,UAAU,UAAU,CAChC,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,QAiB7C"}

package/script/methods/keepValues.js

@@ -0,0 +1,41 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = keepValues;
+const queueOp_js_1 = __importDefault(require("../helpers/queueOp.js"));
+const quoteIdentifier_js_1 = __importDefault(require("../helpers/quoteIdentifier.js"));
+const prepareValueFilters_js_1 = __importDefault(require("../helpers/prepareValueFilters.js"));
+function keepValues(simpleTable, columnsAndValues) {
+    const captured = Object.fromEntries(Object.entries(columnsAndValues).map(([column, values]) => [
+        column,
+        Array.isArray(values) ? [...values] : values,
+    ]));
+    const filters = (0, prepareValueFilters_js_1.default)(captured);
+    (0, queueOp_js_1.default)(simpleTable, {
+        kind: "fusable",
+        method: "keepValues()",
+        parameters: { columnsAndValues: captured },
+        values: filters.flatMap((filter) => filter.values),
+        needsSchema: false,
+        buildSelect: (input) => keepValuesSelect(input, filters),
+    });
+}
+function keepValuesSelect(input, filters) {
+    let query = `SELECT * FROM ${input} WHERE\n`;
+    const conditions = [];
+    for (const filter of filters) {
+        const column = (0, quoteIdentifier_js_1.default)(filter.column);
+        const inValues = filter.values.length > 0
+            ? `${column} IN (${filter.values.map(() => "?").join(", ")})`
+            : null;
+        conditions.push(inValues === null
+            ? filter.includesNull ? `${column} IS NULL` : "FALSE"
+            : filter.includesNull
+                ? `(${inValues} OR ${column} IS NULL)`
+                : inValues);
+    }
+    query += conditions.join("\nAND ");
+    return query;
+}

package/script/methods/lastChars.d.ts

@@ -0,0 +1,3 @@
+import type SimpleTable from "../class/SimpleTable.js";
+export default function lastChars(simpleTable: SimpleTable, column: string, count: number): void;
+//# sourceMappingURL=lastChars.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"lastChars.d.ts","sourceRoot":"","sources":["../../src/methods/lastChars.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAEvD,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,QAYd"}

package/script/methods/lastChars.js

@@ -0,0 +1,17 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = lastChars;
+const quoteIdentifier_js_1 = __importDefault(require("../helpers/quoteIdentifier.js"));
+const queueOp_js_1 = __importDefault(require("../helpers/queueOp.js"));
+function lastChars(simpleTable, column, count) {
+    (0, queueOp_js_1.default)(simpleTable, {
+        kind: "fusable",
+        method: "lastChars()",
+        parameters: { column, count },
+        needsSchema: false,
+        buildSelect: (input) => `SELECT * REPLACE (RIGHT(${(0, quoteIdentifier_js_1.default)(column)}, ${count}) AS ${(0, quoteIdentifier_js_1.default)(column)}) FROM ${input}`,
+    });
+}

package/script/methods/length.d.ts

@@ -0,0 +1,7 @@
+import type SimpleTable from "../class/SimpleTable.js";
+export default function length(simpleTable: SimpleTable, newColumn: string, options?: {
+    unit?: "m" | "km";
+    column?: string;
+    decimals?: number;
+}): void;
+//# sourceMappingURL=length.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"length.d.ts","sourceRoot":"","sources":["../../src/methods/length.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAEvD,MAAM,CAAC,OAAO,UAAU,MAAM,CAC5B,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,QAyBxE"}

package/script/methods/length.js

@@ -0,0 +1,31 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = length;
+const quoteIdentifier_js_1 = __importDefault(require("../helpers/quoteIdentifier.js"));
+const assertNewColumns_js_1 = __importDefault(require("../helpers/assertNewColumns.js"));
+const findGeoColumnFromSchema_js_1 = __importDefault(require("../helpers/findGeoColumnFromSchema.js"));
+const queueOp_js_1 = __importDefault(require("../helpers/queueOp.js"));
+function length(simpleTable, newColumn, options = {}) {
+    options = structuredClone(options);
+    (0, queueOp_js_1.default)(simpleTable, {
+        kind: "fusable",
+        method: "length()",
+        parameters: { newColumn, options },
+        needsSchema: true,
+        needsSpatial: true,
+        buildSelect: (input, types) => {
+            (0, assertNewColumns_js_1.default)(types, [newColumn], "length()");
+            const column = typeof options.column === "string"
+                ? options.column
+                : (0, findGeoColumnFromSchema_js_1.default)(types, "length()", simpleTable.name);
+            let expression = `ST_Length_Spheroid(${(0, quoteIdentifier_js_1.default)(column)}) ${options.unit === "km" ? "/ 1000" : ""}`;
+            if (typeof options.decimals === "number") {
+                expression = `ROUND(${expression}, ${options.decimals})`;
+            }
+            return `SELECT *, CAST(${expression} AS DOUBLE) AS ${(0, quoteIdentifier_js_1.default)(newColumn)} FROM ${input}`;
+        },
+    });
+}

package/script/methods/linearRegressions.d.ts

@@ -1,9 +1,9 @@
 import type SimpleTable from "../class/SimpleTable.js";
-export default function linearRegressions(SimpleTable: SimpleTable, options?: {
+export default function linearRegressions(simpleTable: SimpleTable, options?: {
     x?: string;
     y?: string;
-    categories?: string | string[];
+    by?: string | string[];
     decimals?: number;
     outputTable?: string | boolean;
-}): Promise<void>;
+}): SimpleTable;
 //# sourceMappingURL=linearRegressions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"linearRegressions.d.ts","sourceRoot":"","sources":["../../src/methods/linearRegressions.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAEvD,wBAA8B,iBAAiB,CAC7C,WAAW,EAAE,WAAW,EACxB,OAAO,GAAE;IACP,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CAC3B,iBA8CP"}
+{"version":3,"file":"linearRegressions.d.ts","sourceRoot":"","sources":["../../src/methods/linearRegressions.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAIvD,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,WAAW,EAAE,WAAW,EACxB,OAAO,GAAE;IACP,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CAC3B,GACL,WAAW,CA2Db"}