@cap-js-community/common 0.2.3 → 0.2.4

package/CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## Version 0.2.4 - 2025-07-03
+
+### Fixed
+
+- Multi-tenancy fixes
+- Improve reference detection
+- Deactivate TTL for negative value and static entities
+
 ## Version 0.2.3 - 2025-07-01
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js-community/common",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "CAP Node.js Community Common",
   "homepage": "https://cap.cloud.sap/",
   "engines": {
@@ -45,7 +45,7 @@
     "audit": "npm audit --only=prod"
   },
   "dependencies": {
-    "@cap-js/sqlite": "^2.0.1",
+    "@cap-js/sqlite": "^2.0.2",
     "commander": "^14.0.0",
     "redis": "^4.7.1",
     "verror": "^1.10.1"
@@ -53,14 +53,14 @@
   "devDependencies": {
     "@cap-js-community/common": "./",
     "@cap-js/cds-test": "^0.4.0",
-    "@sap/cds": "^9.0.4",
+    "@sap/cds": "^9.1.0",
     "@sap/cds-common-content": "^3.0.1",
-    "@sap/cds-dk": "^9.0.5",
-    "eslint": "9.30.0",
+    "@sap/cds-dk": "^9.1.0",
+    "eslint": "9.30.1",
     "eslint-config-prettier": "10.1.5",
     "eslint-plugin-jest": "29.0.1",
     "eslint-plugin-n": "^17.20.0",
-    "jest": "30.0.3",
+    "jest": "30.0.4",
     "jest-html-reporters": "3.1.7",
     "jest-junit": "16.0.0",
     "prettier": "3.6.2",

package/src/replication-cache/ReplicationCache.js

@@ -73,10 +73,14 @@ class ReplicationCache {
             this.options?.credentials?.database &&
             this.options?.credentials?.database !== Constants.InMemory
           ) {
-            this.log.debug("Preparing replication cache template database");
-            this.template = createDB(Tenant.Template, this.model, this.options).catch((err) => {
-              this.log.error("Preparing replication cache failed", err);
-            });
+            this.log.info("Preparing replication cache template database");
+            this.template = createDB(Tenant.Template, this.model, this.options)
+              .then(() => {
+                this.log.info("Prepared replication cache template database");
+              })
+              .catch((err) => {
+                this.log.error("Preparing replication cache failed", err);
+              });
           }
         }
       }
@@ -220,9 +224,17 @@ class ReplicationCache {
         if (this.options.measure) {
           return this.measure(
             async () => {
-              return db.tx({ ...req.context }, async (tx) => {
-                return tx.run(req.query);
-              });
+              return db.tx(
+                {
+                  tenant: req.context.tenant,
+                  locale: req.context.locale,
+                  user: req.context.user,
+                  http: req.context.http,
+                },
+                async (tx) => {
+                  return tx.run(req.query);
+                },
+              );
             },
             async () => {
               await next();
@@ -585,6 +597,7 @@ class ReplicationCacheEntry {
     this.db = tenant.db;
     this.ref = ref;
     this.definition = this.csn[ref];
+    this.static = !!this.definition[Annotations.ReplicateStatic];
     this.preload = this.cache.options.preload && this.definition[Annotations.ReplicatePreload];
     this.name = this.definition.name.replace(/\./gi, "_");
     this.status = Status.New;
@@ -614,13 +627,15 @@ class ReplicationCacheEntry {
             await this.load(thread);
             this.status = Status.Ready;
             this.failures = 0;
-            this.timeout = setTimeout(async () => {
-              this.cache.log.debug("Replication cache ref TTL reached", {
-                tenant: this.tenant.id,
-                ref: this.ref,
-              });
-              await this.clear(true);
-            }, this.ttl).unref();
+            if (this.ttl > 0 && !this.static) {
+              this.timeout = setTimeout(async () => {
+                this.cache.log.debug("Replication cache ref TTL reached", {
+                  tenant: this.tenant.id,
+                  ref: this.ref,
+                });
+                await this.clear(true);
+              }, this.ttl).unref();
+            }
           }
           this.cache.log.debug("Preparing replication cache ref finished", {
             tenant: this.tenant.id,
@@ -779,7 +794,11 @@ async function createDB(tenant, model, options) {
   const db = new SQLiteService(tenant ?? Tenant.Default, model, {
     kind: "sqlite",
     impl: "@cap-js/sqlite",
-    credentials: { ...options.credentials, database: filePath },
+    multiTenant: false,
+    credentials: {
+      ...options.credentials,
+      database: filePath,
+    },
   });
   await db.init();
   if (options.deploy && (filePath === Constants.InMemory || tenant === Tenant.Template)) {
@@ -870,14 +889,17 @@ function selectFromRefs(model, query) {
   if (query.SELECT.from.ref) {
     refs = resolveRefs(model, query.SELECT.from.ref);
   } else if (query.SELECT.from.args) {
-    refs = query.SELECT.from.args.reduce((refs, arg) => {
+    for (const arg of query.SELECT.from.args) {
       if (arg.ref) {
         refs = refs.concat(resolveRefs(model, arg.ref));
       } else if (arg.args) {
         refs = refs.concat(selectFromRefs(model, { SELECT: { from: { args: arg.args } } }));
       }
-      return refs;
-    }, []);
+    }
+  } else if (query.SELECT.from.SET?.args) {
+    for (const arg of query.SELECT.from.SET.args) {
+      refs = refs.concat(selectFromRefs(model, arg));
+    }
   } else if (query.SELECT.from.SELECT) {
     refs = selectFromRefs(model, query.SELECT.from);
   }
@@ -895,6 +917,10 @@ function selectFromPrimaryRef(model, query) {
         return selectFromPrimaryRef(model, { SELECT: { from: { args: arg.args } } });
       }
     }
+  } else if (query.SELECT.from.SET?.args) {
+    for (const arg of query.SELECT.from.SET.args) {
+      return selectFromPrimaryRef(model, arg);
+    }
   } else if (query.SELECT.from.SELECT) {
     return selectFromPrimaryRef(model, query.SELECT.from);
   }
@@ -905,9 +931,7 @@ function selectFromAliases(model, definition, query) {
   if (definition?.name) {
     aliases["$self"] = definition.name;
   }
-  if (query.SELECT.from.SELECT) {
-    // Sub-select aliases are not (yet) supported
-  } else if (query.SELECT.from.ref) {
+  if (query.SELECT.from.ref) {
     const ref = resolveRef(model, query.SELECT.from.ref);
     if (query.SELECT.from.as) {
       aliases[query.SELECT.from.as] = ref;
@@ -926,14 +950,24 @@ function selectFromAliases(model, definition, query) {
           aliases[as] = ref;
         }
       } else if (arg.args) {
-        for (const subArg of arg.args) {
-          aliases = {
-            ...aliases,
-            ...selectFromAliases(model, definition, { SELECT: { from: { args: subArg.args } } }),
-          };
-        }
+        aliases = {
+          ...aliases,
+          ...selectFromAliases(model, definition, { SELECT: { from: { args: arg.args } } }),
+        };
       }
     }
+  } else if (query.SELECT.from.SET?.args) {
+    for (const arg of query.SELECT.from.SET.args) {
+      aliases = {
+        ...aliases,
+        ...selectFromAliases(model, definition, arg),
+      };
+    }
+  } else if (query.SELECT.from.SELECT) {
+    aliases = {
+      ...aliases,
+      ...selectFromAliases(model, definition, query.SELECT.from),
+    };
   }
   return aliases;
 }