@zintrust/core 0.4.41 → 0.4.42

package/src/orm/Model.js

@@ -48,17 +48,25 @@ const castAttribute = (config, key, value) => {
             return value;
     }
 };
+const assignAttributes = (config, attrs, newAttrs, options) => {
+    for (const [key, value] of Object.entries(newAttrs)) {
+        if (options.respectFillable && config.fillable.length > 0 && !config.fillable.includes(key)) {
+            continue;
+        }
+        const nextValue = options.applyMutators
+            ? (config.mutators?.[key]?.(value, attrs) ?? value)
+            : value;
+        attrs[key] = castAttribute(config, key, nextValue);
+    }
+};
 /**
  * Fill attributes based on fillable config
  */
 const fillAttributes = (config, attrs, newAttrs) => {
-    for (const [key, value] of Object.entries(newAttrs)) {
-        if (config.fillable.length === 0 || config.fillable.includes(key)) {
-            const mutator = config.mutators?.[key];
-            const nextValue = mutator ? mutator(value, attrs) : value;
-            attrs[key] = castAttribute(config, key, nextValue);
-        }
-    }
+    assignAttributes(config, attrs, newAttrs, { applyMutators: true, respectFillable: true });
+};
+const hydrateAttributes = (config, attrs, storedAttrs) => {
+    assignAttributes(config, attrs, storedAttrs, { applyMutators: false, respectFillable: false });
 };
 const applyAccessor = (config, key, attrs) => {
     const raw = attrs[key];
@@ -137,6 +145,47 @@ const createModelRelationships = (config) => {
         hasManyThrough: createHasManyThroughFactory(),
     };
 };
