rename Func to Fn + minor typing

sketch7 · Sep 10, 2024 · b700055 · b700055
1 parent ba0c5ba
commit b700055
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/lib/prerendering/index.ts b/src/lib/prerendering/index.ts
@@ -1,2 +1,2 @@
-export { BootFunc, BootFuncParams, RenderToStringResult, RenderResult, RedirectResult } from "./prerendering.model";
+export { BootFn, BootFuncParams, RenderToStringResult, RenderResult, RedirectResult } from "./prerendering.model";
 export { createServerRenderer } from "./prerendering";
diff --git a/src/lib/prerendering/prerendering.model.ts b/src/lib/prerendering/prerendering.model.ts
@@ -1,4 +1,4 @@
-export interface RenderToStringFunc {
+export interface RenderToStringFn {
 	(
 		// callback: RenderToStringCallback,
 		applicationBasePath: string,
@@ -27,7 +27,7 @@ export interface RedirectResult {
 
 export type RenderResult = RenderToStringResult | RedirectResult;
 
-export interface BootFunc {
+export interface BootFn {
 	(params: BootFuncParams): Promise<RenderResult>;
 }
 

diff --git a/src/lib/prerendering/prerendering.ts b/src/lib/prerendering/prerendering.ts
@@ -3,13 +3,14 @@ import * as url from "url";
 import * as domain from "domain";
 import { run as domainTaskRun, baseUrl as domainTaskBaseUrl } from "domain-task/main";
 
-import { BootFunc, BootFuncParams, BootModuleInfo, RenderResult, RenderToStringFunc } from "./prerendering.model";
+import { BootFn, BootFuncParams, BootModuleInfo, RenderResult, RenderToStringFn } from "./prerendering.model";
 
 const defaultTimeoutMilliseconds = 30 * 1000;
 
-// REF: https://github.com/aspnet/JavaScriptServices/blob/master/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts
-export function createServerRenderer(bootFunc: BootFunc): RenderToStringFunc {
-	const resultFunc = (
+// REF: based on https://github.com/aspnet/JavaScriptServices/blob/master/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts
+export function createServerRenderer(bootFunc: BootFn): RenderToStringFn {
+	console.warn(">>>> createServerRenderer PRE FN x2");
+	const resultFunc: RenderToStringFn & { isServerRenderer: boolean } = (
 		// callback: RenderToStringCallback,
 		applicationBasePath: string,
 		bootModule: BootModuleInfo,
@@ -19,6 +20,7 @@ export function createServerRenderer(bootFunc: BootFunc): RenderToStringFunc {
 		overrideTimeoutMilliseconds: number,
 		requestPathBase: string
 	) => {
+		console.warn(">>>> createServerRenderer applicationBasePath", applicationBasePath);
 		let renderPromiseResolve: (value?: RenderResult) => void;
 		let renderPromiseReject: (reason?: any) => void;
 		const renderPromise = new Promise<RenderResult>((resolve, reject) => {