@ms-cloudpack/config 0.38.6 → 0.38.7

package/lib/readConfig/expandModulePaths.d.ts

@@ -0,0 +1,10 @@
+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.
+ */
+export declare function expandModulePaths(params: {
+    appConfig: AppConfig;
+    configPath: string;
+}): void;
+//# sourceMappingURL=expandModulePaths.d.ts.map

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

@@ -0,0 +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"}

package/lib/readConfig/expandModulePaths.js

@@ -0,0 +1,44 @@
+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.
+ */
+export function expandModulePaths(params) {
+    const { appConfig: { resolve }, configPath, } = params;
+    if (!path.isAbsolute(configPath)) {
+        throw new Error(`configPath must be an absolute path, got: "${configPath}"`);
+    }
+    if (!resolve?.modules) {
+        return;
+    }
+    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}"`);
+        }
+        // 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}"`);
+        }
+        // Replace template at start of path with actual directory
+        return modulePath.replace(configDirTemplate, configDir);
+    });
+}
+//# sourceMappingURL=expandModulePaths.js.map

package/lib/readConfig/expandModulePaths.js.map

@@ -0,0 +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"]}

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

@@ -1 +1 @@
-{"version":3,"file":"readAppConfig.d.ts","sourceRoot":"","sources":["../../src/readConfig/readAppConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAe,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAElH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AAatE,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,aAAa,CAAC,EAAE,QAAQ,CAAC;IAEzB;;OAEG;IACH,oBAAoB,CAAC,EAAE,eAAe,EAAE,CAAC;IAEzC;;OAEG;IACH,gBAAgB,CAAC,EAAE,WAAW,CAAC;IAE/B;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC;;OAEG;IACH,iBAAiB,CAAC,EAAE,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,aAAa,CAAC,CAAC;IAE/D;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,SAAS,CAAC;IAErB;;OAEG;IACH,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA4ChH"}
+{"version":3,"file":"readAppConfig.d.ts","sourceRoot":"","sources":["../../src/readConfig/readAppConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAe,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAElH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AActE,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,aAAa,CAAC,EAAE,QAAQ,CAAC;IAEzB;;OAEG;IACH,oBAAoB,CAAC,EAAE,eAAe,EAAE,CAAC;IAEzC;;OAEG;IACH,gBAAgB,CAAC,EAAE,WAAW,CAAC;IAE/B;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC;;OAEG;IACH,iBAAiB,CAAC,EAAE,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,aAAa,CAAC,CAAC;IAE/D;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,SAAS,CAAC;IAErB;;OAEG;IACH,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA4ChH"}

package/lib/readConfig/readAppConfig.js

@@ -10,6 +10,7 @@ import { expandEnvironmentVariables } from './expandEnvironmentVariables.js';
 import { mergeParentConfig } from './mergeParentConfig.js';
 import { resolveParentConfig } from './resolveParentConfig.js';
 import { augmentAppConfig } from './augmentAppConfig.js';
+import { expandModulePaths } from './expandModulePaths.js';
 /**
  * Reads the user config file and merges with any parent configs asynchronously.
  * Note this is only useful for making modifications to the user config.
@@ -123,6 +124,7 @@ async function processConfig(configPath, appConfig) {
     }
     checkFeatures(appConfig.features, configPath);
     resolveBundlerCapabilities({ appConfig, configPath });
+    expandModulePaths({ appConfig, configPath });
     processDeprecatedValues(appConfig);
     const configPaths = [];
     // Read and merge with any parent configs (the same processing is applied to parent configs)

package/lib/readConfig/readAppConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"readAppConfig.js","sourceRoot":"","sources":["../../src/readConfig/readAppConfig.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AppConfig, FeatureName, Features, PackageSettings, ServerConfig } from '@ms-cloudpack/common-types';\nimport { allFeatures } from '@ms-cloudpack/common-types';\nimport type { DefineFlags } from '@ms-cloudpack/common-types-browser';\nimport { readJson } from '@ms-cloudpack/json-utilities';\nimport { resolveModule } from '@ms-cloudpack/path-utilities';\nimport fs from 'fs';\nimport path from 'path';\nimport { pathToFileURL } from 'url';\nimport { getConfigPath } from '../getConfigPath.js';\nimport { validateMatch } from '../packageSettings/validateMatch.js';\nimport { expandEnvironmentVariables } from './expandEnvironmentVariables.js';\nimport { mergeParentConfig } from './mergeParentConfig.js';\nimport { resolveParentConfig } from './resolveParentConfig.js';\nimport { augmentAppConfig } from './augmentAppConfig.js';\n\nexport interface ReadAppConfigOptions {\n  /**\n   * Extra feature settings. There will be a warning if any of these are invalid.\n   */\n  extraFeatures?: Features;\n\n  /**\n   * Extra package settings to add at the end of user-provided settings (so they take precedence).\n   */\n  extraPackageSettings?: PackageSettings[];\n\n  /**\n   * Extra define flags to add at the end of user-provided settings (so they take precedence).\n   */\n  extraDefineFlags?: DefineFlags;\n\n  /**\n   * Enable default features that are not explicitly set in the config.\n   */\n  enableDefaultFeatures?: boolean;\n\n  /**\n   * Overrides for the server config. Undefined keys will be ignored.\n   */\n  extraServerConfig?: Pick<ServerConfig, 'open' | 'showOverlay'>;\n\n  /**\n   * Custom config file name to use instead of cloudpack.config.json\n   */\n  configFileName?: string;\n}\n\n/**\n * Application configuration combined with the file paths that were used to load it.\n */\nexport interface AppConfigWithPaths {\n  appConfig: AppConfig;\n\n  /**\n   * The paths to the config files that were read, in order of precedence.\n   */\n  appConfigPaths: string[];\n}\n\n/**\n * Reads the user config file and merges with any parent configs asynchronously.\n * Note this is only useful for making modifications to the user config.\n * For a full merged representation of config, use `readConfig` instead.\n *\n * Throws an error if the config file exists but is not valid JSON, there's some error reading it,\n * or any settings are invalid. (As of writing, this doesn't do full schema validation; it only\n * checks certain specific settings.)\n */\nexport async function readAppConfig(appPath: string, options?: ReadAppConfigOptions): Promise<AppConfigWithPaths> {\n  const { appConfigPaths } = getConfigPath(appPath, options?.configFileName);\n\n  let config: AppConfigWithPaths;\n\n  // Check for JS and JSON config files.\n  const existingPaths = appConfigPaths.filter((p) => fs.existsSync(p));\n  if (existingPaths.length > 1) {\n    const message = 'Multiple Cloudpack config files found. Determine the correct one and delete the others:';\n    throw new Error([message, ...existingPaths].join('\\n  '));\n  }\n\n  const appConfigPath = existingPaths[0];\n  if (!appConfigPath) {\n    // If a custom config was specified, it must exist\n    if (options?.configFileName) {\n      throw new Error(`Config file not found: ${options.configFileName}`);\n    }\n    // This is fine, use an empty config\n    config = { appConfig: {}, appConfigPaths: [] };\n  } else if (path.extname(appConfigPath) === '.json') {\n    // Check for an existing JSON app config first\n    config = await readJsonAppConfig(appConfigPath);\n  } else {\n    // Otherwise, read as a JS file\n    config = await readJsAppConfig(appConfigPath);\n  }\n\n  expandEnvironmentVariables(config.appConfig as Record<string, unknown>);\n\n  // Merge extra settings (usually from CLI options) into the final config.\n  if (options) {\n    config.appConfig = augmentAppConfig(config.appConfig, options);\n  }\n\n  if (appConfigPath) {\n    if (config.appConfigPaths) {\n      config.appConfigPaths?.unshift(appConfigPath); // Add the config path to the beginning of the list\n    } else {\n      config.appConfigPaths = [appConfigPath]; // If no paths were set, just use the current one\n    }\n  }\n\n  return config;\n}\n\n/**\n * Resolve import specifiers for bundler capabilities registry.\n * Throws if a specifier can't be resolved.\n */\nfunction resolveBundlerCapabilities(params: { appConfig: AppConfig; configPath: string }): void {\n  const {\n    appConfig: { bundlerCapabilitiesRegistry },\n    configPath,\n  } = params;\n  if (!bundlerCapabilitiesRegistry) {\n    return;\n  }\n\n  for (const [name, importSpecifier] of Object.entries(bundlerCapabilitiesRegistry)) {\n    try {\n      const moduleUrl = resolveModule({ parentPath: configPath, importSpecifier });\n      bundlerCapabilitiesRegistry[name] = moduleUrl.toString();\n    } catch (e) {\n      throw new Error(`Error resolving bundler capability  \"${importSpecifier}\":\\n${(e as Error).message || e}`);\n    }\n  }\n}\n\n/**\n * Reads the JSON app config file and calls `processConfig` on it.\n * Throws an error if the config file exists but is not valid JSON, or there's some error reading it.\n * @param configPath - The path to the config file.\n * @returns The parsed AppConfig object.\n */\nasync function readJsonAppConfig(configPath: string): Promise<AppConfigWithPaths> {\n  const appConfig = await readJson<AppConfig>(configPath, { mode: 'permissive', throwOnError: true });\n  if (!appConfig) {\n    // shouldn't happen, but just in case/to satisfy the types...\n    throw new Error(`Cloudpack config not found at ${configPath}`);\n  }\n  return processConfig(configPath, appConfig);\n}\n\n/**\n * Reads the JavaScript app config file and calls `processConfig` on it.\n * Throws an error if the config file exists but is not valid, or there's some error reading it.\n * @param configPath - The path to the config file.\n * @returns The parsed AppConfig object.\n */\nasync function readJsAppConfig(configPath: string): Promise<AppConfigWithPaths> {\n  // Convert configPath to a URL for import.\n  try {\n    const appConfig = (await (import(pathToFileURL(configPath).toString()) as Promise<{ default?: AppConfig }>))\n      .default;\n    if (!appConfig) {\n      throw new Error(`Missing default export from Cloudpack config at ${configPath}`);\n    }\n    return processConfig(configPath, appConfig);\n  } catch (e) {\n    throw new Error(`Error reading config file ${configPath}:\\n${(e as Error).message || e}`);\n  }\n}\n\n/**\n * Processes the app config file and merges it with any parent configs.\n * This includes validating the config, checking for deprecated values, and resolving bundler capabilities.\n */\nasync function processConfig(configPath: string, appConfig: AppConfig): Promise<AppConfigWithPaths> {\n  if (!validateConfig(appConfig)) {\n    throw new Error(`Config file ${configPath} has invalid settings (see above for details)`);\n  }\n\n  checkFeatures(appConfig.features, configPath);\n\n  resolveBundlerCapabilities({ appConfig, configPath });\n\n  processDeprecatedValues(appConfig);\n\n  const configPaths: string[] = [];\n\n  // Read and merge with any parent configs (the same processing is applied to parent configs)\n  const { extends: _extends = [] } = appConfig;\n  const extendsArray = Array.isArray(_extends) ? _extends : [_extends];\n  const parentResults = await Promise.all(\n    extendsArray.map(async (importSpecifier) => {\n      const parentConfigPath = resolveParentConfig({ configPath, importSpecifier });\n\n      const result =\n        path.extname(parentConfigPath).toLowerCase() === '.json'\n          ? await readJsonAppConfig(parentConfigPath)\n          : await readJsAppConfig(parentConfigPath);\n\n      // Collect paths from parent configs\n      configPaths.push(...result.appConfigPaths);\n      return result.appConfig;\n    }),\n  );\n\n  const mergedConfig = mergeParentConfig({ appConfig, parentConfigs: parentResults });\n  return { appConfig: mergedConfig, appConfigPaths: configPaths };\n}\n\n/**\n * Validate parts of the current config file (before merging with parents) and log any errors.\n * Logging here and then letting the caller throw if needed allows us to show more errors at once.\n * @returns true if valid, false if not\n */\nfunction validateConfig(appConfig: AppConfig): boolean {\n  let isValid = true;\n\n  // Verify that there are no matches with a negated name and a version\n  for (const setting of appConfig.packageSettings || []) {\n    const { match } = setting;\n    const matches = Array.isArray(match) ? match : [match];\n    for (const m of matches) {\n      const result = validateMatch(m);\n      if (!result.isValid) {\n        isValid = false;\n        console.error(`Invalid packageSettings match: ${result.error}`);\n      }\n    }\n  }\n\n  return isValid;\n}\n\n/**\n * Warn if any feature names are invalid, and remove them.\n */\nfunction checkFeatures(features: Record<string, boolean> | undefined, configPath: string): void {\n  if (!features) {\n    return;\n  }\n\n  const invalidFeatures: string[] = [];\n  for (const featureName of Object.keys(features)) {\n    if (!allFeatures[featureName as FeatureName]) {\n      invalidFeatures.push(featureName);\n      delete features[featureName];\n    }\n  }\n\n  if (invalidFeatures.length) {\n    console.warn(\n      `Unknown feature(s) found in ${configPath} (most likely they were graduated or removed in Cloudpack):\\n  ` +\n        invalidFeatures.join(', '),\n    );\n  }\n}\n\n/**\n * Delete deprecated values and convert them to the new format. (This mutates the `config` object.)\n */\nfunction processDeprecatedValues(config: AppConfig): void {\n  /* eslint-disable etc/no-deprecated */\n  const { devServer, server, packageSettings = [] } = config;\n\n  if (devServer) {\n    if (server) {\n      throw new Error('Cannot have both \"devServer\" and \"server\" in the config file. Use \"server\" only.');\n    }\n\n    config.server = devServer;\n    delete config.devServer;\n  }\n\n  if (server?.routes) {\n    config.routes = server.routes;\n    delete server.routes;\n  }\n\n  for (const setting of packageSettings) {\n    if (setting.bundlerType) {\n      setting.bundler = setting.bundlerType;\n      delete setting.bundlerType;\n    }\n  }\n  /* eslint-enable etc/no-deprecated */\n}\n"]}
+{"version":3,"file":"readAppConfig.js","sourceRoot":"","sources":["../../src/readConfig/readAppConfig.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AppConfig, FeatureName, Features, PackageSettings, ServerConfig } from '@ms-cloudpack/common-types';\nimport { allFeatures } from '@ms-cloudpack/common-types';\nimport type { DefineFlags } from '@ms-cloudpack/common-types-browser';\nimport { readJson } from '@ms-cloudpack/json-utilities';\nimport { resolveModule } from '@ms-cloudpack/path-utilities';\nimport fs from 'fs';\nimport path from 'path';\nimport { pathToFileURL } from 'url';\nimport { getConfigPath } from '../getConfigPath.js';\nimport { validateMatch } from '../packageSettings/validateMatch.js';\nimport { expandEnvironmentVariables } from './expandEnvironmentVariables.js';\nimport { mergeParentConfig } from './mergeParentConfig.js';\nimport { resolveParentConfig } from './resolveParentConfig.js';\nimport { augmentAppConfig } from './augmentAppConfig.js';\nimport { expandModulePaths } from './expandModulePaths.js';\n\nexport interface ReadAppConfigOptions {\n  /**\n   * Extra feature settings. There will be a warning if any of these are invalid.\n   */\n  extraFeatures?: Features;\n\n  /**\n   * Extra package settings to add at the end of user-provided settings (so they take precedence).\n   */\n  extraPackageSettings?: PackageSettings[];\n\n  /**\n   * Extra define flags to add at the end of user-provided settings (so they take precedence).\n   */\n  extraDefineFlags?: DefineFlags;\n\n  /**\n   * Enable default features that are not explicitly set in the config.\n   */\n  enableDefaultFeatures?: boolean;\n\n  /**\n   * Overrides for the server config. Undefined keys will be ignored.\n   */\n  extraServerConfig?: Pick<ServerConfig, 'open' | 'showOverlay'>;\n\n  /**\n   * Custom config file name to use instead of cloudpack.config.json\n   */\n  configFileName?: string;\n}\n\n/**\n * Application configuration combined with the file paths that were used to load it.\n */\nexport interface AppConfigWithPaths {\n  appConfig: AppConfig;\n\n  /**\n   * The paths to the config files that were read, in order of precedence.\n   */\n  appConfigPaths: string[];\n}\n\n/**\n * Reads the user config file and merges with any parent configs asynchronously.\n * Note this is only useful for making modifications to the user config.\n * For a full merged representation of config, use `readConfig` instead.\n *\n * Throws an error if the config file exists but is not valid JSON, there's some error reading it,\n * or any settings are invalid. (As of writing, this doesn't do full schema validation; it only\n * checks certain specific settings.)\n */\nexport async function readAppConfig(appPath: string, options?: ReadAppConfigOptions): Promise<AppConfigWithPaths> {\n  const { appConfigPaths } = getConfigPath(appPath, options?.configFileName);\n\n  let config: AppConfigWithPaths;\n\n  // Check for JS and JSON config files.\n  const existingPaths = appConfigPaths.filter((p) => fs.existsSync(p));\n  if (existingPaths.length > 1) {\n    const message = 'Multiple Cloudpack config files found. Determine the correct one and delete the others:';\n    throw new Error([message, ...existingPaths].join('\\n  '));\n  }\n\n  const appConfigPath = existingPaths[0];\n  if (!appConfigPath) {\n    // If a custom config was specified, it must exist\n    if (options?.configFileName) {\n      throw new Error(`Config file not found: ${options.configFileName}`);\n    }\n    // This is fine, use an empty config\n    config = { appConfig: {}, appConfigPaths: [] };\n  } else if (path.extname(appConfigPath) === '.json') {\n    // Check for an existing JSON app config first\n    config = await readJsonAppConfig(appConfigPath);\n  } else {\n    // Otherwise, read as a JS file\n    config = await readJsAppConfig(appConfigPath);\n  }\n\n  expandEnvironmentVariables(config.appConfig as Record<string, unknown>);\n\n  // Merge extra settings (usually from CLI options) into the final config.\n  if (options) {\n    config.appConfig = augmentAppConfig(config.appConfig, options);\n  }\n\n  if (appConfigPath) {\n    if (config.appConfigPaths) {\n      config.appConfigPaths?.unshift(appConfigPath); // Add the config path to the beginning of the list\n    } else {\n      config.appConfigPaths = [appConfigPath]; // If no paths were set, just use the current one\n    }\n  }\n\n  return config;\n}\n\n/**\n * Resolve import specifiers for bundler capabilities registry.\n * Throws if a specifier can't be resolved.\n */\nfunction resolveBundlerCapabilities(params: { appConfig: AppConfig; configPath: string }): void {\n  const {\n    appConfig: { bundlerCapabilitiesRegistry },\n    configPath,\n  } = params;\n  if (!bundlerCapabilitiesRegistry) {\n    return;\n  }\n\n  for (const [name, importSpecifier] of Object.entries(bundlerCapabilitiesRegistry)) {\n    try {\n      const moduleUrl = resolveModule({ parentPath: configPath, importSpecifier });\n      bundlerCapabilitiesRegistry[name] = moduleUrl.toString();\n    } catch (e) {\n      throw new Error(`Error resolving bundler capability  \"${importSpecifier}\":\\n${(e as Error).message || e}`);\n    }\n  }\n}\n\n/**\n * Reads the JSON app config file and calls `processConfig` on it.\n * Throws an error if the config file exists but is not valid JSON, or there's some error reading it.\n * @param configPath - The path to the config file.\n * @returns The parsed AppConfig object.\n */\nasync function readJsonAppConfig(configPath: string): Promise<AppConfigWithPaths> {\n  const appConfig = await readJson<AppConfig>(configPath, { mode: 'permissive', throwOnError: true });\n  if (!appConfig) {\n    // shouldn't happen, but just in case/to satisfy the types...\n    throw new Error(`Cloudpack config not found at ${configPath}`);\n  }\n  return processConfig(configPath, appConfig);\n}\n\n/**\n * Reads the JavaScript app config file and calls `processConfig` on it.\n * Throws an error if the config file exists but is not valid, or there's some error reading it.\n * @param configPath - The path to the config file.\n * @returns The parsed AppConfig object.\n */\nasync function readJsAppConfig(configPath: string): Promise<AppConfigWithPaths> {\n  // Convert configPath to a URL for import.\n  try {\n    const appConfig = (await (import(pathToFileURL(configPath).toString()) as Promise<{ default?: AppConfig }>))\n      .default;\n    if (!appConfig) {\n      throw new Error(`Missing default export from Cloudpack config at ${configPath}`);\n    }\n    return processConfig(configPath, appConfig);\n  } catch (e) {\n    throw new Error(`Error reading config file ${configPath}:\\n${(e as Error).message || e}`);\n  }\n}\n\n/**\n * Processes the app config file and merges it with any parent configs.\n * This includes validating the config, checking for deprecated values, and resolving bundler capabilities.\n */\nasync function processConfig(configPath: string, appConfig: AppConfig): Promise<AppConfigWithPaths> {\n  if (!validateConfig(appConfig)) {\n    throw new Error(`Config file ${configPath} has invalid settings (see above for details)`);\n  }\n\n  checkFeatures(appConfig.features, configPath);\n\n  resolveBundlerCapabilities({ appConfig, configPath });\n\n  expandModulePaths({ appConfig, configPath });\n\n  processDeprecatedValues(appConfig);\n\n  const configPaths: string[] = [];\n\n  // Read and merge with any parent configs (the same processing is applied to parent configs)\n  const { extends: _extends = [] } = appConfig;\n  const extendsArray = Array.isArray(_extends) ? _extends : [_extends];\n  const parentResults = await Promise.all(\n    extendsArray.map(async (importSpecifier) => {\n      const parentConfigPath = resolveParentConfig({ configPath, importSpecifier });\n\n      const result =\n        path.extname(parentConfigPath).toLowerCase() === '.json'\n          ? await readJsonAppConfig(parentConfigPath)\n          : await readJsAppConfig(parentConfigPath);\n\n      // Collect paths from parent configs\n      configPaths.push(...result.appConfigPaths);\n      return result.appConfig;\n    }),\n  );\n\n  const mergedConfig = mergeParentConfig({ appConfig, parentConfigs: parentResults });\n  return { appConfig: mergedConfig, appConfigPaths: configPaths };\n}\n\n/**\n * Validate parts of the current config file (before merging with parents) and log any errors.\n * Logging here and then letting the caller throw if needed allows us to show more errors at once.\n * @returns true if valid, false if not\n */\nfunction validateConfig(appConfig: AppConfig): boolean {\n  let isValid = true;\n\n  // Verify that there are no matches with a negated name and a version\n  for (const setting of appConfig.packageSettings || []) {\n    const { match } = setting;\n    const matches = Array.isArray(match) ? match : [match];\n    for (const m of matches) {\n      const result = validateMatch(m);\n      if (!result.isValid) {\n        isValid = false;\n        console.error(`Invalid packageSettings match: ${result.error}`);\n      }\n    }\n  }\n\n  return isValid;\n}\n\n/**\n * Warn if any feature names are invalid, and remove them.\n */\nfunction checkFeatures(features: Record<string, boolean> | undefined, configPath: string): void {\n  if (!features) {\n    return;\n  }\n\n  const invalidFeatures: string[] = [];\n  for (const featureName of Object.keys(features)) {\n    if (!allFeatures[featureName as FeatureName]) {\n      invalidFeatures.push(featureName);\n      delete features[featureName];\n    }\n  }\n\n  if (invalidFeatures.length) {\n    console.warn(\n      `Unknown feature(s) found in ${configPath} (most likely they were graduated or removed in Cloudpack):\\n  ` +\n        invalidFeatures.join(', '),\n    );\n  }\n}\n\n/**\n * Delete deprecated values and convert them to the new format. (This mutates the `config` object.)\n */\nfunction processDeprecatedValues(config: AppConfig): void {\n  /* eslint-disable etc/no-deprecated */\n  const { devServer, server, packageSettings = [] } = config;\n\n  if (devServer) {\n    if (server) {\n      throw new Error('Cannot have both \"devServer\" and \"server\" in the config file. Use \"server\" only.');\n    }\n\n    config.server = devServer;\n    delete config.devServer;\n  }\n\n  if (server?.routes) {\n    config.routes = server.routes;\n    delete server.routes;\n  }\n\n  for (const setting of packageSettings) {\n    if (setting.bundlerType) {\n      setting.bundler = setting.bundlerType;\n      delete setting.bundlerType;\n    }\n  }\n  /* eslint-enable etc/no-deprecated */\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/config",
-  "version": "0.38.6",
+  "version": "0.38.7",
   "description": "Configuration handling for Cloudpack",
   "license": "MIT",
   "type": "module",
@@ -14,12 +14,12 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/common-types": "^0.28.1",
+    "@ms-cloudpack/common-types": "^0.28.2",
     "@ms-cloudpack/environment": "^0.1.1",
     "@ms-cloudpack/json-utilities": "^0.1.11",
-    "@ms-cloudpack/package-utilities": "^12.5.3",
+    "@ms-cloudpack/package-utilities": "^13.0.0",
     "@ms-cloudpack/path-string-parsing": "^1.2.7",
-    "@ms-cloudpack/path-utilities": "^3.1.24",
+    "@ms-cloudpack/path-utilities": "^3.1.25",
     "semver": "^7.6.0"
   },
   "devDependencies": {