vite-plugin-react-server 1.1.19 → 1.2.0-alpha.0

package/dist/plugin/helpers/resolveComponent.js

@@ -0,0 +1,71 @@
+/**
+ * vite-plugin-react-server
+ * Copyright (c) Nico Brinkkemper
+ * MIT License
+ */
+import { toError } from '../error/toError.js';
+
+async function resolveComponent(options) {
+  const { componentPath, exportName, loader } = options;
+  try {
+    let modulePath = componentPath;
+    let moduleExportName = exportName;
+    if (componentPath.includes("#")) {
+      const [path, fragmentExport] = componentPath.split("#");
+      modulePath = path;
+      moduleExportName = fragmentExport;
+    }
+    const module = await loader(`${modulePath}#${moduleExportName}`);
+    if (module == null) {
+      return {
+        type: "error",
+        error: new Error(`Module ${modulePath} not found`)
+      };
+    }
+    if (module instanceof Error) {
+      return {
+        type: "error",
+        error: module
+      };
+    }
+    const component = module[moduleExportName];
+    if (!(moduleExportName in module)) {
+      if ("error" in module) {
+        return {
+          type: "error",
+          error: toError(module["error"])
+        };
+      }
+      return {
+        type: "error",
+        error: new Error(`Export "${moduleExportName}" not found in module ${modulePath}.`)
+      };
+    }
+    if (!component) {
+      return {
+        type: "error",
+        error: new Error(
+          `Export "${moduleExportName}" is null or undefined in module ${modulePath}.`
+        )
+      };
+    }
+    if (component instanceof Error) {
+      return {
+        type: "error",
+        error: component
+      };
+    }
+    return {
+      type: "success",
+      component
+    };
+  } catch (error) {
+    return {
+      type: "error",
+      error: error instanceof Error ? error : new Error(String(error))
+    };
+  }
+}
+
+export { resolveComponent };
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"resolveComponent.js","sources":["../../../plugin/helpers/resolveComponent.ts"],"sourcesContent":["import { toError } from \"../error/toError.js\";\nimport type { GenericModuleLoader, HtmlComponentType, RootComponentType } from \"../types.js\";\n\nexport type ComponentName = \"Root\" | \"Html\";\n\ntype ResolveComponentResult<T = unknown> =\n  | {\n      type: \"success\";\n      component: T;\n      error?: never;\n    }\n  | { type: \"error\"; error: Error; component?: never }\n  | { type: \"skip\"; error?: never; component?: never };\n\ntype ResolveComponentOptions = {\n  componentPath: string;\n  exportName: string;\n  loader: GenericModuleLoader;\n};\n\n/**\n * Resolves a component (Root or Html) from a string path.\n * \n * This function handles:\n * - String paths: \"src/Root.tsx\"\n * - Fragment syntax: \"src/components.tsx#MyRoot\"\n * - Export name resolution\n * \n * @param options.componentPath - The path to the component file\n * @param options.exportName - The name of the export to resolve (e.g. 'Root', 'Html')\n * @param options.loader - The loader function to use for loading the module\n * \n * @returns A result object containing the resolved component or error\n */\nexport async function resolveComponent<T = RootComponentType | HtmlComponentType>(\n  options: ResolveComponentOptions\n): Promise<ResolveComponentResult<T>> {\n  const { componentPath, exportName, loader } = options;\n  \n  try {\n    // Handle fragment syntax (e.g., \"src/components.tsx#MyRoot\")\n    let modulePath = componentPath;\n    let moduleExportName = exportName;\n    \n    if (componentPath.includes('#')) {\n      const [path, fragmentExport] = componentPath.split('#');\n      modulePath = path;\n      moduleExportName = fragmentExport;\n    }\n\n    // Load the module\n    const module = await loader(`${modulePath}#${moduleExportName}`);\n    \n    if (module == null) {\n      return {\n        type: \"error\",\n        error: new Error(`Module ${modulePath} not found`),\n      };\n    }\n\n    if (module instanceof Error) {\n      return {\n        type: \"error\",\n        error: module,\n      };\n    }\n\n    // Get the component from the module\n    const component = module[moduleExportName];\n    \n    if (!(moduleExportName in module)) {\n      if (\"error\" in module) {\n        return {\n          type: \"error\",\n          error: toError(module[\"error\"]),\n        };\n      }\n      return {\n        type: \"error\",\n        error: new Error(`Export \"${moduleExportName}\" not found in module ${modulePath}.`),\n      };\n    }\n\n    if (!component) {\n      return {\n        type: \"error\",\n        error: new Error(\n          `Export \"${moduleExportName}\" is null or undefined in module ${modulePath}.`\n        ),\n      };\n    }\n\n    if (component instanceof Error) {\n      return {\n        type: \"error\",\n        error: component,\n      };\n    }\n\n    return {\n      type: \"success\",\n      component: component as T,\n    };\n  } catch (error) {\n    return {\n      type: \"error\",\n      error: error instanceof Error ? error : new Error(String(error)),\n    };\n  }\n}\n\n/**\n * Resolves Root and Html components from user options.\n * \n * This function checks if Root/Html are strings and resolves them to components.\n * If they're already components, it returns them as-is.\n * \n * @param options - Object containing Root, Html, and resolution options\n * @returns Resolved components or original values if not strings\n */\nexport async function resolveComponentOptions(options: {\n  Root: RootComponentType | string;\n  Html: HtmlComponentType | string; \n  rootExportName: string;\n  htmlExportName: string;\n  loader: GenericModuleLoader;\n}): Promise<{\n  Root: RootComponentType;\n  Html: HtmlComponentType;\n  errors: Error[];\n}> {\n  const errors: Error[] = [];\n  let resolvedRoot = options.Root;\n  let resolvedHtml = options.Html;\n\n  // Resolve Root if it's a string\n  if (typeof options.Root === \"string\") {\n    const rootResult = await resolveComponent<RootComponentType>({\n      componentPath: options.Root,\n      exportName: options.rootExportName,\n      loader: options.loader,\n    });\n    \n    if (rootResult.type === \"success\") {\n      resolvedRoot = rootResult.component;\n    } else if (rootResult.type === \"error\") {\n      errors.push(rootResult.error);\n      // Keep original value as fallback\n    }\n  }\n\n  // Resolve Html if it's a string\n  if (typeof options.Html === \"string\") {\n    const htmlResult = await resolveComponent<HtmlComponentType>({\n      componentPath: options.Html,\n      exportName: options.htmlExportName,\n      loader: options.loader,\n    });\n    \n    if (htmlResult.type === \"success\") {\n      resolvedHtml = htmlResult.component;\n    } else if (htmlResult.type === \"error\") {\n      errors.push(htmlResult.error);\n      // Keep original value as fallback\n    }\n  }\n\n  return {\n    Root: resolvedRoot as RootComponentType,\n    Html: resolvedHtml as HtmlComponentType,\n    errors,\n  };\n} "],"names":[],"mappings":";;;;;;;AAkCA,eAAsB,iBACpB,OACoC,EAAA;AACpC,EAAA,MAAM,EAAE,aAAA,EAAe,UAAY,EAAA,MAAA,EAAW,GAAA,OAAA;AAE9C,EAAI,IAAA;AAEF,IAAA,IAAI,UAAa,GAAA,aAAA;AACjB,IAAA,IAAI,gBAAmB,GAAA,UAAA;AAEvB,IAAI,IAAA,aAAA,CAAc,QAAS,CAAA,GAAG,CAAG,EAAA;AAC/B,MAAA,MAAM,CAAC,IAAM,EAAA,cAAc,CAAI,GAAA,aAAA,CAAc,MAAM,GAAG,CAAA;AACtD,MAAa,UAAA,GAAA,IAAA;AACb,MAAmB,gBAAA,GAAA,cAAA;AAAA;AAIrB,IAAA,MAAM,SAAS,MAAM,MAAA,CAAO,GAAG,UAAU,CAAA,CAAA,EAAI,gBAAgB,CAAE,CAAA,CAAA;AAE/D,IAAA,IAAI,UAAU,IAAM,EAAA;AAClB,MAAO,OAAA;AAAA,QACL,IAAM,EAAA,OAAA;AAAA,QACN,KAAO,EAAA,IAAI,KAAM,CAAA,CAAA,OAAA,EAAU,UAAU,CAAY,UAAA,CAAA;AAAA,OACnD;AAAA;AAGF,IAAA,IAAI,kBAAkB,KAAO,EAAA;AAC3B,MAAO,OAAA;AAAA,QACL,IAAM,EAAA,OAAA;AAAA,QACN,KAAO,EAAA;AAAA,OACT;AAAA;AAIF,IAAM,MAAA,SAAA,GAAY,OAAO,gBAAgB,CAAA;AAEzC,IAAI,IAAA,EAAE,oBAAoB,MAAS,CAAA,EAAA;AACjC,MAAA,IAAI,WAAW,MAAQ,EAAA;AACrB,QAAO,OAAA;AAAA,UACL,IAAM,EAAA,OAAA;AAAA,UACN,KAAO,EAAA,OAAA,CAAQ,MAAO,CAAA,OAAO,CAAC;AAAA,SAChC;AAAA;AAEF,MAAO,OAAA;AAAA,QACL,IAAM,EAAA,OAAA;AAAA,QACN,OAAO,IAAI,KAAA,CAAM,WAAW,gBAAgB,CAAA,sBAAA,EAAyB,UAAU,CAAG,CAAA,CAAA;AAAA,OACpF;AAAA;AAGF,IAAA,IAAI,CAAC,SAAW,EAAA;AACd,MAAO,OAAA;AAAA,QACL,IAAM,EAAA,OAAA;AAAA,QACN,OAAO,IAAI,KAAA;AAAA,UACT,CAAA,QAAA,EAAW,gBAAgB,CAAA,iCAAA,EAAoC,UAAU,CAAA,CAAA;AAAA;AAC3E,OACF;AAAA;AAGF,IAAA,IAAI,qBAAqB,KAAO,EAAA;AAC9B,MAAO,OAAA;AAAA,QACL,IAAM,EAAA,OAAA;AAAA,QACN,KAAO,EAAA;AAAA,OACT;AAAA;AAGF,IAAO,OAAA;AAAA,MACL,IAAM,EAAA,SAAA;AAAA,MACN;AAAA,KACF;AAAA,WACO,KAAO,EAAA;AACd,IAAO,OAAA;AAAA,MACL,IAAM,EAAA,OAAA;AAAA,MACN,KAAA,EAAO,iBAAiB,KAAQ,GAAA,KAAA,GAAQ,IAAI,KAAM,CAAA,MAAA,CAAO,KAAK,CAAC;AAAA,KACjE;AAAA;AAEJ;;;;"}

