npm - @baasix/baasix - Versions diffs - 0.1.51 → 0.1.53 - Mend

@baasix/baasix 0.1.51 → 0.1.53

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

package/README.md +7 -3
package/dist/README.md +7 -3
package/dist/app.js +6 -6
package/dist/app.js.map +1 -1
package/dist/services/CacheService.js +16 -16
package/dist/services/CacheService.js.map +1 -1
package/dist/services/ItemsService.d.ts.map +1 -1
package/dist/services/ItemsService.js +18 -12
package/dist/services/ItemsService.js.map +1 -1
package/dist/services/PermissionService.d.ts.map +1 -1
package/dist/services/PermissionService.js +16 -5
package/dist/services/PermissionService.js.map +1 -1
package/dist/utils/cache.d.ts +5 -0
package/dist/utils/cache.d.ts.map +1 -1
package/dist/utils/cache.js +65 -13
package/dist/utils/cache.js.map +1 -1
package/dist/utils/fieldExpansion.d.ts.map +1 -1
package/dist/utils/fieldExpansion.js +27 -19
package/dist/utils/fieldExpansion.js.map +1 -1
package/package.json +1 -1

package/dist/utils/cache.js CHANGED Viewed

@@ -35,10 +35,10 @@ const setIsRedisEnabled = (val) => { globalThis.__baasix_isRedisEnabled = val; }
 const getL1Cache = () => globalThis.__baasix_l1Cache;
 const getLastSyncedVersion = () => globalThis.__baasix_lastSyncedVersion;
 const setLastSyncedVersion = (val) => { globalThis.__baasix_lastSyncedVersion = val; };
-const CACHE_SIZE_GB = parseFloat(env.get("CACHE_SIZE_GB") || "1");
-const CACHE_SIZE_BYTES = CACHE_SIZE_GB * 1024 * 1024 * 1024;
+const SYSTEM_CACHE_SIZE_GB = parseFloat(env.get("SYSTEM_CACHE_SIZE_GB") || "1");
+const CACHE_SIZE_BYTES = SYSTEM_CACHE_SIZE_GB * 1024 * 1024 * 1024;
 // Sync interval for L1 ← L2 synchronization (default: 5 seconds)
