@ms-cloudpack/app-server 0.20.2 → 0.20.4

package/lib/renderRoute/ssr/renderCustomScript.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderCustomScript.js","sourceRoot":"","sources":["../../../src/renderRoute/ssr/renderCustomScript.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  ExpandedRenderFunctionResult,\n  ImportMap,\n  RenderFunction,\n  RenderFunctionOptions,\n  RenderFunctionResult,\n  RenderFunctionScript,\n} from '@ms-cloudpack/common-types';\nimport fsPromises from 'fs/promises';\nimport { pathToFileURL } from 'url';\nimport { getCustomRenderErrorResponse, getErrorResponse } from '../getErrorResponse.js';\nimport { runServerEntryInWorker } from './runServerEntryInWorker.js';\n\n/**\n * Load the default export from a JS file passed as the `renderScript` in a route,\n * and return either the result of running the function, or an error page if something fails.\n */\nexport async function renderCustomScript(\n  params: RenderFunctionOptions & {\n    /** Full path to the render script (bundled version if relevant) */\n    renderScriptPath: string;\n  },\n): Promise<RenderFunctionResult> {\n  const { renderScriptPath, ...options } = params;\n  // Get the html factory function from a script default export.\n  const renderScriptUrl = pathToFileURL(renderScriptPath).toString();\n\n  // Note: because there isn't a way to purge the require cache, we need to add a cache breaker query param to the\n  // script path to ensure we get the latest version of the script. This could be improved by using the git hash of\n  // the file if it exists, or a hash of the content, or even the timestamp of the file.\n  // TODO: this won't work to update anything the file imports, and doesn't seem to work for serverEntry at all...\n  let cacheBreakerQueryParam = `?t=${Date.now()}`;\n  try {\n    const { mtime } = await fsPromises.stat(renderScriptPath);\n    cacheBreakerQueryParam = `?t=${mtime.getTime()}`;\n  } catch {\n    /* no-op */\n  }\n\n  const renderScriptUrlWithCacheBreaker = renderScriptUrl + cacheBreakerQueryParam;\n\n  const { config } = options.session;\n  if (config.features?.enableSSR) {\n    return executeRenderScriptInSsrMode({\n      renderScriptPath,\n      renderScriptUrl: renderScriptUrlWithCacheBreaker,\n      // TODO this should be a Node-specific import map\n      importMap: options.importMap,\n      options,\n    });\n  }\n\n  // Try importing the script\n  let createHtml: RenderFunction | undefined;\n  let errorMessage: string | undefined;\n  try {\n    const importResult = ((await import(renderScriptUrlWithCacheBreaker)) as RenderFunctionScript).default;\n    if (typeof importResult === 'function') {\n      createHtml = importResult;\n    } else {\n      errorMessage = `The render script at \"${renderScriptPath}\" does not export a default function.`;\n    }\n  } catch (e) {\n    errorMessage = `Error importing render script at \"${renderScriptUrl}\":\\n${(e as Error).stack || e}`;\n  }\n\n  if (createHtml) {\n    // Try running the script\n    try {\n      return await createHtml(options);\n    } catch (e) {\n      errorMessage = `Error running render script at \"${renderScriptPath}\":\\n${(e as Error).stack || e}`;\n    }\n  }\n\n  // Return an error page. Doing this instead of returning a default or empty response ensures that\n  // the user is aware of any configuration issues.\n  errorMessage ??= `Unknown error loading render script at \"${renderScriptPath}\".`;\n  return getErrorResponse({ req: options.req, message: errorMessage });\n}\n\nasync function executeRenderScriptInSsrMode(params: {\n  renderScriptPath: string;\n  renderScriptUrl: string;\n  importMap: ImportMap;\n  options: RenderFunctionOptions;\n}): Promise<ExpandedRenderFunctionResult> {\n  const { renderScriptPath, renderScriptUrl, importMap, options } = params;\n\n  const serverEntryResult = await runServerEntryInWorker({\n    renderScriptUrl,\n    importMap,\n    renderParams: {},\n  });\n\n  const { errors, renderedContent } = serverEntryResult;\n  if (errors?.length) {\n    return getCustomRenderErrorResponse({\n      req: options.req,\n      route: options.route,\n      message: `- error running script: ${errors.map((e) => e.text).join('\\n')}`,\n      scriptPath: renderScriptPath,\n    });\n  }\n  return { content: renderedContent, contentType: 'text/html', statusCode: 200 };\n}\n"]}
+{"version":3,"file":"renderCustomScript.js","sourceRoot":"","sources":["../../../src/renderRoute/ssr/renderCustomScript.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Context } from '@ms-cloudpack/api-server';\nimport type {\n  ImportMap,\n  RenderFunction,\n  RenderFunctionResult,\n  RenderFunctionScript,\n  ServerEntryFunctionOptions,\n  ServerEntryFunctionResult,\n} from '@ms-cloudpack/common-types';\nimport fsPromises from 'fs/promises';\nimport type { TLSSocket } from 'tls';\nimport { pathToFileURL } from 'url';\nimport type { RenderRouteOptions } from '../../types/RenderRouteOptions.js';\nimport { getCustomRenderErrorResponse, getErrorResponse } from '../getErrorResponse.js';\nimport { runServerEntryInWorker } from './runServerEntryInWorker.js';\n\n/**\n * Load the default export from a JS file passed as the `renderScript` in a route,\n * and return either the result of running the function, or an error page if something fails.\n */\nexport async function renderCustomScript(\n  params: RenderRouteOptions & {\n    /** Full path to the render script (bundled version if relevant) */\n    renderScriptPath: string;\n  },\n  // only config and importMap are used in the new SSR signature, so in the future this can be:\n  // PartialContext<'session', 'config' | 'importMap'>\n  context: Pick<Context, 'session'>,\n): Promise<RenderFunctionResult> {\n  const { renderScriptPath, req, res, ...options } = params;\n  const { session } = context;\n  const { config, importMap } = session;\n\n  // Get the html factory function from a script default export.\n  const renderScriptUrl = pathToFileURL(renderScriptPath).toString();\n\n  // Note: because there isn't a way to purge the require cache, we need to add a cache breaker query param to the\n  // script path to ensure we get the latest version of the script. This could be improved by using the git hash of\n  // the file if it exists, or a hash of the content, or even the timestamp of the file.\n  // TODO: this won't work to update anything the file imports, and doesn't seem to work for serverEntry at all...\n  let cacheBreakerQueryParam = `?t=${Date.now()}`;\n  try {\n    const { mtime } = await fsPromises.stat(renderScriptPath);\n    cacheBreakerQueryParam = `?t=${mtime.getTime()}`;\n  } catch {\n    /* no-op */\n  }\n\n  const ssrOptions: ServerEntryFunctionOptions = {\n    ...options,\n    appPath: config.appPath,\n    importMap: importMap || { imports: {} },\n    requestInfo: {\n      headers: req.headers,\n      hostname: req.hostname,\n      isEncrypted: !!(req.socket as TLSSocket).encrypted,\n      originalUrl: req.originalUrl,\n      params: req.params,\n      query: req.query,\n      url: req.url,\n    },\n  };\n\n  const renderScriptUrlWithCacheBreaker = renderScriptUrl + cacheBreakerQueryParam;\n\n  if (config.features?.enableSSR) {\n    return executeRenderScriptInSsrMode({\n      renderScriptPath,\n      renderScriptUrl: renderScriptUrlWithCacheBreaker,\n      // TODO this should be a Node-specific import map\n      importMap: ssrOptions.importMap,\n      options: ssrOptions,\n      req,\n    });\n  }\n\n  // Legacy custom render mode: import and run the script directly\n  // TODO improve the naming and error messages (use getCustomRenderErrorResponse)\n  let createHtml: RenderFunction | undefined;\n  let errorMessage: string | undefined;\n  try {\n    const importResult = ((await import(renderScriptUrlWithCacheBreaker)) as RenderFunctionScript).default;\n    if (typeof importResult === 'function') {\n      createHtml = importResult;\n    } else {\n      errorMessage = `The render script at \"${renderScriptPath}\" does not export a default function.`;\n    }\n  } catch (e) {\n    errorMessage = `Error importing render script at \"${renderScriptUrl}\":\\n${(e as Error).stack || e}`;\n  }\n\n  if (createHtml) {\n    // Try running the script\n    try {\n      return await createHtml({ ...ssrOptions, session, req, res });\n    } catch (e) {\n      errorMessage = `Error running render script at \"${renderScriptPath}\":\\n${(e as Error).stack || e}`;\n    }\n  }\n\n  // Return an error page. Doing this instead of returning a default or empty response ensures that\n  // the user is aware of any configuration issues.\n  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- always set by now\n  return getErrorResponse({ req, message: errorMessage! });\n}\n\nasync function executeRenderScriptInSsrMode(\n  params: Pick<RenderRouteOptions, 'req'> & {\n    renderScriptPath: string;\n    renderScriptUrl: string;\n    importMap: ImportMap;\n    options: ServerEntryFunctionOptions;\n  },\n): Promise<ServerEntryFunctionResult> {\n  const { renderScriptPath, renderScriptUrl, importMap, options } = params;\n  try {\n    return await runServerEntryInWorker({\n      renderScriptUrl,\n      importMap,\n      renderParams: options,\n    });\n  } catch (err) {\n    // note: err might not be an instance of Error because of serialization\n    const errorMessage = (err as Error)?.stack || (err as Error)?.message || String(err);\n    return getCustomRenderErrorResponse({\n      req: params.req,\n      route: options.route,\n      message: `- error running script: ${errorMessage}`,\n      scriptPath: renderScriptPath,\n    });\n  }\n}\n"]}

package/lib/renderRoute/ssr/runServerEntryInWorker.d.ts

@@ -1,10 +1,14 @@
+import type { ServerEntryFunctionResult } from '@ms-cloudpack/common-types';
 import type { RunServerEntryOptions } from './types/RunServerEntryOptions.js';
-import type { RunServerEntryResult } from './types/RunServerEntryResult.js';
 /**
  * Run server entry in a child process pool. (Despite the naming, this does not use worker threads.)
+ * Allows exceptions from the script to propagate.
  */
 export declare function runServerEntryInWorker(options: RunServerEntryOptions & {
     maxWorkers?: number;
-}): Promise<RunServerEntryResult>;
-export declare function disposeStubWorkerPool(): Promise<void>;
+}): Promise<ServerEntryFunctionResult>;
+/**
+ * Dispose the server entry runner child processes.
+ */
+export declare function disposeServerEntryWorkerPool(): Promise<void>;
 //# sourceMappingURL=runServerEntryInWorker.d.ts.map

