@appweaver/core 1.1.4 → 1.1.6

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.4",
+  "version": "1.1.6",
   "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",
@@ -53,17 +53,17 @@
   },
   "devDependencies": {
     "@appweaver/common": "^1.0.0",
-    "@prisma/adapter-better-sqlite3": "7.8.0",
-    "@prisma/client": "7.8.0",
+    "@prisma/adapter-better-sqlite3": "7.9.1",
+    "@prisma/client": "7.9.1",
     "bullmq": "5.79.1",
     "cron": "4.4.0",
     "ioredis": "5.11.1",
     "nodemailer": "9.0.1",
-    "prisma": "7.8.0",
+    "prisma": "7.9.1",
     "rimraf": "6.1.3"
   },
   "peerDependencies": {
     "@appweaver/common": "^1.0.0",
-    "@prisma/client": "^7.3.0"
+    "@prisma/client": "^7.9.0"
   }
 }

package/prisma/client/internal/class.d.ts

@@ -19,7 +19,7 @@ export interface PrismaClientConstructor {
    */
     new <Options extends Prisma.PrismaClientOptions = Prisma.PrismaClientOptions, LogOpts extends LogOptions<Options> = LogOptions<Options>, OmitOpts extends Prisma.PrismaClientOptions['omit'] = Options extends {
         omit: infer U;
-    } ? U : Prisma.PrismaClientOptions['omit'], ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs>(options: Prisma.Subset<Options, Prisma.PrismaClientOptions>): PrismaClient<LogOpts, OmitOpts, ExtArgs>;
+    } ? U : Prisma.PrismaClientOptions['omit'], ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs>(options: Prisma.PrismaClientConstructorArgs<Options>): PrismaClient<LogOpts, OmitOpts, ExtArgs>;
 }
 /**
  * ## Prisma Client
@@ -36,7 +36,7 @@ export interface PrismaClientConstructor {
  *
  * Read more in our [docs](https://pris.ly/d/client).
  */
