@lwrjs/config 0.10.0-alpha.15 → 0.10.0-alpha.17

package/build/cjs/global-config.cjs

@@ -97,7 +97,8 @@ function normalizeConfig(config) {
     viewProviders: (0, import_services.normalizeServices)(config.viewProviders),
     viewTransformers: (0, import_services.normalizeServices)(config.viewTransformers),
     routes: (0, import_routes.normalizeRoutes)(config.routes, config.routeHandlers),
-    errorRoutes: (0, import_routes.normalizeRoutes)(config.errorRoutes, config.routeHandlers)
+    errorRoutes: (0, import_routes.normalizeRoutes)(config.errorRoutes, config.routeHandlers),
+    routeHandlers: (0, import_routes.normalizeRouteHandlers)(config.routeHandlers)
   };
 }
 function normalizeConfigPaths(config) {

package/build/cjs/modules.cjs

@@ -86,9 +86,9 @@ async function loadServices(config) {
 async function loadRouteHandlers(config) {
   const routeHandlers = {};
   await Promise.all(Object.keys(config.routeHandlers).map(async (id) => {
-    const handlerPath = config.routeHandlers[id];
+    const [handlerPath, handlerOptions] = config.routeHandlers[id];
     const handler = await importModule(handlerPath, config.rootDir, import_path.default.join(config.cacheDir, "routeHandlers"));
-    routeHandlers[id] = handler;
+    routeHandlers[id] = [handler, handlerOptions];
   }));
   return routeHandlers;
 }

package/build/cjs/utils/routes.cjs

@@ -25,16 +25,28 @@ var __toModule = (module2) => {
 __markAsModule(exports);
 __export(exports, {
   normalizeRouteHandlerPaths: () => normalizeRouteHandlerPaths,
+  normalizeRouteHandlers: () => normalizeRouteHandlers,
   normalizeRoutePaths: () => normalizeRoutePaths,
   normalizeRoutes: () => normalizeRoutes
 });
+var import_fs = __toModule(require("fs"));
 var import_path = __toModule(require("path"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 function normalizeRoutes(routes, routeHandlers) {
   return routes.map((route) => {
-    if (route.routeHandler && !routeHandlers[route.routeHandler]) {
-      const handlerPath = route.routeHandler;
-      routeHandlers[handlerPath] = handlerPath;
+    if (route.routeHandler) {
+      const [handler, options] = typeof route.routeHandler === "string" ? [route.routeHandler, void 0] : route.routeHandler;
+      if (!routeHandlers[handler]) {
+        routeHandlers[handler] = [handler, options];
+      }
+      return {
+        ...route,
+        routeHandler: [handler, options],
+        bootstrap: {
+          ...import_shared_utils.DEFAULT_LWR_BOOTSTRAP_CONFIG,
+          ...route.bootstrap
+        }
+      };
     }
     return {
       ...route,
@@ -60,9 +72,20 @@ function normalizeRoutePaths(routes = [], resourcePaths) {
     return route;
   });
 }
+function normalizeRouteHandlers(routeHandlers) {
+  for (const [id, config] of Object.entries(routeHandlers)) {
+    if (typeof config === "string") {
+      routeHandlers[id] = [config, void 0];
+    }
+  }
+  return routeHandlers;
+}
 function normalizeRouteHandlerPaths(routeHandlers, resourcePaths) {
-  for (const [id, handlerPath] of Object.entries(routeHandlers)) {
-    routeHandlers[id] = import_path.default.resolve((0, import_shared_utils.normalizeDirectory)(handlerPath, resourcePaths.rootDir));
+  for (const [id, [handler, options]] of Object.entries(routeHandlers)) {
+    const normalizedPath = import_path.default.resolve((0, import_shared_utils.normalizeDirectory)(handler, resourcePaths.rootDir));
+    if (import_fs.default.existsSync(normalizedPath)) {
+      routeHandlers[id] = [normalizedPath, options];
+    }
   }
   return routeHandlers;
 }

package/build/cjs/validation/app-config-context.cjs

@@ -349,19 +349,23 @@ var ValidationContext = class {
         location: this.getLocationFromNode(node)
       });
     } else if (node.children && node.children.length > 0) {
-      node.children.forEach((n, index) => {
-        if (n.type !== "string" && n.type !== "array") {
-          this.diagnostics.push({
-            description: import_diagnostics.descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(`${property}[${index}]`, "string or array", n.type),
-            location: this.getLocationFromNode(n)
-          });
-        }
-        if (n.type === "string" && n.value.length === 0 || n.type === "array" && n.children && (n.children.length !== 2 || !isNotEmptyString(n.children[0]))) {
-          this.diagnostics.push({
-            description: import_diagnostics.descriptions.CONFIG_PARSER.INVALID_SERVICE(`${property}[${index}]`, n.value === void 0 && n.children ? `invalid Array[${n.children.length}]` : n.value),
-            location: this.getLocationFromNode(n)
-          });
-        }
+      node.children.forEach((n, index) => this.assertIsService(n, property, index));
+    }
+  }
+  assertIsService(node, property, index) {
+    if (!node) {
+      return;
+    }
+    if (node.type !== "string" && node.type !== "array") {
+      this.diagnostics.push({
+        description: import_diagnostics.descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(index !== void 0 ? `${property}[${index}]` : property, "string or array", node.type),
+        location: this.getLocationFromNode(node)
+      });
+    }
+    if (node.type === "string" && node.value.length === 0 || node.type === "array" && node.children && (node.children.length !== 2 || !isNotEmptyString(node.children[0]))) {
+      this.diagnostics.push({
+        description: import_diagnostics.descriptions.CONFIG_PARSER.INVALID_SERVICE(index !== void 0 ? `${property}[${index}]` : property, node.value === void 0 && node.children ? `invalid Array[${node.children.length}]` : node.value),
+        location: this.getLocationFromNode(node)
       });
     }
   }

package/build/cjs/validation/app-config.cjs

@@ -67,7 +67,7 @@ function validateRouteCommon(node, validationContext, propPrefix) {
   validationContext.assertIsSpecifier((0, import_jsonc_parser.findNodeAtLocation)(node, ["rootComponent"]), `${propPrefix}.rootComponent`);
   validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["contentTemplate"]), `${propPrefix}.contentTemplate`);
   validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["layoutTemplate"]), `${propPrefix}.layoutTemplate`);
-  validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["routeHandler"]), `${propPrefix}.routeHandler`);
+  validationContext.assertIsService((0, import_jsonc_parser.findNodeAtLocation)(node, ["routeHandler"]), `${propPrefix}.routeHandler`);
   validateBootstrap((0, import_jsonc_parser.findNodeAtLocation)(node, ["bootstrap"]), validationContext, `${propPrefix}.bootstrap`);
 }
 function validateRoutes(node, validationContext, preMerge) {

package/build/es/global-config.js

@@ -7,7 +7,7 @@ import { DEFAULT_AMD_LOADER, DEFAULT_AMD_LOADER_LEGACY, DEFAULT_ESM_LOADER, DEFA
 import { validateLwrAppConfig } from './validation/app-config.js';
 import { normalizeAssetPaths, normalizeAssets } from './utils/assets.js';
 import { normalizeServicePaths, normalizeServices } from './utils/services.js';
-import { normalizeRouteHandlerPaths, normalizeRoutePaths, normalizeRoutes } from './utils/routes.js';
+import { normalizeRoutePaths, normalizeRoutes, normalizeRouteHandlers, normalizeRouteHandlerPaths, } from './utils/routes.js';
 import { mergeBundleConfig, mergeLockerConfig, mergeLwcConfig, mergeStaticGenerationConfig, trimLwrConfig, } from './utils/merge.js';
 import { normalizeLwcConfig, normalizeModulePaths } from './utils/lwc.js';
 import { getRuntimeEnvironment } from './runtime-config.js';
@@ -124,6 +124,7 @@ function normalizeConfig(config) {
         // normalize routes and capture all route handlers
         routes: normalizeRoutes(config.routes, config.routeHandlers),
         errorRoutes: normalizeRoutes(config.errorRoutes, config.routeHandlers),
+        routeHandlers: normalizeRouteHandlers(config.routeHandlers),
     };
 }
 /**

package/build/es/modules.js

@@ -85,9 +85,9 @@ export async function loadServices(config) {
 export async function loadRouteHandlers(config) {
     const routeHandlers = {};
     await Promise.all(Object.keys(config.routeHandlers).map(async (id) => {
-        const handlerPath = config.routeHandlers[id];
+        const [handlerPath, handlerOptions] = config.routeHandlers[id];
         const handler = await importModule(handlerPath, config.rootDir, path.join(config.cacheDir, 'routeHandlers'));
-        routeHandlers[id] = handler;
+        routeHandlers[id] = [handler, handlerOptions];
     }));
     return routeHandlers;
 }

package/build/es/utils/assets.d.ts

@@ -1,4 +1,4 @@
-import { AssetConfig } from '@lwrjs/types';
+import type { AssetConfig } from '@lwrjs/types';
 export declare function normalizeAssets(assets: string | AssetConfig[]): AssetConfig[];
 export declare function normalizeAssetPaths(assets: AssetConfig[], rootDir: string): AssetConfig[];
 //# sourceMappingURL=assets.d.ts.map

package/build/es/utils/global-data.d.ts

@@ -1,3 +1,3 @@
-import { GlobalData } from '@lwrjs/types';
+import type { GlobalData } from '@lwrjs/types';
 export declare function getGlobalData(globalDataDir: string, defaultData?: GlobalData): GlobalData;
 //# sourceMappingURL=global-data.d.ts.map

package/build/es/utils/routes.d.ts

@@ -1,8 +1,9 @@
-import type { LwrErrorRoute, LwrRoute, NormalizedLwrErrorRoute, NormalizedLwrRoute, ResourcePaths, RouteHandlersConfig } from '@lwrjs/types';
-declare type ViewOrErrorRoute = LwrRoute | LwrErrorRoute;
-declare type NormalizedRoute<T extends ViewOrErrorRoute> = T extends LwrRoute ? NormalizedLwrRoute : NormalizedLwrErrorRoute;
+import type { LwrErrorRoute, LwrRoute, NormalizedLwrErrorRoute, NormalizedLwrRoute, NormalizedRouteHandlersConfig, ResourcePaths, RouteHandlersConfig } from '@lwrjs/types';
+type ViewOrErrorRoute = LwrRoute | LwrErrorRoute;
+type NormalizedRoute<T extends ViewOrErrorRoute> = T extends LwrRoute ? NormalizedLwrRoute : NormalizedLwrErrorRoute;
 export declare function normalizeRoutes<T extends ViewOrErrorRoute>(routes: T[], routeHandlers: RouteHandlersConfig): NormalizedRoute<T>[];
 export declare function normalizeRoutePaths<T extends ViewOrErrorRoute>(routes: T[] | undefined, resourcePaths: ResourcePaths): NormalizedRoute<T>[];
-export declare function normalizeRouteHandlerPaths(routeHandlers: RouteHandlersConfig, resourcePaths: ResourcePaths): RouteHandlersConfig;
+export declare function normalizeRouteHandlers(routeHandlers: RouteHandlersConfig): NormalizedRouteHandlersConfig;
+export declare function normalizeRouteHandlerPaths(routeHandlers: NormalizedRouteHandlersConfig, resourcePaths: ResourcePaths): NormalizedRouteHandlersConfig;
 export {};
 //# sourceMappingURL=routes.d.ts.map

package/build/es/utils/routes.js

@@ -1,12 +1,22 @@
+import fs from 'fs';
 import path from 'path';
 import { DEFAULT_LWR_BOOTSTRAP_CONFIG, normalizeDirectory, normalizeResourcePath } from '@lwrjs/shared-utils';
 export function normalizeRoutes(routes, routeHandlers) {
     return routes.map((route) => {
         // when a route handler is set, ensure it is set in the route handler config
-        if (route.routeHandler && !routeHandlers[route.routeHandler]) {
-            const handlerPath = route.routeHandler;
-            // the non-normalized path to the handler will be the id used when invoking the route handler
-            routeHandlers[handlerPath] = handlerPath;
+        if (route.routeHandler) {
+            const [handler, options] = typeof route.routeHandler === 'string' ? [route.routeHandler, undefined] : route.routeHandler;
+            if (!routeHandlers[handler]) {
+                routeHandlers[handler] = [handler, options];
+            }
+            return {
+                ...route,
+                routeHandler: [handler, options],
+                bootstrap: {
+                    ...DEFAULT_LWR_BOOTSTRAP_CONFIG,
+                    ...route.bootstrap,
+                },
+            };
         }
         return {
             ...route,
@@ -33,9 +43,21 @@ export function normalizeRoutePaths(routes = [], resourcePaths) {
         return route;
     });
 }
+export function normalizeRouteHandlers(routeHandlers) {
+    for (const [id, config] of Object.entries(routeHandlers)) {
+        if (typeof config === 'string') {
+            routeHandlers[id] = [config, undefined];
+        }
+    }
+    return routeHandlers;
+}
 export function normalizeRouteHandlerPaths(routeHandlers, resourcePaths) {
-    for (const [id, handlerPath] of Object.entries(routeHandlers)) {
-        routeHandlers[id] = path.resolve(normalizeDirectory(handlerPath, resourcePaths.rootDir));
+    for (const [id, [handler, options]] of Object.entries(routeHandlers)) {
+        const normalizedPath = path.resolve(normalizeDirectory(handler, resourcePaths.rootDir));
+        // use the normalized path if it exists; otherwise the handler is module specifier
+        if (fs.existsSync(normalizedPath)) {
+            routeHandlers[id] = [normalizedPath, options];
+        }
     }
     return routeHandlers;
 }

package/build/es/validation/app-config-context.d.ts

@@ -1,11 +1,11 @@
-import { AssetDirConfig, AssetFileConfig, LwrErrorRoute, LwrRoute, NormalizedLwrGlobalConfig, NormalizedLwrAppBootstrapConfig, LwrLockerConfig, RouteHandlersConfig } from '@lwrjs/types';
+import type { AssetDirConfig, AssetFileConfig, LwrErrorRoute, LwrRoute, NormalizedLwrGlobalConfig, NormalizedLwrAppBootstrapConfig, LwrLockerConfig, RouteHandlersConfig } from '@lwrjs/types';
 import { Node } from 'jsonc-parser';
 import { Diagnostic } from '@lwrjs/diagnostics';
-declare type RequiredAssetDirConfig = Required<AssetDirConfig>;
-declare type RequiredAssetFileConfig = Required<AssetFileConfig>;
-declare type RequiredLwrRoute = Required<LwrRoute>;
-declare type RequiredLwrErrorRoute = Required<LwrErrorRoute>;
-declare type RequiredLwrLockerConfig = Required<LwrLockerConfig>;
+type RequiredAssetDirConfig = Required<AssetDirConfig>;
+type RequiredAssetFileConfig = Required<AssetFileConfig>;
+type RequiredLwrRoute = Required<LwrRoute>;
+type RequiredLwrErrorRoute = Required<LwrErrorRoute>;
+type RequiredLwrLockerConfig = Required<LwrLockerConfig>;
 interface ConfigMap {
     root: NormalizedLwrGlobalConfig;
     assetDir: RequiredAssetDirConfig;
@@ -48,6 +48,7 @@ export declare class ValidationContext {
     assertArrayOfStrings(node: Node | undefined, property: string): void;
     assertArrayOfSpecifiers(node: Node | undefined, property: string): void;
     assertArrayOfServices(node: Node | undefined, property: string): void;
+    assertIsService(node: Node | undefined, property: string, index?: number): void;
     assertUniqueIds(nodes: Node[], property: string): void;
     assertClientLockerSSR(routesNode: Node | undefined, lockerNode: Node | undefined): void;
     assertRequiredKeys(node: Node, property: string, requiredPropertyKeys: string[]): void;

package/build/es/validation/app-config-context.js

@@ -324,24 +324,28 @@ export class ValidationContext {
             });
         }
         else if (node.children && node.children.length > 0) {
-            node.children.forEach((n, index) => {
-                if (n.type !== 'string' && n.type !== 'array') {
-                    this.diagnostics.push({
-                        description: descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(`${property}[${index}]`, 'string or array', n.type),
-                        location: this.getLocationFromNode(n),
-                    });
-                }
-                if ((n.type === 'string' && n.value.length === 0) ||
-                    (n.type === 'array' &&
-                        n.children &&
-                        (n.children.length !== 2 || !isNotEmptyString(n.children[0])))) {
-                    this.diagnostics.push({
-                        description: descriptions.CONFIG_PARSER.INVALID_SERVICE(`${property}[${index}]`, n.value === undefined && n.children
-                            ? `invalid Array[${n.children.length}]`
-                            : n.value),
-                        location: this.getLocationFromNode(n),
-                    });
-                }
+            node.children.forEach((n, index) => this.assertIsService(n, property, index));
+        }
+    }
+    assertIsService(node, property, index) {
+        if (!node) {
+            return;
+        }
+        if (node.type !== 'string' && node.type !== 'array') {
+            this.diagnostics.push({
+                description: descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(index !== undefined ? `${property}[${index}]` : property, 'string or array', node.type),
+                location: this.getLocationFromNode(node),
+            });
+        }
+        if ((node.type === 'string' && node.value.length === 0) ||
+            (node.type === 'array' &&
+                node.children &&
+                (node.children.length !== 2 || !isNotEmptyString(node.children[0])))) {
+            this.diagnostics.push({
+                description: descriptions.CONFIG_PARSER.INVALID_SERVICE(index !== undefined ? `${property}[${index}]` : property, node.value === undefined && node.children
+                    ? `invalid Array[${node.children.length}]`
+                    : node.value),
+                location: this.getLocationFromNode(node),
             });
         }
     }

package/build/es/validation/app-config.d.ts

@@ -4,7 +4,7 @@ export declare const SOURCE_BY_PHASE: {
     pre: string;
     post: string;
 };
-declare type ConfigPhase = 'file' | 'pre' | 'post';
+type ConfigPhase = 'file' | 'pre' | 'post';
 export declare function validateLwrAppConfig(config: string | LwrGlobalConfig, phase: ConfigPhase): void | never;
 export {};
 //# sourceMappingURL=app-config.d.ts.map

package/build/es/validation/app-config.js

@@ -63,7 +63,7 @@ function validateRouteCommon(node, validationContext, propPrefix) {
     validationContext.assertIsSpecifier(findNode(node, ['rootComponent']), `${propPrefix}.rootComponent`);
     validationContext.assertNotEmptyString(findNode(node, ['contentTemplate']), `${propPrefix}.contentTemplate`);
     validationContext.assertNotEmptyString(findNode(node, ['layoutTemplate']), `${propPrefix}.layoutTemplate`);
-    validationContext.assertNotEmptyString(findNode(node, ['routeHandler']), `${propPrefix}.routeHandler`);
+    validationContext.assertIsService(findNode(node, ['routeHandler']), `${propPrefix}.routeHandler`);
     validateBootstrap(findNode(node, ['bootstrap']), validationContext, `${propPrefix}.bootstrap`);
 }
 /**

package/build/es/validation/helpers.d.ts

@@ -1,4 +1,4 @@
-import { SourceLocation } from '@lwrjs/diagnostics';
+import type { SourceLocation } from '@lwrjs/diagnostics';
 interface SourcePosition {
     offset: number;
     length: number;

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.10.0-alpha.15",
+    "version": "0.10.0-alpha.17",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -36,13 +36,13 @@
         "package.cjs"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.10.0-alpha.15",
-        "@lwrjs/shared-utils": "0.10.0-alpha.15",
+        "@lwrjs/diagnostics": "0.10.0-alpha.17",
+        "@lwrjs/shared-utils": "0.10.0-alpha.17",
         "fs-extra": "^11.1.1",
         "jsonc-parser": "^3.0.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.10.0-alpha.15"
+        "@lwrjs/types": "0.10.0-alpha.17"
     },
     "peerDependencies": {
         "lwc": "2.x"
@@ -50,5 +50,5 @@
     "engines": {
         "node": ">=16.0.0 <20"
     },
-    "gitHead": "70557f63a46167c40cf1415f12af69f78ae402d6"
+    "gitHead": "36cfce3a18bf3dc71a7d5203bbaa9aa752ccce06"
 }