@lwrjs/config 0.9.0-alpha.8 → 0.9.0-alpha.9

package/build/cjs/env-config.cjs

@@ -36,13 +36,16 @@ var import_services = __toModule(require("./utils/services.cjs"));
 var import_routes = __toModule(require("./utils/routes.cjs"));
 var import_merge = __toModule(require("./utils/merge.cjs"));
 var import_lwc = __toModule(require("./utils/lwc.cjs"));
+var import_jsonc_parser = __toModule(require("jsonc-parser"));
 function getLwrConfigFromFile(rootDir, lwrConfigPath = import_defaults.DEFAULT_LWR_CONFIG_JSON) {
   const resolvedLwrConfigPath = import_path.default.resolve((0, import_shared_utils.normalizeDirectory)(lwrConfigPath, rootDir));
   if (!import_fs.default.existsSync(resolvedLwrConfigPath)) {
     import_shared_utils.logger.warn(`LWR Config not found on "${resolvedLwrConfigPath}"`);
     return void 0;
   }
-  return (0, import_app_config.validateLwrAppConfig)((0, import_shared_utils.readFile)(resolvedLwrConfigPath), "file");
+  const configSource = (0, import_shared_utils.readFile)(resolvedLwrConfigPath);
+  (0, import_app_config.validateLwrAppConfig)(configSource, "file");
+  return (0, import_jsonc_parser.parse)(configSource);
 }
 function createCacheFolder(cache, rootDir) {
   const cacheDir = (0, import_shared_utils.normalizeDirectory)(cache, rootDir);
@@ -53,7 +56,7 @@ function createCacheFolder(cache, rootDir) {
 function loadConfig(configArg) {
   if (configArg) {
     configArg = (0, import_merge.trimLwrConfig)(configArg);
-    (0, import_app_config.validateLwrAppConfig)(JSON.stringify(configArg), "pre");
+    (0, import_app_config.validateLwrAppConfig)(configArg, "pre");
   }
   const rootDir = import_path.default.resolve(configArg?.rootDir || import_defaults.DEFAULT_ROOT_DIR);
   const configFile = !configArg?.ignoreLwrConfigFile ? getLwrConfigFromFile(rootDir, configArg?.lwrConfigFile) : void 0;

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

@@ -170,8 +170,9 @@ function validateRoot(node, validationContext, preMerge) {
   validationContext.assertIsEnvironment((0, import_jsonc_parser.findNodeAtLocation)(node, ["environment"]), "environment");
   validationContext.assertIsBasePath((0, import_jsonc_parser.findNodeAtLocation)(node, ["basePath"]), "basePath");
 }
-function validateLwrAppConfig(jsonSourceText, phase) {
+function validateLwrAppConfig(config, phase) {
   try {
+    const jsonSourceText = typeof config === "string" ? config : JSON.stringify(config);
     const errors = [];
     const preMerge = phase !== "post";
     const rootNode = (0, import_jsonc_parser.parseTree)(jsonSourceText, errors);
@@ -189,12 +190,12 @@ function validateLwrAppConfig(jsonSourceText, phase) {
     if (validationContext.diagnostics.length) {
       throw new import_diagnostics.LwrConfigValidationError(`Configuration validation errors in ${SOURCE_BY_PHASE[phase]}`, validationContext.diagnostics);
     }
-    return (0, import_jsonc_parser.parse)(jsonSourceText);
+    return;
   } catch (err) {
     if (process.env.UNSAFE_IGNORE_CONFIG_VALIDATION === "true") {
       console.warn("ignoring config validation errors due to UNSAFE_IGNORE_CONFIG_VALIDATION flag...proceed with caution");
       console.dir(err, {depth: null});
-      return (0, import_jsonc_parser.parse)(jsonSourceText);
+      return;
     } else {
       throw err;
     }

package/build/es/env-config.js

@@ -8,6 +8,7 @@ import { normalizeServicePaths, normalizeServices } from './utils/services.js';
 import { normalizeRoutePaths, normalizeRoutes } from './utils/routes.js';
 import { mergeBundleConfig, mergeLockerConfig, mergeLwcConfig, mergeStaticGenerationConfig, trimLwrConfig, } from './utils/merge.js';
 import { normalizeLwcConfig, normalizeModulePaths } from './utils/lwc.js';
+import { parse } from 'jsonc-parser';
 /**
  * Load and validate the global config file.
  *
@@ -28,7 +29,9 @@ function getLwrConfigFromFile(rootDir, lwrConfigPath = DEFAULT_LWR_CONFIG_JSON)
         logger.warn(`LWR Config not found on "${resolvedLwrConfigPath}"`);
         return undefined;
     }
-    return validateLwrAppConfig(readFile(resolvedLwrConfigPath), 'file');
+    const configSource = readFile(resolvedLwrConfigPath);
+    validateLwrAppConfig(configSource, 'file');
+    return parse(configSource);
 }
 /**
  * Normalize the cache directory path and create the directory
@@ -62,7 +65,7 @@ function loadConfig(configArg) {
         // the programmatic config is trimmed to prevent overriding properties with an undefined value
         configArg = trimLwrConfig(configArg);
         // validation errors will not be caught unless `UNSAFE_IGNORE_CONFIG_VALIDATION` is set
-        validateLwrAppConfig(JSON.stringify(configArg), 'pre');
+        validateLwrAppConfig(configArg, 'pre');
     }
     // resolve the current root dir
     const rootDir = path.resolve(configArg?.rootDir || DEFAULT_ROOT_DIR);

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

@@ -1,10 +1,10 @@
-import { LwrGlobalConfig } from '@lwrjs/types';
+import type { LwrGlobalConfig } from '@lwrjs/types';
 export declare const SOURCE_BY_PHASE: {
     file: string;
     pre: string;
     post: string;
 };
 declare type ConfigPhase = 'file' | 'pre' | 'post';
-export declare function validateLwrAppConfig(jsonSourceText: string, phase: ConfigPhase): LwrGlobalConfig;
+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

@@ -1,4 +1,4 @@
-import { parse, parseTree, printParseErrorCode, findNodeAtLocation as findNode, } from 'jsonc-parser';
+import { parseTree, printParseErrorCode, findNodeAtLocation as findNode, } from 'jsonc-parser';
 import { createSingleDiagnosticError, descriptions, LwrConfigValidationError } from '@lwrjs/diagnostics';
 import { ASSET_DIR_ATTRIBUTE_KEYS, ASSET_FILE_ATTRIBUTE_KEYS, BOOTSTRAP_ATTRIBUTE_KEYS, ERROR_ROUTE_ATTRIBUTE_KEYS, LOCKER_ATTRIBUTE_KEYS, ROOT_ATTRIBUTE_KEYS, ROUTE_ATTRIBUTE_KEYS, ValidationContext, } from './app-config-context.js';
 import { calculatePositionFromSource } from './helpers.js';
@@ -219,8 +219,9 @@ function validateRoot(node, validationContext, preMerge) {
     validationContext.assertIsEnvironment(findNode(node, ['environment']), 'environment');
     validationContext.assertIsBasePath(findNode(node, ['basePath']), 'basePath');
 }
-export function validateLwrAppConfig(jsonSourceText, phase) {
+export function validateLwrAppConfig(config, phase) {
     try {
+        const jsonSourceText = typeof config === 'string' ? config : JSON.stringify(config);
         const errors = [];
         const preMerge = phase !== 'post'; // meaning the config has not yet been merged and normalized
         const rootNode = parseTree(jsonSourceText, errors);
@@ -241,13 +242,13 @@ export function validateLwrAppConfig(jsonSourceText, phase) {
         if (validationContext.diagnostics.length) {
             throw new LwrConfigValidationError(`Configuration validation errors in ${SOURCE_BY_PHASE[phase]}`, validationContext.diagnostics);
         }
-        return parse(jsonSourceText);
+        return;
     }
     catch (err) {
         if (process.env.UNSAFE_IGNORE_CONFIG_VALIDATION === 'true') {
             console.warn('ignoring config validation errors due to UNSAFE_IGNORE_CONFIG_VALIDATION flag...proceed with caution');
             console.dir(err, { depth: null });
-            return parse(jsonSourceText);
+            return;
         }
         else {
             throw err;

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.9.0-alpha.8",
+    "version": "0.9.0-alpha.9",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -32,16 +32,16 @@
         "package.cjs"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.9.0-alpha.8",
-        "@lwrjs/shared-utils": "0.9.0-alpha.8",
+        "@lwrjs/diagnostics": "0.9.0-alpha.9",
+        "@lwrjs/shared-utils": "0.9.0-alpha.9",
         "fs-extra": "^10.1.0",
         "jsonc-parser": "^3.0.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.9.0-alpha.8"
+        "@lwrjs/types": "0.9.0-alpha.9"
     },
     "engines": {
         "node": ">=14.15.4 <19"
     },
-    "gitHead": "013fcee240ff2e1c23ef304e70fc39d6ef13fb8b"
+    "gitHead": "93522592d25375bb20da156f864d153ffcd3ec88"
 }