kysely-rizzolver 0.0.2 → 0.0.3

package/dist/esm/fk-gather-result-factory.js

@@ -0,0 +1,108 @@
+import { assertIsGatherOneResult, assertIsGatherOneXResult, assertIsGatherSomeResult, isGatherOneResult, isGatherOneXResult, isGatherSomeResult, newGatherOneResult, newGatherOneXResult, newGatherSomeResult } from './fk-gather-result.js';
+export function newFkGatherResultFactory() {
+    return {
+        /**
+         * Creates a new {@link GatherOneResult} instance.
+         */
+        newGatherOne(table, depth, result, models) {
+            return newGatherOneResult(table, depth, result, models);
+        },
+        /**
+         * Creates a new {@link GatherOneXResult} instance.
+         *
+         * Note: it may be counterintuitive, but this function accepts `undefined` as
+         * input. I found it is way more convenient to assert the type once in this
+         * funciton rather than in every caller.
+         */
+        newGatherOneX(table, depth, result, models) {
+            return newGatherOneXResult(table, depth, result, models);
+        },
+        /**
+         * Creates a new {@link GatherSomeResult} instance.
+         */
+        newGatherSome(table, depth, result, models) {
+            return newGatherSomeResult(table, depth, result, models);
+        },
+        /**
+         * Checks if a {@link GatherResult} is a {@link GatherOneResult}.
+         */
+        isGatherOne(table, depth, result) {
+            return isGatherOneResult(result) && result.table === table && result.depth === depth;
+        },
+        /**
+         * Checks if a {@link GatherResult} is a {@link GatherOneXResult}.
+         */
+        isGatherOneX(table, depth, result) {
+            return isGatherOneXResult(result) && result.table === table && result.depth === depth;
+        },
+        /**
+         * Checks if a {@link GatherResult} is a {@link GatherSomeResult}.
+         */
+        isGatherSome(table, depth, result) {
+            return isGatherSomeResult(result) && result.table === table && result.depth === depth;
+        },
+        /**
+         * Asserts that a {@link GatherResult} is a {@link GatherOneResult}.
+         */
+        assertIsGatherOne(table, depth, result) {
+            assertIsGatherOneResult(result);
+            if (result.table !== table) {
+                throw new Error(`Expected a gatherOne result for table ${table}`);
+            }
+            if (result.depth !== depth) {
+                throw new Error(`Expected a gatherOne result for table ${table} of depth ${depth}`);
+            }
+        },
+        /**
+         * Asserts that a {@link GatherResult} is a {@link GatherOneXResult}.
+         */
+        assertIsGatherOneX(table, depth, result) {
+            assertIsGatherOneXResult(result);
+            if (result.table !== table) {
+                throw new Error(`Expected a gatherOne result with a non-null value for table ${table}`);
+            }
+            if (result.depth !== depth) {
+                throw new Error(`Expected a gatherOne result with a non-null value for table ${table} of depth ${depth}`);
+            }
+        },
+        /**
+         * Asserts that a {@link GatherResult} is a {@link GatherSomeResult}.
+         */
+        assertIsGatherSome(table, depth, result) {
+            assertIsGatherSomeResult(result);
+            if (result.table !== table) {
+                throw new Error(`Expected a gatherSome result for table ${table}`);
+            }
+            if (result.depth !== depth) {
+                throw new Error(`Expected a gatherSome result for table ${table} of depth ${depth}`);
+            }
+        },
+        /**
+         * Extracts a Kysely {@link Selectable} instance from a gathered model.
+         *
+         * This is useful because Selectables are the lowest common denominators
+         * for any representation of a DB model, so this allows you to convert
+         * any gather result to anything else that might build upon Kysely.
+         *
+         * For example, to convert a gather result to a fetch result:
+         * ```
+         * const userGather: FkGatherOneXResult<DB, 'user'>;
+         * const userModel = userGather.result;
+         * const userSelectable = rizzolver.gatherObjs.toSelectable(userModel);
+         * ```
+         *
+         */
+        toSelectable(model) {
+            if (model === undefined || model === null) {
+                return model;
+            }
+            const selectable = {
+                ...model
+            };
+            delete selectable['__fkDepth'];
+            delete selectable['__table'];
+            return selectable;
+        }
+    };
+}
+//# sourceMappingURL=fk-gather-result-factory.js.map