package/dist/plugin/helpers/resolveComponents.d.ts

@@ -0,0 +1,27 @@
+import type { PageComponentType, PagePropOpt, RootComponentType, HtmlComponentType } from "../types.js";
+import type { CreateHandlerOptions } from "../types.js";
+export type ResolveComponentsOptions = Pick<CreateHandlerOptions, "pagePath" | "pageExportName" | "propsPath" | "propsExportName" | "route" | "loader" | "moduleBaseURL" | "build" | "RootComponent" | "HtmlComponent" | "verbose"> & {
+    rootPath?: string;
+    htmlPath?: string;
+    rootExportName?: string;
+    htmlExportName?: string;
+};
+export type ResolveComponentsSuccess = {
+    type: "success";
+    PageComponent: PageComponentType<PagePropOpt>;
+    pageProps: PagePropOpt;
+    RootComponent: RootComponentType;
+    HtmlComponent: HtmlComponentType;
+};
+export type ResolveComponentsError = {
+    type: "error";
+    error: Error;
+    reason?: string;
+};
+export type ResolveComponentsResult = ResolveComponentsSuccess | ResolveComponentsError;
+/**
+ * Unified component resolution function that builds a complete components object.
+ * Uses resolvePageAndProps internally and resolves Root/Html components alongside.
+ */
+export declare const resolveComponents: ({ pagePath, propsPath, rootPath, htmlPath, pageExportName, propsExportName, rootExportName, htmlExportName, route, loader, moduleBaseURL, build, RootComponent: overrideRootComponent, HtmlComponent: overrideHtmlComponent, verbose, }: ResolveComponentsOptions) => Promise<ResolveComponentsResult>;
+//# sourceMappingURL=resolveComponents.d.ts.map

package/dist/plugin/helpers/resolveComponents.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveComponents.d.ts","sourceRoot":"","sources":["../../../plugin/helpers/resolveComponents.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAExG,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAExD,MAAM,MAAM,wBAAwB,GAAG,IAAI,CACzC,oBAAoB,EAClB,UAAU,GACV,gBAAgB,GAChB,WAAW,GACX,iBAAiB,GACjB,OAAO,GACP,QAAQ,GACR,eAAe,GACf,OAAO,GACP,eAAe,GACf,eAAe,GACf,SAAS,CACZ,GAAG;IACF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,SAAS,CAAC;IAChB,aAAa,EAAE,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAC9C,SAAS,EAAE,WAAW,CAAC;IACvB,aAAa,EAAE,iBAAiB,CAAC;IACjC,aAAa,EAAE,iBAAiB,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,wBAAwB,GAAG,sBAAsB,CAAC;AAExF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAAU,yOAgBrC,wBAAwB,KAAG,OAAO,CAAC,uBAAuB,CAuH5D,CAAC"}

package/dist/plugin/helpers/resolveComponents.js

