@lwrjs/config 0.17.2-alpha.1 → 0.17.2-alpha.2

package/build/cjs/runtime-config.cjs

@@ -101,7 +101,7 @@ var RUNTIME_CONFIGS = {
 function getServerModeConfig(serverMode) {
   const selectedMode = RUNTIME_CONFIGS[serverMode];
   if (!selectedMode) {
-    throw (0, import_diagnostics.createSingleDiagnosticError)({description: import_diagnostics.descriptions.UNRESOLVABLE.INVALID_MODE(serverMode)}, import_diagnostics.LwrServerError);
+    throw new import_diagnostics.LwrApplicationError(import_diagnostics.descriptions.APPLICATION.INVALID_MODE(serverMode));
   }
   return selectedMode;
 }

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

@@ -155,7 +155,7 @@ var ValidationContext = class {
   assertIsObject(node, property) {
     if (node?.type !== "object" && node) {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, "object", node.type),
+        description: import_diagnostics.descriptions.CONFIG.INCORRECT_NODE_TYPE(property, "object", node.type),
         location: this.getLocationFromNode(node)
       });
     }
@@ -163,7 +163,7 @@ var ValidationContext = class {
   assertIsBoolean(node, property) {
     if (node && node.type !== "boolean") {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, "boolean", node.type),
+        description: import_diagnostics.descriptions.CONFIG.INCORRECT_NODE_TYPE(property, "boolean", node.type),
         location: this.getLocationFromNode(node)
       });
     }
@@ -171,7 +171,7 @@ var ValidationContext = class {
   assertIsArray(node, property) {
     if (node && node.type !== "array") {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, "array", node.type),
+        description: import_diagnostics.descriptions.CONFIG.INCORRECT_NODE_TYPE(property, "array", node.type),
         location: this.getLocationFromNode(node)
       });
     }
@@ -179,7 +179,7 @@ var ValidationContext = class {
   assertIsSpecifier(node, property) {
     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),
+        description: import_diagnostics.descriptions.CONFIG.INVALID_SPECIFIER(property, node.value),
         location: this.getLocationFromNode(node)
       });
     }
@@ -201,7 +201,7 @@ var ValidationContext = class {
           } catch (e) {
             misMatch = matcher[i];
             this.diagnostics.push({
-              description: import_diagnostics.descriptions.CONFIG_PARSER.INVALID_FILE_PATTERN(`${property}[${index}].match`, misMatch),
+              description: import_diagnostics.descriptions.CONFIG.INVALID_FILE_PATTERN(`${property}[${index}].match`, misMatch),
               location: this.getLocationFromNode(node)
             });
           }
@@ -217,7 +217,7 @@ var ValidationContext = class {
   assertIsPath(node, property) {
     if (node && (node.type !== "string" || node.value[0] !== "/")) {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.INVALID_PATH(property, node.value),
+        description: import_diagnostics.descriptions.CONFIG.INVALID_PATH(property, node.value),
         location: this.getLocationFromNode(node)
       });
     }
@@ -225,7 +225,7 @@ var ValidationContext = class {
   assertIsOrigin(node, property) {
     if (node && (node.type !== "string" || !/^https?:\/\//i.test(node.value))) {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.INVALID_ORIGIN(property, node.value),
+        description: import_diagnostics.descriptions.CONFIG.INVALID_ORIGIN(property, node.value),
         location: this.getLocationFromNode(node)
       });
     }
@@ -233,7 +233,7 @@ var ValidationContext = class {
   assertIsPort(node, property) {
     if (node && (node.type !== "number" || node.value < 0 || node.value > 65353)) {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.INVALID_PORT(property, node.value),
+        description: import_diagnostics.descriptions.CONFIG.INVALID_PORT(property, node.value),
         location: this.getLocationFromNode(node)
       });
     }
@@ -241,7 +241,7 @@ var ValidationContext = class {
   assertIsServerType(node, property) {
     if (node && node.value !== "express" && node.value !== "koa" && node.value !== "fs") {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.INVALID_SERVER_TYPE(property, node.value),
+        description: import_diagnostics.descriptions.CONFIG.INVALID_SERVER_TYPE(property, node.value),
         location: this.getLocationFromNode(node)
       });
     }
@@ -249,7 +249,7 @@ var ValidationContext = class {
   assertIsStaticSiteGenerator(node, property) {
     if (node && node.type !== "object") {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.INVALID_GENERATOR_CONFIG(property, node.value),
+        description: import_diagnostics.descriptions.CONFIG.INVALID_GENERATOR_CONFIG(property, node.value),
         location: this.getLocationFromNode(node)
       });
     }
@@ -257,7 +257,7 @@ var ValidationContext = class {
   assertIsMethod(node, property) {
     if (node && node.value !== "get" && node.value !== "post") {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.INVALID_METHOD(property, node.value),
+        description: import_diagnostics.descriptions.CONFIG.INVALID_METHOD(property, node.value),
         location: this.getLocationFromNode(node)
       });
     }
@@ -265,7 +265,7 @@ var ValidationContext = class {
   assertIsStatus(node, property) {
     if (node && node.value !== 404 && node.value !== 500) {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.INVALID_STATUS(property, node.value),
+        description: import_diagnostics.descriptions.CONFIG.INVALID_STATUS(property, node.value),
         location: this.getLocationFromNode(node)
       });
     }
@@ -290,7 +290,7 @@ var ValidationContext = class {
     }
     if (node.type !== "object" || supportedProperty && !defaultProperty) {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.INVALID_ENVIRONMENT(property),
+        description: import_diagnostics.descriptions.CONFIG.INVALID_ENVIRONMENT(property),
         location: this.getLocationFromNode(node)
       });
     }