package/dist/esm/fk-gather-result-factory.js.map

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

package/dist/esm/fk-gather-result.js

@@ -0,0 +1,115 @@
+import { MAX_FK_GATHER_DEPTH } from './fks.js';
+/**
+ * Creates a new {@link FkGatherOneResult} instance.
+ */
+export function newGatherOneResult(table, depth, result, models) {
+    const ref = { value: null };
+    const me = {
+        gatherType: 'gatherOne',
+        table,
+        depth,
+        result,
+        models,
+        asGatherOneX() {
+            if (!me.result) {
+                throw new Error('Expected a gatherOneX result');
+            }
+            return ref.value;
+        }
+    };
+    ref.value = me;
+    return me;
+}
+/**
+ * Creates a new {@link FkGatherOneXResult} instance.
+ *
+ * Note: it may be counterintuitive, but this function accepts `undefined` as
+ * input. I found it is way more convenient to assert the type once in this
+ * funciton rather than in every caller.
+ */
+export function newGatherOneXResult(table, depth, result, models) {
+    if (!result) {
+        throw new Error('Expected a gatherOneX result');
+    }
+    const ref = { value: null };
+    const me = {
+        gatherType: 'gatherOne',
+        table,
+        depth,
+        result,
+        models,
+        asGatherOneX() {
+            return ref.value;
+        }
+    };
+    ref.value = me;
+    return me;
+}
+/**
+ * Creates a new {@link FkGatherSomeResult} instance.
+ */
+export function newGatherSomeResult(table, depth, result, models) {
+    return {
+        gatherType: 'gatherSome',
+        table,
+        depth,
+        result,
+        models
+    };
+}
+export function isGatherResult(result) {
+    return (!!result &&
+        typeof result === 'object' &&
+        'gatherType' in result &&
+        !!result.gatherType &&
+        typeof result.gatherType === 'string' &&
+        'table' in result &&
+        !!result.table &&
+        typeof result.table === 'string' &&
+        'depth' in result &&
+        typeof result.depth === 'number' &&
+        Number.isInteger(result.depth) &&
+        result.depth >= 0 &&
+        result.depth <= MAX_FK_GATHER_DEPTH &&
+        'result' in result &&
+        (result.result === undefined ||
+            typeof result.result === 'object' ||
+            (Array.isArray(result.result) && result.result.every((r) => !!r && typeof r === 'object'))));
+}
+export function isGatherOneResult(value) {
+    return isGatherResult(value) && value.gatherType === 'gatherOne' && !Array.isArray(value.result);
+}
+export function isGatherOneXResult(value) {
+    return (isGatherResult(value) &&
+        value.gatherType === 'gatherOne' &&
+        !Array.isArray(value.result) &&
+        !!value.result);
+}
+export function isGatherSomeResult(value) {
+    return isGatherResult(value) && value.gatherType === 'gatherSome' && Array.isArray(value.result);
+}
+/**
+ * Asserts that `value` is a {@link FkGatherOneResult}.
+ */
+export function assertIsGatherOneResult(value) {
+    if (!isGatherOneResult(value)) {
+        throw new Error('Expected a gatherOne result');
+    }
+}
+/**
+ * Asserts that `value` is a {@link FkGatherOneXResult}.
+ */
+export function assertIsGatherOneXResult(value) {
+    if (!isGatherOneXResult(value)) {
+        throw new Error('Expected a gatherOne result with a non-null, non undefined result');
+    }
+}
+/**
+ * Asserts that `value` is a {@link FkGatherSomeResult}.
+ */
+export function assertIsGatherSomeResult(value) {
+    if (!isGatherSomeResult(value)) {
+        throw new Error('Expected a gatherSome result');
+    }
+}
+//# sourceMappingURL=fk-gather-result.js.map

package/dist/esm/fk-gather-result.js.map

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

package/dist/esm/fks.js

