@farm.js/core 0.1.0-beta.18 → 0.1.0-beta.20

package/dist/plugin.mjs

@@ -2,11 +2,11 @@ import {
   FarmRuntimeShutdownError,
   PluginManager,
   definePlugin
-} from "./chunk-6OKRBYDC.mjs";
+} from "./chunk-UNDUIGWC.mjs";
 import "./chunk-RQ633A5I.mjs";
 import {
   farmPlugin
-} from "./chunk-PWLQWGXD.mjs";
+} from "./chunk-TMZEK265.mjs";
 import "./chunk-LGHEOHBU.mjs";
 import "./chunk-FRPWCMMG.mjs";
 import "./chunk-53MVSX3R.mjs";
@@ -29,7 +29,7 @@ import "./chunk-ZVWA4ZQ3.mjs";
 import "./chunk-7FBJLMQH.mjs";
 import "./chunk-4E6VRJ6P.mjs";
 import "./chunk-GXASWWJU.mjs";
-import "./chunk-SBLHLAE3.mjs";
+import "./chunk-ZYDQS2TT.mjs";
 import "./chunk-T4QJQK76.mjs";
 import "./chunk-MIUW47JX.mjs";
 import "./chunk-P7QDS5AT.mjs";
@@ -47,7 +47,7 @@ import "./chunk-KQCOGTU7.mjs";
 import "./chunk-YTMDIHQN.mjs";
 import "./chunk-RHIFZZUI.mjs";
 import "./chunk-LM2YNO4U.mjs";
-import "./chunk-XFYFRBX5.mjs";
+import "./chunk-4KTN2BLF.mjs";
 import "./chunk-B3FFOIWS.mjs";
 import "./chunk-ITN462YM.mjs";
 import "./chunk-3HIVDX7J.mjs";

package/dist/server.cjs

@@ -3400,6 +3400,26 @@ var init_integration_api = __esm({
   }
 });
 
