@ms-cloudpack/config 0.38.21 → 0.38.22

package/lib/readConfig/expandModulePaths.d.ts

@@ -1,7 +1,7 @@
 import type { AppConfig } from '@ms-cloudpack/common-types';
 /**
  * Expand template variables in module resolution paths.
- * Currently supports {configDir} to reference the configuration file's directory.
+ * Currently supports `{configDir}` to reference the configuration file's directory.
  */
 export declare function expandModulePaths(params: {
     appConfig: AppConfig;

package/lib/readConfig/expandModulePaths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expandModulePaths.d.ts","sourceRoot":"","sources":["../../src/readConfig/expandModulePaths.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAe5D;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE;IAAE,SAAS,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAsC5F"}
+{"version":3,"file":"expandModulePaths.d.ts","sourceRoot":"","sources":["../../src/readConfig/expandModulePaths.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAK5D;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE;IAAE,SAAS,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAiC5F"}

package/lib/readConfig/expandModulePaths.js

@@ -1,17 +1,8 @@
 import path from 'path';
 const configDirTemplate = '{configDir}';
-function countOccurrences(str, substring) {
-    let count = 0;
-    let index = 0;
-    while ((index = str.indexOf(substring, index)) !== -1) {
-        count++;
-        index += substring.length;
-    }
-    return count;
-}
 /**
  * Expand template variables in module resolution paths.
- * Currently supports {configDir} to reference the configuration file's directory.
+ * Currently supports `{configDir}` to reference the configuration file's directory.
  */
 export function expandModulePaths(params) {
     const { appConfig: { resolve }, configPath, } = params;
@@ -23,22 +14,17 @@ export function expandModulePaths(params) {
     }
     const configDir = path.dirname(configPath);
     // Process each module path and expand template variables
-    resolve.modules = resolve.modules.map((modulePath) => {
-        // Count occurrences of the template variable
-        const templateCount = countOccurrences(modulePath, configDirTemplate);
-        if (templateCount === 0) {
-            // Return unchanged paths without template variables
-            return modulePath;
-        }
-        if (templateCount > 1) {
-            throw new Error(`Multiple template variables not allowed in the same path: "${modulePath}"`);
+    resolve.modules = resolve.modules.map((origModulePath) => {
+        let modulePath = origModulePath;
+        if (modulePath.startsWith(configDirTemplate)) {
+            // Replace template at start of path with actual directory
+            modulePath = modulePath.replace(configDirTemplate, configDir);
         }
-        // Single template variable - must be at the beginning
-        if (!modulePath.startsWith(configDirTemplate)) {
-            throw new Error(`${configDirTemplate} template variable must be at the beginning of the path: "${modulePath}"`);
+        if (modulePath.includes(configDirTemplate)) {
+            // There were multiple occurrences, or it was not at the start
+            throw new Error(`${configDirTemplate} template variable is only allowed at the beginning of a \`resolve.modules\` path. Received: "${modulePath}"`);
         }
-        // Replace template at start of path with actual directory
-        return modulePath.replace(configDirTemplate, configDir);
+        return modulePath;
     });
 }
 //# sourceMappingURL=expandModulePaths.js.map

package/lib/readConfig/expandModulePaths.js.map

@@ -1 +1 @@
-{"version":3,"file":"expandModulePaths.js","sourceRoot":"","sources":["../../src/readConfig/expandModulePaths.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,iBAAiB,GAAG,aAAa,CAAC;AAExC,SAAS,gBAAgB,CAAC,GAAW,EAAE,SAAiB;IACtD,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QACtD,KAAK,EAAE,CAAC;QACR,KAAK,IAAI,SAAS,CAAC,MAAM,CAAC;IAC5B,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAAoD;IACpF,MAAM,EACJ,SAAS,EAAE,EAAE,OAAO,EAAE,EACtB,UAAU,GACX,GAAG,MAAM,CAAC;IAEX,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,8CAA8C,UAAU,GAAG,CAAC,CAAC;IAC/E,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC;QACtB,OAAO;IACT,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAE3C,yDAAyD;IACzD,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QACnD,6CAA6C;QAC7C,MAAM,aAAa,GAAG,gBAAgB,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;QAEtE,IAAI,aAAa,KAAK,CAAC,EAAE,CAAC;YACxB,oDAAoD;YACpD,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,8DAA8D,UAAU,GAAG,CAAC,CAAC;QAC/F,CAAC;QAED,sDAAsD;QACtD,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAC9C,MAAM,IAAI,KAAK,CAAC,GAAG,iBAAiB,6DAA6D,UAAU,GAAG,CAAC,CAAC;QAClH,CAAC;QAED,0DAA0D;QAC1D,OAAO,UAAU,CAAC,OAAO,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import type { AppConfig } from '@ms-cloudpack/common-types';\nimport path from 'path';\n\nconst configDirTemplate = '{configDir}';\n\nfunction countOccurrences(str: string, substring: string): number {\n  let count = 0;\n  let index = 0;\n  while ((index = str.indexOf(substring, index)) !== -1) {\n    count++;\n    index += substring.length;\n  }\n  return count;\n}\n\n/**\n * Expand template variables in module resolution paths.\n * Currently supports {configDir} to reference the configuration file's directory.\n */\nexport function expandModulePaths(params: { appConfig: AppConfig; configPath: string }): void {\n  const {\n    appConfig: { resolve },\n    configPath,\n  } = params;\n\n  if (!path.isAbsolute(configPath)) {\n    throw new Error(`configPath must be an absolute path, got: \"${configPath}\"`);\n  }\n\n  if (!resolve?.modules) {\n    return;\n  }\n\n  const configDir = path.dirname(configPath);\n\n  // Process each module path and expand template variables\n  resolve.modules = resolve.modules.map((modulePath) => {\n    // Count occurrences of the template variable\n    const templateCount = countOccurrences(modulePath, configDirTemplate);\n\n    if (templateCount === 0) {\n      // Return unchanged paths without template variables\n      return modulePath;\n    }\n\n    if (templateCount > 1) {\n      throw new Error(`Multiple template variables not allowed in the same path: \"${modulePath}\"`);\n    }\n\n    // Single template variable - must be at the beginning\n    if (!modulePath.startsWith(configDirTemplate)) {\n      throw new Error(`${configDirTemplate} template variable must be at the beginning of the path: \"${modulePath}\"`);\n    }\n\n    // Replace template at start of path with actual directory\n    return modulePath.replace(configDirTemplate, configDir);\n  });\n}\n"]}
+{"version":3,"file":"expandModulePaths.js","sourceRoot":"","sources":["../../src/readConfig/expandModulePaths.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,iBAAiB,GAAG,aAAa,CAAC;AAExC;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAAoD;IACpF,MAAM,EACJ,SAAS,EAAE,EAAE,OAAO,EAAE,EACtB,UAAU,GACX,GAAG,MAAM,CAAC;IAEX,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,8CAA8C,UAAU,GAAG,CAAC,CAAC;IAC/E,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC;QACtB,OAAO;IACT,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAE3C,yDAAyD;IACzD,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE;QACvD,IAAI,UAAU,GAAG,cAAc,CAAC;QAChC,IAAI,UAAU,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAC7C,0DAA0D;YAC1D,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;QAChE,CAAC;QAED,IAAI,UAAU,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAC3C,8DAA8D;YAC9D,MAAM,IAAI,KAAK,CACb,GAAG,iBAAiB,iGAAiG,UAAU,GAAG,CACnI,CAAC;QACJ,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import type { AppConfig } from '@ms-cloudpack/common-types';\nimport path from 'path';\n\nconst configDirTemplate = '{configDir}';\n\n/**\n * Expand template variables in module resolution paths.\n * Currently supports `{configDir}` to reference the configuration file's directory.\n */\nexport function expandModulePaths(params: { appConfig: AppConfig; configPath: string }): void {\n  const {\n    appConfig: { resolve },\n    configPath,\n  } = params;\n\n  if (!path.isAbsolute(configPath)) {\n    throw new Error(`configPath must be an absolute path, got: \"${configPath}\"`);\n  }\n\n  if (!resolve?.modules) {\n    return;\n  }\n\n  const configDir = path.dirname(configPath);\n\n  // Process each module path and expand template variables\n  resolve.modules = resolve.modules.map((origModulePath) => {\n    let modulePath = origModulePath;\n    if (modulePath.startsWith(configDirTemplate)) {\n      // Replace template at start of path with actual directory\n      modulePath = modulePath.replace(configDirTemplate, configDir);\n    }\n\n    if (modulePath.includes(configDirTemplate)) {\n      // There were multiple occurrences, or it was not at the start\n      throw new Error(\n        `${configDirTemplate} template variable is only allowed at the beginning of a \\`resolve.modules\\` path. Received: \"${modulePath}\"`,\n      );\n    }\n\n    return modulePath;\n  });\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/config",
-  "version": "0.38.21",
+  "version": "0.38.22",
   "description": "Configuration handling for Cloudpack",
   "license": "MIT",
   "type": "module",