@@ -0,0 +1,96 @@
+/**
+ * The maximum depth to gather FKs in a single gather operation.
+ *
+ * If you change this, you must also change {@link NextDepth}.
+ */
+export const MAX_FK_GATHER_DEPTH = 3;
+export class ModelFkGatherError extends Error {
+    constructor(table, id, reason) {
+        super(`Failed to gather model (table: '${table}', id: ${id}): ${reason}`);
+    }
+}
+export async function gatherModelFks(rizzolver, dbInstance, table, where, opts = {}) {
+    const depth = opts.depth ?? MAX_FK_GATHER_DEPTH;
+    const onInvalidModel = opts.onInvalidModel ?? 'omit';
+    const modelCollection = opts.modelCollection ?? null;
+    const fkDefs = rizzolver._types.fkDefs;
+    let qb = rizzolver
+        .newQueryBuilder()
+        .add(table, table, rizzolver._types.fields[table]);
+    const gatherItems = [];
+    qb = _collectGatherData(fkDefs, table, qb, depth, gatherItems);
+    let ky = dbInstance.selectFrom(table);
+    for (const gatherItem of gatherItems) {
+        ky = ky.leftJoin(gatherItem.tableAlias, gatherItem.join);
+    }
+    ky = ky.select(qb.allFields()).where((eb) => where(eb));
+    const rizzult = await qb.run(() => ky.execute());
+    const collection = rizzult.models;
+    modelCollection?.addCollection(collection);
+    const result = rizzult.rows.map((row) => {
+        const baseModel = row.selectors[table];
+        const gatheredModel = _baseToGatheredModel(fkDefs, table, baseModel, collection, MAX_FK_GATHER_DEPTH, onInvalidModel);
+        return gatheredModel;
+    });
+    if (onInvalidModel === 'omit') {
+        return result.filter((model) => model !== null);
+    }
+    return result;
+}
+function _collectGatherData(fkDefs, table, qb, depthLeft, result) {
+    if (depthLeft <= 0) {
+        return qb;
+    }
+    const myAlias = qb.numSelectors == 1 ? table : `fk${qb.numSelectors - 1}`;
+    const myFkDefs = fkDefs[table] ?? {};
+    for (const fkDef of Object.values(myFkDefs)) {
+        const otherAlias = `fk${qb.numSelectors}`;
+        qb = qb.add(fkDef.otherTable, otherAlias);
+        const myField = `${myAlias}.${fkDef.myField}`; // qb.selectors[myAlias].field(fkDef.myField).str;
+        const otherField = `${otherAlias}.${fkDef.otherField}`; // qb.selectors[otherAlias].field(fkDef.otherField).str;
+        const join = (join) => join.onRef(myField, '=', otherField);
+        result.push({ tableAlias: qb.table(otherAlias), join });
+        qb = _collectGatherData(fkDefs, fkDef.otherTable, qb, (depthLeft - 1), result);
+    }
+    return qb;
+}
+function _baseToGatheredModel(fkDefs, table, baseModel, collection, depth, onInvalidModel) {
+    if (depth <= 0) {
+        return { __fkDepth: 0, __table: table, ...baseModel };
+    }
+    const myId = baseModel['id'];
+    if (!myId || typeof myId !== 'number') {
+        throw new Error('Expected model to have a valid id');
+    }
+    const gatheredModel = { __fkDepth: depth, __table: table, ...baseModel };
+    const myFkDefs = fkDefs[table] ?? {};
+    for (const [fkName, fkDef] of Object.entries(myFkDefs)) {
+        const fkValue = baseModel[fkDef.myField];
+        if (fkValue !== null && fkValue !== undefined && typeof fkValue !== 'number') {
+            throw new ModelFkGatherError(table, myId, `Invalid looking FK value for reference '${fkName}' (field: '${fkDef.myField}'). Expected positive number, got: '${JSON.stringify(fkValue)}'`);
+        }
+        const expectsOtherModel = fkValue !== null && fkValue !== undefined && fkValue !== 0;
+        const otherBaseModel = expectsOtherModel
+            ? collection.get(fkDef.otherTable, fkValue) ?? null
+            : null;
+        const isValid = expectsOtherModel === !!otherBaseModel;
+        if (!isValid) {
+            switch (onInvalidModel) {
+                case 'omit':
+                case 'null':
+                    return null;
+                case 'throw':
+                    throw new ModelFkGatherError(table, myId, `Could not find model for FK reference '${fkName}' (field: '${fkDef.myField}') for id ${fkValue}`);
+            }
+        }
+        if (otherBaseModel) {
+            const otherGatheredModel = _baseToGatheredModel(fkDefs, fkDef.otherTable, otherBaseModel, collection, (depth - 1), onInvalidModel);
+            gatheredModel[fkName] = otherGatheredModel;
+        }
+        else {
+            gatheredModel[fkName] = undefined;
+        }
+    }
+    return gatheredModel;
+}
+//# sourceMappingURL=fks.js.map

