@appweaver/core 1.1.5 → 1.2.0

package/cache/eviction/lfu-eviction-index.js

@@ -14,6 +14,9 @@ class LfuEvictionIndex {
         this._entries.set(key, meta);
     }
     evictionCandidates(count, now, gracePeriod) {
+        if (count <= 0) {
+            return [];
+        }
         // Build a min-heap of size `count` to find the k entries with the lowest
         // frequency score (usedCount / age), avoiding a full sort.
         // Time complexity: O(n log k) where k = count (typically 1).

package/export/export-service.d.ts

@@ -1,4 +1,5 @@
 import { Readable } from 'node:stream';
+import { QuerySort } from '@appweaver/common';
 export type ExportStream = {
     stream: Readable;
     fileName: string;
@@ -11,9 +12,10 @@ export declare class ExportService {
      *
      * @param {string} modelName - The resource name for which to export data.
      * @param {Object} [filter={}] - The filter conditions to apply when retrieving the data. Default is an empty object.
-     * @param {string} [sort='-createdAt,id'] - The sorting criteria for the data. Default is `-createdAt, id`.
+     * @param {QuerySort} [sort='-createdAt,id'] - The sorting criteria for the data, given either as a comma-separated
+     * field list or as an object of field directions. Default is `-createdAt, id`.
      * @return {Promise<ExportStream>} A promise resolving to the export stream object, which includes the readable
      * stream, MIME type, and file name for the CSV.
      */
-    exportCsv(modelName: string, filter?: any, sort?: string): Promise<ExportStream>;
+    exportCsv(modelName: string, filter?: any, sort?: QuerySort): Promise<ExportStream>;
 }

package/export/export-service.js

@@ -13,7 +13,8 @@ class ExportService {
      *
      * @param {string} modelName - The resource name for which to export data.
      * @param {Object} [filter={}] - The filter conditions to apply when retrieving the data. Default is an empty object.
-     * @param {string} [sort='-createdAt,id'] - The sorting criteria for the data. Default is `-createdAt, id`.
+     * @param {QuerySort} [sort='-createdAt,id'] - The sorting criteria for the data, given either as a comma-separated
+     * field list or as an object of field directions. Default is `-createdAt, id`.
      * @return {Promise<ExportStream>} A promise resolving to the export stream object, which includes the readable
      * stream, MIME type, and file name for the CSV.
      */
@@ -100,29 +101,38 @@ class ExportService {
                         ? `${parentKey}.${exportField.headerName}`
                         : exportField.headerName;
                 }
-                if (exportField.mapValue) {
-                    const mappedValues = [];
-                    // Transform value items using mapValue configuration.
-                    const subItems = isArrayValue ? value : [value];
-                    for (const subItem of subItems) {
-                        if ((0, common_1.isFunction)(exportField.mapValue)) {
-                            try {
-                                mappedValues.push(exportField.mapValue(subItem));
+                const mapValue = exportField.mapValue;
+                if (mapValue) {
+                    // A scalar value has no properties to read the configured field name
+                    // off, so it is resolved against the exported record itself.
+                    if ((0, common_1.isString)(mapValue) && !relationSchema && !fileSchema) {
+                        value = item?.[mapValue];
+                    }
+                    else {
+                        const mappedValues = [];
+                        // Transform value items using mapValue configuration.
+                        const subItems = isArrayValue ? value : [value];
+                        for (const subItem of subItems) {
+                            if ((0, common_1.isFunction)(mapValue)) {
+                                try {
+                                    mappedValues.push(mapValue(subItem));
+                                }
+                                catch (e) {
+                                    mappedValues.push('');
+                                    common_1.logger.error(e, 'Export value mapping error.');
+                                }
                             }
-                            catch (e) {
-                                mappedValues.push('');
-                                common_1.logger.error(e, 'Export value mapping error.');
+                            else if ((0, common_1.isString)(mapValue)) {
+                                mappedValues.push(subItem?.[mapValue]);
                             }
                         }
-                        else if (!(0, common_1.isObject)(exportField.mapValue)) {
-                            mappedValues.push(subItem?.[exportField.mapValue]);
-                        }
+                        value = mappedValues.join(',');
                     }
-                    value = mappedValues.join(',');
                 }
             }
             // Recursively map relation and file fields if the value is an object.
-            if ((value && (0, common_1.isObject)(value)) || (isArrayValue && (0, common_1.isObject)(value[0]))) {
+            // Arrays of plain values are written as a single column below.
+            if ((0, common_1.isPlainObject)(value) || (isArrayValue && (0, common_1.isPlainObject)(value[0]))) {
                 const relationName = (0, common_1.extractResourceName)(relationSchema ?? fileSchema);
                 if (!relationName) {
                     continue;

package/factory/create-model.js

@@ -38,7 +38,7 @@ function createModel(config, override = false) {
     const createModel = omitOrPickScalars(resolveDefaultScalars(typebox_1.Type.Composite([scalarsSchema, virtualSchema]), config), config.create);
     const updateModel = omitOrPickScalars(resolveDefaultScalars(typebox_1.Type.Partial(typebox_1.Type.Composite([scalarsSchema, virtualSchema])), config), config.update);
     const { readOneModel, readManyModel } = buildOutputModels(baseReadModel, relationsModel, filesModel, config);
-    const { createOneModel, updateOneModel } = buildInputModels(createModel, updateModel, relationsModel, config);
+    const { createOneModel, updateOneModel, relationCreateModel, relationUpdateModel, relationInputModel } = buildInputModels(createModel, updateModel, relationsModel, idSchema, config);
     const { fileUploadModel, fileDeleteModel } = buildFileInputModels(config);
     const resourceModel = {
         name,
@@ -53,11 +53,14 @@ function createModel(config, override = false) {
         readManyModel,
         createOneModel,
         updateOneModel,
+        relationCreateModel,
+        relationUpdateModel,
+        relationInputModel,
         fileUploadModel,
         fileDeleteModel
     };
     for (const value of Object.values(resourceModel)) {
-        if ((0, common_1.isObject)(value)) {
+        if ((0, common_1.isPlainObject)(value)) {
             value[common_1.RESOURCE_NAME] = name;
         }
     }
@@ -185,7 +188,7 @@ function buildRelationSchema(relation) {
     const modelName = (0, common_1.capitalize)(relation.model);
     const modelRefName = `${modelName}Single`;
     let relationType = typebox_1.Type.Ref(modelRefName);
-    relationType = relation.array
+    relationType = (0, common_1.isRelationArray)(relation)
         ? typebox_1.Type.Array(relationType, (0, common_1.pickProperties)(relation, ['minItems']))
         : relationType;
     return relation.required === false
@@ -209,15 +212,36 @@ function buildOutputModels(readModel, relationsModel, filesModel, config) {
     ], { $id: `${config.name}Multiple` });
     return { readOneModel, readManyModel };
 }
-function buildInputModels(createModel, updateModel, relationsModel, config) {
+function buildInputModels(createModel, updateModel, relationsModel, idSchema, config) {
     const virtualConfig = config.virtual;
     const relationsConfig = config.relations;
     const adjustedCreateModel = resolveInputVirtualFields(removeHiddenFields(createModel), virtualConfig, 'create');
     const adjustedUpdateModel = resolveInputVirtualFields(removeHiddenFields(updateModel), virtualConfig, 'update');
+    // Data models accepted when this model is written inline through another
+    // model's relation input. Relations and files are excluded, so nested
+    // writes stay limited to the model's own columns, enforced by the service.
+    const relationCreateModel = typebox_1.Type.Composite([adjustedCreateModel], {
+        $id: `${config.name}RelationCreate`
+    });
+    const relationUpdateModel = typebox_1.Type.Composite([idSchema, adjustedUpdateModel], {
+        $id: `${config.name}RelationUpdate`
+    });
+    // Wire model for nested relation writes, holding the id together with the
+    // fields of both shapes above. It stays permissive because the server
+    // strips properties the matched schema does not declare, so a union of the
+    // narrower shapes would drop the fields of the ones it rejects.
+    const relationInputModel = typebox_1.Type.Object({
+        id: typebox_1.Type.Optional(idSchema.properties.id),
+        ...optionalProperties(adjustedCreateModel),
+        ...optionalProperties(adjustedUpdateModel)
+    }, { $id: `${config.name}RelationInput` });
     if (Object.keys(relationsConfig ?? {}).length === 0) {
         return {
             createOneModel: adjustedCreateModel,
-            updateOneModel: adjustedUpdateModel
+            updateOneModel: adjustedUpdateModel,
+            relationCreateModel,
+            relationUpdateModel,
+            relationInputModel
         };
     }
     const relationCreateInputs = relationInputProperties(relationsModel, relationsConfig, 'create');
@@ -226,7 +250,20 @@ function buildInputModels(createModel, updateModel, relationsModel, config) {
     });
     const relationUpdateInputs = relationInputProperties(relationsModel, relationsConfig, 'update');
     const updateOneModel = typebox_1.Type.Composite([adjustedUpdateModel, typebox_1.Type.Partial(relationUpdateInputs)], { $id: `${config.name}Update` });
-    return { createOneModel, updateOneModel };
+    return {
+        createOneModel,
+        updateOneModel,
+        relationCreateModel,
+        relationUpdateModel,
+        relationInputModel
+    };
+}
+function optionalProperties(schema) {
+    const properties = {};
+    for (const [name, field] of Object.entries(schema.properties)) {
+        properties[name] = typebox_1.Type.Optional(field);
+    }
+    return properties;
 }
 function buildFileInputModels(config) {
     const fileConfig = config.files ?? {};
@@ -249,38 +286,34 @@ function buildFileInputModels(config) {
 function relationInputProperties(object, relationConfig, inputType) {
     const relationInputType = (key) => {
         const { type, ...options } = object.properties[key];
-        const uniqueIdObject = resource_1.Id;
-        const uniqueIdType = resource_1.Id.properties.id;
-        let fullInputType = undefined;
         const config = relationConfig?.[key];
-        if (config) {
-            if (shouldSkipInputField(config.input?.type, inputType)) {
-                return undefined;
-            }
-            if (config.input?.fullModel) {
-                fullInputType = typebox_1.Type.Ref(`${config.model}Create`);
-            }
+        if (config && shouldSkipInputField(config.input?.type, inputType)) {
+            return undefined;
         }
-        const isArray = type === 'array';
-        const isOptional = config?.required === false;
-        const idObjectSchema = isArray
-            ? typebox_1.Type.Array(uniqueIdObject, options)
-            : uniqueIdObject;
-        const idTypeSchema = isArray
-            ? typebox_1.Type.Array(uniqueIdType, options)
-            : uniqueIdType;
-        const inputTypeSchemas = [
-            isOptional ? (0, common_1.Nullable)(idObjectSchema) : idObjectSchema,
-            isOptional ? (0, common_1.Nullable)(idTypeSchema) : idTypeSchema
+        // Inline updates carry the related record id, so only parent update
+        // requests accept them
+        const acceptsInlineWrite = config?.input?.allowCreate ||
+            (config?.input?.allowUpdate && inputType === 'update');
+        // Existing records are connected by an id object or a bare id value.
+        // Relations accepting inline writes take the permissive input model
+        // instead, which also covers a lone id. Only one object schema may join
+        // the union, since the server strips undeclared properties.
+        const itemSchemas = [
+            acceptsInlineWrite ? typebox_1.Type.Ref(`${config.model}RelationInput`) : resource_1.Id,
+            resource_1.Id.properties.id
         ];
-        if (fullInputType) {
-            const fullInputTypeSchema = isArray
-                ? typebox_1.Type.Array(fullInputType, options)
-                : fullInputType;
-            inputTypeSchemas.push(isOptional ? (0, common_1.Nullable)(fullInputTypeSchema) : fullInputTypeSchema);
+        const isArrayType = type === 'array';
+        const isOptional = config?.required === false;
+        let inputSchema;
+        if (isArrayType) {
+            // One array of union items, so connect, create, and update inputs mix
+            const arraySchema = typebox_1.Type.Array(typebox_1.Type.Union(itemSchemas), options);
+            inputSchema = isOptional ? (0, common_1.Nullable)(arraySchema) : arraySchema;
         }
-        const unionSchema = typebox_1.Type.Union(inputTypeSchemas);
-        return isOptional ? typebox_1.Type.Optional(unionSchema) : unionSchema;
+        else {
+            inputSchema = typebox_1.Type.Union(itemSchemas.map((itemSchema) => isOptional ? (0, common_1.Nullable)(itemSchema) : itemSchema));
+        }
+        return isOptional ? typebox_1.Type.Optional(inputSchema) : inputSchema;
     };
     return typebox_1.Type.Object({
         ...Object.keys(object.properties).reduce((acc, key) => {
@@ -313,15 +346,18 @@ function relationOutputProperties(object, relationConfig, outputType) {
         }
         return typebox_1.Type.Integer({ minimum: 0 });
     };
+    // Relation, file, and count fields are optional in the output models: their
+    // presence depends on the inclusion depth of the query. The same schema
+    // describes a record nested in another model's output, without relations.
     return typebox_1.Type.Object({
         ...Object.keys(object.properties).reduce((acc, key) => {
             const type = relationOutputType(key);
             if (type) {
-                acc[key] = type;
+                acc[key] = typebox_1.Type.Optional(type);
             }
             const countType = relationCountType(key);
             if (countType) {
-                acc[(0, common_1.countFieldName)(key)] = countType;
+                acc[(0, common_1.countFieldName)(key)] = typebox_1.Type.Optional(countType);
             }
             return acc;
         }, {})

package/factory/create-service.js

@@ -58,7 +58,7 @@ function createService(config, override = false) {
             if ((0, common_1.isFunction)(config.textSearch)) {
                 return config.textSearch(searchText);
             }
-            if ((0, common_1.isObject)(config.textSearch)) {
+            if ((0, common_1.isPlainObject)(config.textSearch)) {
                 return config.textSearch;
             }
             return super.textSearchQuery(searchText);

package/memory/in-memory.js

@@ -53,7 +53,11 @@ class InMemory extends common_1.Memory {
         // is below the configured value
         if (this._maxSizeBytes) {
             while (this._approximatedSize > this._maxSizeBytes) {
-                await this.removeValue(this._storage.keys()[0]);
+                const oldestKey = this._storage.keys().next().value;
+                if (oldestKey === undefined) {
+                    break;
+                }
+                await this.removeValue(oldestKey);
             }
         }
         return true;
@@ -62,12 +66,12 @@ class InMemory extends common_1.Memory {
         return this._storage.has(key);
     }
     async removeValue(key) {
-        const jsonValue = await this.getValue(key);
-        if (!jsonValue) {
+        const entry = this._storage.get(key);
+        if (!entry) {
             return false;
         }
         const deleted = this._storage.delete(key);
-        this._approximatedSize -= Buffer.byteLength(jsonValue, 'utf8');
+        this._approximatedSize -= Buffer.byteLength(entry.value, 'utf8');
         if (this._approximatedSize < 0) {
             this._approximatedSize = 0;
         }
@@ -146,14 +150,14 @@ class InMemory extends common_1.Memory {
     async cleanupExpired() {
         const now = Date.now();
         // Clean up expired storage entries
-        for (const key in this._storage.keys()) {
+        for (const key of Array.from(this._storage.keys())) {
             const entry = this._storage.get(key);
             if (entry && entry.expiresAt && entry.expiresAt < now) {
                 await this.removeValue(key);
             }
         }
         // Clean up expired locks
-        for (const key in this._locks.keys()) {
+        for (const key of Array.from(this._locks.keys())) {
             const lock = this._locks.get(key);
             if (lock && lock.expiresAt < now) {
                 this._locks.delete(key);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appweaver/core",
-  "version": "1.1.5",
+  "version": "1.2.0",
   "description": "Appweaver - the backend framework for AI-first development (@core)",
   "author": "Luka Matosevic",
   "license": "MIT",
@@ -38,9 +38,9 @@
     "@fastify/oauth2": "8.2.0",
     "@fastify/rate-limit": "11.0.0",
     "@fastify/request-context": "7.0.0",
-    "@fastify/static": "9.1.3",
+    "@fastify/static": "10.1.2",
     "@fastify/swagger": "9.7.0",
-    "@fastify/swagger-ui": "6.0.0",
+    "@fastify/swagger-ui": "6.1.1",
     "@fastify/type-provider-typebox": "6.1.0",
     "@sinclair/typebox": "0.34.49",
     "bcrypt": "6.0.0",

package/resource/index.d.ts

@@ -2,3 +2,4 @@ export * from './resource-loader';
 export * from './resource-routes';
 export * from './resource-schema';
 export * from './resource-service';
+export * from './schemas';

package/resource/index.js

@@ -18,3 +18,4 @@ __exportStar(require("./resource-loader"), exports);
 __exportStar(require("./resource-routes"), exports);
 __exportStar(require("./resource-schema"), exports);
 __exportStar(require("./resource-service"), exports);
+__exportStar(require("./schemas"), exports);

package/resource/resource-schema.d.ts

@@ -11,19 +11,14 @@ export declare const AuditData: import("@sinclair/typebox").TObject<{
     createdById: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnsafe<number | null>>;
 }>;
 export declare const QueryRequestData: import("@sinclair/typebox").TObject<{
-    filter: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
     page: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
     size: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-    sort: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
 }>;
 export declare const QueryResponseData: import("@sinclair/typebox").TObject<{
     resultCount: import("@sinclair/typebox").TNumber;
     totalCount: import("@sinclair/typebox").TNumber;
 }>;
 export declare const AggregateRequestData: import("@sinclair/typebox").TObject<{
-    filter: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
-    select: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
-    dateField: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     from: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnsafe<Date>>;
     to: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnsafe<Date>>;
     step: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TInteger>;

package/resource/resource-schema.js

@@ -8,6 +8,7 @@ const context_1 = require("../context");
 const security_1 = require("../security");
 const errors_1 = require("../errors");
 const utils_1 = require("../utils");
+const schemas_1 = require("./schemas");
 exports.Id = typebox_1.Type.Object({
     id: typebox_1.Type.Integer({ minimum: 1 })
 });
@@ -19,20 +20,19 @@ exports.AuditData = typebox_1.Type.Object({
     createdAt: (0, common_1.StringDate)(),
     createdById: (0, common_1.Nullable)(typebox_1.Type.Integer({ minimum: 1, example: 1 }))
 });
+// The sort property is declared per model instead, since its object form
+// references the sortable fields of the queried resource
 exports.QueryRequestData = typebox_1.Type.Object({
-    filter: typebox_1.Type.Optional((0, common_1.AnyJson)({ example: { field: 'value' } })),
     page: typebox_1.Type.Optional(typebox_1.Type.Number({ minimum: 1, example: 1 })),
-    size: typebox_1.Type.Optional(typebox_1.Type.Number({ minimum: 0, maximum: 1000, example: 50 })),
-    sort: typebox_1.Type.Optional(typebox_1.Type.String({ example: '-createdAt,id' }))
+    size: typebox_1.Type.Optional(typebox_1.Type.Number({ minimum: 0, maximum: 1000, example: 50 }))
 });
 exports.QueryResponseData = typebox_1.Type.Object({
     resultCount: typebox_1.Type.Number({ example: 10 }),
     totalCount: typebox_1.Type.Number({ example: 100 })
 });
+// The select and dateField properties are declared per model instead, since
+// they reference the aggregatable fields of the aggregated resource
 exports.AggregateRequestData = typebox_1.Type.Object({
-    filter: typebox_1.Type.Optional((0, common_1.AnyJson)({ example: { field: 'value' } })),
-    select: typebox_1.Type.Optional((0, common_1.AnyJson)({ example: { field: 'value' } })),
-    dateField: typebox_1.Type.Optional(typebox_1.Type.String({ example: 'createdAt' })),
     from: typebox_1.Type.Optional((0, common_1.StringDate)()),
     to: typebox_1.Type.Optional((0, common_1.StringDate)()),
     step: typebox_1.Type.Optional(typebox_1.Type.Integer({ minimum: 1, example: 3600 })),
@@ -43,7 +43,18 @@ function createSchema(name, routeAuthTypes, routeRecaptcha) {
     const resourceModel = (0, context_1.injectModel)(name);
     const resourceName = (0, common_1.camelToSnakeCase)(name, ' ');
     const tag = (0, common_1.plural)(name);
-    const queryRequest = typebox_1.Type.Composite([exports.QueryRequestData], {
+    // Register the recursive query filter and sort schemas of all loaded models,
+    // referenced by the query, aggregate, and export request bodies
+    (0, schemas_1.registerQueryFilterSchemas)();
+    (0, schemas_1.registerQuerySortSchemas)();
+    (0, schemas_1.registerAggregateSelectSchemas)();
+    const filterData = typebox_1.Type.Object({
+        filter: typebox_1.Type.Optional(typebox_1.Type.Ref((0, schemas_1.queryFilterName)(name)))
+    });
+    const sortData = typebox_1.Type.Object({
+        sort: (0, schemas_1.querySortSchema)(name)
+    });
+    const queryRequest = typebox_1.Type.Composite([filterData, sortData, exports.QueryRequestData], {
         $id: `${name}QueryRequest`
     });
     const queryResponse = typebox_1.Type.Composite([
@@ -52,13 +63,17 @@ function createSchema(name, routeAuthTypes, routeRecaptcha) {
             items: typebox_1.Type.Array(resourceModel.readManyModel)
         })
     ], { $id: `${name}QueryResponse` });
-    const aggregateRequest = typebox_1.Type.Composite([exports.AggregateRequestData], {
-        $id: `${name}AggregateRequest`
+    const selectData = typebox_1.Type.Object({
+        select: typebox_1.Type.Ref((0, schemas_1.aggregateSelectName)(name)),
+        dateField: (0, schemas_1.aggregateDateFieldSchema)(resourceModel)
     });
+    const aggregateRequest = typebox_1.Type.Composite([filterData, selectData, exports.AggregateRequestData], { $id: `${name}AggregateRequest` });
     const aggregateResponse = typebox_1.Type.Composite([exports.AggregateResponseData], {
         $id: `${name}AggregateResponse`
     });
-    const exportRequest = typebox_1.Type.Composite([typebox_1.Type.Pick(exports.QueryRequestData, ['filter', 'sort'])], { $id: `${name}ExportRequest` });
+    const exportRequest = typebox_1.Type.Composite([filterData, sortData], {
+        $id: `${name}ExportRequest`
+    });
     const resourceSchemaConfig = {
         findSchema: {
             tags: [tag],