@onreza/sqlx-js 0.7.0 → 0.9.0

package/dist/src/sql-params.js

@@ -0,0 +1,101 @@
+import { isEscapeStringPrefix, isIdentifierContinuation, readBlockComment, readDollarQuoted, readLineComment, readQuotedIdentifier, readSingleQuoted, } from "./sql-lex.js";
+export function rewriteNamedParameters(query) {
+    let out = "";
+    let i = 0;
+    let positional = false;
+    const names = [];
+    const indexes = new Map();
+    const positionMap = [];
+    const append = (text, sourceStart) => {
+        out += text;
+        for (let offset = 0; offset < text.length; offset++)
+            positionMap.push(sourceStart + offset);
+    };
+    while (i < query.length) {
+        const start = i;
+        const ch = query[i];
+        if (ch === "-" && query[i + 1] === "-") {
+            i = readLineComment(query, i);
+            append(query.slice(start, i), start);
+            continue;
+        }
+        if (ch === "/" && query[i + 1] === "*") {
+            i = readBlockComment(query, i);
+            append(query.slice(start, i), start);
+            continue;
+        }
+        if (ch === "'") {
+            i = readSingleQuoted(query, i, isEscapeStringPrefix(query, i));
+            append(query.slice(start, i), start);
+            continue;
+        }
+        if (ch === '"') {
+            i = readQuotedIdentifier(query, i);
+            append(query.slice(start, i), start);
+            continue;
+        }
+        if (ch === "$") {
+            if (i > 0 && isIdentifierContinuation(query[i - 1])) {
+                append(ch, i);
+                i++;
+                continue;
+            }
+            const quotedEnd = readDollarQuoted(query, i);
+            if (quotedEnd !== null) {
+                i = quotedEnd;
+                append(query.slice(start, i), start);
+                continue;
+            }
+            const positionalMatch = /^\$[1-9][0-9]*/.exec(query.slice(i));
+            if (positionalMatch) {
+                positional = true;
+                i += positionalMatch[0].length;
+                append(positionalMatch[0], start);
+                continue;
+            }
+            const namedMatch = /^\$([A-Za-z_][A-Za-z0-9_]*)/.exec(query.slice(i));
+            if (namedMatch) {
+                const name = namedMatch[1];
+                let index = indexes.get(name);
+                if (index === undefined) {
+                    names.push(name);
+                    index = names.length;
+                    indexes.set(name, index);
+                }
+                const replacement = `$${index}`;
+                append(replacement, start);
+                i += namedMatch[0].length;
+                continue;
+            }
+        }
+        append(ch, i);
+        i++;
+    }
+    if (positional && names.length > 0) {
+        throw new Error("sqlx-js: named and positional parameters cannot be mixed in one query");
+    }
+    positionMap.push(query.length);
+    return { query: out, names, positionMap };
+}
+export function bindNamedParameters(rewritten, args) {
+    if (rewritten.names.length === 0)
+        return { query: rewritten.query, params: [...args] };
+    if (args.length !== 1 || args[0] === null || typeof args[0] !== "object" || Array.isArray(args[0])) {
+        throw new Error("sqlx-js: a query with named parameters requires exactly one parameter object");
+    }
+    const values = args[0];
+    const missing = rewritten.names.filter((name) => !Object.hasOwn(values, name));
+    const expected = new Set(rewritten.names);
+    const extra = Object.keys(values).filter((name) => !expected.has(name));
+    if (missing.length > 0)
+        throw new Error(`sqlx-js: missing named parameter(s): ${missing.join(", ")}`);
+    if (extra.length > 0)
+        throw new Error(`sqlx-js: unknown named parameter(s): ${extra.join(", ")}`);
+    return { query: rewritten.query, params: rewritten.names.map((name) => values[name]) };
+}
+export function originalPosition(rewritten, oneBasedPosition) {
+    const position = Number(oneBasedPosition);
+    if (!Number.isInteger(position) || position < 1)
+        return oneBasedPosition;
+    return (rewritten.positionMap[position - 1] ?? position - 1) + 1;
+}

package/dist/src/typed.d.ts

@@ -1,14 +1,15 @@
+import type { QUERY_EXECUTOR, QueryExecutorMethod } from "./query.js";
 type ParamsOf<T> = T extends {
-    params: infer P extends readonly unknown[];
-} ? P : never[];
+    params: infer P;
+} ? P extends readonly unknown[] ? P : [P] : never[];
 type RowOf<T> = T extends {
     row: infer R;
 } ? R : never;
 type ExecuteResult = import("./runtime.js").ExecuteResult;
-type JsonInputValue = import("./runtime.js").JsonInputValue;
+type JsonCompatible<T> = import("./runtime.js").JsonCompatible<T>;
 type JsonParameter<T> = import("./runtime.js").JsonParameter<T>;
 type PgArrayParameter<T> = import("./runtime.js").PgArrayParameter<T>;
-type JsonFn = <T extends JsonInputValue>(value: T) => JsonParameter<T>;
+type JsonFn = <T>(value: T & JsonCompatible<T>) => JsonParameter<T>;
 type ArrayFn = <T>(value: readonly (T | null)[]) => PgArrayParameter<T>;
 export type TypedFile<TFileQueries> = {
     <P extends keyof TFileQueries>(path: P, ...params: ParamsOf<TFileQueries[P]>): Promise<RowOf<TFileQueries[P]>[]>;
@@ -25,6 +26,7 @@ export type TypedSql<TQueries, TFileQueries> = {
     id: (...parts: string[]) => string;
     json: JsonFn;
     array: ArrayFn;
+    readonly [QUERY_EXECUTOR]?: QueryExecutorMethod;
 };
 export type Typed<TQueries, TFileQueries, TTransactionOptions> = TypedSql<TQueries, TFileQueries> & {
     transaction: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onreza/sqlx-js",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "description": "Compile-time-checked raw SQL for TypeScript + PostgreSQL. Inspired by sqlx.",
   "license": "MIT",
   "type": "module",
@@ -66,6 +66,11 @@
   "peerDependencies": {
     "typescript": ">=5.4"
   },
+  "peerDependenciesMeta": {
+    "typescript": {
+      "optional": true
+    }
+  },
   "dependencies": {
     "libpg-query": "^17.7.3",
     "postgres": "^3.4.9"