@lwrjs/view-registry 0.9.0-alpha.8 → 0.9.0

package/build/es/view-handler.js

@@ -1,13 +1,11 @@
-import { normalizeResourcePath } from '@lwrjs/shared-utils';
-import { generateHtmlTag, generatePageContext, getRouteHandler, isViewResponse, toJsonFormat, } from './utils.js';
+import { normalizeResourcePath, shortestTtl } from '@lwrjs/shared-utils';
+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.routeHandlers = context.routeHandlers;
+        this.viewRegistry = context.viewRegistry;
         this.moduleRegistry = context.moduleRegistry;
     }
     // Get the View's HTML Response
@@ -18,8 +16,7 @@ export class LwrViewHandler {
     route, 
     // context
     runtimeEnvironment, runtimeParams = {}) {
-        const { routeHandler } = route;
-        if (routeHandler) {
+        if (route.routeHandler) {
             const response = await this.getRouteHandlerResponse(viewRequest, route, runtimeEnvironment, runtimeParams);
             if (isViewResponse(response)) {
                 // Return custom view response payload as-is
@@ -38,6 +35,7 @@ export class LwrViewHandler {
                 metadata: {
                     viewDefinition,
                 },
+                cache: { ttl: shortestTtl(response.cache?.ttl, viewDefinition.cache?.ttl) },
             };
         }
         // default static view
@@ -47,6 +45,7 @@ export class LwrViewHandler {
             metadata: {
                 viewDefinition,
             },
+            cache: viewDefinition.cache,
         };
     }
     // Get the View's JSON Manifest Response
@@ -57,8 +56,7 @@ export class LwrViewHandler {
     route, 
     // context
     runtimeEnvironment, runtimeParams = {}) {
-        const { routeHandler } = route;
-        if (routeHandler) {
+        if (route.routeHandler) {
             const response = await this.getRouteHandlerResponse(viewRequest, route, runtimeEnvironment, runtimeParams);
             if (isViewResponse(response)) {
                 // Return custom view response payload as-is
@@ -86,9 +84,8 @@ export class LwrViewHandler {
     route, 
     // context
     runtimeEnvironment, runtimeParams = {}) {
-        const { routeHandler } = route;
         let viewDefinition;
-        if (routeHandler) {
+        if (route.routeHandler) {
             const response = await this.getRouteHandlerResponse(viewRequest, route, runtimeEnvironment, runtimeParams);
             if (isViewResponse(response)) {
                 // Return custom view response payload as-is
@@ -143,33 +140,18 @@ export class LwrViewHandler {
     viewRequest, route, 
     // context
     runtimeEnvironment, runtimeParams = {}) {
-        const { rootDir, assets, contentDir, layoutsDir, cacheDir } = this.globalConfig;
-        const paths = { rootDir, assets, contentDir, layoutsDir };
-        const { routeHandler } = route;
-        if (!routeHandler) {
-            throw new Error('Route Handler is required for a CustomView');
+        if (!route.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 routeHandler = this.routeHandlers[route.routeHandler];
+        if (!routeHandler) {
+            throw new Error(`Route handler does not exist for id: ${route.routeHandler}`);
         }
+        const { rootDir, assets, contentDir, layoutsDir } = this.globalConfig;
+        const paths = { rootDir, assets, contentDir, layoutsDir };
         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;
     }
     /*
@@ -202,6 +184,7 @@ export class LwrViewHandler {
             metadata: {
                 viewDefinition,
             },
+            cache: viewDefinition.cache,
         };
     }
 }

package/package.json

@@ -4,15 +4,15 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.9.0-alpha.8",
+    "version": "0.9.0",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
-        "url": "https://github.com/salesforce/lwr.git",
+        "url": "https://github.com/salesforce-experience-platform-emu/lwr.git",
         "directory": "packages/@lwrjs/view-registry"
     },
     "bugs": {
-        "url": "https://github.com/salesforce/lwr/issues"
+        "url": "https://github.com/salesforce-experience-platform-emu/lwr/issues"
     },
     "type": "module",
     "types": "build/es/index.d.ts",
@@ -30,15 +30,15 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/app-service": "0.9.0-alpha.8",
-        "@lwrjs/diagnostics": "0.9.0-alpha.8",
-        "@lwrjs/shared-utils": "0.9.0-alpha.8"
+        "@lwrjs/app-service": "0.9.0",
+        "@lwrjs/diagnostics": "0.9.0",
+        "@lwrjs/shared-utils": "0.9.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.9.0-alpha.8"
+        "@lwrjs/types": "0.9.0"
     },
     "engines": {
-        "node": ">=14.15.4 <19"
+        "node": ">=16.0.0 <20"
     },
-    "gitHead": "013fcee240ff2e1c23ef304e70fc39d6ef13fb8b"
+    "gitHead": "4e42b0dc5453f92b36b42aa8132c5bc281e616b7"
 }