s3db.js 8.1.0 → 8.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s3db.js",
-  "version": "8.1.0",
+  "version": "8.1.1",
   "description": "Use AWS S3, the world's most reliable document storage, as a database with this ORM.",
   "main": "dist/s3db.cjs.js",
   "module": "dist/s3db.es.js",
@@ -106,7 +106,7 @@
     "build": "rollup -c",
     "dev": "rollup -c -w",
     "test": "npm run test:js && npm run test:ts",
-    "test:js": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand --testPathIgnorePatterns=\"plugin-audit.test.js|tests/typescript/\" --testTimeout=10000",
+    "test:js": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js --testTimeout=10000",
     "test:ts": "tsc --noEmit --project tests/typescript/tsconfig.json",
     "test:js-converage": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js --detectOpenHandles --coverage --runInBand",
     "test:js-ai": "node --max-old-space-size=4096 --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand --testPathIgnorePatterns=\"plugin-audit.test.js|tests/typescript/\"",

package/src/behaviors/body-overflow.js

@@ -113,7 +113,6 @@ export async function handleInsert({ resource, data, mappedData, originalData })
 
   const hasOverflow = Object.keys(bodyFields).length > 0;
   let body = hasOverflow ? JSON.stringify(bodyFields) : "";
-  if (!hasOverflow) body = '{}';
 
   // FIX: Only return metadataFields as mappedData, not full mappedData
   return { mappedData: metadataFields, body };

package/src/behaviors/enforce-limits.js

@@ -148,7 +148,9 @@ export async function handleInsert({ 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) };
+  
+  // If data fits in metadata, store only in metadata
+  return { mappedData, body: "" };
 }
 
 export async function handleUpdate({ resource, id, data, mappedData, originalData }) {

package/src/behaviors/truncate-data.js

@@ -142,7 +142,8 @@ export async function handleInsert({ resource, data, mappedData, originalData })
     resultFields[TRUNCATED_FLAG] = TRUNCATED_FLAG_VALUE;
   }
 
-  return { mappedData: resultFields, body: JSON.stringify(mappedData) };
+  // For truncate-data, all data should fit in metadata, so body is empty
+  return { mappedData: resultFields, body: "" };
 }
 
 export async function handleUpdate({ resource, id, data, mappedData, originalData }) {

package/src/behaviors/user-managed.js

@@ -64,6 +64,8 @@ import { S3_METADATA_LIMIT_BYTES } from './enforce-limits.js';
  * @property {boolean} [enabled=true] - Whether the behavior is active
  */
 export async function handleInsert({ resource, data, mappedData, originalData }) {
+
+  
   const totalSize = calculateTotalSize(mappedData);
   
   // Calculate effective limit considering system overhead
@@ -84,8 +86,12 @@ export async function handleInsert({ resource, data, mappedData, originalData })
       excess: totalSize - 2047,
       data: originalData || data
     });
+    // If data exceeds limit, store in body
+    return { mappedData: { _v: mappedData._v }, body: JSON.stringify(mappedData) };
   }
-  return { mappedData, body: JSON.stringify(data) };
+  
+  // If data fits in metadata, store only in metadata
+  return { mappedData, body: "" };
 }
 
 export async function handleUpdate({ resource, id, data, mappedData, originalData }) {
@@ -141,7 +147,22 @@ export async function handleUpsert({ resource, id, data, mappedData, originalDat
 }
 
 export async function handleGet({ resource, metadata, body }) {
-  // No special handling needed for user-managed behavior
-  // User is responsible for handling metadata as received
+  // If body contains data, parse it and merge with metadata
+  if (body && body.trim() !== '') {
+    try {
+      const bodyData = JSON.parse(body);
+      // Merge body data with metadata, with metadata taking precedence
+      const mergedData = {
+        ...bodyData,
+        ...metadata
+      };
+      return { metadata: mergedData, body };
+    } catch (error) {
+      // If parsing fails, return original metadata and body
+      return { metadata, body };
+    }
+  }
+  
+  // If no body data, return metadata as is
   return { metadata, body };
 }

package/src/plugins/audit.plugin.js

@@ -61,14 +61,15 @@ export class AuditPlugin extends Plugin {
   setupResourceAuditing(resource) {
     // Insert
     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
       });
     });
 
@@ -80,14 +81,15 @@ export class AuditPlugin extends Plugin {
         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
       });
     });
 
@@ -99,16 +101,59 @@ export class AuditPlugin extends Plugin {
         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
       });
     });
+
+    // DeleteMany - We need to intercept before deletion to get the data
+    const originalDeleteMany = resource.deleteMany.bind(resource);
+    const plugin = this;
+    resource.deleteMany = async function(ids) {
+      // Fetch all objects before deletion for audit logging
+      const objectsToDelete = [];
+      if (plugin.config.includeData) {
+        for (const id of ids) {
+          const [ok, err, fetched] = await tryFn(() => resource.get(id));
+          if (ok) {
+            objectsToDelete.push(fetched);
+          } else {
+            objectsToDelete.push({ id }); // Just store the ID if we can't fetch
+          }
+        }
+      } else {
+        objectsToDelete.push(...ids.map(id => ({ id })));
+      }
+      
+      // Perform the actual deletion
+      const result = await originalDeleteMany(ids);
+      
+      // Log audit entries after successful deletion
+      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;
+    };
+    
+    // Store reference for cleanup if needed
+    resource._originalDeleteMany = originalDeleteMany;
   }
 
   // Backward compatibility for tests