package/dist/esm/fks.js.map

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

package/dist/esm/index.js

@@ -1,5 +1,8 @@
 export { KyselyRizzolver } from './kysely-rizzolver.js';
-export { assertIsFetchOneResult, assertIsFetchOneXResult, assertIsFetchSomeResult, isFetchOneResult, isFetchOneXResult, isFetchSomeResult, newFetchOneResult, newFetchOneXResult, newFetchSomeResult } from './fetch-result.js';
+export { assertIsFetchOneResult, assertIsFetchOneXResult, assertIsFetchSomeResult, isFetchOneResult, isFetchOneXResult, isFetchResult, isFetchSomeResult, newFetchOneResult, newFetchOneXResult, newFetchSomeResult } from './fetch-result.js';
+export { assertIsGatherOneResult, assertIsGatherOneXResult, assertIsGatherSomeResult, isGatherOneResult, isGatherOneXResult, isGatherResult, isGatherSomeResult, newGatherOneResult, newGatherOneXResult, newGatherSomeResult } from './fk-gather-result.js';
+export { MAX_FK_GATHER_DEPTH, ModelFkGatherError } from './fks.js';
 export { newSelector } from './selector.js';
 export { newQueryBuilder } from './query-builder.js';
 export { newModelCollection } from './model-collection.js';
+//# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAQxD,OAAO,EACN,sBAAsB,EACtB,uBAAuB,EACvB,uBAAuB,EACvB,gBAAgB,EAChB,iBAAiB,EACjB,aAAa,EACb,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,MAAM,mBAAmB,CAAC;AAW3B,OAAO,EACN,uBAAuB,EACvB,wBAAwB,EACxB,wBAAwB,EACxB,iBAAiB,EACjB,kBAAkB,EAClB,cAAc,EACd,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,EACnB,MAAM,uBAAuB,CAAC;AAW/B,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAYnE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/esm/kysely-rizzolver-builder.js

@@ -0,0 +1,20 @@
+import { newKyselyRizzolverFkBuilder } from './kysely-rizzolver-fk-builder.js';
+import { KyselyRizzolver } from './kysely-rizzolver.js';
+export function newKyselyRizzolverBuilder(fields, defaultGatherDepth) {
+    return {
+        table(tableName, tableFields) {
+            return newKyselyRizzolverBuilder({
+                ...fields,
+                [tableName]: tableFields
+            });
+        },
+        defaultGatherDepth(depth) {
+            return newKyselyRizzolverBuilder(fields, depth);
+        },
+        build(cb) {
+            const defs = cb?.(newKyselyRizzolverFkBuilder({}));
+            return new KyselyRizzolver(fields, defs ?? {}, defaultGatherDepth);
+        }
+    };
+}
+//# sourceMappingURL=kysely-rizzolver-builder.js.map

package/dist/esm/kysely-rizzolver-builder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"kysely-rizzolver-builder.js","sourceRoot":"","sources":["../../src/kysely-rizzolver-builder.ts"],"names":[],"mappings":"AAEA,OAAO,EAEN,2BAA2B,EAC3B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,eAAe,EAA2B,MAAM,uBAAuB,CAAC;AAsCjF,MAAM,UAAU,yBAAyB,CAIvC,MAAS,EAAE,kBAAuC;IACnD,OAAO;QACN,KAAK,CACJ,SAAY,EACZ,WAG+D;YAE/D,OAAO,yBAAyB,CAA6C;gBAC5E,GAAG,MAAM;gBACT,CAAC,SAAS,CAAC,EAAE,WAAW;aACxB,CAAQ,CAAC;QACX,CAAC;QAED,kBAAkB,CAAiC,KAAgB;YAClE,OAAO,yBAAyB,CAAmB,MAAM,EAAE,KAAK,CAAC,CAAC;QACnE,CAAC;QAED,KAAK,CAAwC,EAAsC;YAClF,MAAM,IAAI,GAAG,EAAE,EAAE,CAAC,2BAA2B,CAAK,EAAE,CAAC,CAAC,CAAC;YACvD,OAAO,IAAI,eAAe,CAAC,MAAM,EAAE,IAAI,IAAI,EAAE,EAAE,kBAAkB,CAAC,CAAC;QACpE,CAAC;KAC2C,CAAC;AAC/C,CAAC"}

