every-plugin 0.3.1 → 0.4.0

package/dist/index.d.ts

@@ -2,5 +2,5 @@ export * from "./errors";
 export * from "./plugin";
 export * from "./runtime";
 export { getNormalizedRemoteName } from "./runtime/services/normalize";
-export type { AnyPlugin, ConfigOf, EveryPlugin, InitializedPlugin, LoadedPlugin, PluginInstance, PluginOf, PluginRegistry, PluginRuntimeConfig, RegistryBindings, SecretsConfig } from "./types";
+export type { AnyPlugin, EveryPlugin, InitializedPlugin, LoadedPlugin, PluginClientType, PluginConfigInput, PluginContext, PluginContract, PluginInstance, PluginMetadata, PluginRegistry, PluginRouterType, PluginRuntimeConfig, PluginSecrets, PluginVariables, RegisteredPlugins, SecretsConfig } from "./types";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAG1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,YAAY,EACX,SAAS,EACT,QAAQ,EACR,WAAW,EACX,iBAAiB,EACjB,YAAY,EACZ,cAAc,EACd,QAAQ,EACR,cAAc,EACd,mBAAmB,EACnB,gBAAgB,EAChB,aAAa,EACb,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAG1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,YAAY,EACX,SAAS,EACT,WAAW,EACX,iBAAiB,EACjB,YAAY,EACZ,gBAAgB,EAAE,iBAAiB,EAAE,aAAa,EAAE,cAAc,EAAE,cAAc,EAClF,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EAAE,aAAa,EAAE,eAAe,EAAE,iBAAiB,EACtE,aAAa,EACb,MAAM,SAAS,CAAC"}

package/dist/plugin.d.ts

@@ -1,37 +1,34 @@
-import type { AnyContractRouter } from "@orpc/contract";
+import type { AnyContractRouter, AnySchema, InferSchemaOutput } from "@orpc/contract";
 import type { Context, Implementer, Router } from "@orpc/server";
 import { Effect, type Scope } from "effect";
 import { z } from "zod";
 /**
  * Helper type that correctly constructs the config schema type
  */
-export type PluginConfigFor<V extends z.ZodTypeAny, S extends z.ZodTypeAny> = z.ZodObject<{
+export type PluginConfigFor<V extends AnySchema, S extends AnySchema> = {
     variables: V;
     secrets: S;
-}>;
+};
 /**
  * Loaded plugin with static binding property
  */
