s3db.js 8.0.1 → 8.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s3db.js",
-  "version": "8.0.1",
+  "version": "8.0.3",
   "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",

package/src/client.class.js

@@ -34,7 +34,7 @@ export class Client extends EventEmitter {
   }) {
     super();
     this.verbose = verbose;
-    this.id = id ?? idGenerator();
+    this.id = id ?? idGenerator(77);
     this.parallelism = parallelism;
     this.config = new ConnectionString(connectionString);
     this.httpClientOptions = {

package/src/database.class.js

@@ -6,13 +6,15 @@ import jsonStableStringify from "json-stable-stringify";
 import Client from "./client.class.js";
 import tryFn from "./concerns/try-fn.js";
 import Resource from "./resource.class.js";
-import { streamToString } from "./stream/index.js";
 import { ResourceNotFound } from "./errors.js";
+import { idGenerator } from "./concerns/id.js";
+import { streamToString } from "./stream/index.js";
 
 export class Database extends EventEmitter {
   constructor(options) {
     super();
 
+    this.id = idGenerator(7)
     this.version = "1";
     // Version is injected during build, fallback to "latest" for development
     this.s3dbVersion = (() => {

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

@@ -91,8 +91,8 @@ export class MemoryCache extends Cache {
     super(config);
     this.cache = {};
     this.meta = {};
-    this.maxSize = config.maxSize || 0;
-    this.ttl = config.ttl || 0;
+    this.maxSize = config.maxSize !== undefined ? config.maxSize : 1000;
+    this.ttl = config.ttl !== undefined ? config.ttl : 300000;
   }
 
   async _set(key, data) {

package/src/plugins/cache.plugin.js

@@ -11,14 +11,26 @@ import tryFn from "../concerns/try-fn.js";
 export class CachePlugin extends Plugin {
   constructor(options = {}) {
     super(options);
-    this.driver = options.driver;
-    this.config = {
-      includePartitions: options.includePartitions !== false,
-      partitionStrategy: options.partitionStrategy || 'hierarchical',
-      partitionAware: options.partitionAware !== false,
-      trackUsage: options.trackUsage !== false,
-      preloadRelated: options.preloadRelated !== false,
-      ...options
+    
+    // Extract primary configuration
+    this.driverName = options.driver || 's3';
+    this.ttl = options.ttl;
+    this.maxSize = options.maxSize;
+    this.config = options.config || {};
+    
+    // Plugin-level settings
+    this.includePartitions = options.includePartitions !== false;
+    this.partitionStrategy = options.partitionStrategy || 'hierarchical';
+    this.partitionAware = options.partitionAware !== false;
+    this.trackUsage = options.trackUsage !== false;
+    this.preloadRelated = options.preloadRelated !== false;
+    
+    // Legacy support - keep the old options for backward compatibility
+    this.legacyConfig = {
+      memoryOptions: options.memoryOptions,
+      filesystemOptions: options.filesystemOptions,
+      s3Options: options.s3Options,
+      driver: options.driver
     };
   }
 
@@ -28,26 +40,68 @@ export class CachePlugin extends Plugin {
 
   async onSetup() {
     // Initialize cache driver
-    if (this.config.driver && typeof this.config.driver === 'object') {
+    if (this.driverName && typeof this.driverName === 'object') {
       // Use custom driver instance if provided
-      this.driver = this.config.driver;
-    } else if (this.config.driver === 'memory') {
-      this.driver = new MemoryCache(this.config.memoryOptions || {});
-    } else if (this.config.driver === 'filesystem') {
+      this.driver = this.driverName;
+    } else if (this.driverName === 'memory') {
+      // Build driver configuration with proper precedence
+      const driverConfig = {
+        ...this.legacyConfig.memoryOptions, // Legacy support (lowest priority)
+        ...this.config, // New config format (medium priority)
+      };
+      
+      // Add global settings if defined (highest priority)
+      if (this.ttl !== undefined) {
+        driverConfig.ttl = this.ttl;
+      }
+      if (this.maxSize !== undefined) {
+        driverConfig.maxSize = this.maxSize;
+      }
+      
+      this.driver = new MemoryCache(driverConfig);
+    } else if (this.driverName === 'filesystem') {
+      // Build driver configuration with proper precedence
+      const driverConfig = {
+        ...this.legacyConfig.filesystemOptions, // Legacy support (lowest priority)
+        ...this.config, // New config format (medium priority)
+      };
+      
+      // Add global settings if defined (highest priority)
+      if (this.ttl !== undefined) {
+        driverConfig.ttl = this.ttl;
+      }
+      if (this.maxSize !== undefined) {
+        driverConfig.maxSize = this.maxSize;
+      }
+      
       // Use partition-aware filesystem cache if enabled
-      if (this.config.partitionAware) {
+      if (this.partitionAware) {
         this.driver = new PartitionAwareFilesystemCache({
-          partitionStrategy: this.config.partitionStrategy,
-          trackUsage: this.config.trackUsage,
-          preloadRelated: this.config.preloadRelated,
-          ...this.config.filesystemOptions
+          partitionStrategy: this.partitionStrategy,
+          trackUsage: this.trackUsage,
+          preloadRelated: this.preloadRelated,
+          ...driverConfig
         });
       } else {
-        this.driver = new FilesystemCache(this.config.filesystemOptions || {});
+        this.driver = new FilesystemCache(driverConfig);
       }
     } else {
-      // Default to S3Cache, sempre passa o client do database
-      this.driver = new S3Cache({ client: this.database.client, ...(this.config.s3Options || {}) });
+      // Default to S3Cache - build driver configuration with proper precedence
+      const driverConfig = {
+        client: this.database.client, // Required for S3Cache
+        ...this.legacyConfig.s3Options, // Legacy support (lowest priority)
+        ...this.config, // New config format (medium priority)
+      };
+      
+      // Add global settings if defined (highest priority)
+      if (this.ttl !== undefined) {
+        driverConfig.ttl = this.ttl;
+      }
+      if (this.maxSize !== undefined) {
+        driverConfig.maxSize = this.maxSize;
+      }
+      
+      this.driver = new S3Cache(driverConfig);
     }
 
     // Use database hooks instead of method overwriting

package/src/resource.class.js

@@ -7,14 +7,13 @@ import { PromisePool } from "@supercharge/promise-pool";
 import { chunk, cloneDeep, merge, isEmpty, isObject } from "lodash-es";
 
 import Schema from "./schema.class.js";
-import tryFn, { tryFnSync } from "./concerns/try-fn.js";
 import { streamToString } from "./stream/index.js";
-import { InvalidResourceItem, ResourceError, PartitionError } from "./errors.js";
+import tryFn, { tryFnSync } from "./concerns/try-fn.js";
 import { ResourceReader, ResourceWriter } from "./stream/index.js"
 import { getBehavior, DEFAULT_BEHAVIOR } from "./behaviors/index.js";
 import { idGenerator as defaultIdGenerator } from "./concerns/id.js";
 import { calculateTotalSize, calculateEffectiveLimit } from "./concerns/calculator.js";
-import { mapAwsError } from "./errors.js";
+import { mapAwsError, InvalidResourceItem, ResourceError, PartitionError } from "./errors.js";
 
 
 export class Resource extends EventEmitter {
@@ -99,12 +98,19 @@ export class Resource extends EventEmitter {
    */
   constructor(config = {}) {
     super();
-    this._instanceId = Math.random().toString(36).slice(2, 8);
+    this._instanceId = defaultIdGenerator(7);
 
     // Validate configuration
     const validation = validateResourceConfig(config);
     if (!validation.isValid) {
-      throw new ResourceError(`Invalid Resource ${config.name} configuration`, { resourceName: config.name, validation: validation.errors, operation: 'constructor', suggestion: 'Check resource config and attributes.' });
+      const errorDetails = validation.errors.map(err => `  • ${err}`).join('\n');
+      throw new ResourceError(
+        `Invalid Resource ${config.name || '[unnamed]'} configuration:\n${errorDetails}`, 
+        { 
+          resourceName: config.name, 
+          validation: validation.errors, 
+        }
+      );
     }
 
     // Extract configuration with defaults - all at root level