@b4moss/crudian 0.9.0 → 0.10.0

package/dist/sqlite/sync-crud.js

@@ -1,15 +1,16 @@
 import { CrudianError, assertString, } from "../index.js";
+import { sqliteDialect } from "../dialect/sqlite.js";
 import { createPkGuard, resolvePk } from "./pk.js";
-import { compileWhere, quoteIdent, resolveWhere } from "./sql.js";
+import { compileWhere, resolveWhere } from "./sql.js";
 function requireWhere(query, label) {
     if (query.where === undefined || query.where === null) {
         throw new CrudianError(`${label} requires where`);
     }
 }
-function selectColumns(columns) {
+function selectColumns(d, columns) {
     if (!columns || columns.length === 0)
         return "*";
-    return columns.map((c) => quoteIdent(c)).join(", ");
+    return columns.map((c) => d.quoteIdent(c)).join(", ");
 }
 function rowFromObject(value) {
     if (value === null || typeof value !== "object") {
@@ -17,9 +18,11 @@ function rowFromObject(value) {
     }
     return { ...value };
 }
-export function createSyncSqliteCrud(db, ex, options) {
+/** Dialect-aware sync CRUD factory. */
+export function createSyncCrud(db, ex, dialect, options) {
     const pk = resolvePk(options);
-    const ensurePkColumn = createPkGuard(pk, ex.get, ex.all);
+    const ensurePkColumn = createPkGuard(pk, dialect, ex.all);
+    const d = dialect;
     const crud = {
         db,
         create(table, cols) {
@@ -32,23 +35,24 @@ export function createSyncSqliteCrud(db, ex, options) {
             if (keys.length === 0) {
                 throw new CrudianError("cols must not be empty");
             }
-            const tbl = quoteIdent(table);
-            const colSql = keys.map((k) => quoteIdent(k)).join(", ");
-            const placeholders = keys.map(() => "?").join(", ");
+            const tbl = d.quoteIdent(table);
+            const colSql = keys.map((k) => d.quoteIdent(k)).join(", ");
+            let idx = 1;
+            const placeholders = keys.map(() => d.placeholder(idx++)).join(", ");
             const args = keys.map((k) => cols[k]);
             ex.run(`INSERT INTO ${tbl} (${colSql}) VALUES (${placeholders})`, args);
             const pkValue = Object.prototype.hasOwnProperty.call(cols, pk)
                 ? cols[pk]
-                : Number(ex.get("SELECT last_insert_rowid() AS id")?.id);
-            const row = ex.get(`SELECT * FROM ${tbl} WHERE ${quoteIdent(pk)} = ?`, [pkValue]);
+                : Number(ex.get(d.lastInsertIdSql())?.id);
+            const row = ex.get(`SELECT * FROM ${tbl} WHERE ${d.quoteIdent(pk)} = ${d.placeholder(1)}`, [pkValue]);
             return rowFromObject(row);
         },
         read(table, query = {}) {
             assertString(table, "table");
             ensurePkColumn(table);
-            const tbl = quoteIdent(table);
-            const where = compileWhere(resolveWhere(query.where));
-            const sql = `SELECT ${selectColumns(query.columns)} FROM ${tbl}` +
+            const tbl = d.quoteIdent(table);
+            const where = compileWhere(d, resolveWhere(query.where));
+            const sql = `SELECT ${selectColumns(d, query.columns)} FROM ${tbl}` +
                 (where.sql ? ` WHERE ${where.sql}` : "") +
                 ` LIMIT 1`;
             const row = ex.get(sql, where.args);
@@ -65,25 +69,27 @@ export function createSyncSqliteCrud(db, ex, options) {
             if (keys.length === 0) {
                 throw new CrudianError("cols must not be empty");
             }
-            const tbl = quoteIdent(table);
-            const where = compileWhere(resolveWhere(query.where));
+            const tbl = d.quoteIdent(table);
+            let idx = 1;
+            const sets = keys.map((k) => `${d.quoteIdent(k)} = ${d.placeholder(idx++)}`).join(", ");
+            const where = compileWhere(d, resolveWhere(query.where), idx);
             if (!where.sql) {
                 throw new CrudianError("update requires where");
             }
-            const sets = keys.map((k) => `${quoteIdent(k)} = ?`).join(", ");
             const args = [...keys.map((k) => cols[k]), ...where.args];
             const result = ex.run(`UPDATE ${tbl} SET ${sets} WHERE ${where.sql}`, args);
             if (result.changes === 0)
                 return null;
-            const row = ex.get(`SELECT * FROM ${tbl} WHERE ${where.sql} LIMIT 1`, where.args);
+            const fetchWhere = compileWhere(d, resolveWhere(query.where));
+            const row = ex.get(`SELECT * FROM ${tbl} WHERE ${fetchWhere.sql} LIMIT 1`, fetchWhere.args);
             return row == null ? null : rowFromObject(row);
         },
         delete(table, query) {
             assertString(table, "table");
             ensurePkColumn(table);
             requireWhere(query, "delete");
-            const tbl = quoteIdent(table);
-            const where = compileWhere(resolveWhere(query.where));
+            const tbl = d.quoteIdent(table);
+            const where = compileWhere(d, resolveWhere(query.where));
             if (!where.sql) {
                 throw new CrudianError("delete requires where");
             }
@@ -112,8 +118,8 @@ export function createSyncSqliteCrud(db, ex, options) {
                 typeof query.cursor !== "string") {
                 throw new CrudianError("cursor must be a number, string, or null");
             }
-            const tbl = quoteIdent(table);
-            const where = compileWhere(resolveWhere(query.where));
+            const tbl = d.quoteIdent(table);
+            const where = compileWhere(d, resolveWhere(query.where));
             const total = crud.count(table, { where: query.where });
             if (paging === "offset") {
                 const offset = query.offset ?? 0;
@@ -121,10 +127,11 @@ export function createSyncSqliteCrud(db, ex, options) {
                     throw new CrudianError("offset must be a non-negative number");
                 }
                 const args = [...where.args];
+                let idx = where.nextIndex;
                 const whereSql = where.sql ? ` WHERE ${where.sql}` : "";
-                const sql = `SELECT ${selectColumns(query.columns)} FROM ${tbl}` +
+                const sql = `SELECT ${selectColumns(d, query.columns)} FROM ${tbl}` +
                     whereSql +
-                    ` ORDER BY ${quoteIdent(pk)} ASC LIMIT ? OFFSET ?`;
+                    ` ORDER BY ${d.quoteIdent(pk)} ASC LIMIT ${d.placeholder(idx++)} OFFSET ${d.placeholder(idx++)}`;
                 args.push(limit, offset);
                 const items = ex.all(sql, args).map((r) => rowFromObject(r));
                 return {
@@ -136,17 +143,18 @@ export function createSyncSqliteCrud(db, ex, options) {
                 };
             }
             const args = [...where.args];
+            let idx = where.nextIndex;
             const parts = [];
             if (where.sql)
                 parts.push(`(${where.sql})`);
             if (query.cursor != null) {
-                parts.push(`${quoteIdent(pk)} > ?`);
+                parts.push(`${d.quoteIdent(pk)} > ${d.placeholder(idx++)}`);
                 args.push(query.cursor);
             }
             const whereSql = parts.length > 0 ? ` WHERE ${parts.join(" AND ")}` : "";
-            const sql = `SELECT ${selectColumns(query.columns)} FROM ${tbl}` +
+            const sql = `SELECT ${selectColumns(d, query.columns)} FROM ${tbl}` +
                 whereSql +
-                ` ORDER BY ${quoteIdent(pk)} ASC LIMIT ?`;
+                ` ORDER BY ${d.quoteIdent(pk)} ASC LIMIT ${d.placeholder(idx++)}`;
             args.push(limit + 1);
             const rows = ex.all(sql, args).map((r) => rowFromObject(r));
             const hasMore = rows.length > limit;
@@ -164,9 +172,9 @@ export function createSyncSqliteCrud(db, ex, options) {
         count(table, query = {}) {
             assertString(table, "table");
             ensurePkColumn(table);
-            const tbl = quoteIdent(table);
-            const where = compileWhere(resolveWhere(query.where));
-            const sql = `SELECT COUNT(*) AS ${quoteIdent("row_count")} FROM ${tbl}` +
+            const tbl = d.quoteIdent(table);
+            const where = compileWhere(d, resolveWhere(query.where));
+            const sql = `SELECT COUNT(*) AS ${d.quoteIdent("row_count")} FROM ${tbl}` +
                 (where.sql ? ` WHERE ${where.sql}` : "");
             const row = ex.get(sql, where.args);
             return Number(row?.row_count ?? 0);
@@ -174,9 +182,9 @@ export function createSyncSqliteCrud(db, ex, options) {
         exists(table, query = {}) {
             assertString(table, "table");
             ensurePkColumn(table);
-            const tbl = quoteIdent(table);
-            const where = compileWhere(resolveWhere(query.where));
-            const sql = `SELECT 1 AS ${quoteIdent("ok")} FROM ${tbl}` +
+            const tbl = d.quoteIdent(table);
+            const where = compileWhere(d, resolveWhere(query.where));
+            const sql = `SELECT 1 AS ${d.quoteIdent("ok")} FROM ${tbl}` +
                 (where.sql ? ` WHERE ${where.sql}` : "") +
                 ` LIMIT 1`;
             return ex.get(sql, where.args) != null;
@@ -260,12 +268,13 @@ export function createSyncSqliteCrud(db, ex, options) {
             if (keys.length === 0) {
                 throw new CrudianError("cols must not be empty");
             }
-            const tbl = quoteIdent(table);
-            const where = compileWhere(resolveWhere(query.where));
+            const tbl = d.quoteIdent(table);
+            let idx = 1;
+            const sets = keys.map((k) => `${d.quoteIdent(k)} = ${d.placeholder(idx++)}`).join(", ");
+            const where = compileWhere(d, resolveWhere(query.where), idx);
             if (!where.sql) {
                 throw new CrudianError("bulkUpdate requires where");
             }
-            const sets = keys.map((k) => `${quoteIdent(k)} = ?`).join(", ");
             const args = [...keys.map((k) => cols[k]), ...where.args];
             const result = ex.run(`UPDATE ${tbl} SET ${sets} WHERE ${where.sql}`, args);
             return Number(result.changes ?? 0);
@@ -303,3 +312,7 @@ export function createSyncSqliteCrud(db, ex, options) {
     };
     return crud;
 }
+/** SQLite sync CRUD (compat). */
+export function createSyncSqliteCrud(db, ex, options) {
+    return createSyncCrud(db, ex, sqliteDialect, options);
+}

package/dist/types.d.ts

@@ -44,9 +44,16 @@ export type DuplicateQuery = {
     where: WhereInput;
     overrides?: Record<string, unknown>;
 };
+/** SQL dialect for adapters that support more than SQLite (e.g. Prisma). */
+export type CreateCrudDialect = "sqlite" | "postgres" | "mysql";
 /** Options for `createCrud(db, options?)`. */
 export type CreateCrudOptions = {
     /** Primary key column name. Default: `"id"`. */
     pk?: string;
+    /**
+     * SQL dialect. Default: `"sqlite"`.
+     * Used by Prisma (and future multi-DB adapters). SQLite-only adapters ignore this.
+     */
+    dialect?: CreateCrudDialect;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEzD,MAAM,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAEzC,MAAM,MAAM,kBAAkB,CAAC,CAAC,GAAG,GAAG,IAAI;IACxC,KAAK,EAAE,CAAC,EAAE,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,kBAAkB,CAAC,CAAC,GAAG,GAAG,IAAI;IACxC,KAAK,EAAE,CAAC,EAAE,CAAA;IACV,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;IAClC,OAAO,EAAE,OAAO,CAAA;IAChB,oDAAoD;IACpD,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,GAAG,GAAG,IAAI,kBAAkB,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAA;AAEjF,MAAM,MAAM,UAAU,GAAG,YAAY,GAAG,SAAS,CAAA;AAEjD,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,KAAK,CAAC,EAAE,UAAU,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,4CAA4C;IAC5C,MAAM,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAA;IAC5B,mDAAmD;IACnD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,0EAA0E;IAC1E,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;CAChC,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,CAAC,EAAE,UAAU,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,UAAU,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,UAAU,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,UAAU,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CACpC,CAAA;AAED,8CAA8C;AAC9C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,gDAAgD;IAChD,EAAE,CAAC,EAAE,MAAM,CAAA;CACZ,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEzD,MAAM,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAEzC,MAAM,MAAM,kBAAkB,CAAC,CAAC,GAAG,GAAG,IAAI;IACxC,KAAK,EAAE,CAAC,EAAE,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,kBAAkB,CAAC,CAAC,GAAG,GAAG,IAAI;IACxC,KAAK,EAAE,CAAC,EAAE,CAAA;IACV,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;IAClC,OAAO,EAAE,OAAO,CAAA;IAChB,oDAAoD;IACpD,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,GAAG,GAAG,IAAI,kBAAkB,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAA;AAEjF,MAAM,MAAM,UAAU,GAAG,YAAY,GAAG,SAAS,CAAA;AAEjD,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,KAAK,CAAC,EAAE,UAAU,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,4CAA4C;IAC5C,MAAM,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAA;IAC5B,mDAAmD;IACnD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,0EAA0E;IAC1E,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;CAChC,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,CAAC,EAAE,UAAU,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,UAAU,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,UAAU,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,UAAU,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CACpC,CAAA;AAED,4EAA4E;AAC5E,MAAM,MAAM,iBAAiB,GAAG,QAAQ,GAAG,UAAU,GAAG,OAAO,CAAA;AAE/D,8CAA8C;AAC9C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,gDAAgD;IAChD,EAAE,CAAC,EAAE,MAAM,CAAA;IACX;;;OAGG;IACH,OAAO,CAAC,EAAE,iBAAiB,CAAA;CAC5B,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b4moss/crudian",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "CRUD abstraction for DDD repositories",
   "type": "module",
   "license": "MIT",
@@ -41,10 +41,14 @@
     "build": "tsc -p tsconfig.json",
     "prepublishOnly": "npm run build",
     "prisma:generate": "prisma generate --schema prisma/schema.prisma",
+    "prisma:generate:postgres": "prisma generate --schema prisma/schema.postgres.prisma",
+    "prisma:generate:mysql": "prisma generate --schema prisma/schema.mysql.prisma",
     "test": "bun run test:bun-sqlite && bun run test:drizzle && bun run test:prisma && bun run test:libsql",
     "test:bun-sqlite": "bun test src/bun-sqlite",
     "test:drizzle": "tsx --test src/drizzle/crud.test.ts src/drizzle/pk.test.ts",
     "test:prisma": "bun run prisma:generate && tsx --test src/prisma/crud.test.ts src/prisma/pk.test.ts",
+    "test:prisma:postgres": "bun run prisma:generate:postgres && DATABASE_URL_POSTGRES=\"${DATABASE_URL_POSTGRES:-postgresql://crudian:crudian@127.0.0.1:5432/crudian?sslmode=disable}\" tsx --test src/prisma/postgres.test.ts",
+    "test:prisma:mysql": "bun run prisma:generate:mysql && DATABASE_URL_MYSQL=\"${DATABASE_URL_MYSQL:-mysql://crudian:crudian@127.0.0.1:3306/crudian}\" tsx --test src/prisma/mysql.test.ts",
     "test:libsql": "tsx --test src/libsql/crud.test.ts src/libsql/pk.test.ts"
   },
   "engines": {