-const CACHE_SYNC_INTERVAL_MS = (parseInt(env.get("CACHE_SYNC_INTERVAL") || "5")) * 1000;
+const CACHE_SYNC_INTERVAL_MS = (parseInt(env.get("SYSTEM_CACHE_SYNC_INTERVAL") || "5")) * 1000;
 /**
  * Keys that use hybrid L1+L2 caching
  * These are read from L1 (memory) and synced from L2 (Redis)
@@ -73,17 +73,21 @@ async function syncFromRedis() {
         if (currentVersion === getLastSyncedVersion()) {
             return;
         }
-        // Fetch all hybrid keys from Redis
+        // Fetch all hybrid keys from Redis using batch reads (mget)
         const hybridPatterns = ["permissions:*", "settings:*", "auth:*"];
         for (const pattern of hybridPatterns) {
             const keys = await redisClient.keys(pattern);
-            for (const key of keys) {
-                const value = await redisClient.get(key);
-                if (value) {
-                    l1Cache.set(key, {
-                        value: value, // Already JSON string from Redis
-                        expiry: -1, // Hybrid keys have infinite TTL
-                    });
+            if (keys.length > 0) {
+                // Use mget for batch read — single round-trip instead of N sequential gets
+                const values = await redisClient.mget(...keys);
+                for (let i = 0; i < keys.length; i++) {
+                    const value = values[i];
+                    if (value) {
+                        l1Cache.set(keys[i], {
+                            value: value, // Already JSON string from Redis
+                            expiry: -1, // Hybrid keys have infinite TTL
+                        });
+                    }
                 }
             }
         }
@@ -212,8 +216,8 @@ export function initializeCache(options) {
     }
     const defaultTTL = Math.floor(options.ttl / 1000); // Convert ms to seconds
     const uri = options.uri;
-    // Check if we should use Redis based on CACHE_ADAPTER
-    const cacheAdapter = env.get("CACHE_ADAPTER") || "memory";
+    // Check if we should use Redis based on SYSTEM_CACHE_ADAPTER
+    const cacheAdapter = env.get("SYSTEM_CACHE_ADAPTER") || "memory";
     const shouldUseRedis = (cacheAdapter === "redis" || cacheAdapter === "upstash") &&
         uri && uri.toLowerCase() !== "null" && uri !== "undefined" && uri !== "";
     if (shouldUseRedis) {
@@ -312,6 +316,54 @@ export function initializeCache(options) {
                 l1Cache.set(key, { value: jsonValue, expiry });
             }
         },
+        /**
+         * SET BATCH: Write multiple keys in a single Redis pipeline round-trip.
+         * For hybrid keys, writes to both L1 and L2.
+         * Only increments cache version once for all hybrid key changes.
+         */
+        setBatch: async (entries) => {
+            if (entries.length === 0)
+                return;
+            await ensureCacheSize();
+            const l1Cache = getL1Cache();
+            const redisClient = getRedisClient();
+            let hasHybridKey = false;
+            // Pre-serialize all entries
+            const prepared = entries.map(e => ({
+                key: e.key,
+                json: JSON.stringify(e.value),
+                ttl: e.expiresIn ?? defaultTTL,
+                hybrid: isHybridKey(e.key),
+            }));
+            // Write to L1 (hybrid keys always, non-hybrid only when no Redis)
+            for (const { key, json, ttl, hybrid } of prepared) {
+                if (hybrid) {
+                    hasHybridKey = true;
+                    l1Cache.set(key, { value: json, expiry: -1 });
+                }
+                else if (!redisClient) {
+                    const expiry = (ttl === -1 || ttl === 0) ? -1 : Date.now() + ttl * 1000;
+                    l1Cache.set(key, { value: json, expiry });
+                }
+            }
+            // Batch write to Redis using pipeline (single network round-trip)
+            if (redisClient) {
+                const pipeline = redisClient.pipeline();
+                for (const { key, json, ttl, hybrid } of prepared) {
+                    if (hybrid || ttl === -1 || ttl === 0) {
+                        pipeline.set(key, json);
+                    }
+                    else {
+                        pipeline.set(key, json, "EX", ttl);
+                    }
+                }
+                await pipeline.exec();
+                // Single version increment for all hybrid key changes
+                if (hasHybridKey) {
+                    await incrementCacheVersion();
+                }
+            }
+        },
         /**
          * DELETE: For hybrid keys, delete from both L1 and L2
          */

package/dist/utils/cache.js.map CHANGED Viewed

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

