s3db.js 8.1.0 → 8.1.1

package/dist/s3db.iife.js

@@ -605,6 +605,12 @@ ${JSON.stringify(validation, null, 2)}`,
   const passwordAlphabet = "ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz23456789";
   const passwordGenerator = nanoid.customAlphabet(passwordAlphabet, 16);
 
+  var id = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    idGenerator: idGenerator,
+    passwordGenerator: passwordGenerator
+  });
+
   var domain;
 
   // This constructor is used to store event handlers. Instantiating this is
@@ -1298,14 +1304,15 @@ ${JSON.stringify(validation, null, 2)}`,
     }
     setupResourceAuditing(resource) {
       resource.on("insert", async (data) => {
+        const partitionValues = this.config.includePartitions ? this.getPartitionValues(data, resource) : null;
         await this.logAudit({
           resourceName: resource.name,
           operation: "insert",
           recordId: data.id || "auto-generated",
           oldData: null,
           newData: this.config.includeData ? JSON.stringify(this.truncateData(data)) : null,
-          partition: this.config.includePartitions && this.getPartitionValues(data, resource) ? this.getPrimaryPartition(this.getPartitionValues(data, resource)) : null,
-          partitionValues: this.config.includePartitions && this.getPartitionValues(data, resource) ? JSON.stringify(this.getPartitionValues(data, resource)) : null
+          partition: partitionValues ? this.getPrimaryPartition(partitionValues) : null,
+          partitionValues: partitionValues ? JSON.stringify(partitionValues) : null
         });
       });
       resource.on("update", async (data) => {
@@ -1314,14 +1321,15 @@ ${JSON.stringify(validation, null, 2)}`,
           const [ok, err, fetched] = await try_fn_default(() => resource.get(data.id));
           if (ok) oldData = fetched;
         }
+        const partitionValues = this.config.includePartitions ? this.getPartitionValues(data, resource) : null;
         await this.logAudit({
           resourceName: resource.name,
           operation: "update",
           recordId: data.id,
           oldData: oldData && this.config.includeData ? JSON.stringify(this.truncateData(oldData)) : null,
           newData: this.config.includeData ? JSON.stringify(this.truncateData(data)) : null,
-          partition: this.config.includePartitions && this.getPartitionValues(data, resource) ? this.getPrimaryPartition(this.getPartitionValues(data, resource)) : null,
-          partitionValues: this.config.includePartitions && this.getPartitionValues(data, resource) ? JSON.stringify(this.getPartitionValues(data, resource)) : null
+          partition: partitionValues ? this.getPrimaryPartition(partitionValues) : null,
+          partitionValues: partitionValues ? JSON.stringify(partitionValues) : null
         });
       });
       resource.on("delete", async (data) => {
@@ -1330,16 +1338,49 @@ ${JSON.stringify(validation, null, 2)}`,
           const [ok, err, fetched] = await try_fn_default(() => resource.get(data.id));
           if (ok) oldData = fetched;
         }
+        const partitionValues = oldData && this.config.includePartitions ? this.getPartitionValues(oldData, resource) : null;
         await this.logAudit({
           resourceName: resource.name,
           operation: "delete",
           recordId: data.id,
           oldData: oldData && this.config.includeData ? JSON.stringify(this.truncateData(oldData)) : null,
           newData: null,
-          partition: oldData && this.config.includePartitions && this.getPartitionValues(oldData, resource) ? this.getPrimaryPartition(this.getPartitionValues(oldData, resource)) : null,
-          partitionValues: oldData && this.config.includePartitions && this.getPartitionValues(oldData, resource) ? JSON.stringify(this.getPartitionValues(oldData, resource)) : null
+          partition: partitionValues ? this.getPrimaryPartition(partitionValues) : null,
+          partitionValues: partitionValues ? JSON.stringify(partitionValues) : null
         });
       });