package/dist/esm/kysely-rizzolver-fk-builder.js

@@ -0,0 +1,20 @@
+export function newKyselyRizzolverFkBuilder(fkDefs) {
+    return {
+        add(fromTable, fromField, toTable, toField, fkName, nullable) {
+            const defsForTable = (fkDefs[fromTable] ?? {});
+            const fkEntry = {
+                myField: fromField,
+                otherTable: toTable,
+                otherField: toField,
+                isNullable: nullable ?? false
+            };
+            defsForTable[fkName] = fkEntry;
+            fkDefs[fromTable] = defsForTable;
+            return newKyselyRizzolverFkBuilder(fkDefs);
+        },
+        build() {
+            return fkDefs;
+        }
+    };
+}
+//# sourceMappingURL=kysely-rizzolver-fk-builder.js.map

package/dist/esm/kysely-rizzolver-fk-builder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"kysely-rizzolver-fk-builder.js","sourceRoot":"","sources":["../../src/kysely-rizzolver-fk-builder.ts"],"names":[],"mappings":"AAwDA,MAAM,UAAU,2BAA2B,CAC1C,MAAc;IAEd,OAAO;QACN,GAAG,CAQF,SAAoB,EACpB,SAAoB,EACpB,OAAgB,EAChB,OAAgB,EAChB,MAAc,EACd,QAAmB;YAEnB,MAAM,YAAY,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAmC,CAAC;YACjF,MAAM,OAAO,GAAG;gBACf,OAAO,EAAE,SAAS;gBAClB,UAAU,EAAE,OAAO;gBACnB,UAAU,EAAE,OAAO;gBACnB,UAAU,EAAE,QAAQ,IAAI,KAAK;aAC6B,CAAC;YAE5D,YAAY,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC;YAC/B,MAAM,CAAC,SAAS,CAAC,GAAG,YAAY,CAAC;YAEjC,OAAO,2BAA2B,CAAU,MAAM,CAAC,CAAC;QACrD,CAAC;QAED,KAAK;YACJ,OAAO,MAAM,CAAC;QACf,CAAC;KACD,CAAC;AACH,CAAC"}

package/dist/esm/kysely-rizzolver.js

@@ -1,7 +1,10 @@
 import { newFetchResultFactory } from './fetch-result-factory.js';
+import { newFkGatherResultFactory } from './fk-gather-result-factory.js';
+import { gatherModelFks, MAX_FK_GATHER_DEPTH } from './fks.js';
+import { newKyselyRizzolverBuilder } from './kysely-rizzolver-builder.js';
+import { newModelCollection as kyNewModelCollection } from './model-collection.js';
 import { newQueryBuilder as kyNewQueryBuilder } from './query-builder.js';
 import { newSelector as kyNewSelector } from './selector.js';