@@ -301,14 +301,14 @@ var ValidationContext = class {
     }
     if (node.type !== "string") {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, "string", node.type),
+        description: import_diagnostics.descriptions.CONFIG.INCORRECT_NODE_TYPE(property, "string", node.type),
         location: this.getLocationFromNode(node)
       });
     } else if (node.value === "" || allowSlash && node.value === "/") {
       return;
     } else if (node.value.match(BASE_PATH_REGEX) === null) {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.INVALID_BASEPATH(property, node.value),
+        description: import_diagnostics.descriptions.CONFIG.INVALID_BASEPATH(property, node.value),
         location: this.getLocationFromNode(node)
       });
     }
@@ -319,12 +319,12 @@ var ValidationContext = class {
     }
     if (node.type !== "string") {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, "string", node.type),
+        description: import_diagnostics.descriptions.CONFIG.INCORRECT_NODE_TYPE(property, "string", node.type),
         location: this.getLocationFromNode(node)
       });
     } else if (!isNotEmptyString(node)) {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.NON_EMPTY_STRING(property, node.value),
+        description: import_diagnostics.descriptions.CONFIG.NON_EMPTY_STRING(property, node.value),
         location: this.getLocationFromNode(node)
       });
     }
@@ -335,12 +335,12 @@ var ValidationContext = class {
     }
     if (node.type !== "array") {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, "array", node.type),
+        description: import_diagnostics.descriptions.CONFIG.INCORRECT_NODE_TYPE(property, "array", node.type),
         location: this.getLocationFromNode(node)
       });
     } else if (!node.children || node.children.length === 0) {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.NON_EMPTY_ARRAY(property, "[]"),
+        description: import_diagnostics.descriptions.CONFIG.NON_EMPTY_ARRAY(property, "[]"),
         location: this.getLocationFromNode(node)
       });
     }
@@ -348,7 +348,7 @@ var ValidationContext = class {
   assertHasOneOrMore(node, property, childProps) {
     if (!childProps.some((p) => (0, import_jsonc_parser.findNodeAtLocation)(node, [p]) !== void 0)) {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.MISSING_ONE_OF(property, childProps),
+        description: import_diagnostics.descriptions.CONFIG.MISSING_ONE_OF(property, childProps),
         location: this.getLocationFromNode(node)
       });
     }
@@ -356,7 +356,7 @@ var ValidationContext = class {
   assertHasOnlyOne(node, property, childProps) {
     if (childProps.filter((p) => (0, import_jsonc_parser.findNodeAtLocation)(node, [p])).length !== 1) {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.TOO_MANY(property, childProps),
+        description: import_diagnostics.descriptions.CONFIG.TOO_MANY(property, childProps),
         location: this.getLocationFromNode(node)
       });
     }
@@ -367,14 +367,14 @@ var ValidationContext = class {
     }
     if (node.type !== "array") {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, "array", node.type),
+        description: import_diagnostics.descriptions.CONFIG.INCORRECT_NODE_TYPE(property, "array", node.type),
         location: this.getLocationFromNode(node)
       });
     } else if (node.children && node.children.length > 0) {
       node.children.forEach((n, index) => {
         if (!isNotEmptyString(n)) {
           this.diagnostics.push({
-            description: import_diagnostics.descriptions.CONFIG_PARSER.NON_EMPTY_STRING(`${property}[${index}]`, n.value),
+            description: import_diagnostics.descriptions.CONFIG.NON_EMPTY_STRING(`${property}[${index}]`, n.value),
             location: this.getLocationFromNode(n)
           });
         }
@@ -387,14 +387,14 @@ var ValidationContext = class {
     }
     if (node.type !== "array") {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, "array", node.type),
+        description: import_diagnostics.descriptions.CONFIG.INCORRECT_NODE_TYPE(property, "array", node.type),
         location: this.getLocationFromNode(node)
       });
     } else if (node.children && node.children.length > 0) {
       node.children.forEach((n, index) => {
         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),
+            description: import_diagnostics.descriptions.CONFIG.INVALID_SPECIFIER(`${property}[${index}]`, n.value),
             location: this.getLocationFromNode(n)
           });
         }