+      const originalDeleteMany = resource.deleteMany.bind(resource);
+      const plugin = this;
+      resource.deleteMany = async function(ids) {
+        const objectsToDelete = [];
+        if (plugin.config.includeData) {
+          for (const id of ids) {
+            const [ok, err, fetched] = await try_fn_default(() => resource.get(id));
+            if (ok) {
+              objectsToDelete.push(fetched);
+            } else {
+              objectsToDelete.push({ id });
+            }
+          }
+        } else {
+          objectsToDelete.push(...ids.map((id) => ({ id })));
+        }
+        const result = await originalDeleteMany(ids);
+        for (const oldData of objectsToDelete) {
+          const partitionValues = oldData && plugin.config.includePartitions ? plugin.getPartitionValues(oldData, resource) : null;
+          await plugin.logAudit({
+            resourceName: resource.name,
+            operation: "deleteMany",
+            recordId: oldData.id,
+            oldData: oldData && plugin.config.includeData ? JSON.stringify(plugin.truncateData(oldData)) : null,
+            newData: null,
+            partition: partitionValues ? plugin.getPrimaryPartition(partitionValues) : null,
+            partitionValues: partitionValues ? JSON.stringify(partitionValues) : null
+          });
+        }
+        return result;
+      };
+      resource._originalDeleteMany = originalDeleteMany;
     }
     // Backward compatibility for tests
     installEventListenersForResource(resource) {
@@ -1377,9 +1418,13 @@ ${JSON.stringify(validation, null, 2)}`,
       }
     }
     getPartitionValues(data, resource) {
-      if (!this.config.includePartitions || !resource.partitions) return null;
+      if (!this.config.includePartitions) return null;
+      const partitions = resource.config?.partitions || resource.partitions;
+      if (!partitions) {
+        return null;
+      }
       const partitionValues = {};
-      for (const [partitionName, partitionConfig] of Object.entries(resource.partitions)) {
+      for (const [partitionName, partitionConfig] of Object.entries(partitions)) {
         const values = {};
         for (const field of Object.keys(partitionConfig.fields)) {
           values[field] = this.getNestedFieldValue(data, field);
@@ -1422,7 +1467,7 @@ ${JSON.stringify(validation, null, 2)}`,
     }
     async getAuditLogs(options = {}) {
       if (!this.auditResource) return [];
-      const { resourceName, operation, recordId, partition, startDate, endDate, limit = 100 } = options;
+      const { resourceName, operation, recordId, partition, startDate, endDate, limit = 100, offset = 0 } = options;
       let query = {};
       if (resourceName) query.resourceName = resourceName;
       if (operation) query.operation = operation;
@@ -1433,7 +1478,7 @@ ${JSON.stringify(validation, null, 2)}`,
         if (startDate) query.timestamp.$gte = startDate;
         if (endDate) query.timestamp.$lte = endDate;
       }
-      const result = await this.auditResource.page({ query, limit });
+      const result = await this.auditResource.page({ query, limit, offset });
       return result.items || [];
     }
     async getRecordHistory(resourceName, recordId) {
@@ -6548,7 +6593,7 @@ ${JSON.stringify(validation, null, 2)}`,
       ttl = 0,
       prefix = void 0
     }) {
-      super({ client, keyPrefix, ttl, prefix });
+      super();
       this.client = client;
       this.keyPrefix = keyPrefix;
       this.config.ttl = ttl;
@@ -7229,6 +7274,26 @@ ${JSON.stringify(validation, null, 2)}`,
       }
       return super._set(key, data);
     }
+    /**
+     * Public set method with partition support
+     */
+    async set(resource, action, data, options = {}) {
+      if (typeof resource === "string" && typeof action === "string" && options.partition) {
+        const key = this._getPartitionCacheKey(resource, action, options.partition, options.partitionValues, options.params);
+        return this._set(key, data, { resource, action, ...options });
+      }
+      return super.set(resource, action);
+    }
+    /**
+     * Public get method with partition support
+     */
+    async get(resource, action, options = {}) {
+      if (typeof resource === "string" && typeof action === "string" && options.partition) {
+        const key = this._getPartitionCacheKey(resource, action, options.partition, options.partitionValues, options.params);
+        return this._get(key, { resource, action, ...options });
+      }
+      return super.get(resource);
+    }
     /**
      * Enhanced get method with partition awareness
      */
@@ -10791,7 +10856,7 @@ ${JSON.stringify(validation, null, 2)}`,
     if (totalSize > effectiveLimit) {
       throw new Error(`S3 metadata size exceeds 2KB limit. Current size: ${totalSize} bytes, effective limit: ${effectiveLimit} bytes, absolute limit: ${S3_METADATA_LIMIT_BYTES} bytes`);
     }
-    return { mappedData, body: JSON.stringify(mappedData) };
+    return { mappedData, body: "" };
   }
   async function handleUpdate$4({ resource, id, data, mappedData, originalData }) {
     const totalSize = calculateTotalSize(mappedData);
@@ -10854,8 +10919,9 @@ ${JSON.stringify(validation, null, 2)}`,
         excess: totalSize - 2047,
         data: originalData || data
       });
+      return { mappedData: { _v: mappedData._v }, body: JSON.stringify(mappedData) };
     }
-    return { mappedData, body: JSON.stringify(data) };
+    return { mappedData, body: "" };
   }
   async function handleUpdate$3({ resource, id, data, mappedData, originalData }) {
     const totalSize = calculateTotalSize(mappedData);
@@ -10902,6 +10968,18 @@ ${JSON.stringify(validation, null, 2)}`,
     return { mappedData, body: JSON.stringify(data) };
   }
   async function handleGet$3({ resource, metadata, body }) {
+    if (body && body.trim() !== "") {
+      try {
+        const bodyData = JSON.parse(body);
+        const mergedData = {
+          ...bodyData,
+          ...metadata
+        };
+        return { metadata: mergedData, body };
+      } catch (error) {
+        return { metadata, body };
+      }
+    }
     return { metadata, body };
   }
 