@@ -0,0 +1,137 @@
+/**
+ * vite-plugin-react-server
+ * Copyright (c) Nico Brinkkemper
+ * MIT License
+ */
+import { resolvePageAndProps } from './resolvePageAndProps.js';
+import { resolveComponent } from './resolveComponent.js';
+import { Root } from '../components/root.js';
+import { Html } from '../components/html.js';
+import { enhanceError } from '../error/enhanceError.js';
+import { toError } from '../error/toError.js';
+
+const resolveComponents = async ({
+  pagePath,
+  propsPath,
+  rootPath,
+  htmlPath,
+  pageExportName = "Page",
+  propsExportName = "props",
+  rootExportName = "Root",
+  htmlExportName = "Html",
+  route,
+  loader,
+  moduleBaseURL,
+  build,
+  RootComponent: overrideRootComponent,
+  HtmlComponent: overrideHtmlComponent,
+  verbose
+}) => {
+  try {
+    const pageAndPropsResult = await resolvePageAndProps({
+      pagePath,
+      propsPath,
+      pageExportName,
+      propsExportName,
+      route,
+      loader,
+      moduleBaseURL,
+      build
+    });
+    if (pageAndPropsResult.type !== "success") {
+      if (pageAndPropsResult.type === "error") {
+        const enhancedError = enhanceError(
+          pageAndPropsResult.error,
+          resolveComponents,
+          `resolveComponents("${route}")`
+        );
+        return {
+          type: "error",
+          error: enhancedError,
+          reason: "Page/props resolution failed"
+        };
+      }
+      const skipError = new Error("Page/props resolution was skipped");
+      Error.captureStackTrace(skipError, resolveComponents);
+      return {
+        type: "error",
+        error: skipError,
+        reason: "Page/props resolution was skipped"
+      };
+    }
+    const { PageComponent, pageProps } = pageAndPropsResult;
+    let RootComponent = overrideRootComponent || Root;
+    if (!overrideRootComponent && rootPath) {
+      if (verbose) {
+        console.log(`[resolveComponents] Resolving Root component from path: ${rootPath}, exportName: ${rootExportName}`);
+      }
+      const rootResult = await resolveComponent({
+        componentPath: rootPath,
+        exportName: rootExportName,
+        loader
+      });
+      if (rootResult.type === "error") {
+        if (verbose) {
+          console.log(`[resolveComponents] Root component resolution failed:`, rootResult.error);
+        }
+        RootComponent = Root;
+      } else if (rootResult.type === "success") {
+        if (verbose) {
+          console.log(`[resolveComponents] Root component resolved successfully`);
+        }
+        RootComponent = rootResult.component;
+      }
+    } else {
+      if (verbose) {
+        console.log(`[resolveComponents] Using default Root component (override: ${!!overrideRootComponent}, rootPath: ${rootPath})`);
+      }
+    }
+    let HtmlComponent = overrideHtmlComponent || Html;
+    if (!overrideHtmlComponent && htmlPath) {
+      if (verbose) {
+        console.log(`[resolveComponents] Resolving Html component from path: ${htmlPath}, exportName: ${htmlExportName}`);
+      }
+      const htmlResult = await resolveComponent({
+        componentPath: htmlPath,
+        exportName: htmlExportName,
+        loader
+      });
+      if (htmlResult.type === "error") {
+        if (verbose) {
+          console.log(`[resolveComponents] Html component resolution failed:`, htmlResult.error);
+        }
+        HtmlComponent = Html;
+      } else if (htmlResult.type === "success") {
+        if (verbose) {
+          console.log(`[resolveComponents] Html component resolved successfully`);
+        }
+        HtmlComponent = htmlResult.component;
+      }
+    } else {
+      if (verbose) {
+        console.log(`[resolveComponents] Using default Html component (override: ${!!overrideHtmlComponent}, htmlPath: ${htmlPath})`);
+      }
+    }
+    return {
+      type: "success",
+      PageComponent,
+      pageProps,
+      RootComponent,
+      HtmlComponent
+    };
+  } catch (error) {
+    const enhancedError = enhanceError(
+      toError(error),
+      resolveComponents,
+      `resolveComponents("${route}")`
+    );
+    return {
+      type: "error",
+      error: enhancedError,
+      reason: "Component resolution failed"
+    };
+  }
+};
+
+export { resolveComponents };
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"resolveComponents.js","sources":["../../../plugin/helpers/resolveComponents.ts"],"sourcesContent":["import { resolvePageAndProps } from \"./resolvePageAndProps.js\";\nimport { resolveComponent } from \"./resolveComponent.js\";\nimport { Root as DefaultRoot } from \"../components/root.js\";\nimport { Html as DefaultHtml } from \"../components/html.js\";\nimport { enhanceError } from \"../error/enhanceError.js\";\nimport type { PageComponentType, PagePropOpt, RootComponentType, HtmlComponentType } from \"../types.js\";\nimport { toError } from \"../error/toError.js\";\nimport type { CreateHandlerOptions } from \"../types.js\";\n\nexport type ResolveComponentsOptions = Pick<\n  CreateHandlerOptions,\n  | \"pagePath\"\n  | \"pageExportName\"\n  | \"propsPath\"\n  | \"propsExportName\"\n  | \"route\"\n  | \"loader\"\n  | \"moduleBaseURL\"\n  | \"build\"\n  | \"RootComponent\"\n  | \"HtmlComponent\"\n  | \"verbose\"\n> & {\n  rootPath?: string;\n  htmlPath?: string;\n  rootExportName?: string;\n  htmlExportName?: string;\n};\n\nexport type ResolveComponentsSuccess = {\n  type: \"success\";\n  PageComponent: PageComponentType<PagePropOpt>;\n  pageProps: PagePropOpt;\n  RootComponent: RootComponentType;\n  HtmlComponent: HtmlComponentType;\n};\n\nexport type ResolveComponentsError = {\n  type: \"error\";\n  error: Error;\n  reason?: string;\n};\n\nexport type ResolveComponentsResult = ResolveComponentsSuccess | ResolveComponentsError;\n\n/**\n * Unified component resolution function that builds a complete components object.\n * Uses resolvePageAndProps internally and resolves Root/Html components alongside.\n */\nexport const resolveComponents = async ({\n  pagePath,\n  propsPath,\n  rootPath,\n  htmlPath,\n  pageExportName = \"Page\",\n  propsExportName = \"props\",\n  rootExportName = \"Root\",\n  htmlExportName = \"Html\",\n  route,\n  loader,\n  moduleBaseURL,\n  build,\n  RootComponent: overrideRootComponent,\n  HtmlComponent: overrideHtmlComponent,\n  verbose,\n}: ResolveComponentsOptions): Promise<ResolveComponentsResult> => {\n  try {\n    // First resolve page and props using existing function\n    const pageAndPropsResult = await resolvePageAndProps({\n      pagePath,\n      propsPath,\n      pageExportName,\n      propsExportName,\n      route,\n      loader,\n      moduleBaseURL,\n      build,\n    });\n\n    if (pageAndPropsResult.type !== \"success\") {\n      if (pageAndPropsResult.type === \"error\") {\n        const enhancedError = enhanceError(\n          pageAndPropsResult.error,\n          resolveComponents,\n          `resolveComponents(\\\"${route}\\\")`,\n        );\n        \n        return {\n          type: \"error\",\n          error: enhancedError,\n          reason: \"Page/props resolution failed\",\n        };\n      }\n      \n      const skipError = new Error(\"Page/props resolution was skipped\");\n      Error.captureStackTrace(skipError, resolveComponents);\n      \n      return {\n        type: \"error\",\n        error: skipError,\n        reason: \"Page/props resolution was skipped\",\n      };\n    }\n\n    const { PageComponent, pageProps } = pageAndPropsResult;\n\n    // Resolve Root component (use override if provided, otherwise resolve from path)\n    let RootComponent = overrideRootComponent || DefaultRoot;\n    if (!overrideRootComponent && rootPath) {\n      if (verbose) {\n        console.log(`[resolveComponents] Resolving Root component from path: ${rootPath}, exportName: ${rootExportName}`);\n      }\n      const rootResult = await resolveComponent({\n        componentPath: rootPath,\n        exportName: rootExportName,\n        loader: loader as any,\n      });\n      if (rootResult.type === \"error\") {\n        if (verbose) {\n          console.log(`[resolveComponents] Root component resolution failed:`, rootResult.error);\n        }\n        // Fallback to default Root component\n        RootComponent = DefaultRoot;\n      } else if (rootResult.type === \"success\") {\n        if (verbose) {\n          console.log(`[resolveComponents] Root component resolved successfully`);\n        }\n        RootComponent = rootResult.component;\n      }\n    } else {\n      if (verbose) {\n        console.log(`[resolveComponents] Using default Root component (override: ${!!overrideRootComponent}, rootPath: ${rootPath})`);\n      }\n    }\n\n    // Resolve Html component (use override if provided, otherwise resolve from path)\n    let HtmlComponent = overrideHtmlComponent || DefaultHtml;\n    if (!overrideHtmlComponent && htmlPath) {\n      if (verbose) {\n        console.log(`[resolveComponents] Resolving Html component from path: ${htmlPath}, exportName: ${htmlExportName}`);\n      }\n      const htmlResult = await resolveComponent({\n        componentPath: htmlPath,\n        exportName: htmlExportName,\n        loader: loader as any,\n      });\n      if (htmlResult.type === \"error\") {\n        if (verbose) {\n          console.log(`[resolveComponents] Html component resolution failed:`, htmlResult.error);\n        }\n        // Fallback to default Html component\n        HtmlComponent = DefaultHtml;\n      } else if (htmlResult.type === \"success\") {\n        if (verbose) {\n          console.log(`[resolveComponents] Html component resolved successfully`);\n        }\n        HtmlComponent = htmlResult.component;\n      }\n    } else {\n      if (verbose) {\n        console.log(`[resolveComponents] Using default Html component (override: ${!!overrideHtmlComponent}, htmlPath: ${htmlPath})`);\n      }\n    }\n\n    return {\n      type: \"success\",\n      PageComponent,\n      pageProps,\n      RootComponent,\n      HtmlComponent,\n    };\n  } catch (error) {\n    const enhancedError = enhanceError(\n      toError(error),\n      resolveComponents,\n      `resolveComponents(\\\"${route}\\\")`\n    );\n    \n    return {\n      type: \"error\",\n      error: enhancedError,\n      reason: \"Component resolution failed\",\n    };\n  }\n}; "],"names":["DefaultRoot","DefaultHtml"],"mappings":"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"}

package/dist/plugin/helpers/resolvePage.d.ts