-import { newModelCollection as kyNewModelCollection } from './model-collection.js';
 /**
  * A {@link KyselyRizzolver} is a class that is used to define the structure of
  * a database schema.
@@ -14,11 +17,19 @@ import { newModelCollection as kyNewModelCollection } from './model-collection.j
  * {@link KyselyRizzolver.builderNoSchema|.builderNoSchema()}.
  */
 export class KyselyRizzolver {
-    fields;
-    fetches;
-    constructor(fields) {
-        this.fields = fields;
-        this.fetches = newFetchResultFactory();
+    _types;
+    fetchObjs;
+    gatherObjs;
+    defaultGatherDepth;
+    constructor(fields, fks, defaultGatherDepth) {
+        this._types = Object.freeze({
+            fields,
+            fkDefs: fks,
+            dbfk: null
+        });
+        this.fetchObjs = newFetchResultFactory();
+        this.gatherObjs = newFkGatherResultFactory();
+        this.defaultGatherDepth = defaultGatherDepth ?? MAX_FK_GATHER_DEPTH;
     }
     /**
      * Intantiates a new {@link Selector} for the given table.
@@ -38,19 +49,43 @@ export class KyselyRizzolver {
     newModelCollection() {
         return kyNewModelCollection();
     }
+    async gatherOne(db, table, where, opts) {
+        const depth = opts?.depth ?? this.defaultGatherDepth;
+        const modelCollection = opts?.modelCollection ?? this.newModelCollection();
+        const gather = await gatherModelFks(this, db, table, where, opts);
+        const result = gather[0] ?? undefined;
+        return this.gatherObjs.newGatherOne(table, depth, result, modelCollection);
+    }
+    async gatherOneX(db, table, where, opts) {
+        const depth = opts?.depth ?? this.defaultGatherDepth;
+        const modelCollection = opts?.modelCollection ?? this.newModelCollection();
+        const gather = await gatherModelFks(this, db, table, where, opts);
+        const result = gather[0] ?? undefined;
+        return this.gatherObjs.newGatherOneX(table, depth, result, modelCollection);
+    }
+    async gatherSome(db, table, where, opts) {
+        const depth = opts?.depth ?? this.defaultGatherDepth;
+        const modelCollection = opts?.modelCollection ?? this.newModelCollection();
+        const gather = await gatherModelFks(this, db, table, where, opts);
+        const result = gather.filter((r) => !!r);
+        if (result.length < gather.length) {
+            throw new Error('Expected no nulls in fkGatherSome result');
+        }
+        return this.gatherObjs.newGatherSome(table, depth, result, modelCollection);
+    }
     /**
      * Starts building a new {@link KyselyRizzolver} using a builder pattern for
      * a schema.
      *
-     * Call {@link KyselyRizzolverBuilderForSchema.table|.table()} for each
+     * Call {@link KyselyRizzolverBuilder.table|.table()} for each
      * table that exists on the `DB` type parameter with all of their column
      * names as a const array. After all tables have been added, call
-     * {@link KyselyRizzolverBuilderForSchema.build|.build()} to get a new
+     * {@link KyselyRizzolverBuilder.build|.build()} to get a new
      * {@link KyselyRizzolver} instance.
      *
      * Example:
      * ```
-     * const rizzolver = KyselyRizzolver.builderForSchema<DB>()
+     * const rizzolver = KyselyRizzolver.builder<DB>()
      *   .table('user', ['id', 'name', 'email'] as const)
      *   .table('post', ['id', 'title', 'content', 'authorId'] as const)
      *   .build();
@@ -58,86 +93,8 @@ export class KyselyRizzolver {
      *
      * Note: The `as const` assertion is necessary for correct type inference.
      */
-    static builderForSchema() {
-        return _newKyselyRizzolverBuilderForSchema({});
+    static builder() {
+        return newKyselyRizzolverBuilder({});
     }
-    /**
-     * Starts building a new {@link KyselyRizzolver} using a builder pattern
-     * without a schema.
-     *
-     * Call {@link KyselyRizzolverBuilderNoSchema.table|.table()} for each
-     * table with all of their column names as a const array.
-     *
-     * Example:
-     * ```
-     * const rizzolver = KyselyRizzolver.builder()
-     *     .table('user', ['id', 'name', 'email'] as const) // note `as const` is necessary
-     *     .table('post', ['id', 'title', 'content', 'authorId'] as const)
-     *     .build();
-     * ```
-     *
-     * Since this version of builder is schemaless, it cannot infer the value
-     * types for the columns. The `user` type will be `{ id: unknown, name:
-     * unknown, email: unknown }`.
-     *
-     * You may call
-     * {@link KyselyRizzolverBuilderNoSchema.asModel|.asModel\<M\>()}
-     * immediately after the .table() call to provide the types, where `M` is an
-     * type like `{ column1: type1, column2: type2, ... }`.
-     *
-     * Example:
-     * ```
-     * const rizzolver = KyselyRizzolver.builder()
-     *     .table('user', ['id', 'name', 'email'] as const)
-     *     .asModel<{id: number, name: string, email: string}>()
-     *     .table('post', ['id', 'title', 'content', 'authorId'] as const)
-     *     .asModel<{id: number, title: string, content: string, authorId: number}>()
-     *     .build();
-     * ```
-     *
-     * p.s. if your .table() and .asModel() columns differ, it will let you know
-     * at compile time ;)
-     *
-     * Once all tables have been added, call
-     * {@link KyselyRizzolverBuilderNoSchema.build|.build()} to get a new
-     * {@link KyselyRizzolver} instance.
-     */
-    static builderNoSchema() {
-        return _newKyselyRizzolverBuilderNoSchema({}, null);
-    }
-}
-function _newKyselyRizzolverBuilderForSchema(fields) {
-    return {
-        table(tableName, tableFields) {
-            return _newKyselyRizzolverBuilderForSchema({
-                ...fields,
-                [tableName]: tableFields
-            });
-        },
-        build() {
-            return new KyselyRizzolver(fields);
-        }
-    };
-}
-function _newKyselyRizzolverBuilderNoSchema(fields, last) {
-    return {
-        table(tableName, tableFields) {
-            return _newKyselyRizzolverBuilderNoSchema({
-                ...fields,
-                [tableName]: {
-                    model: null,
-                    columns: tableFields
-                }
-            }, tableName);
-        },
-        asModel() {
-            if (!last) {
-                throw new Error('asModel() must be called after table()');
-            }
-            return _newKyselyRizzolverBuilderNoSchema(fields, null);
-        },
-        build() {
-            return new KyselyRizzolver(Object.fromEntries(Object.entries(fields).map((entry) => [entry[0], entry[1].columns])));
-        }
-    };
 }
+//# sourceMappingURL=kysely-rizzolver.js.map

package/dist/esm/kysely-rizzolver.js.map

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

package/dist/esm/model-collection.js

@@ -14,8 +14,30 @@ export function newModelCollection(init = {}) {
             collection[table][selectable.id] = selectable;
             return this;
         },
-        get collection() {
-            return collection;
+        addCollection(collection) {
+            for (const [table, entries] of Object.entries(collection.get())) {
+                for (const [id, model] of Object.entries(entries)) {
+                    this.add(table, model);
+                }
+            }
+            return this;
+        },
+        get(table, id) {
+            if (!table) {
+                return collection;
+            }
+            if (!id) {
+                return collection[table] ?? {};
+            }
+            return collection[table]?.[id];
+        },
+        getX(table, id) {
+            const result = this.get(table, id);
+            if (!result) {
+                throw new Error(`Model not found in ModelCollection for table ${table} with id ${id}`);
+            }
+            return result;
         }
     };
 }
+//# sourceMappingURL=model-collection.js.map

package/dist/esm/model-collection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-collection.js","sourceRoot":"","sources":["../../src/model-collection.ts"],"names":[],"mappings":"AAkCA,MAAM,UAAU,kBAAkB,CAAK,OAAiB,EAAE;IACzD,MAAM,UAAU,GAAa,EAAE,GAAG,IAAI,EAAE,CAAC;IAEzC,OAAO;QACN,GAAG,CAAkC,KAAY,EAAE,UAAkC;YACpF,IACC,CAAC,UAAU;gBACX,CAAC,CAAC,IAAI,IAAI,UAAU,CAAC;gBACrB,CAAC,UAAU,CAAC,EAAE;gBACd,OAAO,UAAU,CAAC,EAAE,KAAK,QAAQ,EAChC,CAAC;gBACF,OAAO,IAAI,CAAC;YACb,CAAC;YAED,IAAI,CAAC,CAAC,KAAK,IAAI,UAAU,CAAC,EAAE,CAAC;gBAC5B,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;YACxB,CAAC;YAED,UAAU,CAAC,KAAK,CAAE,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC;YAC/C,OAAO,IAAI,CAAC;QACb,CAAC;QAED,aAAa,CAAC,UAA+B;YAC5C,KAAK,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;gBACjE,KAAK,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAc,CAAC,EAAE,CAAC;oBAC1D,IAAI,CAAC,GAAG,CAAC,KAAY,EAAE,KAAY,CAAC,CAAC;gBACtC,CAAC;YACF,CAAC;YACD,OAAO,IAAI,CAAC;QACb,CAAC;QAED,GAAG,CAAkC,KAAa,EAAE,EAAW;YAC9D,IAAI,CAAC,KAAK,EAAE,CAAC;gBACZ,OAAO,UAAU,CAAC;YACnB,CAAC;YAED,IAAI,CAAC,EAAE,EAAE,CAAC;gBACT,OAAO,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAChC,CAAC;YAED,OAAO,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAChC,CAAC;QAED,IAAI,CAAkC,KAAY,EAAE,EAAU;YAC7D,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACnC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACb,MAAM,IAAI,KAAK,CAAC,gDAAgD,KAAK,YAAY,EAAE,EAAE,CAAC,CAAC;YACxF,CAAC;YACD,OAAO,MAAM,CAAC;QACf,CAAC;KACsB,CAAC;AAC1B,CAAC"}