+const applySaveTimestamps = (config, attrs, isCreate) => {
+    if ((config.timestamps ?? false) === false)
+        return;
+    const now = new Date().toISOString();
+    attrs['updated_at'] = now;
+    if (isCreate) {
+        attrs['created_at'] = attrs['created_at'] ?? now;
+    }
+};
+const persistNewModel = async (config, db, attrs) => {
+    const builder = QueryBuilder.create(config.table, db, buildSoftDeleteOptions(config));
+    const result = await builder.insert({ ...attrs });
+    if (attrs['id'] === undefined && result.id !== null) {
+        attrs['id'] = result.id;
+    }
+};
+const collectDirtyValues = (config, attrs, dirtyFields) => {
+    const keys = new Set(dirtyFields);
+    if (config.timestamps ?? false) {
+        keys.add('updated_at');
+    }
+    return Object.fromEntries([...keys].filter((key) => key in attrs).map((key) => [key, attrs[key]]));
+};
+const persistExistingModel = async (config, db, attrs, dirtyFields) => {
+    const values = collectDirtyValues(config, attrs, dirtyFields);
+    if (Object.keys(values).length === 0)
+        return;
+    const primaryKey = attrs['id'];
+    if (primaryKey === undefined || primaryKey === null || primaryKey === '') {
+        throw ErrorFactory.createDatabaseError('Cannot update a persisted model without an id');
+    }
+    const builder = QueryBuilder.create(config.table, db, buildSoftDeleteOptions(config));
+    await builder.where('id', '=', primaryKey).update(values);
+};
+const persistModelState = async (config, db, attrs, isCreate, dirtyFields) => {
+    if (isCreate) {
+        await persistNewModel(config, db, attrs);
+        return;
+    }
+    await persistExistingModel(config, db, attrs, dirtyFields);
+};
 const performModelSave = async (model, config, attrs, getDb, context) => {
     const db = getDb();
     if (db === undefined)
@@ -144,10 +193,8 @@ const performModelSave = async (model, config, attrs, getDb, context) => {
     const isCreate = context.isExists === false;
     await runObservers(config, 'saving', model);
     await runObservers(config, isCreate ? 'creating' : 'updating', model);
-    if (config.timestamps ?? false) {
-        attrs['created_at'] = attrs['created_at'] ?? new Date().toISOString();
-        attrs['updated_at'] = new Date().toISOString();
-    }
+    applySaveTimestamps(config, attrs, isCreate);
+    await persistModelState(config, db, attrs, isCreate, context.getDirtyFields());
     context.setExists(true);
     context.updateOriginal({ ...attrs });
     context.clearDirty();
@@ -163,108 +210,130 @@ const performModelDelete = async (model, config, getDb, isExists) => {
     await runObservers(config, 'deleted', model);
     return true;
 };
+const createAttributeApi = (config, attrs, relations, context) => ({
+    fill: (newAttrs) => {
+        fillAttributes(config, attrs, newAttrs);
+        const original = context.getOriginal();
+        for (const key of Object.keys(newAttrs)) {
+            if (attrs[key] !== original[key]) {
+                context.dirtyFields.add(key);
+            }
+        }
+        return context.getModel();
+    },
+    setAttribute: (key, value) => {
+        const mutator = config.mutators?.[key];
+        const nextValue = mutator ? mutator(value, attrs) : value;
+        const castedValue = castAttribute(config, key, nextValue);
+        attrs[key] = castedValue;
+        const original = context.getOriginal();
+        if (original[key] === castedValue) {
+            context.dirtyFields.delete(key);
+        }
+        else {
+            context.dirtyFields.add(key);
+        }
+        return context.getModel();
+    },
+    getAttribute: (key) => {
+        if (relations[key] !== undefined)
+            return relations[key];
+        return applyAccessor(config, key, attrs);
+    },
+    getAttributes: () => ({ ...attrs }),
+    setRelation: (name, value) => {
+        relations[name] = value;
+    },
+    getRelation: (name) => relations[name],
+    toJSON: () => createModelJSON(config, attrs),
+    isDirty: (key) => {
+        if (key !== undefined)
+            return context.dirtyFields.has(key);
+        return context.dirtyFields.size > 0;
+    },
+    getTable: () => config.table,
+    exists: () => context.exists(),
+    setExists: (nextExists) => {
+        context.setExists(nextExists);
+    },
+});
+const createLifecycleApi = (config, attrs, getDb, context) => ({
+    save: async () => performModelSave(context.getModel(), config, attrs, getDb, {
+        isExists: context.exists(),
+        setExists: context.setExists,
+        updateOriginal: context.setOriginal,
+        clearDirty: () => context.dirtyFields.clear(),
+        getDirtyFields: () => [...context.dirtyFields],
+    }),
+    delete: async () => performModelDelete(context.getModel(), config, getDb, context.exists()),
+    restore: async () => {
+        if (config.softDeletes !== true || !context.exists())
+            return false;
+        await Promise.resolve();
+        const deleteAtColumn = config.deleteAtColumn ?? 'deleted_at';
+        attrs[deleteAtColumn] = null;
+        context.dirtyFields.add(deleteAtColumn);
+        return true;
+    },
+    forceDelete: async () => {
+        if (!context.exists())
+            return false;
+        const model = context.getModel();
+        await runObservers(config, 'deleting', model);
+        await runObservers(config, 'deleted', model);
+        return true;
+    },
+    isDeleted: () => {
+        if (config.softDeletes !== true)
+            return false;
+        const deleteAtColumn = config.deleteAtColumn ?? 'deleted_at';
+        const deletedValue = attrs[deleteAtColumn];
+        return deletedValue !== null && deletedValue !== undefined;
+    },
+});
 /**
  * Create a new model instance
  */
-// eslint-disable-next-line max-lines-per-function
-export const createModel = (config, attributes = {}) => {
+export const createModel = (config, attributes = {}, options) => {
     const connection = config.connection ?? DEFAULTS.CONNECTION;
     const getDb = () => useDatabase(undefined, connection);
     const attrs = {};
     const relations = {}; // Store eager loaded relations
     let original = {};
-    let isExists = false;
+    let isExists = options?.exists === true;
     const dirtyFields = new Set();
-    fillAttributes(config, attrs, attributes);
+    if (options?.hydrate === true) {
+        hydrateAttributes(config, attrs, attributes);
+    }
+    else {
+        fillAttributes(config, attrs, attributes);
+    }
     original = { ...attrs };
-    const model = {
-        fill: (newAttrs) => {
-            fillAttributes(config, attrs, newAttrs);
-            // Mark all filled fields as dirty
-            for (const key of Object.keys(newAttrs)) {
-                if (attrs[key] !== original[key]) {
-                    dirtyFields.add(key);
-                }
-            }
-            return model;
-        },
-        setAttribute: (key, value) => {
-            const mutator = config.mutators?.[key];
-            const nextValue = mutator ? mutator(value, attrs) : value;
-            const castedValue = castAttribute(config, key, nextValue);
-            attrs[key] = castedValue;
-            // Track dirty field
-            if (original[key] === castedValue) {
-                dirtyFields.delete(key);
-            }
-            else {
-                dirtyFields.add(key);
-            }
-            return model;
-        },
-        getAttribute: (key) => {
-            // Check relations first if it's a relation name
-            if (relations[key] !== undefined)
-                return relations[key];
-            return applyAccessor(config, key, attrs);
-        },
-        getAttributes: () => ({ ...attrs }),
-        // Relationship helpers
-        setRelation: (name, value) => {
-            relations[name] = value;
-        },
-        getRelation: (name) => relations[name],
-        // remove in production - use saveChanges pattern
-        save: async () => performModelSave(model, config, attrs, getDb, {
-            isExists,
-            setExists: (v) => {
-                isExists = v;
+    let modelApi = {};
+    modelApi = {
+        ...createAttributeApi(config, attrs, relations, {
+            dirtyFields,
+            getModel: () => modelApi,
+            getOriginal: () => original,
+            exists: () => isExists,
+            setExists: (exists) => {
+                isExists = exists;
+            },
+        }),
+        ...createLifecycleApi(config, attrs, getDb, {
+            dirtyFields,
+            getModel: () => modelApi,
+            exists: () => isExists,
+            setExists: (exists) => {
+                isExists = exists;
             },
-            updateOriginal: (v) => {
-                original = v;
+            setOriginal: (value) => {
+                original = value;
             },
-            clearDirty: () => dirtyFields.clear(),
         }),
-        // remove in production - use delete pattern
-        delete: async () => performModelDelete(model, config, getDb, isExists),
-        // eslint-disable-next-line @typescript-eslint/require-await
-        restore: async () => {
-            if (config.softDeletes !== true || !isExists)
-                return false;
-            const deleteAtColumn = config.deleteAtColumn ?? 'deleted_at';
-            attrs[deleteAtColumn] = null;
-            dirtyFields.add(deleteAtColumn);
-            return true;
-        },
-        forceDelete: async () => {
-            if (!isExists)
-                return false;
-            await runObservers(config, 'deleting', model);
-            await runObservers(config, 'deleted', model);
-            return true;
-        },
-        isDeleted: () => {
-            if (config.softDeletes !== true)
-                return false;
-            const deleteAtColumn = config.deleteAtColumn ?? 'deleted_at';
-            const deletedValue = attrs[deleteAtColumn];
-            return deletedValue !== null && deletedValue !== undefined;
-        },
-        toJSON: () => createModelJSON(config, attrs),
-        isDirty: (key) => {
-            if (key !== undefined) {
-                return dirtyFields.has(key);
-            }
-            return dirtyFields.size > 0;
-        },
-        getTable: () => config.table,
-        exists: () => isExists,
-        setExists: (exists) => {
-            isExists = exists;
-        },
     };
-    Object.assign(model, createModelRelationships(config));
-    return model;
+    Object.assign(modelApi, createModelRelationships(config));
+    return modelApi;
 };
 /**
  * Get a query builder for a table
@@ -288,9 +357,7 @@ export const find = async (config, id) => {
     const result = await builder.first();
     if (result === null)
         return null;
-    const model = createModel(config, result);
-    model.setExists(true);
-    return model;
+    return createModel(config, result, { hydrate: true, exists: true });
 };
 /**
  * Get all records for a model
@@ -299,11 +366,7 @@ export const all = async (config) => {
     const db = useDatabase(undefined, config.connection ?? DEFAULTS.CONNECTION);
     const builder = QueryBuilder.create(config.table, db, buildSoftDeleteOptions(config));
     const results = await builder.get();
-    return results.map((result) => {
-        const model = createModel(config, result);
-        model.setExists(true);
-        return model;
-    });
+    return results.map((result) => createModel(config, result, { hydrate: true, exists: true }));
 };
 const bindUnboundMethods = (model, methods) => {
     const bound = {};
@@ -333,8 +396,7 @@ const createModelBuilder = (cfg) => {
 };
 const createHydrator = (cfg, attach) => {
     return (attributes) => {
-        const model = createModel(cfg, attributes);
-        model.setExists(true);
+        const model = createModel(cfg, attributes, { hydrate: true, exists: true });
         return attach(model);
     };
 };
@@ -397,8 +459,30 @@ const hydrateAndLoadRelations = async (raw, eagerBuilder, hydrateModel) => {
     await loadEagerCounts(eagerBuilder, models);
     return models;
 };
+const hydrateOneAndLoadRelations = async (raw, eagerBuilder, hydrateModel) => {
+    if (!isRecord(raw))
+        return raw;
+    const model = hydrateModel(raw);
+    await loadEagerRelations(eagerBuilder, [model]);
+    await loadEagerCounts(eagerBuilder, [model]);
+    return model;
+};
 const wrapBuilderGetForEagerLoading = (builder, hydrateModel) => {
     const eagerBuilder = builder;
+    if (typeof eagerBuilder.first === 'function') {
+        const originalFirst = eagerBuilder.first.bind(builder);
+        eagerBuilder.first = async () => {
+            const raw = await originalFirst();
+            return hydrateOneAndLoadRelations(raw, eagerBuilder, hydrateModel);
+        };
+    }
+    if (typeof eagerBuilder.firstOrFail === 'function') {
+        const originalFirstOrFail = eagerBuilder.firstOrFail.bind(builder);
+        eagerBuilder.firstOrFail = async (message) => {
+            const raw = await originalFirstOrFail(message);
+            return hydrateOneAndLoadRelations(raw, eagerBuilder, hydrateModel);
+        };
+    }
     const originalGet = eagerBuilder.get.bind(builder);
     eagerBuilder.get = async () => {
         const raw = await originalGet();

package/src/orm/QueryBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../../../src/orm/QueryBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../../../src/orm/QueryBuilder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGtE,OAAO,KAAK,EAAE,SAAS,EAAY,MAAM,eAAe,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAGzC,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACpC,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;CAC7C;AAED,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,CAAC;AAE5D,MAAM,WAAW,mBAAmB;IAClC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB;AAED,MAAM,MAAM,mBAAmB,GAAG,CAAC,OAAO,EAAE,aAAa,KAAK,aAAa,CAAC;AAC5E,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;AAEvE,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;IAC5C,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC;IACvD,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC;IACnD,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,aAAa,CAAC;IAClG,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,aAAa,CAAC;IAC3E,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,aAAa,CAAC;IAC1E,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IACzC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;IAC1D,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;IAC7D,WAAW,IAAI,aAAa,CAAC;IAC7B,WAAW,IAAI,aAAa,CAAC;IAC7B,cAAc,IAAI,aAAa,CAAC;IAChC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/C,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,aAAa,CAAC;IACnD,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,aAAa,CAAC;IACnE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC;IACpC,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC;IACrC,eAAe,IAAI,WAAW,EAAE,CAAC;IACjC,gBAAgB,IAAI,MAAM,EAAE,CAAC;IAC7B,QAAQ,IAAI,MAAM,CAAC;IACnB,QAAQ,IAAI,MAAM,GAAG,SAAS,CAAC;IAC/B,SAAS,IAAI,MAAM,GAAG,SAAS,CAAC;IAChC,UAAU,IAAI;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IACxE,QAAQ,IAAI,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACjD,eAAe,IAAI,OAAO,CAAC;IAC3B,KAAK,IAAI,MAAM,CAAC;IAChB,aAAa,IAAI,OAAO,EAAE,CAAC;IAC3B,KAAK,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAC9B,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7C,GAAG,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IACvB,GAAG,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IACvB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAE/F,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,oBAAoB,GAAG,aAAa,CAAC;IAC7D,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,aAAa,CAAC;IAC3C,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1F,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7D,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAChG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvD,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB;AAi+CD;;;;;GAKG;AACH,eAAO,MAAM,YAAY;IACvB;;OAEG;sBAEU,MAAM,GAAG,SAAS,OACxB,SAAS,YACL,mBAAmB,GAC3B,aAAa;IA8BhB;;;;;OAKG;aACY,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;EAIxC,CAAC"}

package/src/orm/QueryBuilder.js

@@ -718,6 +718,16 @@ const setRelationsFromBuckets = (models, relation, localKey, buckets, isMany) =>
         }
     }
 };
+const setBelongsToRelations = (models, relation, foreignKey, relatedMap) => {
+    for (const model of models) {
+        const relatedId = model.getAttribute(foreignKey);
+        if (!isKeyValue(relatedId)) {
+            model.setRelation(relation, null);
+            continue;
+        }
+        model.setRelation(relation, relatedMap.get(relatedId) ?? null);
+    }
+};
 const buildParentToThroughIds = (throughResults, throughForeignKey, secondLocalKey) => {
     const parentToThroughIds = new Map();
     for (const throughItem of throughResults) {
@@ -902,6 +912,72 @@ const loadThroughRelation = async (models, relation, rel, constraint) => {
     setThroughRelations(models, relation, localKey, parentToThroughIds, relatedBuckets, isMany);
     return true;
 };
+const loadBelongsToRelation = async (models, relation, rel, constraint) => {
+    if (rel.type !== 'belongsTo')
+        return false;
+    const foreignKey = rel.foreignKey;
+    const ownerKey = rel.localKey;
+    if (!isNonEmptyString(foreignKey) || !isNonEmptyString(ownerKey))
+        return true;
+    const relatedModel = rel.related;
+    if (typeof relatedModel.query !== 'function')
+        return true;
+    const ids = getModelIds(models, foreignKey);
+    if (ids.length === 0) {
+        setBelongsToRelations(models, relation, foreignKey, new Map());
+        return true;
+    }
+    const relatedQuery = applyConstraint(relatedModel.query(), constraint);
+    const relatedResults = await relatedQuery.whereIn(ownerKey, ids).get();
+    const relatedMap = buildSingleMap(relatedResults, ownerKey);
+    setBelongsToRelations(models, relation, foreignKey, relatedMap);
+    return true;
+};
+const BELONGS_TO_MANY_PARENT_KEY_ALIAS = '__zin_belongs_to_many_parent_key';
+const resolveRelatedTableName = (relatedModel) => {
+    if (typeof relatedModel.getTable === 'function') {
+        const tableName = relatedModel.getTable();
+        return isNonEmptyString(tableName) ? tableName : null;
+    }
+    if (typeof relatedModel.query !== 'function')
+        return null;
+    const query = relatedModel.query();
+    const tableName = query.getTable();
+    return isNonEmptyString(tableName) ? tableName : null;
+};
+const loadBelongsToManyRelation = async (models, relation, rel, constraint) => {
+    if (rel.type !== 'belongsToMany')
+        return false;
+    const throughTable = rel.throughTable;
+    const foreignKey = rel.foreignKey;
+    const relatedKey = rel.relatedKey;
+    const localKey = rel.localKey;
+    if (!isNonEmptyString(throughTable) ||
+        !isNonEmptyString(foreignKey) ||
+        !isNonEmptyString(relatedKey) ||
+        !isNonEmptyString(localKey)) {
+        return true;
+    }
+    const relatedModel = rel.related;
+    if (typeof relatedModel.query !== 'function')
+        return true;
+    const ids = getModelIds(models, localKey);
+    if (ids.length === 0) {
+        setRelationsFromBuckets(models, relation, localKey, new Map(), true);
+        return true;
+    }
+    const relatedTable = resolveRelatedTableName(relatedModel);
+    if (!isNonEmptyString(relatedTable))
+        return true;
+    const relatedQuery = applyConstraint(relatedModel.query(), constraint)
+        .join(throughTable, `${relatedTable}.id = ${throughTable}.${relatedKey}`)
+        .selectAs(`${throughTable}.${foreignKey}`, BELONGS_TO_MANY_PARENT_KEY_ALIAS)
+        .whereIn(`${throughTable}.${foreignKey}`, ids);
+    const relatedResults = await relatedQuery.get();
+    const relatedBuckets = buildBucketMap(relatedResults, BELONGS_TO_MANY_PARENT_KEY_ALIAS);
+    setRelationsFromBuckets(models, relation, localKey, relatedBuckets, true);
+    return true;
+};
 const loadStandardRelation = async (models, relation, rel, constraint) => {
     const related = rel.related;
     if (related === null || related === undefined)
@@ -942,6 +1018,14 @@ const loadRelation = async (models, relation, constraint) => {
         await loadThroughRelation(models, relation, rel, constraint);
         return;
     }
+    if (type === 'belongsTo') {
+        await loadBelongsToRelation(models, relation, rel, constraint);
+        return;
+    }
+    if (type === 'belongsToMany') {
+        await loadBelongsToManyRelation(models, relation, rel, constraint);
+        return;
+    }
     await loadStandardRelation(models, relation, rel, constraint);
 };
 function attachRelationshipMethods(builder, state, db) {
@@ -988,7 +1072,7 @@ function attachWriteMethods(builder, state, db) {
         // For multi-row inserts, use the insertedRecords array
         return {
             id: result.lastInsertId ??
-                (items.length === 1 ? items[0]?.['id'] ?? null : null),
+                (items.length === 1 ? (items[0]?.['id'] ?? null) : null),
             affectedRows: result.rowCount,
             insertedRecords: items,
         };

package/src/runtime/WorkerAdapterImports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerAdapterImports.d.ts","sourceRoot":"","sources":["../../../src/runtime/WorkerAdapterImports.ts"],"names":[],"mappings":"AAkCA,eAAO,MAAM,oBAAoB;;;EAG/B,CAAC"}
+{"version":3,"file":"WorkerAdapterImports.d.ts","sourceRoot":"","sources":["../../../src/runtime/WorkerAdapterImports.ts"],"names":[],"mappings":"AA8BA,eAAO,MAAM,oBAAoB;;;EAG/B,CAAC"}

package/src/runtime/WorkerAdapterImports.js

@@ -20,12 +20,7 @@ const tryImportProjectRuntime = async () => {
 // via the @/ alias configured by the ZinTrust app templates.
 const tryImportOptional = async () => {
     await tryImportProjectRuntime();
-    try {
-        await import('../zintrust.plugins.wg.js');
-    }
-    catch {
-        // Log and swallow errors since these are optional imports that may not exist in all projects.
-    }
+    await import('./WorkerProjectPlugins.js');
 };
 const ready = await tryImportOptional();
 export const WorkerAdapterImports = Object.freeze({

package/src/runtime/WorkerProjectPlugins.d.ts

@@ -0,0 +1,6 @@
+import '../zintrust.plugins.wg';
+export declare const WorkerProjectPlugins: Readonly<{
+    loaded: true;
+}>;
+export default WorkerProjectPlugins;
+//# sourceMappingURL=WorkerProjectPlugins.d.ts.map

package/src/runtime/WorkerProjectPlugins.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkerProjectPlugins.d.ts","sourceRoot":"","sources":["../../../src/runtime/WorkerProjectPlugins.ts"],"names":[],"mappings":"AAAA,OAAO,uBAAuB,CAAC;AAE/B,eAAO,MAAM,oBAAoB;;EAE/B,CAAC;AAEH,eAAe,oBAAoB,CAAC"}

package/src/runtime/WorkerProjectPlugins.js

@@ -0,0 +1,5 @@
+import '../zintrust.plugins.wg.js';
+export const WorkerProjectPlugins = Object.freeze({
+    loaded: true,
+});
+export default WorkerProjectPlugins;

package/src/runtime/plugins/system-debugger-runtime.d.ts

@@ -0,0 +1,19 @@
+type DebuggerConfigApi = {
+    merge(overrides?: unknown): {
+        enabled?: boolean;
+        connection?: string;
+    };
+};
+type DebuggerStorageApi = {
+    resolveStorage(db: unknown): unknown;
+};
+export declare const isAvailable: () => boolean;
+export declare const DebuggerConfig: DebuggerConfigApi;
+export declare const DebuggerStorage: DebuggerStorageApi;
+export declare const registerDebuggerRoutes: (router: unknown, storage: unknown, options?: {
+    basePath?: string;
+    middleware?: ReadonlyArray<string>;
+}) => void;
+export declare const ensureSystemDebuggerRegistered: () => Promise<void>;
+export {};
+//# sourceMappingURL=system-debugger-runtime.d.ts.map

package/src/runtime/plugins/system-debugger-runtime.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"system-debugger-runtime.d.ts","sourceRoot":"","sources":["../../../../src/runtime/plugins/system-debugger-runtime.ts"],"names":[],"mappings":"AAAA,KAAK,iBAAiB,GAAG;IACvB,KAAK,CAAC,SAAS,CAAC,EAAE,OAAO,GAAG;QAAE,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACxE,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,cAAc,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC;CACtC,CAAC;AAgCF,eAAO,MAAM,WAAW,QAAO,OAA6C,CAAC;AAE7E,eAAO,MAAM,cAAc,EAAE,iBACmC,CAAC;AAEjE,eAAO,MAAM,eAAe,EAAE,kBACoC,CAAC;AAEnE,eAAO,MAAM,sBAAsB,WAlCvB,OAAO,WACN,OAAO,YACN;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;CAAE,KAChE,IAgCyE,CAAC;AAEjF,eAAO,MAAM,8BAA8B,QAAa,OAAO,CAAC,IAAI,CAGnE,CAAC"}

package/src/runtime/plugins/system-debugger-runtime.js

@@ -0,0 +1,19 @@
+const fallbackDebuggerConfig = Object.freeze({
+    merge: () => ({ enabled: false }),
+});
+const fallbackDebuggerStorage = Object.freeze({
+    resolveStorage: (_db) => undefined,
+});
+const fallbackRegisterDebuggerRoutes = (_router, _storage, _options) => undefined;
+const systemDebuggerModule = await import('../../../packages/system-debugger/src/index.js')
+    .then((module) => module)
+    .catch(() => undefined);
+export const isAvailable = () => systemDebuggerModule !== undefined;
+export const DebuggerConfig = systemDebuggerModule?.DebuggerConfig ?? fallbackDebuggerConfig;
+export const DebuggerStorage = systemDebuggerModule?.DebuggerStorage ?? fallbackDebuggerStorage;
+export const registerDebuggerRoutes = systemDebuggerModule?.registerDebuggerRoutes ?? fallbackRegisterDebuggerRoutes;
+export const ensureSystemDebuggerRegistered = async () => {
+    if (!isAvailable())
+        return;
+    await import('../../../packages/system-debugger/src/register.js').catch(() => undefined);
+};

package/src/runtime/plugins/system-debugger.d.ts

@@ -0,0 +1,2 @@
+export type {};
+//# sourceMappingURL=system-debugger.d.ts.map

package/src/runtime/plugins/system-debugger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"system-debugger.d.ts","sourceRoot":"","sources":["../../../../src/runtime/plugins/system-debugger.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,CAAC"}

package/src/runtime/plugins/system-debugger.js

@@ -0,0 +1,14 @@
+const tryImport = async (specifier) => {
+    try {
+        await import(specifier);
+        return true;
+    }
+    catch {
+        return false;
+    }
+};
+const importedPackagePlugin = await tryImport('@zintrust/system-debugger/plugin');
+if (!importedPackagePlugin) {
+    await import('../../../packages/system-debugger/src/plugin.js').catch(() => undefined);
+}
+export {};

package/src/security/JwtManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"JwtManager.d.ts","sourceRoot":"","sources":["../../../src/security/JwtManager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAGjE,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;AAEvD,MAAM,WAAW,UAAU;IACzB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,CAAC,EAAE,YAAY,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,WAAW;IAC1B,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACxD,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,UAAU,GAAG,MAAM,CAAC;IACxD,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC;IAC5D,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAAC;IAClC,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACjC,aAAa,IAAI,MAAM,CAAC;CACzB;AAQD,MAAM,WAAW,cAAc;IAC7B,MAAM,IAAI,WAAW,CAAC;IACtB,eAAe,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9E,MAAM,EAAE,CAAC,UAAU,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3C;AAyFD;;GAEG;AACH,eAAO,MAAM,UAAU,EAAE,cAKvB,CAAC"}
+{"version":3,"file":"JwtManager.d.ts","sourceRoot":"","sources":["../../../src/security/JwtManager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAGjE,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;AAEvD,MAAM,WAAW,UAAU;IACzB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,CAAC,EAAE,YAAY,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,WAAW;IAC1B,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACxD,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,UAAU,GAAG,MAAM,CAAC;IACxD,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC;IAC5D,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAAC;IAClC,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACjC,aAAa,IAAI,MAAM,CAAC;CACzB;AAQD,MAAM,WAAW,cAAc;IAC7B,MAAM,IAAI,WAAW,CAAC;IACtB,eAAe,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9E,MAAM,EAAE,CAAC,UAAU,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3C;AAoHD;;GAEG;AACH,eAAO,MAAM,UAAU,EAAE,cAKvB,CAAC"}