+// src/plugin-integration-context.ts
+function setFarmPluginIntegrationContext(plugin, integration) {
+  Object.defineProperty(plugin, FARM_PLUGIN_INTEGRATION_CONTEXT, {
+    value: integration
+  });
+}
+function getFarmPluginIntegrationContext(plugin) {
+  const value = plugin[FARM_PLUGIN_INTEGRATION_CONTEXT];
+  return value && typeof value === "object" ? value : void 0;
+}
+var FARM_PLUGIN_INTEGRATION_CONTEXT;
+var init_plugin_integration_context = __esm({
+  "src/plugin-integration-context.ts"() {
+    "use strict";
+    FARM_PLUGIN_INTEGRATION_CONTEXT = /* @__PURE__ */ Symbol.for("@farm.js/core/plugin-integration-context");
+    __name(setFarmPluginIntegrationContext, "setFarmPluginIntegrationContext");
+    __name(getFarmPluginIntegrationContext, "getFarmPluginIntegrationContext");
+  }
+});
+
 // src/server/response.ts
 async function sendWebResponse(res, response) {
   res.statusCode = response.status;
@@ -3597,6 +3617,10 @@ var init_integration_orm = __esm({
 });
 
 // src/integrations.ts
+function getFarmIntegrationPluginOwner(plugin) {
+  const value = plugin[FARM_INTEGRATION_PLUGIN_OWNER];
+  return value && typeof value === "object" ? value : void 0;
+}
 function defineTypedIntegrationRoute(method, path27, input) {
   return {
     path: path27,
@@ -3691,13 +3715,70 @@ function resolveIntegrationPlugins(integrations) {
     if (!integration || !isFarmIntegration(integration)) {
       continue;
     }
-    plugins.push(createIntegrationPlugin(key, integration));
-    if (integration.plugins?.length) {
-      plugins.push(...integration.plugins);
-    }
+    const owner = createIntegrationPluginOwner(key, integration, "lifecycle");
+    plugins.push(withIntegrationPluginOwner(createIntegrationPlugin(key, integration), owner));
+    plugins.push(...resolveIntegrationPluginContributions(key, integration));
   }
   return plugins;
 }
+function resolveIntegrationPluginContributions(key, integration) {
+  const contributions = integration.plugins;
+  if (!contributions) return [];
+  if (!Array.isArray(contributions)) {
+    throw new TypeError(`Integration "${key}" plugins must be an array`);
+  }
+  const names = /* @__PURE__ */ new Set();
+  return contributions.map((plugin, index) => {
+    if (!plugin || typeof plugin !== "object" || typeof plugin.name !== "string") {
+      throw new TypeError(`Integration "${key}" plugin at index ${index} is invalid`);
+    }
+    const name = plugin.name.trim();
+    if (!name) {
+      throw new TypeError(`Integration "${key}" plugin at index ${index} requires a name`);
+    }
+    if (names.has(name)) {
+      throw new Error(`Integration "${key}" contributes duplicate plugin name "${name}"`);
+    }
+    names.add(name);
+    return withIntegrationPluginOwner(
+      plugin,
+      createIntegrationPluginOwner(key, integration, "contribution"),
+      createIntegrationPluginContext(key, integration)
+    );
+  });
+}
+function createIntegrationPluginOwner(key, integration, source) {
+  return Object.freeze({
+    key,
+    category: integration.category,
+    type: integration.type,
+    source,
+    serverRuntime: integration.serverRuntime !== false
+  });
+}
+function createIntegrationPluginContext(key, integration) {
+  return Object.freeze({
+    key,
+    category: integration.category,
+    type: integration.type,
+    instance: integration.instance,
+    serverRuntime: integration.serverRuntime !== false
+  });
+}
+function withIntegrationPluginOwner(plugin, owner, integration) {
+  const descriptors = Object.getOwnPropertyDescriptors(plugin);
+  Reflect.deleteProperty(descriptors, FARM_INTEGRATION_PLUGIN_OWNER);
+  Reflect.deleteProperty(descriptors, FARM_INTEGRATION_PLUGIN_SERVER_RUNTIME);
+  const ownedPlugin = Object.create(Object.getPrototypeOf(plugin), descriptors);
+  Object.defineProperty(ownedPlugin, FARM_INTEGRATION_PLUGIN_OWNER, { value: owner });
+  Object.defineProperty(ownedPlugin, FARM_INTEGRATION_PLUGIN_SERVER_RUNTIME, {
+    value: owner.serverRuntime
+  });
+  if (integration) {
+    setFarmPluginIntegrationContext(ownedPlugin, integration);
+  }
+  return ownedPlugin;
+}
 function getIntegrationProviders(integrations) {
   if (!integrations) {
     return [];
@@ -5248,11 +5329,12 @@ function normalizeMatcher(matcher) {
   }
   return typeof matcher === "string" ? matcher : matcher.join(", ");
 }
-var FARM_INTEGRATION_INTERNAL_DISPATCH_CONTEXT_KEY, FARM_INTEGRATION_PLUGIN_SERVER_RUNTIME, integrationRoute, INTEGRATION_RUNTIME_REGISTRY_KEY, INTEGRATION_REQUEST_DISPATCHER_KEY, INTEGRATION_DATA_HEADER, INTEGRATION_DATA_HEADER_MAX_LENGTH, BLOCKED_INTEGRATION_DATA_KEYS;
+var FARM_INTEGRATION_INTERNAL_DISPATCH_CONTEXT_KEY, FARM_INTEGRATION_PLUGIN_SERVER_RUNTIME, FARM_INTEGRATION_PLUGIN_OWNER, integrationRoute, INTEGRATION_RUNTIME_REGISTRY_KEY, INTEGRATION_REQUEST_DISPATCHER_KEY, INTEGRATION_DATA_HEADER, INTEGRATION_DATA_HEADER_MAX_LENGTH, BLOCKED_INTEGRATION_DATA_KEYS;
 var init_integrations = __esm({
   "src/integrations.ts"() {
     "use strict";
     init_integration_api();
+    init_plugin_integration_context();
     init_request_context();
     init_response();
     init_server_http();
@@ -5261,6 +5343,8 @@ var init_integrations = __esm({
     FARM_INTEGRATION_PLUGIN_SERVER_RUNTIME = /* @__PURE__ */ Symbol.for(
       "@farm.js/core/integration-plugin-server-runtime"
     );
+    FARM_INTEGRATION_PLUGIN_OWNER = /* @__PURE__ */ Symbol.for("@farm.js/core/integration-plugin-owner");
+    __name(getFarmIntegrationPluginOwner, "getFarmIntegrationPluginOwner");
     __name(defineTypedIntegrationRoute, "defineTypedIntegrationRoute");
     __name(createIntegrationRouteFactory, "createIntegrationRouteFactory");
     integrationRoute = createIntegrationRouteFactory();
@@ -5269,6 +5353,10 @@ var init_integrations = __esm({
     __name(getIntegrationRuntimeRegistry, "getIntegrationRuntimeRegistry");
     __name(isFarmIntegration, "isFarmIntegration");
     __name(resolveIntegrationPlugins, "resolveIntegrationPlugins");
+    __name(resolveIntegrationPluginContributions, "resolveIntegrationPluginContributions");
+    __name(createIntegrationPluginOwner, "createIntegrationPluginOwner");
+    __name(createIntegrationPluginContext, "createIntegrationPluginContext");
+    __name(withIntegrationPluginOwner, "withIntegrationPluginOwner");
     __name(getIntegrationProviders, "getIntegrationProviders");
     __name(getIntegrationDocumentNavigationMatchers, "getIntegrationDocumentNavigationMatchers");
     __name(getRegisteredIntegrations, "getRegisteredIntegrations");
@@ -24814,7 +24902,7 @@ function transformError(id, message) {
 __name(transformError, "transformError");
 
 // package.json
-var version = "0.1.0-beta.18";
+var version = "0.1.0-beta.20";
 
 // src/version.ts
 var FARM_VERSION = version;
@@ -26195,7 +26283,15 @@ window.__FARM_MANIFEST__ = ${inlineValue({
             const startTime2 = Date.now();
             try {
               if (pm) {
-                await pm.runHookParallel("beforeRequest", req, res);
+                await pm.runHookParallelFiltered(
+                  "beforeRequest",
+                  (plugin) => {
+                    const owner = getFarmIntegrationPluginOwner(plugin);
+                    return owner?.source !== "lifecycle" || owner.key !== matchedRoute.key;
+                  },
+                  req,
+                  res
+                );
               }
               if (res.writableEnded) {
                 const duration2 = Date.now() - startTime2;
@@ -29599,6 +29695,7 @@ init_config2();
 // src/plugin.ts
 init_env();
 init_request_context();
+init_plugin_integration_context();
 var _FarmRuntimeShutdownError = class _FarmRuntimeShutdownError extends Error {
   constructor(message, errors) {
     super(message);
@@ -29664,10 +29761,14 @@ var _PluginManager = class _PluginManager {
       }
     };
   }
-  createRequestHookContext(target) {
+  createPluginHookContext(plugin, context = this.context) {
+    const integration = getFarmPluginIntegrationContext(plugin);
+    return integration ? { ...context, integration } : context;
+  }
+  createRequestHookContext(target, plugin) {
     const requestContext = this.context.requestContext;
     return {
-      ...this.context,
+      ...this.createPluginHookContext(plugin),
       req: {
         set(key, value, options) {
           requestContext.set(target, key, value, options);
@@ -29710,7 +29811,7 @@ var _PluginManager = class _PluginManager {
     return {
       ...this.createStateHookContext(plugin),
       request,
-      req: this.createRequestHookContext(request).req,
+      req: this.createRequestHookContext(request, plugin).req,
       kind: options.kind ?? "request",
       route: options.route,
       signal: request.signal,
@@ -29776,7 +29877,7 @@ var _PluginManager = class _PluginManager {
   }
   createStateHookContext(plugin, context = this.context) {
     return {
-      ...context,
+      ...this.createPluginHookContext(plugin, context),
       state: this.pluginStates.get(plugin)
     };
   }
@@ -29904,14 +30005,14 @@ var _PluginManager = class _PluginManager {
     }
     return hooks;
   }
-  getHookContext(hookName, args) {
+  getHookContext(plugin, hookName, args) {
     if (hookName === "beforeRequest" || hookName === "afterResponse" || hookName === "beforeApiHandler") {
       const target = args[0];
       if (target && typeof target === "object") {
-        return this.createRequestHookContext(target);
+        return this.createRequestHookContext(target, plugin);
       }
     }
-    return this.context;
+    return this.createPluginHookContext(plugin);
   }
   addPlugin(plugin) {
     this.plugins.push(plugin);
@@ -29960,7 +30061,7 @@ var _PluginManager = class _PluginManager {
     for (const plugin of this.getSortedPlugins()) {
       if (!plugin.setup) continue;
       const state = await plugin.setup({
-        ...this.context,
+        ...this.createPluginHookContext(plugin),
         env: getResolvedEnv()
       });
       this.pluginStates.set(plugin, state);
@@ -30131,7 +30232,7 @@ var _PluginManager = class _PluginManager {
     const plugins = this.getSortedPlugins();
     for (const plugin of plugins) {
       for (const hook of this.getPluginHooks(plugin, hookName)) {
-        const hookContext = this.getHookContext(hookName, args);
+        const hookContext = this.getHookContext(plugin, hookName, args);
         const result = await hook.apply(plugin, [...args, hookContext]);
         if (result !== void 0) {
           return result;
@@ -30145,7 +30246,7 @@ var _PluginManager = class _PluginManager {
     for (const plugin of plugins) {
       for (const hook of this.getPluginHooks(plugin, hookName)) {
         const hookArgs = [value, ...args];
-        const hookContext = this.getHookContext(hookName, hookArgs);
+        const hookContext = this.getHookContext(plugin, hookName, hookArgs);
         const result = await hook.apply(plugin, [...hookArgs, hookContext]);
         if (result !== void 0) {
           if (hookName === "beforeApiHandler" && result !== value && value && result && typeof value === "object" && typeof result === "object") {
@@ -30158,11 +30259,15 @@ var _PluginManager = class _PluginManager {
     return value;
   }
   async runHookParallel(hookName, ...args) {
+    return this.runHookParallelFiltered(hookName, () => true, ...args);
+  }
+  /** @internal Runs hooks for only the plugins selected by the runtime adapter. */
+  async runHookParallelFiltered(hookName, include, ...args) {
     if (hookName === "shutdown" && !this.runtimeShutdownHooksRunning) {
       await this.closeRuntime(args[0]?.reason);
       return false;
     }
-    const plugins = this.getSortedPlugins();
+    const plugins = this.getSortedPlugins().filter(include);
     const sequentialHooks = /* @__PURE__ */ new Set([
       "ready",
       "shutdown",
@@ -30185,7 +30290,7 @@ var _PluginManager = class _PluginManager {
               return true;
             }
           }
-          const hookContext = this.getHookContext(hookName, args);
+          const hookContext = this.getHookContext(plugin, hookName, args);
           try {
             await hook.apply(plugin, [...args, hookContext]);
           } catch (error) {
@@ -30207,7 +30312,7 @@ var _PluginManager = class _PluginManager {
       const promises3 = [];
       for (const plugin of plugins) {
         for (const hook of this.getPluginHooks(plugin, hookName)) {
-          const hookContext = this.getHookContext(hookName, args);
+          const hookContext = this.getHookContext(plugin, hookName, args);
           promises3.push(hook.apply(plugin, [...args, hookContext]));
         }
       }
@@ -30227,6 +30332,19 @@ var _PluginManager = class _PluginManager {
 };
 __name(_PluginManager, "PluginManager");
 var PluginManager = _PluginManager;
+function definePlugin(plugin) {
+  return plugin;
+}
+__name(definePlugin, "definePlugin");
+((definePlugin2) => {
+  function forIntegration() {
+    return /* @__PURE__ */ __name(function defineBoundPlugin(plugin) {
+      return plugin;
+    }, "defineBoundPlugin");
+  }
+  definePlugin2.forIntegration = forIntegration;
+  __name(forIntegration, "forIntegration");
+})(definePlugin || (definePlugin = {}));
 
 // src/server/create-server.ts
 var import_fs5 = __toESM(require("fs"));