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

package/script/methods/fuzzyClean.d.ts

@@ -1,7 +1,7 @@
 import type SimpleTable from "../class/SimpleTable.js";
 export default function fuzzyClean(table: SimpleTable, column: string, newColumn: string, threshold: number, options?: {
     method?: "ratio" | "partial_ratio" | "token_sort_ratio" | "token_set_ratio";
-    keep?: "mostCommon" | "longestString" | "shortestString" | "mostCentral" | "maxScore";
-    preFilterPrefixLen?: number;
-}): Promise<void>;
+    strategy?: "mostCommon" | "longestString" | "shortestString" | "mostCentral" | "maxScore";
+    prefilterPrefixLength?: number;
+}): void;
 //# sourceMappingURL=fuzzyClean.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"fuzzyClean.d.ts","sourceRoot":"","sources":["../../src/methods/fuzzyClean.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAIvD,wBAA8B,UAAU,CACtC,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;IACP,MAAM,CAAC,EACH,OAAO,GACP,eAAe,GACf,kBAAkB,GAClB,iBAAiB,CAAC;IACtB,IAAI,CAAC,EACD,YAAY,GACZ,eAAe,GACf,gBAAgB,GAChB,aAAa,GACb,UAAU,CAAC;IACf,kBAAkB,CAAC,EAAE,MAAM,CAAC;CACxB,GACL,OAAO,CAAC,IAAI,CAAC,CAmPf"}
