neoorm 0.9.6 → 0.9.8

package/dist/init/validate.js

@@ -1,14 +1,50 @@
-import { extname, resolve } from "node:path";
+import { extname, isAbsolute, relative, resolve, sep } from "node:path";
+import { foreignDatabaseScheme } from "../runtime/sqlite-open.js";
+const CONFIG_FILE = "neoorm.config.ts";
+const ENV_EXAMPLE_FILE = ".env.example";
+function hasControlChar(value) {
+    for (let i = 0; i < value.length; i++) {
+        const code = value.charCodeAt(i);
+        if (code <= 0x1f || code === 0x7f)
+            return true;
+    }
+    return false;
+}
+/** True when `abs` is `cwd` or a descendant of it. */
+export function isInsideProject(cwd, abs) {
+    const rel = relative(resolve(cwd), abs);
+    if (rel === "")
+        return true;
+    if (isAbsolute(rel))
+        return false;
+    return rel !== ".." && !rel.startsWith(`..${sep}`);
+}
 const SCHEMA_EXTENSIONS = new Set([".ts", ".mts", ".cts"]);
-export function validateSchemaPath(value) {
+export function validateSchemaPath(value, cwd) {
     const trimmed = value.trim();
     if (trimmed.length === 0) {
         return "Schema path is required";
     }
+    if (hasControlChar(trimmed)) {
+        return "Schema path cannot contain control characters";
+    }
     const extension = extname(trimmed).toLowerCase();
     if (!SCHEMA_EXTENSIONS.has(extension)) {
         return "Schema path must end in .ts, .mts, or .cts";
     }
+    if (cwd === undefined)
+        return undefined;
+    const abs = resolve(cwd, trimmed);
+    const root = resolve(cwd);
+    if (abs === root || !isInsideProject(root, abs)) {
+        return "Schema path must stay inside the project directory";
+    }
+    if (abs === resolve(root, CONFIG_FILE)) {
+        return "Schema path cannot be neoorm.config.ts";
+    }
+    if (abs === resolve(root, ENV_EXAMPLE_FILE)) {
+        return "Schema path cannot be .env.example";
+    }
     return undefined;
 }
 export function validateOutDir(value, schemaPath, cwd) {
@@ -16,9 +52,23 @@ export function validateOutDir(value, schemaPath, cwd) {
     if (trimmed.length === 0) {
         return "Output directory is required";
     }
-    if (resolve(cwd, trimmed) === resolve(cwd, schemaPath.trim())) {
+    if (hasControlChar(trimmed)) {
+        return "Output directory cannot contain control characters";
+    }
+    const root = resolve(cwd);
+    const outPath = resolve(root, trimmed);
+    if (outPath === root) {
+        return "Output directory cannot be the project directory";
+    }
+    if (!isInsideProject(root, outPath)) {
+        return "Output directory must stay inside the project directory";
+    }
+    if (outPath === resolve(root, schemaPath.trim())) {
         return "Output directory cannot be the same path as the schema file";
     }
+    if (outPath === resolve(root, CONFIG_FILE)) {
+        return "Output directory cannot be neoorm.config.ts";
+    }
     return undefined;
 }
 export function validateDatabaseUrl(value, provider) {
@@ -26,7 +76,14 @@ export function validateDatabaseUrl(value, provider) {
     if (trimmed.length === 0) {
         return "Database URL is required";
     }
+    if (hasControlChar(trimmed)) {
+        return "Database URL cannot contain control characters";
+    }
     if (provider === "sqlite") {
+        const scheme = foreignDatabaseScheme(trimmed);
+        if (scheme !== undefined) {
+            return `Database URL is a ${scheme} connection URL, not a SQLite path`;
+        }
         return undefined;
     }
     if (!trimmed.includes("://")) {
@@ -35,7 +92,7 @@ export function validateDatabaseUrl(value, provider) {
     return undefined;
 }
 export function assertInitAnswers(options) {
-    const schemaErrorMessage = validateSchemaPath(options.schemaPath);
+    const schemaErrorMessage = validateSchemaPath(options.schemaPath, options.cwd);
     if (schemaErrorMessage) {
         throw new Error(schemaErrorMessage);
     }

package/dist/init/validate.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/init/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAG7C,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAE3D,MAAM,UAAU,kBAAkB,CAAC,KAAa;IAC/C,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,yBAAyB,CAAC;IAClC,CAAC;IACD,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;IACjD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QACvC,OAAO,4CAA4C,CAAC;IACrD,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,cAAc,CAC7B,KAAa,EACb,UAAkB,EAClB,GAAW;IAEX,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,8BAA8B,CAAC;IACvC,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QAC/D,OAAO,6DAA6D,CAAC;IACtE,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAClC,KAAa,EACb,QAAsB;IAEtB,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,0BAA0B,CAAC;IACnC,CAAC;IACD,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAC3B,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,4DAA4D,CAAC;IACrE,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,OAMjC;IACA,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAClE,IAAI,kBAAkB,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACrC,CAAC;IACD,MAAM,eAAe,GAAG,cAAc,CACrC,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,GAAG,CACX,CAAC;IACF,IAAI,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;IAClC,CAAC;IACD,MAAM,eAAe,GAAG,mBAAmB,CAC1C,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,QAAQ,CAChB,CAAC;IACF,IAAI,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;IAClC,CAAC;AACF,CAAC"}
+{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/init/validate.ts"],"names":[],"mappings":"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"}

package/dist/introspect/mysql/to-manifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"to-manifest.d.ts","sourceRoot":"","sources":["../../../src/introspect/mysql/to-manifest.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACX,QAAQ,EAMR,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AA8K9D,wBAAsB,yBAAyB,CAC9C,MAAM,EAAE,cAAc,GACpB,OAAO,CAAC,QAAQ,CAAC,CAiBnB"}
+{"version":3,"file":"to-manifest.d.ts","sourceRoot":"","sources":["../../../src/introspect/mysql/to-manifest.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACX,QAAQ,EAMR,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AA+K9D,wBAAsB,yBAAyB,CAC9C,MAAM,EAAE,cAAc,GACpB,OAAO,CAAC,QAAQ,CAAC,CAiBnB"}

package/dist/introspect/mysql/to-manifest.js

@@ -1,6 +1,7 @@
 import { quoteMysqlIdentifier } from "../../dialect/mysql.js";
 import { columnTsNameFromSqlName, tableAccessorFromSqlName, } from "../../utils/case.js";
 import { groupForeignKeyRows, mapReferentialAction } from "../group-fks.js";
+import { setIntrospectedTable } from "../table-map.js";
 function mapDeleteRule(rule) {
     return mapReferentialAction(rule);
 }
@@ -124,7 +125,7 @@ export async function introspectMysqlToManifest(client) {
     const tables = {};
     for (const { table_name } of tableResult.rows) {
         const table = await introspectMysqlTable(client, table_name);
-        tables[table.accessor] = table;
+        setIntrospectedTable(tables, table);
     }
     return { version: 1, tables, manyToMany: [] };
 }

package/dist/introspect/mysql/to-manifest.js.map

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

package/dist/introspect/pull.d.ts

@@ -1,8 +1,13 @@
+import type { Manifest } from "../dialect/types.js";
 import type { DatabaseClient } from "../runtime/driver.js";
 export declare function introspectPostgres(client: DatabaseClient, options?: {
     schema?: string;
 }): Promise<string>;
+/** Emit a `neoorm/schema` TS source from an introspected manifest. Exported for tests. */
+export declare function emitPostgresSchema(manifest: Manifest): string;
 export declare function parseIndexWhere(whereSql: string, tsNameBySql: Map<string, string>): string | undefined;
 export declare function introspectMysql(client: DatabaseClient): Promise<string>;
+/** Emit a `neoorm/schema` TS source from a SQLite-introspected manifest. Exported for tests. */
+export declare function emitSqliteSchema(manifest: Manifest): string;
 export declare function introspectSqlite(client: DatabaseClient): Promise<string>;
 //# sourceMappingURL=pull.d.ts.map

package/dist/introspect/pull.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/introspect/pull.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAqE3D,wBAAsB,kBAAkB,CACvC,MAAM,EAAE,cAAc,EACtB,OAAO,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/B,OAAO,CAAC,MAAM,CAAC,CAGjB;AAu0BD,wBAAgB,eAAe,CAC9B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,MAAM,GAAG,SAAS,CAiBpB;AAsPD,wBAAsB,eAAe,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAG7E;AAED,wBAAsB,gBAAgB,CACrC,MAAM,EAAE,cAAc,GACpB,OAAO,CAAC,MAAM,CAAC,CAoDjB"}
+{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/introspect/pull.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACX,QAAQ,EAGR,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AA0N3D,wBAAsB,kBAAkB,CACvC,MAAM,EAAE,cAAc,EACtB,OAAO,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/B,OAAO,CAAC,MAAM,CAAC,CAGjB;AAED,0FAA0F;AAC1F,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CA+D7D;AA+xBD,wBAAgB,eAAe,CAC9B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,MAAM,GAAG,SAAS,CAiBpB;AAqSD,wBAAsB,eAAe,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAG7E;AAED,gGAAgG;AAChG,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAyD3D;AAED,wBAAsB,gBAAgB,CACrC,MAAM,EAAE,cAAc,GACpB,OAAO,CAAC,MAAM,CAAC,CAGjB"}

package/dist/introspect/pull.js

@@ -1,3 +1,4 @@
+import { tsMemberAccess, tsPropertyKey } from "../codegen/ts-syntax.js";
 import { manifestIndexKeys } from "../dialect/shared.js";
 import { escapeTsString, resolveSqlColumnName, toCamelCase, } from "../utils/case.js";
 import { singularize } from "../utils/inflect.js";
@@ -7,11 +8,109 @@ import { introspectToManifest } from "./to-manifest.js";
 function inferFkAs(tsName) {
     return tsName.replace(/_(Id|id)$/, "").replace(/Id$/, "");
 }
+function pullNameTracker(manifest) {
+    const columnNames = new Map();
+    for (const table of Object.values(manifest.tables)) {
+        columnNames.set(table.accessor, new Set(table.columns.map((c) => c.tsName)));
+    }
+    return { assigned: new Map(), columnNames };
+}
+/**
+ * Names the emitted schema already defines on a table: its column tsNames
+ * plus every relation name (forward, inverse) picked so far.
+ */
+function reservedNamesOnTable(tracker, accessor) {
+    const used = new Set(tracker.columnNames.get(accessor) ?? []);
+    const extra = tracker.assigned.get(accessor);
+    if (extra) {
+        for (const name of extra) {
+            used.add(name);
+        }
+    }
+    return used;
+}
+/** Reserve a relation name so later picks (and their suffixes) cannot reuse it. */
+function reserveRelationName(tracker, accessor, name) {
+    let extra = tracker.assigned.get(accessor);
+    if (!extra) {
+        extra = new Set();
+        tracker.assigned.set(accessor, extra);
+    }
+    extra.add(name);
+}
+/** Deterministic unused variant of `base` in `used`: base, base2, base3, … */
+function withSuffix(base, used) {
+    if (!used.has(base)) {
+        return base;
+    }
+    let index = 2;
+    while (used.has(`${base}${index}`)) {
+        index += 1;
+    }
+    return `${base}${index}`;
+}
+/** Accessor of an fk column's target table ("" when unresolved). */
+function fkTargetAccessor(col, manifest) {
+    const targetRef = resolveFkAccessorTarget(col, manifest);
+    return targetRef.includes(".")
+        ? targetRef.slice(0, targetRef.indexOf("."))
+        : targetRef;
+}
+/**
+ * Forward relation name an FK column is emitted with in a pulled schema:
+ * the stored/inferred name when it is free on the table. When the name is
+ * already defined — as the fk's own column, a sibling column, or a relation
+ * picked for an earlier fk — the fallback prefers the singular target table
+ * name (the `userId → user` convention) for an Id-less fk column, then
+ * suffixes the preferred name: `statusChangedBy2`, `statusChangedBy3`, …
+ */
+function pulledFkRelationName(col, table, manifest, tracker) {
+    const inferred = inferFkAs(col.tsName);
+    const stored = col.fkAs !== undefined && col.fkAs !== "" ? col.fkAs : inferred;
+    const used = reservedNamesOnTable(tracker, table.accessor);
+    let name = stored;
+    if (used.has(name)) {
+        let base = stored;
+        if (stored === col.tsName) {
+            const targetAccessor = fkTargetAccessor(col, manifest);
+            base =
+                targetAccessor !== ""
+                    ? singularize(targetAccessor)
+                    : `${inferred}Relation`;
+        }
+        name = withSuffix(base, used);
+    }
+    reserveRelationName(tracker, table.accessor, name);
+    return name;
+}
+/**
+ * Inverse relation name for an fk into `targetAccessor`: the source table
+ * accessor (singularized for unique/one-to-one fks). The default name is
+ * always reserved on the target table — without reserving it, a second fk
+ * to the same target would emit a second relation under the same default
+ * inverse name, which generate rejects with `duplicate_inverse`.
+ */
+function pulledFkInverseName(col, sourceAccessor, targetAccessor, tracker) {
+    const defaultInverse = col.unique
+        ? singularize(sourceAccessor)
+        : sourceAccessor;
+    const name = withSuffix(defaultInverse, reservedNamesOnTable(tracker, targetAccessor));
+    reserveRelationName(tracker, targetAccessor, name);
+    return name;
+}
 function tableHeader(accessor, sqlName) {
+    const key = tsPropertyKey(accessor);
     if (sqlName === accessor) {
-        return `  ${accessor}: table({`;
+        return `  ${key}: table({`;
     }
-    return `  ${accessor}: table("${escapeTsString(sqlName)}", {`;
+    return `  ${key}: table("${escapeTsString(sqlName)}", {`;
+}
+/** `t.col` or `t["raw sql"]` when the tsName lookup falls back to a SQL name. */
+function tColumnRef(tsNameBySql, sqlName) {
+    return tsMemberAccess("t", tsNameBySql.get(sqlName) ?? sqlName);
+}
+function whereField(ts, expr) {
+    return `${tsPropertyKey(ts)}: ${expr}`;
 }
 const POSTGIS_KINDS = new Set(["geometry", "geography", "point"]);
 const SCHEMA_IMPORT_ORDER = [
@@ -61,10 +160,12 @@ export async function introspectPostgres(client, options = {}) {
     const manifest = await introspectToManifest(client, options);
     return emitPostgresSchema(manifest);
 }
-function emitPostgresSchema(manifest) {
+/** Emit a `neoorm/schema` TS source from an introspected manifest. Exported for tests. */
+export function emitPostgresSchema(manifest) {
     const usedBuilders = new Set(["defineSchema", "table"]);
     const pluginColumnImports = new Set();
     let needsPostgisSideEffect = false;
+    const tracker = pullNameTracker(manifest);
     const tableBlocks = [];
     for (const table of Object.values(manifest.tables)) {
         const columnNaming = inferColumnNaming(table.columns.map((col) => col.sqlName));
@@ -77,9 +178,9 @@ function emitPostgresSchema(manifest) {
                 needsPostgisSideEffect = true;
                 pluginColumnImports.add(col.kind);
             }
-            blockLines.push(`    ${emitPostgresColumn(col, table, manifest, columnNaming, usedBuilders)},`);
+            blockLines.push(`    ${emitPostgresColumn(col, table, manifest, columnNaming, usedBuilders, tracker)},`);
         }
-        const extras = emitTableExtras(table, tsNameBySql, usedBuilders, manifest);
+        const extras = emitTableExtras(table, tsNameBySql, usedBuilders, manifest, tracker);
         blockLines.push(tableClose(columnNaming, extras));
         tableBlocks.push(blockLines.join("\n"));
     }
@@ -100,16 +201,16 @@ function emitPostgresSchema(manifest) {
     lines.push(`});`, ``);
     return lines.join("\n");
 }
-function emitPostgresColumn(col, table, manifest, columnNaming, usedBuilders) {
+function emitPostgresColumn(col, table, manifest, columnNaming, usedBuilders, tracker) {
     if (col.kind === "fk") {
         usedBuilders.add("fk");
-        let def = `${col.tsName}: ${emitFkBuilder(col, table, manifest)}`;
+        let def = `${tsPropertyKey(col.tsName)}: ${emitFkBuilder(col, table, manifest, tracker)}`;
         def += emitColumnModifiers(col, table, { skipNotNullIfPrimary: true });
         return appendMapModifier(def, col.tsName, col.sqlName, columnNaming);
     }
     if (col.kind === "id") {
         usedBuilders.add("id");
-        let def = `${col.tsName}: id()`;
+        let def = `${tsPropertyKey(col.tsName)}: id()`;
         def += emitColumnModifiers(col, table, {
             skipPrimary: true,
             skipNotNull: true,
@@ -117,7 +218,7 @@ function emitPostgresColumn(col, table, manifest, columnNaming, usedBuilders) {
         return appendMapModifier(def, col.tsName, col.sqlName, columnNaming);
     }
     const call = emitScalarBuilder(col, usedBuilders);
-    let def = `${col.tsName}: ${call}`;
+    let def = `${tsPropertyKey(col.tsName)}: ${call}`;
     def += emitColumnModifiers(col, table, {
         skipNotNullIfPrimary: true,
         skipNotNull: col.kind === "serial",
@@ -174,18 +275,30 @@ function emitScalarBuilder(col, usedBuilders) {
     usedBuilders.add(col.kind);
     return `${col.kind}()`;
 }
-function emitFkBuilder(col, table, manifest) {
+function emitFkBuilder(col, table, manifest, tracker) {
     const targetRef = resolveFkAccessorTarget(col, manifest);
     const relName = inferFkAs(col.tsName);
+    const relationName = pulledFkRelationName(col, table, manifest, tracker);
     let def = `fk("${escapeTsString(targetRef)}")`;
-    if (col.fkAs && col.fkAs !== relName) {
-        def += `.as("${escapeTsString(col.fkAs)}")`;
+    if (relationName !== relName) {
+        def += `.as("${escapeTsString(relationName)}")`;
     }
     const defaultInverse = col.unique
         ? singularize(table.accessor)
         : table.accessor;
     if (col.fkInverse && col.fkInverse !== defaultInverse) {
         def += `.inverse("${escapeTsString(col.fkInverse)}")`;
+        return def;
+    }
+    const targetAccessor = fkTargetAccessor(col, manifest);
+    if (manifest.tables[targetAccessor]) {
+        // Reserve the default inverse name on the target table and emit an
+        // explicit `.inverse()` when the default is taken there (e.g. a second
+        // fk to the same target, or a column carrying the accessor's name)
+        const inverseName = pulledFkInverseName(col, table.accessor, targetAccessor, tracker);
+        if (inverseName !== defaultInverse) {
+            def += `.inverse("${escapeTsString(inverseName)}")`;
+        }
     }
     return def;
 }
@@ -734,7 +847,11 @@ function renderIndexPredicate(node) {
             return `NOT: { ${inner} }`;
         }
         case "col":
-            return `${node.ts}: ${node.expr}`;
+            return whereField(node.ts, node.expr);
+        default: {
+            const exhaustive = node;
+            return exhaustive;
+        }
     }
 }
 /** Group an AND level into where-object bodies, merging same-column operators. */
@@ -746,7 +863,7 @@ function conjunctBodies(items) {
         if (order.length === 0)
             return;
         bodies.push(order
-            .map((ts) => `${ts}: ${pending.get(ts)?.expr ?? ""}`)
+            .map((ts) => whereField(ts, pending.get(ts)?.expr ?? ""))
             .join(", "));
         pending.clear();
         order.length = 0;
@@ -795,7 +912,7 @@ export function parseIndexWhere(whereSql, tsNameBySql) {
     if (!parsed)
         return undefined;
     if (parsed.kind === "col") {
-        return `.where({ ${parsed.ts}: ${parsed.expr} })`;
+        return `.where({ ${whereField(parsed.ts, parsed.expr)} })`;
     }
     if (parsed.kind === "and") {
         const bodies = conjunctBodies(parsed.items);
@@ -811,7 +928,7 @@ export function parseIndexWhere(whereSql, tsNameBySql) {
         return undefined;
     return `.where({ ${rendered} })`;
 }
-function emitTableExtras(table, tsNameBySql, usedBuilders, manifest) {
+function emitTableExtras(table, tsNameBySql, usedBuilders, manifest, tracker) {
     const extras = [];
     for (const index of table.indexes) {
         const builder = index.unique ? "unique" : "index";
@@ -824,7 +941,7 @@ function emitTableExtras(table, tsNameBySql, usedBuilders, manifest) {
                 return `expr("${escapeTsString(key.expr)}")`;
             }
             const sqlName = key.sqlName ?? "";
-            return `t.${tsNameBySql.get(sqlName) ?? sqlName}`;
+            return tColumnRef(tsNameBySql, sqlName);
         })
             .join(", ");
         let extra = `${builder}(${cols})`;
@@ -856,7 +973,7 @@ function emitTableExtras(table, tsNameBySql, usedBuilders, manifest) {
     if (table.primaryKey.length > 1) {
         usedBuilders?.add("primaryKey");
         extras.push(`    primaryKey(${table.primaryKey
-            .map((sqlName) => `t.${tsNameBySql.get(sqlName) ?? sqlName}`)
+            .map((sqlName) => tColumnRef(tsNameBySql, sqlName))
             .join(", ")}),`);
     }
     for (const fk of table.foreignKeys ?? []) {
@@ -865,7 +982,7 @@ function emitTableExtras(table, tsNameBySql, usedBuilders, manifest) {
             ? Object.values(manifest.tables).find((item) => item.sqlName === fk.targetTable)
             : undefined;
         const localCols = fk.columns
-            .map((sqlName) => `t.${tsNameBySql.get(sqlName) ?? sqlName}`)
+            .map((sqlName) => tColumnRef(tsNameBySql, sqlName))
             .join(", ");
         const targetCols = fk.targetColumns
             .map((sqlName) => {
@@ -876,8 +993,27 @@ function emitTableExtras(table, tsNameBySql, usedBuilders, manifest) {
             .join(", ");
         const accessor = target?.accessor ?? fk.targetTable;
         const firstLocal = tsNameBySql.get(fk.columns[0] ?? "") ?? "ref";
-        const asName = inferFkAs(firstLocal);
-        let extra = `foreignKey(${localCols}).references("${escapeTsString(accessor)}", ${targetCols}).as("${escapeTsString(asName)}").inverse("${escapeTsString(table.accessor)}")`;
+        // Composite FK constraints are emitted as a `foreignKey()` extra whose
+        // relation name and inverse compete with column names and other picked
+        // relations on both tables — same resolver as column-level fks.
+        let asName = inferFkAs(firstLocal);
+        let inverseName = table.accessor;
+        if (tracker && manifest) {
+            const usedOnSource = reservedNamesOnTable(tracker, table.accessor);
+            if (usedOnSource.has(asName)) {
+                const fallbackBase = asName === firstLocal && target?.accessor
+                    ? singularize(target.accessor)
+                    : "";
+                asName = withSuffix(fallbackBase !== "" ? fallbackBase : asName, usedOnSource);
+            }
+            reserveRelationName(tracker, table.accessor, asName);
+            const targetKey = target?.accessor ?? fk.targetTable;
+            if (targetKey) {
+                inverseName = withSuffix(table.accessor, reservedNamesOnTable(tracker, targetKey));
+                reserveRelationName(tracker, targetKey, inverseName);
+            }
+        }
+        let extra = `foreignKey(${localCols}).references("${escapeTsString(accessor)}", ${targetCols}).as("${escapeTsString(asName)}").inverse("${escapeTsString(inverseName)}")`;
         if (fk.onDelete && fk.onDelete !== "no action") {
             extra += `.onDelete("${escapeTsString(fk.onDelete)}")`;
         }
@@ -983,28 +1119,38 @@ function resolveFkAccessorTarget(col, manifest) {
     }
     return `${accessor}.${targetCol?.tsName ?? sqlColumn}`;
 }
-function sqliteColumnDef(col, table, manifest) {
+function sqliteColumnDef(col, table, manifest, tracker) {
     if (col.kind === "fk" && col.fkTarget) {
         const targetRef = resolveFkAccessorTarget(col, manifest);
         const relName = inferFkAs(col.tsName);
-        let def = `fk("${targetRef}")`;
-        if (col.fkAs && col.fkAs !== relName) {
-            def += `.as("${col.fkAs}")`;
+        const relationName = pulledFkRelationName(col, table, manifest, tracker);
+        let def = `fk("${escapeTsString(targetRef)}")`;
+        if (relationName !== relName) {
+            def += `.as("${escapeTsString(relationName)}")`;
         }
         const defaultInverse = col.unique
             ? singularize(table.accessor)
             : table.accessor;
         if (col.fkInverse && col.fkInverse !== defaultInverse) {
-            def += `.inverse("${col.fkInverse}")`;
+            def += `.inverse("${escapeTsString(col.fkInverse)}")`;
+        }
+        else {
+            const targetAccessor = fkTargetAccessor(col, manifest);
+            if (manifest.tables[targetAccessor]) {
+                const inverseName = pulledFkInverseName(col, table.accessor, targetAccessor, tracker);
+                if (inverseName !== defaultInverse) {
+                    def += `.inverse("${escapeTsString(inverseName)}")`;
+                }
+            }
         }
         if (col.onDelete) {
-            def += `.onDelete("${col.onDelete}")`;
+            def += `.onDelete("${escapeTsString(col.onDelete)}")`;
         }
         if (col.onUpdate) {
-            def += `.onUpdate("${col.onUpdate}")`;
+            def += `.onUpdate("${escapeTsString(col.onUpdate)}")`;
         }
         if (col.deferrable) {
-            def += `.deferrable("${col.deferrable}")`;
+            def += `.deferrable("${escapeTsString(col.deferrable)}")`;
         }
         if (col.primary) {
             def += ".primary()";
@@ -1012,9 +1158,9 @@ function sqliteColumnDef(col, table, manifest) {
         else if (!col.nullable) {
             def += ".notNull()";
         }
-        return `${col.tsName}: ${def},`;
+        return `${tsPropertyKey(col.tsName)}: ${def},`;
     }
-    let def = `${col.tsName}: ${sqliteColumnBuilder(col)}()`;
+    let def = `${tsPropertyKey(col.tsName)}: ${sqliteColumnBuilder(col)}()`;
     if (col.kind !== "id" && col.primary && table.primaryKey.length === 1) {
         def += ".primary()";
     }
@@ -1033,16 +1179,17 @@ export async function introspectMysql(client) {
     const manifest = await introspectMysqlToManifest(client);
     return emitPostgresSchema(manifest);
 }
-export async function introspectSqlite(client) {
-    const manifest = await introspectSqliteToManifest(client);
+/** Emit a `neoorm/schema` TS source from a SQLite-introspected manifest. Exported for tests. */
+export function emitSqliteSchema(manifest) {
+    const tracker = pullNameTracker(manifest);
     const tableBlocks = [];
     for (const table of Object.values(manifest.tables)) {
         const tsNameBySql = new Map(table.columns.map((col) => [col.sqlName, col.tsName]));
         const lines = [tableHeader(table.accessor, table.sqlName)];
         for (const col of table.columns) {
-            lines.push(`    ${sqliteColumnDef(col, table, manifest)}`);
+            lines.push(`    ${sqliteColumnDef(col, table, manifest, tracker)}`);
         }
-        const extras = emitTableExtras(table, tsNameBySql, undefined, manifest);
+        const extras = emitTableExtras(table, tsNameBySql, undefined, manifest, tracker);
         if (extras.length > 0) {
             lines.push(`  }, (t) => [
 ${extras.join("\n")}
@@ -1079,6 +1226,10 @@ ${extras.join("\n")}
         ``,
     ].join("\n");
 }
+export async function introspectSqlite(client) {
+    const manifest = await introspectSqliteToManifest(client);
+    return emitSqliteSchema(manifest);
+}
 function inferColumnNaming(columnNames) {
     const allCamelCase = columnNames.every((sqlName) => toCamelCase(sqlName) === sqlName);
     const needsSnakeCaseMap = columnNames.some((sqlName) => sqlName !== resolveSqlColumnName(toCamelCase(sqlName), "snakeCase"));