package/lib/renderRoute/ssr/runServerEntryInWorker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runServerEntryInWorker.d.ts","sourceRoot":"","sources":["../../../src/renderRoute/ssr/runServerEntryInWorker.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAO5E;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,qBAAqB,GAAG;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GACvD,OAAO,CAAC,oBAAoB,CAAC,CAgC/B;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC,CAG3D"}
+{"version":3,"file":"runServerEntryInWorker.d.ts","sourceRoot":"","sources":["../../../src/renderRoute/ssr/runServerEntryInWorker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AAG5E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAM9E;;;GAGG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,qBAAqB,GAAG;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GACvD,OAAO,CAAC,yBAAyB,CAAC,CAiBpC;AAED;;GAEG;AACH,wBAAsB,4BAA4B,IAAI,OAAO,CAAC,IAAI,CAAC,CAGlE"}

package/lib/renderRoute/ssr/runServerEntryInWorker.js

@@ -4,6 +4,7 @@ const workerPath = path.join(import.meta.dirname, 'worker/ssrProcessEntry.js');
 let workerPool;
 /**
  * Run server entry in a child process pool. (Despite the naming, this does not use worker threads.)
+ * Allows exceptions from the script to propagate.
  */
 export async function runServerEntryInWorker(options) {
     workerPool ??= new WorkerPool({
@@ -17,27 +18,15 @@ export async function runServerEntryInWorker(options) {
         // OOM crashes if cloudpack start is left running for a long time.
         inactiveTimeout: 5 * 60 * 1000,
     });
-    try {
-        const runServerEntryResult = await workerPool.execute({
-            method: 'runServerEntry',
-            args: [options],
-        });
-        return runServerEntryResult;
-    }
-    catch (err) {
-        return {
-            renderedContent: '',
-            errors: [
-                {
-                    source: 'Server Entry Execution',
-                    // note: err won't be an instance of Error because of serialization
-                    text: err?.stack || err?.message || String(err),
-                },
-            ],
-        };
-    }
+    return workerPool.execute({
+        method: 'runServerEntry',
+        args: [options],
+    });
 }
-export async function disposeStubWorkerPool() {
+/**
+ * Dispose the server entry runner child processes.
+ */
+export async function disposeServerEntryWorkerPool() {
     await workerPool?.dispose();
     workerPool = undefined;
 }

package/lib/renderRoute/ssr/runServerEntryInWorker.js.map

@@ -1 +1 @@
-{"version":3,"file":"runServerEntryInWorker.js","sourceRoot":"","sources":["../../../src/renderRoute/ssr/runServerEntryInWorker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGvD,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,2BAA2B,CAAC,CAAC;AAE/E,IAAI,UAAkC,CAAC;AAEvC;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,OAAwD;IAExD,UAAU,KAAK,IAAI,UAAU,CAAC;QAC5B,UAAU,EAAE,SAAS;QACrB,IAAI,EAAE,uBAAuB;QAC7B,SAAS,EAAE,UAAU;QACrB,iFAAiF;QACjF,mEAAmE;QACnE,UAAU,EAAE,CAAC;QACb,6FAA6F;QAC7F,kEAAkE;QAClE,eAAe,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;KAC/B,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,MAAM,oBAAoB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAuB;YAC1E,MAAM,EAAE,gBAAgB;YACxB,IAAI,EAAE,CAAC,OAAO,CAAC;SAChB,CAAC,CAAC;QAEH,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO;YACL,eAAe,EAAE,EAAE;YACnB,MAAM,EAAE;gBACN;oBACE,MAAM,EAAE,wBAAwB;oBAChC,mEAAmE;oBACnE,IAAI,EAAG,GAAa,EAAE,KAAK,IAAK,GAAa,EAAE,OAAO,IAAI,MAAM,CAAC,GAAG,CAAC;iBACtE;aACF;SACF,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB;IACzC,MAAM,UAAU,EAAE,OAAO,EAAE,CAAC;IAC5B,UAAU,GAAG,SAAS,CAAC;AACzB,CAAC","sourcesContent":["import { WorkerPool } from '@ms-cloudpack/worker-pool';\nimport type { RunServerEntryOptions } from './types/RunServerEntryOptions.js';\nimport type { RunServerEntryResult } from './types/RunServerEntryResult.js';\nimport path from 'path';\n\nconst workerPath = path.join(import.meta.dirname, 'worker/ssrProcessEntry.js');\n\nlet workerPool: WorkerPool | undefined;\n\n/**\n * Run server entry in a child process pool. (Despite the naming, this does not use worker threads.)\n */\nexport async function runServerEntryInWorker(\n  options: RunServerEntryOptions & { maxWorkers?: number },\n): Promise<RunServerEntryResult> {\n  workerPool ??= new WorkerPool({\n    workerType: 'process',\n    name: 'serverEntry execution',\n    entryPath: workerPath,\n    // Currently we're unlikely to be server-rendering more than one thing at a time.\n    // Keep this low unless we find a case where it needs to be higher.\n    maxWorkers: 3,\n    // Stop inactive processes after 5 minutes. This is intended to prevent one possible cause of\n    // OOM crashes if cloudpack start is left running for a long time.\n    inactiveTimeout: 5 * 60 * 1000,\n  });\n\n  try {\n    const runServerEntryResult = await workerPool.execute<RunServerEntryResult>({\n      method: 'runServerEntry',\n      args: [options],\n    });\n\n    return runServerEntryResult;\n  } catch (err) {\n    return {\n      renderedContent: '',\n      errors: [\n        {\n          source: 'Server Entry Execution',\n          // note: err won't be an instance of Error because of serialization\n          text: (err as Error)?.stack || (err as Error)?.message || String(err),\n        },\n      ],\n    };\n  }\n}\n\nexport async function disposeStubWorkerPool(): Promise<void> {\n  await workerPool?.dispose();\n  workerPool = undefined;\n}\n"]}
+{"version":3,"file":"runServerEntryInWorker.js","sourceRoot":"","sources":["../../../src/renderRoute/ssr/runServerEntryInWorker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,2BAA2B,CAAC,CAAC;AAE/E,IAAI,UAAkC,CAAC;AAEvC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,OAAwD;IAExD,UAAU,KAAK,IAAI,UAAU,CAAC;QAC5B,UAAU,EAAE,SAAS;QACrB,IAAI,EAAE,uBAAuB;QAC7B,SAAS,EAAE,UAAU;QACrB,iFAAiF;QACjF,mEAAmE;QACnE,UAAU,EAAE,CAAC;QACb,6FAA6F;QAC7F,kEAAkE;QAClE,eAAe,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;KAC/B,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC,OAAO,CAA4B;QACnD,MAAM,EAAE,gBAAgB;QACxB,IAAI,EAAE,CAAC,OAAO,CAAC;KAChB,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,4BAA4B;IAChD,MAAM,UAAU,EAAE,OAAO,EAAE,CAAC;IAC5B,UAAU,GAAG,SAAS,CAAC;AACzB,CAAC","sourcesContent":["import type { ServerEntryFunctionResult } from '@ms-cloudpack/common-types';\nimport { WorkerPool } from '@ms-cloudpack/worker-pool';\nimport path from 'path';\nimport type { RunServerEntryOptions } from './types/RunServerEntryOptions.js';\n\nconst workerPath = path.join(import.meta.dirname, 'worker/ssrProcessEntry.js');\n\nlet workerPool: WorkerPool | undefined;\n\n/**\n * Run server entry in a child process pool. (Despite the naming, this does not use worker threads.)\n * Allows exceptions from the script to propagate.\n */\nexport async function runServerEntryInWorker(\n  options: RunServerEntryOptions & { maxWorkers?: number },\n): Promise<ServerEntryFunctionResult> {\n  workerPool ??= new WorkerPool({\n    workerType: 'process',\n    name: 'serverEntry execution',\n    entryPath: workerPath,\n    // Currently we're unlikely to be server-rendering more than one thing at a time.\n    // Keep this low unless we find a case where it needs to be higher.\n    maxWorkers: 3,\n    // Stop inactive processes after 5 minutes. This is intended to prevent one possible cause of\n    // OOM crashes if cloudpack start is left running for a long time.\n    inactiveTimeout: 5 * 60 * 1000,\n  });\n\n  return workerPool.execute<ServerEntryFunctionResult>({\n    method: 'runServerEntry',\n    args: [options],\n  });\n}\n\n/**\n * Dispose the server entry runner child processes.\n */\nexport async function disposeServerEntryWorkerPool(): Promise<void> {\n  await workerPool?.dispose();\n  workerPool = undefined;\n}\n"]}

package/lib/renderRoute/ssr/types/RunServerEntryOptions.d.ts

@@ -1,4 +1,4 @@
-import type { ServerRenderFunctionOptions } from '@ms-cloudpack/common-types';
+import type { ServerEntryFunctionOptions } from '@ms-cloudpack/common-types';
 import type { ImportMap } from '@ms-cloudpack/import-map';
 export type RunServerEntryOptions = {
     /**
@@ -9,6 +9,6 @@ export type RunServerEntryOptions = {
     /** Absolute file URL for the render script (bundled if relevant) */
     renderScriptUrl: string;
     /** Params to pass to the user's render function */
-    renderParams: ServerRenderFunctionOptions;
+    renderParams: ServerEntryFunctionOptions;
 };
 //# sourceMappingURL=RunServerEntryOptions.d.ts.map

package/lib/renderRoute/ssr/types/RunServerEntryOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RunServerEntryOptions.d.ts","sourceRoot":"","sources":["../../../../src/renderRoute/ssr/types/RunServerEntryOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE1D,MAAM,MAAM,qBAAqB,GAAG;IAClC;;;OAGG;IACH,SAAS,EAAE,SAAS,CAAC;IACrB,oEAAoE;IACpE,eAAe,EAAE,MAAM,CAAC;IACxB,mDAAmD;IACnD,YAAY,EAAE,2BAA2B,CAAC;CAC3C,CAAC"}
+{"version":3,"file":"RunServerEntryOptions.d.ts","sourceRoot":"","sources":["../../../../src/renderRoute/ssr/types/RunServerEntryOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAC7E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE1D,MAAM,MAAM,qBAAqB,GAAG;IAClC;;;OAGG;IACH,SAAS,EAAE,SAAS,CAAC;IACrB,oEAAoE;IACpE,eAAe,EAAE,MAAM,CAAC;IACxB,mDAAmD;IACnD,YAAY,EAAE,0BAA0B,CAAC;CAC1C,CAAC"}

package/lib/renderRoute/ssr/types/RunServerEntryOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"RunServerEntryOptions.js","sourceRoot":"","sources":["../../../../src/renderRoute/ssr/types/RunServerEntryOptions.ts"],"names":[],"mappings":"","sourcesContent":["import type { ServerRenderFunctionOptions } from '@ms-cloudpack/common-types';\nimport type { ImportMap } from '@ms-cloudpack/import-map';\n\nexport type RunServerEntryOptions = {\n  /**\n   * TODO: This should be the import map specific to the render script in Node\n   * (as of writing, it reuses the browser one)\n   */\n  importMap: ImportMap;\n  /** Absolute file URL for the render script (bundled if relevant) */\n  renderScriptUrl: string;\n  /** Params to pass to the user's render function */\n  renderParams: ServerRenderFunctionOptions;\n};\n"]}
+{"version":3,"file":"RunServerEntryOptions.js","sourceRoot":"","sources":["../../../../src/renderRoute/ssr/types/RunServerEntryOptions.ts"],"names":[],"mappings":"","sourcesContent":["import type { ServerEntryFunctionOptions } from '@ms-cloudpack/common-types';\nimport type { ImportMap } from '@ms-cloudpack/import-map';\n\nexport type RunServerEntryOptions = {\n  /**\n   * TODO: This should be the import map specific to the render script in Node\n   * (as of writing, it reuses the browser one)\n   */\n  importMap: ImportMap;\n  /** Absolute file URL for the render script (bundled if relevant) */\n  renderScriptUrl: string;\n  /** Params to pass to the user's render function */\n  renderParams: ServerEntryFunctionOptions;\n};\n"]}

package/lib/renderRoute/ssr/worker/importMapLoader.d.ts

@@ -1,10 +1,9 @@
 /**
- * @param {RunServerEntryOptions} context
+ * @param {ImportMapLoaderContext} context
  * @returns {void}
  */
-export function initialize(context: RunServerEntryOptions): void;
+export function initialize(context: ImportMapLoaderContext): void;
 /**
- *
  * @param {string} specifier
  * @param {ResolveHookContext} context
  * @param {DefaultResolve} defaultResolve
@@ -18,6 +17,23 @@ export function resolve(specifier: string, context: ResolveHookContext, defaultR
  * @returns {Promise<LoadFnOutput>}
  */
 export function load(url: string, context: LoadHookContext, defaultLoad: DefaultLoad): Promise<LoadFnOutput>;
+/**
+ * NOTE: This file is a custom loader for "bare" imports in nodejs
+ * It should ONLY import types and not any runtime code.
+ */
+export type ImportMapLoaderContext = {
+    port: MessagePort;
+};
+/**
+ * Message with a new import map
+ */
+export type UpdateImportMapMessage = {
+    importMap: ImportMap;
+};
+/**
+ * Confirmation the message was received
+ */
+export type UpdateImportMapResult = boolean;
 /**
  * NOTE: This file is a custom loader for "bare" imports in nodejs
  * It should ONLY import types and not any runtime code.
@@ -28,9 +44,10 @@ export type DefaultResolve = (specifier: string, context: ResolveHookContext) =>
  * It should ONLY import types and not any runtime code.
  */
 export type DefaultLoad = (url: string, context: LoadHookContext) => Promise<LoadFnOutput>;
-import type { RunServerEntryOptions } from '../types/RunServerEntryOptions.js';
-import type { ResolveHookContext } from 'module';
-import type { ResolveFnOutput } from 'module';
-import type { LoadHookContext } from 'module';
-import type { LoadFnOutput } from 'module';
+import type { ResolveHookContext } from 'node:module';
+import type { ResolveFnOutput } from 'node:module';
+import type { LoadHookContext } from 'node:module';
+import type { LoadFnOutput } from 'node:module';
+import type { MessagePort } from 'node:worker_threads';
+import type { ImportMap } from '@ms-cloudpack/common-types';
 //# sourceMappingURL=importMapLoader.d.ts.map

package/lib/renderRoute/ssr/worker/importMapLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"importMapLoader.d.ts","sourceRoot":"","sources":["../../../../src/renderRoute/ssr/worker/importMapLoader.js"],"names":[],"mappings":"AAgBA;;;GAGG;AACH,oCAHW,qBAAqB,GACnB,IAAI,CAIhB;AAED;;;;;;GAMG;AACH,mCALW,MAAM,WACN,kBAAkB,kBAClB,cAAc,GACZ,eAAe,CAc3B;AAED;;;;;GAKG;AACH,0BALW,MAAM,WACN,eAAe,eACf,WAAW,GACT,OAAO,CAAC,YAAY,CAAC,CAsBjC;;;;;6BA/DY,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,KAAK,eAAe;;;;;0BAEnE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,KAAK,OAAO,CAAC,YAAY,CAAC;2CAJnC,mCAAmC;wCADU,QAAQ;qCAAR,QAAQ;qCAAR,QAAQ;kCAAR,QAAQ"}
+{"version":3,"file":"importMapLoader.d.ts","sourceRoot":"","sources":["../../../../src/renderRoute/ssr/worker/importMapLoader.js"],"names":[],"mappings":"AAqBA;;;GAGG;AACH,oCAHW,sBAAsB,GACpB,IAAI,CAehB;AAED;;;;;GAKG;AACH,mCALW,MAAM,WACN,kBAAkB,kBAClB,cAAc,GACZ,eAAe,CAoB3B;AAED;;;;;GAKG;AACH,0BALW,MAAM,WACN,eAAe,eACf,WAAW,GACT,OAAO,CAAC,YAAY,CAAC,CAsBjC;;;;;qCApFY;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE;;;;qCAErB;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE;;;;oCACxB,OAAO;;;;;6BAEP,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,KAAK,eAAe;;;;;0BAEnE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,KAAK,OAAO,CAAC,YAAY,CAAC;wCAVU,aAAa;qCAAb,aAAa;qCAAb,aAAa;kCAAb,aAAa;iCACpE,qBAAqB;+BAFvB,4BAA4B"}

package/lib/renderRoute/ssr/worker/importMapLoader.js

@@ -3,30 +3,51 @@
  * It should ONLY import types and not any runtime code.
  *
  * @import { ImportMap } from '@ms-cloudpack/common-types';
- * @import { LoadFnOutput, LoadHookContext, ResolveFnOutput, ResolveHookContext } from 'module';
- * @import { RunServerEntryOptions } from '../types/RunServerEntryOptions.js';
+ * @import { LoadFnOutput, LoadHookContext, ResolveFnOutput, ResolveHookContext } from 'node:module';
+ * @import { MessagePort } from 'node:worker_threads';
+ *
+ * @typedef {{ port: MessagePort }} ImportMapLoaderContext
+ *
+ * @typedef {{ importMap: ImportMap }} UpdateImportMapMessage Message with a new import map
+ * @typedef {boolean} UpdateImportMapResult Confirmation the message was received
  *
  * @typedef {(specifier: string, context: ResolveHookContext) => ResolveFnOutput} DefaultResolve
  *
  * @typedef {(url: string, context: LoadHookContext) => Promise<LoadFnOutput>} DefaultLoad
  */
-/** @type {ImportMap} */
-let importMap = { imports: {} };
+/** @type {ImportMap | undefined} */
+let importMap;
 /**
- * @param {RunServerEntryOptions} context
+ * @param {ImportMapLoaderContext} context
  * @returns {void}
  */
 export function initialize(context) {
-    importMap = context.importMap || { imports: {} };
+    const { port } = context;
+    port.on('message', (/** @type {UpdateImportMapMessage} */ message) => {
+        if (message.importMap) {
+            importMap = message.importMap;
+        }
+        else {
+            // This should never happen
+            console.error('Unexpected message received in import map loader:', JSON.stringify(message));
+        }
+        // Acknowledge the message
+        const /** @type {UpdateImportMapResult} */ result = !!importMap;
+        port.postMessage(result);
+    });
 }
 /**
- *
  * @param {string} specifier
  * @param {ResolveHookContext} context
  * @param {DefaultResolve} defaultResolve
  * @returns {ResolveFnOutput}
  */
 export function resolve(specifier, context, defaultResolve) {
+    if (!importMap) {
+        // The import map is updated via a message port created by runServerEntry
+        // (this case should never happen)
+        throw new Error('Import map has not been updated by runServerEntry');
+    }
     // TODO: Deal with scope
     const target = importMap?.imports?.[specifier];
     if (target) {
@@ -50,7 +71,7 @@ export async function load(url, context, defaultLoad) {
         const res = await fetch(url);
         if (!res.ok) {
             // TODO include the response text?
-            throw new Error(`Failed to fetch ${url} (Status: ${res.status})`);
+            throw new Error(`Failed to fetch ${url} (status: ${res.status})`);
         }
         const source = await res.text();
         return {

package/lib/renderRoute/ssr/worker/importMapLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"importMapLoader.js","sourceRoot":"","sources":["../../../../src/renderRoute/ssr/worker/importMapLoader.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,wBAAwB;AACxB,IAAI,SAAS,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;AAEhC;;;GAGG;AACH,MAAM,UAAU,UAAU,CAAC,OAAO;IAChC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;AACnD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE,cAAc;IACxD,wBAAwB;IACxB,MAAM,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;IAC/C,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,CAAC,IAAI,CAAC,wBAAwB,SAAS,OAAO,MAAM,EAAE,CAAC,CAAC;QAC/D,OAAO;YACL,GAAG,EAAE,MAAM;YACX,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,OAAO,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AAC5C,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,WAAW;IAClD,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,uBAAuB,GAAG,EAAE,CAAC,CAAC;QAE3C,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACZ,kCAAkC;YAClC,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,aAAa,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;QACpE,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAEhC,OAAO;YACL,MAAM,EAAE,QAAQ;YAChB,MAAM;YACN,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,OAAO,WAAW,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AACnC,CAAC","sourcesContent":["/**\n * NOTE: This file is a custom loader for \"bare\" imports in nodejs\n * It should ONLY import types and not any runtime code.\n *\n * @import { ImportMap } from '@ms-cloudpack/common-types';\n * @import { LoadFnOutput, LoadHookContext, ResolveFnOutput, ResolveHookContext } from 'module';\n * @import { RunServerEntryOptions } from '../types/RunServerEntryOptions.js';\n *\n * @typedef {(specifier: string, context: ResolveHookContext) => ResolveFnOutput} DefaultResolve\n *\n * @typedef {(url: string, context: LoadHookContext) => Promise<LoadFnOutput>} DefaultLoad\n */\n\n/** @type {ImportMap} */\nlet importMap = { imports: {} };\n\n/**\n * @param {RunServerEntryOptions} context\n * @returns {void}\n */\nexport function initialize(context) {\n  importMap = context.importMap || { imports: {} };\n}\n\n/**\n *\n * @param {string} specifier\n * @param {ResolveHookContext} context\n * @param {DefaultResolve} defaultResolve\n * @returns {ResolveFnOutput}\n */\nexport function resolve(specifier, context, defaultResolve) {\n  // TODO: Deal with scope\n  const target = importMap?.imports?.[specifier];\n  if (target) {\n    console.info(`Import map redirect: ${specifier} -> ${target}`);\n    return {\n      url: target,\n      shortCircuit: true,\n    };\n  }\n\n  return defaultResolve(specifier, context);\n}\n\n/**\n * @param {string} url\n * @param {LoadHookContext} context\n * @param {DefaultLoad} defaultLoad\n * @returns {Promise<LoadFnOutput>}\n */\nexport async function load(url, context, defaultLoad) {\n  if (url.startsWith('http')) {\n    console.info(`Importing from URL: ${url}`);\n\n    const res = await fetch(url);\n    if (!res.ok) {\n      // TODO include the response text?\n      throw new Error(`Failed to fetch ${url} (Status: ${res.status})`);\n    }\n\n    const source = await res.text();\n\n    return {\n      format: 'module',\n      source,\n      shortCircuit: true,\n    };\n  }\n\n  return defaultLoad(url, context);\n}\n"]}
+{"version":3,"file":"importMapLoader.js","sourceRoot":"","sources":["../../../../src/renderRoute/ssr/worker/importMapLoader.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,oCAAoC;AACpC,IAAI,SAAS,CAAC;AAEd;;;GAGG;AACH,MAAM,UAAU,UAAU,CAAC,OAAO;IAChC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACzB,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,qCAAqC,CAAC,OAAO,EAAE,EAAE;QACnE,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACtB,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,2BAA2B;YAC3B,OAAO,CAAC,KAAK,CAAC,mDAAmD,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QAC9F,CAAC;QACD,0BAA0B;QAC1B,MAAM,oCAAoC,CAAC,MAAM,GAAG,CAAC,CAAC,SAAS,CAAC;QAChE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE,cAAc;IACxD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,yEAAyE;QACzE,kCAAkC;QAClC,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IAED,wBAAwB;IACxB,MAAM,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;IAC/C,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,CAAC,IAAI,CAAC,wBAAwB,SAAS,OAAO,MAAM,EAAE,CAAC,CAAC;QAC/D,OAAO;YACL,GAAG,EAAE,MAAM;YACX,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,OAAO,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AAC5C,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,WAAW;IAClD,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,uBAAuB,GAAG,EAAE,CAAC,CAAC;QAE3C,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACZ,kCAAkC;YAClC,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,aAAa,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;QACpE,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAEhC,OAAO;YACL,MAAM,EAAE,QAAQ;YAChB,MAAM;YACN,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,OAAO,WAAW,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AACnC,CAAC","sourcesContent":["/**\n * NOTE: This file is a custom loader for \"bare\" imports in nodejs\n * It should ONLY import types and not any runtime code.\n *\n * @import { ImportMap } from '@ms-cloudpack/common-types';\n * @import { LoadFnOutput, LoadHookContext, ResolveFnOutput, ResolveHookContext } from 'node:module';\n * @import { MessagePort } from 'node:worker_threads';\n *\n * @typedef {{ port: MessagePort }} ImportMapLoaderContext\n *\n * @typedef {{ importMap: ImportMap }} UpdateImportMapMessage Message with a new import map\n * @typedef {boolean} UpdateImportMapResult Confirmation the message was received\n *\n * @typedef {(specifier: string, context: ResolveHookContext) => ResolveFnOutput} DefaultResolve\n *\n * @typedef {(url: string, context: LoadHookContext) => Promise<LoadFnOutput>} DefaultLoad\n */\n\n/** @type {ImportMap | undefined} */\nlet importMap;\n\n/**\n * @param {ImportMapLoaderContext} context\n * @returns {void}\n */\nexport function initialize(context) {\n  const { port } = context;\n  port.on('message', (/** @type {UpdateImportMapMessage} */ message) => {\n    if (message.importMap) {\n      importMap = message.importMap;\n    } else {\n      // This should never happen\n      console.error('Unexpected message received in import map loader:', JSON.stringify(message));\n    }\n    // Acknowledge the message\n    const /** @type {UpdateImportMapResult} */ result = !!importMap;\n    port.postMessage(result);\n  });\n}\n\n/**\n * @param {string} specifier\n * @param {ResolveHookContext} context\n * @param {DefaultResolve} defaultResolve\n * @returns {ResolveFnOutput}\n */\nexport function resolve(specifier, context, defaultResolve) {\n  if (!importMap) {\n    // The import map is updated via a message port created by runServerEntry\n    // (this case should never happen)\n    throw new Error('Import map has not been updated by runServerEntry');\n  }\n\n  // TODO: Deal with scope\n  const target = importMap?.imports?.[specifier];\n  if (target) {\n    console.info(`Import map redirect: ${specifier} -> ${target}`);\n    return {\n      url: target,\n      shortCircuit: true,\n    };\n  }\n\n  return defaultResolve(specifier, context);\n}\n\n/**\n * @param {string} url\n * @param {LoadHookContext} context\n * @param {DefaultLoad} defaultLoad\n * @returns {Promise<LoadFnOutput>}\n */\nexport async function load(url, context, defaultLoad) {\n  if (url.startsWith('http')) {\n    console.info(`Importing from URL: ${url}`);\n\n    const res = await fetch(url);\n    if (!res.ok) {\n      // TODO include the response text?\n      throw new Error(`Failed to fetch ${url} (status: ${res.status})`);\n    }\n\n    const source = await res.text();\n\n    return {\n      format: 'module',\n      source,\n      shortCircuit: true,\n    };\n  }\n\n  return defaultLoad(url, context);\n}\n"]}

package/lib/renderRoute/ssr/worker/runServerEntry.d.ts

@@ -1,13 +1,10 @@
 /**
+ * Register the import map loader with `options.importMap`, then import and run the render script.
+ * Throws if the script path is invalid, and allows exceptions from within the script to propagate.
  * @param {RunServerEntryOptions} options
- * @returns {Promise<RunServerEntryResult>}
+ * @returns {Promise<RenderFunctionResult>}
  */
-export function runServerEntry(options: RunServerEntryOptions): Promise<RunServerEntryResult>;
-export type RenderModule = {
-    render?: (params?: ServerRenderFunctionOptions) => Promise<string>;
-    default?: (params?: ServerRenderFunctionOptions) => Promise<string>;
-};
+export function runServerEntry(options: RunServerEntryOptions): Promise<RenderFunctionResult>;
 import type { RunServerEntryOptions } from '../types/RunServerEntryOptions.js';
-import type { RunServerEntryResult } from '../types/RunServerEntryResult.js';
-import type { ServerRenderFunctionOptions } from '@ms-cloudpack/common-types';
+import type { RenderFunctionResult } from '@ms-cloudpack/common-types';
 //# sourceMappingURL=runServerEntry.d.ts.map

package/lib/renderRoute/ssr/worker/runServerEntry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runServerEntry.d.ts","sourceRoot":"","sources":["../../../../src/renderRoute/ssr/worker/runServerEntry.js"],"names":[],"mappings":"AAYA;;;GAGG;AACH,wCAHW,qBAAqB,GACnB,OAAO,CAAC,oBAAoB,CAAC,CA2BzC;2BApCY;IACR,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,2BAA2B,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACnE,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,2BAA2B,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACrE;2CANsC,mCAAmC;0CACpC,kCAAkC;iDAF3B,4BAA4B"}
+{"version":3,"file":"runServerEntry.d.ts","sourceRoot":"","sources":["../../../../src/renderRoute/ssr/worker/runServerEntry.js"],"names":[],"mappings":"AAuBA;;;;;GAKG;AACH,wCAHW,qBAAqB,GACnB,OAAO,CAAC,oBAAoB,CAAC,CA4BzC;2CAjDyC,mCAAmC;0CADnE,4BAA4B"}

package/lib/renderRoute/ssr/worker/runServerEntry.js

@@ -1,40 +1,94 @@
 /**
- * @import { ServerRenderFunctionOptions } from '@ms-cloudpack/common-types';
+ * @import {
+ *   ImportMap,
+ *   RenderFunctionResult,
+ *   ServerEntryFunctionScript
+ * } from '@ms-cloudpack/common-types';
  * @import { RunServerEntryOptions } from '../types/RunServerEntryOptions.js';
- * @import { RunServerEntryResult } from '../types/RunServerEntryResult.js';
- *
- * @typedef {{
- *   render?: (params?: ServerRenderFunctionOptions) => Promise<string>;
- *   default?: (params?: ServerRenderFunctionOptions) => Promise<string>;
- * }} RenderModule
+ * @import { ImportMapLoaderContext, UpdateImportMapMessage, UpdateImportMapResult } from './importMapLoader.js';
  */
 import { register } from 'node:module';
+import { MessageChannel } from 'node:worker_threads';
+let hasInitialized = false;
+// See updateImportMap comment
+const channel = new MessageChannel();
+/** Port used by the parent to communicate with the loader */
+const parentPort = channel.port1;
+/** Port used by the loader to communicate with the parent */
+const loaderPort = channel.port2;
+parentPort.unref();
+loaderPort.unref();
 /**
+ * Register the import map loader with `options.importMap`, then import and run the render script.
+ * Throws if the script path is invalid, and allows exceptions from within the script to propagate.
  * @param {RunServerEntryOptions} options
- * @returns {Promise<RunServerEntryResult>}
+ * @returns {Promise<RenderFunctionResult>}
  */
 export async function runServerEntry(options) {
     const { importMap, renderScriptUrl, renderParams } = options;
-    // Registers the customer loader, which is responsible for handling base-imports in a nodejs environment..
-    register('./importMapLoader.js', {
-        parentURL: import.meta.url,
-        data: { importMap },
-    });
-    // With the custom loader registered, we can now import the render script.
-    // We support both named and default exports for the render function.
-    const renderedResult = await /** @type {Promise<RenderModule>} */ (import(renderScriptUrl))
-        .then((mod) => {
-        if (typeof mod.render === 'function') {
-            return mod.render(renderParams);
-        }
-        else if (typeof mod.default === 'function') {
-            return mod.default(renderParams);
-        }
-        throw new Error(`No render function found in module: ${renderScriptUrl}`);
-    })
-        .catch((err) => {
-        console.log('Error:', err);
+    if (!hasInitialized) {
+        // Register the custom loader, which is responsible for handling "bare" import resolution
+        // using the import map where necessary.
+        hasInitialized = true;
+        const /** @type {ImportMapLoaderContext} */ context = { port: loaderPort };
+        register('./importMapLoader.js', {
+            parentURL: import.meta.url,
+            data: context,
+            transferList: [loaderPort],
+        });
+    }
+    // Send the latest import map to the loader
+    await updateImportMap(importMap);
+    // Import the render script, which will use the custom import map if relevant
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access -- missed jsdoc cast
+    const render = /** @type {ServerEntryFunctionScript} */ (await import(renderScriptUrl)).default;
+    if (typeof render !== 'function') {
+        throw new Error(`The serverEntry script does not export a default function.`);
+    }
+    return await render(renderParams);
+}
+/**
+ * We have to update the import map for importMapLoader.js via message ports, since the
+ * customization hooks run in a separate thread.
+ * @param {ImportMap} importMap
+ * @returns {Promise<void>}
+ */
+function updateImportMap(importMap) {
+    return new Promise((resolve, reject) => {
+        // Before sending the message, add one-off handlers for all cases to be safe.
+        // This is just sending an object and waiting for confirmation, so errors are very unlikely.
+        const onMessage = (/** @type {UpdateImportMapResult} */ result) => {
+            handlersOff();
+            if (result === true) {
+                resolve();
+            }
+            else if (result === false) {
+                // extremely unlikely
+                reject(new Error('Failed to update import map before running serverEntry'));
+            }
+            else {
+                // even less likely
+                reject(new Error(`Unexpected message from import map loader: ${JSON.stringify(message)}`));
+            }
+        };
+        parentPort.once('message', onMessage);
+        const onError = (/** @type {*} */ error) => {
+            handlersOff();
+            reject(new Error(`Error updating import map before running serverEntry: ${error}`));
+        };
+        parentPort.once('error', onError);
+        // This should happen almost instantly, so conservatively time out after 1s
+        const timeout = setTimeout(() => {
+            handlersOff();
+            reject(new Error('Timed out waiting for import map update confirmation from loader'));
+        }, 1000);
+        const handlersOff = () => {
+            parentPort.off('message', onMessage);
+            parentPort.off('error', onError);
+            clearTimeout(timeout);
+        };
+        const /** @type {UpdateImportMapMessage} */ message = { importMap };
+        parentPort.postMessage(message);
     });
-    return { renderedContent: renderedResult || '' };
 }
 //# sourceMappingURL=runServerEntry.js.map

package/lib/renderRoute/ssr/worker/runServerEntry.js.map

@@ -1 +1 @@
-{"version":3,"file":"runServerEntry.js","sourceRoot":"","sources":["../../../../src/renderRoute/ssr/worker/runServerEntry.js"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAAO;IAC1C,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IAE7D,0GAA0G;IAC1G,QAAQ,CAAC,sBAAsB,EAAE;QAC/B,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG;QAC1B,IAAI,EAAE,EAAE,SAAS,EAAE;KACpB,CAAC,CAAC;IAEH,0EAA0E;IAC1E,qEAAqE;IACrE,MAAM,cAAc,GAAG,MAAM,oCAAoC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;SACxF,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;QACZ,IAAI,OAAO,GAAG,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YACrC,OAAO,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAClC,CAAC;aAAM,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;YAC7C,OAAO,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACnC,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,uCAAuC,eAAe,EAAE,CAAC,CAAC;IAC5E,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEL,OAAO,EAAE,eAAe,EAAE,cAAc,IAAI,EAAE,EAAE,CAAC;AACnD,CAAC","sourcesContent":["/**\n * @import { ServerRenderFunctionOptions } from '@ms-cloudpack/common-types';\n * @import { RunServerEntryOptions } from '../types/RunServerEntryOptions.js';\n * @import { RunServerEntryResult } from '../types/RunServerEntryResult.js';\n *\n * @typedef {{\n *   render?: (params?: ServerRenderFunctionOptions) => Promise<string>;\n *   default?: (params?: ServerRenderFunctionOptions) => Promise<string>;\n * }} RenderModule\n */\nimport { register } from 'node:module';\n\n/**\n * @param {RunServerEntryOptions} options\n * @returns {Promise<RunServerEntryResult>}\n */\nexport async function runServerEntry(options) {\n  const { importMap, renderScriptUrl, renderParams } = options;\n\n  // Registers the customer loader, which is responsible for handling base-imports in a nodejs environment..\n  register('./importMapLoader.js', {\n    parentURL: import.meta.url,\n    data: { importMap },\n  });\n\n  // With the custom loader registered, we can now import the render script.\n  // We support both named and default exports for the render function.\n  const renderedResult = await /** @type {Promise<RenderModule>} */ (import(renderScriptUrl))\n    .then((mod) => {\n      if (typeof mod.render === 'function') {\n        return mod.render(renderParams);\n      } else if (typeof mod.default === 'function') {\n        return mod.default(renderParams);\n      }\n      throw new Error(`No render function found in module: ${renderScriptUrl}`);\n    })\n    .catch((err) => {\n      console.log('Error:', err);\n    });\n\n  return { renderedContent: renderedResult || '' };\n}\n"]}
+{"version":3,"file":"runServerEntry.js","sourceRoot":"","sources":["../../../../src/renderRoute/ssr/worker/runServerEntry.js"],"names":[],"mappings":"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","sourcesContent":["/**\n * @import {\n *   ImportMap,\n *   RenderFunctionResult,\n *   ServerEntryFunctionScript\n * } from '@ms-cloudpack/common-types';\n * @import { RunServerEntryOptions } from '../types/RunServerEntryOptions.js';\n * @import { ImportMapLoaderContext, UpdateImportMapMessage, UpdateImportMapResult } from './importMapLoader.js';\n */\nimport { register } from 'node:module';\nimport { MessageChannel } from 'node:worker_threads';\n\nlet hasInitialized = false;\n\n// See updateImportMap comment\nconst channel = new MessageChannel();\n/** Port used by the parent to communicate with the loader */\nconst parentPort = channel.port1;\n/** Port used by the loader to communicate with the parent */\nconst loaderPort = channel.port2;\nparentPort.unref();\nloaderPort.unref();\n\n/**\n * Register the import map loader with `options.importMap`, then import and run the render script.\n * Throws if the script path is invalid, and allows exceptions from within the script to propagate.\n * @param {RunServerEntryOptions} options\n * @returns {Promise<RenderFunctionResult>}\n */\nexport async function runServerEntry(options) {\n  const { importMap, renderScriptUrl, renderParams } = options;\n\n  if (!hasInitialized) {\n    // Register the custom loader, which is responsible for handling \"bare\" import resolution\n    // using the import map where necessary.\n    hasInitialized = true;\n    const /** @type {ImportMapLoaderContext} */ context = { port: loaderPort };\n    register('./importMapLoader.js', {\n      parentURL: import.meta.url,\n      data: context,\n      transferList: [loaderPort],\n    });\n  }\n\n  // Send the latest import map to the loader\n  await updateImportMap(importMap);\n\n  // Import the render script, which will use the custom import map if relevant\n  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access -- missed jsdoc cast\n  const render = /** @type {ServerEntryFunctionScript} */ (await import(renderScriptUrl)).default;\n  if (typeof render !== 'function') {\n    throw new Error(`The serverEntry script does not export a default function.`);\n  }\n\n  return await render(renderParams);\n}\n\n/**\n * We have to update the import map for importMapLoader.js via message ports, since the\n * customization hooks run in a separate thread.\n * @param {ImportMap} importMap\n * @returns {Promise<void>}\n */\nfunction updateImportMap(importMap) {\n  return new Promise((resolve, reject) => {\n    // Before sending the message, add one-off handlers for all cases to be safe.\n    // This is just sending an object and waiting for confirmation, so errors are very unlikely.\n    const onMessage = (/** @type {UpdateImportMapResult} */ result) => {\n      handlersOff();\n      if (result === true) {\n        resolve();\n      } else if (result === false) {\n        // extremely unlikely\n        reject(new Error('Failed to update import map before running serverEntry'));\n      } else {\n        // even less likely\n        reject(new Error(`Unexpected message from import map loader: ${JSON.stringify(message)}`));\n      }\n    };\n\n    parentPort.once('message', onMessage);\n    const onError = (/** @type {*} */ error) => {\n      handlersOff();\n      reject(new Error(`Error updating import map before running serverEntry: ${error}`));\n    };\n    parentPort.once('error', onError);\n\n    // This should happen almost instantly, so conservatively time out after 1s\n    const timeout = setTimeout(() => {\n      handlersOff();\n      reject(new Error('Timed out waiting for import map update confirmation from loader'));\n    }, 1000);\n\n    const handlersOff = () => {\n      parentPort.off('message', onMessage);\n      parentPort.off('error', onError);\n      clearTimeout(timeout);\n    };\n\n    const /** @type {UpdateImportMapMessage} */ message = { importMap };\n    parentPort.postMessage(message);\n  });\n}\n"]}

package/lib/startServers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"startServers.d.ts","sourceRoot":"","sources":["../src/startServers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAGL,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACzB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAI9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAGnC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE;IACP,UAAU,EAAE,WAAW,CAAC;IACxB,0FAA0F;IAC1F,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iEAAiE;IACjE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACzB,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,EACD,OAAO,EAAE,OAAO,GACf,OAAO,CAAC;IACT,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC,CAoDD"}
+{"version":3,"file":"startServers.d.ts","sourceRoot":"","sources":["../src/startServers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAGL,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACzB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAI9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAGnC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGtD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE;IACP,UAAU,EAAE,WAAW,CAAC;IACxB,0FAA0F;IAC1F,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iEAAiE;IACjE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACzB,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,EACD,OAAO,EAAE,OAAO,GACf,OAAO,CAAC;IACT,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC,CA4DD"}

package/lib/startServers.js

@@ -4,6 +4,7 @@ import { combinedServerBundleRequestPrefix } from '@ms-cloudpack/import-map';
 import { cyan } from '@ms-cloudpack/task-reporter';
 import { createRoutes } from './createRoutes.js';
 import { handleKnownServerErrors } from './handleKnownServerErrors.js';
+import { disposeServerEntryWorkerPool } from './renderRoute/ssr/runServerEntryInWorker.js';
 /**
  * Start the app server, and (usually) the bundle server (but see below).
  *
@@ -57,7 +58,15 @@ export async function startServers(options, context) {
         createRoutes({ ...options, app, url }, context);
         task.complete({ message: `Available @ ${cyan(url)}`, forceShow: true });
         return {
-            appServer: { app, close, port, url },
+            appServer: {
+                app,
+                port,
+                url,
+                close: async () => {
+                    await close();
+                    await disposeServerEntryWorkerPool();
+                },
+            },
             bundleServer,
         };
     }

package/lib/startServers.js.map

@@ -1 +1 @@
-{"version":3,"file":"startServers.js","sourceRoot":"","sources":["../src/startServers.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Context } from '@ms-cloudpack/api-server';\nimport {\n  handleBundleRequest,\n  startBundleServer,\n  type BundleServer,\n  type BundleServerOptions,\n} from '@ms-cloudpack/bundle-server';\nimport type { PackageJson } from '@ms-cloudpack/common-types';\nimport { createExpressApp, getDomain } from '@ms-cloudpack/create-express-app';\nimport { combinedServerBundleRequestPrefix } from '@ms-cloudpack/import-map';\nimport { cyan } from '@ms-cloudpack/task-reporter';\nimport type { Server } from 'http';\nimport { createRoutes } from './createRoutes.js';\nimport { handleKnownServerErrors } from './handleKnownServerErrors.js';\nimport type { AppServer } from './types/AppServer.js';\n\n/**\n * Start the app server, and (usually) the bundle server (but see below).\n *\n * The app server hosts the appropriate routes for the web app, primarily returning html content\n * which loads resources from the bundle server.\n *\n * Separating the app server from the bundle service keeps the routes separate - the app server\n * can support whichever routes the app needs, while the bundle server can provide package\n * assets in various forms using its own routing.\n *\n * Exception: some projects need the bundle server and app server on the same origin for local\n * development due to security policies. If the `useSingleWebServer` feature is enabled, the app\n * server will also serve bundles rather than creating a separate bundle server.\n */\nexport async function startServers(\n  options: {\n    definition: PackageJson;\n    /** If provided, act as a middleware on this server, rather than starting a new server. */\n    expressServer?: Server;\n    /** Custom port for the app server (probably from CLI options) */\n    port?: number | number[];\n    bundleServerOptions: BundleServerOptions;\n  },\n  context: Context,\n): Promise<{\n  appServer: AppServer;\n  bundleServer?: BundleServer;\n}> {\n  const { definition, expressServer, bundleServerOptions } = options;\n  const { session, reporter } = context;\n  const { config } = session;\n  const { server = {} } = config;\n\n  // Read the port from the config file or default to array of ports.\n  const customPorts = server.port ?? options.port;\n  const ports = customPorts ?? [5000, 5001, 5002, 5003];\n  const task = reporter.addTask(`Starting app server for \"${definition.name}\"`);\n  const hostname = getDomain(server.domain);\n\n  try {\n    const { app, close, port, url } = await createExpressApp({\n      portRange: ports,\n      requireSpecifiedPort: customPorts !== undefined,\n      hostname,\n      requestHeaders: server?.requestHeaders,\n      sslOptions: context.session.config?.server?.parsedHttps ?? context.session.config?.server?.https,\n      server: expressServer,\n      cwd: config.appPath,\n    });\n    session.urls.appServer = url;\n\n    let bundleServer: BundleServer | undefined;\n    if (config.features?.useSingleWebServer) {\n      // Add a route on this server for bundles.\n      session.urls.bundleServer = `${url}/${combinedServerBundleRequestPrefix}`;\n      app.get(`/${combinedServerBundleRequestPrefix}/*`, (req, res) => {\n        handleBundleRequest({ req, res, ...bundleServerOptions }, context).catch((err) => {\n          console.error((err as Error)?.stack || err);\n          res.status(500).send(`Error bundling: ${err}`);\n        });\n      });\n    } else {\n      // Start the bundle server.\n      bundleServer = await startBundleServer(bundleServerOptions, context);\n    }\n\n    createRoutes({ ...options, app, url }, context);\n\n    task.complete({ message: `Available @ ${cyan(url)}`, forceShow: true });\n\n    return {\n      appServer: { app, close, port, url },\n      bundleServer,\n    };\n  } catch (err: unknown) {\n    task.complete({ status: 'fail', message: 'Failed to start app server', forceShow: true });\n    handleKnownServerErrors({ err, ports }, context);\n    throw err;\n  }\n}\n"]}
+{"version":3,"file":"startServers.js","sourceRoot":"","sources":["../src/startServers.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Context } from '@ms-cloudpack/api-server';\nimport {\n  handleBundleRequest,\n  startBundleServer,\n  type BundleServer,\n  type BundleServerOptions,\n} from '@ms-cloudpack/bundle-server';\nimport type { PackageJson } from '@ms-cloudpack/common-types';\nimport { createExpressApp, getDomain } from '@ms-cloudpack/create-express-app';\nimport { combinedServerBundleRequestPrefix } from '@ms-cloudpack/import-map';\nimport { cyan } from '@ms-cloudpack/task-reporter';\nimport type { Server } from 'http';\nimport { createRoutes } from './createRoutes.js';\nimport { handleKnownServerErrors } from './handleKnownServerErrors.js';\nimport type { AppServer } from './types/AppServer.js';\nimport { disposeServerEntryWorkerPool } from './renderRoute/ssr/runServerEntryInWorker.js';\n\n/**\n * Start the app server, and (usually) the bundle server (but see below).\n *\n * The app server hosts the appropriate routes for the web app, primarily returning html content\n * which loads resources from the bundle server.\n *\n * Separating the app server from the bundle service keeps the routes separate - the app server\n * can support whichever routes the app needs, while the bundle server can provide package\n * assets in various forms using its own routing.\n *\n * Exception: some projects need the bundle server and app server on the same origin for local\n * development due to security policies. If the `useSingleWebServer` feature is enabled, the app\n * server will also serve bundles rather than creating a separate bundle server.\n */\nexport async function startServers(\n  options: {\n    definition: PackageJson;\n    /** If provided, act as a middleware on this server, rather than starting a new server. */\n    expressServer?: Server;\n    /** Custom port for the app server (probably from CLI options) */\n    port?: number | number[];\n    bundleServerOptions: BundleServerOptions;\n  },\n  context: Context,\n): Promise<{\n  appServer: AppServer;\n  bundleServer?: BundleServer;\n}> {\n  const { definition, expressServer, bundleServerOptions } = options;\n  const { session, reporter } = context;\n  const { config } = session;\n  const { server = {} } = config;\n\n  // Read the port from the config file or default to array of ports.\n  const customPorts = server.port ?? options.port;\n  const ports = customPorts ?? [5000, 5001, 5002, 5003];\n  const task = reporter.addTask(`Starting app server for \"${definition.name}\"`);\n  const hostname = getDomain(server.domain);\n\n  try {\n    const { app, close, port, url } = await createExpressApp({\n      portRange: ports,\n      requireSpecifiedPort: customPorts !== undefined,\n      hostname,\n      requestHeaders: server?.requestHeaders,\n      sslOptions: context.session.config?.server?.parsedHttps ?? context.session.config?.server?.https,\n      server: expressServer,\n      cwd: config.appPath,\n    });\n    session.urls.appServer = url;\n\n    let bundleServer: BundleServer | undefined;\n    if (config.features?.useSingleWebServer) {\n      // Add a route on this server for bundles.\n      session.urls.bundleServer = `${url}/${combinedServerBundleRequestPrefix}`;\n      app.get(`/${combinedServerBundleRequestPrefix}/*`, (req, res) => {\n        handleBundleRequest({ req, res, ...bundleServerOptions }, context).catch((err) => {\n          console.error((err as Error)?.stack || err);\n          res.status(500).send(`Error bundling: ${err}`);\n        });\n      });\n    } else {\n      // Start the bundle server.\n      bundleServer = await startBundleServer(bundleServerOptions, context);\n    }\n\n    createRoutes({ ...options, app, url }, context);\n\n    task.complete({ message: `Available @ ${cyan(url)}`, forceShow: true });\n\n    return {\n      appServer: {\n        app,\n        port,\n        url,\n        close: async () => {\n          await close();\n          await disposeServerEntryWorkerPool();\n        },\n      },\n      bundleServer,\n    };\n  } catch (err: unknown) {\n    task.complete({ status: 'fail', message: 'Failed to start app server', forceShow: true });\n    handleKnownServerErrors({ err, ports }, context);\n    throw err;\n  }\n}\n"]}

package/lib/types/RenderRouteOptions.d.ts

@@ -0,0 +1,10 @@
+import type { RenderFunctionOptions, Request, Response } from '@ms-cloudpack/common-types';
+/**
+ * Options for the `renderRoute` function and its helpers.
+ * (This is similar to the original `RenderFunctionOptions`, but `req` and `res` are not deprecated.)
+ */
+export interface RenderRouteOptions extends Pick<RenderFunctionOptions, 'route' | 'baseUrl' | 'definition' | 'overlayScript' | 'entryScripts' | 'inlineScripts'> {
+    req: Request;
+    res: Response;
+}
+//# sourceMappingURL=RenderRouteOptions.d.ts.map

package/lib/types/RenderRouteOptions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RenderRouteOptions.d.ts","sourceRoot":"","sources":["../../src/types/RenderRouteOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAE3F;;;GAGG;AACH,MAAM,WAAW,kBACf,SAAQ,IAAI,CACV,qBAAqB,EACrB,OAAO,GAAG,SAAS,GAAG,YAAY,GAAG,eAAe,GAAG,cAAc,GAAG,eAAe,CACxF;IACD,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,QAAQ,CAAC;CACf"}

package/lib/types/RenderRouteOptions.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=RenderRouteOptions.js.map

package/lib/types/RenderRouteOptions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RenderRouteOptions.js","sourceRoot":"","sources":["../../src/types/RenderRouteOptions.ts"],"names":[],"mappings":"","sourcesContent":["import type { RenderFunctionOptions, Request, Response } from '@ms-cloudpack/common-types';\n\n/**\n * Options for the `renderRoute` function and its helpers.\n * (This is similar to the original `RenderFunctionOptions`, but `req` and `res` are not deprecated.)\n */\nexport interface RenderRouteOptions\n  extends Pick<\n    RenderFunctionOptions,\n    'route' | 'baseUrl' | 'definition' | 'overlayScript' | 'entryScripts' | 'inlineScripts'\n  > {\n  req: Request;\n  res: Response;\n}\n"]}