@lwrjs/config 0.11.0-alpha.4 → 0.11.0-alpha.6

package/build/cjs/hooks.cjs

@@ -66,11 +66,13 @@ function executeStartHooks(hooks, globalConfig, runtimeEnvironment, skipValidate
     }
     const onStartConfig = {
       basePath: globalConfig.basePath,
+      i18n: globalConfig.i18n,
       routes: globalConfig.routes
     };
     hook.onStart(onStartConfig);
-    globalConfig.routes = onStartConfig.routes || [];
     runtimeEnvironment.basePath = globalConfig.basePath = onStartConfig.basePath || "";
+    globalConfig.i18n = onStartConfig.i18n;
+    globalConfig.routes = onStartConfig.routes || [];
   }
   globalConfig.routes = (0, import_routes.normalizeRoutes)(globalConfig.routes, globalConfig.routeHandlers);
   const ssrConfig = (0, import_global_config.applySsrConfig)(globalConfig);

package/build/cjs/utils/routes.cjs

@@ -61,7 +61,7 @@ function normalizeRoutePaths(routes = [], resourcePaths) {
   return routes.map((route) => {
     const {contentTemplate, layoutTemplate, subRoutes} = route;
     if (contentTemplate) {
-      route.contentTemplate = import_path.default.resolve((0, import_shared_utils.normalizeResourcePath)(contentTemplate, resourcePaths));
+      route.contentTemplate = typeof contentTemplate === "string" ? import_path.default.resolve((0, import_shared_utils.normalizeResourcePath)(contentTemplate, resourcePaths)) : contentTemplate;
     }
     if (layoutTemplate) {
       route.layoutTemplate = import_path.default.resolve((0, import_shared_utils.normalizeResourcePath)(layoutTemplate, resourcePaths));

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

@@ -38,6 +38,7 @@ __export(exports, {
 var import_jsonc_parser = __toModule(require("jsonc-parser"));
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_helpers = __toModule(require("./helpers.cjs"));
+var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 function createKeys(p, t) {
   return p && t;
 }
@@ -82,7 +83,7 @@ var ROOT_ATTRIBUTE_KEYS = createKeys("root", [
 var ASSET_DIR_ATTRIBUTE_KEYS = createKeys("assetDir", ["alias", "dir", "urlPath", "root"]);
 var ASSET_FILE_ATTRIBUTE_KEYS = createKeys("assetFile", ["alias", "file", "urlPath"]);
 var LOCKER_ATTRIBUTE_KEYS = createKeys("locker", ["enabled", "trustedComponents", "clientOnly"]);
-var I18N_ATTRIBUTE_KEYS = createKeys("i18n", ["defaultLocale", "locales"]);
+var I18N_ATTRIBUTE_KEYS = createKeys("i18n", ["defaultLocale", "locales", "uriPattern"]);
 var ROUTE_ATTRIBUTE_KEYS = createKeys("routes", [
   "bootstrap",
   "subRoutes",
@@ -119,7 +120,6 @@ var BOOTSTRAP_ATTRIBUTE_KEYS = createKeys("bootstrap", [
   "module",
   "preloadModules"
 ]);
-var SPECIFIER_REGEX = /^@?[\w-]+(\/[\w-]+)*$/;
 function isNotEmptyString(node) {
   return node.type === "string" && node.value.length > 0;
 }
@@ -157,7 +157,7 @@ var ValidationContext = class {
     }
   }
   assertIsSpecifier(node, property) {
-    if (node && (node.type !== "string" || !SPECIFIER_REGEX.test(node.value))) {
+    if (node && (node.type !== "string" || !(0, import_shared_utils.isSpecifier)(node.value))) {
       this.diagnostics.push({
         description: import_diagnostics.descriptions.CONFIG_PARSER.INVALID_SPECIFIER(property, node.value),
         location: this.getLocationFromNode(node)
@@ -334,7 +334,7 @@ var ValidationContext = class {
       });
     } else if (node.children && node.children.length > 0) {
       node.children.forEach((n, index) => {
-        if (n.type !== "string" || !SPECIFIER_REGEX.test(n.value)) {
+        if (n.type !== "string" || !(0, import_shared_utils.isSpecifier)(n.value)) {
           this.diagnostics.push({
             description: import_diagnostics.descriptions.CONFIG_PARSER.INVALID_SPECIFIER(`${property}[${index}]`, n.value),
             location: this.getLocationFromNode(n)
@@ -356,6 +356,22 @@ var ValidationContext = class {
       node.children.forEach((n, index) => this.assertIsService(n, property, index));
     }
   }
+  assertIsStringOrObject(node, property, index) {
+    if (!node) {
+      return;
+    }
+    if (node.type !== "string" && node.type !== "object") {
+      this.diagnostics.push({
+        description: import_diagnostics.descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(index !== void 0 ? `${property}[${index}]` : property, "string or object", node.type),
+        location: this.getLocationFromNode(node)
+      });
+    } else if (node.type === "string" && !isNotEmptyString(node)) {
+      this.diagnostics.push({
+        description: import_diagnostics.descriptions.CONFIG_PARSER.NON_EMPTY_STRING(property, node.value),
+        location: this.getLocationFromNode(node)
+      });
+    }
+  }
   assertIsService(node, property, index) {
     if (!node) {
       return;
@@ -456,4 +472,21 @@ var ValidationContext = class {
       });
     }
   }
+  assertFallbackIds(nodes) {
+    const localesIds = nodes.map((n) => {
+      const idNode = (0, import_jsonc_parser.findNodeAtLocation)(n, ["id"]);
+      return idNode ? idNode.value : void 0;
+    }).filter((id) => id !== void 0);
+    for (const n of nodes) {
+      const fallbackNode = (0, import_jsonc_parser.findNodeAtLocation)(n, ["fallback"]);
+      if (fallbackNode?.value) {
+        if (!localesIds.includes(fallbackNode.value)) {
+          this.diagnostics.push({
+            description: import_diagnostics.descriptions.CONFIG_PARSER.FALLBACK_NOT_IN_LOCALES(fallbackNode.value, localesIds),
+            location: this.getLocationFromNode(fallbackNode)
+          });
+        }
+      }
+    }
+  }
 };

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

@@ -68,7 +68,7 @@ function validateRouteCommon(node, validationContext, propPrefix) {
   ]);
   validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["id"]), `${propPrefix}.id`);
   validationContext.assertIsSpecifier((0, import_jsonc_parser.findNodeAtLocation)(node, ["rootComponent"]), `${propPrefix}.rootComponent`);
-  validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["contentTemplate"]), `${propPrefix}.contentTemplate`);
+  validationContext.assertIsStringOrObject((0, import_jsonc_parser.findNodeAtLocation)(node, ["contentTemplate"]), `${propPrefix}.contentTemplate`);
   validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["layoutTemplate"]), `${propPrefix}.layoutTemplate`);
   validationContext.assertIsService((0, import_jsonc_parser.findNodeAtLocation)(node, ["routeHandler"]), `${propPrefix}.routeHandler`);
   validateBootstrap((0, import_jsonc_parser.findNodeAtLocation)(node, ["bootstrap"]), validationContext, `${propPrefix}.bootstrap`);
@@ -101,7 +101,10 @@ function validateI18NConfig(node, validationContext, preMerge) {
     validationContext.assertRequiredKeys(node, "i18n", ["defaultLocale", "locales"]);
     const locales = (0, import_jsonc_parser.findNodeAtLocation)(node, ["locales"]);
     validationContext.assertNotEmptyArray(locales, "i18n.locales");
-    validationContext.assertUniqueIds([...locales?.children || []], "i18n.locales");
+    if (locales) {
+      validationContext.assertUniqueIds([...locales?.children || []], "i18n.locales");
+      validationContext.assertFallbackIds([...locales?.children || []]);
+    }
     const defaultLocale = (0, import_jsonc_parser.findNodeAtLocation)(node, ["defaultLocale"]);
     validationContext.assertNotEmptyString(defaultLocale, "i18n.defaultLocale");
     const localeIds = locales?.children?.map((n) => (0, import_jsonc_parser.findNodeAtLocation)(n, ["id"])?.value) || [];

package/build/es/hooks.js

@@ -65,12 +65,14 @@ export function executeStartHooks(hooks, globalConfig, runtimeEnvironment, skipV
         }
         const onStartConfig = {
             basePath: globalConfig.basePath,
+            i18n: globalConfig.i18n,
             routes: globalConfig.routes,
         };
         hook.onStart(onStartConfig);
         // copy updated values back to the globalConfig
-        globalConfig.routes = (onStartConfig.routes || []);
         runtimeEnvironment.basePath = globalConfig.basePath = onStartConfig.basePath || '';
+        globalConfig.i18n = onStartConfig.i18n;
+        globalConfig.routes = (onStartConfig.routes || []);
     }
     globalConfig.routes = normalizeRoutes(globalConfig.routes, globalConfig.routeHandlers);
     const ssrConfig = applySsrConfig(globalConfig);

package/build/es/utils/routes.js

@@ -34,7 +34,10 @@ export function normalizeRoutePaths(routes = [], resourcePaths) {
         // route handler paths are NOT normalized here to maintain the id lookup for route handler invocation
         const { contentTemplate, layoutTemplate, subRoutes } = route;
         if (contentTemplate) {
-            route.contentTemplate = path.resolve(normalizeResourcePath(contentTemplate, resourcePaths));
+            route.contentTemplate =
+                typeof contentTemplate === 'string'
+                    ? path.resolve(normalizeResourcePath(contentTemplate, resourcePaths))
+                    : contentTemplate;
         }
         if (layoutTemplate) {
             route.layoutTemplate = path.resolve(normalizeResourcePath(layoutTemplate, resourcePaths));

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

@@ -1,4 +1,4 @@
-import type { AssetDirConfig, AssetFileConfig, LwrErrorRoute, LwrRoute, NormalizedLwrGlobalConfig, NormalizedLwrAppBootstrapConfig, LwrLockerConfig, RouteHandlersConfig, BundleConfig, I18NConfig } from '@lwrjs/types';
+import type { AssetDirConfig, AssetFileConfig, LwrErrorRoute, LwrRoute, NormalizedLwrGlobalConfig, NormalizedLwrAppBootstrapConfig, LwrLockerConfig, RouteHandlersConfig, BundleConfig, I18NConfig, Locale } from '@lwrjs/types';
 import { Node } from 'jsonc-parser';
 import { Diagnostic } from '@lwrjs/diagnostics';
 type RequiredAssetDirConfig = Required<AssetDirConfig>;
@@ -7,6 +7,7 @@ type RequiredLwrRoute = Required<LwrRoute>;
 type RequiredLwrErrorRoute = Required<LwrErrorRoute>;
 type RequiredLwrLockerConfig = Required<LwrLockerConfig>;
 type RequiredI18NConfig = Required<I18NConfig>;
+type RequiredLocalesConfig = Required<Locale>;
 interface ConfigMap {
     root: NormalizedLwrGlobalConfig;
     assetDir: RequiredAssetDirConfig;
@@ -20,12 +21,13 @@ interface ConfigMap {
     'bundleConfig.external': BundleConfig;
     'bundleConfig.groups': BundleConfig;
     i18n: RequiredI18NConfig;
+    'i18n.locales': RequiredLocalesConfig;
 }
 export declare const ROOT_ATTRIBUTE_KEYS: ["amdLoader", "apiVersion", "assets", "assetProviders", "assetTransformers", "bundleConfig", "bundleProviders", "cacheDir", "contentDir", "environment", "errorRoutes", "esmLoader", "staticSiteGenerator", "globalData", "globalDataDir", "hooks", "i18n", "ignoreLwrConfigFile", "lwrConfigFile", "layoutsDir", "locker", "lwc", "lwrVersion", "moduleProviders", "port", "basePath", "resourceProviders", "rootDir", "routeHandlers", "routes", "serverMode", "minify", "serverType", "uriTransformers", "viewProviders", "viewTransformers"];
 export declare const ASSET_DIR_ATTRIBUTE_KEYS: ["alias", "dir", "urlPath", "root"];
 export declare const ASSET_FILE_ATTRIBUTE_KEYS: ["alias", "file", "urlPath"];
 export declare const LOCKER_ATTRIBUTE_KEYS: ["enabled", "trustedComponents", "clientOnly"];
-export declare const I18N_ATTRIBUTE_KEYS: ["defaultLocale", "locales"];
+export declare const I18N_ATTRIBUTE_KEYS: ["defaultLocale", "locales", "uriPattern"];
 export declare const ROUTE_ATTRIBUTE_KEYS: ["bootstrap", "subRoutes", "contentTemplate", "id", "cache", "layoutTemplate", "method", "path", "rootComponent", "routeHandler", "properties"];
 export declare const ERROR_ROUTE_ATTRIBUTE_KEYS: ["bootstrap", "subRoutes", "contentTemplate", "id", "layoutTemplate", "rootComponent", "routeHandler", "status", "properties", "cache"];
 export declare const BOOTSTRAP_ATTRIBUTE_KEYS: ["autoBoot", "syntheticShadow", "workers", "services", "configAsSrc", "ssr", "mixedMode", "module", "preloadModules"];
@@ -54,6 +56,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;
+    assertIsStringOrObject(node: Node | undefined, property: string, index?: number): void;
     assertIsService(node: Node | undefined, property: string, index?: number): void;
     assertUniqueIds(nodes: Node[], property: string): void;
     assertClientLockerSSR(routesNode: Node | undefined, lockerNode: Node | undefined): void;
@@ -61,6 +64,7 @@ export declare class ValidationContext {
     assertValidKeys<T extends keyof ConfigMap>(node: Node, property: T, validPropertyKeys: (keyof ConfigMap[T])[]): void;
     assertNoBundleConfigDupes(node: Node, dupes: string[]): void;
     assertDefaultInLocales(node: Node, defaultLocale: string, localesIds: string[]): void;
+    assertFallbackIds(nodes: Node[]): void;
 }
 export {};
 //# sourceMappingURL=app-config-context.d.ts.map

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

@@ -1,6 +1,7 @@
 import { findNodeAtLocation } from 'jsonc-parser';
 import { descriptions } from '@lwrjs/diagnostics';
 import { calculatePositionFromSource } from './helpers.js';
+import { isSpecifier } from '@lwrjs/shared-utils';
 // Run the duplicate and missing property checks against an object of a given type
 function createKeys(p, t) {
     return p && t;
@@ -47,7 +48,7 @@ export const ROOT_ATTRIBUTE_KEYS = createKeys('root', [
 export const ASSET_DIR_ATTRIBUTE_KEYS = createKeys('assetDir', ['alias', 'dir', 'urlPath', 'root']);
 export const ASSET_FILE_ATTRIBUTE_KEYS = createKeys('assetFile', ['alias', 'file', 'urlPath']);
 export const LOCKER_ATTRIBUTE_KEYS = createKeys('locker', ['enabled', 'trustedComponents', 'clientOnly']);
-export const I18N_ATTRIBUTE_KEYS = createKeys('i18n', ['defaultLocale', 'locales']);
+export const I18N_ATTRIBUTE_KEYS = createKeys('i18n', ['defaultLocale', 'locales', 'uriPattern']);
 export const ROUTE_ATTRIBUTE_KEYS = createKeys('routes', [
     'bootstrap',
     'subRoutes',
@@ -84,7 +85,6 @@ export const BOOTSTRAP_ATTRIBUTE_KEYS = createKeys('bootstrap', [
     'module',
     'preloadModules',
 ]);
-const SPECIFIER_REGEX = /^@?[\w-]+(\/[\w-]+)*$/;
 function isNotEmptyString(node) {
     return node.type === 'string' && node.value.length > 0;
 }
@@ -122,7 +122,7 @@ export class ValidationContext {
         }
     }
     assertIsSpecifier(node, property) {
-        if (node && (node.type !== 'string' || !SPECIFIER_REGEX.test(node.value))) {
+        if (node && (node.type !== 'string' || !isSpecifier(node.value))) {
             this.diagnostics.push({
                 description: descriptions.CONFIG_PARSER.INVALID_SPECIFIER(property, node.value),
                 location: this.getLocationFromNode(node),
@@ -307,7 +307,7 @@ export class ValidationContext {
         }
         else if (node.children && node.children.length > 0) {
             node.children.forEach((n, index) => {
-                if (n.type !== 'string' || !SPECIFIER_REGEX.test(n.value)) {
+                if (n.type !== 'string' || !isSpecifier(n.value)) {
                     this.diagnostics.push({
                         description: descriptions.CONFIG_PARSER.INVALID_SPECIFIER(`${property}[${index}]`, n.value),
                         location: this.getLocationFromNode(n),
@@ -330,6 +330,23 @@ export class ValidationContext {
             node.children.forEach((n, index) => this.assertIsService(n, property, index));
         }
     }
+    assertIsStringOrObject(node, property, index) {
+        if (!node) {
+            return;
+        }
+        if (node.type !== 'string' && node.type !== 'object') {
+            this.diagnostics.push({
+                description: descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(index !== undefined ? `${property}[${index}]` : property, 'string or object', node.type),
+                location: this.getLocationFromNode(node),
+            });
+        }
+        else if (node.type === 'string' && !isNotEmptyString(node)) {
+            this.diagnostics.push({
+                description: descriptions.CONFIG_PARSER.NON_EMPTY_STRING(property, node.value),
+                location: this.getLocationFromNode(node),
+            });
+        }
+    }
     assertIsService(node, property, index) {
         if (!node) {
             return;
@@ -439,5 +456,24 @@ export class ValidationContext {
             });
         }
     }
+    assertFallbackIds(nodes) {
+        const localesIds = nodes
+            .map((n) => {
+            const idNode = findNodeAtLocation(n, ['id']);
+            return idNode ? idNode.value : undefined;
+        })
+            .filter((id) => id !== undefined);
+        for (const n of nodes) {
+            const fallbackNode = findNodeAtLocation(n, ['fallback']);
+            if (fallbackNode?.value) {
+                if (!localesIds.includes(fallbackNode.value)) {
+                    this.diagnostics.push({
+                        description: descriptions.CONFIG_PARSER.FALLBACK_NOT_IN_LOCALES(fallbackNode.value, localesIds),
+                        location: this.getLocationFromNode(fallbackNode),
+                    });
+                }
+            }
+        }
+    }
 }
 //# sourceMappingURL=app-config-context.js.map

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

@@ -51,7 +51,7 @@ function validateBootstrap(node, validationContext, propPrefix) {
  *          - contentTemplate
  *          - routeHandler
  *      - rootComponent: optional specifier
- *      - contentTemplate: optional string
+ *      - contentTemplate: optional string or object
  *      - layoutTemplate: optional string
  *      - routeHandler: optional string
  *      - optional bootstrap...
@@ -64,7 +64,7 @@ function validateRouteCommon(node, validationContext, propPrefix) {
     ]);
     validationContext.assertNotEmptyString(findNode(node, ['id']), `${propPrefix}.id`);
     validationContext.assertIsSpecifier(findNode(node, ['rootComponent']), `${propPrefix}.rootComponent`);
-    validationContext.assertNotEmptyString(findNode(node, ['contentTemplate']), `${propPrefix}.contentTemplate`);
+    validationContext.assertIsStringOrObject(findNode(node, ['contentTemplate']), `${propPrefix}.contentTemplate`);
     validationContext.assertNotEmptyString(findNode(node, ['layoutTemplate']), `${propPrefix}.layoutTemplate`);
     validationContext.assertIsService(findNode(node, ['routeHandler']), `${propPrefix}.routeHandler`);
     validateBootstrap(findNode(node, ['bootstrap']), validationContext, `${propPrefix}.bootstrap`);
@@ -110,7 +110,10 @@ function validateI18NConfig(node, validationContext, preMerge) {
         // Validate locales
         const locales = findNode(node, ['locales']);
         validationContext.assertNotEmptyArray(locales, 'i18n.locales');
-        validationContext.assertUniqueIds([...(locales?.children || [])], 'i18n.locales');
+        if (locales) {
+            validationContext.assertUniqueIds([...(locales?.children || [])], 'i18n.locales');
+            validationContext.assertFallbackIds([...(locales?.children || [])]);
+        }
         // Validate defaultLocale
         const defaultLocale = findNode(node, ['defaultLocale']);
         validationContext.assertNotEmptyString(defaultLocale, 'i18n.defaultLocale');

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.11.0-alpha.4",
+    "version": "0.11.0-alpha.6",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -41,14 +41,14 @@
         "test": "jest"
     },
     "dependencies": {
-        "@lwrjs/diagnostics": "0.11.0-alpha.4",
-        "@lwrjs/instrumentation": "0.11.0-alpha.4",
-        "@lwrjs/shared-utils": "0.11.0-alpha.4",
+        "@lwrjs/diagnostics": "0.11.0-alpha.6",
+        "@lwrjs/instrumentation": "0.11.0-alpha.6",
+        "@lwrjs/shared-utils": "0.11.0-alpha.6",
         "fs-extra": "^11.1.1",
         "jsonc-parser": "^3.0.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.11.0-alpha.4",
+        "@lwrjs/types": "0.11.0-alpha.6",
         "jest": "^26.6.3",
         "ts-jest": "^26.5.6"
     },
@@ -61,5 +61,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "89a7e9815e0e381d9fd67212f0471d9a11f73985"
+    "gitHead": "571d4bac5650765aa818bcb9d5ed752a8cf041af"
 }