@@ -407,7 +407,7 @@ var ValidationContext = class {
     }
     if (node.type !== "array") {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, "array", node.type),
+        description: import_diagnostics.descriptions.CONFIG.INCORRECT_NODE_TYPE(property, "array", node.type),
         location: this.getLocationFromNode(node)
       });
     } else if (node.children && node.children.length > 0) {
@@ -420,7 +420,7 @@ var ValidationContext = class {
     }
     if (node.type !== "array") {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, "array", node.type),
+        description: import_diagnostics.descriptions.CONFIG.INCORRECT_NODE_TYPE(property, "array", node.type),
         location: this.getLocationFromNode(node)
       });
     } else if (node.children && node.children.length > 0) {
@@ -434,7 +434,7 @@ var ValidationContext = class {
         }
         if (!(0, import_shared_utils.isSpecifier)(specifier)) {
           this.diagnostics.push({
-            description: import_diagnostics.descriptions.CONFIG_PARSER.INVALID_SPECIFIER(`${property}[${index}]`, specifier),
+            description: import_diagnostics.descriptions.CONFIG.INVALID_SPECIFIER(`${property}[${index}]`, specifier),
             location: this.getLocationFromNode(n)
           });
         }
@@ -447,12 +447,12 @@ var ValidationContext = class {
     }
     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),
+        description: import_diagnostics.descriptions.CONFIG.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),
+        description: import_diagnostics.descriptions.CONFIG.NON_EMPTY_STRING(property, node.value),
         location: this.getLocationFromNode(node)
       });
     }
@@ -463,13 +463,13 @@ var ValidationContext = class {
     }
     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),
+        description: import_diagnostics.descriptions.CONFIG.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),
+        description: import_diagnostics.descriptions.CONFIG.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)
       });
     }
@@ -482,7 +482,7 @@ var ValidationContext = class {
     const dupeIds = ids.filter((id, index) => ids.indexOf(id) !== index);
     if (dupeIds.length > 0) {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.DUPLICATE_IDS(property, dupeIds),
+        description: import_diagnostics.descriptions.CONFIG.DUPLICATE_IDS(property, dupeIds),
         location: this.getLocationFromNode(nodes[0])
       });
     }
@@ -491,7 +491,7 @@ var ValidationContext = class {
     const missingProps = requiredPropertyKeys.filter((p) => (0, import_jsonc_parser.findNodeAtLocation)(node, [p]) === void 0);
     if (missingProps.length > 0) {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.MISSING_REQUIRED(property, missingProps),
+        description: import_diagnostics.descriptions.CONFIG.MISSING_REQUIRED(property, missingProps),
         location: this.getLocationFromNode(node)
       });
     }
@@ -500,7 +500,7 @@ var ValidationContext = class {
     const {children} = node;
     if (!children) {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.INVALID_EMPTY_NODE(property),
+        description: import_diagnostics.descriptions.CONFIG.INVALID_EMPTY_NODE(property),
         location: this.getLocationFromNode(node)
       });
       return;