package/dist/utils/fieldExpansion.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fieldExpansion.d.ts","sourceRoot":"","sources":["../../baasix/utils/fieldExpansion.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AAEH,qBAAa,kBAAkB;IAC7B;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,cAAc;IAmB7B;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,EAAE;IA8BvE;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;~~IA2ElC~~;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAOpC;;OAEG;IACH,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO;CAWvE;AAED,eAAe,kBAAkB,CAAC"}
1	+ {"version":3,"file":"fieldExpansion.d.ts","sourceRoot":"","sources":["../../baasix/utils/fieldExpansion.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AAEH,qBAAa,kBAAkB;IAC7B;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,cAAc;IAmB7B;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,EAAE;IA8BvE;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAkFlC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAOpC;;OAEG;IACH,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO;CAWvE;AAED,eAAe,kBAAkB,CAAC"}

package/dist/utils/fieldExpansion.js CHANGED Viewed

@@ -90,30 +90,38 @@ export class FieldExpansionUtil {
                 else {
                     // Check if it's a field or association
                     const tableColumns = this.getColumnNames(currentCollection);
-                    if (tableColumns.includes(part)) {
-                        // It's a field
+                    const associations = relationBuilder.getAssociations(currentCollection);
+                    const association = associations?.[part];
+                    // When there are remaining parts to traverse (not the last part),
+                    // prioritize association lookup over column lookup.
+                    // This fixes cases where a name is both a column (FK) and an association,
+                    // e.g., "question" in exam_attempt_question is both a FK column and
+                    // a relation — "exam_attempt_question.question.*" should follow the relation.
+                    const hasRemainingParts = i < parts.length - 1;
+                    if (hasRemainingParts && association) {
+                        // Treat as association — navigate into it
+                        currentPrefix += part + '.';
+                        currentCollection = association.model;
+                    }
+                    else if (tableColumns.includes(part)) {
+                        // It's a field (or last part matching a column)
                         expandedFields.push(currentPrefix + part);
                         break;
                     }
-                    else {
-                        // Check if it's an association
-                        const associations = relationBuilder.getAssociations(currentCollection);
-                        const association = associations?.[part];
-                        if (association) {
-                            currentPrefix += part + '.';
-                            currentCollection = association.model;
-                            if (i === parts.length - 1) {
-                                // Last part is an association - include all its fields
-                                const assocColumns = this.getColumnNames(currentCollection);
-                                expandedFields.push(...assocColumns.map((attr) => `${currentPrefix}${attr}`));
-                            }
-                        }
-                        else {
-                            // Not a field or association - add as-is (might be computed field)
-                            expandedFields.push(currentPrefix + part);
-                            break;
+                    else if (association) {
+                        currentPrefix += part + '.';
+                        currentCollection = association.model;
+                        if (i === parts.length - 1) {
+                            // Last part is an association - include all its fields
+                            const assocColumns = this.getColumnNames(currentCollection);
+                            expandedFields.push(...assocColumns.map((attr) => `${currentPrefix}${attr}`));
                         }
                     }
+                    else {
+                        // Not a field or association - add as-is (might be computed field)
+                        expandedFields.push(currentPrefix + part);
+                        break;
+                    }
                 }
             }
         }

package/dist/utils/fieldExpansion.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fieldExpansion.js","sourceRoot":"","sources":["../../baasix/utils/fieldExpansion.ts"],"names":[],"mappings":"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~~oBAE5D~~,~~IAAI~~,YAAY,~~CAAC~~,~~QAAQ~~,CAAC,~~IAAI~~,CAAC,~~EAAE~~,CAAC~~;wBAChC~~,~~eAAe~~;~~wBACf~~,~~cAAc~~,~~CAAC~~,~~IAAI~~,~~CAAC~~,~~aAAa~~,~~GAAG~~,IAAI,CAAC,CAAC;~~wBAC1C~~,~~MAAM~~;~~oBACR~~,~~CAAC~~;~~yBAAM~~,~~CAAC~~;~~wBACN,+BAA+B~~;~~wBAC/B~~,MAAM,~~YAAY~~,GAAG,~~eAAe~~,CAAC,~~eAAe~~,CAAC,iBAAiB,CAAC,CAAC;~~wBACxE~~,~~MAAM~~,WAAW,~~GAAG~~,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC;~~wBAEzC~~,IAAI,WAAW,EAAE,CAAC;~~4BAChB~~,aAAa,IAAI,IAAI,GAAG,GAAG,CAAC;~~4BAC5B~~,iBAAiB,GAAG,WAAW,CAAC,KAAK,CAAC;~~4BAEtC~~,IAAI,CAAC,KAAK,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;~~gCAC3B~~,uDAAuD;~~gCACvD~~,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;~~gCAC5D~~,cAAc,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,aAAa,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;~~4BAChF~~,CAAC;~~wBACH~~,CAAC;~~6BAAM~~,CAAC;~~4BACN~~,mEAAmE;~~4BACnE~~,cAAc,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC;~~4BAC1C~~,MAAM;~~wBACR~~,CAAC;~~oBACH,CAAC;~~gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,kCAAkC,KAAK,GAAG,EAAE,KAAK,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IAED;;OAEG;IACK,MAAM,CAAC,qBAAqB,CAAC,MAAgB;QACnD,OAAO,MAAM,CAAC,MAAM,CAClB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CACrB,KAAK,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC,CAC5E,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,kBAAkB,CAAC,KAAa,EAAE,SAAmB;QAC1D,wEAAwE;QACxE,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC5B,gDAAgD;YAChD,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YACzF,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC;QAED,iCAAiC;QACjC,OAAO,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;CACF;AAED,eAAe,kBAAkB,CAAC"}
1	+ {"version":3,"file":"fieldExpansion.js","sourceRoot":"","sources":["../../baasix/utils/fieldExpansion.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@baasix/baasix",
-    "version": "0.1.51",
+    "version": "0.1.53",
     "description": "Baasix - Backend-as-a-Service with 40+ tools for schema management, CRUD operations with 50+ filter operators, relationships, permissions, files, workflows, and more",
     "main": "dist/index.js",
     "type": "module",