s3db.js 8.1.0 → 8.1.1

package/dist/s3db.es.js

@@ -615,6 +615,12 @@ const idGenerator = customAlphabet(urlAlphabet, 22);
 const passwordAlphabet = "ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz23456789";
 const passwordGenerator = 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
@@ -1308,14 +1314,15 @@ class AuditPlugin extends plugin_class_default {
   }
   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) => {
@@ -1324,14 +1331,15 @@ class AuditPlugin extends plugin_class_default {
         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) => {
@@ -1340,16 +1348,49 @@ class AuditPlugin extends plugin_class_default {
         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) {
@@ -1387,9 +1428,13 @@ class AuditPlugin extends plugin_class_default {
     }
   }
   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);
@@ -1432,7 +1477,7 @@ class AuditPlugin extends plugin_class_default {
   }
   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;
@@ -1443,7 +1488,7 @@ class AuditPlugin extends plugin_class_default {
       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) {
@@ -6558,7 +6603,7 @@ class S3Cache extends Cache {
     ttl = 0,
     prefix = void 0
   }) {
-    super({ client, keyPrefix, ttl, prefix });
+    super();
     this.client = client;
     this.keyPrefix = keyPrefix;
     this.config.ttl = ttl;
@@ -7239,6 +7284,26 @@ class PartitionAwareFilesystemCache extends FilesystemCache {
     }
     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
    */
@@ -10801,7 +10866,7 @@ async function handleInsert$4({ resource, data, mappedData, originalData }) {
   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);
@@ -10864,8 +10929,9 @@ async function handleInsert$3({ resource, data, mappedData, originalData }) {
       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);
@@ -10912,6 +10978,18 @@ async function handleUpsert$3({ resource, id, data, mappedData, originalData })
   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 };
 }
 
@@ -10979,7 +11057,7 @@ async function handleInsert$2({ resource, data, mappedData, originalData }) {
   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 });
@@ -11069,7 +11147,6 @@ async function handleInsert$1({ resource, data, mappedData, originalData }) {
   }
   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 }) {
@@ -11721,16 +11798,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]
@@ -11754,7 +11831,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);
@@ -11799,26 +11883,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;
   }
   /**
@@ -11827,7 +11896,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 (isObject$1(id)) throw new Error(`id cannot be an object`);
     if (isEmpty(id)) throw new Error("id cannot be empty");
@@ -11842,17 +11911,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);
@@ -13191,6 +13249,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]);
@@ -13433,7 +13503,7 @@ class Database extends EventEmitter {
     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 = {};