@lwrjs/view-registry 0.9.0-alpha.11 → 0.9.0-alpha.13

package/build/cjs/utils.cjs

@@ -29,19 +29,15 @@ __export(exports, {
   generatePageContext: () => generatePageContext,
   getModuleResource: () => getModuleResource,
   getModuleResourceByUri: () => getModuleResourceByUri,
-  getRouteHandler: () => getRouteHandler,
   isViewResponse: () => isViewResponse,
   normalizeRenderOptions: () => normalizeRenderOptions,
   normalizeRenderedResult: () => normalizeRenderedResult,
   reduceSourceAssetReferences: () => reduceSourceAssetReferences,
   toJsonFormat: () => toJsonFormat
 });
-var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_path = __toModule(require("path"));
-var import_path2 = __toModule(require("path"));
-var import_shared_utils2 = __toModule(require("@lwrjs/shared-utils"));
+var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_identity = __toModule(require("@lwrjs/app-service/identity"));
-var import_shared_utils3 = __toModule(require("@lwrjs/shared-utils"));
 function streamToString(stream) {
   const chunks = [];
   return new Promise((resolve, reject) => {
@@ -132,7 +128,7 @@ function normalizeRenderOptions(runtimeEnvironment, overrideRenderOptions, baseR
   };
 }
 function getTitleFromFilePath(filePath) {
-  return filePath ? (0, import_path2.basename)(filePath, (0, import_path2.extname)(filePath)) : import_shared_utils.DEFAULT_TITLE;
+  return filePath ? (0, import_path.basename)(filePath, (0, import_path.extname)(filePath)) : import_shared_utils.DEFAULT_TITLE;
 }
 function generatePageContext({requestPath: url}, {id, contentTemplate, properties}) {
   const title = properties?.title || getTitleFromFilePath(contentTemplate);
@@ -141,19 +137,6 @@ function generatePageContext({requestPath: url}, {id, contentTemplate, propertie
 function isViewResponse(response) {
   return response.body !== void 0;
 }
-async function getRouteHandler(path, {cacheDir, rootDir}) {
-  try {
-    const fullPath = (0, import_shared_utils.resolveFileExtension)(path);
-    if (fullPath.endsWith(".ts")) {
-      path = await (0, import_shared_utils.transpileTs)(path, {rootDir, cacheDir: import_path.default.join(cacheDir, "routeHandlers")});
-    }
-    const moduleEntry = await Promise.resolve().then(() => __toModule(require(path)));
-    return moduleEntry.default || moduleEntry;
-  } catch (err) {
-    console.log(err);
-    throw new Error(`Unable to get routeHandler: ${path}`);
-  }
-}
 async function toJsonFormat(viewRequest, viewDefinition, route, runtimeEnvironment, runtimeParams, moduleRegistry) {
   const {viewRecord} = viewDefinition;
   const {bootstrap, id: appName} = route;
@@ -186,7 +169,7 @@ async function toJsonFormat(viewRequest, viewDefinition, route, runtimeEnvironme
     });
     resources.push({
       type: "application/javascript",
-      src: (0, import_shared_utils3.getClientBootstrapConfigurationUri)({url: viewRequest.url, id: route.id}, runtimeEnvironment, runtimeParams)
+      src: (0, import_shared_utils.getClientBootstrapConfigurationUri)({url: viewRequest.url, id: route.id}, runtimeEnvironment, runtimeParams)
     });
   }
   const mappingUrl = (0, import_shared_utils.getMappingUriPrefix)(runtimeEnvironment, runtimeParams);
@@ -206,7 +189,7 @@ async function toJsonFormat(viewRequest, viewDefinition, route, runtimeEnvironme
   });
   viewRecord.assetReferences?.forEach((asset) => {
     if (asset.override?.uri) {
-      const type = (0, import_shared_utils2.mimeLookup)(asset.override?.uri);
+      const type = (0, import_shared_utils.mimeLookup)(asset.override?.uri);
       resources.push({type, src: asset.override?.uri});
     }
   });

package/build/cjs/view-handler.cjs

@@ -31,8 +31,6 @@ var import_utils = __toModule(require("./utils.cjs"));
 var import_path = __toModule(require("path"));
 var LwrViewHandler = class {
   constructor(context, globalConfig) {
-    this.inflightRouteHandlerEvalMap = new Map();
-    this.routeHandlerFunctionMap = new Map();
     this.viewRegistry = context.viewRegistry;
     this.globalConfig = globalConfig;
     this.moduleRegistry = context.moduleRegistry;
@@ -128,28 +126,15 @@ var LwrViewHandler = class {
     return viewDefinition;
   }
   async getRouteHandlerResponse(viewRequest, route, runtimeEnvironment, runtimeParams = {}) {
-    const {rootDir, assets, contentDir, layoutsDir, cacheDir} = this.globalConfig;
+    const {rootDir, assets, contentDir, layoutsDir} = this.globalConfig;
     const paths = {rootDir, assets, contentDir, layoutsDir};
     const {routeHandler} = route;
     if (!routeHandler) {
       throw new Error("Route Handler is required for a CustomView");
     }
-    let routeHandlerFunction = this.routeHandlerFunctionMap.get(routeHandler);
-    if (!routeHandlerFunction) {
-      const inflightRouteHandlerPromise = this.inflightRouteHandlerEvalMap.get(routeHandler);
-      if (inflightRouteHandlerPromise) {
-        routeHandlerFunction = await inflightRouteHandlerPromise;
-      } else {
-        const handlerPromise = (0, import_utils.getRouteHandler)(routeHandler, {cacheDir, rootDir});
-        this.inflightRouteHandlerEvalMap.set(routeHandler, handlerPromise);
-        routeHandlerFunction = await handlerPromise;
-      }
-      this.routeHandlerFunctionMap.set(routeHandler, routeHandlerFunction);
-      this.inflightRouteHandlerEvalMap.delete(routeHandler);
-    }
     const locale = runtimeParams.locale;
     const viewApi = this.getBoundApi(route, runtimeEnvironment, runtimeParams);
-    const response = await routeHandlerFunction({...viewRequest, locale}, {route, viewApi, ...paths});
+    const response = await routeHandler({...viewRequest, locale}, {route, viewApi, ...paths});
     return response;
   }
   getBoundApi(route, runtimeEnvironment, runtimeParams) {

package/build/es/utils.d.ts

@@ -1,25 +1,13 @@
-import { NormalizedRenderingResult, RenderingResult, ResourceDefinition, AssetReference, RenderedAssetReference, RenderOptions, ModuleId, ViewModuleResourceContext, ViewPageContext, JsonCompatible } from '@lwrjs/types';
-import { PublicModuleRegistry, RuntimeEnvironment, RuntimeParams, ModuleJson, RouteHandlerViewResponse, ViewResponse, RouteHandlerFunction, LwrRoute, LwrErrorRoute, ViewRequest, LinkedViewDefinition, ModuleRegistry } from 'packages/@lwrjs/types/src';
+import type { NormalizedRenderingResult, RenderingResult, ResourceDefinition, AssetReference, RenderedAssetReference, RenderOptions, ModuleId, ViewModuleResourceContext, ViewPageContext, JsonCompatible, LwrRoute, LwrErrorRoute, PublicModuleRegistry, RuntimeEnvironment, RuntimeParams, ModuleJson, RouteHandlerViewResponse, ViewResponse, Route, ViewRequest, LinkedViewDefinition, ModuleRegistry } from '@lwrjs/types';
 export declare type HTMLResource = Partial<ResourceDefinition>;
 export declare function generateHtmlTag(definition: HTMLResource): Promise<string>;
 export declare function normalizeRenderedResult({ renderedView, metadata, options, }: RenderingResult): NormalizedRenderingResult;
 export declare function reduceSourceAssetReferences(assets: AssetReference[]): RenderedAssetReference[];
 export declare function normalizeRenderOptions(runtimeEnvironment: RuntimeEnvironment, overrideRenderOptions?: RenderOptions, baseRenderOptions?: RenderOptions): Required<RenderOptions>;
-export declare function generatePageContext({ requestPath: url }: ViewRequest, { id, contentTemplate, properties }: LwrRoute | LwrErrorRoute): JsonCompatible<ViewPageContext>;
+export declare function generatePageContext({ requestPath: url }: ViewRequest, { id, contentTemplate, properties }: Route<LwrRoute | LwrErrorRoute>): JsonCompatible<ViewPageContext>;
 export declare function isViewResponse(response: RouteHandlerViewResponse): response is ViewResponse;
-interface RouteHandlerContext {
-    cacheDir: string;
-    rootDir: string;
-}
-/**
- * Load and cache a route handler function (for a view) from the fs
- * @param path - path to the route handle code on the fs
- * @param param1 - directories
- */
-export declare function getRouteHandler(path: string, { cacheDir, rootDir }: RouteHandlerContext): Promise<RouteHandlerFunction>;
-export declare function toJsonFormat(viewRequest: ViewRequest, viewDefinition: LinkedViewDefinition, route: LwrRoute | LwrErrorRoute, runtimeEnvironment: RuntimeEnvironment, runtimeParams: RuntimeParams, moduleRegistry: ModuleRegistry): Promise<ViewResponse>;
+export declare function toJsonFormat(viewRequest: ViewRequest, viewDefinition: LinkedViewDefinition, route: Route<LwrRoute | LwrErrorRoute>, runtimeEnvironment: RuntimeEnvironment, runtimeParams: RuntimeParams, moduleRegistry: ModuleRegistry): Promise<ViewResponse>;
 export declare function getModuleResource(moduleId: Pick<ModuleId, 'specifier' | 'version'>, runtimeEnvironment: RuntimeEnvironment, moduleResouceMeta: ViewModuleResourceContext, moduleRegistry: ModuleRegistry, runtimeParams?: RuntimeParams): Promise<ResourceDefinition>;
 export declare function getModuleResourceByUri(uri: string, runtimeEnvironment: RuntimeEnvironment, moduleResouceMeta: ViewModuleResourceContext): ResourceDefinition;
 export declare function createJsonModule(specifier: string, moduleRegistry: PublicModuleRegistry, environment: RuntimeEnvironment, params?: RuntimeParams): Promise<ModuleJson>;
-export {};
 //# sourceMappingURL=utils.d.ts.map

package/build/es/utils.js

@@ -1,9 +1,6 @@
-import { explodeSpecifier, getMappingUriPrefix, getSpecifier, resolveFileExtension, transpileTs, DEFAULT_TITLE, } from '@lwrjs/shared-utils';
-import libPath from 'path';
 import { basename, extname } from 'path';
-import { mimeLookup } from '@lwrjs/shared-utils';
+import { explodeSpecifier, getMappingUriPrefix, getSpecifier, getClientBootstrapConfigurationUri, mimeLookup, DEFAULT_TITLE, } from '@lwrjs/shared-utils';
 import { AppResourceEnum, getAppSpecifier, ResourceIdentityTypes, } from '@lwrjs/app-service/identity';
-import { getClientBootstrapConfigurationUri } from '@lwrjs/shared-utils';
 function streamToString(stream) {
     const chunks = [];
     return new Promise((resolve, reject) => {
@@ -110,25 +107,6 @@ export function generatePageContext({ requestPath: url }, { id, contentTemplate,
 export function isViewResponse(response) {
     return response.body !== undefined;
 }
-/**
- * Load and cache a route handler function (for a view) from the fs
- * @param path - path to the route handle code on the fs
- * @param param1 - directories
- */
-export async function getRouteHandler(path, { cacheDir, rootDir }) {
-    try {
-        const fullPath = resolveFileExtension(path);
-        if (fullPath.endsWith('.ts')) {
-            path = await transpileTs(path, { rootDir, cacheDir: libPath.join(cacheDir, 'routeHandlers') });
-        }
-        const moduleEntry = await import(path);
-        return moduleEntry.default || moduleEntry;
-    }
-    catch (err) {
-        console.log(err);
-        throw new Error(`Unable to get routeHandler: ${path}`);
-    }
-}
 export async function toJsonFormat(viewRequest, viewDefinition, route, runtimeEnvironment, runtimeParams, moduleRegistry) {
     const { viewRecord } = viewDefinition;
     const { bootstrap, id: appName } = route;

package/build/es/view-handler.d.ts

@@ -1,4 +1,4 @@
-import { ViewRegistry, RuntimeEnvironment, NormalizedLwrGlobalConfig, ViewRequest, RuntimeParams, ViewResponse, LwrErrorRoute, LwrRoute, ModuleRegistry, RouteHandlerFunction, ViewHandler } from '@lwrjs/types';
+import { ViewRegistry, RuntimeEnvironment, NormalizedLwrGlobalConfig, ViewRequest, RuntimeParams, ViewResponse, LwrRoute, LwrErrorRoute, Route, ModuleRegistry, ViewHandler } from '@lwrjs/types';
 export interface ViewHandlerContext {
     viewRegistry: ViewRegistry;
     moduleRegistry: ModuleRegistry;
@@ -7,12 +7,10 @@ export declare class LwrViewHandler implements ViewHandler {
     viewRegistry: ViewRegistry;
     moduleRegistry: ModuleRegistry;
     globalConfig: NormalizedLwrGlobalConfig;
-    inflightRouteHandlerEvalMap: Map<string, Promise<RouteHandlerFunction>>;
-    routeHandlerFunctionMap: Map<string, RouteHandlerFunction>;
     constructor(context: ViewHandlerContext, globalConfig: NormalizedLwrGlobalConfig);
-    getViewContent(viewRequest: ViewRequest, route: LwrRoute | LwrErrorRoute, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams): Promise<ViewResponse>;
-    getViewJson(viewRequest: ViewRequest, route: LwrRoute | LwrErrorRoute, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams): Promise<ViewResponse>;
-    getViewConfiguration(viewRequest: ViewRequest, route: LwrRoute | LwrErrorRoute, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams): Promise<ViewResponse | undefined>;
+    getViewContent(viewRequest: ViewRequest, route: Route<LwrRoute | LwrErrorRoute>, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams): Promise<ViewResponse>;
+    getViewJson(viewRequest: ViewRequest, route: Route<LwrRoute | LwrErrorRoute>, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams): Promise<ViewResponse>;
+    getViewConfiguration(viewRequest: ViewRequest, route: Route<LwrRoute | LwrErrorRoute>, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams): Promise<ViewResponse | undefined>;
     private getDefaultRouteViewDefinition;
     private getRouteHandlerResponse;
     private getBoundApi;

package/build/es/view-handler.js

@@ -1,11 +1,8 @@
 import { normalizeResourcePath, shortestTtl } from '@lwrjs/shared-utils';
-import { generateHtmlTag, generatePageContext, getRouteHandler, isViewResponse, toJsonFormat, } from './utils.js';
+import { generateHtmlTag, generatePageContext, isViewResponse, toJsonFormat } from './utils.js';
 import { resolve } from 'path';
 export class LwrViewHandler {
     constructor(context, globalConfig) {
-        // TODO convert to using InflightTasks in the shared utils
-        this.inflightRouteHandlerEvalMap = new Map();
-        this.routeHandlerFunctionMap = new Map();
         this.viewRegistry = context.viewRegistry;
         this.globalConfig = globalConfig;
         this.moduleRegistry = context.moduleRegistry;
@@ -145,33 +142,15 @@ export class LwrViewHandler {
     viewRequest, route, 
     // context
     runtimeEnvironment, runtimeParams = {}) {
-        const { rootDir, assets, contentDir, layoutsDir, cacheDir } = this.globalConfig;
+        const { rootDir, assets, contentDir, layoutsDir } = this.globalConfig;
         const paths = { rootDir, assets, contentDir, layoutsDir };
         const { routeHandler } = route;
         if (!routeHandler) {
             throw new Error('Route Handler is required for a CustomView');
         }
-        // Import and instantiate route handler
-        let routeHandlerFunction = this.routeHandlerFunctionMap.get(routeHandler);
-        if (!routeHandlerFunction) {
-            const inflightRouteHandlerPromise = this.inflightRouteHandlerEvalMap.get(routeHandler);
-            if (inflightRouteHandlerPromise) {
-                // wait on the current inflight route handler promise
-                routeHandlerFunction = await inflightRouteHandlerPromise;
-            }
-            else {
-                // get the route handler eval promise
-                const handlerPromise = getRouteHandler(routeHandler, { cacheDir, rootDir });
-                this.inflightRouteHandlerEvalMap.set(routeHandler, handlerPromise);
-                routeHandlerFunction = await handlerPromise;
-            }
-            // add the resolved route handler function into the cache and delete the inflight entry
-            this.routeHandlerFunctionMap.set(routeHandler, routeHandlerFunction);
-            this.inflightRouteHandlerEvalMap.delete(routeHandler);
-        }
         const locale = runtimeParams.locale;
         const viewApi = this.getBoundApi(route, runtimeEnvironment, runtimeParams);
-        const response = await routeHandlerFunction({ ...viewRequest, locale }, { route, viewApi, ...paths });
+        const response = await routeHandler({ ...viewRequest, locale }, { route: route, viewApi, ...paths });
         return response;
     }
     /*

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.9.0-alpha.11",
+    "version": "0.9.0-alpha.13",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -30,15 +30,15 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/app-service": "0.9.0-alpha.11",
-        "@lwrjs/diagnostics": "0.9.0-alpha.11",
-        "@lwrjs/shared-utils": "0.9.0-alpha.11"
+        "@lwrjs/app-service": "0.9.0-alpha.13",
+        "@lwrjs/diagnostics": "0.9.0-alpha.13",
+        "@lwrjs/shared-utils": "0.9.0-alpha.13"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.9.0-alpha.11"
+        "@lwrjs/types": "0.9.0-alpha.13"
     },
     "engines": {
         "node": ">=14.15.4 <19"
     },
-    "gitHead": "3cb1275b364ae7373c1868c79e6082a122dbef9c"
+    "gitHead": "fa30915a685f6e8c5c2895d0c053d59145780123"
 }