@gjsify/sqlite 0.3.13 → 0.3.15

package/lib/esm/statement-sync.js

@@ -1,292 +1,300 @@
-import Gda from "@girs/gda-6.0";
 import { IllegalConstructorError, InvalidArgTypeError, InvalidArgValueError, SqliteError } from "./errors.js";
 import { readAllRows, readFirstRow } from "./data-model-reader.js";
+import Gda from "@girs/gda-6.0";
+
+//#region src/statement-sync.ts
 const MAX_INT64 = 9223372036854775807n;
 const MIN_INT64 = -9223372036854775808n;
-const INTERNAL = /* @__PURE__ */ Symbol("StatementSync.internal");
+const INTERNAL = Symbol("StatementSync.internal");
 function validateBindValue(value, paramIndex) {
-  if (value === null) return;
-  const t = typeof value;
-  if (t === "number" || t === "bigint" || t === "string" || t === "boolean") return;
-  if (value instanceof Uint8Array || value instanceof ArrayBuffer) return;
-  if (ArrayBuffer.isView(value)) return;
-  throw new InvalidArgTypeError(
-    `Provided value cannot be bound to SQLite parameter ${paramIndex}.`
-  );
+	if (value === null) return;
+	const t = typeof value;
+	if (t === "number" || t === "bigint" || t === "string" || t === "boolean") return;
+	if (value instanceof Uint8Array || value instanceof ArrayBuffer) return;
+	if (ArrayBuffer.isView(value)) return;
+	throw new InvalidArgTypeError(`Provided value cannot be bound to SQLite parameter ${paramIndex}.`);
 }
 function sqlEscapeValue(value) {
-  if (value === null) return "NULL";
-  if (value === void 0) return "NULL";
-  if (typeof value === "number") return String(value);
-  if (typeof value === "boolean") return value ? "1" : "0";
-  if (typeof value === "bigint") {
-    if (value > MAX_INT64 || value < MIN_INT64) {
-      throw new InvalidArgValueError("BigInt value is too large to bind.");
-    }
-    return String(value);
-  }
-  if (typeof value === "string") return "'" + value.replace(/'/g, "''") + "'";
-  if (value instanceof Uint8Array) {
-    let hex = "";
-    for (let i = 0; i < value.length; i++) {
-      hex += value[i].toString(16).padStart(2, "0");
-    }
-    return "X'" + hex + "'";
-  }
-  if (ArrayBuffer.isView(value)) {
-    return sqlEscapeValue(new Uint8Array(value.buffer));
-  }
-  return "NULL";
-}
-class StatementSync {
-  #connection;
-  #sql;
-  #paramMap;
-  #readBigInts;
-  #returnArrays;
-  #allowBareNamedParameters;
-  #allowUnknownNamedParameters;
-  #parser;
-  constructor(sentinel, connection, sql, options, paramMap, parser) {
-    if (sentinel !== INTERNAL) {
-      throw new IllegalConstructorError();
-    }
-    this.#connection = connection;
-    this.#sql = sql;
-    this.#paramMap = paramMap;
-    this.#readBigInts = options.readBigInts ?? false;
-    this.#returnArrays = options.returnArrays ?? false;
-    this.#allowBareNamedParameters = options.allowBareNamedParameters ?? true;
-    this.#allowUnknownNamedParameters = options.allowUnknownNamedParameters ?? false;
-    this.#parser = parser;
-  }
-  /** @internal */
-  static _create(connection, sql, options, paramMap, parser) {
-    return new StatementSync(INTERNAL, connection, sql, options, paramMap, parser);
-  }
-  get sourceSQL() {
-    return this.#sql;
-  }
-  get expandedSQL() {
-    return this.#sql;
-  }
-  #getReadOptions() {
-    return {
-      readBigInts: this.#readBigInts,
-      returnArrays: this.#returnArrays
-    };
-  }
-  // Build the final SQL with parameter values substituted inline.
-  // Returns the SQL string ready for execution.
-  #buildSql(args) {
-    if (this.#paramMap.length === 0) {
-      if (args.length > 0) {
-        const hasNamedArg = args.length > 0 && args[0] !== null && typeof args[0] === "object" && !(args[0] instanceof Uint8Array) && !ArrayBuffer.isView(args[0]);
-        if (!hasNamedArg) {
-          throw new SqliteError("column index out of range", 25, "column index out of range");
-        }
-      }
-      return this.#sql;
-    }
-    let namedArgs = null;
-    let positionalArgs = args;
-    if (args.length > 0 && args[0] !== null && typeof args[0] === "object" && !(args[0] instanceof Uint8Array) && !ArrayBuffer.isView(args[0])) {
-      namedArgs = args[0];
-      positionalArgs = args.slice(1);
-    }
-    const values = /* @__PURE__ */ new Map();
-    const positionalValues = {};
-    if (namedArgs) {
-      for (const param of this.#paramMap) {
-        if (param.position >= 0) continue;
-        const origName = param.originalName;
-        let value = void 0;
-        let found = false;
-        if (origName in namedArgs) {
-          value = namedArgs[origName];
-          found = true;
-        }
-        if (!found && this.#allowBareNamedParameters) {
-          const bareName = origName.replace(/^[\$:@]/, "");
-          if (bareName in namedArgs) {
-            value = namedArgs[bareName];
-            found = true;
-          }
-        }
-        if (!found && !this.#allowBareNamedParameters) {
-          const bareName = origName.replace(/^[\$:@]/, "");
-          if (bareName in namedArgs) {
-            throw new SqliteError(`Unknown named parameter '${bareName}'`, 0, `Unknown named parameter '${bareName}'`);
-          }
-        }
-        if (found) {
-          validateBindValue(value, this.#paramMap.indexOf(param) + 1);
-          values.set(param.originalName, sqlEscapeValue(value));
-        } else {
-          values.set(param.originalName, "NULL");
-        }
-      }
-      const positionalParams = this.#paramMap.filter((p) => p.position >= 0);
-      for (let i = 0; i < positionalArgs.length; i++) {
-        if (i >= positionalParams.length) {
-          throw new SqliteError("column index out of range", 25, "column index out of range");
-        }
-        validateBindValue(positionalArgs[i], i + 1);
-        positionalValues[positionalParams[i].position] = sqlEscapeValue(positionalArgs[i]);
-      }
-    } else {
-      const positionalParams = this.#paramMap.filter((p) => p.position >= 0);
-      if (positionalArgs.length > positionalParams.length && positionalParams.length > 0) {
-        throw new SqliteError("column index out of range", 25, "column index out of range");
-      }
-      for (let i = 0; i < positionalParams.length; i++) {
-        if (i < positionalArgs.length) {
-          validateBindValue(positionalArgs[i], i + 1);
-          positionalValues[positionalParams[i].position] = sqlEscapeValue(positionalArgs[i]);
-        } else {
-          positionalValues[positionalParams[i].position] = "NULL";
-        }
-      }
-    }
-    let result = this.#sql;
-    const namedParams = this.#paramMap.filter((p) => p.position < 0).sort((a, b) => b.originalName.length - a.originalName.length);
-    for (const param of namedParams) {
-      const escaped = values.get(param.originalName) ?? "NULL";
-      result = result.split(param.originalName).join(escaped);
-    }
-    if (Object.keys(positionalValues).length > 0) {
-      let out = "";
-      let pIdx = 0;
-      let i = 0;
-      while (i < result.length) {
-        if (result[i] === "'") {
-          const start = i;
-          i++;
-          while (i < result.length && result[i] !== "'") {
-            if (result[i] === "'" && result[i + 1] === "'") {
-              i += 2;
-              continue;
-            }
-            i++;
-          }
-          if (i < result.length) i++;
-          out += result.substring(start, i);
-          continue;
-        }
-        if (result[i] === "?") {
-          i++;
-          let numStr = "";
-          while (i < result.length && result[i] >= "0" && result[i] <= "9") {
-            numStr += result[i];
-            i++;
-          }
-          const pos = numStr ? parseInt(numStr, 10) - 1 : pIdx;
-          pIdx = numStr ? pIdx : pIdx + 1;
-          out += pos in positionalValues ? positionalValues[pos] : "NULL";
-          continue;
-        }
-        out += result[i];
-        i++;
-      }
-      result = out;
-    }
-    return result;
-  }
-  #executeSql(sql) {
-    const [stmt] = this.#parser.parse_string(sql);
-    if (!stmt) {
-      throw new SqliteError("Failed to parse SQL statement");
-    }
-    const stmtType = stmt.get_statement_type();
-    if (stmtType === Gda.SqlStatementType.SELECT) {
-      return { model: this.#connection.statement_execute_select(stmt, null), isSelect: true };
-    }
-    try {
-      this.#connection.statement_execute_non_select(stmt, null);
-      return { model: null, isSelect: false };
-    } catch {
-      const model = this.#connection.statement_execute_select(stmt, null);
-      return { model, isSelect: true };
-    }
-  }
-  run(...args) {
-    const sql = this.#buildSql(args);
-    this.#executeSql(sql);
-    let changes = 0;
-    let lastInsertRowid = 0;
-    try {
-      const chModel = this.#connection.execute_select_command("SELECT changes()");
-      if (chModel && chModel.get_n_rows() > 0) {
-        changes = chModel.get_value_at(0, 0);
-      }
-    } catch {
-    }
-    try {
-      const ridModel = this.#connection.execute_select_command("SELECT last_insert_rowid()");
-      if (ridModel && ridModel.get_n_rows() > 0) {
-        lastInsertRowid = ridModel.get_value_at(0, 0);
-      }
-    } catch {
-    }
-    if (this.#readBigInts) {
-      changes = BigInt(changes);
-      lastInsertRowid = BigInt(lastInsertRowid);
-    }
-    return { changes, lastInsertRowid };
-  }
-  get(...args) {
-    const sql = this.#buildSql(args);
-    try {
-      const { model } = this.#executeSql(sql);
-      if (!model || model.get_n_rows() === 0) {
-        return void 0;
-      }
-      return readFirstRow(model, this.#getReadOptions());
-    } catch {
-      return void 0;
-    }
-  }
-  all(...args) {
-    const sql = this.#buildSql(args);
-    try {
-      const { model } = this.#executeSql(sql);
-      if (!model) {
-        return [];
-      }
-      return readAllRows(model, this.#getReadOptions());
-    } catch {
-      return [];
-    }
-  }
-  setReadBigInts(enabled) {
-    if (typeof enabled !== "boolean") {
-      throw new InvalidArgTypeError('The "readBigInts" argument must be a boolean.');
-    }
-    this.#readBigInts = enabled;
-    return void 0;
-  }
-  setReturnArrays(enabled) {
-    if (typeof enabled !== "boolean") {
-      throw new InvalidArgTypeError('The "returnArrays" argument must be a boolean.');
-    }
-    this.#returnArrays = enabled;
-    return void 0;
-  }
-  setAllowBareNamedParameters(enabled) {
-    if (typeof enabled !== "boolean") {
-      throw new InvalidArgTypeError('The "allowBareNamedParameters" argument must be a boolean.');
-    }
-    this.#allowBareNamedParameters = enabled;
-    return void 0;
-  }
-  setAllowUnknownNamedParameters(enabled) {
-    if (typeof enabled !== "boolean") {
-      throw new InvalidArgTypeError('The "allowUnknownNamedParameters" argument must be a boolean.');
-    }
-    this.#allowUnknownNamedParameters = enabled;
-    return void 0;
-  }
+	if (value === null) return "NULL";
+	if (value === undefined) return "NULL";
+	if (typeof value === "number") return String(value);
+	if (typeof value === "boolean") return value ? "1" : "0";
+	if (typeof value === "bigint") {
+		if (value > MAX_INT64 || value < MIN_INT64) {
+			throw new InvalidArgValueError("BigInt value is too large to bind.");
+		}
+		return String(value);
+	}
+	if (typeof value === "string") return "'" + value.replace(/'/g, "''") + "'";
+	if (value instanceof Uint8Array) {
+		let hex = "";
+		for (let i = 0; i < value.length; i++) {
+			hex += value[i].toString(16).padStart(2, "0");
+		}
+		return "X'" + hex + "'";
+	}
+	if (ArrayBuffer.isView(value)) {
+		return sqlEscapeValue(new Uint8Array(value.buffer));
+	}
+	return "NULL";
 }
-export {
-  StatementSync
+var StatementSync = class StatementSync {
+	#connection;
+	#sql;
+	#paramMap;
+	#readBigInts;
+	#returnArrays;
+	#allowBareNamedParameters;
+	#allowUnknownNamedParameters;
+	#parser;
+	constructor(sentinel, connection, sql, options, paramMap, parser) {
+		if (sentinel !== INTERNAL) {
+			throw new IllegalConstructorError();
+		}
+		this.#connection = connection;
+		this.#sql = sql;
+		this.#paramMap = paramMap;
+		this.#readBigInts = options.readBigInts ?? false;
+		this.#returnArrays = options.returnArrays ?? false;
+		this.#allowBareNamedParameters = options.allowBareNamedParameters ?? true;
+		this.#allowUnknownNamedParameters = options.allowUnknownNamedParameters ?? false;
+		this.#parser = parser;
+	}
+	/** @internal */
+	static _create(connection, sql, options, paramMap, parser) {
+		return new StatementSync(INTERNAL, connection, sql, options, paramMap, parser);
+	}
+	get sourceSQL() {
+		return this.#sql;
+	}
+	get expandedSQL() {
+		return this.#sql;
+	}
+	#getReadOptions() {
+		return {
+			readBigInts: this.#readBigInts,
+			returnArrays: this.#returnArrays
+		};
+	}
+	#buildSql(args) {
+		if (this.#paramMap.length === 0) {
+			if (args.length > 0) {
+				const hasNamedArg = args.length > 0 && args[0] !== null && typeof args[0] === "object" && !(args[0] instanceof Uint8Array) && !ArrayBuffer.isView(args[0]);
+				if (!hasNamedArg) {
+					throw new SqliteError("column index out of range", 25, "column index out of range");
+				}
+			}
+			return this.#sql;
+		}
+		let namedArgs = null;
+		let positionalArgs = args;
+		if (args.length > 0 && args[0] !== null && typeof args[0] === "object" && !(args[0] instanceof Uint8Array) && !ArrayBuffer.isView(args[0])) {
+			namedArgs = args[0];
+			positionalArgs = args.slice(1);
+		}
+		const values = new Map();
+		const positionalValues = {};
+		if (namedArgs) {
+			for (const param of this.#paramMap) {
+				if (param.position >= 0) continue;
+				const origName = param.originalName;
+				let value = undefined;
+				let found = false;
+				if (origName in namedArgs) {
+					value = namedArgs[origName];
+					found = true;
+				}
+				if (!found && this.#allowBareNamedParameters) {
+					const bareName = origName.replace(/^[\$:@]/, "");
+					if (bareName in namedArgs) {
+						value = namedArgs[bareName];
+						found = true;
+					}
+				}
+				if (!found && !this.#allowBareNamedParameters) {
+					const bareName = origName.replace(/^[\$:@]/, "");
+					if (bareName in namedArgs) {
+						throw new SqliteError(`Unknown named parameter '${bareName}'`, 0, `Unknown named parameter '${bareName}'`);
+					}
+				}
+				if (found) {
+					validateBindValue(value, this.#paramMap.indexOf(param) + 1);
+					values.set(param.originalName, sqlEscapeValue(value));
+				} else {
+					values.set(param.originalName, "NULL");
+				}
+			}
+			const positionalParams = this.#paramMap.filter((p) => p.position >= 0);
+			for (let i = 0; i < positionalArgs.length; i++) {
+				if (i >= positionalParams.length) {
+					throw new SqliteError("column index out of range", 25, "column index out of range");
+				}
+				validateBindValue(positionalArgs[i], i + 1);
+				positionalValues[positionalParams[i].position] = sqlEscapeValue(positionalArgs[i]);
+			}
+		} else {
+			const positionalParams = this.#paramMap.filter((p) => p.position >= 0);
+			if (positionalArgs.length > positionalParams.length && positionalParams.length > 0) {
+				throw new SqliteError("column index out of range", 25, "column index out of range");
+			}
+			for (let i = 0; i < positionalParams.length; i++) {
+				if (i < positionalArgs.length) {
+					validateBindValue(positionalArgs[i], i + 1);
+					positionalValues[positionalParams[i].position] = sqlEscapeValue(positionalArgs[i]);
+				} else {
+					positionalValues[positionalParams[i].position] = "NULL";
+				}
+			}
+		}
+		let result = this.#sql;
+		const namedParams = this.#paramMap.filter((p) => p.position < 0).sort((a, b) => b.originalName.length - a.originalName.length);
+		for (const param of namedParams) {
+			const escaped = values.get(param.originalName) ?? "NULL";
+			result = result.split(param.originalName).join(escaped);
+		}
+		if (Object.keys(positionalValues).length > 0) {
+			let out = "";
+			let pIdx = 0;
+			let i = 0;
+			while (i < result.length) {
+				if (result[i] === "'") {
+					const start = i;
+					i++;
+					while (i < result.length && result[i] !== "'") {
+						if (result[i] === "'" && result[i + 1] === "'") {
+							i += 2;
+							continue;
+						}
+						i++;
+					}
+					if (i < result.length) i++;
+					out += result.substring(start, i);
+					continue;
+				}
+				if (result[i] === "?") {
+					i++;
+					let numStr = "";
+					while (i < result.length && result[i] >= "0" && result[i] <= "9") {
+						numStr += result[i];
+						i++;
+					}
+					const pos = numStr ? parseInt(numStr, 10) - 1 : pIdx;
+					pIdx = numStr ? pIdx : pIdx + 1;
+					out += pos in positionalValues ? positionalValues[pos] : "NULL";
+					continue;
+				}
+				out += result[i];
+				i++;
+			}
+			result = out;
+		}
+		return result;
+	}
+	#executeSql(sql) {
+		const [stmt] = this.#parser.parse_string(sql);
+		if (!stmt) {
+			throw new SqliteError("Failed to parse SQL statement");
+		}
+		const stmtType = stmt.get_statement_type();
+		if (stmtType === Gda.SqlStatementType.SELECT) {
+			return {
+				model: this.#connection.statement_execute_select(stmt, null),
+				isSelect: true
+			};
+		}
+		try {
+			this.#connection.statement_execute_non_select(stmt, null);
+			return {
+				model: null,
+				isSelect: false
+			};
+		} catch {
+			const model = this.#connection.statement_execute_select(stmt, null);
+			return {
+				model,
+				isSelect: true
+			};
+		}
+	}
+	run(...args) {
+		const sql = this.#buildSql(args);
+		this.#executeSql(sql);
+		let changes = 0;
+		let lastInsertRowid = 0;
+		try {
+			const chModel = this.#connection.execute_select_command("SELECT changes()");
+			if (chModel && chModel.get_n_rows() > 0) {
+				changes = chModel.get_value_at(0, 0);
+			}
+		} catch {}
+		try {
+			const ridModel = this.#connection.execute_select_command("SELECT last_insert_rowid()");
+			if (ridModel && ridModel.get_n_rows() > 0) {
+				lastInsertRowid = ridModel.get_value_at(0, 0);
+			}
+		} catch {}
+		if (this.#readBigInts) {
+			changes = BigInt(changes);
+			lastInsertRowid = BigInt(lastInsertRowid);
+		}
+		return {
+			changes,
+			lastInsertRowid
+		};
+	}
+	get(...args) {
+		const sql = this.#buildSql(args);
+		try {
+			const { model } = this.#executeSql(sql);
+			if (!model || model.get_n_rows() === 0) {
+				return undefined;
+			}
+			return readFirstRow(model, this.#getReadOptions());
+		} catch {
+			return undefined;
+		}
+	}
+	all(...args) {
+		const sql = this.#buildSql(args);
+		try {
+			const { model } = this.#executeSql(sql);
+			if (!model) {
+				return [];
+			}
+			return readAllRows(model, this.#getReadOptions());
+		} catch {
+			return [];
+		}
+	}
+	setReadBigInts(enabled) {
+		if (typeof enabled !== "boolean") {
+			throw new InvalidArgTypeError("The \"readBigInts\" argument must be a boolean.");
+		}
+		this.#readBigInts = enabled;
+		return undefined;
+	}
+	setReturnArrays(enabled) {
+		if (typeof enabled !== "boolean") {
+			throw new InvalidArgTypeError("The \"returnArrays\" argument must be a boolean.");
+		}
+		this.#returnArrays = enabled;
+		return undefined;
+	}
+	setAllowBareNamedParameters(enabled) {
+		if (typeof enabled !== "boolean") {
+			throw new InvalidArgTypeError("The \"allowBareNamedParameters\" argument must be a boolean.");
+		}
+		this.#allowBareNamedParameters = enabled;
+		return undefined;
+	}
+	setAllowUnknownNamedParameters(enabled) {
+		if (typeof enabled !== "boolean") {
+			throw new InvalidArgTypeError("The \"allowUnknownNamedParameters\" argument must be a boolean.");
+		}
+		this.#allowUnknownNamedParameters = enabled;
+		return undefined;
+	}
 };
+
+//#endregion
+export { StatementSync };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gjsify/sqlite",
-  "version": "0.3.13",
+  "version": "0.3.15",
   "description": "Node.js sqlite module for Gjs using libgda",
   "type": "module",
   "module": "lib/esm/index.js",
@@ -31,14 +31,14 @@
     "libgda"
   ],
   "devDependencies": {
-    "@gjsify/cli": "^0.3.13",
-    "@gjsify/unit": "^0.3.13",
+    "@gjsify/cli": "^0.3.15",
+    "@gjsify/unit": "^0.3.15",
     "@types/node": "^25.6.0",
     "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@girs/gda-6.0": "^6.0.0-4.0.0-rc.9",
-    "@girs/glib-2.0": "^2.88.0-4.0.0-rc.9",
-    "@girs/gobject-2.0": "^2.88.0-4.0.0-rc.9"
+    "@girs/gda-6.0": "6.0.0-4.0.0-rc.9",
+    "@girs/glib-2.0": "2.88.0-4.0.0-rc.9",
+    "@girs/gobject-2.0": "2.88.0-4.0.0-rc.9"
   }
 }