neoorm 0.8.0 → 0.8.2

package/dist/sql/builder.js

@@ -1,6 +1,6 @@
 import { compileError } from "../runtime/compile-error.js";
 import { QueryErrorCode } from "../runtime/error-codes.js";
-import { sqlFragment, sqlId } from "./template.js";
+import { isSqlFragment, rebaseParamRefs, sqlFragment, sqlId, } from "./template.js";
 function parseQualifiedColumn(col) {
     const parts = col.split(".");
     if (parts.length === 2) {
@@ -26,10 +26,107 @@ function sqlOrderDirection(direction) {
             });
     }
 }
+function sqlBuilderOperator(op) {
+    switch (op.toUpperCase()) {
+        case "=":
+            return "=";
+        case "!=":
+            return "!=";
+        case "<>":
+            return "<>";
+        case "<":
+            return "<";
+        case "<=":
+            return "<=";
+        case ">":
+            return ">";
+        case ">=":
+            return ">=";
+        case "LIKE":
+            return "LIKE";
+        case "ILIKE":
+            return "ILIKE";
+        case "IN":
+            return "IN";
+        case "NOT IN":
+            return "NOT IN";
+        case "IS":
+            return "IS";
+        case "IS NOT":
+            return "IS NOT";
+        default:
+            compileError(`where operator must be one of =, !=, <>, <, <=, >, >=, LIKE, ILIKE, IN, NOT IN, IS, IS NOT`, { code: QueryErrorCode.invalid_args });
+    }
+}
+function compileFluentPredicate(column, op, value) {
+    const operator = sqlBuilderOperator(op);
+    const col = parseQualifiedColumn(column).text;
+    switch (operator) {
+        case "IN":
+        case "NOT IN": {
+            if (!Array.isArray(value) || value.length === 0) {
+                compileError(`${operator} requires a non-empty array`, {
+                    code: QueryErrorCode.invalid_args,
+                });
+            }
+            const placeholders = value.map((_, i) => `$${i + 1}`).join(", ");
+            return sqlFragment(`${col} ${operator} (${placeholders})`, [
+                ...value,
+            ]);
+        }
+        case "IS":
+        case "IS NOT":
+            if (value !== null) {
+                compileError(`${operator} only accepts null`, {
+                    code: QueryErrorCode.invalid_args,
+                });
+            }
+            return sqlFragment(`${col} ${operator} NULL`, []);
+        case "=":
+        case "!=":
+        case "<>":
+        case "<":
+        case "<=":
+        case ">":
+        case ">=":
+        case "LIKE":
+        case "ILIKE":
+            return sqlFragment(`${col} ${operator} $1`, [value]);
+        default: {
+            const _exhaustive = operator;
+            return _exhaustive;
+        }
+    }
+}
+function predicateFromArgs(method, args) {
+    if (args.length === 1) {
+        const [frag] = args;
+        if (!isSqlFragment(frag)) {
+            compileError(`${method}() requires a sql fragment or column, operator, and value`, { code: QueryErrorCode.invalid_args });
+        }
+        return frag;
+    }
+    if (args.length === 3) {
+        const [column, op, value] = args;
+        if (typeof column !== "string" || typeof op !== "string") {
+            compileError(`${method}() requires a sql fragment or column, operator, and value`, { code: QueryErrorCode.invalid_args });
+        }
+        return compileFluentPredicate(column, op, value);
+    }
+    compileError(`${method}() requires a sql fragment or column, operator, and value`, { code: QueryErrorCode.invalid_args });
+}
+function requireNonNegativeInteger(n, label) {
+    if (!Number.isInteger(n) || n < 0) {
+        compileError(`${label} must be a non-negative integer`, {
+            code: QueryErrorCode.invalid_args,
+        });
+    }
+    return n;
+}
 /**
- * Fluent SQL builder for select/join/group/order.
- * No WHERE, LIMIT, or bound params — interpolate `.compile()` into `db.sql`
- * or `sql\`...\`` for those clauses.
+ * Fluent SQL builder for select/join/where/group/order/limit.
+ * `.compile()` returns a parameterized fragment; interpolate it into `db.sql`
+ * or `sql\`...\`` for HAVING and other raw tails.
  */
 export const sqlBuilder = {
     selectFrom(table) {
@@ -38,6 +135,16 @@ export const sqlBuilder = {
         let selectCols = [];
         let groupCols = [];
         let orderClause = "";
+        const wherePieces = [];
+        let limitValue;
+        let offsetValue;
+        const appendWhere = (connector, args, method) => {
+            wherePieces.push({
+                connector,
+                fragment: predicateFromArgs(method, args),
+            });
+            return builder;
+        };
         const builder = {
             leftJoin(joinTable, leftCol, rightCol) {
                 joins.push(`LEFT JOIN ${sqlId(joinTable).text} ON ${parseQualifiedColumn(leftCol).text} = ${parseQualifiedColumn(rightCol).text}`);
@@ -51,6 +158,15 @@ export const sqlBuilder = {
                 selectCols = columns.map((c) => parseQualifiedColumn(c).text);
                 return builder;
             },
+            where(...args) {
+                return appendWhere("AND", args, "where");
+            },
+            andWhere(...args) {
+                return appendWhere("AND", args, "andWhere");
+            },
+            orWhere(...args) {
+                return appendWhere("OR", args, "orWhere");
+            },
             groupBy(...columns) {
                 groupCols = columns.map((c) => parseQualifiedColumn(c).text);
                 return builder;
@@ -59,15 +175,49 @@ export const sqlBuilder = {
                 orderClause = `ORDER BY ${parseQualifiedColumn(column).text} ${sqlOrderDirection(direction)}`;
                 return builder;
             },
+            limit(n) {
+                limitValue = requireNonNegativeInteger(n, "limit");
+                return builder;
+            },
+            offset(n) {
+                offsetValue = requireNonNegativeInteger(n, "offset");
+                return builder;
+            },
             compile() {
                 let text = `SELECT ${selectCols.join(", ")} FROM ${fromClause}`;
                 if (joins.length > 0)
                     text += ` ${joins.join(" ")}`;
+                const params = [];
+                let paramIndex = 0;
+                if (wherePieces.length > 0) {
+                    const parts = [];
+                    for (let i = 0; i < wherePieces.length; i++) {
+                        const piece = wherePieces[i];
+                        if (!piece)
+                            continue;
+                        const adjusted = rebaseParamRefs(piece.fragment.text, paramIndex);
+                        params.push(...piece.fragment.params);
+                        paramIndex += piece.fragment.params.length;
+                        const clause = `(${adjusted})`;
+                        parts.push(i === 0 ? clause : `${piece.connector} ${clause}`);
+                    }
+                    text += ` WHERE ${parts.join(" ")}`;
+                }
                 if (groupCols.length > 0)
                     text += ` GROUP BY ${groupCols.join(", ")}`;
                 if (orderClause)
                     text += ` ${orderClause}`;
-                return sqlFragment(text, []);
+                if (limitValue !== undefined) {
+                    paramIndex++;
+                    params.push(limitValue);
+                    text += ` LIMIT $${paramIndex}`;
+                }
+                if (offsetValue !== undefined) {
+                    paramIndex++;
+                    params.push(offsetValue);
+                    text += ` OFFSET $${paramIndex}`;
+                }
+                return sqlFragment(text, params);
             },
         };
         return builder;

package/dist/sql/builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/sql/builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/sql/builder.ts"],"names":[],"mappings":"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"}

package/dist/sql/index.d.ts

@@ -3,6 +3,7 @@
  * Parameterized SQL templates and a small fluent query builder.
  */
 import { sqlTag } from "./template.js";
+export type { SqlBuilderOperator } from "./builder.js";
 export { sqlBuilder } from "./builder.js";
 export type { CompiledSql, SqlFragment, SqlValue } from "./template.js";
 export { compile, isSqlFragment, sqlFragment, sqlId, sqlTag, } from "./template.js";

package/dist/sql/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sql/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACxE,OAAO,EACN,OAAO,EACP,aAAa,EACb,WAAW,EACX,KAAK,EACL,MAAM,GACN,MAAM,eAAe,CAAC;AAEvB;;;GAGG;AACH,eAAO,MAAM,GAAG,eAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sql/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,YAAY,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACxE,OAAO,EACN,OAAO,EACP,aAAa,EACb,WAAW,EACX,KAAK,EACL,MAAM,GACN,MAAM,eAAe,CAAC;AAEvB;;;GAGG;AACH,eAAO,MAAM,GAAG,eAAS,CAAC"}

package/dist/sql/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sql/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EACN,OAAO,EACP,aAAa,EACb,WAAW,EACX,KAAK,EACL,MAAM,GACN,MAAM,eAAe,CAAC;AAEvB;;;GAGG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,MAAM,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sql/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAGvC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EACN,OAAO,EACP,aAAa,EACb,WAAW,EACX,KAAK,EACL,MAAM,GACN,MAAM,eAAe,CAAC;AAEvB;;;GAGG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,MAAM,CAAC"}

package/dist/sql/qualify-tables.d.ts

@@ -0,0 +1,15 @@
+export type QualifyTableIdentifiersOptions = {
+    /** Unquoted SQL table names from the manifest. */
+    tableNames: ReadonlySet<string>;
+    /** Return a schema-qualified identifier for a table sqlName. */
+    qualify: (sqlName: string) => string;
+};
+/**
+ * Schema-qualify unqualified table identifiers in raw SQL.
+ *
+ * Skips string literals, quoted non-tables, comments, dollar-quotes, identifiers
+ * after `AS`, and the optional alias immediately after a table reference.
+ * Already-qualified `schema.table` refs are left unchanged.
+ */
+export declare function qualifyTableIdentifiers(sql: string, options: QualifyTableIdentifiersOptions): string;
+//# sourceMappingURL=qualify-tables.d.ts.map

package/dist/sql/qualify-tables.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"qualify-tables.d.ts","sourceRoot":"","sources":["../../src/sql/qualify-tables.ts"],"names":[],"mappings":"AAsEA,MAAM,MAAM,8BAA8B,GAAG;IAC5C,kDAAkD;IAClD,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAChC,gEAAgE;IAChE,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;CACrC,CAAC;AA+DF;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACtC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,8BAA8B,GACrC,MAAM,CA0GR"}

package/dist/sql/qualify-tables.js

@@ -0,0 +1,206 @@
+import { scanBacktickQuoted, scanDollarQuoted, scanDoubleQuoted, scanSingleQuoted, } from "./template.js";
+/** Keywords that can follow a table reference (not implicit aliases). */
+const FOLLOWING_KEYWORDS = new Set([
+    "ALL",
+    "AND",
+    "AS",
+    "ASC",
+    "BETWEEN",
+    "CASE",
+    "CROSS",
+    "DELETE",
+    "DESC",
+    "DISTINCT",
+    "ELSE",
+    "END",
+    "EXCEPT",
+    "EXISTS",
+    "FALSE",
+    "FETCH",
+    "FOR",
+    "FROM",
+    "FULL",
+    "GROUP",
+    "HAVING",
+    "ILIKE",
+    "IN",
+    "INNER",
+    "INSERT",
+    "INTERSECT",
+    "INTO",
+    "IS",
+    "JOIN",
+    "LATERAL",
+    "LEFT",
+    "LIKE",
+    "LIMIT",
+    "NATURAL",
+    "NOT",
+    "NULL",
+    "NULLS",
+    "OFFSET",
+    "ON",
+    "ONLY",
+    "OR",
+    "ORDER",
+    "OUTER",
+    "RETURNING",
+    "RIGHT",
+    "SELECT",
+    "SET",
+    "SIMILAR",
+    "TABLE",
+    "THEN",
+    "TRUE",
+    "UNION",
+    "UPDATE",
+    "USING",
+    "VALUES",
+    "WHEN",
+    "WHERE",
+    "WINDOW",
+    "WITH",
+]);
+function precedingWord(sql, identStart) {
+    let i = identStart - 1;
+    while (i >= 0 && /\s/.test(sql[i] ?? ""))
+        i--;
+    const end = i + 1;
+    while (i >= 0 && /[A-Za-z_]/.test(sql[i] ?? ""))
+        i--;
+    return sql.slice(i + 1, end);
+}
+function isDotQualified(sql, identStart) {
+    let i = identStart - 1;
+    while (i >= 0 && /\s/.test(sql[i] ?? ""))
+        i--;
+    return sql[i] === ".";
+}
+function readUnquotedIdent(sql, start) {
+    const ch = sql[start];
+    if (!ch || !/[A-Za-z_]/.test(ch))
+        return undefined;
+    let j = start + 1;
+    while (j < sql.length && /[A-Za-z0-9_]/.test(sql[j] ?? ""))
+        j++;
+    return { ident: sql.slice(start, j), end: j };
+}
+function decodeDoubleQuoted(sql, start) {
+    const end = scanDoubleQuoted(sql, start);
+    const raw = sql.slice(start + 1, end - 1);
+    return { name: raw.replace(/""/g, '"'), end };
+}
+function matchingTable(ident, quoted, tableNames) {
+    if (quoted) {
+        return tableNames.has(ident) ? ident : undefined;
+    }
+    if (tableNames.has(ident))
+        return ident;
+    const folded = ident.toLowerCase();
+    if (folded !== ident && tableNames.has(folded))
+        return folded;
+    return undefined;
+}
+function scanLineComment(sql, start) {
+    const newline = sql.indexOf("\n", start);
+    return newline === -1 ? sql.length : newline + 1;
+}
+function scanBlockComment(sql, start) {
+    const end = sql.indexOf("*/", start + 2);
+    return end === -1 ? sql.length : end + 2;
+}
+/**
+ * Schema-qualify unqualified table identifiers in raw SQL.
+ *
+ * Skips string literals, quoted non-tables, comments, dollar-quotes, identifiers
+ * after `AS`, and the optional alias immediately after a table reference.
+ * Already-qualified `schema.table` refs are left unchanged.
+ */
+export function qualifyTableIdentifiers(sql, options) {
+    const { tableNames, qualify } = options;
+    if (tableNames.size === 0)
+        return sql;
+    let result = "";
+    let i = 0;
+    let expectAlias = false;
+    const copySpan = (end) => {
+        result += sql.slice(i, end);
+        i = end;
+    };
+    const handleIdent = (ident, quoted, raw, end) => {
+        if (precedingWord(sql, i).toUpperCase() === "AS") {
+            expectAlias = false;
+            result += raw;
+            i = end;
+            return;
+        }
+        const keyword = !quoted && FOLLOWING_KEYWORDS.has(ident.toUpperCase());
+        if (expectAlias && !keyword) {
+            expectAlias = false;
+            result += raw;
+            i = end;
+            return;
+        }
+        if (keyword) {
+            expectAlias = false;
+        }
+        if (isDotQualified(sql, i)) {
+            const table = matchingTable(ident, quoted, tableNames);
+            if (table)
+                expectAlias = true;
+            result += raw;
+            i = end;
+            return;
+        }
+        const table = matchingTable(ident, quoted, tableNames);
+        if (table) {
+            result += qualify(table);
+            expectAlias = true;
+            i = end;
+            return;
+        }
+        result += raw;
+        i = end;
+    };
+    while (i < sql.length) {
+        const ch = sql[i];
+        const next = sql[i + 1];
+        if (ch === "-" && next === "-") {
+            copySpan(scanLineComment(sql, i));
+            continue;
+        }
+        if (ch === "/" && next === "*") {
+            copySpan(scanBlockComment(sql, i));
+            continue;
+        }
+        if (ch === "'") {
+            copySpan(scanSingleQuoted(sql, i));
+            continue;
+        }
+        if (ch === "`") {
+            copySpan(scanBacktickQuoted(sql, i));
+            continue;
+        }
+        if (ch === "$") {
+            const dollarEnd = scanDollarQuoted(sql, i);
+            if (dollarEnd !== -1) {
+                copySpan(dollarEnd);
+                continue;
+            }
+        }
+        if (ch === '"') {
+            const { name, end } = decodeDoubleQuoted(sql, i);
+            handleIdent(name, true, sql.slice(i, end), end);
+            continue;
+        }
+        const unquoted = readUnquotedIdent(sql, i);
+        if (unquoted) {
+            handleIdent(unquoted.ident, false, sql.slice(i, unquoted.end), unquoted.end);
+            continue;
+        }
+        result += ch;
+        i++;
+    }
+    return result;
+}
+//# sourceMappingURL=qualify-tables.js.map

package/dist/sql/qualify-tables.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"qualify-tables.js","sourceRoot":"","sources":["../../src/sql/qualify-tables.ts"],"names":[],"mappings":"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"}

package/dist/sql/template.d.ts

@@ -6,6 +6,11 @@ export type SqlFragment = {
 export type SqlValue = unknown | SqlFragment;
 export declare function sqlFragment(text: string, params?: unknown[]): SqlFragment;
 export declare function isSqlFragment(value: unknown): value is SqlFragment;
+export declare function scanSingleQuoted(sql: string, start: number): number;
+export declare function scanBacktickQuoted(sql: string, start: number): number;
+export declare function scanDoubleQuoted(sql: string, start: number): number;
+/** Index just past the closing $tag$ for a dollar-quoted region, or -1. */
+export declare function scanDollarQuoted(sql: string, start: number): number;
 /**
  * Rebase `$N` parameter references by `offset` without touching text inside
  * single-quoted literals, double-quoted identifiers, or dollar-quoted regions.

package/dist/sql/template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../src/sql/template.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG;IACzB,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,WAAW,CAAC;AAE7C,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,EAAO,GAAG,WAAW,CAE7E;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,WAAW,CAOlE;AA2CD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAsCnE;AAED,iEAAiE;AACjE,wBAAgB,MAAM,CACrB,OAAO,EAAE,oBAAoB,EAC7B,GAAG,MAAM,EAAE,OAAO,EAAE,GAClB,WAAW,CAwBb;AAED,qDAAqD;AACrD,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAG/C;AAED,MAAM,MAAM,WAAW,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,EAAE,CAAC;CAClB,CAAC;AAEF,0DAA0D;AAC1D,wBAAgB,OAAO,CAAC,QAAQ,EAAE,WAAW,GAAG,WAAW,CAE1D"}
+{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../src/sql/template.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG;IACzB,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,WAAW,CAAC;AAE7C,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,EAAO,GAAG,WAAW,CAE7E;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,WAAW,CAOlE;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAanE;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAarE;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAanE;AAED,2EAA2E;AAC3E,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAQnE;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CA4CnE;AAED,iEAAiE;AACjE,wBAAgB,MAAM,CACrB,OAAO,EAAE,oBAAoB,EAC7B,GAAG,MAAM,EAAE,OAAO,EAAE,GAClB,WAAW,CAwBb;AAED,qDAAqD;AACrD,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAG/C;AAED,MAAM,MAAM,WAAW,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,EAAE,CAAC;CAClB,CAAC;AAEF,0DAA0D;AAC1D,wBAAgB,OAAO,CAAC,QAAQ,EAAE,WAAW,GAAG,WAAW,CAE1D"}

package/dist/sql/template.js

@@ -7,7 +7,7 @@ export function isSqlFragment(value) {
         "_kind" in value &&
         value._kind === "fragment");
 }
-function scanSingleQuoted(sql, start) {
+export function scanSingleQuoted(sql, start) {
     let i = start + 1;
     while (i < sql.length) {
         if (sql[i] === "'") {
@@ -21,7 +21,21 @@ function scanSingleQuoted(sql, start) {
     }
     return sql.length;
 }
-function scanDoubleQuoted(sql, start) {
+export function scanBacktickQuoted(sql, start) {
+    let i = start + 1;
+    while (i < sql.length) {
+        if (sql[i] === "`") {
+            if (sql[i + 1] === "`") {
+                i += 2;
+                continue;
+            }
+            return i + 1;
+        }
+        i++;
+    }
+    return sql.length;
+}
+export function scanDoubleQuoted(sql, start) {
     let i = start + 1;
     while (i < sql.length) {
         if (sql[i] === '"') {
@@ -36,7 +50,7 @@ function scanDoubleQuoted(sql, start) {
     return sql.length;
 }
 /** Index just past the closing $tag$ for a dollar-quoted region, or -1. */
-function scanDollarQuoted(sql, start) {
+export function scanDollarQuoted(sql, start) {
     const tagEnd = sql.indexOf("$", start + 1);
     if (tagEnd === -1)
         return -1;
@@ -73,6 +87,12 @@ export function rebaseParamRefs(sql, offset) {
             i = end;
             continue;
         }
+        if (ch === "`") {
+            const end = scanBacktickQuoted(sql, i);
+            result += sql.slice(i, end);
+            i = end;
+            continue;
+        }
         if (ch === "$") {
             const dollarEnd = scanDollarQuoted(sql, i);
             if (dollarEnd !== -1) {

package/dist/sql/template.js.map

@@ -1 +1 @@
-{"version":3,"file":"template.js","sourceRoot":"","sources":["../../src/sql/template.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"template.js","sourceRoot":"","sources":["../../src/sql/template.ts"],"names":[],"mappings":"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"}

package/dist/utils/load-ts.d.ts

@@ -1,2 +1,3 @@
-export declare function importTsModule(filePath: string): Promise<any>;
+export declare function resolveModuleExport(mod: Record<string, unknown>, exportName: string): unknown;
+export declare function importTsModule(filePath: string): Promise<Record<string, unknown>>;
 //# sourceMappingURL=load-ts.d.ts.map

package/dist/utils/load-ts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"load-ts.d.ts","sourceRoot":"","sources":["../../src/utils/load-ts.ts"],"names":[],"mappings":"AAGA,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAOnE"}
+{"version":3,"file":"load-ts.d.ts","sourceRoot":"","sources":["../../src/utils/load-ts.ts"],"names":[],"mappings":"AAEA,wBAAgB,mBAAmB,CAClC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,UAAU,EAAE,MAAM,GAChB,OAAO,CAYT;AAED,wBAAsB,cAAc,CACnC,QAAQ,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAOlC"}

package/dist/utils/load-ts.js

@@ -1,5 +1,17 @@
 import { pathToFileURL } from "node:url";
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function resolveModuleExport(mod, exportName) {
+    const direct = mod[exportName];
+    if (direct !== undefined) {
+        return direct;
+    }
+    const nested = mod.default;
+    if (nested !== null && typeof nested === "object") {
+        const record = nested;
+        const fromDefault = record[exportName];
+        return fromDefault !== undefined ? fromDefault : nested;
+    }
+    return undefined;
+}
 export async function importTsModule(filePath) {
     const url = pathToFileURL(filePath).href;
     if (process.versions.bun) {

package/dist/utils/load-ts.js.map

@@ -1 +1 @@
-{"version":3,"file":"load-ts.js","sourceRoot":"","sources":["../../src/utils/load-ts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,8DAA8D;AAC9D,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,QAAgB;IACpD,MAAM,GAAG,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC;IACzC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QAC1B,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC;IACD,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;IACjD,OAAO,QAAQ,CAAC,GAAG,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;AACvC,CAAC"}
+{"version":3,"file":"load-ts.js","sourceRoot":"","sources":["../../src/utils/load-ts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,UAAU,mBAAmB,CAClC,GAA4B,EAC5B,UAAkB;IAElB,MAAM,MAAM,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC;IAC/B,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,MAAM,CAAC;IACf,CAAC;IACD,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC;IAC3B,IAAI,MAAM,KAAK,IAAI,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QACnD,MAAM,MAAM,GAAG,MAAiC,CAAC;QACjD,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;QACvC,OAAO,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC;IACzD,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CACnC,QAAgB;IAEhB,MAAM,GAAG,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC;IACzC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QAC1B,OAAO,MAAM,CAAC,GAAG,CAAqC,CAAC;IACxD,CAAC;IACD,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;IACjD,OAAO,QAAQ,CAAC,GAAG,EAAE,OAAO,IAAI,CAAC,GAAG,CAAqC,CAAC;AAC3E,CAAC"}

package/docs/cli.md

@@ -13,15 +13,15 @@ neoorm init [options]
 Creates `neoorm.config.ts`, `schema.ts`, and `.env.example` only — no codegen or migrations. Run `neoorm migrate dev` afterwards to generate the client and first migration.
 
 Options:
-- `--provider <provider>` — `postgresql` (default) or `sqlite`. `postgres` and `pg` are aliases of `postgresql`. If omitted and running interactively, prompts to choose.
-- `--database-url <url>` — override database URL / file path (default: `postgresql://postgres:postgres@localhost:5432/myapp` for postgres, `./dev.db` for sqlite)
+- `--provider <provider>` — `postgresql` (default), `sqlite`, `mysql`, or `mariadb`. `postgres` and `pg` are aliases of `postgresql`. If omitted and running interactively, prompts to choose.
+- `--database-url <url>` — override database URL / file path (default: `postgresql://postgres:postgres@localhost:5432/myapp` for postgres, `./dev.db` for sqlite, `mysql://root@localhost:3306/myapp` for mysql, `mariadb://root@localhost:3306/myapp` for mariadb)
 - `--schema <path>` — schema file path (default: `./schema.ts`)
 - `--out <dir>` — generated output directory (default: `./neoorm`)
 - `--force` — overwrite existing scaffold files
 
 ## `neoorm generate`
 
-Generate manifest, typed client, models, includes, and migrations from your schema.
+Generate manifest, typed client, models, includes, and migrations from your schema. With `generate.zod` in config, also writes `out/zod.ts` (install `zod` `^4`; generate warns if it is missing). With `generate.typebox`, also writes `out/typebox.ts` (install `typebox` `^1`; generate warns if it is missing). With `generate.elysia`, also writes `out/elysia.ts` (install `elysia` `>=1.2`; generate warns if it is missing).
 
 ```
 neoorm generate [options]
@@ -70,7 +70,7 @@ Requires `down.sql` and `snapshot.before.json` in each migration folder (written
 
 ## `neoorm migrate reset`
 
-Drop the `public` schema (PostgreSQL) or all tables (SQLite) and re-apply all migrations.
+Drop the `public` schema (PostgreSQL) or all tables (SQLite, MySQL, and MariaDB) and re-apply all migrations.
 
 ```
 neoorm migrate reset --force [--skip-apply]