@@ -10969,7 +11047,7 @@ ${JSON.stringify(validation, null, 2)}`,
     if (truncated) {
       resultFields[TRUNCATED_FLAG] = TRUNCATED_FLAG_VALUE;
     }
-    return { mappedData: resultFields, body: JSON.stringify(mappedData) };
+    return { mappedData: resultFields, body: "" };
   }
   async function handleUpdate$2({ resource, id, data, mappedData, originalData }) {
     return handleInsert$2({ resource, data, mappedData, originalData });
@@ -11059,7 +11137,6 @@ ${JSON.stringify(validation, null, 2)}`,
     }
     const hasOverflow = Object.keys(bodyFields).length > 0;
     let body = hasOverflow ? JSON.stringify(bodyFields) : "";
-    if (!hasOverflow) body = "{}";
     return { mappedData: metadataFields, body };
   }
   async function handleUpdate$1({ resource, id, data, mappedData, originalData }) {
@@ -11711,16 +11788,16 @@ ${errorDetails}`,
      *   email: 'john@example.com'
      * });
      */
-    async insert({ id, ...attributes }) {
-      const exists = await this.exists(id);
-      if (exists) throw new Error(`Resource with id '${id}' already exists`);
-      this.getResourceKey(id || "(auto)");
+    async insert({ id: id$1, ...attributes }) {
+      const exists = await this.exists(id$1);
+      if (exists) throw new Error(`Resource with id '${id$1}' already exists`);
+      this.getResourceKey(id$1 || "(auto)");
       if (this.options.timestamps) {
         attributes.createdAt = (/* @__PURE__ */ new Date()).toISOString();
         attributes.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
       }
       const attributesWithDefaults = this.applyDefaults(attributes);
-      const completeData = { id, ...attributesWithDefaults };
+      const completeData = { id: id$1, ...attributesWithDefaults };
       const preProcessedData = await this.executeHooks("beforeInsert", completeData);
       const extraProps = Object.keys(preProcessedData).filter(
         (k) => !(k in completeData) || preProcessedData[k] !== completeData[k]
@@ -11744,7 +11821,14 @@ ${errorDetails}`,
       }
       const { id: validatedId, ...validatedAttributes } = validated;
       Object.assign(validatedAttributes, extraData);