-export interface PrismaClient<in LogOpts extends Prisma.LogLevel = never, in out OmitOpts extends Prisma.PrismaClientOptions['omit'] = undefined, in out ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> {
+export interface PrismaClient<in LogOpts extends Prisma.LogLevel = never, in out OmitOpts extends Prisma.PrismaClientOptions['omit'] = Prisma.PrismaClientOptions['omit'], in out ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> {
     [K: symbol]: {
         types: Prisma.TypeMap<ExtArgs>['other'];
     };

package/prisma/client/internal/class.js

@@ -48,8 +48,8 @@ exports.getPrismaClientClass = getPrismaClientClass;
 const runtime = __importStar(require("@prisma/client/runtime/client"));
 const config = {
     "previewFeatures": [],
-    "clientVersion": "7.8.0",
-    "engineVersion": "3c6e192761c0362d496ed980de936e2f3cebcd3a",
+    "clientVersion": "7.9.1",
+    "engineVersion": "e922089b7d7502aff4249d5da3420f6fa55fc6ad",
     "activeProvider": "sqlite",
     "inlineSchema": "// This is your Prisma schema file,\n// learn more about it in the docs: https://pris.ly/d/prisma-schema\n\n// Generated by Appweaver. Please do not edit this file manually.\n\ndatasource db {\n  provider = \"sqlite\"\n}\n\ngenerator client {\n  provider = \"prisma-client\"\n  output   = \"./client\"\n}\n\nmodel ApiKey {\n  id          Int       @id @default(autoincrement())\n  key         String\n  keyHash     String    @unique\n  name        String?\n  description String?\n  enabled     Boolean   @default(true)\n  expiresAt   DateTime?\n\n  /// Audit columns\n  updatedAt DateTime @updatedAt\n  createdAt DateTime @default(now())\n}\n\nmodel OneTimeToken {\n  id        Int      @id @default(autoincrement())\n  tokenHash String\n  purpose   String\n  expiresAt DateTime\n  data      Json\n\n  /// Audit columns\n  updatedAt DateTime @updatedAt\n  createdAt DateTime @default(now())\n\n  @@index([tokenHash, purpose])\n}\n\nmodel Permission {\n  id   Int    @id @default(autoincrement())\n  name String @unique\n\n  /// Related columns\n  roles Role[] @relation(\"RolePermissionsPermission\")\n\n  /// Audit columns\n  updatedAt DateTime @updatedAt\n  createdAt DateTime @default(now())\n}\n\nmodel Role {\n  id   Int    @id @default(autoincrement())\n  name String @unique\n\n  /// Related columns\n  permissions Permission[] @relation(\"RolePermissionsPermission\")\n\n  /// Audit columns\n  updatedAt DateTime @updatedAt\n  createdAt DateTime @default(now())\n}\n\nmodel Seeder {\n  id         String   @id @default(uuid())\n  checksum   String\n  seederName String   @unique\n  startedAt  DateTime\n  finishedAt DateTime\n  logs       String?\n\n  @@map(\"_seeders\")\n}\n\nmodel File {\n  id            Int     @id @default(autoincrement())\n  name          String  @unique\n  originalName  String\n  mimeType      String\n  sizeBytes     Int\n  checksum      String\n  title         String?\n  description   String?\n  resourceField String?\n  resourceName  String?\n  resourceId    Int?\n\n  /// Audit columns\n  updatedAt DateTime @updatedAt\n  createdAt DateTime @default(now())\n\n  @@index([resourceField, resourceName, resourceId])\n}\n",
     "runtimeDataModel": {

package/prisma/client/internal/prismaNamespace.d.ts

@@ -46,8 +46,8 @@ export type PrismaVersion = {
     engine: string;
 };
 /**
- * Prisma Client JS version: 7.8.0
- * Query Engine version: 3c6e192761c0362d496ed980de936e2f3cebcd3a
+ * Prisma Client JS version: 7.9.1
+ * Query Engine version: e922089b7d7502aff4249d5da3420f6fa55fc6ad
  */
 export declare const prismaVersion: PrismaVersion;
 /**
@@ -105,6 +105,19 @@ export type Enumerable<T> = T | Array<T>;
 export type Subset<T, U> = {
     [key in keyof T]: key extends keyof U ? T[key] : never;
 };
+/**
+ * Resolved type of the argument passed to the `PrismaClient` constructor.
+ *
+ * When called without a narrower options type (the common case), this resolves
+ * to `PrismaClientOptions` directly, which produces a clear TypeScript error
+ * message (`not assignable to parameter of type 'PrismaClientOptions'`) when
+ * the argument is missing or incomplete. When the user supplies a narrower
+ * options type (e.g. via a literal), it falls back to `Subset` to keep
+ * filtering out unknown properties.
+ */
+export type PrismaClientConstructorArgs<Options extends PrismaClientOptions> = [
+    PrismaClientOptions
+] extends [Options] ? PrismaClientOptions : Subset<Options, PrismaClientOptions>;
 /**
  * SelectSubset
  * @desc From `T` pick properties that exist in `U`. Simple version of Intersection.
@@ -127,7 +140,7 @@ type Without<T, U> = {
  * XOR is needed to have a real mutually exclusive union type
  * https://stackoverflow.com/questions/42123407/does-typescript-support-mutually-exclusive-types
  */
-export type XOR<T, U> = T extends object ? U extends object ? (Without<T, U> & U) | (Without<U, T> & T) : U : T;
+export type XOR<T, U> = T extends object ? U extends object ? ((Without<T, U> & U) | (Without<U, T> & T)) & object : U : T;
 /**
  * Is T a Record?
  */
@@ -854,19 +867,10 @@ export type BatchPayload = {
 export declare const defineExtension: runtime.Types.Extensions.ExtendsHook<"define", TypeMapCb, runtime.Types.Extensions.DefaultArgs>;
 export type DefaultPrismaClient = PrismaClient;
 export type ErrorFormat = 'pretty' | 'colorless' | 'minimal';
-export type PrismaClientOptions = ({
-    /**
-     * Instance of a Driver Adapter, e.g., like one provided by `@prisma/adapter-pg`.
-     */
-    adapter: runtime.SqlDriverAdapterFactory;
-    accelerateUrl?: never;
-} | {
-    /**
-     * Prisma Accelerate URL allowing the client to connect through Accelerate instead of a direct database.
-     */
-    accelerateUrl: string;
-    adapter?: never;
-}) & {
+/**
+ * Options common to all variants of `PrismaClientOptions`, regardless of whether you connect to your database through a driver adapter or through Prisma Accelerate.
+ */
+export interface PrismaClientBaseOptions {
     /**
      * @default "colorless"
      */
@@ -952,7 +956,54 @@ export type PrismaClientOptions = ({
      * ```
      */
     queryPlanCacheMaxSize?: number;
-};
+}
+/**
+ * `PrismaClient` options for connecting to your database through Prisma Accelerate instead of a driver adapter.
+ *
+ * Learn more: https://pris.ly/d/accelerate
+ */
+export interface PrismaClientOptionsWithAccelerateUrl extends PrismaClientBaseOptions {
+    /**
+     * The Prisma Accelerate connection URL. Use this option to connect to your database through Prisma Accelerate instead of using a driver adapter to connect directly.
+     *
+     * Learn more: https://pris.ly/d/accelerate
+     */
+    accelerateUrl: string;
+    adapter?: never;
+}
+/**
+ * `PrismaClient` options for connecting to your database through a driver adapter. This is the common case in Prisma 7.
+ *
+ * Learn more: https://pris.ly/d/driver-adapters
+ */
+export interface PrismaClientOptionsWithAdapter extends PrismaClientBaseOptions {
+    /**
+     * A driver adapter that PrismaClient uses to connect to your database, such as the ones provided by `@prisma/adapter-pg`, `@prisma/adapter-libsql`, `@prisma/adapter-planetscale`, etc.
+     *
+     * A driver adapter is **required** unless you connect to your database through Prisma Accelerate (in which case use `accelerateUrl` instead).
+     *
+     * Learn more: https://pris.ly/d/driver-adapters
+     *
+     * @example
+     * ```ts
+     * import { PrismaPg } from '@prisma/adapter-pg'
+     * import { PrismaClient } from './generated/prisma/client'
+     *
+     * const adapter = new PrismaPg({ connectionString: process.env.DATABASE_URL })
+     * const prisma = new PrismaClient({ adapter })
+     * ```
+     */
+    adapter: runtime.SqlDriverAdapterFactory;
+    accelerateUrl?: never;
+}
+/**
+ * Options passed to the `PrismaClient` constructor.
+ *
+ * A driver adapter (or, alternatively, a Prisma Accelerate URL) is **required**. See {@link PrismaClientOptionsWithAdapter} and {@link PrismaClientOptionsWithAccelerateUrl} for the two variants. All other properties live in {@link PrismaClientBaseOptions} and are optional.
+ *
+ * Learn more about driver adapters: https://pris.ly/d/driver-adapters
+ */
+export type PrismaClientOptions = PrismaClientOptionsWithAccelerateUrl | PrismaClientOptionsWithAdapter;
 export type GlobalOmitConfig = {
     apiKey?: Prisma.ApiKeyOmit;
     oneTimeToken?: Prisma.OneTimeTokenOmit;

package/prisma/client/internal/prismaNamespace.js

@@ -72,12 +72,12 @@ exports.Sql = runtime.Sql;
 exports.Decimal = runtime.Decimal;
 exports.getExtensionContext = runtime.Extensions.getExtensionContext;
 /**
- * Prisma Client JS version: 7.8.0
- * Query Engine version: 3c6e192761c0362d496ed980de936e2f3cebcd3a
+ * Prisma Client JS version: 7.9.1
+ * Query Engine version: e922089b7d7502aff4249d5da3420f6fa55fc6ad
  */
 exports.prismaVersion = {
-    client: "7.8.0",
-    engine: "3c6e192761c0362d496ed980de936e2f3cebcd3a"
+    client: "7.9.1",
+    engine: "e922089b7d7502aff4249d5da3420f6fa55fc6ad"
 };
 exports.NullTypes = {
     DbNull: runtime.NullTypes.DbNull,

package/resource/resource-service.js

@@ -507,8 +507,10 @@ class ResourceService {
                 relationSchema?.type === 'array' ||
                 fileSchema?.type === 'array';
             const isArrayValue = (0, common_1.isArray)(value);
-            // Recursively map nested objects and handle arrays of objects
-            if ((0, common_1.isObject)(value) || (isArrayValue && (0, common_1.isObject)(value[0]))) {
+            // Recursively map nested objects and handle arrays of objects. Arrays of
+            // plain values are mapped below as inclusion, range or relation filters.
+            if (((0, common_1.isObject)(value) && !isArrayValue) ||
+                (isArrayValue && (0, common_1.isObject)(value[0]))) {
                 const resourceName = (0, common_1.extractResourceName)(relationSchema ?? fileSchema);
                 if (resourceName) {
                     queryFilter[key] = isArrayValue
@@ -685,8 +687,8 @@ class ResourceService {
             }
             // Map relation disconnects if unique keys are no longer present or the
             // new value is null. Delete relations if orphanRemoval is set to true.
-            // Also, do not create a disconnect action if the currentValue is already
-            // null.
+            // Relations that are not set on the current resource are left untouched,
+            // so no relation action is applied for them.
             if (action === 'update') {
                 const currentValue = currentData[key];
                 const removalMethod = config?.orphanRemoval ? 'delete' : 'disconnect';

package/server/create-server.js

@@ -88,10 +88,10 @@ function createServer() {
             constraints: common_1.config.SERVER_STATIC_ALLOWED_HOST
                 ? { host: common_1.config.SERVER_STATIC_ALLOWED_HOST }
                 : {},
-            setHeaders: (response) => {
+            setHeaders: (reply) => {
                 for (const header of common_1.config.SERVER_STATIC_RESPONSE_HEADERS) {
                     const [name, ...valueParts] = header.split(':');
-                    response.setHeader(name.trim(), valueParts.join(':').trim());
+                    reply.header(name.trim(), valueParts.join(':').trim());
                 }
             }
         });