neoorm 0.5.2 → 0.6.1

package/dist/schema/column.js

@@ -11,26 +11,81 @@ export function createColumnBuilder(meta) {
         index() {
             return createColumnBuilder({ ...meta, index: true });
         },
+        hidden() {
+            return createColumnBuilder({ ...meta, hidden: true });
+        },
         default(value) {
             return createColumnBuilder({ ...meta, defaultValue: value });
         },
+        primary() {
+            return createColumnBuilder({ ...meta, primary: true, nullable: false });
+        },
+        map(name) {
+            return createColumnBuilder({ ...meta, mapName: name });
+        },
+        check(expression) {
+            return createColumnBuilder({ ...meta, checkExpression: expression });
+        },
+    };
+    return builder;
+}
+export function createTimestampColumnBuilder(meta) {
+    const builder = {
+        _type: undefined,
+        _meta: meta,
+        notNull() {
+            return createTimestampColumnBuilder({ ...meta, nullable: false });
+        },
+        unique() {
+            return createTimestampColumnBuilder({ ...meta, unique: true });
+        },
+        index() {
+            return createTimestampColumnBuilder({ ...meta, index: true });
+        },
+        hidden() {
+            return createTimestampColumnBuilder({ ...meta, hidden: true });
+        },
+        default(value) {
+            return createTimestampColumnBuilder({ ...meta, defaultValue: value });
+        },
+        primary() {
+            return createTimestampColumnBuilder({ ...meta, primary: true });
+        },
+        map(name) {
+            return createTimestampColumnBuilder({ ...meta, mapName: name });
+        },
+        check(expression) {
+            return createTimestampColumnBuilder({ ...meta, checkExpression: expression });
+        },
         defaultNow() {
-            return createColumnBuilder({ ...meta, defaultNow: true });
+            return createTimestampColumnBuilder({ ...meta, defaultNow: true });
         },
         updatedAt() {
-            return createColumnBuilder({
+            return createTimestampColumnBuilder({
                 ...meta,
                 updatedAt: true,
             });
         },
-        primary() {
-            return createColumnBuilder({ ...meta, primary: true, nullable: false });
-        },
-        map(name) {
-            return createColumnBuilder({ ...meta, mapName: name });
-        },
     };
     return builder;
 }
+export function timestamps() {
+    const createdAt = createTimestampColumnBuilder({
+        kind: "timestamp",
+        nullable: false,
+        unique: false,
+        primary: false,
+        defaultNow: true,
+    });
+    const updatedAt = createTimestampColumnBuilder({
+        kind: "timestamp",
+        nullable: false,
+        unique: false,
+        primary: false,
+        defaultNow: true,
+        updatedAt: true,
+    });
+    return { createdAt, updatedAt };
+}
 export { bool, bigint, bytea, citext, decimal, enumType, id, int, intArray, json, jsonb, numeric, serial, text, textArray, timestamp, uuid, } from "../plugins/builtin.js";
 //# sourceMappingURL=column.js.map

package/dist/schema/column.js.map

@@ -1 +1 @@
-{"version":3,"file":"column.js","sourceRoot":"","sources":["../../src/schema/column.ts"],"names":[],"mappings":"AA8DA,MAAM,UAAU,mBAAmB,CAClC,IAAW;IAEX,MAAM,OAAO,GAAiC;QAC7C,KAAK,EAAE,SAA8B;QACrC,KAAK,EAAE,IAAI;QACX,OAAO;YACN,OAAO,mBAAmB,CAGxB,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,KAAK,EAE3B,CAAC,CAAC;QACJ,CAAC;QACD,MAAM;YACL,OAAO,mBAAmB,CAGxB,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,IAAI,EAExB,CAAC,CAAC;QACJ,CAAC;QACD,KAAK;YACJ,OAAO,mBAAmB,CAGxB,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,IAAI,EAEvB,CAAC,CAAC;QACJ,CAAC;QACD,OAAO,CAAC,KAAa;YACpB,OAAO,mBAAmB,CAGxB,EAAE,GAAG,IAAI,EAAE,YAAY,EAAE,KAAK,EAGJ,CAAC,CAAC;QAC/B,CAAC;QACD,UAAU;YACT,OAAO,mBAAmB,CAGxB,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,IAAI,EAE5B,CAAC,CAAC;QACJ,CAAC;QACD,SAAS;YACR,OAAO,mBAAmB,CAAgC;gBACzD,GAAG,IAAI;gBACP,SAAS,EAAE,IAAI;aACU,CAAC,CAAC;QAC7B,CAAC;QACD,OAAO;YACN,OAAO,mBAAmB,CAGxB,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAK1C,CAAC,CAAC;QACJ,CAAC;QACD,GAAG,CAAC,IAAY;YACf,OAAO,mBAAmB,CAGxB,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,IAAI,EAEzB,CAAC,CAAC;QACJ,CAAC;KACD,CAAC;IACF,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,OAAO,EACN,IAAI,EACJ,MAAM,EACN,KAAK,EACL,MAAM,EACN,OAAO,EACP,QAAQ,EACR,EAAE,EACF,GAAG,EACH,QAAQ,EACR,IAAI,EACJ,KAAK,EACL,OAAO,EACP,MAAM,EACN,IAAI,EACJ,SAAS,EACT,SAAS,EACT,IAAI,GACJ,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"column.js","sourceRoot":"","sources":["../../src/schema/column.ts"],"names":[],"mappings":"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"}

package/dist/schema/define-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"define-schema.d.ts","sourceRoot":"","sources":["../../src/schema/define-schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,MAAM,aAAa,GAAG;IAC3B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,SAAS,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI;IACjE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,aAAa,CAAC,EAAE,YAAY,CAAC;IACtC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACzC,GAAG,OAAO,CAAC;AAEZ,wBAAgB,YAAY,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,EACpE,MAAM,EAAE,OAAO,EACf,OAAO,GAAE,aAAkB,GACzB,SAAS,CAAC,OAAO,CAAC,CAWpB"}
+{"version":3,"file":"define-schema.d.ts","sourceRoot":"","sources":["../../src/schema/define-schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,MAAM,aAAa,GAAG;IAC3B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,SAAS,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI;IACjE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,aAAa,CAAC,EAAE,YAAY,CAAC;IACtC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACzC,GAAG,OAAO,CAAC;AA0CZ,wBAAgB,YAAY,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,EACpE,MAAM,EAAE,OAAO,EACf,OAAO,GAAE,aAAkB,GACzB,SAAS,CAAC,OAAO,CAAC,CAepB"}

package/dist/schema/define-schema.js

@@ -1,4 +1,38 @@
+function findPrimaryKeyColumn(table) {
+    for (const [tsName, col] of Object.entries(table._columns)) {
+        if (typeof col === "object" &&
+            col !== null &&
+            "_meta" in col &&
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            col._meta?.primary === true) {
+            return tsName;
+        }
+    }
+    for (const [tsName, col] of Object.entries(table._columns)) {
+        if (typeof col === "object" &&
+            col !== null &&
+            "_meta" in col &&
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            col._meta?.kind === "id") {
+            return tsName;
+        }
+    }
+    return undefined;
+}
+function assignTableAccessor(table, accessor) {
+    const sqlName = table._tableName || accessor;
+    const pkColumnName = findPrimaryKeyColumn(table);
+    const targetRef = pkColumnName ? `${sqlName}.${pkColumnName}` : `${sqlName}.`;
+    Object.assign(table, {
+        _tableName: sqlName,
+        _accessor: accessor,
+        _targetRef: targetRef,
+    });
+}
 export function defineSchema(tables, options = {}) {
+    for (const [accessor, tableDef] of Object.entries(tables)) {
+        assignTableAccessor(tableDef, accessor);
+    }
     const base = {
         _tables: tables,
     };

package/dist/schema/define-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"define-schema.js","sourceRoot":"","sources":["../../src/schema/define-schema.ts"],"names":[],"mappings":"AAaA,MAAM,UAAU,YAAY,CAC3B,MAAe,EACf,OAAO,GAAkB,EAAE;IAE3B,MAAM,IAAI,GAA4B;QACrC,OAAO,EAAE,MAAM;KACf,CAAC;IACF,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QAC1B,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;IAC3C,CAAC;IACD,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzD,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IACvC,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAuB,CAAC;AAC1D,CAAC"}
+{"version":3,"file":"define-schema.js","sourceRoot":"","sources":["../../src/schema/define-schema.ts"],"names":[],"mappings":"AAaA,SAAS,oBAAoB,CAC5B,KAAe;IAEf,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5D,IACC,OAAO,GAAG,KAAK,QAAQ;YACvB,GAAG,KAAK,IAAI;YACZ,OAAO,IAAI,GAAG;YACd,8DAA8D;YAC7D,GAAW,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,EACnC,CAAC;YACF,OAAO,MAAM,CAAC;QACf,CAAC;IACF,CAAC;IACD,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5D,IACC,OAAO,GAAG,KAAK,QAAQ;YACvB,GAAG,KAAK,IAAI;YACZ,OAAO,IAAI,GAAG;YACd,8DAA8D;YAC7D,GAAW,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI,EAChC,CAAC;YACF,OAAO,MAAM,CAAC;QACf,CAAC;IACF,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAe,EAAE,QAAgB;IAC7D,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,IAAI,QAAQ,CAAC;IAC7C,MAAM,YAAY,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;IACjD,MAAM,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,IAAI,YAAY,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,GAAG,CAAC;IAE9E,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE;QACpB,UAAU,EAAE,OAAO;QACnB,SAAS,EAAE,QAAQ;QACnB,UAAU,EAAE,SAAS;KACrB,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,YAAY,CAC3B,MAAe,EACf,OAAO,GAAkB,EAAE;IAE3B,KAAK,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3D,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,IAAI,GAA4B;QACrC,OAAO,EAAE,MAAM;KACf,CAAC;IACF,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QAC1B,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;IAC3C,CAAC;IACD,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzD,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IACvC,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAuB,CAAC;AAC1D,CAAC"}

package/dist/schema/index.d.ts

@@ -1,15 +1,15 @@
 export type { DecimalOptions, EnumTypeOptions, UuidOptions, } from "../plugins/builtin.js";
-export type { ColumnBuilder, ColumnKind, ColumnMeta } from "./column.js";
-export { bigint, bool, bytea, citext, decimal, enumType, id, int, intArray, json, jsonb, numeric, serial, text, textArray, timestamp, uuid, } from "./column.js";
+export type { ColumnBuilder, ColumnKind, ColumnMeta, TimestampColumnBuilder, } from "./column.js";
+export { bigint, bool, bytea, citext, decimal, enumType, id, int, intArray, json, jsonb, numeric, serial, text, textArray, timestamp, timestamps, uuid, } from "./column.js";
 export type { SchemaDef, SchemaOptions } from "./define-schema.js";
 export { defineSchema } from "./define-schema.js";
-export type { InlineManyToManyOptions, ManyToManyDef, ManyToManyExtra, } from "./many-to-many.js";
-export { clearManyToManyRegistry, getManyToManyRegistry, manyToMany, } from "./many-to-many.js";
+export type { InlineManyToManyOptions, ManyToManyExtra, } from "./many-to-many.js";
+export { manyToMany } from "./many-to-many.js";
 export { clearTableRegistry } from "./table-registry.js";
-export type { FkBuilder, FkMeta, FkOptions, OnDeleteAction, } from "./relation.js";
+export type { FkBuilder, FkMeta, OnDeleteAction, } from "./relation.js";
 export { fk } from "./relation.js";
 export type { InlineM2MInverseRelations, InlineM2MInverseWhereMap, InlineM2MInverseWriteMap, InlineM2MRelations, InlineM2MWhereMap, InlineM2MWriteMap, InverseRelations, JunctionM2MRelations, NestedCreateInput, OutgoingFkRelations, RelationCreateMap, RelationUpdateMap, SqlNameToAccessor, } from "./relation-types.js";
-export type { ColumnDef, ColumnNaming, ColumnRefs, IndexDef, PrimaryKeyDef, ScalarColumnKeys, TableDef, TableExtra, TableOptions, } from "./table.js";
+export type { ColumnDef, ColumnNaming, ColumnRefs, IndexDef, IndexWherePredicate, PrimaryKeyDef, ScalarColumnKeys, TableDef, TableExtra, TableOptions, } from "./table.js";
 export { index, primaryKey, table, unique } from "./table.js";
-export type { AggregateArgs, ApplyOmit, ApplySelect, ColumnWhereInput, ConnectInput, ConnectOrCreateItem, CountArgs, CountSelect, CreateArgs, CreateInput, CreateManyAndReturnArgs, CreateManyArgs, CreateManyInput, CursorInput, DeleteArgs, DeleteManyAndReturnArgs, DeleteManyArgs, ExistsArgs, FindByIdArgs, FindFirstArgs, FindManyArgs, FindOrCreateArgs, FindOrCreateResult, FindUniqueArgs, GroupByArgs, GroupByHaving, GroupByOrderBy, InferAggregateResult, InferCountResult, InferFindResult, InferGroupByResult, InferInsertRow, InferSelectRow, InferWithResult, LogicalWhereInput, ManyRelationFilter, NumericHaving, NumericUpdateOps, OmitInput, OrderByInput, OrderDirection, PaginateArgs, PaginateResult, QueryMode, RelationAccessors, RelationCountInput, RelationWhereMap, RelationWriteInput, ScalarPkName, ScalarSetOp, SchemaTables, SelectInput, UpdateArgs, UpdateInput, UpdateManyAndReturnArgs, UpdateManyArgs, UpsertArgs, WhereInput, WhereOperators, WithInclude, WithInput, WithInputMap, WithRelationOptions, } from "./types.js";
+export type { AggregateArgs, ApplyOmit, ApplySelect, ColumnWhereInput, ConnectInput, ConnectOrCreateItem, CountArgs, CountSelect, CreateArgs, CreateInput, CreateManyAndReturnArgs, CreateManyArgs, CreateManyInput, CursorInput, DeleteArgs, DeleteManyAndReturnArgs, DeleteManyArgs, ExistsArgs, FindByIdArgs, FindFirstArgs, FindManyArgs, FindOrCreateArgs, FindOrCreateResult, FindUniqueArgs, GroupByArgs, GroupByHaving, GroupByOrderBy, InferAggregateResult, InferCountResult, InferFindResult, InferGroupByResult, InferInsertRow, InferSelectRow, InferWithResult, LogicalWhereInput, ManyRelationFilter, NumericHaving, NumericUpdateOps, OmitInput, OrderByInput, OrderDirection, PaginateArgs, PaginateResult, QueryMode, RelationAccessors, RelationCountInput, RelationWhereMap, RelationWriteInput, ScalarPkName, ScalarSetOp, SchemaTables, SelectInput, HiddenKeys, StripOmitKeys, StripResult, StripCapable, UpdateArgs, UpdateInput, UpdateManyAndReturnArgs, UpdateManyArgs, UpsertArgs, WhereInput, WhereOperators, WithInclude, WithInput, WithInputMap, WithRelationOptions, } from "./types.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/schema/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACX,cAAc,EACd,eAAe,EACf,WAAW,GACX,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,EACN,MAAM,EACN,IAAI,EACJ,KAAK,EACL,MAAM,EACN,OAAO,EACP,QAAQ,EACR,EAAE,EACF,GAAG,EACH,QAAQ,EACR,IAAI,EACJ,KAAK,EACL,OAAO,EACP,MAAM,EACN,IAAI,EACJ,SAAS,EACT,SAAS,EACT,IAAI,GACJ,MAAM,aAAa,CAAC;AACrB,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,YAAY,EACX,uBAAuB,EACvB,aAAa,EACb,eAAe,GACf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACN,uBAAuB,EACvB,qBAAqB,EACrB,UAAU,GACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,YAAY,EACX,SAAS,EACT,MAAM,EACN,SAAS,EACT,cAAc,GACd,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AACnC,YAAY,EACX,yBAAyB,EACzB,wBAAwB,EACxB,wBAAwB,EACxB,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,EAChB,oBAAoB,EACpB,iBAAiB,EACjB,mBAAmB,EACnB,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,GACjB,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EACX,SAAS,EACT,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,aAAa,EACb,gBAAgB,EAChB,QAAQ,EACR,UAAU,EACV,YAAY,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAC9D,YAAY,EACX,aAAa,EACb,SAAS,EACT,WAAW,EACX,gBAAgB,EAChB,YAAY,EACZ,mBAAmB,EACnB,SAAS,EACT,WAAW,EACX,UAAU,EACV,WAAW,EACX,uBAAuB,EACvB,cAAc,EACd,eAAe,EACf,WAAW,EACX,UAAU,EACV,uBAAuB,EACvB,cAAc,EACd,UAAU,EACV,YAAY,EACZ,aAAa,EACb,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,EACd,WAAW,EACX,aAAa,EACb,cAAc,EACd,oBAAoB,EACpB,gBAAgB,EAChB,eAAe,EACf,kBAAkB,EAClB,cAAc,EACd,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,aAAa,EACb,gBAAgB,EAChB,SAAS,EACT,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,cAAc,EACd,SAAS,EACT,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,WAAW,EACX,UAAU,EACV,WAAW,EACX,uBAAuB,EACvB,cAAc,EACd,UAAU,EACV,UAAU,EACV,cAAc,EACd,WAAW,EACX,SAAS,EACT,YAAY,EACZ,mBAAmB,GACnB,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/schema/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACX,cAAc,EACd,eAAe,EACf,WAAW,GACX,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EACX,aAAa,EACb,UAAU,EACV,UAAU,EACV,sBAAsB,GACtB,MAAM,aAAa,CAAC;AACrB,OAAO,EACN,MAAM,EACN,IAAI,EACJ,KAAK,EACL,MAAM,EACN,OAAO,EACP,QAAQ,EACR,EAAE,EACF,GAAG,EACH,QAAQ,EACR,IAAI,EACJ,KAAK,EACL,OAAO,EACP,MAAM,EACN,IAAI,EACJ,SAAS,EACT,SAAS,EACT,UAAU,EACV,IAAI,GACJ,MAAM,aAAa,CAAC;AACrB,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,YAAY,EACX,uBAAuB,EACvB,eAAe,GACf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,YAAY,EACX,SAAS,EACT,MAAM,EACN,cAAc,GACd,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AACnC,YAAY,EACX,yBAAyB,EACzB,wBAAwB,EACxB,wBAAwB,EACxB,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,EAChB,oBAAoB,EACpB,iBAAiB,EACjB,mBAAmB,EACnB,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,GACjB,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EACX,SAAS,EACT,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,mBAAmB,EACnB,aAAa,EACb,gBAAgB,EAChB,QAAQ,EACR,UAAU,EACV,YAAY,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAC9D,YAAY,EACX,aAAa,EACb,SAAS,EACT,WAAW,EACX,gBAAgB,EAChB,YAAY,EACZ,mBAAmB,EACnB,SAAS,EACT,WAAW,EACX,UAAU,EACV,WAAW,EACX,uBAAuB,EACvB,cAAc,EACd,eAAe,EACf,WAAW,EACX,UAAU,EACV,uBAAuB,EACvB,cAAc,EACd,UAAU,EACV,YAAY,EACZ,aAAa,EACb,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,EACd,WAAW,EACX,aAAa,EACb,cAAc,EACd,oBAAoB,EACpB,gBAAgB,EAChB,eAAe,EACf,kBAAkB,EAClB,cAAc,EACd,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,aAAa,EACb,gBAAgB,EAChB,SAAS,EACT,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,cAAc,EACd,SAAS,EACT,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,WAAW,EACX,UAAU,EACV,aAAa,EACb,WAAW,EACX,YAAY,EACZ,UAAU,EACV,WAAW,EACX,uBAAuB,EACvB,cAAc,EACd,UAAU,EACV,UAAU,EACV,cAAc,EACd,WAAW,EACX,SAAS,EACT,YAAY,EACZ,mBAAmB,GACnB,MAAM,YAAY,CAAC"}

package/dist/schema/index.js

@@ -1,6 +1,6 @@
-export { bigint, bool, bytea, citext, decimal, enumType, id, int, intArray, json, jsonb, numeric, serial, text, textArray, timestamp, uuid, } from "./column.js";
+export { bigint, bool, bytea, citext, decimal, enumType, id, int, intArray, json, jsonb, numeric, serial, text, textArray, timestamp, timestamps, uuid, } from "./column.js";
 export { defineSchema } from "./define-schema.js";
-export { clearManyToManyRegistry, getManyToManyRegistry, manyToMany, } from "./many-to-many.js";
+export { manyToMany } from "./many-to-many.js";
 export { clearTableRegistry } from "./table-registry.js";
 export { fk } from "./relation.js";
 export { index, primaryKey, table, unique } from "./table.js";

package/dist/schema/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/schema/index.ts"],"names":[],"mappings":"AAMA,OAAO,EACN,MAAM,EACN,IAAI,EACJ,KAAK,EACL,MAAM,EACN,OAAO,EACP,QAAQ,EACR,EAAE,EACF,GAAG,EACH,QAAQ,EACR,IAAI,EACJ,KAAK,EACL,OAAO,EACP,MAAM,EACN,IAAI,EACJ,SAAS,EACT,SAAS,EACT,IAAI,GACJ,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAMlD,OAAO,EACN,uBAAuB,EACvB,qBAAqB,EACrB,UAAU,GACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAOzD,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AA2BnC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/schema/index.ts"],"names":[],"mappings":"AAWA,OAAO,EACN,MAAM,EACN,IAAI,EACJ,KAAK,EACL,MAAM,EACN,OAAO,EACP,QAAQ,EACR,EAAE,EACF,GAAG,EACH,QAAQ,EACR,IAAI,EACJ,KAAK,EACL,OAAO,EACP,MAAM,EACN,IAAI,EACJ,SAAS,EACT,SAAS,EACT,UAAU,EACV,IAAI,GACJ,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAKlD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAMzD,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AA4BnC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC"}

package/dist/schema/many-to-many.d.ts

@@ -1,15 +1,14 @@
-import type { TableDef } from "./table.js";
 export type ManyToManyExtra<TTarget extends string = string, TAs extends string = string, TInverse extends string = string> = {
     kind: "manyToMany";
     /** Target table accessor name (e.g. "tags"). */
     target: TTarget;
-    /** Junction table SQL name. When omitted, a junction table is generated. */
+    /** Junction table accessor. When omitted, a junction table is generated. */
     through?: string;
     /** Junction column (TS name) referencing the source table. */
     leftKey?: string;
     /** Junction column (TS name) referencing the target table. */
     rightKey?: string;
-    /** Relation name on the source table. Defaults to the column/extras key. */
+    /** Relation name on the source table. Defaults to the column key. */
     as: TAs;
     /** Relation name on the target table. Defaults to the source accessor. */
     inverse: TInverse;
@@ -27,25 +26,6 @@ type ManyToManyAsOf<T extends InlineManyToManyOptions> = T extends {
 type ManyToManyInverseOf<T extends InlineManyToManyOptions> = T extends {
     inverse: infer Inv extends string;
 } ? Inv : "";
-export type ManyToManyDef = {
-    kind: "manyToMany";
-    leftKey: string;
-    rightKey: string;
-    throughKey: string;
-    leftRelation: string;
-    rightRelation: string;
-    as: string;
-    inverse: string;
-};
 export declare function manyToMany<const TTarget extends string, const TOptions extends InlineManyToManyOptions = {}>(target: TTarget, options?: TOptions): ManyToManyExtra<TTarget, ManyToManyAsOf<TOptions>, ManyToManyInverseOf<TOptions>>;
-export declare function manyToMany<TLeft extends TableDef, TRight extends TableDef, TThrough extends TableDef>(left: TLeft, right: TRight, options: {
-    through: TThrough;
-    left: string;
-    right: string;
-    as: string;
-    inverse: string;
-}): void;
-export declare function getManyToManyRegistry(): readonly ManyToManyDef[];
-export declare function clearManyToManyRegistry(): void;
 export {};
 //# sourceMappingURL=many-to-many.d.ts.map

package/dist/schema/many-to-many.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"many-to-many.d.ts","sourceRoot":"","sources":["../../src/schema/many-to-many.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,MAAM,eAAe,CAC1B,OAAO,SAAS,MAAM,GAAG,MAAM,EAC/B,GAAG,SAAS,MAAM,GAAG,MAAM,EAC3B,QAAQ,SAAS,MAAM,GAAG,MAAM,IAC7B;IACH,IAAI,EAAE,YAAY,CAAC;IACnB,gDAAgD;IAChD,MAAM,EAAE,OAAO,CAAC;IAChB,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,8DAA8D;IAC9D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,4EAA4E;IAC5E,EAAE,EAAE,GAAG,CAAC;IACR,0EAA0E;IAC1E,OAAO,EAAE,QAAQ,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,cAAc,CAAC,CAAC,SAAS,uBAAuB,IAAI,CAAC,SAAS;IAClE,EAAE,EAAE,MAAM,EAAE,SAAS,MAAM,CAAC;CAC5B,GACE,EAAE,GACF,EAAE,CAAC;AAEN,KAAK,mBAAmB,CAAC,CAAC,SAAS,uBAAuB,IAAI,CAAC,SAAS;IACvE,OAAO,EAAE,MAAM,GAAG,SAAS,MAAM,CAAC;CAClC,GACE,GAAG,GACH,EAAE,CAAC;AAEN,MAAM,MAAM,aAAa,GAAG;IAC3B,IAAI,EAAE,YAAY,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;CAChB,CAAC;AAaF,wBAAgB,UAAU,CACzB,KAAK,CAAC,OAAO,SAAS,MAAM,EAC5B,KAAK,CAAC,QAAQ,SAAS,uBAAuB,GAAG,EAAE,EAEnD,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,QAAQ,GAChB,eAAe,CACjB,OAAO,EACP,cAAc,CAAC,QAAQ,CAAC,EACxB,mBAAmB,CAAC,QAAQ,CAAC,CAC7B,CAAC;AACF,wBAAgB,UAAU,CACzB,KAAK,SAAS,QAAQ,EACtB,MAAM,SAAS,QAAQ,EACvB,QAAQ,SAAS,QAAQ,EAEzB,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,MAAM,EACb,OAAO,EAAE;IACR,OAAO,EAAE,QAAQ,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;CAChB,GACC,IAAI,CAAC;AAwCR,wBAAgB,qBAAqB,IAAI,SAAS,aAAa,EAAE,CAEhE;AAED,wBAAgB,uBAAuB,IAAI,IAAI,CAE9C"}
+{"version":3,"file":"many-to-many.d.ts","sourceRoot":"","sources":["../../src/schema/many-to-many.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,CAC1B,OAAO,SAAS,MAAM,GAAG,MAAM,EAC/B,GAAG,SAAS,MAAM,GAAG,MAAM,EAC3B,QAAQ,SAAS,MAAM,GAAG,MAAM,IAC7B;IACH,IAAI,EAAE,YAAY,CAAC;IACnB,gDAAgD;IAChD,MAAM,EAAE,OAAO,CAAC;IAChB,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,8DAA8D;IAC9D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qEAAqE;IACrE,EAAE,EAAE,GAAG,CAAC;IACR,0EAA0E;IAC1E,OAAO,EAAE,QAAQ,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,cAAc,CAAC,CAAC,SAAS,uBAAuB,IAAI,CAAC,SAAS;IAClE,EAAE,EAAE,MAAM,EAAE,SAAS,MAAM,CAAC;CAC5B,GACE,EAAE,GACF,EAAE,CAAC;AAEN,KAAK,mBAAmB,CAAC,CAAC,SAAS,uBAAuB,IAAI,CAAC,SAAS;IACvE,OAAO,EAAE,MAAM,GAAG,SAAS,MAAM,CAAC;CAClC,GACE,GAAG,GACH,EAAE,CAAC;AAEN,wBAAgB,UAAU,CACzB,KAAK,CAAC,OAAO,SAAS,MAAM,EAC5B,KAAK,CAAC,QAAQ,SAAS,uBAAuB,GAAG,EAAE,EAEnD,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,QAAQ,GAChB,eAAe,CACjB,OAAO,EACP,cAAc,CAAC,QAAQ,CAAC,EACxB,mBAAmB,CAAC,QAAQ,CAAC,CAC7B,CAUA"}

package/dist/schema/many-to-many.js

@@ -1,46 +1,12 @@
-// The registry lives on globalThis so every module instance (src vs dist,
-// tsx tsImport vs Node import) shares the same array — a schema module loaded
-// through tsImport evaluates its DSL imports in an isolated module graph, so a
-// module-local array would never be visible to the codegen process reading it.
-const REGISTRY_KEY = Symbol.for("neoorm.manyToManyRegistry");
-function registry() {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    return (globalThis[REGISTRY_KEY] ??= []);
-}
-export function manyToMany(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-...args) {
-    const [first, second, third] = args;
-    if (typeof first === "string") {
-        const options = second;
-        return {
-            kind: "manyToMany",
-            target: first,
-            ...(options?.through ? { through: options.through } : {}),
-            ...(options?.leftKey ? { leftKey: options.leftKey } : {}),
-            ...(options?.rightKey ? { rightKey: options.rightKey } : {}),
-            as: options?.as ?? "",
-            inverse: options?.inverse ?? "",
-        };
-    }
-    const left = first;
-    const right = second;
-    const options = third;
-    registry().push({
+export function manyToMany(target, options) {
+    return {
         kind: "manyToMany",
-        leftKey: left._tableName,
-        rightKey: right._tableName,
-        throughKey: options.through._tableName,
-        leftRelation: options.left,
-        rightRelation: options.right,
-        as: options.as,
-        inverse: options.inverse,
-    });
-}
-export function getManyToManyRegistry() {
-    return registry();
-}
-export function clearManyToManyRegistry() {
-    registry().length = 0;
+        target,
+        ...(options?.through ? { through: options.through } : {}),
+        ...(options?.leftKey ? { leftKey: options.leftKey } : {}),
+        ...(options?.rightKey ? { rightKey: options.rightKey } : {}),
+        as: (options?.as ?? ""),
+        inverse: (options?.inverse ?? ""),
+    };
 }
 //# sourceMappingURL=many-to-many.js.map

package/dist/schema/many-to-many.js.map

@@ -1 +1 @@
-{"version":3,"file":"many-to-many.js","sourceRoot":"","sources":["../../src/schema/many-to-many.ts"],"names":[],"mappings":"AAqDA,0EAA0E;AAC1E,8EAA8E;AAC9E,+EAA+E;AAC/E,+EAA+E;AAC/E,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;AAE7D,SAAS,QAAQ;IAChB,8DAA8D;IAC9D,OAAO,CAAE,UAAkB,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;AACnD,CAAC;AA4BD,MAAM,UAAU,UAAU;AACzB,8DAA8D;AAC9D,GAAG,IAAW;IAEd,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC;IACpC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,MAA6C,CAAC;QAC9D,OAAO;YACN,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,KAAK;YACb,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACzD,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACzD,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5D,EAAE,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE;YACrB,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,EAAE;SAC/B,CAAC;IACH,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,CAAC;IACnB,MAAM,KAAK,GAAG,MAAM,CAAC;IACrB,MAAM,OAAO,GAAG,KAMf,CAAC;IACF,QAAQ,EAAE,CAAC,IAAI,CAAC;QACf,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE,IAAI,CAAC,UAAU;QACxB,QAAQ,EAAE,KAAK,CAAC,UAAU;QAC1B,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,UAAU;QACtC,YAAY,EAAE,OAAO,CAAC,IAAI;QAC1B,aAAa,EAAE,OAAO,CAAC,KAAK;QAC5B,EAAE,EAAE,OAAO,CAAC,EAAE;QACd,OAAO,EAAE,OAAO,CAAC,OAAO;KACxB,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,qBAAqB;IACpC,OAAO,QAAQ,EAAE,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,uBAAuB;IACtC,QAAQ,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;AACvB,CAAC"}
+{"version":3,"file":"many-to-many.js","sourceRoot":"","sources":["../../src/schema/many-to-many.ts"],"names":[],"mappings":"AAwCA,MAAM,UAAU,UAAU,CAIzB,MAAe,EACf,OAAkB;IAMlB,OAAO;QACN,IAAI,EAAE,YAAY;QAClB,MAAM;QACN,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5D,EAAE,EAAE,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,CAA6B;QACnD,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,IAAI,EAAE,CAAkC;KAClE,CAAC;AACH,CAAC"}

package/dist/schema/nested-relation-types.d.ts

@@ -1,6 +1,6 @@
 import type { ColumnBuilder } from "./column.js";
 import type { FkBuilder, FkMeta } from "./relation.js";
-import type { ConnectInput, FkInverseName, FkRelationName, InferInsertRow, SqlNameToAccessor } from "./relation-types.js";
+import type { ConnectInput, FkInverseName, FkRelationName, InferInsertRow } from "./relation-types.js";
 import type { ColumnDef, TableDef } from "./table.js";
 type Expand<T> = T extends infer O ? {
     [K in keyof O]: O[K];
@@ -20,7 +20,7 @@ type HasPrimaryIdColumn<TColumns extends Record<string, ColumnDef>> = {
 type IsThroughTable<TColumns extends Record<string, ColumnDef>> = [
     HasPrimaryIdColumn<TColumns>
 ] extends [never] ? HasExactlyTwoFks<TColumns> : false;
-type FkTargetMatchesAccessor<TSchema extends Record<string, TableDef>, TTarget extends string, TAccessor extends keyof TSchema & string> = [TTarget] extends [`${TSchema[TAccessor]["_tableName"]}.${string}`] ? true : false;
+type FkTargetMatchesAccessor<TSchema extends Record<string, TableDef>, TTarget extends string, TAccessor extends keyof TSchema & string> = [TTarget] extends [`${TAccessor}.${string}`] ? true : [TTarget] extends [TAccessor] ? true : false;
 type DisconnectWriteForFk<C extends ColumnDef> = C extends FkBuilder ? C["_meta"] extends {
     nullable: true;
 } ? {
@@ -30,11 +30,11 @@ type ShallowToOneRelationWriteForAccessor<TSchema extends Record<string, TableDe
     connect?: ConnectInput<TSchema[TAccessor]["_columns"], TSchema>;
     create?: InferInsertRow<TSchema[TAccessor]["_columns"], TSchema>;
 } & DisconnectWriteForFk<TFkColumn> : never;
+type FkTargetAccessor<TSchema extends Record<string, TableDef>, TTarget extends string> = TTarget extends `${infer Acc}.${string}` ? Acc extends keyof TSchema & string ? Acc : never : TTarget extends keyof TSchema & string ? TTarget : never;
 type ShallowOutgoingFkRelationWriteMap<TSchema extends Record<string, TableDef>, TColumns extends Record<string, ColumnDef>> = {
     [K in keyof TColumns & string as TColumns[K] extends FkBuilder ? TColumns[K]["_meta"] extends FkMeta ? TColumns[K]["_meta"] extends {
         as: infer As extends string;
-        target: `${infer Sql}.${string}`;
-    } ? SqlNameToAccessor<TSchema, Sql> extends keyof TSchema & string ? FkRelationName<As, K> : never : never : never : never]?: TColumns[K] extends FkBuilder ? TColumns[K]["_meta"] extends FkMeta ? TColumns[K]["_meta"]["target"] extends `${infer Sql}.${string}` ? SqlNameToAccessor<TSchema, Sql> extends infer Acc extends keyof TSchema & string ? Acc extends keyof TSchema & string ? ShallowToOneRelationWriteForAccessor<TSchema, Acc, TColumns[K]> : never : never : never : never : never;
+    } ? FkTargetAccessor<TSchema, TColumns[K]["_meta"]["target"]> extends keyof TSchema & string ? FkRelationName<As, K> : never : never : never : never]?: TColumns[K] extends FkBuilder ? TColumns[K]["_meta"] extends FkMeta ? FkTargetAccessor<TSchema, TColumns[K]["_meta"]["target"]> extends infer Acc extends keyof TSchema & string ? ShallowToOneRelationWriteForAccessor<TSchema, Acc, TColumns[K]> : never : never : never;
 };
 type ParentFkColumnOnChild<TSchema extends Record<string, TableDef>, TParentAccessor extends keyof TSchema & string, TChildAccessor extends keyof TSchema & string> = {
     [K in FkColumnNames<TSchema[TChildAccessor]["_columns"]>]: FkMetaOf<TSchema[TChildAccessor]["_columns"][K]> extends {

package/dist/schema/nested-relation-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nested-relation-types.d.ts","sourceRoot":"","sources":["../../src/schema/nested-relation-types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"nested-relation-types.d.ts","sourceRoot":"","sources":["../../src/schema/nested-relation-types.ts"],"names":[],"mappings":"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"}

package/dist/schema/relation-types.d.ts

@@ -99,9 +99,11 @@ export type SqlNameToAccessor<TSchema extends Record<string, TableDef>, TSqlName
 type OutgoingFkRelationEntry<TSchema extends Record<string, TableDef>, C extends ColumnDef, K extends string> = FkMetaOf<C> extends {
     target: infer TTarget extends string;
     as: infer As extends string;
-} ? TTarget extends `${infer Sql}.${string}` ? SqlNameToAccessor<TSchema, Sql> extends infer Acc extends keyof TSchema & string ? IsThroughTable<TSchema[Acc]["_columns"]> extends true ? never : {
+} ? TTarget extends `${infer Acc}.${string}` ? Acc extends keyof TSchema & string ? IsThroughTable<TSchema[Acc]["_columns"]> extends true ? never : {
     [P in FkRelationName<As, K>]: Acc;
-} : never : never : never;
+} : never : TTarget extends keyof TSchema & string ? IsThroughTable<TSchema[TTarget]["_columns"]> extends true ? never : {
+    [P in FkRelationName<As, K>]: TTarget;
+} : never : never;
 export type OutgoingFkRelations<TSchema extends Record<string, TableDef>, TColumns extends Record<string, ColumnDef>> = MergeRelationUnion<{
     [K in keyof TColumns]: OutgoingFkRelationEntry<TSchema, TColumns[K], K & string>;
 }[keyof TColumns]>;
@@ -110,9 +112,11 @@ export type InverseRelationEntryForSource<TSchema extends Record<string, TableDe
     target: infer TTarget extends string;
     inverse: infer Inv extends string;
 } ? [TTarget] extends [
-    `${TSchema[TTargetAccessor]["_tableName"]}.${string}`
+    `${TTargetAccessor & string}.${string}`
 ] ? {
     [P in FkInverseName<Inv, K>]: TSourceAccessor;
+} : [TTarget] extends [TTargetAccessor] ? {
+    [P in FkInverseName<Inv, K>]: TSourceAccessor;
 } : never : never;
 export type InverseRelationEntriesForTable<TSchema extends Record<string, TableDef>, TAccessor extends keyof TSchema & string, TSourceAccessor extends keyof TSchema & string> = {
     [K in FkColumnNames<TSchema[TSourceAccessor]["_columns"]>]: InverseRelationEntryForSource<TSchema, TAccessor, TSourceAccessor, TSchema[TSourceAccessor]["_columns"][K], K>;
@@ -120,10 +124,10 @@ export type InverseRelationEntriesForTable<TSchema extends Record<string, TableD
 export type InverseRelations<TSchema extends Record<string, TableDef>, TAccessor extends keyof TSchema & string> = MergeInverseRelationUnion<{
     [K in keyof TSchema & string]: MergeInverseRelationUnion<InverseRelationEntriesForTable<TSchema, TAccessor, K>>;
 }[keyof TSchema & string]>;
-type FkTargetMatchesAccessor<TSchema extends Record<string, TableDef>, TTarget extends string, TAccessor extends keyof TSchema & string> = [TTarget] extends [`${TSchema[TAccessor]["_tableName"]}.${string}`] ? true : false;
+type FkTargetMatchesAccessor<TSchema extends Record<string, TableDef>, TTarget extends string, TAccessor extends keyof TSchema & string> = [TTarget] extends [`${TAccessor}.${string}`] ? true : [TTarget] extends [TAccessor] ? true : false;
 type OtherFkTarget<TSchema extends Record<string, TableDef>, TThroughAccessor extends keyof TSchema & string, TCurrentAccessor extends keyof TSchema & string, TFkCol extends FkColumnNames<TSchema[TThroughAccessor]["_columns"]>> = FkMetaOf<TSchema[TThroughAccessor]["_columns"][TFkCol]> extends {
     target: infer TTarget extends string;
-} ? FkTargetMatchesAccessor<TSchema, TTarget, TCurrentAccessor> extends true ? never : TTarget extends `${infer Sql}.${string}` ? SqlNameToAccessor<TSchema, Sql> : never : never;
+} ? FkTargetMatchesAccessor<TSchema, TTarget, TCurrentAccessor> extends true ? never : TTarget extends `${infer Acc}.${string}` ? Acc extends keyof TSchema & string ? Acc : never : TTarget extends keyof TSchema & string ? TTarget : never : never;
 /** M2M via junction tables: relation name = target table accessor */
 type JunctionM2MEntry<TSchema extends Record<string, TableDef>, TAccessor extends keyof TSchema & string, TThroughAccessor extends keyof TSchema & string> = MergeRelationUnion<{
     [C in FkColumnNames<TSchema[TThroughAccessor]["_columns"]>]: OtherFkTarget<TSchema, TThroughAccessor, TAccessor, C> extends infer Target extends keyof TSchema & string ? {
@@ -200,8 +204,24 @@ export type RelationCountInput<TSchema extends Record<string, TableDef>, TAccess
 type SelectKeys<S> = S extends readonly (infer K extends PropertyKey)[] ? K : S extends Record<string, unknown> ? {
     [K in keyof S]: S[K] extends true ? K : never;
 }[keyof S] : never;
+/** Keys removed by `strip()` — schema `.hidden()` columns plus optional extra omit. */
+export type StripOmitKeys<TColumns extends Record<string, ColumnDef>, O = undefined> = HiddenKeys<TColumns> | (O extends undefined ? never : SelectKeys<O>);
 export type ApplySelect<Row extends Record<string, unknown>, S> = Pick<Row, SelectKeys<S> & keyof Row>;
 export type ApplyOmit<Row extends Record<string, unknown>, O> = Omit<Row, SelectKeys<O> & keyof Row>;
+/** Column names marked `.hidden()` in the schema. */
+export type HiddenKeys<TColumns extends Record<string, ColumnDef>> = {
+    [K in ScalarColumnKeys<TColumns>]: TColumns[K] extends {
+        readonly _meta: infer M;
+    } ? M extends {
+        hidden: true;
+    } ? K : never : never;
+}[ScalarColumnKeys<TColumns>];
+/** Result of `strip()` — removes hidden and extra omitted keys; preserves null/undefined and maps arrays. */
+export type StripResult<T, Keys extends PropertyKey = never> = T extends null | undefined ? T : T extends readonly (infer Item extends Record<string, unknown>)[] ? Array<StripResult<Item, Keys>> : T extends Record<string, unknown> ? Omit<T, Keys> : T;
+/** Row payload with `.strip()` — removes `.hidden()` columns and optional extra fields. */
+export type StripCapable<TColumns extends Record<string, ColumnDef>, TRow extends Record<string, unknown>> = TRow & {
+    strip<const O extends OmitInput<TColumns> | undefined = undefined>(omit?: O): StripResult<TRow, StripOmitKeys<TColumns, O>>;
+};
 type RelationTargetModel<TSchema extends Record<string, TableDef>, TTargetAccessor extends keyof TSchema & string> = InferSelectRow<TSchema[TTargetAccessor]["_columns"], TSchema>;
 type InferNestedWithResult<TSchema extends Record<string, TableDef>, TTargetAccessor extends keyof TSchema & string, TInclude, TModel extends Record<string, unknown>> = TInclude extends {
     select?: infer S;
@@ -241,16 +261,20 @@ export type ManyRelationFilter<TSchema extends Record<string, TableDef>, TTarget
 type OutgoingFkRelationWhereEntry<TSchema extends Record<string, TableDef>, C extends ColumnDef, K extends string> = FkMetaOf<C> extends {
     target: infer TTarget extends string;
     as: infer As extends string;
-} ? TTarget extends `${infer Sql}.${string}` ? SqlNameToAccessor<TSchema, Sql> extends infer Acc extends keyof TSchema & string ? IsThroughTable<TSchema[Acc]["_columns"]> extends true ? never : {
+} ? TTarget extends `${infer Acc}.${string}` ? Acc extends keyof TSchema & string ? IsThroughTable<TSchema[Acc]["_columns"]> extends true ? never : {
     [P in FkRelationName<As, K>]?: WhereInput<TSchema[Acc]["_columns"], TSchema, Acc>;
-} : never : never : never;
+} : never : TTarget extends keyof TSchema & string ? IsThroughTable<TSchema[TTarget]["_columns"]> extends true ? never : {
+    [P in FkRelationName<As, K>]?: WhereInput<TSchema[TTarget]["_columns"], TSchema, TTarget>;
+} : never : never;
 type InverseRelationWhereEntry<TSchema extends Record<string, TableDef>, TTargetAccessor extends keyof TSchema & string, TSourceAccessor extends keyof TSchema & string, C extends ColumnDef, K extends string> = IsThroughTable<TSchema[TSourceAccessor]["_columns"]> extends true ? never : FkMetaOf<C> extends {
     target: infer TTarget extends string;
     inverse: infer Inv extends string;
 } ? [TTarget] extends [
-    `${TSchema[TTargetAccessor]["_tableName"]}.${string}`
+    `${TTargetAccessor & string}.${string}`
 ] ? {
     [P in FkInverseName<Inv, K>]?: ManyRelationFilter<TSchema, TSourceAccessor>;
+} : [TTarget] extends [TTargetAccessor] ? {
+    [P in FkInverseName<Inv, K>]?: ManyRelationFilter<TSchema, TSourceAccessor>;
 } : never : never;
 type JunctionM2MWhereEntry<TSchema extends Record<string, TableDef>, TAccessor extends keyof TSchema & string, TThroughAccessor extends keyof TSchema & string> = MergeRelationUnion<{
     [C in FkColumnNames<TSchema[TThroughAccessor]["_columns"]>]: OtherFkTarget<TSchema, TThroughAccessor, TAccessor, C> extends infer Target extends keyof TSchema & string ? {
@@ -296,11 +320,11 @@ type ToOneRelationWriteForAccessor<TSchema extends Record<string, TableDef>, TAc
     connect?: ConnectInput<TSchema[TAccessor]["_columns"], TSchema>;
     create?: InferInsertRow<TSchema[TAccessor]["_columns"], TSchema>;
 } & DisconnectWriteForFk<TFkColumn> : never;
+type FkTargetAccessor<TSchema extends Record<string, TableDef>, TTarget extends string> = TTarget extends `${infer Acc}.${string}` ? Acc extends keyof TSchema & string ? Acc : never : TTarget extends keyof TSchema & string ? TTarget : never;
 type OutgoingFkRelationWriteMap<TSchema extends Record<string, TableDef>, TColumns extends Record<string, ColumnDef>> = {
     [K in keyof TColumns & string as TColumns[K] extends FkBuilder ? TColumns[K]["_meta"] extends FkMeta ? TColumns[K]["_meta"] extends {
         as: infer As extends string;
-        target: `${infer Sql}.${string}`;
-    } ? SqlNameToAccessor<TSchema, Sql> extends keyof TSchema & string ? FkRelationName<As, K> : never : never : never : never]?: TColumns[K] extends FkBuilder ? TColumns[K]["_meta"] extends FkMeta ? TColumns[K]["_meta"]["target"] extends `${infer Sql}.${string}` ? SqlNameToAccessor<TSchema, Sql> extends infer Acc extends keyof TSchema & string ? Acc extends keyof TSchema & string ? ToOneRelationWriteForAccessor<TSchema, Acc, TColumns[K]> : never : never : never : never : never;
+    } ? FkTargetAccessor<TSchema, TColumns[K]["_meta"]["target"]> extends keyof TSchema & string ? FkRelationName<As, K> : never : never : never : never]?: TColumns[K] extends FkBuilder ? TColumns[K]["_meta"] extends FkMeta ? FkTargetAccessor<TSchema, TColumns[K]["_meta"]["target"]> extends infer Acc extends keyof TSchema & string ? ToOneRelationWriteForAccessor<TSchema, Acc, TColumns[K]> : never : never : never;
 };
 type M2MRelationWriteForAccessor<TSchema extends Record<string, TableDef>, TTargetAccessor extends keyof TSchema & string> = TTargetAccessor extends keyof TSchema & string ? {
     connect?: ConnectInput<TSchema[TTargetAccessor]["_columns"], TSchema>[];