s3db.js 7.2.1 → 7.3.1

package/src/plugins/replicators/s3db-replicator.class.js

@@ -48,7 +48,7 @@ class S3dbReplicator extends BaseReplicator {
   }
 
   _normalizeResources(resources) {
-    // Suporta array, objeto, função, string
+    // Supports array, object, function, string
     if (!resources) return {};
     if (Array.isArray(resources)) {
       const map = {};
@@ -135,24 +135,40 @@ class S3dbReplicator extends BaseReplicator {
     }
   }
 
-  // Change signature to accept id
-  async replicate({ resource, operation, data, id: explicitId }) {
+  // Support both object and parameter signatures for flexibility
+  async replicate(resourceOrObj, operation, data, recordId, beforeData) {
+    let resource, op, payload, id;
+    
+    // Handle object signature: { resource, operation, data, id }
+    if (typeof resourceOrObj === 'object' && resourceOrObj.resource) {
+      resource = resourceOrObj.resource;
+      op = resourceOrObj.operation;
+      payload = resourceOrObj.data;
+      id = resourceOrObj.id;
+    } else {
+      // Handle parameter signature: (resource, operation, data, recordId, beforeData)
+      resource = resourceOrObj;
+      op = operation;
+      payload = data;
+      id = recordId;
+    }
+    
     const normResource = normalizeResourceName(resource);
-    const destResource = this._resolveDestResource(normResource, data);
+    const destResource = this._resolveDestResource(normResource, payload);
     const destResourceObj = this._getDestResourceObj(destResource);
     
     // Apply transformer before replicating
-    const transformedData = this._applyTransformer(normResource, data);
+    const transformedData = this._applyTransformer(normResource, payload);
     
     let result;
-    if (operation === 'insert') {
+    if (op === 'insert') {
       result = await destResourceObj.insert(transformedData);
-    } else if (operation === 'update') {
-      result = await destResourceObj.update(explicitId, transformedData);
-    } else if (operation === 'delete') {
-      result = await destResourceObj.delete(explicitId);
+    } else if (op === 'update') {
+      result = await destResourceObj.update(id, transformedData);
+    } else if (op === 'delete') {
+      result = await destResourceObj.delete(id);
     } else {
-      throw new Error(`Invalid operation: ${operation}. Supported operations are: insert, update, delete`);
+      throw new Error(`Invalid operation: ${op}. Supported operations are: insert, update, delete`);
     }
     
     return result;
@@ -174,7 +190,7 @@ class S3dbReplicator extends BaseReplicator {
     } else {
       result = data;
     }
-    // Garante que id sempre está presente
+          // Ensure that id is always present
     if (result && data && data.id && !result.id) result.id = data.id;
     // Fallback: if transformer returns undefined/null, use original data
     if (!result && data) result = data;
@@ -193,12 +209,12 @@ class S3dbReplicator extends BaseReplicator {
     }
     // String mapping
     if (typeof entry === 'string') return entry;
-    // Função mapping
-    if (typeof entry === 'function') return resource;
-    // Objeto: { resource, transform }
+          // Mapping function - when there's only transformer, use original resource
+      if (resource && !targetResourceName) targetResourceName = resource;
+          // Object: { resource, transform }
     if (typeof entry === 'object' && entry.resource) return entry.resource;
     return resource;
-    }
+  }
 
   _getDestResourceObj(resource) {
     if (!this.client || !this.client.resources) return null;
@@ -292,15 +308,15 @@ class S3dbReplicator extends BaseReplicator {
     // If no action is specified, just check if resource is configured
     if (!action) return true;
     
-    // Suporte a todos os estilos de configuração
-    // Se for array de objetos, checar actions
+    // Support for all configuration styles
+          // If it's an array of objects, check actions
     if (Array.isArray(entry)) {
       for (const item of entry) {
         if (typeof item === 'object' && item.resource) {
           if (item.actions && Array.isArray(item.actions)) {
             if (item.actions.includes(action)) return true;
           } else {
-            return true; // Se não há actions, aceita todas
+            return true; // If no actions, accept all
           }
         } else if (typeof item === 'string' || typeof item === 'function') {
           return true;

package/src/plugins/replicators/sqs-replicator.class.js

@@ -29,7 +29,6 @@ import BaseReplicator from './base-replicator.class.js';
 class SqsReplicator extends BaseReplicator {
   constructor(config = {}, resources = [], client = null) {
     super(config);
-    this.resources = resources;
     this.client = client;
     this.queueUrl = config.queueUrl;
     this.queues = config.queues || {};
@@ -39,13 +38,26 @@ class SqsReplicator extends BaseReplicator {
     this.messageGroupId = config.messageGroupId;
     this.deduplicationId = config.deduplicationId;
     
-    // Build queues from resources configuration
-    if (resources && typeof resources === 'object') {
+    // Normalize resources to object format
+    if (Array.isArray(resources)) {
+      this.resources = {};
+      for (const resource of resources) {
+        if (typeof resource === 'string') {
+          this.resources[resource] = true;
+        } else if (typeof resource === 'object' && resource.name) {
+          this.resources[resource.name] = resource;
+        }
+      }
+    } else if (typeof resources === 'object') {
+      this.resources = resources;
+      // Build queues from resources configuration
       for (const [resourceName, resourceConfig] of Object.entries(resources)) {
-        if (resourceConfig.queueUrl) {
+        if (resourceConfig && resourceConfig.queueUrl) {
           this.queues[resourceName] = resourceConfig.queueUrl;
         }
       }
+    } else {
+      this.resources = {};
     }
   }
 
@@ -297,7 +309,7 @@ class SqsReplicator extends BaseReplicator {
       connected: !!this.sqsClient,
       queueUrl: this.queueUrl,
       region: this.region,
-      resources: this.resources,
+      resources: Object.keys(this.resources || {}),
       totalreplicators: this.listenerCount('replicated'),
       totalErrors: this.listenerCount('replicator_error')
     };

package/src/resource.class.js

@@ -171,7 +171,7 @@ export class Resource extends EventEmitter {
             if (typeof fn === 'function') {
               this.hooks[event].push(fn.bind(this));
             }
-            // Se não for função, ignore silenciosamente
+            // If not a function, ignore silently
           }
         }
       }
@@ -704,7 +704,7 @@ export class Resource extends EventEmitter {
     // LOG: body e contentType antes do putObject
     // Only throw if behavior is 'body-only' and body is empty
     if (this.behavior === 'body-only' && (!body || body === "")) {
-      throw new Error(`[Resource.insert] Tentativa de gravar objeto sem body! Dados: id=${finalId}, resource=${this.name}`);
+      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
@@ -753,7 +753,7 @@ export class Resource extends EventEmitter {
 
     // Execute afterInsert hooks
     const finalResult = await this.executeHooks('afterInsert', insertedData);
-    // Emit event com dados antes dos hooks afterInsert
+    // Emit event with data before afterInsert hooks
     this.emit("insert", {
       ...insertedData,
       $before: { ...completeData },
@@ -774,7 +774,7 @@ export class Resource extends EventEmitter {
     if (isEmpty(id)) throw new Error('id cannot be empty');
     
     const key = this.getResourceKey(id);
-    // LOG: início do get
+    // LOG: start of get
     // eslint-disable-next-line no-console
     const [ok, err, request] = await tryFn(() => this.client.getObject(key));
     // LOG: resultado do headObject
@@ -788,7 +788,7 @@ export class Resource extends EventEmitter {
         id
       });
     }
-    // Se o objeto existe mas não tem conteúdo, lançar erro NoSuchKey
+    // 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';
@@ -1346,7 +1346,7 @@ export class Resource extends EventEmitter {
         prefix = `resource=${this.name}/partition=${partition}`;
       }
     } else {
-      // List from main resource (sem versão no path)
+      // List from main resource (without version in path)
       prefix = `resource=${this.name}/data`;
     }
     // Use getKeysPage for real pagination support
@@ -1892,7 +1892,7 @@ export class Resource extends EventEmitter {
     for (const [partitionName, partition] of Object.entries(partitions)) {
       const partitionKey = this.getPartitionKey({ partitionName, id: data.id, data });
       if (partitionKey) {
-        // Salvar apenas a versão como metadado, nunca atributos do objeto
+        // Save only version as metadata, never object attributes
         const partitionMetadata = {
           _v: String(this.version)
         };
@@ -2082,7 +2082,7 @@ export class Resource extends EventEmitter {
       // Create new partition reference if new key exists
       if (newPartitionKey) {
         const [ok, err] = await tryFn(async () => {
-          // Salvar apenas a versão como metadado
+          // Save only version as metadata
           const partitionMetadata = {
             _v: String(this.version)
           };
@@ -2101,7 +2101,7 @@ export class Resource extends EventEmitter {
     } else if (newPartitionKey) {
       // If partition keys are the same, just update the existing reference
       const [ok, err] = await tryFn(async () => {
-        // Salvar apenas a versão como metadado
+        // Save only version as metadata
         const partitionMetadata = {
           _v: String(this.version)
         };
@@ -2138,7 +2138,7 @@ export class Resource extends EventEmitter {
       }
       const partitionKey = this.getPartitionKey({ partitionName, id: data.id, data });
       if (partitionKey) {
-        // Salvar apenas a versão como metadado
+        // Save only version as metadata
         const partitionMetadata = {
           _v: String(this.version)
         };
@@ -2306,8 +2306,8 @@ export class Resource extends EventEmitter {
   }
 
   /**
-   * Compose the full object (metadata + body) as retornado por .get(),
-   * usando os dados em memória após insert/update, de acordo com o behavior
+   * Compose the full object (metadata + body) as returned by .get(),
+   * using in-memory data after insert/update, according to behavior
    */
   async composeFullObjectFromWrite({ id, metadata, body, behavior }) {
     // Preserve behavior flags before unmapping
@@ -2464,7 +2464,7 @@ export class Resource extends EventEmitter {
     this._middlewares.get(method).push(fn);
   }
 
-  // Utilitário para aplicar valores default do schema
+  // Utility to apply schema default values
   applyDefaults(data) {
     const out = { ...data };
     for (const [key, def] of Object.entries(this.attributes)) {
@@ -2473,7 +2473,7 @@ export class Resource extends EventEmitter {
           const match = def.match(/default:([^|]+)/);
           if (match) {
             let val = match[1];
-            // Conversão para boolean/number se necessário
+            // Convert to boolean/number if necessary
             if (def.includes('boolean')) val = val === 'true';
             else if (def.includes('number')) val = Number(val);
             out[key] = val;

package/src/schema.class.js

@@ -484,7 +484,7 @@ export class Schema {
    */
   static _importAttributes(attrs) {
     if (typeof attrs === 'string') {
-      // Tenta detectar se é um objeto serializado como string JSON
+      // Try to detect if it's an object serialized as JSON string
       const [ok, err, parsed] = tryFnSync(() => JSON.parse(attrs));
       if (ok && typeof parsed === 'object' && parsed !== null) {
         const [okNested, errNested, nested] = tryFnSync(() => Schema._importAttributes(parsed));
@@ -687,9 +687,9 @@ export class Schema {
           properties: this.preprocessAttributesForValidation(value),
           strict: false
         };
-        // Se for explicitamente required, não marca como opcional
+        // If explicitly required, don't mark as optional
         if (isExplicitRequired) {
-          // nada
+          // nothing
         } else if (isExplicitOptional || this.allNestedObjectsOptional) {
           objectConfig.optional = true;
         }