s3db.js 7.4.1 → 7.5.0

package/dist/s3db.es.js

@@ -7606,11 +7606,11 @@ class CachePlugin extends plugin_class_default {
     await super.setup(database);
   }
   async onSetup() {
-    if (this.config.driver) {
+    if (this.config.driver && typeof this.config.driver === "object") {
       this.driver = this.config.driver;
-    } else if (this.config.driverType === "memory") {
+    } else if (this.config.driver === "memory") {
       this.driver = new memory_cache_class_default(this.config.memoryOptions || {});
-    } else if (this.config.driverType === "filesystem") {
+    } else if (this.config.driver === "filesystem") {
       if (this.config.partitionAware) {
         this.driver = new PartitionAwareFilesystemCache({
           partitionStrategy: this.config.partitionStrategy,
@@ -11192,6 +11192,14 @@ class Resource extends EventEmitter {
     this.passphrase = passphrase ?? "secret";
     this.versioningEnabled = versioningEnabled;
     this.idGenerator = this.configureIdGenerator(customIdGenerator, idSize);
+    if (typeof customIdGenerator === "number" && customIdGenerator > 0) {
+      this.idSize = customIdGenerator;
+    } else if (typeof idSize === "number" && idSize > 0) {
+      this.idSize = idSize;
+    } else {
+      this.idSize = 22;
+    }
+    this.idGeneratorType = this.getIdGeneratorType(customIdGenerator, this.idSize);
     this.config = {
       cache,
       hooks,
@@ -11247,7 +11255,7 @@ class Resource extends EventEmitter {
    */
   configureIdGenerator(customIdGenerator, idSize) {
     if (typeof customIdGenerator === "function") {
-      return customIdGenerator;
+      return () => String(customIdGenerator());
     }
     if (typeof customIdGenerator === "number" && customIdGenerator > 0) {
       return customAlphabet(urlAlphabet, customIdGenerator);
@@ -11257,6 +11265,19 @@ class Resource extends EventEmitter {
     }
     return idGenerator;
   }
+  /**
+   * Get a serializable representation of the ID generator type
+   * @param {Function|number} customIdGenerator - Custom ID generator function or size
+   * @param {number} idSize - Size for auto-generated IDs
+   * @returns {string|number} Serializable ID generator type
+   * @private
+   */
+  getIdGeneratorType(customIdGenerator, idSize) {
+    if (typeof customIdGenerator === "function") {
+      return "custom_function";
+    }
+    return idSize;
+  }
   /**
    * Get resource options (for backward compatibility with tests)
    */
@@ -13305,7 +13326,7 @@ class Database extends EventEmitter {
     super();
     this.version = "1";
     this.s3dbVersion = (() => {
-      const [ok, err, version] = try_fn_default(() => true ? "7.4.1" : "latest");
+      const [ok, err, version] = try_fn_default(() => true ? "7.5.0" : "latest");
       return ok ? version : "latest";
     })();
     this.resources = {};
@@ -13376,6 +13397,18 @@ class Database extends EventEmitter {
       const currentVersion = resourceMetadata.currentVersion || "v0";
       const versionData = resourceMetadata.versions?.[currentVersion];
       if (versionData) {
+        let restoredIdGenerator, restoredIdSize;
+        if (versionData.idGenerator !== void 0) {
+          if (versionData.idGenerator === "custom_function") {
+            restoredIdGenerator = void 0;
+            restoredIdSize = versionData.idSize || 22;
+          } else if (typeof versionData.idGenerator === "number") {
+            restoredIdGenerator = versionData.idGenerator;
+            restoredIdSize = versionData.idSize || versionData.idGenerator;
+          }
+        } else {
+          restoredIdSize = versionData.idSize || 22;
+        }
         this.resources[name] = new resource_class_default({
           name,
           client: this.client,
@@ -13395,7 +13428,9 @@ class Database extends EventEmitter {
           autoDecrypt: versionData.autoDecrypt !== void 0 ? versionData.autoDecrypt : true,
           hooks: versionData.hooks || {},
           versioningEnabled: this.versioningEnabled,
-          map: versionData.map
+          map: versionData.map,
+          idGenerator: restoredIdGenerator,
+          idSize: restoredIdSize
         });
       }
     }
@@ -13556,6 +13591,8 @@ class Database extends EventEmitter {
             autoDecrypt: resource.config.autoDecrypt,
             cache: resource.config.cache,
             hooks: resource.config.hooks,
+            idSize: resource.idSize,
+            idGenerator: resource.idGeneratorType,
             createdAt: isNewVersion ? (/* @__PURE__ */ new Date()).toISOString() : existingVersionData?.createdAt
           }
         }
@@ -14511,6 +14548,10 @@ class ReplicatorPlugin extends plugin_class_default {
     }
     return filtered;
   }
+  async getCompleteData(resource, data) {
+    const [ok, err, completeRecord] = await try_fn_default(() => resource.get(data.id));
+    return ok ? completeRecord : data;
+  }
   installEventListeners(resource, database, plugin) {
     if (!resource || this.eventListenersInstalled.has(resource.name) || resource.name === this.config.replicatorLogResource) {
       return;
@@ -14529,8 +14570,9 @@ class ReplicatorPlugin extends plugin_class_default {
     });
     resource.on("update", async (data, beforeData) => {
       const [ok, error] = await try_fn_default(async () => {
-        const completeData = { ...data, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
-        await plugin.processReplicatorEvent("update", resource.name, completeData.id, completeData, beforeData);
+        const completeData = await plugin.getCompleteData(resource, data);
+        const dataWithTimestamp = { ...completeData, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
+        await plugin.processReplicatorEvent("update", resource.name, completeData.id, dataWithTimestamp, beforeData);
       });
       if (!ok) {
         if (this.config.verbose) {
@@ -14552,14 +14594,6 @@ class ReplicatorPlugin extends plugin_class_default {
     });
     this.eventListenersInstalled.add(resource.name);
   }
-  /**
-   * Get complete data by always fetching the full record from the resource
-   * This ensures we always have the complete data regardless of behavior or data size
-   */
-  async getCompleteData(resource, data) {
-    const [ok, err, completeRecord] = await try_fn_default(() => resource.get(data.id));
-    return ok ? completeRecord : data;
-  }
   async setup(database) {
     this.database = database;
     const [initOk, initError] = await try_fn_default(async () => {
@@ -14573,7 +14607,7 @@ class ReplicatorPlugin extends plugin_class_default {
       throw initError;
     }
     const [logOk, logError] = await try_fn_default(async () => {
-      if (this.config.replicatorLogResource) {
+      if (this.config.persistReplicatorLog) {
         const logRes = await database.createResource({
           name: this.config.replicatorLogResource,
           behavior: "body-overflow",
@@ -14600,6 +14634,10 @@ class ReplicatorPlugin extends plugin_class_default {
       });
     }
     await this.uploadMetadataFile(database);
+    for (const resourceName in database.resources) {
+      const resource = database.resources[resourceName];
+      this.installEventListeners(resource, database, this);
+    }
     const originalCreateResource = database.createResource.bind(database);
     database.createResource = async (config) => {
       const resource = await originalCreateResource(config);
@@ -14608,10 +14646,6 @@ class ReplicatorPlugin extends plugin_class_default {
       }
       return resource;
     };
-    for (const resourceName in database.resources) {
-      const resource = database.resources[resourceName];
-      this.installEventListeners(resource, database, this);
-    }
   }
   createReplicator(driver, config, resources, client) {
     return createReplicator(driver, config, resources, client);