@@ -154,10 +199,16 @@ export class AuditPlugin extends Plugin {
   }
 
   getPartitionValues(data, resource) {
-    if (!this.config.includePartitions || !resource.partitions) return null;
+    if (!this.config.includePartitions) return null;
+    
+    // Access partitions from resource.config.partitions, not resource.partitions
+    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);
@@ -207,7 +258,7 @@ export class AuditPlugin extends Plugin {
   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 = {};
     
@@ -222,7 +273,7 @@ export class AuditPlugin extends Plugin {
       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 || [];
   }
 

package/src/plugins/cache/partition-aware-filesystem-cache.class.js

@@ -154,6 +154,34 @@ export 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) {
+      // Partition-aware set
+      const key = this._getPartitionCacheKey(resource, action, options.partition, options.partitionValues, options.params);
+      return this._set(key, data, { resource, action, ...options });
+    }
+    
+    // Standard cache set (first parameter is the key)
+    return super.set(resource, action); // resource is actually the key, action is the data
+  }
+
+  /**
+   * Public get method with partition support
+   */
+  async get(resource, action, options = {}) {
+    if (typeof resource === 'string' && typeof action === 'string' && options.partition) {
+      // Partition-aware get
+      const key = this._getPartitionCacheKey(resource, action, options.partition, options.partitionValues, options.params);
+      return this._get(key, { resource, action, ...options });
+    }
+    
+    // Standard cache get (first parameter is the key)
+    return super.get(resource); // resource is actually the key
+  }
+
   /**
    * Enhanced get method with partition awareness
    */

package/src/plugins/cache/s3-cache.class.js

@@ -118,7 +118,7 @@ export class S3Cache extends Cache {
     ttl = 0,
     prefix = undefined
   }) {
-    super({ client, keyPrefix, ttl, prefix });
+    super();
     this.client = client
     this.keyPrefix = keyPrefix;
     this.config.ttl = ttl;

package/src/resource.class.js

@@ -740,7 +740,17 @@ export class Resource extends EventEmitter {
     const { id: validatedId, ...validatedAttributes } = validated;
     // Reinjetar propriedades extras do beforeInsert
     Object.assign(validatedAttributes, extraData);
-    const finalId = validatedId || id || this.idGenerator();
+    
+    // Generate ID with fallback for empty generators
+    let finalId = validatedId || id;
+    if (!finalId) {
+      finalId = this.idGenerator();
+      // Fallback to default generator if custom generator returns empty
+      if (!finalId || finalId.trim() === '') {
+        const { idGenerator } = await import('#src/concerns/id.js');
+        finalId = idGenerator();
+      }
+    }
 
     const mappedData = await this.schema.mapper(validatedAttributes);
     mappedData._v = String(this.version);
@@ -769,8 +779,7 @@ export class Resource extends EventEmitter {
       throw new Error(`[Resource.insert] Attempt to save object without body! Data: id=${finalId}, resource=${this.name}`);
     }
     // For other behaviors, allow empty body (all data in metadata)
-    // Before putObject in insert
-    // eslint-disable-next-line no-console
+
     const [okPut, errPut, putResult] = await tryFn(() => this.client.putObject({
       key,
       body,
@@ -796,31 +805,19 @@ export class Resource extends EventEmitter {
         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;
     }
 
-    // Compose the full object sem reinjetar extras
-    let insertedData = await this.composeFullObjectFromWrite({
-      id: finalId,
-      metadata: finalMetadata,
-      body,
-      behavior: this.behavior
-    });
-
+    // Get the inserted object
+    const insertedObject = await this.get(finalId);
+    
     // Execute afterInsert hooks
-    const finalResult = await this.executeHooks('afterInsert', insertedData);
-    // Emit event with data before afterInsert hooks
-    this.emit("insert", {
-      ...insertedData,
-      $before: { ...completeData },
-      $after: { ...finalResult }
-    });
+    const finalResult = await this.executeHooks('afterInsert', insertedObject);
+    
+    // Emit insert event
+    this.emit('insert', finalResult);
+    
+    // Return the final object
     return finalResult;
   }
 
@@ -830,7 +827,7 @@ export class Resource extends EventEmitter {
    * @returns {Promise<Object>} The resource object with all attributes and metadata
    * @example
    * const user = await resource.get('user-123');
-            */
+   */
   async get(id) {
     if (isObject(id)) throw new Error(`id cannot be an object`);
     if (isEmpty(id)) throw new Error('id cannot be empty');
@@ -850,18 +847,8 @@ export class Resource extends EventEmitter {
         id
       });
     }
-    // If object exists but has no content, throw NoSuchKey error
-    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
-      });
-    }
+    // NOTE: ContentLength === 0 is valid for objects with data in metadata only
+    // (removed validation that threw NoSuchKey for empty body objects)
 
     // Get the correct schema version for unmapping (from _v metadata)
     const objectVersionRaw = request.Metadata?._v || this.version;
@@ -2440,6 +2427,19 @@ export class Resource extends EventEmitter {
       Object.keys(result).forEach(k => { result[k] = fixValue(result[k]); });
       return result;
     }
+    
+    // Handle user-managed behavior when data is in body
+    if (behavior === 'user-managed' && body && body.trim() !== '') {
+      const [okBody, errBody, parsedBody] = await tryFn(() => Promise.resolve(JSON.parse(body)));
+      if (okBody) {
+        const [okUnmap, errUnmap, unmappedBody] = await tryFn(() => 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]); });
     const filtered = filterInternalFields(result);