s3db.js 13.0.0 → 13.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s3db.js",
-  "version": "13.0.0",
+  "version": "13.1.0",
   "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/plugins/api/index.js

@@ -35,6 +35,7 @@
 import { Plugin } from '../plugin.class.js';
 import { requirePluginDependency } from '../concerns/plugin-dependencies.js';
 import tryFn from '../../concerns/try-fn.js';
+import { ApiServer } from './server.js';
 
 /**
  * API Plugin class
@@ -460,11 +461,6 @@ export class ApiPlugin extends Plugin {
       console.log('[API Plugin] Starting server...');
     }
 
-    // Dynamic import with path manipulation to prevent Rollup from inlining
-    // This ensures hono is only loaded when ApiPlugin is actually used
-    const serverPath = './server' + '.js';
-    const { ApiServer } = await import(/* @vite-ignore */ serverPath);
-
     // Create server instance
     this.server = new ApiServer({
       port: this.config.port,
@@ -546,5 +542,3 @@ export class ApiPlugin extends Plugin {
     return this.server ? this.server.getApp() : null;
   }
 }
-
-export default ApiPlugin;

package/src/plugins/api/routes/resource-routes.js

@@ -4,7 +4,6 @@
  * Automatically generates REST endpoints for each resource
  */
 
-import { Hono } from 'hono';
 import { asyncHandler } from '../utils/error-handler.js';
 import * as formatter from '../utils/response-formatter.js';
 
@@ -51,9 +50,10 @@ function parseCustomRoute(routeDef) {
  * @param {Object} resource - s3db.js Resource instance
  * @param {string} version - Resource version (e.g., 'v1', 'v1')
  * @param {Object} config - Route configuration
+ * @param {Function} Hono - Hono constructor (passed from server.js)
  * @returns {Hono} Hono app with resource routes
  */
-export function createResourceRoutes(resource, version, config = {}) {
+export function createResourceRoutes(resource, version, config = {}, Hono) {
   const app = new Hono();
   const {
     methods = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'HEAD', 'OPTIONS'],
@@ -385,7 +385,7 @@ export function createResourceRoutes(resource, version, config = {}) {
  * @param {string} version - Resource version (e.g., 'v1')
  * @returns {Hono} Hono app with relational routes
  */
-export function createRelationalRoutes(sourceResource, relationName, relationConfig, version) {
+export function createRelationalRoutes(sourceResource, relationName, relationConfig, version, Hono) {
   const app = new Hono();
   const resourceName = sourceResource.name;
   const relatedResourceName = relationConfig.resource;

package/src/plugins/api/server.js

@@ -4,9 +4,6 @@
  * Manages HTTP server lifecycle and routing
  */
 
-import { Hono } from 'hono';
-import { serve } from '@hono/node-server';
-import { swaggerUI } from '@hono/swagger-ui';
 import { createResourceRoutes, createRelationalRoutes } from './routes/resource-routes.js';
 import { errorHandler } from './utils/error-handler.js';
 import * as formatter from './utils/response-formatter.js';
@@ -46,17 +43,18 @@ export class ApiServer {
       }
     };
 
-    this.app = new Hono();
+    this.app = null; // Will be initialized in start() with dynamic import
     this.server = null;
     this.isRunning = false;
     this.openAPISpec = null;
+    this.initialized = false;
 
     // Detect if RelationPlugin is installed
     this.relationsPlugin = this.options.database?.plugins?.relation ||
                           this.options.database?.plugins?.RelationPlugin ||
                           null;
 
-    this._setupRoutes();
+    // Routes will be setup in start() after dynamic import
   }
 
   /**
@@ -170,7 +168,7 @@ export class ApiServer {
 
       // API Documentation UI endpoint
       if (this.options.docsUI === 'swagger') {
-        this.app.get('/docs', swaggerUI({
+        this.app.get('/docs', this.swaggerUI({
           url: '/openapi.json'
         }));
       } else {
@@ -254,7 +252,7 @@ export class ApiServer {
         methods: config.methods,
         customMiddleware: config.customMiddleware || [],
         enableValidation: config.validation !== false
-      });
+      }, this.Hono);
 
       // Mount resource routes
       this.app.route(`/${version}/${name}`, resourceApp);
@@ -317,7 +315,8 @@ export class ApiServer {
           resource,
           relationName,
           relationConfig,
-          version
+          version,
+          this.Hono
         );
 
         // Mount relational routes at /{version}/{resource}/:id/{relation}
@@ -343,11 +342,32 @@ export class ApiServer {
       return;
     }
 
+    // Dynamic import of Hono dependencies (peer dependencies)
+    // This ensures hono is only loaded when server actually starts
+    if (!this.initialized) {
+      const { Hono } = await import('hono');
+      const { serve } = await import('@hono/node-server');
+      const { swaggerUI } = await import('@hono/swagger-ui');
+
+      // Store for use in _setupRoutes
+      this.Hono = Hono;
+      this.serve = serve;
+      this.swaggerUI = swaggerUI;
+
+      // Initialize app
+      this.app = new Hono();
+
+      // Setup all routes
+      this._setupRoutes();
+
+      this.initialized = true;
+    }
+
     const { port, host } = this.options;
 
     return new Promise((resolve, reject) => {
       try {
-        this.server = serve({
+        this.server = this.serve({
           fetch: this.app.fetch,
           port,
           hostname: host

package/src/plugins/audit.plugin.js

@@ -1,4 +1,4 @@
-import Plugin from "./plugin.class.js";
+import { Plugin } from "./plugin.class.js";
 import tryFn from "../concerns/try-fn.js";
 
 export class AuditPlugin extends Plugin {
@@ -420,6 +420,4 @@ export class AuditPlugin extends Plugin {
 
     return deletedCount;
   }
-}
-
-export default AuditPlugin; 
+} 

package/src/plugins/backup.plugin.js

@@ -1,4 +1,4 @@
-import Plugin from "./plugin.class.js";
+import { Plugin } from "./plugin.class.js";
 import tryFn from "../concerns/try-fn.js";
 import { createBackupDriver, validateBackupConfig } from "./backup/index.js";
 import { StreamingExporter } from "./backup/streaming-exporter.js";
@@ -982,6 +982,4 @@ export class BackupPlugin extends Plugin {
       await this.driver.cleanup();
     }
   }
-}
-
-export default BackupPlugin;
+}

package/src/plugins/cache.plugin.js

@@ -2,7 +2,7 @@ import { join } from "path";
 import jsonStableStringify from "json-stable-stringify";
 import crypto from 'crypto';
 
-import Plugin from "./plugin.class.js";
+import { Plugin } from "./plugin.class.js";
 import S3Cache from "./cache/s3-cache.class.js";
 import MemoryCache from "./cache/memory-cache.class.js";
 import { FilesystemCache } from "./cache/filesystem-cache.class.js";
@@ -781,5 +781,3 @@ export class CachePlugin extends Plugin {
     return parts.join(' ');
   }
 }
-
-export default CachePlugin;

package/src/plugins/costs.plugin.js

@@ -299,5 +299,3 @@ export class CostsPlugin extends Plugin {
     }
   }
 }
-
-export default CostsPlugin;

package/src/plugins/eventual-consistency/index.js

@@ -4,7 +4,7 @@
  * @module eventual-consistency
  */
 
-import Plugin from "../plugin.class.js";
+import { Plugin } from "../plugin.class.js";
 import { createConfig, validateResourcesConfig, logConfigWarnings, logInitialization } from "./config.js";
 import { detectTimezone, getCohortInfo, createFieldHandler } from "./utils.js";
 import { createPartitionConfig } from "./partitions.js";
@@ -733,5 +733,3 @@ export class EventualConsistencyPlugin extends Plugin {
     return diagnostics;
   }
 }
-
-export default EventualConsistencyPlugin;

package/src/plugins/fulltext.plugin.js

@@ -1,4 +1,4 @@
-import Plugin from "./plugin.class.js";
+import { Plugin } from "./plugin.class.js";
 import tryFn from "../concerns/try-fn.js";
 import { FulltextError } from "./fulltext.errors.js";
 
@@ -554,6 +554,4 @@ export class FullTextPlugin extends Plugin {
     // Save changes
     await this.saveIndexes();
   }
-}
-
-export default FullTextPlugin; 
+} 

package/src/plugins/geo.plugin.js

@@ -1,4 +1,4 @@
-import Plugin from "./plugin.class.js";
+import { Plugin } from "./plugin.class.js";
 import tryFn from "../concerns/try-fn.js";
 
 /**
@@ -868,5 +868,3 @@ export class GeoPlugin extends Plugin {
     await super.uninstall();
   }
 }
-
-export default GeoPlugin;

package/src/plugins/importer/index.js

@@ -1016,5 +1016,3 @@ export const Transformers = {
     return String(value).trim();
   }
 };
-
-export default ImporterPlugin;

package/src/plugins/index.js

@@ -1,6 +1,5 @@
 export * from './plugin.class.js'
 export * from './plugin.obj.js'
-export { default as Plugin } from './plugin.class.js'
 
 // plugins:
 // ApiPlugin is exported separately to avoid bundling hono dependencies

package/src/plugins/metrics.plugin.js

@@ -1,4 +1,4 @@
-import Plugin from "./plugin.class.js";
+import { Plugin } from "./plugin.class.js";
 import tryFn from "../concerns/try-fn.js";
 
 export class MetricsPlugin extends Plugin {
@@ -831,6 +831,4 @@ export class MetricsPlugin extends Plugin {
       console.error('[Metrics Plugin] Standalone metrics server error:', err);
     });
   }
-}
-
-export default MetricsPlugin; 
+}