+{"version":3,"file":"fuzzyClean.d.ts","sourceRoot":"","sources":["../../src/methods/fuzzyClean.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAMvD,MAAM,CAAC,OAAO,UAAU,UAAU,CAChC,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;IACP,MAAM,CAAC,EACH,OAAO,GACP,eAAe,GACf,kBAAkB,GAClB,iBAAiB,CAAC;IACtB,QAAQ,CAAC,EACL,YAAY,GACZ,eAAe,GACf,gBAAgB,GAChB,aAAa,GACb,UAAU,CAAC;IACf,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAC3B,GACL,IAAI,CAYN"}

package/script/methods/fuzzyClean.js

@@ -4,52 +4,58 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = fuzzyClean;
+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 fuzzyClean(table, column, newColumn, threshold, options = {}) {
+const queueOp_js_1 = __importDefault(require("../helpers/queueOp.js"));
+const buildFuzzyMatchSql_js_1 = __importDefault(require("../helpers/buildFuzzyMatchSql.js"));
+function fuzzyClean(table, column, newColumn, threshold, options = {}) {
+    // The clustering runs in JS over the fuzzy pairs read from the table, so
+    // fuzzyClean can't be expressed as a single SELECT over its input: it
+    // executes as a barrier.
+    options = structuredClone(options);
+    (0, queueOp_js_1.default)(table, {
+        kind: "barrier",
+        method: "fuzzyClean()",
+        parameters: { column, newColumn, threshold, options },
+        execute: () => executeFuzzyClean(table, column, newColumn, threshold, options),
+    });
+}
+async function executeFuzzyClean(table, column, newColumn, threshold, options = {}) {
     const method = options.method ?? "ratio";
-    const keep = options.keep ?? "mostCommon";
-    let onClause = `rapidfuzz_${method}(a.value, b.value) >= ${threshold}`;
-    if (method === "ratio") {
-        const maxDiffMultiplier = (200 - 2 * threshold) / (200 - threshold);
-        onClause +=
-            ` AND ABS(LENGTH(a.value) - LENGTH(b.value)) <= ${maxDiffMultiplier} * GREATEST(LENGTH(a.value), LENGTH(b.value))`;
-    }
-    if (options.preFilterPrefixLen !== undefined) {
-        onClause +=
-            ` AND SUBSTR(a.value, 1, ${options.preFilterPrefixLen}) = SUBSTR(b.value, 1, ${options.preFilterPrefixLen})`;
-    }
-    // Single round trip: compute fuzzy pairs and embed counts for both sides.
-    // Only values that appear in at least one pair above the threshold can be
-    // normalized — singletons need no processing at all.
+    const strategy = options.strategy ?? "mostCommon";
+    const { scoreExpression, condition } = (0, buildFuzzyMatchSql_js_1.default)("a.value", "b.value", method, threshold, { prefilterPrefixLength: options.prefilterPrefixLength });
+    // Compute fuzzy pairs and embed counts for both sides. Only values that
+    // appear in at least one pair above the threshold can be normalized —
+    // singletons need no processing at all.
     const pairsData = await (0, queryDB_js_1.default)(table, `INSTALL rapidfuzz FROM community; LOAD rapidfuzz;
      WITH uniques AS (
-       SELECT "${column}" AS value, COUNT(*) AS cnt
-       FROM "${table.name}"
-       WHERE "${column}" IS NOT NULL
-       GROUP BY "${column}"
+       SELECT ${(0, quoteIdentifier_js_1.default)(column)} AS value, COUNT(*) AS cnt
+       FROM ${(0, quoteIdentifier_js_1.default)(table.name)}
+       WHERE ${(0, quoteIdentifier_js_1.default)(column)} IS NOT NULL
+       GROUP BY ${(0, quoteIdentifier_js_1.default)(column)}
      )
      SELECT
        a.value AS left_value,
        b.value AS right_value,
        a.cnt   AS left_cnt,
        b.cnt   AS right_cnt,
-       rapidfuzz_${method}(a.value, b.value) AS score
+       ${scoreExpression} AS score
      FROM uniques a
      JOIN uniques b
-       ON ${onClause}
+       ON ${condition}
        AND a.value < b.value`, (0, mergeOptions_js_1.default)(table, {
         table: table.name,
         method: "fuzzyClean()",
         parameters: { column, newColumn, threshold, options },
-        returnDataFrom: "query",
+        returnData: true,
     }));
     const pairs = pairsData ?? [];
     if (pairs.length === 0) {
         if (newColumn !== column) {
-            await (0, queryDB_js_1.default)(table, `ALTER TABLE "${table.name}" ADD "${newColumn}" VARCHAR;
-         UPDATE "${table.name}"
-           SET "${newColumn}" = "${column}";`, (0, mergeOptions_js_1.default)(table, {
+            await (0, queryDB_js_1.default)(table, `ALTER TABLE ${(0, quoteIdentifier_js_1.default)(table.name)} ADD ${(0, quoteIdentifier_js_1.default)(newColumn)} VARCHAR;
+         UPDATE ${(0, quoteIdentifier_js_1.default)(table.name)}
+           SET ${(0, quoteIdentifier_js_1.default)(newColumn)} = ${(0, quoteIdentifier_js_1.default)(column)};`, (0, mergeOptions_js_1.default)(table, {
                 table: table.name,
                 method: "fuzzyClean()",
                 parameters: { column, newColumn, threshold, options },
@@ -147,21 +153,21 @@ async function fuzzyClean(table, column, newColumn, threshold, options = {}) {
             return byScore(a, b); // sum then alphabetical tie-break
         };
         let canonical;
-        if (keep === "longestString") {
+        if (strategy === "longestString") {
             canonical = members.reduce((a, b) => {
                 if (a.length !== b.length)
                     return a.length > b.length ? a : b;
                 return byScore(a, b);
             });
         }
-        else if (keep === "shortestString") {
+        else if (strategy === "shortestString") {
             canonical = members.reduce((a, b) => {
                 if (a.length !== b.length)
                     return a.length < b.length ? a : b;
                 return byScore(a, b);
             });
         }
-        else if (keep === "mostCommon") {
+        else if (strategy === "mostCommon") {
             canonical = members.reduce((a, b) => {
                 const ca = countMap.get(a) ?? 0;
                 const cb = countMap.get(b) ?? 0;
@@ -170,7 +176,7 @@ async function fuzzyClean(table, column, newColumn, threshold, options = {}) {
                 return byScore(a, b);
             });
         }
-        else if (keep === "mostCentral") {
+        else if (strategy === "mostCentral") {
             // Most central string — highest total similarity to all other cluster members.
             canonical = members.reduce((a, b) => byScore(a, b));
         }
@@ -187,33 +193,27 @@ async function fuzzyClean(table, column, newColumn, threshold, options = {}) {
         return;
     // Use a VALUES-based CTE for the UPDATE so DuckDB can use a hash join
     // instead of evaluating a potentially huge CASE WHEN expression.
-    const escape = (s) => s.replace(/'/g, "''");
-    const valuesList = [...replacement.entries()]
-        .map(([from, to]) => `('${escape(from)}', '${escape(to)}')`)
-        .join(",\n     ");
-    if (newColumn !== column) {
-        await (0, queryDB_js_1.default)(table, `ALTER TABLE "${table.name}" ADD "${newColumn}" VARCHAR;
-       UPDATE "${table.name}"
-         SET "${newColumn}" = "${column}";
+    const replacementEntries = [...replacement.entries()];
+    const valuesList = replacementEntries.map(() => "(?, ?)").join(",\n     ");
+    const values = replacementEntries.flatMap(([from, to]) => [from, to]);
+    const query = newColumn !== column
+        ? `ALTER TABLE ${(0, quoteIdentifier_js_1.default)(table.name)} ADD ${(0, quoteIdentifier_js_1.default)(newColumn)} VARCHAR;
+       UPDATE ${(0, quoteIdentifier_js_1.default)(table.name)}
+         SET ${(0, quoteIdentifier_js_1.default)(newColumn)} = ${(0, quoteIdentifier_js_1.default)(column)};
        WITH mapping(original, canonical) AS (VALUES ${valuesList})
-       UPDATE "${table.name}"
-         SET "${newColumn}" = m.canonical
+       UPDATE ${(0, quoteIdentifier_js_1.default)(table.name)}
+         SET ${(0, quoteIdentifier_js_1.default)(newColumn)} = m.canonical
          FROM mapping m
-         WHERE "${table.name}"."${newColumn}" = m.original`, (0, mergeOptions_js_1.default)(table, {
-            table: table.name,
-            method: "fuzzyClean()",
-            parameters: { column, newColumn, options },
-        }));
-    }
-    else {
-        await (0, queryDB_js_1.default)(table, `WITH mapping(original, canonical) AS (VALUES ${valuesList})
-       UPDATE "${table.name}"
-         SET "${column}" = m.canonical
+         WHERE ${(0, quoteIdentifier_js_1.default)(table.name)}.${(0, quoteIdentifier_js_1.default)(newColumn)} = m.original`
+        : `WITH mapping(original, canonical) AS (VALUES ${valuesList})
+       UPDATE ${(0, quoteIdentifier_js_1.default)(table.name)}
+         SET ${(0, quoteIdentifier_js_1.default)(column)} = m.canonical
          FROM mapping m
-         WHERE "${table.name}"."${column}" = m.original`, (0, mergeOptions_js_1.default)(table, {
-            table: table.name,
-            method: "fuzzyClean()",
-            parameters: { column, newColumn, options },
-        }));
-    }
+         WHERE ${(0, quoteIdentifier_js_1.default)(table.name)}.${(0, quoteIdentifier_js_1.default)(column)} = m.original`;
+    await (0, queryDB_js_1.default)(table, query, (0, mergeOptions_js_1.default)(table, {
+        table: table.name,
+        method: "fuzzyClean()",
+        parameters: { column, newColumn, options },
+        values,
+    }));
 }

package/script/methods/fuzzyJoin.d.ts

@@ -3,6 +3,6 @@ export default function fuzzyJoin(leftTable: SimpleTable, rightTable: SimpleTabl
     method?: "ratio" | "partial_ratio" | "token_sort_ratio" | "token_set_ratio";
     similarityColumn?: string;
     outputTable?: string | boolean;
-    preFilterPrefixLen?: number;
-}): Promise<SimpleTable>;
+    prefilterPrefixLength?: number;
+}): SimpleTable;
 //# sourceMappingURL=fuzzyJoin.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"fuzzyJoin.d.ts","sourceRoot":"","sources":["../../src/methods/fuzzyJoin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAMvD,wBAA8B,SAAS,CACrC,SAAS,EAAE,WAAW,EACtB,UAAU,EAAE,WAAW,EACvB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;IACP,MAAM,CAAC,EACH,OAAO,GACP,eAAe,GACf,kBAAkB,GAClB,iBAAiB,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC/B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CACxB,wBAiFP"}
+{"version":3,"file":"fuzzyJoin.d.ts","sourceRoot":"","sources":["../../src/methods/fuzzyJoin.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAUvD,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,SAAS,EAAE,WAAW,EACtB,UAAU,EAAE,WAAW,EACvB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;IACP,MAAM,CAAC,EACH,OAAO,GACP,eAAe,GACf,kBAAkB,GAClB,iBAAiB,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC/B,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAC3B,GACL,WAAW,CAyCb"}

package/script/methods/fuzzyJoin.js

@@ -4,14 +4,40 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = fuzzyJoin;
+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 fuzzyJoinQuery_js_1 = __importDefault(require("./fuzzyJoinQuery.js"));
-async function fuzzyJoin(leftTable, rightTable, leftColumn, rightColumn, threshold, options = {}) {
+const queueOp_js_1 = __importDefault(require("../helpers/queueOp.js"));
+const assertSameDatabase_js_1 = __importDefault(require("../helpers/assertSameDatabase.js"));
+const buildFuzzyMatchSql_js_1 = __importDefault(require("../helpers/buildFuzzyMatchSql.js"));
+function fuzzyJoin(leftTable, rightTable, leftColumn, rightColumn, threshold, options = {}) {
+    (0, assertSameDatabase_js_1.default)(leftTable.sdb, [rightTable], "fuzzyJoin()");
+    options = structuredClone(options);
+    // This validation doesn't need the database, so it stays at call time.
     if (leftColumn === rightColumn) {
-        throw new Error(`The leftColumn and rightColumn have the same name "${leftColumn}". Rename one of them before doing the fuzzy join.`);
+        throw new Error(`The leftColumn and rightColumn have the same name ${(0, quoteIdentifier_js_1.default)(leftColumn)}. Rename one of them before doing the fuzzy join.`);
     }
+    // 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: "fuzzyJoin()",
+        parameters: {
+            leftColumn,
+            rightColumn,
+            rightTable: rightTable.name,
+            threshold,
+            options,
+        },
+        execute: () => executeFuzzyJoin(leftTable, rightTable, outputTable, leftColumn, rightColumn, threshold, options),
+    });
+    return outputTable;
+}
+async function executeFuzzyJoin(leftTable, rightTable, outputTable, leftColumn, rightColumn, threshold, options) {
     const leftCols = await leftTable.getColumns();
     const rightCols = await rightTable.getColumns();
     const identicalColumns = (0, getIdenticalColumns_js_1.default)(leftCols, rightCols);
@@ -23,18 +49,23 @@ async function fuzzyJoin(leftTable, rightTable, leftColumn, rightColumn, thresho
             throw new Error(`The tables have columns with identical names. Rename or remove "${identicalColumnsForError[0]}" in one of the two tables before doing the fuzzy join.`);
         }
         else {
-            throw new Error(`The tables have columns with identical names. Rename or remove ${identicalColumnsForError.map((d) => `"${d}"`).join(", ")} in one of the two tables before doing the fuzzy join.`);
+            throw new Error(`The tables have columns with identical names. Rename or remove ${identicalColumnsForError.map((d) => `${(0, quoteIdentifier_js_1.default)(d)}`).join(", ")} in one of the two tables before doing the fuzzy join.`);
         }
     }
     const method = options.method ?? "ratio";
     const similarityColumn = options.similarityColumn;
-    const outputTableName = typeof options.outputTable === "string"
-        ? options.outputTable
-        : leftTable.name;
+    // The right table's copy of a column shared with the left table (only
+    // rightColumn can be shared, checked above) is excluded from the SELECT
+    // directly, instead of dropping its _1 duplicate with a rewrite after the
+    // join.
+    const rightSelect = rightCols
+        .filter((d) => !leftCols.includes(d))
+        .map((d) => `${(0, quoteIdentifier_js_1.default)(rightTable.name)}.${(0, quoteIdentifier_js_1.default)(d)}`)
+        .join(", ");
     const sql = `INSTALL rapidfuzz FROM community; LOAD rapidfuzz;\n` +
-        (0, fuzzyJoinQuery_js_1.default)(leftTable.name, leftColumn, rightTable.name, rightColumn, method, threshold, outputTableName, similarityColumn, options.preFilterPrefixLen);
+        fuzzyJoinQuery(leftTable.name, leftColumn, rightTable.name, rightColumn, method, threshold, outputTable.name, similarityColumn, rightSelect, options.prefilterPrefixLength);
     await (0, queryDB_js_1.default)(leftTable, sql, (0, mergeOptions_js_1.default)(leftTable, {
-        table: outputTableName,
+        table: outputTable.name,
         method: "fuzzyJoin()",
         parameters: {
             leftColumn,
@@ -44,15 +75,25 @@ async function fuzzyJoin(leftTable, rightTable, leftColumn, rightColumn, thresho
             options,
         },
     }));
-    const outputTable = typeof options.outputTable === "string"
-        ? leftTable.sdb.newTable(options.outputTable)
-        : leftTable;
-    // Remove the duplicate right-column produced when leftColumn === rightColumn
-    // (DuckDB suffixes it with _1 in SELECT *)
-    const outputCols = await outputTable.getColumns();
-    const duplicateCol = `${rightColumn}_1`;
-    if (outputCols.includes(duplicateCol)) {
-        await outputTable.removeColumns([duplicateCol]);
+}
+function fuzzyJoinQuery(leftTable, leftColumn, rightTable, rightColumn, method, threshold, outputTable, similarityColumn, rightSelect, prefilterPrefixLength) {
+    const leftExpression = `${(0, quoteIdentifier_js_1.default)(leftTable)}.${(0, quoteIdentifier_js_1.default)(leftColumn)}`;
+    const rightExpression = `${(0, quoteIdentifier_js_1.default)(rightTable)}.${(0, quoteIdentifier_js_1.default)(rightColumn)}`;
+    const { scoreExpression, condition } = (0, buildFuzzyMatchSql_js_1.default)(leftExpression, rightExpression, method, threshold, { decimals: 2, prefilterPrefixLength });
+    if (similarityColumn) {
+        return `CREATE OR REPLACE TABLE ${(0, quoteIdentifier_js_1.default)(outputTable)} AS
+SELECT * EXCLUDE ("_sda_score"), "_sda_score" AS ${(0, quoteIdentifier_js_1.default)(similarityColumn)}
+FROM (
+  SELECT ${(0, quoteIdentifier_js_1.default)(leftTable)}.*, ${rightSelect}, ${scoreExpression} AS "_sda_score"
+  FROM ${(0, quoteIdentifier_js_1.default)(leftTable)} LEFT JOIN ${(0, quoteIdentifier_js_1.default)(rightTable)} ON ${condition}
+) _sda
+ORDER BY ${(0, quoteIdentifier_js_1.default)(leftColumn)}, "_sda_score" DESC;\n`;
     }
-    return outputTable;
+    return `CREATE OR REPLACE TABLE ${(0, quoteIdentifier_js_1.default)(outputTable)} AS
+SELECT *
+FROM (
+  SELECT ${(0, quoteIdentifier_js_1.default)(leftTable)}.*, ${rightSelect}
+  FROM ${(0, quoteIdentifier_js_1.default)(leftTable)} LEFT JOIN ${(0, quoteIdentifier_js_1.default)(rightTable)} ON ${condition}
+) _sda
+ORDER BY ${(0, quoteIdentifier_js_1.default)(leftColumn)}, ${(0, quoteIdentifier_js_1.default)(rightColumn)};\n`;
 }

package/script/methods/getBottom.d.ts

@@ -3,6 +3,6 @@ export default function getBottom(simpleTable: SimpleTable, count: number, optio
     originalOrder?: boolean;
     conditions?: string;
 }): Promise<{
-    [key: string]: string | number | boolean | Date | null;
+    [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":"AAEA,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;;KA6BP"}

package/script/methods/getBottom.js

@@ -4,20 +4,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 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 = {}) {
     const queryResult = await (0, queryDB_js_1.default)(simpleTable, `WITH "numberedRowsForGetBottom" AS (
-                SELECT *, row_number() OVER () as "rowNumberForGetBottom" FROM "${simpleTable.name}"${options.conditions ? ` WHERE ${options.conditions}` : ""}
+                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,
-        returnDataFrom: "query",
+        returnData: true,
         method: "getBottom()",
         parameters: { count, options },
     }));
     if (!queryResult) {
-        throw new Error("No queryResult");
+        throw new Error("The query did not return a result.");
     }
     const rowsRaw = queryResult.map((d) => {
         delete d.rowNumberForGetBottom;

package/script/methods/getBoundingBox.d.ts

@@ -0,0 +1,3 @@
+import type SimpleTable from "../class/SimpleTable.js";
+export default function getBoundingBox(simpleTable: SimpleTable, column?: string): Promise<[number, number, number, number]>;
+//# sourceMappingURL=getBoundingBox.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getBoundingBox.d.ts","sourceRoot":"","sources":["../../src/methods/getBoundingBox.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAEvD,wBAA8B,cAAc,CAC1C,WAAW,EAAE,WAAW,EACxB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAkB3C"}

package/script/methods/getBoundingBox.js

@@ -0,0 +1,25 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = getBoundingBox;
+const quoteIdentifier_js_1 = __importDefault(require("../helpers/quoteIdentifier.js"));
+const findGeoColumn_js_1 = __importDefault(require("../helpers/findGeoColumn.js"));
+const mergeOptions_js_1 = __importDefault(require("../helpers/mergeOptions.js"));
+const queryDB_js_1 = __importDefault(require("../helpers/queryDB.js"));
+async function getBoundingBox(simpleTable, column) {
+    const col = column ?? (await (0, findGeoColumn_js_1.default)(simpleTable, "getBoundingBox()"));
+    const result = (await (0, queryDB_js_1.default)(simpleTable, `SELECT
+                MIN(ST_YMin(${(0, quoteIdentifier_js_1.default)(col)})) AS minX,
+                MIN(ST_XMin(${(0, quoteIdentifier_js_1.default)(col)})) AS minY,
+                MAX(ST_YMax(${(0, quoteIdentifier_js_1.default)(col)})) AS maxX,
+                MAX(ST_XMax(${(0, quoteIdentifier_js_1.default)(col)})) AS maxY,
+            from ${(0, quoteIdentifier_js_1.default)(simpleTable.name)};`, (0, mergeOptions_js_1.default)(simpleTable, {
+        table: simpleTable.name,
+        method: "getBoundingBox()",
+        parameters: { column },
+        returnData: true,
+    })));
+    return [result[0].minY, result[0].minX, result[0].maxY, result[0].maxX];
+}

package/script/methods/getCharacterCount.d.ts

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"getCharacterCount.d.ts","sourceRoot":"","sources":["../../src/methods/getCharacterCount.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAGvD,wBAA8B,iBAAiB,CAC7C,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,mBAsBf"}

package/script/methods/getCharacterCount.js

@@ -0,0 +1,23 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = getCharacterCount;
+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"));
+const quoteQualifiedIdentifier_js_1 = __importDefault(require("../helpers/quoteQualifiedIdentifier.js"));
+async function getCharacterCount(SimpleTable, column) {
+    const queryResult = await (0, queryDB_js_1.default)(SimpleTable, `SELECT CAST(SUM(LENGTH(${(0, quoteQualifiedIdentifier_js_1.default)(SimpleTable.name, column)})) AS BIGINT) AS total_chars FROM ${(0, quoteIdentifier_js_1.default)(SimpleTable.name)}`, (0, mergeOptions_js_1.default)(SimpleTable, {
+        table: SimpleTable.name,
+        returnData: true,
+        method: "getCharacterCount()",
+        parameters: { column },
+    }));
+    if (!queryResult) {
+        throw new Error("The query did not return a result.");
+    }
+    const result = Number(queryResult[0].total_chars);
+    return result;
+}

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

@@ -1 +1 @@
-{"version":3,"file":"getColumns.d.ts","sourceRoot":"","sources":["../../src/methods/getColumns.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAEvD,wBAA8B,UAAU,CAAC,WAAW,EAAE,WAAW,qBAmBhE"}
+{"version":3,"file":"getColumns.d.ts","sourceRoot":"","sources":["../../src/methods/getColumns.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAGvD,wBAA8B,UAAU,CAAC,WAAW,EAAE,WAAW,qBAmBhE"}

package/script/methods/getColumns.js

@@ -6,15 +6,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = getColumns;
 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"));
 async function getColumns(simpleTable) {
-    const queryResult = await (0, queryDB_js_1.default)(simpleTable, `DESCRIBE ${simpleTable.name}`, (0, mergeOptions_js_1.default)(simpleTable, {
+    const queryResult = await (0, queryDB_js_1.default)(simpleTable, `DESCRIBE ${(0, quoteIdentifier_js_1.default)(simpleTable.name)}`, (0, mergeOptions_js_1.default)(simpleTable, {
         table: simpleTable.name,
-        returnDataFrom: "query",
+        returnData: true,
         method: "getColumns()",
         parameters: {},
     }));
     if (!queryResult) {
-        throw new Error("No result");
+        throw new Error("The query did not return a result.");
     }
     const columns = queryResult.map((d) => d.column_name);
     return columns;

package/script/methods/getData.d.ts

@@ -0,0 +1,9 @@
+import type SimpleTable from "../class/SimpleTable.js";
+export default function getData(simpleTable: SimpleTable, options?: {
+    columns?: string | string[];
+    conditions?: string;
+    limit?: number;
+}): Promise<{
+    [key: string]: unknown;
+}[]>;
+//# sourceMappingURL=getData.d.ts.map

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

@@ -0,0 +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"}

package/script/methods/getData.js

@@ -0,0 +1,29 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = getData;
+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 = {}) {
+    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.");
+    }
+    const columns = options.columns
+        ? (typeof options.columns === "string"
+            ? [options.columns]
+            : options.columns)
+        : undefined;
+    return (await (0, queryDB_js_1.default)(simpleTable, `SELECT ${columns
+        ? columns.map((column) => (0, quoteQualifiedIdentifier_js_1.default)(simpleTable.name, column)).join(", ")
+        : "*"} 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()",
+        parameters: { options },
+    })));
+}

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

@@ -1 +1 @@
-{"version":3,"file":"getDescription.d.ts","sourceRoot":"","sources":["../../src/methods/getDescription.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAEvD,wBAA8B,cAAc,CAAC,WAAW,EAAE,WAAW;YAc3C,MAAM;;WAEP,MAAM;YACC,MAAM;UACV,MAAM;KAIjC"}
+{"version":3,"file":"getDescription.d.ts","sourceRoot":"","sources":["../../src/methods/getDescription.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAEvD,wBAA8B,cAAc,CAAC,WAAW,EAAE,WAAW;;;WAoB1C,MAAM;YACG,MAAM;UACZ,MAAM;KAKnC"}

package/script/methods/getDescription.js

@@ -5,19 +5,24 @@ async function getDescription(simpleTable) {
     const types = await simpleTable.getTypes();
     const columns = await simpleTable.getColumns();
     const summaryForGetDescription = await simpleTable.summarize({
-        values: columns,
-        summaries: ["count", "countUnique", "countNull"],
-        toMs: true,
+        columns: columns,
+        stats: ["count", "countDistinct", "countNull"],
+        datesToMs: true,
         outputTable: "summaryForGetDescription",
     });
     const summaryData = await summaryForGetDescription.getData();
     await summaryForGetDescription.removeTable();
-    const description = summaryData.map((d) => ({
-        column: d["value"],
-        type: types[d["value"]],
-        count: d["count"],
-        unique: d["countUnique"],
-        null: d["countNull"],
-    }));
+    // summarize adds the `column` output column only when it summarizes more than one
+    // column; for a single-column table the column name is already known.
+    const description = summaryData.map((d) => {
+        const column = columns.length > 1 ? d.column : columns[0];
+        return {
+            column,
+            type: types[column],
+            count: d["count"],
+            unique: d["countDistinct"],
+            null: d["countNull"],
+        };
+    });
     return description;
 }

package/script/methods/getFirstRow.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"getFirstRow.d.ts","sourceRoot":"","sources":["../../src/methods/getFirstRow.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAEvD,wBAA8B,WAAW,CACvC,WAAW,EAAE,WAAW,EACxB,OAAO,GAAE;IACP,UAAU,CAAC,EAAE,MAAM,CAAC;CAChB;;GAqBP"}
+{"version":3,"file":"getFirstRow.d.ts","sourceRoot":"","sources":["../../src/methods/getFirstRow.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAEvD,wBAA8B,WAAW,CACvC,WAAW,EAAE,WAAW,EACxB,OAAO,GAAE;IACP,UAAU,CAAC,EAAE,MAAM,CAAC;CAChB;;GAqBP"}

package/script/methods/getFirstRow.js

@@ -4,18 +4,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = getFirstRow;
+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 getFirstRow(simpleTable, options = {}) {
-    const queryResult = await (0, queryDB_js_1.default)(simpleTable, `SELECT * FROM "${simpleTable.name}"${options.conditions ? ` WHERE ${options.conditions}` : ""} LIMIT 1`, (0, mergeOptions_js_1.default)(simpleTable, {
+    const queryResult = await (0, queryDB_js_1.default)(simpleTable, `SELECT * FROM ${(0, quoteIdentifier_js_1.default)(simpleTable.name)}${options.conditions ? ` WHERE ${options.conditions}` : ""} LIMIT 1`, (0, mergeOptions_js_1.default)(simpleTable, {
         table: simpleTable.name,
-        returnDataFrom: "query",
+        returnData: true,
         method: "getFirstRow()",
         parameters: { options },
     }));
     if (!queryResult) {
-        throw new Error("No queryResult");
+        throw new Error("The query did not return a result.");
     }
     const result = queryResult[0];
-    return result;
+    return result ?? null;
 }

package/script/methods/getGeoData.d.ts

@@ -10,7 +10,7 @@ export default function getGeoData(SimpleTable: SimpleTable, column: string, opt
             coordinates: unknown[];
         };
         properties: {
-            [key: string]: string | number | boolean | Date | null;
+            [key: string]: unknown;
         };
     }[];
 }>;

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

@@ -1 +1 @@
-{"version":3,"file":"getGeoData.d.ts","sourceRoot":"","sources":["../../src/methods/getGeoData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAMvD,wBAA8B,UAAU,CACtC,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO;;;;;kBAuBtB,MAAM;yBACC,OAAO,EAAE;;;;;;GAgC7B"}
+{"version":3,"file":"getGeoData.d.ts","sourceRoot":"","sources":["../../src/methods/getGeoData.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAMvD,wBAA8B,UAAU,CACtC,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO;;;;;kBA0BtB,MAAM;yBACC,OAAO,EAAE;;;;;;GAgC7B"}