-export interface LoadedPluginWithBinding<TContract extends AnyContractRouter, TVariables extends z.ZodTypeAny, TSecrets extends z.ZodTypeAny, TContext extends Context = Record<never, never>> {
+export interface LoadedPluginWithBinding<TContract extends AnyContractRouter, TVariables extends AnySchema, TSecrets extends AnySchema, TContext extends Context = Record<never, never>> {
     new (): Plugin<TContract, TVariables, TSecrets, TContext>;
     binding: {
         contract: TContract;
+        variables: TVariables;
+        secrets: TSecrets;
         config: PluginConfigFor<TVariables, TSecrets>;
+        context: TContext;
     };
 }
-/**
- * Utility type to extract binding from plugin constructor
- */
-export type PluginBinding<T> = T extends {
-    binding: infer B;
-} ? B : never;
 /**
  * Common error schemas that all plugins can use
  * These provide consistent error handling across the plugin ecosystem
  */
 export declare const CommonPluginErrors: {
-    UNAUTHORIZED: {
-        data: z.ZodObject<{
+    readonly UNAUTHORIZED: {
+        readonly data: z.ZodObject<{
             apiKeyProvided: z.ZodBoolean;
             provider: z.ZodOptional<z.ZodString>;
             authType: z.ZodOptional<z.ZodEnum<{
@@ -41,8 +38,8 @@ export declare const CommonPluginErrors: {
             }>>;
         }, z.core.$strip>;
     };
-    RATE_LIMITED: {
-        data: z.ZodObject<{
+    readonly RATE_LIMITED: {
+        readonly data: z.ZodObject<{
             retryAfter: z.ZodNumber;
             remainingRequests: z.ZodOptional<z.ZodNumber>;
             resetTime: z.ZodOptional<z.ZodString>;
@@ -53,15 +50,15 @@ export declare const CommonPluginErrors: {
             }>>;
         }, z.core.$strip>;
     };
-    SERVICE_UNAVAILABLE: {
-        data: z.ZodObject<{
+    readonly SERVICE_UNAVAILABLE: {
+        readonly data: z.ZodObject<{
             retryAfter: z.ZodOptional<z.ZodNumber>;
             maintenanceWindow: z.ZodDefault<z.ZodBoolean>;
             estimatedUptime: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>;
     };
-    BAD_REQUEST: {
-        data: z.ZodObject<{
+    readonly BAD_REQUEST: {
+        readonly data: z.ZodObject<{
             invalidFields: z.ZodOptional<z.ZodArray<z.ZodString>>;
             validationErrors: z.ZodOptional<z.ZodArray<z.ZodObject<{
                 field: z.ZodString;
@@ -70,14 +67,14 @@ export declare const CommonPluginErrors: {
             }, z.core.$strip>>>;
         }, z.core.$strip>;
     };
-    NOT_FOUND: {
-        data: z.ZodObject<{
+    readonly NOT_FOUND: {
+        readonly data: z.ZodObject<{
             resource: z.ZodOptional<z.ZodString>;
             resourceId: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>;
     };
-    FORBIDDEN: {
-        data: z.ZodObject<{
+    readonly FORBIDDEN: {
+        readonly data: z.ZodObject<{
             requiredPermissions: z.ZodOptional<z.ZodArray<z.ZodString>>;
             action: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>;
@@ -86,34 +83,33 @@ export declare const CommonPluginErrors: {
 /**
  * Plugin interface
  */
-export interface Plugin<TContract extends AnyContractRouter, TVariables extends z.ZodTypeAny, TSecrets extends z.ZodTypeAny, TContext extends Context = Record<never, never>> {
+export interface Plugin<TContract extends AnyContractRouter, TVariables extends AnySchema, TSecrets extends AnySchema, TContext extends Context = Record<never, never>> {
     readonly id: string;
     readonly contract: TContract;
     readonly configSchema: PluginConfigFor<TVariables, TSecrets>;
     initialize(config: {
-        variables: z.infer<TVariables>;
-        secrets: z.infer<TSecrets>;
+        variables: InferSchemaOutput<TVariables>;
+        secrets: InferSchemaOutput<TSecrets>;
     }): Effect.Effect<TContext, unknown, Scope.Scope>;
     shutdown(): Effect.Effect<void, never>;
     /**
      * Creates the strongly-typed oRPC router for this plugin.
      * The router's procedure types are inferred directly from the contract.
      * @param context The initialized plugin context
-     * @returns A router with procedures matching the plugin's contract and composed context
+     * @returns A router with procedures matching the plugin's contract
      */
-    createRouter<THostContext extends Context = Record<never, never>>(context?: TContext): Router<TContract, TContext & THostContext>;
+    createRouter(context: TContext): Router<TContract, TContext>;
 }
 /**
  * Factory function to create plugins
  */
-export declare function createPlugin<V extends z.ZodTypeAny, S extends z.ZodTypeAny, TContract extends AnyContractRouter, TContext extends Context = Record<never, never>>(config: {
-    id: string;
+export declare function createPlugin<V extends AnySchema, S extends AnySchema, TContract extends AnyContractRouter, TContext extends Context = Record<never, never>>(config: {
     variables: V;
     secrets: S;
     contract: TContract;
     initialize?: (config: {
-        variables: z.infer<V>;
-        secrets: z.infer<S>;
+        variables: InferSchemaOutput<V>;
+        secrets: InferSchemaOutput<S>;
     }) => Effect.Effect<TContext, Error, Scope.Scope>;
     createRouter: (context: TContext, builder: Implementer<TContract, TContext & Record<never, never>, TContext & Record<never, never>>) => Router<TContract, TContext & Record<never, never>>;
     shutdown?: (ctx: TContext) => Effect.Effect<void, Error, never>;

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"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"}

package/dist/plugin.js

@@ -55,12 +55,13 @@ export const CommonPluginErrors = {
  * Factory function to create plugins
  */
 export function createPlugin(config) {
-    const configSchema = z.object({
+    const configSchema = {
         variables: config.variables,
         secrets: config.secrets
-    });
+    };
     class CreatedPlugin {
-        id = config.id;
+        /** set during instantiation - registry key */
+        id;
         contract = config.contract;
         configSchema = configSchema;
         _context = null;
@@ -80,13 +81,15 @@ export function createPlugin(config) {
             const builder = implement(config.contract).$context();
             const router = config.createRouter(context, builder);
             return router;
-            // return router as Router<TContract, TContext & THostContext>;
         }
     }
     const PluginConstructor = CreatedPlugin;
     PluginConstructor.binding = {
         contract: config.contract,
-        config: configSchema
+        variables: config.variables,
+        secrets: config.secrets,
+        config: configSchema,
+        context: {}
     };
     return PluginConstructor;
 }

package/dist/runtime/index.d.ts

@@ -1,8 +1,7 @@
 import { ManagedRuntime } from "effect";
-import type { z } from "zod";
-import type { ConfigOf, EveryPlugin, InitializedPlugin, LoadedPlugin, PluginInstance, PluginOf, PluginRegistry, RegistryBindings, RuntimeOptions, SecretsConfig } from "../types";
+import type { AnyPlugin, InitializedPlugin, LoadedPlugin, PluginConfigInput, PluginInstance, PluginRegistry, PluginRuntimeConfig, RegisteredPlugin, RegisteredPlugins, UsePluginResult } from "../types";
 import { PluginService } from "./services/plugin.service";
-export declare class PluginRuntime<R extends RegistryBindings = RegistryBindings> {
+export declare class PluginRuntime<R extends RegisteredPlugins = RegisteredPlugins> {
     private runtime;
     private registry;
     private pluginCache;
@@ -10,23 +9,12 @@ export declare class PluginRuntime<R extends RegistryBindings = RegistryBindings
     private generateCacheKey;
     private validatePluginId;
     private runPromise;
-    loadPlugin<K extends keyof R>(pluginId: K): Promise<LoadedPlugin<PluginOf<R[K]>>>;
-    instantiatePlugin<K extends keyof R>(pluginId: K, loadedPlugin: LoadedPlugin<PluginOf<R[K]>>): Promise<PluginInstance<PluginOf<R[K]>>>;
-    initializePlugin<K extends keyof R>(instance: PluginInstance<PluginOf<R[K]>>, config: z.input<PluginOf<R[K]>["configSchema"]>): Promise<InitializedPlugin<PluginOf<R[K]>> & {
-        config: ConfigOf<R[K]>;
-    }>;
-    usePlugin<K extends keyof R>(pluginId: K, config: z.input<PluginOf<R[K]>["configSchema"]>): Promise<EveryPlugin<PluginOf<R[K]>> & {
-        initialized: InitializedPlugin<PluginOf<R[K]>> & {
-            config: ConfigOf<R[K]>;
-        };
-    }>;
+    usePlugin<K extends keyof RegisteredPlugins & string>(pluginId: K, config: PluginConfigInput<R[K]>): Promise<UsePluginResult<K>>;
+    loadPlugin<K extends keyof RegisteredPlugins & string>(pluginId: K): Promise<LoadedPlugin<RegisteredPlugin<K>>>;
+    instantiatePlugin<K extends keyof RegisteredPlugins & string>(pluginId: K, loadedPlugin: LoadedPlugin<RegisteredPlugin<K>>): Promise<PluginInstance<RegisteredPlugin<K>>>;
+    initializePlugin<T extends AnyPlugin>(instance: PluginInstance<T>, config: any): Promise<InitializedPlugin<T>>;
     shutdown(): Promise<void>;
-    evictPlugin<K extends keyof R>(pluginId: K, config: z.input<PluginOf<R[K]>["configSchema"]>): Promise<void>;
+    evictPlugin<K extends keyof RegisteredPlugins & string>(pluginId: K, config: PluginConfigInput<RegisteredPlugins[K]>): Promise<void>;
 }
-export declare function createPluginRuntime<R extends RegistryBindings = RegistryBindings>(config: {
-    registry: PluginRegistry;
-    secrets?: SecretsConfig;
-    options?: RuntimeOptions;
-}): PluginRuntime<R>;
-export type { ConfigOf, EveryPlugin, InitializedPlugin, PluginOf, RegistryBindings } from "../types";
+export declare function createPluginRuntime(config: PluginRuntimeConfig): PluginRuntime;
 //# sourceMappingURL=index.d.ts.map

package/dist/runtime/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"AACA,OAAO,EAA6B,cAAc,EAAU,MAAM,QAAQ,CAAC;AAC3E,OAAO,KAAK,EACX,SAAS,EACT,iBAAiB,EACjB,YAAY,EAEZ,iBAAiB,EACjB,cAAc,EACd,cAAc,EAEd,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,EACjB,eAAe,EACf,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,qBAAa,aAAa,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB;IAIxE,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,QAAQ;IAJjB,OAAO,CAAC,WAAW,CAAsF;gBAGhG,OAAO,EAAE,cAAc,CAAC,cAAc,CAAC,aAAa,EAAE,KAAK,CAAC,EAC5D,QAAQ,EAAE,cAAc;IAGjC,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,gBAAgB;YAcV,UAAU;IAgBlB,SAAS,CAAC,CAAC,SAAS,MAAM,iBAAiB,GAAG,MAAM,EACzD,QAAQ,EAAE,CAAC,EACX,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAC7B,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAiCxB,UAAU,CAAC,CAAC,SAAS,MAAM,iBAAiB,GAAG,MAAM,EAC1D,QAAQ,EAAE,CAAC,GACT,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;IAQvC,iBAAiB,CAAC,CAAC,SAAS,MAAM,iBAAiB,GAAG,MAAM,EACjE,QAAQ,EAAE,CAAC,EACX,YAAY,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,GAC7C,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;IAQzC,gBAAgB,CAAC,CAAC,SAAS,SAAS,EACzC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,EAC3B,MAAM,EAAE,GAAG,GACT,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAQ1B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAQzB,WAAW,CAAC,CAAC,SAAS,MAAM,iBAAiB,GAAG,MAAM,EAC3D,QAAQ,EAAE,CAAC,EACX,MAAM,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,GAC7C,OAAO,CAAC,IAAI,CAAC;CAwBhB;AAWD,wBAAgB,mBAAmB,CAClC,MAAM,EAAE,mBAAmB,GACzB,aAAa,CAkBf"}

package/dist/runtime/index.js

@@ -1,5 +1,5 @@
+import { createRouterClient } from "@orpc/server";
 import { Cause, Effect, Exit, Hash, ManagedRuntime, Option } from "effect";
-import { createPluginClient, getPluginRouter } from "../client/index";
 import { PluginRuntimeError } from "./errors";
 import { PluginService } from "./services/plugin.service";
 export class PluginRuntime {
@@ -15,16 +15,15 @@ export class PluginRuntime {
         return `${pluginId}:${configHash}`;
     }
     validatePluginId(pluginId) {
-        const pluginIdStr = pluginId;
-        if (!(pluginIdStr in this.registry)) {
+        if (!(pluginId in this.registry)) {
             return Effect.fail(new PluginRuntimeError({
-                pluginId: pluginIdStr,
+                pluginId: String(pluginId),
                 operation: "validate-plugin-id",
-                cause: new Error(`Plugin ID '${pluginIdStr}' not found in registry`),
+                cause: new Error(`Plugin ID '${String(pluginId)}' not found in registry.`),
                 retryable: false,
             }));
         }
-        return Effect.succeed(pluginIdStr);
+        return Effect.succeed(String(pluginId));
     }
     async runPromise(effect) {
         const exit = await this.runtime.runPromiseExit(effect);
@@ -37,34 +36,8 @@ export class PluginRuntime {
         }
         return exit.value;
     }
-    loadPlugin(pluginId) {
-        const effect = Effect.gen(this, function* () {
-            const pluginService = yield* PluginService;
-            const validatedId = yield* this.validatePluginId(pluginId);
-            const result = yield* pluginService.loadPlugin(validatedId);
-            return result;
-        });
-        return this.runPromise(effect);
-    }
-    instantiatePlugin(pluginId, loadedPlugin) {
-        const effect = Effect.gen(this, function* () {
-            const pluginService = yield* PluginService;
-            const pluginIdStr = pluginId;
-            const result = yield* pluginService.instantiatePlugin(pluginIdStr, loadedPlugin);
-            return result;
-        });
-        return this.runPromise(effect);
-    }
-    initializePlugin(instance, config) {
-        const effect = Effect.gen(this, function* () {
-            const pluginService = yield* PluginService;
-            const result = yield* pluginService.initializePlugin(instance, config);
-            return result;
-        });
-        return this.runPromise(effect);
-    }
     async usePlugin(pluginId, config) {
-        const cacheKey = this.generateCacheKey(String(pluginId), config);
+        const cacheKey = this.generateCacheKey(pluginId, config);
         let cachedPlugin = this.pluginCache.get(cacheKey);
         if (!cachedPlugin) {
             const operation = Effect.gen(this, function* () {
@@ -72,49 +45,87 @@ export class PluginRuntime {
                 const validatedId = yield* this.validatePluginId(pluginId);
                 // Load → Instantiate → Initialize
                 const ctor = yield* pluginService.loadPlugin(validatedId);
-                const instance = yield* pluginService.instantiatePlugin(String(pluginId), ctor);
-                const _initialized = yield* pluginService.initializePlugin(instance, config);
-                const initialized = _initialized;
-                const client = createPluginClient(initialized);
-                const router = getPluginRouter(initialized);
-                return {
-                    client,
-                    router,
-                    metadata: initialized.metadata,
-                    initialized
-                };
+                const instance = yield* pluginService.instantiatePlugin(pluginId, ctor);
+                const initialized = yield* pluginService.initializePlugin(instance, config);
+                return initialized;
             }).pipe(Effect.provide(this.runtime));
             cachedPlugin = Effect.cached(operation).pipe(Effect.flatten);
             this.pluginCache.set(cacheKey, cachedPlugin);
         }
-        return this.runPromise(cachedPlugin);
+        const initialized = await this.runPromise(cachedPlugin);
+        const router = initialized.plugin.createRouter(initialized.context);
+        const client = createRouterClient(router);
+        return {
+            router: router,
+            client: client,
+            metadata: initialized.metadata,
+            initialized: initialized
+        };
+    }
+    async loadPlugin(pluginId) {
+        const effect = Effect.gen(function* () {
+            const pluginService = yield* PluginService;
+            return yield* pluginService.loadPlugin(pluginId);
+        });
+        return this.runPromise(effect);
+    }
+    async instantiatePlugin(pluginId, loadedPlugin) {
+        const effect = Effect.gen(function* () {
+            const pluginService = yield* PluginService;
+            return yield* pluginService.instantiatePlugin(pluginId, loadedPlugin);
+        });
+        return this.runPromise(effect);
+    }
+    async initializePlugin(instance, config) {
+        const effect = Effect.gen(function* () {
+            const pluginService = yield* PluginService;
+            return yield* pluginService.initializePlugin(instance, config);
+        });
+        return this.runPromise(effect);
     }
-    shutdown() {
+    async shutdown() {
         const effect = Effect.gen(function* () {
             const pluginService = yield* PluginService;
             yield* pluginService.cleanup();
         });
         return this.runPromise(effect);
     }
-    evictPlugin(pluginId, config) {
-        const cacheKey = this.generateCacheKey(String(pluginId), config);
+    async evictPlugin(pluginId, config) {
+        const cacheKey = this.generateCacheKey(pluginId, config);
         const effect = Effect.gen(this, function* () {
             const pluginService = yield* PluginService;
             const cachedPlugin = this.pluginCache.get(cacheKey);
             if (cachedPlugin) {
                 this.pluginCache.delete(cacheKey);
                 const pluginResult = yield* cachedPlugin.pipe(Effect.catchAll(() => Effect.succeed(null)));
-                if (pluginResult?.initialized) {
-                    yield* pluginService.shutdownPlugin(pluginResult.initialized).pipe(Effect.catchAll(() => Effect.void));
+                if (pluginResult) {
+                    yield* pluginService.shutdownPlugin(pluginResult).pipe(Effect.catchAll(() => Effect.void));
                 }
             }
         }).pipe(Effect.catchAll(() => Effect.void));
         return this.runPromise(effect);
     }
 }
+/**
+ * Normalizes a remote URL to ensure it points to remoteEntry.js
+ * If the URL doesn't end with a file extension, appends /remoteEntry.js
+ */
+function normalizeRemoteUrl(url) {
+    if (url.endsWith('.js'))
+        return url; // Already a file
+    return `${url.endsWith('/') ? url.slice(0, -1) : url}/remoteEntry.js`;
+}
 export function createPluginRuntime(config) {
     const secrets = config.secrets || {};
-    const layer = PluginService.Live(config.registry, secrets);
+    // Normalize all remote URLs in the registry
+    const normalizedRegistry = Object.fromEntries(Object.entries(config.registry).map(([pluginId, entry]) => [
+        pluginId,
+        {
+            ...entry,
+            remoteUrl: normalizeRemoteUrl(entry.remoteUrl)
+        }
+    ]));
+    const layer = PluginService.Live(normalizedRegistry, secrets);
     const runtime = ManagedRuntime.make(layer);
-    return new PluginRuntime(runtime, config.registry);
+    return new PluginRuntime(runtime, normalizedRegistry);
 }

package/dist/runtime/services/module-federation.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module-federation.service.d.ts","sourceRoot":"","sources":["../../../src/runtime/services/module-federation.service.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;;;mCAkFpB,MAAM,OAAO,MAAM;0CA2CZ,MAAM,OAAO,MAAM,6BAxH/B,SAAS;;;AAwElC,qBAAa,uBAAwB,SAAQ,4BAuF3C;CAAG"}
+{"version":3,"file":"module-federation.service.d.ts","sourceRoot":"","sources":["../../../src/runtime/services/module-federation.service.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;;;mCAkFpB,MAAM,OAAO,MAAM;0CA2CZ,MAAM,OAAO,MAAM,6BAxH/B,SAAS;;;AAwElC,qBAAa,uBAAwB,SAAQ,4BAkH3C;CAAG"}

package/dist/runtime/services/module-federation.service.js

@@ -112,11 +112,32 @@ export class ModuleFederationService extends Effect.Service()("ModuleFederationS
                         if (!container) {
                             throw new Error(`No container returned for ${modulePath}`);
                         }
+                        // Support multiple export patterns: direct function, default export, named exports
                         const Constructor = typeof container === "function"
-                            ? container
-                            : container.default;
+                            ? container // Direct function export
+                            : container.default
+                                ? container.default // Default export
+                                : Object.values(container).find(// Named export fallback
+                                (exp) => typeof exp === "function" && exp.prototype?.constructor === exp);
                         if (!Constructor || typeof Constructor !== "function") {
-                            throw new Error(`No valid constructor found. Container type: ${typeof container}`);
+                            const containerInfo = typeof container === "object"
+                                ? `Available exports: ${Object.keys(container).join(', ')}`
+                                : `Container type: ${typeof container}`;
+                            throw new Error(`No valid plugin constructor found for '${pluginId}'.\n` +
+                                `Supported patterns:\n` +
+                                `  - export const YourPlugin = createPlugin({...})\n` +
+                                `  - export default createPlugin({...})\n` +
+                                `${containerInfo}`);
+                        }
+                        // Validate it looks like a plugin constructor (has binding property)
+                        if (!Constructor.binding) {
+                            const containerInfo = typeof container === "object"
+                                ? `Found exports: ${Object.keys(container).join(', ')}`
+                                : `Container type: ${typeof container}`;
+                            throw new Error(`Invalid plugin constructor for '${pluginId}'. ` +
+                                `The exported value must be created with createPlugin(). ` +
+                                `Found a function but it's missing the required 'binding' property.\n` +
+                                `${containerInfo}`);
                         }
                         console.log(`[MF] ✅ Loaded constructor for ${pluginId}`);
                         return Constructor;

package/dist/runtime/services/plugin-loader.service.d.ts

@@ -1,5 +1,5 @@
+import type { InferSchemaInput, InferSchemaOutput } from "@orpc/contract";
 import { Context, Effect, Scope } from "effect";
-import type { z } from "zod";
 import type { AnyPlugin, LoadedPlugin, PluginInstance, PluginRegistry } from "../../types";
 import { PluginRuntimeError } from "../errors";
 import { ModuleFederationService } from "./module-federation.service";
@@ -9,7 +9,7 @@ export declare class PluginRegistryTag extends PluginRegistryTag_base {
 }
 declare const RegistryService_base: Effect.Service.Class<RegistryService, "RegistryService", {
     readonly effect: Effect.Effect<{
-        get: (pluginId: string) => Effect.Effect<import("../../types").PluginMetadata, PluginRuntimeError, never>;
+        get: (pluginId: string) => Effect.Effect<import("../..").PluginMetadata, PluginRuntimeError, never>;
     }, never, PluginRegistryTag>;
 }>;
 export declare class RegistryService extends RegistryService_base {
@@ -18,19 +18,22 @@ declare const PluginLoaderService_base: Effect.Service.Class<PluginLoaderService
     readonly effect: Effect.Effect<{
         loadPlugin: (pluginId: string) => Effect.Effect<{
             ctor: new () => AnyPlugin;
-            metadata: import("../../types").PluginMetadata;
+            metadata: import("../..").PluginMetadata;
         }, PluginRuntimeError, never>;
         instantiatePlugin: <T extends AnyPlugin>(pluginId: string, loadedPlugin: LoadedPlugin<T>) => Effect.Effect<{
             plugin: T;
-            metadata: import("../../types").PluginMetadata;
+            metadata: import("../..").PluginMetadata;
         }, PluginRuntimeError, never>;
         initializePlugin: <T extends AnyPlugin>(pluginInstance: PluginInstance<T>, config: {
-            variables: unknown;
-            secrets: unknown;
+            variables: InferSchemaInput<T["configSchema"]["variables"]>;
+            secrets: InferSchemaInput<T["configSchema"]["secrets"]>;
         }) => Effect.Effect<{
             plugin: T;
-            metadata: import("../../types").PluginMetadata;
-            config: z.infer<T["configSchema"]>;
+            metadata: import("../..").PluginMetadata;
+            config: {
+                variables: InferSchemaOutput<T["configSchema"]["variables"]>;
+                secrets: InferSchemaOutput<T["configSchema"]["secrets"]>;
+            };
             context: any;
             scope: Scope.CloseableScope;
         }, PluginRuntimeError, never>;

package/dist/runtime/services/plugin-loader.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-loader.service.d.ts","sourceRoot":"","sources":["../../../src/runtime/services/plugin-loader.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EACX,SAAS,EAET,YAAY,EACZ,cAAc,EACd,cAAc,EACd,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAwB,MAAM,WAAW,CAAC;AAErE,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;;AAEnD,qBAAa,iBAAkB,SAAQ,sBAGpC;CAAI;;;wBAOY,MAAM;;;AALzB,qBAAa,eAAgB,SAAQ,oBAkBnC;CAAI;;;+BAgBoB,MAAM;;;;4BAyBT,CAAC,SAAS,SAAS,YAC5B,MAAM,gBACF,YAAY,CAAC,CAAC,CAAC;;;;2BAmCX,CAAC,SAAS,SAAS,kBACrB,cAAc,CAAC,CAAC,CAAC,UACzB;YAAE,SAAS,EAAE,OAAO,CAAC;YAAC,OAAO,EAAE,OAAO,CAAA;SAAE;;;oBAwD3B,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;;;;;;AAtInD,qBAAa,mBAAoB,SAAQ,wBA6IvC;CACD"}
+{"version":3,"file":"plugin-loader.service.d.ts","sourceRoot":"","sources":["../../../src/runtime/services/plugin-loader.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEhD,OAAO,KAAK,EACX,SAAS,EAET,YAAY,EACZ,cAAc,EACd,cAAc,EACd,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAwB,MAAM,WAAW,CAAC;AAErE,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;;AAEnD,qBAAa,iBAAkB,SAAQ,sBAGpC;CAAI;;;wBAOY,MAAM;;;AALzB,qBAAa,eAAgB,SAAQ,oBAkBnC;CAAI;;;+BAgBoB,MAAM;;;;4BAyBT,CAAC,SAAS,SAAS,YAC5B,MAAM,gBACF,YAAY,CAAC,CAAC,CAAC;;;;2BAuBX,CAAC,SAAS,SAAS,kBACrB,cAAc,CAAC,CAAC,CAAC,UACzB;YAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;YAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,SAAS,CAAC,CAAC,CAAA;SAAE;;;;;;;;;;;;AAlEpI,qBAAa,mBAAoB,SAAQ,wBAoJvC;CACD"}

package/dist/runtime/services/plugin-loader.service.js

@@ -11,7 +11,7 @@ export class RegistryService extends Effect.Service()("RegistryService", {
         return {
             get: (pluginId) => Effect.fromNullable(registry[pluginId]).pipe(Effect.mapError(() => new PluginRuntimeError({
                 pluginId,
-                operation: "load-plugin",
+                operation: "validate-plugin-id",
                 cause: new Error(`Plugin ${pluginId} not found in registry`),
                 retryable: false,
             }))),
@@ -42,15 +42,7 @@ export class PluginLoaderService extends Effect.Service()("PluginLoaderService",
             }),
             instantiatePlugin: (pluginId, loadedPlugin) => Effect.gen(function* () {
                 const instance = yield* Effect.try(() => new loadedPlugin.ctor()).pipe(Effect.mapError((error) => toPluginRuntimeError(error, pluginId, undefined, "instantiate-plugin", false)));
-                // Validate plugin ID matches
-                if (instance.id !== pluginId) {
-                    return yield* Effect.fail(new PluginRuntimeError({
-                        pluginId,
-                        operation: "validate-plugin-id",
-                        cause: new Error(`Plugin ID mismatch: expected ${pluginId}, got ${instance.id}`),
-                        retryable: false,
-                    }));
-                }
+                instance.id = pluginId;
                 return {
                     plugin: instance,
                     metadata: loadedPlugin.metadata,
@@ -59,14 +51,25 @@ export class PluginLoaderService extends Effect.Service()("PluginLoaderService",
             initializePlugin: (pluginInstance, config) => Effect.gen(function* () {
                 const { plugin } = pluginInstance;
                 // Validate and hydrate config
-                const validatedConfig = yield* validate(plugin.configSchema, config, plugin.id, "config").pipe(Effect.mapError((validationError) => new PluginRuntimeError({
+                const validatedVariables = yield* validate(plugin.configSchema.variables, config.variables, plugin.id, "config").pipe(Effect.mapError((validationError) => new PluginRuntimeError({
                     pluginId: plugin.id,
                     operation: "validate-config",
                     cause: validationError.zodError,
                     retryable: false,
                 })));
-                const hydratedConfig = yield* secretsService.hydrateSecrets(validatedConfig);
-                const _config = yield* validate(plugin.configSchema, hydratedConfig, plugin.id, "config").pipe(Effect.mapError((validationError) => new PluginRuntimeError({
+                // Validate secrets
+                const validatedSecrets = yield* validate(plugin.configSchema.secrets, config.secrets, plugin.id, "config").pipe(Effect.mapError((validationError) => new PluginRuntimeError({
+                    pluginId: plugin.id,
+                    operation: "validate-secrets",
+                    cause: validationError.zodError,
+                    retryable: false,
+                })));
+                // Hydrate secrets in variables
+                const hydratedConfig = yield* secretsService.hydrateSecrets({
+                    variables: validatedVariables,
+                    secrets: validatedSecrets,
+                });
+                const _variables = yield* validate(plugin.configSchema.variables, hydratedConfig.variables, plugin.id, "config").pipe(Effect.mapError((validationError) => new PluginRuntimeError({
                     pluginId: plugin.id,
                     operation: "validate-hydrated-config",
                     cause: validationError.zodError,
@@ -75,11 +78,11 @@ export class PluginLoaderService extends Effect.Service()("PluginLoaderService",
                 // Create a long-lived scope for this plugin instance
                 const scope = yield* Scope.make();
                 // Initialize plugin within the scope
-                const context = yield* plugin.initialize(_config).pipe(Effect.provideService(Scope.Scope, scope), Effect.mapError((error) => toPluginRuntimeError(error, plugin.id, undefined, "initialize-plugin", false)));
+                const context = yield* plugin.initialize({ variables: _variables, secrets: hydratedConfig.secrets }).pipe(Effect.provideService(Scope.Scope, scope), Effect.mapError((error) => toPluginRuntimeError(error, plugin.id, undefined, "initialize-plugin", false)));
                 return {
                     plugin,
                     metadata: pluginInstance.metadata,
-                    config: _config,
+                    config: { variables: _variables, secrets: hydratedConfig.secrets },
                     context,
                     scope,
                 };

package/dist/runtime/services/plugin.service.d.ts

@@ -6,25 +6,28 @@ declare const PluginService_base: Effect.Service.Class<PluginService, "PluginSer
     readonly scoped: Effect.Effect<{
         loadPlugin: (pluginId: string) => Effect.Effect<{
             ctor: new () => AnyPlugin;
-            metadata: import("../../types").PluginMetadata;
+            metadata: import("../..").PluginMetadata;
         }, import("../errors").PluginRuntimeError, never>;
         instantiatePlugin: <T extends AnyPlugin>(pluginId: string, loadedPlugin: import("../..").LoadedPlugin<T>) => Effect.Effect<{
             plugin: T;
-            metadata: import("../../types").PluginMetadata;
+            metadata: import("../..").PluginMetadata;
         }, import("../errors").PluginRuntimeError, never>;
         initializePlugin: <T extends AnyPlugin>(pluginInstance: import("../..").PluginInstance<T>, config: {
-            variables: unknown;
-            secrets: unknown;
+            variables: import("@orpc/contract").InferSchemaInput<T["configSchema"]["variables"]>;
+            secrets: import("@orpc/contract").InferSchemaInput<T["configSchema"]["secrets"]>;
         }) => Effect.Effect<{
             plugin: T;
-            metadata: import("../../types").PluginMetadata;
-            config: import("zod").infer<T["configSchema"]>;
+            metadata: import("../..").PluginMetadata;
+            config: {
+                variables: import("@orpc/contract").InferSchemaOutput<T["configSchema"]["variables"]>;
+                secrets: import("@orpc/contract").InferSchemaOutput<T["configSchema"]["secrets"]>;
+            };
             context: any;
             scope: Scope.CloseableScope;
         }, import("../errors").PluginRuntimeError, never>;
         shutdownPlugin: (plugin: InitializedPlugin<AnyPlugin>) => Effect.Effect<void, never, never>;
         cleanup: () => Effect.Effect<void, never, never>;
-    }, never, PluginLoaderService | PluginLifecycleService>;
+    }, never, PluginLifecycleService | PluginLoaderService>;
 }>;
 export declare class PluginService extends PluginService_base {
     static Live: (registry: PluginRegistry, secrets: SecretsConfig) => Layer.Layer<PluginService, never, never>;