@farm.js/core 0.1.39 → 0.1.41

package/dist/{chunk-ZXH4TS3F.cjs → chunk-NBPNUQYO.cjs}

@@ -3,65 +3,11 @@
 var _chunkAI7QMY7Ocjs = require('./chunk-AI7QMY7O.cjs');
 
 
-var _chunk6XWDE2P2cjs = require('./chunk-6XWDE2P2.cjs');
+var _chunkZTP3BJG6cjs = require('./chunk-ZTP3BJG6.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
 
-// src/middleware/server.ts
-var _async_hooks = require('async_hooks');
-var MIDDLEWARE_DATA_STORE_KEY = /* @__PURE__ */ Symbol.for("farm.middlewareDataStore");
-var MIDDLEWARE_CONTEXT_STORE_KEY = /* @__PURE__ */ Symbol.for("farm.middlewareContextStore");
-function getGlobalMiddlewareStore(key) {
-  const state = globalThis;
-  const existing = state[key];
-  if (existing instanceof _async_hooks.AsyncLocalStorage) {
-    return existing;
-  }
-  const store = new (0, _async_hooks.AsyncLocalStorage)();
-  state[key] = store;
-  return store;
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, getGlobalMiddlewareStore, "getGlobalMiddlewareStore");
-var middlewareStore = getGlobalMiddlewareStore(MIDDLEWARE_DATA_STORE_KEY);
-var middlewareContextStore = getGlobalMiddlewareStore(MIDDLEWARE_CONTEXT_STORE_KEY);
-function toMiddlewareMap(data) {
-  if (data instanceof Map) {
-    return new Map(data);
-  }
-  return new Map(Object.entries(data));
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, toMiddlewareMap, "toMiddlewareMap");
-function _clearCurrentMiddlewareData() {
-  middlewareStore.enterWith(/* @__PURE__ */ new Map());
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, _clearCurrentMiddlewareData, "_clearCurrentMiddlewareData");
-function _clearCurrentMiddlewareContext() {
-  middlewareContextStore.enterWith(/* @__PURE__ */ new Map());
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, _clearCurrentMiddlewareContext, "_clearCurrentMiddlewareContext");
-async function _runWithMiddlewareData(data, fn) {
-  return middlewareStore.run(toMiddlewareMap(data), fn);
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, _runWithMiddlewareData, "_runWithMiddlewareData");
-async function _runWithMiddlewareContext(context, fn) {
-  return middlewareContextStore.run(toMiddlewareMap(context), fn);
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, _runWithMiddlewareContext, "_runWithMiddlewareContext");
-function getMiddlewareData() {
-  return middlewareStore.getStore() || /* @__PURE__ */ new Map();
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, getMiddlewareData, "getMiddlewareData");
-function getMiddlewareValue(key) {
-  const data = getMiddlewareData();
-  return data.get(key);
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, getMiddlewareValue, "getMiddlewareValue");
-function getMiddlewareContext() {
-  return middlewareContextStore.getStore() || /* @__PURE__ */ new Map();
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, getMiddlewareContext, "getMiddlewareContext");
-
 // src/middleware/cookie-header.ts
 function parseMiddlewareCookieHeader(cookieHeader) {
   const cookies = /* @__PURE__ */ Object.create(null);
@@ -112,7 +58,7 @@ function toWebRequest(ctx) {
   if (isWebRequest(ctx.request)) {
     return ctx.request;
   }
-  return _chunk6XWDE2P2cjs.createWebRequestFromFarmRequest.call(void 0, ctx.request, { origin: ctx.url.origin });
+  return _chunkZTP3BJG6cjs.createWebRequestFromFarmRequest.call(void 0, ctx.request, { origin: ctx.url.origin });
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, toWebRequest, "toWebRequest");
 function createRequestMiddlewareContext(ctx) {
@@ -230,11 +176,4 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, normalizeMiddlewareModule, "normalizeMiddl
 
 
 
-
-
-
-
-
-
-
-exports._clearCurrentMiddlewareData = _clearCurrentMiddlewareData; exports._clearCurrentMiddlewareContext = _clearCurrentMiddlewareContext; exports._runWithMiddlewareData = _runWithMiddlewareData; exports._runWithMiddlewareContext = _runWithMiddlewareContext; exports.getMiddlewareData = getMiddlewareData; exports.getMiddlewareValue = getMiddlewareValue; exports.getMiddlewareContext = getMiddlewareContext; exports.parseMiddlewareCookieHeader = parseMiddlewareCookieHeader; exports.serializeMiddlewareCookie = serializeMiddlewareCookie; exports.serializeMiddlewareCookieDeletion = serializeMiddlewareCookieDeletion; exports.normalizeMiddlewareModule = normalizeMiddlewareModule;
+exports.parseMiddlewareCookieHeader = parseMiddlewareCookieHeader; exports.serializeMiddlewareCookie = serializeMiddlewareCookie; exports.serializeMiddlewareCookieDeletion = serializeMiddlewareCookieDeletion; exports.normalizeMiddlewareModule = normalizeMiddlewareModule;

package/dist/{chunk-VXEEATVD.cjs → chunk-NFG4PUPI.cjs}

@@ -6,7 +6,7 @@
 var _chunkDVM4FKZLcjs = require('./chunk-DVM4FKZL.cjs');
 
 
-var _chunk6XWDE2P2cjs = require('./chunk-6XWDE2P2.cjs');
+var _chunkZTP3BJG6cjs = require('./chunk-ZTP3BJG6.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
@@ -29,7 +29,7 @@ function createRewritesPlugin(rewrites, {
       if (overrideBeforeRequest) {
         await overrideBeforeRequest(req, res, context);
       }
-      const url = _chunk6XWDE2P2cjs.resolveFarmRequestURL.call(void 0, req);
+      const url = _chunkZTP3BJG6cjs.resolveFarmRequestURL.call(void 0, req);
       const routePath = _chunkDVM4FKZLcjs.resolveConfigRoutePathname.call(void 0, url.pathname, i18n);
       const pathname = routePath.pathname;
       for (const { rewrite, pattern } of compiledRewrites) {

package/dist/{chunk-INL3THCU.mjs → chunk-O7USYJ4U.mjs}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-SAXPH6G5.mjs";
 import {
   resolveFarmRequestURL
-} from "./chunk-POSPE3IO.mjs";
+} from "./chunk-X3NGFVRF.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";

package/dist/{chunk-4ZFL5GFN.cjs → chunk-OILHPMFX.cjs}

@@ -5,66 +5,81 @@ var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
 // src/storage/index.ts
 var _unstorage = require('unstorage');
 var _memory = require('unstorage/drivers/memory'); var _memory2 = _interopRequireDefault(_memory);
-var loadModule = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (specifier) => import(
-  /* @vite-ignore */
-  specifier
-), "loadModule");
+var STORAGE_MODULES_KEY = /* @__PURE__ */ Symbol.for("farmjs.storage.modules");
+function getRegisteredStorageModules() {
+  return globalThis[STORAGE_MODULES_KEY];
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, getRegisteredStorageModules, "getRegisteredStorageModules");
+var loadModule = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (specifier) => {
+  const registered = _optionalChain([getRegisteredStorageModules, 'call', _ => _(), 'optionalAccess', _2 => _2[specifier]]);
+  return registered ? registered() : import(
+    /* @vite-ignore */
+    specifier
+  );
+}, "loadModule");
+function _registerFarmStorageModules(loaders) {
+  globalThis[STORAGE_MODULES_KEY] = {
+    ...getRegisteredStorageModules(),
+    ...loaders
+  };
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, _registerFarmStorageModules, "_registerFarmStorageModules");
 var DATABASE_CONNECTORS = {
   sqlite: {
     connector: "node-sqlite",
-    load: /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => loadModule("db0/connectors/node-sqlite"), "load")
+    module: "db0/connectors/node-sqlite"
   },
   "node-sqlite": {
     connector: "node-sqlite",
-    load: /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => loadModule("db0/connectors/node-sqlite"), "load")
+    module: "db0/connectors/node-sqlite"
   },
   sqlite3: {
     connector: "sqlite3",
-    load: /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => loadModule("db0/connectors/sqlite3"), "load")
+    module: "db0/connectors/sqlite3"
   },
   "better-sqlite3": {
     connector: "better-sqlite3",
-    load: /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => loadModule("db0/connectors/better-sqlite3"), "load")
+    module: "db0/connectors/better-sqlite3"
   },
   postgres: {
     connector: "postgresql",
-    load: /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => loadModule("db0/connectors/postgresql"), "load")
+    module: "db0/connectors/postgresql"
   },
   postgresql: {
     connector: "postgresql",
-    load: /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => loadModule("db0/connectors/postgresql"), "load")
+    module: "db0/connectors/postgresql"
   },
   pg: {
     connector: "postgresql",
-    load: /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => loadModule("db0/connectors/postgresql"), "load")
+    module: "db0/connectors/postgresql"
   },
   mysql: {
     connector: "mysql2",
-    load: /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => loadModule("db0/connectors/mysql2"), "load")
+    module: "db0/connectors/mysql2"
   },
   mysql2: {
     connector: "mysql2",
-    load: /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => loadModule("db0/connectors/mysql2"), "load")
+    module: "db0/connectors/mysql2"
   },
   pglite: {
     connector: "pglite",
-    load: /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => loadModule("db0/connectors/pglite"), "load")
+    module: "db0/connectors/pglite"
   },
   planetscale: {
     connector: "planetscale",
-    load: /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => loadModule("db0/connectors/planetscale"), "load")
+    module: "db0/connectors/planetscale"
   },
   libsql: {
     connector: "libsql",
-    load: /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => loadModule("db0/connectors/libsql/node"), "load")
+    module: "db0/connectors/libsql/node"
   },
   "libsql-node": {
     connector: "libsql-node",
-    load: /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => loadModule("db0/connectors/libsql/node"), "load")
+    module: "db0/connectors/libsql/node"
   },
   "libsql-http": {
     connector: "libsql-http",
-    load: /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => loadModule("db0/connectors/libsql/http"), "load")
+    module: "db0/connectors/libsql/http"
   }
 };
 function createMemoryStorage() {
@@ -133,6 +148,7 @@ function extractDriverOptions(config) {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, extractDriverOptions, "extractDriverOptions");
 async function loadBuiltinDriver(name, options) {
+  if (name === "memory") return _memory2.default.call(void 0, );
   const modulePath = _unstorage.builtinDrivers[name];
   if (!modulePath) {
     throw new Error(`Unsupported storage driver "${name}".`);
@@ -145,7 +161,7 @@ async function loadDatabaseDriver(config) {
   const connectorEntry = DATABASE_CONNECTORS[config.driver];
   const [{ createDatabase }, connectorModule, db0DriverModule] = await Promise.all([
     loadModule("db0"),
-    connectorEntry.load(),
+    loadModule(connectorEntry.module),
     loadModule("unstorage/drivers/db0")
   ]);
   const database = createDatabase(connectorModule.default(extractDriverOptions(config) || {}));
@@ -165,7 +181,7 @@ async function resolveDriver(config) {
   if (config && isStorageClient(config)) {
     return config.resolveDriver();
   }
-  const driverInput = _nullishCoalesce(_optionalChain([config, 'optionalAccess', _ => _.driver]), () => ( "memory"));
+  const driverInput = _nullishCoalesce(_optionalChain([config, 'optionalAccess', _3 => _3.driver]), () => ( "memory"));
   if (typeof driverInput === "function") {
     return await driverInput();
   }
@@ -184,7 +200,8 @@ async function resolveDriver(config) {
   );
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, resolveDriver, "resolveDriver");
-function createStorageClientFromResolver(resolveDriver2) {
+var STORAGE_CLIENT_MODULES_KEY = /* @__PURE__ */ Symbol.for("farmjs.storage.clientModules");
+function createStorageClientFromResolver(resolveDriver2, modules = []) {
   let driverPromise;
   let storagePromise;
   const ensureDriver = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => {
@@ -216,7 +233,8 @@ function createStorageClientFromResolver(resolveDriver2) {
     kind: "farm-storage-client",
     ready: ensureStorage,
     createStorage: ensureStorage,
-    resolveDriver: ensureDriver
+    resolveDriver: ensureDriver,
+    [STORAGE_CLIENT_MODULES_KEY]: modules
   };
   return new Proxy(target, {
     get(currentTarget, prop, receiver) {
@@ -249,7 +267,10 @@ function defineStorageClient(resolveDriver2) {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, defineStorageClient, "defineStorageClient");
 function createStorageClient(config) {
-  return defineStorageClient(() => resolveDriver(config));
+  return createStorageClientFromResolver(
+    () => resolveDriver(config),
+    _collectFarmStorageModules(config)
+  );
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, createStorageClient, "createStorageClient");
 function driverStorage(driver) {
@@ -257,14 +278,14 @@ function driverStorage(driver) {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, driverStorage, "driverStorage");
 function databaseStorage(database, options = {}) {
-  return defineStorageClient(async () => {
+  return createStorageClientFromResolver(async () => {
     const db0DriverModule = await loadModule("unstorage/drivers/db0");
     const { dispose: _dispose, ...driver } = db0DriverModule.default({
       database,
       tableName: options.tableName
     });
     return driver;
-  });
+  }, ["unstorage/drivers/db0"]);
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, databaseStorage, "databaseStorage");
 function memoryStorage() {
@@ -377,6 +398,38 @@ function vercelBlobStorage(options) {
   });
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, vercelBlobStorage, "vercelBlobStorage");
+function collectDriverModules(config, modules) {
+  if (!config || typeof config !== "object") return;
+  if (isStorageClient(config)) {
+    const clientModules = config[STORAGE_CLIENT_MODULES_KEY];
+    if (Array.isArray(clientModules)) for (const module of clientModules) modules.add(module);
+    return;
+  }
+  if (isStorageInstance(config)) return;
+  const source = config;
+  const driver = source.driver;
+  if (typeof driver === "string") {
+    if (isDatabaseDriverName(driver)) {
+      modules.add("db0");
+      modules.add(DATABASE_CONNECTORS[driver].module);
+      modules.add("unstorage/drivers/db0");
+    } else if (driver !== "memory") {
+      const module = _unstorage.builtinDrivers[driver === "local" ? "fs-lite" : driver];
+      if (module) modules.add(module);
+    }
+  }
+  collectDriverModules(source.client, modules);
+  if (source.mounts && typeof source.mounts === "object") {
+    for (const mount of Object.values(source.mounts)) collectDriverModules(mount, modules);
+  }
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, collectDriverModules, "collectDriverModules");
+function _collectFarmStorageModules(config) {
+  const modules = /* @__PURE__ */ new Set();
+  collectDriverModules(config, modules);
+  return [...modules];
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, _collectFarmStorageModules, "_collectFarmStorageModules");
 async function mountNamespaces(storage, mounts) {
   if (!mounts) {
     return;
@@ -434,6 +487,11 @@ function getStorage(namespace) {
   globalStorage = getActiveGlobalStorage();
   const base = normalizeMountKey(namespace);
   if (!base) {
+    if (namespace) {
+      throw new TypeError(
+        `getStorage(${JSON.stringify(namespace)}) names no namespace. Pass a non-empty name, or call getStorage() for the root store.`
+      );
+    }
     return globalStorage;
   }
   const namespaced = _unstorage.prefixStorage.call(void 0, globalStorage, base);
@@ -517,4 +575,6 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, disposeStorage, "disposeStorage");
 
 
 
-exports.defineStorageClient = defineStorageClient; exports.createStorageClient = createStorageClient; exports.driverStorage = driverStorage; exports.databaseStorage = databaseStorage; exports.memoryStorage = memoryStorage; exports.localStorage = localStorage; exports.sqliteStorage = sqliteStorage; exports.mysqlStorage = mysqlStorage; exports.mysql2Storage = mysql2Storage; exports.postgresStorage = postgresStorage; exports.pgStorage = pgStorage; exports.pgliteStorage = pgliteStorage; exports.planetscaleStorage = planetscaleStorage; exports.libsqlStorage = libsqlStorage; exports.redisStorage = redisStorage; exports.s3Storage = s3Storage; exports.mongodbStorage = mongodbStorage; exports.upstashStorage = upstashStorage; exports.netlifyBlobsStorage = netlifyBlobsStorage; exports.vercelKVStorage = vercelKVStorage; exports.vercelBlobStorage = vercelBlobStorage; exports.createFarmStorage = createFarmStorage; exports.resolveStorageRuntimeClient = resolveStorageRuntimeClient; exports.initStorage = initStorage; exports.getStorage = getStorage; exports.disposeStorage = disposeStorage;
+
+
+exports._registerFarmStorageModules = _registerFarmStorageModules; exports.defineStorageClient = defineStorageClient; exports.createStorageClient = createStorageClient; exports.driverStorage = driverStorage; exports.databaseStorage = databaseStorage; exports.memoryStorage = memoryStorage; exports.localStorage = localStorage; exports.sqliteStorage = sqliteStorage; exports.mysqlStorage = mysqlStorage; exports.mysql2Storage = mysql2Storage; exports.postgresStorage = postgresStorage; exports.pgStorage = pgStorage; exports.pgliteStorage = pgliteStorage; exports.planetscaleStorage = planetscaleStorage; exports.libsqlStorage = libsqlStorage; exports.redisStorage = redisStorage; exports.s3Storage = s3Storage; exports.mongodbStorage = mongodbStorage; exports.upstashStorage = upstashStorage; exports.netlifyBlobsStorage = netlifyBlobsStorage; exports.vercelKVStorage = vercelKVStorage; exports.vercelBlobStorage = vercelBlobStorage; exports._collectFarmStorageModules = _collectFarmStorageModules; exports.createFarmStorage = createFarmStorage; exports.resolveStorageRuntimeClient = resolveStorageRuntimeClient; exports.initStorage = initStorage; exports.getStorage = getStorage; exports.disposeStorage = disposeStorage;

package/dist/{chunk-AJQTP4OO.mjs → chunk-OJ7JP7RJ.mjs}

@@ -8,7 +8,7 @@ import {
 } from "./chunk-5WI2S4CO.mjs";
 import {
   matchesFarmIfNoneMatch
-} from "./chunk-ZMMBIVQM.mjs";
+} from "./chunk-ZZGQD7A4.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";