@@ -511,7 +511,7 @@ var ValidationContext = class {
           const {type, value} = keyNode;
           if (type === "string" && !validPropertyKeys.includes(value)) {
             this.diagnostics.push({
-              description: import_diagnostics.descriptions.CONFIG_PARSER.INVALID_PROPERTY(property, value),
+              description: import_diagnostics.descriptions.CONFIG.INVALID_PROPERTY(property, value),
               location: this.getLocationFromNode(keyNode)
             });
           }
@@ -522,7 +522,7 @@ var ValidationContext = class {
   assertNoBundleConfigDupes(node, dupes) {
     if (dupes.length) {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.DUPLICATE_BUNDLE_CONFIG(dupes),
+        description: import_diagnostics.descriptions.CONFIG.DUPLICATE_BUNDLE_CONFIG(dupes),
         location: this.getLocationFromNode(node)
       });
     }
@@ -530,7 +530,7 @@ var ValidationContext = class {
   assertDefaultInLocales(node, defaultLocale, localesIds) {
     if (!localesIds.includes(defaultLocale)) {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.DEFAULT_NOT_IN_LOCALES(defaultLocale, localesIds),
+        description: import_diagnostics.descriptions.CONFIG.DEFAULT_NOT_IN_LOCALES(defaultLocale, localesIds),
         location: this.getLocationFromNode(node)
       });
     }
@@ -545,7 +545,7 @@ var ValidationContext = class {
       if (fallbackNode?.value) {
         if (!localesIds.includes(fallbackNode.value)) {
           this.diagnostics.push({
-            description: import_diagnostics.descriptions.CONFIG_PARSER.FALLBACK_NOT_IN_LOCALES(fallbackNode.value, localesIds),
+            description: import_diagnostics.descriptions.CONFIG.FALLBACK_NOT_IN_LOCALES(fallbackNode.value, localesIds),
             location: this.getLocationFromNode(fallbackNode)
           });
         }
@@ -557,7 +557,7 @@ var ValidationContext = class {
     const preloadData = (0, import_jsonc_parser.findNodeAtLocation)(node, ["preloadData"])?.value;
     if (ssr === true && preloadData === false) {
       this.diagnostics.push({
-        description: import_diagnostics.descriptions.CONFIG_PARSER.SSR_WITHOUT_PRELOAD(propPrefix),
+        description: import_diagnostics.descriptions.CONFIG.SSR_WITHOUT_PRELOAD(propPrefix),
         location: this.getLocationFromNode(node)
       });
     }

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

@@ -288,15 +288,12 @@ function validateLwrAppConfig(config, phase) {
       const {error, length, offset} = errors[0];
       const message = (0, import_jsonc_parser.printParseErrorCode)(error);
       const sourceLocation = (0, import_helpers.calculatePositionFromSource)(jsonSourceText, {length, offset});
-      throw (0, import_diagnostics2.createSingleDiagnosticError)({
-        location: sourceLocation,
-        description: import_diagnostics2.descriptions.CONFIG_PARSER.INVALID_JSON(message)
-      }, import_diagnostics2.LwrConfigValidationError);
+      throw new import_diagnostics2.LwrConfigError(import_diagnostics2.descriptions.CONFIG.INVALID_JSON(message));
     }
     const validationContext = new import_app_config_context.ValidationContext(jsonSourceText);
     validateRoot(rootNode, validationContext, preMerge);
     if (validationContext.diagnostics.length) {
-      throw new import_diagnostics2.LwrConfigValidationError(`Configuration validation errors in ${SOURCE_BY_PHASE[phase]}`, validationContext.diagnostics);
+      throw new import_diagnostics2.LwrConfigError(`Configuration validation errors in ${SOURCE_BY_PHASE[phase]}`, validationContext.diagnostics);
     }
     if (phase === "file" && jsonSourceText.includes("/lwr-info")) {
       import_diagnostics.logger.warn({label: `config`, message: `LWR Config file attempted to override "/lwr-info" path`});

package/build/es/global-config.d.ts

@@ -16,7 +16,7 @@ export interface Configurations {
  * By default, this file is expected to be named `lwr.config.json` and be located at the root directory.
  * This default expectation can be override with the `lwrConfigFile` configuration.
  *
- * @throws {LwrConfigValidationError} Validation errors will be swallowed when the
+ * @throws {LwrConfigError} Validation errors will be swallowed when the
  * `UNSAFE_IGNORE_CONFIG_VALIDATION` flag is set.
  *
  * @param {string} lwrConfigPath - config file path override

package/build/es/global-config.js

@@ -21,7 +21,7 @@ import { getTracer, ConfigSpan } from '@lwrjs/instrumentation';
  * By default, this file is expected to be named `lwr.config.json` and be located at the root directory.
  * This default expectation can be override with the `lwrConfigFile` configuration.
  *
- * @throws {LwrConfigValidationError} Validation errors will be swallowed when the
+ * @throws {LwrConfigError} Validation errors will be swallowed when the
  * `UNSAFE_IGNORE_CONFIG_VALIDATION` flag is set.
  *
  * @param {string} lwrConfigPath - config file path override
@@ -62,7 +62,7 @@ function createCacheFolder(cache, rootDir) {
  * Configurations are merged in the following order:
  *  defaults -> environment variables -> config file (lwr.config.json) -> config argument
  *
- * @throws {LwrConfigValidationError} Validation errors will not be caught without the
+ * @throws {LwrConfigError} Validation errors will not be caught without the
  * `UNSAFE_IGNORE_CONFIG_VALIDATION` flag.
  *
  * @param {LwrGlobalConfig} configArg - programmatic global config

package/build/es/runtime-config.d.ts

@@ -4,7 +4,7 @@ export declare const RUNTIME_CONFIGS: Record<string, ServerModeConfig>;
 /**
  * Get server mode config by name
  *
- * @throws {LwrServerError} Mode must be supported by LWR.
+ * @throws {LwrApplicationError} Mode must be supported by LWR.
  *
  * @param {string} serverMode - the name of the server mode
  * @returns {ServerModeConfig} the server mode config

package/build/es/runtime-config.js

@@ -1,4 +1,4 @@
-import { createSingleDiagnosticError, descriptions, LwrServerError } from '@lwrjs/diagnostics';
+import { descriptions, LwrApplicationError } from '@lwrjs/diagnostics';
 import { getFeatureFlags } from '@lwrjs/shared-utils';
 export const DEFAULT_I18N_CONFIG = {
     defaultLocale: 'en-US',
@@ -70,7 +70,7 @@ export const RUNTIME_CONFIGS = {
 /**
  * Get server mode config by name
  *
- * @throws {LwrServerError} Mode must be supported by LWR.
+ * @throws {LwrApplicationError} Mode must be supported by LWR.
  *
  * @param {string} serverMode - the name of the server mode
  * @returns {ServerModeConfig} the server mode config
@@ -78,7 +78,7 @@ export const RUNTIME_CONFIGS = {
 export function getServerModeConfig(serverMode) {
     const selectedMode = RUNTIME_CONFIGS[serverMode];
     if (!selectedMode) {
-        throw createSingleDiagnosticError({ description: descriptions.UNRESOLVABLE.INVALID_MODE(serverMode) }, LwrServerError);
+        throw new LwrApplicationError(descriptions.APPLICATION.INVALID_MODE(serverMode));
     }
     return selectedMode;
 }

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

@@ -118,7 +118,7 @@ export class ValidationContext {
     assertIsObject(node, property) {
         if (node?.type !== 'object' && node) {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, 'object', node.type),
+                description: descriptions.CONFIG.INCORRECT_NODE_TYPE(property, 'object', node.type),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -126,7 +126,7 @@ export class ValidationContext {
     assertIsBoolean(node, property) {
         if (node && node.type !== 'boolean') {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, 'boolean', node.type),
+                description: descriptions.CONFIG.INCORRECT_NODE_TYPE(property, 'boolean', node.type),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -134,7 +134,7 @@ export class ValidationContext {
     assertIsArray(node, property) {
         if (node && node.type !== 'array') {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, 'array', node.type),
+                description: descriptions.CONFIG.INCORRECT_NODE_TYPE(property, 'array', node.type),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -142,7 +142,7 @@ export class ValidationContext {
     assertIsSpecifier(node, property) {
         if (node && (node.type !== 'string' || !isSpecifier(node.value))) {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.INVALID_SPECIFIER(property, node.value),
+                description: descriptions.CONFIG.INVALID_SPECIFIER(property, node.value),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -167,7 +167,7 @@ export class ValidationContext {
                     catch (e) {
                         misMatch = matcher[i];
                         this.diagnostics.push({
-                            description: descriptions.CONFIG_PARSER.INVALID_FILE_PATTERN(`${property}[${index}].match`, misMatch),
+                            description: descriptions.CONFIG.INVALID_FILE_PATTERN(`${property}[${index}].match`, misMatch),
                             location: this.getLocationFromNode(node)
                         });
                     }
@@ -183,7 +183,7 @@ export class ValidationContext {
     assertIsPath(node, property) {
         if (node && (node.type !== 'string' || node.value[0] !== '/')) {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.INVALID_PATH(property, node.value),
+                description: descriptions.CONFIG.INVALID_PATH(property, node.value),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -191,7 +191,7 @@ export class ValidationContext {
     assertIsOrigin(node, property) {
         if (node && (node.type !== 'string' || !/^https?:\/\//i.test(node.value))) {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.INVALID_ORIGIN(property, node.value),
+                description: descriptions.CONFIG.INVALID_ORIGIN(property, node.value),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -199,7 +199,7 @@ export class ValidationContext {
     assertIsPort(node, property) {
         if (node && (node.type !== 'number' || node.value < 0 || node.value > 65353)) {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.INVALID_PORT(property, node.value),
+                description: descriptions.CONFIG.INVALID_PORT(property, node.value),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -207,7 +207,7 @@ export class ValidationContext {
     assertIsServerType(node, property) {
         if (node && node.value !== 'express' && node.value !== 'koa' && node.value !== 'fs') {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.INVALID_SERVER_TYPE(property, node.value),
+                description: descriptions.CONFIG.INVALID_SERVER_TYPE(property, node.value),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -215,7 +215,7 @@ export class ValidationContext {
     assertIsStaticSiteGenerator(node, property) {
         if (node && node.type !== 'object') {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.INVALID_GENERATOR_CONFIG(property, node.value),
+                description: descriptions.CONFIG.INVALID_GENERATOR_CONFIG(property, node.value),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -223,7 +223,7 @@ export class ValidationContext {
     assertIsMethod(node, property) {
         if (node && node.value !== 'get' && node.value !== 'post') {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.INVALID_METHOD(property, node.value),
+                description: descriptions.CONFIG.INVALID_METHOD(property, node.value),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -231,7 +231,7 @@ export class ValidationContext {
     assertIsStatus(node, property) {
         if (node && node.value !== 404 && node.value !== 500) {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.INVALID_STATUS(property, node.value),
+                description: descriptions.CONFIG.INVALID_STATUS(property, node.value),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -256,7 +256,7 @@ export class ValidationContext {
         }
         if (node.type !== 'object' || (supportedProperty && !defaultProperty)) {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.INVALID_ENVIRONMENT(property),
+                description: descriptions.CONFIG.INVALID_ENVIRONMENT(property),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -267,7 +267,7 @@ export class ValidationContext {
         }
         if (node.type !== 'string') {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, 'string', node.type),
+                description: descriptions.CONFIG.INCORRECT_NODE_TYPE(property, 'string', node.type),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -276,7 +276,7 @@ export class ValidationContext {
         }
         else if (node.value.match(BASE_PATH_REGEX) === null) {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.INVALID_BASEPATH(property, node.value),
+                description: descriptions.CONFIG.INVALID_BASEPATH(property, node.value),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -287,13 +287,13 @@ export class ValidationContext {
         }
         if (node.type !== 'string') {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, 'string', node.type),
+                description: descriptions.CONFIG.INCORRECT_NODE_TYPE(property, 'string', node.type),
                 location: this.getLocationFromNode(node),
             });
         }
         else if (!isNotEmptyString(node)) {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.NON_EMPTY_STRING(property, node.value),
+                description: descriptions.CONFIG.NON_EMPTY_STRING(property, node.value),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -304,13 +304,13 @@ export class ValidationContext {
         }
         if (node.type !== 'array') {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, 'array', node.type),
+                description: descriptions.CONFIG.INCORRECT_NODE_TYPE(property, 'array', node.type),
                 location: this.getLocationFromNode(node),
             });
         }
         else if (!node.children || node.children.length === 0) {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.NON_EMPTY_ARRAY(property, '[]'),
+                description: descriptions.CONFIG.NON_EMPTY_ARRAY(property, '[]'),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -319,7 +319,7 @@ export class ValidationContext {
         // At least one of the given child properties of node must exist
         if (!childProps.some((p) => findNodeAtLocation(node, [p]) !== undefined)) {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.MISSING_ONE_OF(property, childProps),
+                description: descriptions.CONFIG.MISSING_ONE_OF(property, childProps),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -328,7 +328,7 @@ export class ValidationContext {
         // One and ONLY one of the given child properties of node must exist
         if (childProps.filter((p) => findNodeAtLocation(node, [p])).length !== 1) {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.TOO_MANY(property, childProps),
+                description: descriptions.CONFIG.TOO_MANY(property, childProps),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -339,7 +339,7 @@ export class ValidationContext {
         }
         if (node.type !== 'array') {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, 'array', node.type),
+                description: descriptions.CONFIG.INCORRECT_NODE_TYPE(property, 'array', node.type),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -347,7 +347,7 @@ export class ValidationContext {
             node.children.forEach((n, index) => {
                 if (!isNotEmptyString(n)) {
                     this.diagnostics.push({
-                        description: descriptions.CONFIG_PARSER.NON_EMPTY_STRING(`${property}[${index}]`, n.value),
+                        description: descriptions.CONFIG.NON_EMPTY_STRING(`${property}[${index}]`, n.value),
                         location: this.getLocationFromNode(n),
                     });
                 }
@@ -360,7 +360,7 @@ export class ValidationContext {
         }
         if (node.type !== 'array') {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, 'array', node.type),
+                description: descriptions.CONFIG.INCORRECT_NODE_TYPE(property, 'array', node.type),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -368,7 +368,7 @@ export class ValidationContext {
             node.children.forEach((n, index) => {
                 if (n.type !== 'string' || !isSpecifier(n.value)) {
                     this.diagnostics.push({
-                        description: descriptions.CONFIG_PARSER.INVALID_SPECIFIER(`${property}[${index}]`, n.value),
+                        description: descriptions.CONFIG.INVALID_SPECIFIER(`${property}[${index}]`, n.value),
                         location: this.getLocationFromNode(n),
                     });
                 }
@@ -381,7 +381,7 @@ export class ValidationContext {
         }
         if (node.type !== 'array') {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, 'array', node.type),
+                description: descriptions.CONFIG.INCORRECT_NODE_TYPE(property, 'array', node.type),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -395,7 +395,7 @@ export class ValidationContext {
         }
         if (node.type !== 'array') {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, 'array', node.type),
+                description: descriptions.CONFIG.INCORRECT_NODE_TYPE(property, 'array', node.type),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -411,7 +411,7 @@ export class ValidationContext {
                 }
                 if (!isSpecifier(specifier)) {
                     this.diagnostics.push({
-                        description: descriptions.CONFIG_PARSER.INVALID_SPECIFIER(`${property}[${index}]`, specifier),
+                        description: descriptions.CONFIG.INVALID_SPECIFIER(`${property}[${index}]`, specifier),
                         location: this.getLocationFromNode(n),
                     });
                 }
@@ -424,13 +424,13 @@ export class ValidationContext {
         }
         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),
+                description: descriptions.CONFIG.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),
+                description: descriptions.CONFIG.NON_EMPTY_STRING(property, node.value),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -441,7 +441,7 @@ export class ValidationContext {
         }
         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),
+                description: descriptions.CONFIG.INCORRECT_NODE_TYPE(index !== undefined ? `${property}[${index}]` : property, 'string or array', node.type),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -450,7 +450,7 @@ export class ValidationContext {
                 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
+                description: descriptions.CONFIG.INVALID_SERVICE(index !== undefined ? `${property}[${index}]` : property, node.value === undefined && node.children
                     ? `invalid Array[${node.children.length}]`
                     : node.value),
                 location: this.getLocationFromNode(node),
@@ -467,7 +467,7 @@ export class ValidationContext {
         const dupeIds = ids.filter((id, index) => ids.indexOf(id) !== index);
         if (dupeIds.length > 0) {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.DUPLICATE_IDS(property, dupeIds),
+                description: descriptions.CONFIG.DUPLICATE_IDS(property, dupeIds),
                 location: this.getLocationFromNode(nodes[0]),
             });
         }
@@ -477,7 +477,7 @@ export class ValidationContext {
         const missingProps = requiredPropertyKeys.filter((p) => findNodeAtLocation(node, [p]) === undefined);
         if (missingProps.length > 0) {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.MISSING_REQUIRED(property, missingProps),
+                description: descriptions.CONFIG.MISSING_REQUIRED(property, missingProps),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -486,7 +486,7 @@ export class ValidationContext {
         const { children } = node;
         if (!children) {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.INVALID_EMPTY_NODE(property),
+                description: descriptions.CONFIG.INVALID_EMPTY_NODE(property),
                 location: this.getLocationFromNode(node),
             });
             return;
@@ -498,7 +498,7 @@ export class ValidationContext {
                     const { type, value } = keyNode;
                     if (type === 'string' && !validPropertyKeys.includes(value)) {
                         this.diagnostics.push({
-                            description: descriptions.CONFIG_PARSER.INVALID_PROPERTY(property, value),
+                            description: descriptions.CONFIG.INVALID_PROPERTY(property, value),
                             location: this.getLocationFromNode(keyNode),
                         });
                     }
@@ -509,7 +509,7 @@ export class ValidationContext {
     assertNoBundleConfigDupes(node, dupes) {
         if (dupes.length) {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.DUPLICATE_BUNDLE_CONFIG(dupes),
+                description: descriptions.CONFIG.DUPLICATE_BUNDLE_CONFIG(dupes),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -517,7 +517,7 @@ export class ValidationContext {
     assertDefaultInLocales(node, defaultLocale, localesIds) {
         if (!localesIds.includes(defaultLocale)) {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.DEFAULT_NOT_IN_LOCALES(defaultLocale, localesIds),
+                description: descriptions.CONFIG.DEFAULT_NOT_IN_LOCALES(defaultLocale, localesIds),
                 location: this.getLocationFromNode(node),
             });
         }
@@ -534,7 +534,7 @@ export class ValidationContext {
             if (fallbackNode?.value) {
                 if (!localesIds.includes(fallbackNode.value)) {
                     this.diagnostics.push({
-                        description: descriptions.CONFIG_PARSER.FALLBACK_NOT_IN_LOCALES(fallbackNode.value, localesIds),
+                        description: descriptions.CONFIG.FALLBACK_NOT_IN_LOCALES(fallbackNode.value, localesIds),
                         location: this.getLocationFromNode(fallbackNode),
                     });
                 }
@@ -546,7 +546,7 @@ export class ValidationContext {
         const preloadData = findNodeAtLocation(node, ['preloadData'])?.value;
         if (ssr === true && preloadData === false) {
             this.diagnostics.push({
-                description: descriptions.CONFIG_PARSER.SSR_WITHOUT_PRELOAD(propPrefix),
+                description: descriptions.CONFIG.SSR_WITHOUT_PRELOAD(propPrefix),
                 location: this.getLocationFromNode(node),
             });
         }

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

@@ -1,6 +1,6 @@
 import { logger } from '@lwrjs/diagnostics';
 import { parseTree, printParseErrorCode, findNodeAtLocation as findNode, } from 'jsonc-parser';
-import { createSingleDiagnosticError, descriptions, LwrConfigValidationError } from '@lwrjs/diagnostics';
+import { descriptions, LwrConfigError } from '@lwrjs/diagnostics';
 import { ASSET_DIR_ATTRIBUTE_KEYS, ASSET_FILE_ATTRIBUTE_KEYS, BOOTSTRAP_ATTRIBUTE_KEYS, ERROR_ROUTE_ATTRIBUTE_KEYS, I18N_ATTRIBUTE_KEYS, LOCKER_ATTRIBUTE_KEYS, ROOT_ATTRIBUTE_KEYS, ROUTE_ATTRIBUTE_KEYS, STATIC_SITE_GENERATOR_ATTRIBUTE_KEYS, ValidationContext, } from './app-config-context.js';
 import { calculatePositionFromSource } from './helpers.js';
 import { DEFAULT_ESM_BUNDLE_EXCLUSIONS, DEFAULT_AMD_BUNDLE_EXCLUSIONS } from '../defaults.js';
@@ -358,17 +358,14 @@ export function validateLwrAppConfig(config, phase) {
             const { error, length, offset } = errors[0];
             const message = printParseErrorCode(error);
             const sourceLocation = calculatePositionFromSource(jsonSourceText, { length, offset });
-            throw createSingleDiagnosticError({
-                location: sourceLocation,
-                description: descriptions.CONFIG_PARSER.INVALID_JSON(message),
-            }, LwrConfigValidationError);
+            throw new LwrConfigError(descriptions.CONFIG.INVALID_JSON(message));
         }
         // Validate from root
         const validationContext = new ValidationContext(jsonSourceText);
         validateRoot(rootNode, validationContext, preMerge);
         // Throw an error with all diagnostics at once
         if (validationContext.diagnostics.length) {
-            throw new LwrConfigValidationError(`Configuration validation errors in ${SOURCE_BY_PHASE[phase]}`, validationContext.diagnostics);
+            throw new LwrConfigError(`Configuration validation errors in ${SOURCE_BY_PHASE[phase]}`, validationContext.diagnostics);
         }
         if (phase === 'file' && jsonSourceText.includes("/lwr-info")) {
             logger.warn({ label: `config`, message: `LWR Config file attempted to override "/lwr-info" path` });

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

@@ -1,8 +1,8 @@
-import type { SourceLocation } from '@lwrjs/diagnostics';
+import type { DiagnosticLocation } from '@lwrjs/diagnostics';
 interface SourcePosition {
     offset: number;
     length: number;
 }
-export declare function calculatePositionFromSource(source: string, partialPosition: SourcePosition): SourceLocation;
+export declare function calculatePositionFromSource(source: string, partialPosition: SourcePosition): DiagnosticLocation;
 export {};
 //# sourceMappingURL=helpers.d.ts.map

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.17.2-alpha.1",
+    "version": "0.17.2-alpha.2",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -42,14 +42,14 @@
         "test": "jest"
     },
     "dependencies": {
-        "@lwrjs/diagnostics": "0.17.2-alpha.1",
-        "@lwrjs/instrumentation": "0.17.2-alpha.1",
-        "@lwrjs/shared-utils": "0.17.2-alpha.1",
+        "@lwrjs/diagnostics": "0.17.2-alpha.2",
+        "@lwrjs/instrumentation": "0.17.2-alpha.2",
+        "@lwrjs/shared-utils": "0.17.2-alpha.2",
         "fs-extra": "^11.2.0",
         "jsonc-parser": "^3.3.1"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.17.2-alpha.1",
+        "@lwrjs/types": "0.17.2-alpha.2",
         "jest": "^26.6.3",
         "memfs": "^4.13.0",
         "ts-jest": "^26.5.6"
@@ -71,5 +71,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "bba15ca717a242b0375decaa378af06bdee813b5"
+    "gitHead": "739b237f5d7f2c1989142cb505a56cc763f21976"
 }