s3db.js 7.3.3 → 7.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s3db.js",
-  "version": "7.3.3",
+  "version": "7.3.5",
   "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",
@@ -43,27 +43,6 @@
     "PLUGINS.md",
     "UNLICENSE"
   ],
-  "scripts": {
-    "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",
-    "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 --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js --detectOpenHandles --runInBand",
-    "test:full": "npm run test:js && npm run test:ts",
-    "test:cache": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js tests/plugins/plugin-cache*.test.js --runInBand",
-    "test:quick": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand --testTimeout=10000",
-    "test:batch": "./test-batch.sh",
-    "test:plugins": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js tests/plugins/ --runInBand --testTimeout=60000",
-    "test:plugins:fast": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js tests/plugins/ --runInBand --testTimeout=15000 --testPathIgnorePatterns='plugin-audit.test.js|plugin-replicator-s3db.test.js|plugin-fulltext.test.js'",
-    "test:slow": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js tests/plugins/plugin-audit.test.js tests/plugins/plugin-replicator-s3db.test.js tests/plugins/plugin-fulltext.test.js --runInBand --testTimeout=120000",
-    "test:types": "tsc --noEmit --project tests/typescript/tsconfig.json",
-    "test:types:basic": "tsc --noEmit tests/typescript/basic-usage.test.ts",
-    "test:types:direct": "tsc --noEmit tests/typescript/direct-type-test.ts",
-    "test:types:watch": "tsc --noEmit --watch --project tests/typescript/tsconfig.json",
-    "validate:types": "npm run test:types && echo 'TypeScript definitions are valid!'"
-  },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.848.0",
     "@supercharge/promise-pool": "^3.2.0",
@@ -115,5 +94,26 @@
   },
   "funding": [
     "https://github.com/sponsors/forattini-dev"
-  ]
-}
+  ],
+  "scripts": {
+    "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",
+    "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 --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js --detectOpenHandles --runInBand",
+    "test:full": "npm run test:js && npm run test:ts",
+    "test:cache": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js tests/plugins/plugin-cache*.test.js --runInBand",
+    "test:quick": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand --testTimeout=10000",
+    "test:batch": "./test-batch.sh",
+    "test:plugins": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js tests/plugins/ --runInBand --testTimeout=60000",
+    "test:plugins:fast": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js tests/plugins/ --runInBand --testTimeout=15000 --testPathIgnorePatterns='plugin-audit.test.js|plugin-replicator-s3db.test.js|plugin-fulltext.test.js'",
+    "test:slow": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js tests/plugins/plugin-audit.test.js tests/plugins/plugin-replicator-s3db.test.js tests/plugins/plugin-fulltext.test.js --runInBand --testTimeout=120000",
+    "test:types": "tsc --noEmit --project tests/typescript/tsconfig.json",
+    "test:types:basic": "tsc --noEmit tests/typescript/basic-usage.test.ts",
+    "test:types:direct": "tsc --noEmit tests/typescript/direct-type-test.ts",
+    "test:types:watch": "tsc --noEmit --watch --project tests/typescript/tsconfig.json",
+    "validate:types": "npm run test:types && echo 'TypeScript definitions are valid!'"
+  }
+}

package/src/database.class.js