-      const finalId = validatedId || id || this.idGenerator();
+      let finalId = validatedId || id$1;
+      if (!finalId) {
+        finalId = this.idGenerator();
+        if (!finalId || finalId.trim() === "") {
+          const { idGenerator } = await Promise.resolve().then(function () { return id; });
+          finalId = idGenerator();
+        }
+      }
       const mappedData = await this.schema.mapper(validatedAttributes);
       mappedData._v = String(this.version);
       const behaviorImpl = getBehavior(this.behavior);
@@ -11789,26 +11873,11 @@ ${errorDetails}`,
           errPut.excess = excess;
           throw new ResourceError("metadata headers exceed", { resourceName: this.name, operation: "insert", id: finalId, totalSize, effectiveLimit, excess, suggestion: "Reduce metadata size or number of fields." });
         }
-        throw mapAwsError(errPut, {
-          bucket: this.client.config.bucket,
-          key,
-          resourceName: this.name,
-          operation: "insert",
-          id: finalId
-        });
+        throw errPut;
       }
-      let insertedData = await this.composeFullObjectFromWrite({
-        id: finalId,
-        metadata: finalMetadata,
-        body,
-        behavior: this.behavior
-      });
-      const finalResult = await this.executeHooks("afterInsert", insertedData);
-      this.emit("insert", {
-        ...insertedData,
-        $before: { ...completeData },
-        $after: { ...finalResult }
-      });
+      const insertedObject = await this.get(finalId);
+      const finalResult = await this.executeHooks("afterInsert", insertedObject);
+      this.emit("insert", finalResult);
       return finalResult;
     }
     /**
@@ -11817,7 +11886,7 @@ ${errorDetails}`,
      * @returns {Promise<Object>} The resource object with all attributes and metadata
      * @example
      * const user = await resource.get('user-123');
-              */
+     */
     async get(id) {
       if (lodashEs.isObject(id)) throw new Error(`id cannot be an object`);
       if (lodashEs.isEmpty(id)) throw new Error("id cannot be empty");
@@ -11832,17 +11901,6 @@ ${errorDetails}`,
           id
         });
       }
-      if (request.ContentLength === 0) {
-        const noContentErr = new Error(`No such key: ${key} [bucket:${this.client.config.bucket}]`);
-        noContentErr.name = "NoSuchKey";
-        throw mapAwsError(noContentErr, {
-          bucket: this.client.config.bucket,
-          key,
-          resourceName: this.name,
-          operation: "get",
-          id
-        });
-      }
       const objectVersionRaw = request.Metadata?._v || this.version;
       const objectVersion = typeof objectVersionRaw === "string" && objectVersionRaw.startsWith("v") ? objectVersionRaw.slice(1) : objectVersionRaw;
       const schema = await this.getSchemaForVersion(objectVersion);
@@ -13181,6 +13239,18 @@ ${errorDetails}`,
         });
         return result2;
       }
+      if (behavior === "user-managed" && body && body.trim() !== "") {
+        const [okBody, errBody, parsedBody] = await try_fn_default(() => Promise.resolve(JSON.parse(body)));
+        if (okBody) {
+          const [okUnmap, errUnmap, unmappedBody] = await try_fn_default(() => this.schema.unmapper(parsedBody));
+          const bodyData = okUnmap ? unmappedBody : {};
+          const merged = { ...bodyData, ...unmappedMetadata, id };
+          Object.keys(merged).forEach((k) => {
+            merged[k] = fixValue(merged[k]);
+          });
+          return filterInternalFields(merged);
+        }
+      }
       const result = { ...unmappedMetadata, id };
       Object.keys(result).forEach((k) => {
         result[k] = fixValue(result[k]);
@@ -13423,7 +13493,7 @@ ${errorDetails}`,
       this.id = idGenerator(7);
       this.version = "1";
       this.s3dbVersion = (() => {
-        const [ok, err, version] = try_fn_default(() => true ? "8.1.0" : "latest");
+        const [ok, err, version] = try_fn_default(() => true ? "8.1.1" : "latest");
         return ok ? version : "latest";
       })();
       this.resources = {};