@@ -1,20 +1,24 @@
-type ResolvePageOptions<N extends string> = {
-    id: string;
-    exportName: N;
-    loader: (id: string) => Promise<any>;
-};
-type ResolvePageResult<T, N extends string> = {
+import type { GenericModuleLoader } from "../types.js";
+type ResolvePageResult = {
     type: "success";
-    Page: T;
-    module: {
-        [key in N]: T;
-    };
+    module: Record<string, unknown>;
+    error?: never;
 } | {
     type: "error";
     error: Error;
+    Page?: never;
+    module?: never;
 } | {
     type: "skip";
+    error?: never;
+    Page?: never;
+    module?: never;
 };
+type ResolvePageFn = (options: {
+    id: string;
+    exportName: string;
+    loader: GenericModuleLoader;
+}) => Promise<ResolvePageResult>;
 /**
  * Resolves a page component from a module.
  *
@@ -31,6 +35,6 @@ type ResolvePageResult<T, N extends string> = {
  *   - Page: The resolved page component if successful
  *   - error: Error message if failed
  */
-export declare const resolvePage: <T, N extends string>({ id, exportName, loader, }: ResolvePageOptions<N>) => Promise<ResolvePageResult<T, N>>;
+export declare const resolvePage: ResolvePageFn;
 export {};
 //# sourceMappingURL=resolvePage.d.ts.map

package/dist/plugin/helpers/resolvePage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolvePage.d.ts","sourceRoot":"","sources":["../../../plugin/helpers/resolvePage.ts"],"names":[],"mappings":"AAEA,KAAK,kBAAkB,CAAC,CAAC,SAAS,MAAM,IAAI;IAC1C,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,CAAC,CAAC;IACd,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CACtC,CAAC;AAEF,KAAK,iBAAiB,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,IACtC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE;SAAG,GAAG,IAAI,CAAC,GAAG,CAAC;KAAE,CAAA;CAAE,GACvD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,GAC/B;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAErB;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,WAAW,GAAU,CAAC,EAAE,CAAC,SAAS,MAAM,EAAE,6BAIpD,kBAAkB,CAAC,CAAC,CAAC,KAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,CAgEzD,CAAC"}
+{"version":3,"file":"resolvePage.d.ts","sourceRoot":"","sources":["../../../plugin/helpers/resolvePage.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEvD,KAAK,iBAAiB,GAClB;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,GACD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,KAAK,CAAC;IAAC,IAAI,CAAC,EAAE,KAAK,CAAC;IAAC,MAAM,CAAC,EAAE,KAAK,CAAA;CAAE,GAC7D;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAC;IAAC,IAAI,CAAC,EAAE,KAAK,CAAC;IAAC,MAAM,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC;AAElE,KAAK,aAAa,GAAG,CAAC,OAAO,EAAE;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,mBAAmB,CAAA;CAC5B,KAAK,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAEjC;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,WAAW,EAAE,aAqEzB,CAAC"}

package/dist/plugin/helpers/resolvePage.js

@@ -5,17 +5,17 @@
  */
 import { toError } from '../error/toError.js';
 
-const resolvePage = async ({
+const resolvePage = async function _resolvePage({
   id,
   exportName,
   loader
-}) => {
+}) {
   const pageLoadResult = await (async () => {
     try {
       return {
         type: "success",
         key: id,
-        module: await loader(id)
+        module: await loader(`${id}#${exportName}`)
       };
     } catch (error) {
       return {
@@ -28,6 +28,12 @@ const resolvePage = async ({
     return pageLoadResult;
   }
   const { module } = pageLoadResult;
+  if (module == null) {
+    return {
+      type: "error",
+      error: new Error(`Module ${id} not found`)
+    };
+  }
   const Page = module[exportName];
   if (module instanceof Error) {
     return {
@@ -42,10 +48,9 @@ const resolvePage = async ({
     if ("error" in module) {
       return {
         type: "error",
-        error: toError(module.error)
+        error: toError(module["error"])
       };
     }
-    console.log({ module });
     return {
       type: "error",
       error: new Error(`Export "${exportName}" not found in module ${id}.`)
@@ -65,10 +70,9 @@ const resolvePage = async ({
   }
   return {
     type: "success",
-    Page,
     module
   };
 };
 
 export { resolvePage };
-//# sourceMappingURL=resolvePage.js.map
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzb2x2ZVBhZ2UuanMiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3BsdWdpbi9oZWxwZXJzL3Jlc29sdmVQYWdlLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHRvRXJyb3IgfSBmcm9tIFwiLi4vZXJyb3IvdG9FcnJvci5qc1wiO1xuaW1wb3J0IHR5cGUgeyBHZW5lcmljTW9kdWxlTG9hZGVyIH0gZnJvbSBcIi4uL3R5cGVzLmpzXCI7XG5cbnR5cGUgUmVzb2x2ZVBhZ2VSZXN1bHQgPVxuICB8IHtcbiAgICAgIHR5cGU6IFwic3VjY2Vzc1wiO1xuICAgICAgbW9kdWxlOiAgUmVjb3JkPHN0cmluZywgdW5rbm93bj47XG4gICAgICBlcnJvcj86IG5ldmVyO1xuICAgIH1cbiAgfCB7IHR5cGU6IFwiZXJyb3JcIjsgZXJyb3I6IEVycm9yOyBQYWdlPzogbmV2ZXI7IG1vZHVsZT86IG5ldmVyIH1cbiAgfCB7IHR5cGU6IFwic2tpcFwiOyBlcnJvcj86IG5ldmVyOyBQYWdlPzogbmV2ZXI7IG1vZHVsZT86IG5ldmVyIH07XG5cbnR5cGUgUmVzb2x2ZVBhZ2VGbiA9IChvcHRpb25zOiB7XG4gIGlkOiBzdHJpbmc7XG4gIGV4cG9ydE5hbWU6IHN0cmluZztcbiAgbG9hZGVyOiBHZW5lcmljTW9kdWxlTG9hZGVyXG59KSA9PiBQcm9taXNlPFJlc29sdmVQYWdlUmVzdWx0PjtcblxuLyoqXG4gKiBSZXNvbHZlcyBhIHBhZ2UgY29tcG9uZW50IGZyb20gYSBtb2R1bGUuXG4gKlxuICogRHVyaW5nIGRldmVsb3BtZW50IChzc3JMb2FkTW9kdWxlKTpcbiAqIC0gUmVhbCBtb2R1bGVzIGhhdmUgZXhwb3J0cyBhdmFpbGFibGUgZGlyZWN0bHkgb24gdGhlIG1vZHVsZSBvYmplY3RcbiAqIC0gVmlydHVhbCBtb2R1bGVzIGhhdmUgZXhwb3J0cyBzdG9yZWQgaW4gdGVtcG9yYXJ5UmVmZXJlbmNlc1xuICpcbiAqIEBwYXJhbSBvcHRpb25zLmlkIC0gVGhlIG1vZHVsZSBJRCB0byByZXNvbHZlXG4gKiBAcGFyYW0gb3B0aW9ucy5leHBvcnROYW1lIC0gVGhlIG5hbWUgb2YgdGhlIGV4cG9ydCB0byByZXNvbHZlIChlLmcuICdQYWdlJylcbiAqIEBwYXJhbSBvcHRpb25zLmxvYWRlciAtIFRoZSBsb2FkZXIgZnVuY3Rpb24gdG8gdXNlIGZvciBsb2FkaW5nIHRoZSBtb2R1bGVcbiAqXG4gKiBAcmV0dXJucyBBIHJlc3VsdCBvYmplY3QgY29udGFpbmluZzpcbiAqICAgLSB0eXBlOiBcInN1Y2Nlc3NcIiB8IFwiZXJyb3JcIiB8IFwic2tpcFwiXG4gKiAgIC0gUGFnZTogVGhlIHJlc29sdmVkIHBhZ2UgY29tcG9uZW50IGlmIHN1Y2Nlc3NmdWxcbiAqICAgLSBlcnJvcjogRXJyb3IgbWVzc2FnZSBpZiBmYWlsZWRcbiAqL1xuZXhwb3J0IGNvbnN0IHJlc29sdmVQYWdlOiBSZXNvbHZlUGFnZUZuID0gYXN5bmMgZnVuY3Rpb24gX3Jlc29sdmVQYWdlKHtcbiAgaWQsXG4gIGV4cG9ydE5hbWUsXG4gIGxvYWRlcixcbn0pIHtcbiAgLy8gQ2hlY2sgaWYgdGhpcyBpcyBhIHN0YXNoZWQgcGFnZSB0aGF0IG5lZWRzIHNwZWNpYWwgaGFuZGxpbmdcbiAgY29uc3QgcGFnZUxvYWRSZXN1bHQgPSBhd2FpdCAoYXN5bmMgKCkgPT4ge1xuICAgIHRyeSB7XG4gICAgICByZXR1cm4ge1xuICAgICAgICB0eXBlOiBcInN1Y2Nlc3NcIiBhcyBjb25zdCxcbiAgICAgICAga2V5OiBpZCxcbiAgICAgICAgbW9kdWxlOiBhd2FpdCBsb2FkZXIoYCR7aWR9IyR7ZXhwb3J0TmFtZX1gKSxcbiAgICAgIH07XG4gICAgfSBjYXRjaCAoZXJyb3IpIHtcbiAgICAgIHJldHVybiB7XG4gICAgICAgIHR5cGU6IFwiZXJyb3JcIiBhcyBjb25zdCxcbiAgICAgICAgZXJyb3I6IGVycm9yIGluc3RhbmNlb2YgRXJyb3IgPyBlcnJvciA6IG5ldyBFcnJvcihTdHJpbmcoZXJyb3IpKSxcbiAgICAgIH07XG4gICAgfVxuICB9KSgpO1xuXG4gIGlmIChwYWdlTG9hZFJlc3VsdC50eXBlICE9PSBcInN1Y2Nlc3NcIikge1xuICAgIHJldHVybiBwYWdlTG9hZFJlc3VsdDtcbiAgfVxuICBjb25zdCB7IG1vZHVsZSB9ID0gcGFnZUxvYWRSZXN1bHQ7XG4gIGlmIChtb2R1bGUgPT0gbnVsbCkge1xuICAgIHJldHVybiB7XG4gICAgICB0eXBlOiBcImVycm9yXCIgYXMgY29uc3QsXG4gICAgICBlcnJvcjogbmV3IEVycm9yKGBNb2R1bGUgJHtpZH0gbm90IGZvdW5kYCksXG4gICAgfTtcbiAgfVxuICBjb25zdCBQYWdlID0gbW9kdWxlW2V4cG9ydE5hbWVdO1xuICBpZiAobW9kdWxlIGluc3RhbmNlb2YgRXJyb3IpIHtcbiAgICByZXR1cm4ge1xuICAgICAgdHlwZTogXCJlcnJvclwiIGFzIGNvbnN0LFxuICAgICAgZXJyb3I6IHtcbiAgICAgICAgbmFtZTogbW9kdWxlLm5hbWUsXG4gICAgICAgIG1lc3NhZ2U6IG1vZHVsZS5tZXNzYWdlLFxuICAgICAgICBzdGFjazogbW9kdWxlLnN0YWNrLFxuICAgICAgfSxcbiAgICB9O1xuICB9IGVsc2UgaWYgKCEoZXhwb3J0TmFtZSBpbiBtb2R1bGUpKSB7XG4gICAgaWYgKFwiZXJyb3JcIiBpbiBtb2R1bGUpIHtcbiAgICAgIHJldHVybiB7XG4gICAgICAgIHR5cGU6IFwiZXJyb3JcIiBhcyBjb25zdCxcbiAgICAgICAgZXJyb3I6IHRvRXJyb3IobW9kdWxlW1wiZXJyb3JcIl0pLFxuICAgICAgfTtcbiAgICB9XG4gICAgcmV0dXJuIHtcbiAgICAgIHR5cGU6IFwiZXJyb3JcIiBhcyBjb25zdCxcbiAgICAgIGVycm9yOiBuZXcgRXJyb3IoYEV4cG9ydCBcIiR7ZXhwb3J0TmFtZX1cIiBub3QgZm91bmQgaW4gbW9kdWxlICR7aWR9LmApLFxuICAgIH07XG4gIH0gZWxzZSBpZiAoIVBhZ2UpIHtcbiAgICByZXR1cm4ge1xuICAgICAgdHlwZTogXCJlcnJvclwiIGFzIGNvbnN0LFxuICAgICAgZXJyb3I6IG5ldyBFcnJvcihcbiAgICAgICAgYEV4cG9ydCBcIiR7ZXhwb3J0TmFtZX1cIiBpcyBudWxsIG9yIHVuZGVmaW5lZCBpbiBtb2R1bGUgJHtpZH0uYFxuICAgICAgKSxcbiAgICB9O1xuICB9IGVsc2UgaWYgKFBhZ2UgaW5zdGFuY2VvZiBFcnJvcikge1xuICAgIHJldHVybiB7XG4gICAgICB0eXBlOiBcImVycm9yXCIgYXMgY29uc3QsXG4gICAgICBlcnJvcjogUGFnZSxcbiAgICB9O1xuICB9XG4gIHJldHVybiB7XG4gICAgdHlwZTogXCJzdWNjZXNzXCIgYXMgY29uc3QsXG4gICAgbW9kdWxlOiBtb2R1bGUsXG4gIH07XG59O1xuIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7QUFrQ2EsTUFBQSxXQUFBLEdBQTZCLGVBQWUsWUFBYSxDQUFBO0FBQUEsRUFDcEUsRUFBQTtBQUFBLEVBQ0EsVUFBQTtBQUFBLEVBQ0E7QUFDRixDQUFHLEVBQUE7QUFFRCxFQUFNLE1BQUEsY0FBQSxHQUFpQixPQUFPLFlBQVk7QUFDeEMsSUFBSSxJQUFBO0FBQ0YsTUFBTyxPQUFBO0FBQUEsUUFDTCxJQUFNLEVBQUEsU0FBQTtBQUFBLFFBQ04sR0FBSyxFQUFBLEVBQUE7QUFBQSxRQUNMLFFBQVEsTUFBTSxNQUFBLENBQU8sR0FBRyxFQUFFLENBQUEsQ0FBQSxFQUFJLFVBQVUsQ0FBRSxDQUFBO0FBQUEsT0FDNUM7QUFBQSxhQUNPLEtBQU8sRUFBQTtBQUNkLE1BQU8sT0FBQTtBQUFBLFFBQ0wsSUFBTSxFQUFBLE9BQUE7QUFBQSxRQUNOLEtBQUEsRUFBTyxpQkFBaUIsS0FBUSxHQUFBLEtBQUEsR0FBUSxJQUFJLEtBQU0sQ0FBQSxNQUFBLENBQU8sS0FBSyxDQUFDO0FBQUEsT0FDakU7QUFBQTtBQUNGLEdBQ0MsR0FBQTtBQUVILEVBQUksSUFBQSxjQUFBLENBQWUsU0FBUyxTQUFXLEVBQUE7QUFDckMsSUFBTyxPQUFBLGNBQUE7QUFBQTtBQUVULEVBQU0sTUFBQSxFQUFFLFFBQVcsR0FBQSxjQUFBO0FBQ25CLEVBQUEsSUFBSSxVQUFVLElBQU0sRUFBQTtBQUNsQixJQUFPLE9BQUE7QUFBQSxNQUNMLElBQU0sRUFBQSxPQUFBO0FBQUEsTUFDTixLQUFPLEVBQUEsSUFBSSxLQUFNLENBQUEsQ0FBQSxPQUFBLEVBQVUsRUFBRSxDQUFZLFVBQUEsQ0FBQTtBQUFBLEtBQzNDO0FBQUE7QUFFRixFQUFNLE1BQUEsSUFBQSxHQUFPLE9BQU8sVUFBVSxDQUFBO0FBQzlCLEVBQUEsSUFBSSxrQkFBa0IsS0FBTyxFQUFBO0FBQzNCLElBQU8sT0FBQTtBQUFBLE1BQ0wsSUFBTSxFQUFBLE9BQUE7QUFBQSxNQUNOLEtBQU8sRUFBQTtBQUFBLFFBQ0wsTUFBTSxNQUFPLENBQUEsSUFBQTtBQUFBLFFBQ2IsU0FBUyxNQUFPLENBQUEsT0FBQTtBQUFBLFFBQ2hCLE9BQU8sTUFBTyxDQUFBO0FBQUE7QUFDaEIsS0FDRjtBQUFBLEdBQ0YsTUFBQSxJQUFXLEVBQUUsVUFBQSxJQUFjLE1BQVMsQ0FBQSxFQUFBO0FBQ2xDLElBQUEsSUFBSSxXQUFXLE1BQVEsRUFBQTtBQUNyQixNQUFPLE9BQUE7QUFBQSxRQUNMLElBQU0sRUFBQSxPQUFBO0FBQUEsUUFDTixLQUFPLEVBQUEsT0FBQSxDQUFRLE1BQU8sQ0FBQSxPQUFPLENBQUM7QUFBQSxPQUNoQztBQUFBO0FBRUYsSUFBTyxPQUFBO0FBQUEsTUFDTCxJQUFNLEVBQUEsT0FBQTtBQUFBLE1BQ04sT0FBTyxJQUFJLEtBQUEsQ0FBTSxXQUFXLFVBQVUsQ0FBQSxzQkFBQSxFQUF5QixFQUFFLENBQUcsQ0FBQSxDQUFBO0FBQUEsS0FDdEU7QUFBQSxHQUNGLE1BQUEsSUFBVyxDQUFDLElBQU0sRUFBQTtBQUNoQixJQUFPLE9BQUE7QUFBQSxNQUNMLElBQU0sRUFBQSxPQUFBO0FBQUEsTUFDTixPQUFPLElBQUksS0FBQTtBQUFBLFFBQ1QsQ0FBQSxRQUFBLEVBQVcsVUFBVSxDQUFBLGlDQUFBLEVBQW9DLEVBQUUsQ0FBQSxDQUFBO0FBQUE7QUFDN0QsS0FDRjtBQUFBLEdBQ0YsTUFBQSxJQUFXLGdCQUFnQixLQUFPLEVBQUE7QUFDaEMsSUFBTyxPQUFBO0FBQUEsTUFDTCxJQUFNLEVBQUEsT0FBQTtBQUFBLE1BQ04sS0FBTyxFQUFBO0FBQUEsS0FDVDtBQUFBO0FBRUYsRUFBTyxPQUFBO0FBQUEsSUFDTCxJQUFNLEVBQUEsU0FBQTtBQUFBLElBQ047QUFBQSxHQUNGO0FBQ0Y7Ozs7In0=

package/dist/plugin/helpers/resolvePageAndProps.d.ts

@@ -1,12 +1,4 @@
-import type { PageComponentType, PagePropOpt } from "../types.js";
-type ResolvePageAndPropsOptions<N1 extends string, N2 extends string> = {
-    pagePath: string;
-    pageExportName: N1;
-    propsPath?: string;
-    propsExportName?: N2;
-    route: string;
-    loader: (id: string) => Promise<any>;
-};
+import type { CreateHandlerOptions, PageComponentType, PagePropOpt } from "../types.js";
 type ResolvePageAndPropsResult<T extends PagePropOpt = PagePropOpt> = {
     type: "success";
     error?: never;
@@ -23,6 +15,7 @@ type ResolvePageAndPropsResult<T extends PagePropOpt = PagePropOpt> = {
     PageComponent?: never;
     pageProps?: never;
 };
-export declare function resolvePageAndProps<T extends PagePropOpt = PagePropOpt, N1 extends string = string, N2 extends string = string>(handlerOptions: ResolvePageAndPropsOptions<N1, N2>): Promise<ResolvePageAndPropsResult<T>>;
+export type ResolvePageAndPropsFn = <T extends PagePropOpt = PagePropOpt>(options: Pick<CreateHandlerOptions, "pagePath" | "pageExportName" | "propsPath" | "propsExportName" | "route" | "loader" | "moduleBaseURL" | "build">) => Promise<ResolvePageAndPropsResult<T>>;
+export declare const resolvePageAndProps: ResolvePageAndPropsFn;
 export {};
 //# sourceMappingURL=resolvePageAndProps.d.ts.map

package/dist/plugin/helpers/resolvePageAndProps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolvePageAndProps.d.ts","sourceRoot":"","sources":["../../../plugin/helpers/resolvePageAndProps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAIlE,KAAK,0BAA0B,CAAC,EAAE,SAAS,MAAM,EAAE,EAAE,SAAS,MAAM,IAAI;IACtE,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,EAAE,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,EAAE,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CACtC,CAAC;AAEF,KAAK,yBAAyB,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAC9D;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,aAAa,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC;IACpC,SAAS,EAAE,CAAC,CAAC;CACd,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IACb,aAAa,CAAC,EAAE,KAAK,CAAC;IACtB,SAAS,CAAC,EAAE,KAAK,CAAC;CACnB,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,aAAa,CAAC,EAAE,KAAK,CAAC;IACtB,SAAS,CAAC,EAAE,KAAK,CAAC;CACnB,CAAC;AAEN,wBAAsB,mBAAmB,CACvC,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,EAAE,SAAS,MAAM,GAAG,MAAM,EAC1B,EAAE,SAAS,MAAM,GAAG,MAAM,EAE1B,cAAc,EAAE,0BAA0B,CAAC,EAAE,EAAE,EAAE,CAAC,GACjD,OAAO,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,CA6CvC"}
+{"version":3,"file":"resolvePageAndProps.d.ts","sourceRoot":"","sources":["../../../plugin/helpers/resolvePageAndProps.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,oBAAoB,EACpB,iBAAiB,EACjB,WAAW,EACZ,MAAM,aAAa,CAAC;AAKrB,KAAK,yBAAyB,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAC9D;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,aAAa,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC;IACpC,SAAS,EAAE,CAAC,CAAC;CACd,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IACb,aAAa,CAAC,EAAE,KAAK,CAAC;IACtB,SAAS,CAAC,EAAE,KAAK,CAAC;CACnB,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,aAAa,CAAC,EAAE,KAAK,CAAC;IACtB,SAAS,CAAC,EAAE,KAAK,CAAC;CACnB,CAAC;AAEN,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,EACtE,OAAO,EAAE,IAAI,CACX,oBAAoB,EAClB,UAAU,GACV,gBAAgB,GAChB,WAAW,GACX,iBAAiB,GACjB,OAAO,GACP,QAAQ,GACR,eAAe,GACf,OAAO,CACV,KACE,OAAO,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC;AAE3C,eAAO,MAAM,mBAAmB,EAAE,qBA4D/B,CAAC"}

package/dist/plugin/helpers/resolvePageAndProps.js

@@ -3,52 +3,62 @@
  * Copyright (c) Nico Brinkkemper
  * MIT License
  */
+import { DEFAULT_CONFIG } from '../config/defaults.js';
+import { toError } from '../error/toError.js';
 import { resolvePage } from './resolvePage.js';
 import { resolveProps } from './resolveProps.js';
+import { routeToURL } from '../utils/routeToURL.js';
 
-async function resolvePageAndProps(handlerOptions) {
+const resolvePageAndProps = async function _resolvePageAndProps(handlerOptions) {
   try {
+    const url = routeToURL(handlerOptions.route, handlerOptions.moduleBaseURL, handlerOptions.build.rscOutputPath);
     const resolvePagePromise = resolvePage({
       id: handlerOptions.pagePath,
-      exportName: handlerOptions.pageExportName,
+      exportName: handlerOptions.pageExportName ?? DEFAULT_CONFIG.PAGE_EXPORT_NAME,
       loader: handlerOptions.loader
     });
     const resolvePropsPromise = resolveProps({
-      url: handlerOptions.route,
-      id: handlerOptions.propsPath ?? handlerOptions.pagePath,
-      exportName: handlerOptions.propsExportName ?? "default",
-      loader: handlerOptions.propsPath ? handlerOptions.loader : async () => {
+      url,
+      id: handlerOptions.propsPath || handlerOptions.pagePath,
+      exportName: handlerOptions.propsExportName ?? DEFAULT_CONFIG.PROPS_EXPORT_NAME,
+      loader: async () => {
         const resolvePageResult2 = await resolvePagePromise;
         if (resolvePageResult2.type === "error") {
-          return resolvePageResult2.error;
+          throw resolvePageResult2.error;
         }
-        if (resolvePageResult2.type === "skip") {
-          return null;
+        if (resolvePageResult2.type === "success" && handlerOptions.propsExportName in resolvePageResult2.module) {
+          return resolvePageResult2.module;
         }
-        return resolvePageResult2.module;
+        if (handlerOptions.propsPath) {
+          return handlerOptions.loader(handlerOptions.propsPath);
+        }
+        return {
+          [handlerOptions.propsExportName]: { url }
+        };
       }
     });
-    const [resolvePageResult, resolvePropsResult] = await Promise.all([resolvePagePromise, resolvePropsPromise]);
+    const [resolvePageResult, resolvePropsResult] = await Promise.all([
+      resolvePagePromise,
+      resolvePropsPromise
+    ]);
     if (resolvePageResult.type != "success") {
       return resolvePageResult;
     }
     if (resolvePropsResult.type != "success") {
       return resolvePropsResult;
     }
-    const { Page } = resolvePageResult;
-    const { props } = resolvePropsResult;
     return {
       type: "success",
-      PageComponent: Page,
-      pageProps: props
+      PageComponent: resolvePageResult.module[handlerOptions.pageExportName],
+      pageProps: resolvePropsResult.module?.[handlerOptions.propsExportName]
     };
   } catch (error) {
     return {
       type: "error",
-      error: error instanceof Error ? error : new Error(String(error))
+      error: toError(error)
     };
   }
-}
+};
 
 export { resolvePageAndProps };
-//# sourceMappingURL=resolvePageAndProps.js.map
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzb2x2ZVBhZ2VBbmRQcm9wcy5qcyIsInNvdXJjZXMiOlsiLi4vLi4vLi4vcGx1Z2luL2hlbHBlcnMvcmVzb2x2ZVBhZ2VBbmRQcm9wcy50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBERUZBVUxUX0NPTkZJRyB9IGZyb20gXCIuLi9jb25maWcvZGVmYXVsdHMuanNcIjtcbmltcG9ydCB7IHRvRXJyb3IgfSBmcm9tIFwiLi4vZXJyb3IvdG9FcnJvci5qc1wiO1xuaW1wb3J0IHR5cGUge1xuICBDcmVhdGVIYW5kbGVyT3B0aW9ucyxcbiAgUGFnZUNvbXBvbmVudFR5cGUsXG4gIFBhZ2VQcm9wT3B0LFxufSBmcm9tIFwiLi4vdHlwZXMuanNcIjtcbmltcG9ydCB7IHJlc29sdmVQYWdlIH0gZnJvbSBcIi4vcmVzb2x2ZVBhZ2UuanNcIjtcbmltcG9ydCB7IHJlc29sdmVQcm9wcyB9IGZyb20gXCIuL3Jlc29sdmVQcm9wcy5qc1wiO1xuaW1wb3J0IHsgcm91dGVUb1VSTCB9IGZyb20gXCIuLi91dGlscy9yb3V0ZVRvVVJMLmpzXCI7XG5cbnR5cGUgUmVzb2x2ZVBhZ2VBbmRQcm9wc1Jlc3VsdDxUIGV4dGVuZHMgUGFnZVByb3BPcHQgPSBQYWdlUHJvcE9wdD4gPVxuICB8IHtcbiAgICAgIHR5cGU6IFwic3VjY2Vzc1wiO1xuICAgICAgZXJyb3I/OiBuZXZlcjtcbiAgICAgIFBhZ2VDb21wb25lbnQ6IFBhZ2VDb21wb25lbnRUeXBlPFQ+O1xuICAgICAgcGFnZVByb3BzOiBUO1xuICAgIH1cbiAgfCB7XG4gICAgICB0eXBlOiBcImVycm9yXCI7XG4gICAgICBlcnJvcjogRXJyb3I7XG4gICAgICBQYWdlQ29tcG9uZW50PzogbmV2ZXI7XG4gICAgICBwYWdlUHJvcHM/OiBuZXZlcjtcbiAgICB9XG4gIHwge1xuICAgICAgdHlwZTogXCJza2lwXCI7XG4gICAgICBlcnJvcj86IG5ldmVyO1xuICAgICAgUGFnZUNvbXBvbmVudD86IG5ldmVyO1xuICAgICAgcGFnZVByb3BzPzogbmV2ZXI7XG4gICAgfTtcblxuZXhwb3J0IHR5cGUgUmVzb2x2ZVBhZ2VBbmRQcm9wc0ZuID0gPFQgZXh0ZW5kcyBQYWdlUHJvcE9wdCA9IFBhZ2VQcm9wT3B0PihcbiAgb3B0aW9uczogUGljazxcbiAgICBDcmVhdGVIYW5kbGVyT3B0aW9ucyxcbiAgICB8IFwicGFnZVBhdGhcIlxuICAgIHwgXCJwYWdlRXhwb3J0TmFtZVwiXG4gICAgfCBcInByb3BzUGF0aFwiXG4gICAgfCBcInByb3BzRXhwb3J0TmFtZVwiXG4gICAgfCBcInJvdXRlXCJcbiAgICB8IFwibG9hZGVyXCJcbiAgICB8IFwibW9kdWxlQmFzZVVSTFwiXG4gICAgfCBcImJ1aWxkXCJcbiAgPlxuKSA9PiBQcm9taXNlPFJlc29sdmVQYWdlQW5kUHJvcHNSZXN1bHQ8VD4+O1xuXG5leHBvcnQgY29uc3QgcmVzb2x2ZVBhZ2VBbmRQcm9wczogUmVzb2x2ZVBhZ2VBbmRQcm9wc0ZuID1cbiAgYXN5bmMgZnVuY3Rpb24gX3Jlc29sdmVQYWdlQW5kUHJvcHMoaGFuZGxlck9wdGlvbnMpIHtcbiAgICB0cnkge1xuICAgICAgY29uc3QgdXJsID0gcm91dGVUb1VSTChoYW5kbGVyT3B0aW9ucy5yb3V0ZSwgaGFuZGxlck9wdGlvbnMubW9kdWxlQmFzZVVSTCwgaGFuZGxlck9wdGlvbnMuYnVpbGQucnNjT3V0cHV0UGF0aCk7XG4gXG4gICAgICAvLyBMb2FkIHRoZSBwYWdlIGNvbXBvbmVudFxuICAgICAgY29uc3QgcmVzb2x2ZVBhZ2VQcm9taXNlID0gcmVzb2x2ZVBhZ2Uoe1xuICAgICAgICBpZDogaGFuZGxlck9wdGlvbnMucGFnZVBhdGgsXG4gICAgICAgIGV4cG9ydE5hbWU6IGhhbmRsZXJPcHRpb25zLnBhZ2VFeHBvcnROYW1lID8/IERFRkFVTFRfQ09ORklHLlBBR0VfRVhQT1JUX05BTUUsXG4gICAgICAgIGxvYWRlcjogaGFuZGxlck9wdGlvbnMubG9hZGVyLFxuICAgICAgfSk7XG4gICAgICBjb25zdCByZXNvbHZlUHJvcHNQcm9taXNlID0gcmVzb2x2ZVByb3BzKHsgIFxuICAgICAgICB1cmwsXG4gICAgICAgIGlkOiBoYW5kbGVyT3B0aW9ucy5wcm9wc1BhdGggfHwgaGFuZGxlck9wdGlvbnMucGFnZVBhdGgsXG4gICAgICAgIGV4cG9ydE5hbWU6IGhhbmRsZXJPcHRpb25zLnByb3BzRXhwb3J0TmFtZSA/PyBERUZBVUxUX0NPTkZJRy5QUk9QU19FWFBPUlRfTkFNRSxcbiAgICAgICAgbG9hZGVyOiBhc3luYyAoKSA9PiB7XG4gICAgICAgICAgY29uc3QgcmVzb2x2ZVBhZ2VSZXN1bHQgPSBhd2FpdCByZXNvbHZlUGFnZVByb21pc2U7XG4gICAgICAgICAgaWYgKHJlc29sdmVQYWdlUmVzdWx0LnR5cGUgPT09IFwiZXJyb3JcIikge1xuICAgICAgICAgICAgdGhyb3cgcmVzb2x2ZVBhZ2VSZXN1bHQuZXJyb3I7XG4gICAgICAgICAgfVxuICAgICAgICAgIGlmIChcbiAgICAgICAgICAgIHJlc29sdmVQYWdlUmVzdWx0LnR5cGUgPT09IFwic3VjY2Vzc1wiICYmXG4gICAgICAgICAgICBoYW5kbGVyT3B0aW9ucy5wcm9wc0V4cG9ydE5hbWUgaW4gcmVzb2x2ZVBhZ2VSZXN1bHQubW9kdWxlXG4gICAgICAgICAgKSB7XG4gICAgICAgICAgICAvLyByZXR1cm4gdGhlIG1vZHVsZVxuICAgICAgICAgICAgcmV0dXJuIHJlc29sdmVQYWdlUmVzdWx0Lm1vZHVsZVxuICAgICAgICAgIH1cbiAgICAgICAgICBpZiAoaGFuZGxlck9wdGlvbnMucHJvcHNQYXRoKSB7XG4gICAgICAgICAgICByZXR1cm4gaGFuZGxlck9wdGlvbnMubG9hZGVyKGhhbmRsZXJPcHRpb25zLnByb3BzUGF0aCk7XG4gICAgICAgICAgfVxuICAgICAgICAgIHJldHVybiB7XG4gICAgICAgICAgICBbaGFuZGxlck9wdGlvbnMucHJvcHNFeHBvcnROYW1lXTogeyB1cmw6IHVybCB9LFxuICAgICAgICAgIH07XG4gICAgICAgIH0sXG4gICAgICB9KTtcbiAgICAgIGNvbnN0IFtyZXNvbHZlUGFnZVJlc3VsdCwgcmVzb2x2ZVByb3BzUmVzdWx0XSA9IGF3YWl0IFByb21pc2UuYWxsKFtcbiAgICAgICAgcmVzb2x2ZVBhZ2VQcm9taXNlLFxuICAgICAgICByZXNvbHZlUHJvcHNQcm9taXNlLFxuICAgICAgXSk7XG4gICAgICBpZiAocmVzb2x2ZVBhZ2VSZXN1bHQudHlwZSAhPSBcInN1Y2Nlc3NcIikge1xuICAgICAgICByZXR1cm4gcmVzb2x2ZVBhZ2VSZXN1bHQ7XG4gICAgICB9XG4gICAgICBpZiAocmVzb2x2ZVByb3BzUmVzdWx0LnR5cGUgIT0gXCJzdWNjZXNzXCIpIHtcbiAgICAgICAgcmV0dXJuIHJlc29sdmVQcm9wc1Jlc3VsdDtcbiAgICAgIH1cbiAgICAgIHJldHVybiB7XG4gICAgICAgIHR5cGU6IFwic3VjY2Vzc1wiIGFzIGNvbnN0LFxuICAgICAgICBQYWdlQ29tcG9uZW50OiByZXNvbHZlUGFnZVJlc3VsdC5tb2R1bGVbXG4gICAgICAgICAgaGFuZGxlck9wdGlvbnMucGFnZUV4cG9ydE5hbWVcbiAgICAgICAgXSBhcyBuZXZlcixcbiAgICAgICAgcGFnZVByb3BzOiByZXNvbHZlUHJvcHNSZXN1bHQubW9kdWxlPy5bXG4gICAgICAgICAgaGFuZGxlck9wdGlvbnMucHJvcHNFeHBvcnROYW1lIGFzIGtleW9mIHR5cGVvZiByZXNvbHZlUHJvcHNSZXN1bHQubW9kdWxlXG4gICAgICAgIF0gYXMgbmV2ZXIsXG4gICAgICB9O1xuICAgIH0gY2F0Y2ggKGVycm9yKSB7XG4gICAgICByZXR1cm4ge1xuICAgICAgICB0eXBlOiBcImVycm9yXCIgYXMgY29uc3QsXG4gICAgICAgIGVycm9yOiB0b0Vycm9yKGVycm9yKSxcbiAgICAgIH07XG4gICAgfVxuICB9O1xuIl0sIm5hbWVzIjpbInJlc29sdmVQYWdlUmVzdWx0Il0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQTZDYSxNQUFBLG1CQUFBLEdBQ1gsZUFBZSxvQkFBQSxDQUFxQixjQUFnQixFQUFBO0FBQ2xELEVBQUksSUFBQTtBQUNGLElBQU0sTUFBQSxHQUFBLEdBQU0sV0FBVyxjQUFlLENBQUEsS0FBQSxFQUFPLGVBQWUsYUFBZSxFQUFBLGNBQUEsQ0FBZSxNQUFNLGFBQWEsQ0FBQTtBQUc3RyxJQUFBLE1BQU0scUJBQXFCLFdBQVksQ0FBQTtBQUFBLE1BQ3JDLElBQUksY0FBZSxDQUFBLFFBQUE7QUFBQSxNQUNuQixVQUFBLEVBQVksY0FBZSxDQUFBLGNBQUEsSUFBa0IsY0FBZSxDQUFBLGdCQUFBO0FBQUEsTUFDNUQsUUFBUSxjQUFlLENBQUE7QUFBQSxLQUN4QixDQUFBO0FBQ0QsSUFBQSxNQUFNLHNCQUFzQixZQUFhLENBQUE7QUFBQSxNQUN2QyxHQUFBO0FBQUEsTUFDQSxFQUFBLEVBQUksY0FBZSxDQUFBLFNBQUEsSUFBYSxjQUFlLENBQUEsUUFBQTtBQUFBLE1BQy9DLFVBQUEsRUFBWSxjQUFlLENBQUEsZUFBQSxJQUFtQixjQUFlLENBQUEsaUJBQUE7QUFBQSxNQUM3RCxRQUFRLFlBQVk7QUFDbEIsUUFBQSxNQUFNQSxxQkFBb0IsTUFBTSxrQkFBQTtBQUNoQyxRQUFJQSxJQUFBQSxrQkFBQUEsQ0FBa0IsU0FBUyxPQUFTLEVBQUE7QUFDdEMsVUFBQSxNQUFNQSxrQkFBa0IsQ0FBQSxLQUFBO0FBQUE7QUFFMUIsUUFBQSxJQUNFQSxtQkFBa0IsSUFBUyxLQUFBLFNBQUEsSUFDM0IsY0FBZSxDQUFBLGVBQUEsSUFBbUJBLG1CQUFrQixNQUNwRCxFQUFBO0FBRUEsVUFBQSxPQUFPQSxrQkFBa0IsQ0FBQSxNQUFBO0FBQUE7QUFFM0IsUUFBQSxJQUFJLGVBQWUsU0FBVyxFQUFBO0FBQzVCLFVBQU8sT0FBQSxjQUFBLENBQWUsTUFBTyxDQUFBLGNBQUEsQ0FBZSxTQUFTLENBQUE7QUFBQTtBQUV2RCxRQUFPLE9BQUE7QUFBQSxVQUNMLENBQUMsY0FBQSxDQUFlLGVBQWUsR0FBRyxFQUFFLEdBQVM7QUFBQSxTQUMvQztBQUFBO0FBQ0YsS0FDRCxDQUFBO0FBQ0QsSUFBQSxNQUFNLENBQUMsaUJBQW1CLEVBQUEsa0JBQWtCLENBQUksR0FBQSxNQUFNLFFBQVEsR0FBSSxDQUFBO0FBQUEsTUFDaEUsa0JBQUE7QUFBQSxNQUNBO0FBQUEsS0FDRCxDQUFBO0FBQ0QsSUFBSSxJQUFBLGlCQUFBLENBQWtCLFFBQVEsU0FBVyxFQUFBO0FBQ3ZDLE1BQU8sT0FBQSxpQkFBQTtBQUFBO0FBRVQsSUFBSSxJQUFBLGtCQUFBLENBQW1CLFFBQVEsU0FBVyxFQUFBO0FBQ3hDLE1BQU8sT0FBQSxrQkFBQTtBQUFBO0FBRVQsSUFBTyxPQUFBO0FBQUEsTUFDTCxJQUFNLEVBQUEsU0FBQTtBQUFBLE1BQ04sYUFBZSxFQUFBLGlCQUFBLENBQWtCLE1BQy9CLENBQUEsY0FBQSxDQUFlLGNBQ2pCLENBQUE7QUFBQSxNQUNBLFNBQVcsRUFBQSxrQkFBQSxDQUFtQixNQUM1QixHQUFBLGNBQUEsQ0FBZSxlQUNqQjtBQUFBLEtBQ0Y7QUFBQSxXQUNPLEtBQU8sRUFBQTtBQUNkLElBQU8sT0FBQTtBQUFBLE1BQ0wsSUFBTSxFQUFBLE9BQUE7QUFBQSxNQUNOLEtBQUEsRUFBTyxRQUFRLEtBQUs7QUFBQSxLQUN0QjtBQUFBO0FBRUo7Ozs7In0=

package/dist/plugin/helpers/resolveProps.d.ts

@@ -1,21 +1,27 @@
-type ResolvePropsOptions<N extends string> = {
+import type { GenericModuleLoader, PagePropOpt, PropsName } from "../types.js";
+type ResolvePropsOptions = {
     id: string;
     url: string;
-    exportName: N;
-    loader: (id: string) => Promise<any>;
+    exportName: string;
+    loader: GenericModuleLoader;
 };
-type ResolvePropsResult<T, N extends string> = {
+type ValidPropTypes<T> = T | Promise<T> | Array<T[keyof T]> | Array<[string, T[keyof T]]> | ((url: string) => ValidPropTypes<T>);
+type ResolvePropsResult<T extends PagePropOpt, N extends string> = {
     type: "success";
     key: string;
-    props: T;
     module?: {
-        [key in N]: T;
+        [key in N]: ValidPropTypes<T> | ((url: string) => ValidPropTypes<T>) | (new (url: string) => T);
     };
 } | {
     type: "error";
+    key: string;
     error: Error;
+    module?: never;
 } | {
     type: "skip";
+    key: string;
+    module?: never;
+    error?: never;
 };
 /**
  * Resolves props from a module, handling both real and virtual modules.
@@ -47,6 +53,6 @@ type ResolvePropsResult<T, N extends string> = {
  *   - props: The resolved props if successful
  *   - error: Error message if failed
  */
-export declare const resolveProps: <T, N extends string>({ id, url, exportName, loader, }: ResolvePropsOptions<N>) => Promise<ResolvePropsResult<T, N>>;
+export declare const resolveProps: <T extends PagePropOpt = PagePropOpt, N extends string = PropsName>({ id, url, exportName, loader, }: ResolvePropsOptions) => Promise<ResolvePropsResult<T, N>>;
 export {};
 //# sourceMappingURL=resolveProps.d.ts.map

package/dist/plugin/helpers/resolveProps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveProps.d.ts","sourceRoot":"","sources":["../../../plugin/helpers/resolveProps.ts"],"names":[],"mappings":"AAEA,KAAK,mBAAmB,CAAC,CAAC,SAAS,MAAM,IAAI;IAC3C,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,CAAC,CAAC;IACd,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CACtC,CAAC;AAEF,KAAK,kBAAkB,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,IACvC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,CAAC,CAAC;IAAC,MAAM,CAAC,EAAG;SAAG,GAAG,IAAI,CAAC,GAAG,CAAC;KAAE,CAAA;CAAE,GACvE;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,GAC/B;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAErB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,eAAO,MAAM,YAAY,GAAU,CAAC,EAAE,CAAC,SAAS,MAAM,EAAE,kCAKrD,mBAAmB,CAAC,CAAC,CAAC,KAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CA+H3D,CAAC"}
+{"version":3,"file":"resolveProps.d.ts","sourceRoot":"","sources":["../../../plugin/helpers/resolveProps.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE/E,KAAK,mBAAmB,GAAG;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,mBAAmB,CAAC;CAC7B,CAAC;AAEF,KAAK,cAAc,CAAC,CAAC,IACjB,CAAC,GACD,OAAO,CAAC,CAAC,CAAC,GACV,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GACjB,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAC3B,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;AAIzC,KAAK,kBAAkB,CAAC,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,MAAM,IAC3D;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE;SACN,GAAG,IAAI,CAAC,GACL,cAAc,CAAC,CAAC,CAAC,GACjB,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,cAAc,CAAC,CAAC,CAAC,CAAC,GACpC,CAAC,KAAK,GAAG,EAAE,MAAM,KAAK,CAAC,CAAC;KAC7B,CAAC;CACH,GACD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,KAAK,CAAC;IAAC,MAAM,CAAC,EAAE,KAAK,CAAA;CAAE,GAC5D;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,KAAK,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC;AAEjE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,eAAO,MAAM,YAAY,GACvB,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,MAAM,GAAG,SAAS,EAC5B,kCAKC,mBAAmB,KAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAwKxD,CAAC"}