@@ -74,15 +74,17 @@ export class Database extends EventEmitter {
     // Add process exit listener for cleanup
     if (!this._exitListenerRegistered) {
       this._exitListenerRegistered = true;
-      process.on('exit', async () => {
-        if (this.isConnected()) {
-          try {
-            await this.disconnect();
-          } catch (err) {
-            // Silently ignore errors on exit
+      if (typeof process !== 'undefined') {
+        process.on('exit', async () => {
+          if (this.isConnected()) {
+            try {
+              await this.disconnect();
+            } catch (err) {
+              // Silently ignore errors on exit
+            }
           }
-        }
-      });
+        });
+      }
     }
   }
   

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

@@ -79,19 +79,12 @@
  * - Metadata includes creation time, compression info, and custom properties
  */
 import fs from 'fs';
+import { readFile, writeFile, unlink, readdir, stat, mkdir } from 'fs/promises';
 import path from 'path';
 import zlib from 'node:zlib';
-import { promisify } from 'util';
 import { Cache } from './cache.class.js';
 import tryFn from '../../concerns/try-fn.js';
 
-const readFile = promisify(fs.readFile);
-const writeFile = promisify(fs.writeFile);
-const unlink = promisify(fs.unlink);
-const readdir = promisify(fs.readdir);
-const stat = promisify(fs.stat);
-const mkdir = promisify(fs.mkdir);
-
 export class FilesystemCache extends Cache {
   constructor({
     directory,

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

@@ -24,17 +24,10 @@
  */
 import path from 'path';
 import fs from 'fs';
-import { promisify } from 'util';
+import { mkdir, rm as rmdir, readdir, stat, writeFile, readFile } from 'fs/promises';
 import { FilesystemCache } from './filesystem-cache.class.js';
 import tryFn from '../../concerns/try-fn.js';
 
-const mkdir = promisify(fs.mkdir);
-const rmdir = promisify(fs.rm);
-const readdir = promisify(fs.readdir);
-const stat = promisify(fs.stat);
-const writeFile = promisify(fs.writeFile);
-const readFile = promisify(fs.readFile);
-
 export class PartitionAwareFilesystemCache extends FilesystemCache {
   constructor({
     partitionStrategy = 'hierarchical', // 'hierarchical', 'flat', 'temporal'

package/src/plugins/metrics.plugin.js

@@ -33,7 +33,7 @@ export class MetricsPlugin extends Plugin {
 
   async setup(database) {
     this.database = database;
-    if (process.env.NODE_ENV === 'test') return;
+    if (typeof process !== 'undefined' && process.env.NODE_ENV === 'test') return;
 
     const [ok, err] = await tryFn(async () => {
       const [ok1, err1, metricsResource] = await tryFn(() => database.createResource({
@@ -90,7 +90,7 @@ export class MetricsPlugin extends Plugin {
     this.installMetricsHooks();
     
     // Disable flush timer during tests to avoid side effects
-    if (process.env.NODE_ENV !== 'test') {
+    if (typeof process !== 'undefined' && process.env.NODE_ENV !== 'test') {
       this.startFlushTimer();
     }
   }
@@ -107,7 +107,7 @@ export class MetricsPlugin extends Plugin {
     }
     
     // Don't flush metrics during tests
-    if (process.env.NODE_ENV !== 'test') {
+    if (typeof process !== 'undefined' && process.env.NODE_ENV !== 'test') {
       await this.flushMetrics();
     }
   }
@@ -328,11 +328,21 @@ export class MetricsPlugin extends Plugin {
     if (!this.metricsResource) return;
 
     const [ok, err] = await tryFn(async () => {
-      // Use empty metadata during tests to avoid header issues
-      const metadata = process.env.NODE_ENV === 'test' ? {} : { global: 'true' };
-      const perfMetadata = process.env.NODE_ENV === 'test' ? {} : { perf: 'true' };
-      const errorMetadata = process.env.NODE_ENV === 'test' ? {} : { error: 'true' };
-      const resourceMetadata = process.env.NODE_ENV === 'test' ? {} : { resource: 'true' };
+      let metadata, perfMetadata, errorMetadata, resourceMetadata;
+      
+      if (typeof process !== 'undefined' && process.env.NODE_ENV === 'test') {
+        // Use empty metadata during tests to avoid header issues
+        metadata = {};
+        perfMetadata = {};
+        errorMetadata = {};
+        resourceMetadata = {};
+      } else {
+        // Use empty metadata during tests to avoid header issues
+        metadata = { global: 'true' };
+        perfMetadata = { perf: 'true' };
+        errorMetadata = { error: 'true' };
+        resourceMetadata = { resource: 'true' };
+      }
 
       // Flush operation metrics
       for (const [operation, data] of Object.entries(this.metrics.operations)) {

package/src/plugins/replicator.plugin.js

@@ -1,5 +1,3 @@
-import { isPlainObject } from 'lodash-es';
-
 import Plugin from "./plugin.class.js";
 import tryFn from "../concerns/try-fn.js";
 import { createReplicator, validateReplicatorConfig } from "./replicators/index.js";
@@ -300,36 +298,12 @@ export class ReplicatorPlugin extends Plugin {
     // await this.processQueue(); // Removed as per edit hint
   }
 
-  filterInternalFields(data) {
-    if (!data || typeof data !== 'object') return data;
-    const filtered = {};
-    for (const [key, value] of Object.entries(data)) {
-      // Filter out internal fields that start with _ or $
-      if (!key.startsWith('_') && !key.startsWith('$')) {
-        filtered[key] = value;
-      }
-    }
-    return filtered;
-  }
-
   async uploadMetadataFile(database) {
     if (typeof database.uploadMetadataFile === 'function') {
       await database.uploadMetadataFile();
     }
   }
 
-  async getCompleteData(resource, data) {
-    try {
-      const [ok, err, record] = await tryFn(() => resource.get(data.id));
-      if (ok && record) {
-        return record;
-      }
-    } catch (error) {
-      // Fallback to provided data
-    }
-    return data;
-  }
-
   async retryWithBackoff(operation, maxRetries = 3) {
     let lastError;
     for (let attempt = 1; attempt <= maxRetries; attempt++) {

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

@@ -209,9 +209,9 @@ class S3dbReplicator extends BaseReplicator {
     }
     // String mapping
     if (typeof entry === 'string') return entry;
-          // Mapping function - when there's only transformer, use original resource
-      if (resource && !targetResourceName) targetResourceName = resource;
-          // Object: { resource, transform }
+    // Mapping function - when there's only transformer, use original resource
+    if (typeof entry === 'function') return resource;
+    // Object: { resource, transform }
     if (typeof entry === 'object' && entry.resource) return entry.resource;
     return resource;
   }