@ms-cloudpack/config 0.31.6 → 0.32.0

package/lib/checkMatch.d.ts

@@ -11,6 +11,8 @@ interface CheckMatchParams {
 }
 /**
  * Checks if the package is a match for the given package settings.
+ *
+ * Throws if the match is invalid (shouldn't happen due to previous validation).
  */
 export declare function checkMatch(params: CheckMatchParams): boolean;
 export {};

package/lib/checkMatch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkMatch.d.ts","sourceRoot":"","sources":["../src/checkMatch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAoD,MAAM,4BAA4B,CAAC;AAGpH,UAAU,gBAAgB;IACxB,+BAA+B;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,kCAAkC;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,mFAAmF;IACnF,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC;IAChC,8EAA8E;IAC9E,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAqB5D"}
+{"version":3,"file":"checkMatch.d.ts","sourceRoot":"","sources":["../src/checkMatch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAoD,MAAM,4BAA4B,CAAC;AAIpH,UAAU,gBAAgB;IACxB,+BAA+B;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,kCAAkC;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,mFAAmF;IACnF,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC;IAChC,8EAA8E;IAC9E,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAqB5D"}

package/lib/checkMatch.js

@@ -1,6 +1,9 @@
 import { satisfies } from 'semver';
+import { validateMatch } from './validateMatch.js';
 /**
  * Checks if the package is a match for the given package settings.
+ *
+ * Throws if the match is invalid (shouldn't happen due to previous validation).
  */
 export function checkMatch(params) {
     const { name, version, match, exactMatch } = params;
@@ -21,8 +24,14 @@ export function checkMatch(params) {
 }
 /**
  * Check a match where `match.name` is negated. (This will handle removing the ! from the name.)
+ *
+ * Throws if the match has a version (shouldn't happen due to previous validation).
  */
 function checkNegatedMatch(params) {
+    const result = validateMatch(params.match);
+    if (!result.isValid) {
+        throw new Error(result.error);
+    }
     return !checkMatch({ ...params, match: { ...params.match, name: params.match.name.slice(1) } });
 }
 function checkMatchArray(params) {

package/lib/checkMatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkMatch.js","sourceRoot":"","sources":["../src/checkMatch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAanC;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,MAAwB;IACjD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IAEpD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,eAAe,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACtC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IAE5D,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAC9B,OAAO,iBAAiB,CAAC,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,mFAAmF;IACnF,IAAI,UAAU,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3C,OAAO,SAAS,KAAK,IAAI,IAAI,CAAC,CAAC,YAAY,IAAI,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;IACnF,CAAC;IAED,sFAAsF;IACtF,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,IAAI,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;AACxG,CAAC;AAED;;GAEG;AACH,SAAS,iBAAiB,CAAC,MAA+E;IACxG,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAClG,CAAC;AAED,SAAS,eAAe,CAAC,MAA6E;IACpG,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,iEAAiE;IACjE,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QAC/B,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QAClC,IAAI,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAClC,QAAQ,KAAK,iBAAiB,CAAC,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QACjE,CAAC;aAAM,CAAC;YACN,QAAQ,KAAK,UAAU,CAAC,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,aAAa,CAAC,KAA0C;IAC/D,IAAI,IAAY,CAAC;IACjB,IAAI,OAA2B,CAAC;IAChC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,IAAI,GAAG,KAAK,CAAC;IACf,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QAClB,6FAA6F;QAC7F,OAAO,GAAG,KAAK,CAAC,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;IAC9D,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;AAC3B,CAAC","sourcesContent":["import type { PackageSettings, PackageSettingsMatch, PackageSettingsMatchObject } from '@ms-cloudpack/common-types';\nimport { satisfies } from 'semver';\n\ninterface CheckMatchParams {\n  /** The name of the package. */\n  name: string;\n  /** The version of the package. */\n  version: string;\n  /** The match to check against. For an array, returns true if any entries match. */\n  match: PackageSettings['match'];\n  /** If true, require an exact match for the name (don't process wildcards). */\n  exactMatch?: boolean;\n}\n\n/**\n * Checks if the package is a match for the given package settings.\n */\nexport function checkMatch(params: CheckMatchParams): boolean {\n  const { name, version, match, exactMatch } = params;\n\n  if (Array.isArray(match)) {\n    return checkMatchArray({ ...params, matches: match });\n  }\n\n  const matchObj = toMatchObject(match);\n  const { name: matchName, version: matchVersion } = matchObj;\n\n  if (matchName.startsWith('!')) {\n    return checkNegatedMatch({ ...params, match: matchObj });\n  }\n\n  // For exact or non-wildcard matches, check the full name and possibly the version.\n  if (exactMatch || !matchName.endsWith('*')) {\n    return matchName === name && (!matchVersion || satisfies(version, matchVersion));\n  }\n\n  // Remove the trailing wildcard and check for a prefix match and possibly the version.\n  return name.startsWith(matchName.slice(0, -1)) && (!matchVersion || satisfies(version, matchVersion));\n}\n\n/**\n * Check a match where `match.name` is negated. (This will handle removing the ! from the name.)\n */\nfunction checkNegatedMatch(params: Omit<CheckMatchParams, 'match'> & { match: PackageSettingsMatchObject }): boolean {\n  return !checkMatch({ ...params, match: { ...params.match, name: params.match.name.slice(1) } });\n}\n\nfunction checkMatchArray(params: Omit<CheckMatchParams, 'match'> & { matches: PackageSettingsMatch[] }): boolean {\n  let hasMatch = false;\n  // Now that we support negations, we have to check every element.\n  for (const m of params.matches) {\n    const matchObj = toMatchObject(m);\n    if (matchObj.name.startsWith('!')) {\n      hasMatch &&= checkNegatedMatch({ ...params, match: matchObj });\n    } else {\n      hasMatch ||= checkMatch({ ...params, match: m });\n    }\n  }\n  return hasMatch;\n}\n\nfunction toMatchObject(match: PackageSettingsMatchObject | string): PackageSettingsMatchObject {\n  let name: string;\n  let version: string | undefined;\n  if (typeof match === 'string') {\n    name = match;\n  } else {\n    name = match.name;\n    // If any version is allowed, unset the version to skip the satisfies() check for efficiency.\n    version = match.version === '*' ? undefined : match.version;\n  }\n  return { name, version };\n}\n"]}
+{"version":3,"file":"checkMatch.js","sourceRoot":"","sources":["../src/checkMatch.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageSettings, PackageSettingsMatch, PackageSettingsMatchObject } from '@ms-cloudpack/common-types';\nimport { satisfies } from 'semver';\nimport { validateMatch } from './validateMatch.js';\n\ninterface CheckMatchParams {\n  /** The name of the package. */\n  name: string;\n  /** The version of the package. */\n  version: string;\n  /** The match to check against. For an array, returns true if any entries match. */\n  match: PackageSettings['match'];\n  /** If true, require an exact match for the name (don't process wildcards). */\n  exactMatch?: boolean;\n}\n\n/**\n * Checks if the package is a match for the given package settings.\n *\n * Throws if the match is invalid (shouldn't happen due to previous validation).\n */\nexport function checkMatch(params: CheckMatchParams): boolean {\n  const { name, version, match, exactMatch } = params;\n\n  if (Array.isArray(match)) {\n    return checkMatchArray({ ...params, matches: match });\n  }\n\n  const matchObj = toMatchObject(match);\n  const { name: matchName, version: matchVersion } = matchObj;\n\n  if (matchName.startsWith('!')) {\n    return checkNegatedMatch({ ...params, match: matchObj });\n  }\n\n  // For exact or non-wildcard matches, check the full name and possibly the version.\n  if (exactMatch || !matchName.endsWith('*')) {\n    return matchName === name && (!matchVersion || satisfies(version, matchVersion));\n  }\n\n  // Remove the trailing wildcard and check for a prefix match and possibly the version.\n  return name.startsWith(matchName.slice(0, -1)) && (!matchVersion || satisfies(version, matchVersion));\n}\n\n/**\n * Check a match where `match.name` is negated. (This will handle removing the ! from the name.)\n *\n * Throws if the match has a version (shouldn't happen due to previous validation).\n */\nfunction checkNegatedMatch(params: Omit<CheckMatchParams, 'match'> & { match: PackageSettingsMatchObject }): boolean {\n  const result = validateMatch(params.match);\n  if (!result.isValid) {\n    throw new Error(result.error);\n  }\n  return !checkMatch({ ...params, match: { ...params.match, name: params.match.name.slice(1) } });\n}\n\nfunction checkMatchArray(params: Omit<CheckMatchParams, 'match'> & { matches: PackageSettingsMatch[] }): boolean {\n  let hasMatch = false;\n  // Now that we support negations, we have to check every element.\n  for (const m of params.matches) {\n    const matchObj = toMatchObject(m);\n    if (matchObj.name.startsWith('!')) {\n      hasMatch &&= checkNegatedMatch({ ...params, match: matchObj });\n    } else {\n      hasMatch ||= checkMatch({ ...params, match: m });\n    }\n  }\n  return hasMatch;\n}\n\nfunction toMatchObject(match: PackageSettingsMatchObject | string): PackageSettingsMatchObject {\n  let name: string;\n  let version: string | undefined;\n  if (typeof match === 'string') {\n    name = match;\n  } else {\n    name = match.name;\n    // If any version is allowed, unset the version to skip the satisfies() check for efficiency.\n    version = match.version === '*' ? undefined : match.version;\n  }\n  return { name, version };\n}\n"]}

package/lib/index.d.ts

@@ -16,4 +16,5 @@ export { writeGeneratedConfig } from './writeGeneratedConfig.js';
 export { writeAppConfig } from './writeAppConfig.js';
 export { ensureGeneratedSettingsForPackage } from './ensureGeneratedSettingsForPackage.js';
 export { updateUserPreference } from './updateUserPreference.js';
+export { validateMatch } from './validateMatch.js';
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAChG,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,iCAAiC,EAAE,MAAM,wCAAwC,CAAC;AAC3F,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAChG,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,iCAAiC,EAAE,MAAM,wCAAwC,CAAC;AAC3F,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC"}

package/lib/index.js

@@ -16,4 +16,5 @@ export { writeGeneratedConfig } from './writeGeneratedConfig.js';
 export { writeAppConfig } from './writeAppConfig.js';
 export { ensureGeneratedSettingsForPackage } from './ensureGeneratedSettingsForPackage.js';
 export { updateUserPreference } from './updateUserPreference.js';
+export { validateMatch } from './validateMatch.js';
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAChG,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,UAAU,EAA0B,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,iCAAiC,EAAE,MAAM,wCAAwC,CAAC;AAC3F,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC","sourcesContent":["export { checkMatch } from './checkMatch.js';\nexport { configTemplate } from './configTemplate.js';\nexport { generatedConfigFileName, appConfigFileName } from './constants.js';\nexport { allUserPreferences } from './constants.js';\nexport { createPackageDefinitions } from './createPackageDefinitions.js';\nexport { getCachePath, getLocalCachePath } from './getCachePath.js';\nexport { getConfigPath } from './getConfigPath.js';\nexport { getUserPreferencesPath, setMockUserPreferencesDir } from './getUserPreferencesPath.js';\nexport { getPackageSettings } from './getPackageSettings.js';\nexport { getGeneratedPackageSettings } from './getGeneratedPackageSettings.js';\nexport { readConfig, type ReadConfigOptions } from './readConfig.js';\nexport { readGeneratedConfig } from './readGeneratedConfig.js';\nexport { readAppConfig } from './readAppConfig.js';\nexport { readUserPreferences } from './readUserPreferences.js';\nexport { writeGeneratedConfig } from './writeGeneratedConfig.js';\nexport { writeAppConfig } from './writeAppConfig.js';\nexport { ensureGeneratedSettingsForPackage } from './ensureGeneratedSettingsForPackage.js';\nexport { updateUserPreference } from './updateUserPreference.js';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAChG,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,UAAU,EAA0B,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,iCAAiC,EAAE,MAAM,wCAAwC,CAAC;AAC3F,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC","sourcesContent":["export { checkMatch } from './checkMatch.js';\nexport { configTemplate } from './configTemplate.js';\nexport { generatedConfigFileName, appConfigFileName } from './constants.js';\nexport { allUserPreferences } from './constants.js';\nexport { createPackageDefinitions } from './createPackageDefinitions.js';\nexport { getCachePath, getLocalCachePath } from './getCachePath.js';\nexport { getConfigPath } from './getConfigPath.js';\nexport { getUserPreferencesPath, setMockUserPreferencesDir } from './getUserPreferencesPath.js';\nexport { getPackageSettings } from './getPackageSettings.js';\nexport { getGeneratedPackageSettings } from './getGeneratedPackageSettings.js';\nexport { readConfig, type ReadConfigOptions } from './readConfig.js';\nexport { readGeneratedConfig } from './readGeneratedConfig.js';\nexport { readAppConfig } from './readAppConfig.js';\nexport { readUserPreferences } from './readUserPreferences.js';\nexport { writeGeneratedConfig } from './writeGeneratedConfig.js';\nexport { writeAppConfig } from './writeAppConfig.js';\nexport { ensureGeneratedSettingsForPackage } from './ensureGeneratedSettingsForPackage.js';\nexport { updateUserPreference } from './updateUserPreference.js';\nexport { validateMatch } from './validateMatch.js';\n"]}

package/lib/mergeParentConfig.d.ts

@@ -3,7 +3,7 @@ import type { AppConfig } from '@ms-cloudpack/common-types';
  * Merge the configs. Later parent configs override earlier ones.
  */
 export declare function mergeParentConfig(params: {
-    AppConfig: AppConfig;
+    appConfig: AppConfig;
     parentConfigs: AppConfig[];
 }): AppConfig;
 //# sourceMappingURL=mergeParentConfig.d.ts.map

package/lib/mergeParentConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mergeParentConfig.d.ts","sourceRoot":"","sources":["../src/mergeParentConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAG5D;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE;IAAE,SAAS,EAAE,SAAS,CAAC;IAAC,aAAa,EAAE,SAAS,EAAE,CAAA;CAAE,GAAG,SAAS,CAkBzG"}
+{"version":3,"file":"mergeParentConfig.d.ts","sourceRoot":"","sources":["../src/mergeParentConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAG5D;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE;IAAE,SAAS,EAAE,SAAS,CAAC;IAAC,aAAa,EAAE,SAAS,EAAE,CAAA;CAAE,GAAG,SAAS,CAazG"}

package/lib/mergeParentConfig.js

@@ -3,18 +3,15 @@ import { mergeObjects } from '@ms-cloudpack/package-utilities';
  * Merge the configs. Later parent configs override earlier ones.
  */
 export function mergeParentConfig(params) {
-    const configs = [...params.parentConfigs, params.AppConfig];
-    const result = mergeObjects(configs, { arrayMerge: 'overwrite' });
+    const result = mergeObjects([...params.parentConfigs, params.appConfig], {
+        arrayMerge: 'overwrite',
+        customMerge: {
+            // Concatenate package settings
+            packageSettings: (prev, curr) => [...(prev ?? []), ...(curr ?? [])],
+        },
+    });
     // Remove the extends property from the result
     delete result.extends;
-    // Remove the default-merged package settings (fixed below)
-    delete result.packageSettings;
-    // Concatenate the package settings. User config comes first here since order can matter
-    // in some cases (and the user config should override the parent).
-    const packageSettings = configs.reverse().flatMap((config) => config.packageSettings ?? []);
-    if (packageSettings.length) {
-        result.packageSettings = packageSettings;
-    }
     return result;
 }
 //# sourceMappingURL=mergeParentConfig.js.map

package/lib/mergeParentConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergeParentConfig.js","sourceRoot":"","sources":["../src/mergeParentConfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAA4D;IAC5F,MAAM,OAAO,GAAG,CAAC,GAAG,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IAE5D,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC;IAElE,8CAA8C;IAC9C,OAAO,MAAM,CAAC,OAAO,CAAC;IACtB,2DAA2D;IAC3D,OAAO,MAAM,CAAC,eAAe,CAAC;IAE9B,wFAAwF;IACxF,kEAAkE;IAClE,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;IAC5F,IAAI,eAAe,CAAC,MAAM,EAAE,CAAC;QAC3B,MAAM,CAAC,eAAe,GAAG,eAAe,CAAC;IAC3C,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import type { AppConfig } from '@ms-cloudpack/common-types';\nimport { mergeObjects } from '@ms-cloudpack/package-utilities';\n\n/**\n * Merge the configs. Later parent configs override earlier ones.\n */\nexport function mergeParentConfig(params: { AppConfig: AppConfig; parentConfigs: AppConfig[] }): AppConfig {\n  const configs = [...params.parentConfigs, params.AppConfig];\n\n  const result = mergeObjects(configs, { arrayMerge: 'overwrite' });\n\n  // Remove the extends property from the result\n  delete result.extends;\n  // Remove the default-merged package settings (fixed below)\n  delete result.packageSettings;\n\n  // Concatenate the package settings. User config comes first here since order can matter\n  // in some cases (and the user config should override the parent).\n  const packageSettings = configs.reverse().flatMap((config) => config.packageSettings ?? []);\n  if (packageSettings.length) {\n    result.packageSettings = packageSettings;\n  }\n\n  return result;\n}\n"]}
+{"version":3,"file":"mergeParentConfig.js","sourceRoot":"","sources":["../src/mergeParentConfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAA4D;IAC5F,MAAM,MAAM,GAAG,YAAY,CAAC,CAAC,GAAG,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE;QACvE,UAAU,EAAE,WAAW;QACvB,WAAW,EAAE;YACX,+BAA+B;YAC/B,eAAe,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;SACpE;KACF,CAAC,CAAC;IAEH,8CAA8C;IAC9C,OAAO,MAAM,CAAC,OAAO,CAAC;IAEtB,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import type { AppConfig } from '@ms-cloudpack/common-types';\nimport { mergeObjects } from '@ms-cloudpack/package-utilities';\n\n/**\n * Merge the configs. Later parent configs override earlier ones.\n */\nexport function mergeParentConfig(params: { appConfig: AppConfig; parentConfigs: AppConfig[] }): AppConfig {\n  const result = mergeObjects([...params.parentConfigs, params.appConfig], {\n    arrayMerge: 'overwrite',\n    customMerge: {\n      // Concatenate package settings\n      packageSettings: (prev, curr) => [...(prev ?? []), ...(curr ?? [])],\n    },\n  });\n\n  // Remove the extends property from the result\n  delete result.extends;\n\n  return result;\n}\n"]}

package/lib/readAppConfig.d.ts

@@ -10,7 +10,9 @@ export interface ReadAppConfigOptions {
  * Note this is only useful for making modifications to the user config.
  * For a full merged representation of config, use `readConfig` instead.
  *
- * Throws an error if the config file exists but is not valid JSON (or there's some error reading it).
+ * Throws an error if the config file exists but is not valid JSON, there's some error reading it,
+ * or any settings are invalid. (As of writing, this doesn't do full schema validation; it only
+ * checks certain specific settings.)
  */
 export declare function readAppConfig(appPath: string, options?: ReadAppConfigOptions): Promise<AppConfig>;
 //# sourceMappingURL=readAppConfig.d.ts.map

package/lib/readAppConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"readAppConfig.d.ts","sourceRoot":"","sources":["../src/readAppConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAA8B,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAOzG,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,oBAAoB,CAAC,EAAE,eAAe,EAAE,CAAC;CAC1C;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAC,CAavG"}
+{"version":3,"file":"readAppConfig.d.ts","sourceRoot":"","sources":["../src/readAppConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAS7E,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,oBAAoB,CAAC,EAAE,eAAe,EAAE,CAAC;CAC1C;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAC,CAqBvG"}

package/lib/readAppConfig.js

@@ -1,32 +1,55 @@
 import { readJson } from '@ms-cloudpack/json-utilities';
+import fs from 'fs';
 import { getConfigPath } from './getConfigPath.js';
 import { mergeParentConfig } from './mergeParentConfig.js';
 import { resolveParentConfig } from './resolveParentConfig.js';
 import { resolveModule } from '@ms-cloudpack/package-utilities';
+import { validateMatch } from './validateMatch.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.
  * For a full merged representation of config, use `readConfig` instead.
  *
- * Throws an error if the config file exists but is not valid JSON (or there's some error reading it).
+ * Throws an error if the config file exists but is not valid JSON, there's some error reading it,
+ * or any settings are invalid. (As of writing, this doesn't do full schema validation; it only
+ * checks certain specific settings.)
  */
 export async function readAppConfig(appPath, options) {
     const { extraPackageSettings } = options || {};
     const { appConfigPath } = getConfigPath(appPath);
-    const config = (await readAppConfigInternal(appConfigPath)) || {};
+    // Do a separate existence check for the top-level config, since it's fine if that doesn't exist.
+    // (readAppConfigInternal throws if the file doesn't exist because it's also used for reading
+    // parent configs from "extends", which must exist if specified.)
+    let config;
+    if (!fs.existsSync(appConfigPath)) {
+        config = {};
+    }
+    else {
+        config = (await readAppConfigInternal(appConfigPath)) || {};
+    }
     if (extraPackageSettings) {
         // Add these last so they take precedence.
         (config.packageSettings ??= []).push(...extraPackageSettings);
     }
     return config;
 }
-function tryResolveBundlerCapability(importSpecifier, parentUrl) {
-    try {
-        return resolveModule({ parentUrl, importSpecifier });
+/**
+ * Resolve import specifiers for bundler capabilities registry.
+ * Throws if a specifier can't be resolved.
+ */
+function resolveBundlerCapabilities(params) {
+    const { appConfig: { bundlerCapabilitiesRegistry }, configPath, } = params;
+    if (!bundlerCapabilitiesRegistry) {
+        return;
     }
-    catch (e) {
-        console.warn(`Error resolving bundler capability "${importSpecifier}", Error:`, e);
-        return undefined;
+    for (const [name, importSpecifier] of Object.entries(bundlerCapabilitiesRegistry)) {
+        try {
+            const moduleUrl = resolveModule({ parentUrl: configPath, importSpecifier });
+            bundlerCapabilitiesRegistry[name] = moduleUrl;
+        }
+        catch (e) {
+            throw new Error(`Error resolving bundler capability  "${importSpecifier}":\n${e.message || e}`);
+        }
     }
 }
 /**
@@ -34,56 +57,42 @@ function tryResolveBundlerCapability(importSpecifier, parentUrl) {
  * Throws an error if the config file exists but is not valid JSON, or there's some error reading it.
  */
 async function readAppConfigInternal(configPath) {
-    const AppConfig = await readJson(configPath, { mode: 'permissive', throwOnError: true });
-    if (!AppConfig) {
-        return undefined;
+    const appConfig = await readJson(configPath, { mode: 'permissive', throwOnError: true });
+    if (!appConfig) {
+        // shouldn't happen, but just in case/to satisfy the types...
+        throw new Error(`Could not read config file ${configPath}`);
     }
-    // Resolve import specifiers for bundler capabilities registry
-    if (AppConfig.bundlerCapabilitiesRegistry) {
-        for (const [key, value] of Object.entries(AppConfig.bundlerCapabilitiesRegistry)) {
-            const moduleUrl = tryResolveBundlerCapability(value, configPath);
-            if (moduleUrl) {
-                AppConfig.bundlerCapabilitiesRegistry[key] = moduleUrl;
-            }
-        }
+    if (!validateConfig(appConfig)) {
+        throw new Error(`Config file ${configPath} has invalid settings (see above for details)`);
     }
-    // PackageSettings's bundlerCapabilities may contain short-hand keys that need to be resolved to full import specifiers before bundler capabilities can be processed
-    // This is done by looking up the short-hand keys in the bundlerCapabilitiesRegistry
-    // If the short-hand key is not found in the registry, it is assumed to be a full import specifier
-    if (AppConfig.packageSettings && AppConfig.bundlerCapabilitiesRegistry) {
-        for (const setting of AppConfig.packageSettings) {
-            if (setting.bundlerCapabilities) {
-                const newBundlerCapabilities = {};
-                for (const key in setting.bundlerCapabilities) {
-                    if (key in AppConfig.bundlerCapabilitiesRegistry) {
-                        const newKey = AppConfig.bundlerCapabilitiesRegistry[key];
-                        newBundlerCapabilities[newKey] = setting.bundlerCapabilities[key];
-                    }
-                    else {
-                        newBundlerCapabilities[key] = setting.bundlerCapabilities[key];
-                    }
-                }
-                setting.bundlerCapabilities = newBundlerCapabilities;
-            }
-        }
-    }
-    const extendsArray = AppConfig.extends
-        ? Array.isArray(AppConfig.extends)
-            ? AppConfig.extends
-            : [AppConfig.extends]
-        : [];
-    // Recursively read any parent config files
-    const parentConfigs = [];
-    for (const importSpecifier of extendsArray) {
-        const resolvedPath = resolveParentConfig({ configPath, importSpecifier });
-        if (resolvedPath) {
-            const parentConfig = await readAppConfigInternal(resolvedPath);
-            if (parentConfig) {
-                parentConfigs.push(parentConfig);
+    resolveBundlerCapabilities({ appConfig, configPath });
+    processDeprecatedValues(appConfig);
+    // Read and merge with any parent configs (the same processing is applied to parent configs)
+    const { extends: _extends = [] } = appConfig;
+    const extendsArray = Array.isArray(_extends) ? _extends : [_extends];
+    const parentConfigs = await Promise.all(extendsArray.map((importSpecifier) => readAppConfigInternal(resolveParentConfig({ configPath, importSpecifier }))));
+    return mergeParentConfig({ appConfig, parentConfigs });
+}
+/**
+ * Validate parts of the current config file (before merging with parents) and log any errors.
+ * Logging here and then letting the caller throw if needed allows us to show more errors at once.
+ * @returns true if valid, false if not
+ */
+function validateConfig(appConfig) {
+    let isValid = true;
+    // Verify that there are no matches with a negated name and a version
+    for (const setting of appConfig.packageSettings || []) {
+        const { match } = setting;
+        const matches = Array.isArray(match) ? match : [match];
+        for (const m of matches) {
+            const result = validateMatch(m);
+            if (!result.isValid) {
+                isValid = false;
+                console.error(`Invalid packageSettings match: ${result.error}`);
             }
         }
     }
-    return processDeprecatedValues(mergeParentConfig({ AppConfig, parentConfigs }));
+    return isValid;
 }
 /**
  * Delete deprecated values and convert them to the new format. (This mutates the `config` object.)
@@ -108,7 +117,6 @@ function processDeprecatedValues(config) {
             delete setting.bundlerType;
         }
     }
-    return config;
     /* eslint-enable etc/no-deprecated */
 }
 //# sourceMappingURL=readAppConfig.js.map

package/lib/readAppConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"readAppConfig.js","sourceRoot":"","sources":["../src/readAppConfig.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AppConfig, BundlerCapabilitiesOptions, PackageSettings } from '@ms-cloudpack/common-types';\nimport { readJson } from '@ms-cloudpack/json-utilities';\nimport { getConfigPath } from './getConfigPath.js';\nimport { mergeParentConfig } from './mergeParentConfig.js';\nimport { resolveParentConfig } from './resolveParentConfig.js';\nimport { resolveModule } from '@ms-cloudpack/package-utilities';\n\nexport interface ReadAppConfigOptions {\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/**\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 (or there's some error reading it).\n */\nexport async function readAppConfig(appPath: string, options?: ReadAppConfigOptions): Promise<AppConfig> {\n  const { extraPackageSettings } = options || {};\n\n  const { appConfigPath } = getConfigPath(appPath);\n\n  const config = (await readAppConfigInternal(appConfigPath)) || {};\n\n  if (extraPackageSettings) {\n    // Add these last so they take precedence.\n    (config.packageSettings ??= []).push(...extraPackageSettings);\n  }\n\n  return config;\n}\n\nfunction tryResolveBundlerCapability(importSpecifier: string, parentUrl: string) {\n  try {\n    return resolveModule({ parentUrl, importSpecifier });\n  } catch (e) {\n    console.warn(`Error resolving bundler capability \"${importSpecifier}\", Error:`, e);\n    return undefined;\n  }\n}\n\n/**\n * Reads the user config, with any `extends` parent configs merged in.\n * Throws an error if the config file exists but is not valid JSON, or there's some error reading it.\n */\nasync function readAppConfigInternal(configPath: string): Promise<AppConfig | undefined> {\n  const AppConfig = await readJson<AppConfig>(configPath, { mode: 'permissive', throwOnError: true });\n  if (!AppConfig) {\n    return undefined;\n  }\n\n  // Resolve import specifiers for bundler capabilities registry\n  if (AppConfig.bundlerCapabilitiesRegistry) {\n    for (const [key, value] of Object.entries(AppConfig.bundlerCapabilitiesRegistry)) {\n      const moduleUrl = tryResolveBundlerCapability(value, configPath);\n      if (moduleUrl) {\n        AppConfig.bundlerCapabilitiesRegistry[key] = moduleUrl;\n      }\n    }\n  }\n\n  // PackageSettings's bundlerCapabilities may contain short-hand keys that need to be resolved to full import specifiers before bundler capabilities can be processed\n  // This is done by looking up the short-hand keys in the bundlerCapabilitiesRegistry\n  // If the short-hand key is not found in the registry, it is assumed to be a full import specifier\n  if (AppConfig.packageSettings && AppConfig.bundlerCapabilitiesRegistry) {\n    for (const setting of AppConfig.packageSettings) {\n      if (setting.bundlerCapabilities) {\n        const newBundlerCapabilities: BundlerCapabilitiesOptions = {};\n        for (const key in setting.bundlerCapabilities) {\n          if (key in AppConfig.bundlerCapabilitiesRegistry) {\n            const newKey = AppConfig.bundlerCapabilitiesRegistry[key];\n            newBundlerCapabilities[newKey] = setting.bundlerCapabilities[key];\n          } else {\n            newBundlerCapabilities[key] = setting.bundlerCapabilities[key];\n          }\n        }\n        setting.bundlerCapabilities = newBundlerCapabilities;\n      }\n    }\n  }\n\n  const extendsArray = AppConfig.extends\n    ? Array.isArray(AppConfig.extends)\n      ? AppConfig.extends\n      : [AppConfig.extends]\n    : [];\n\n  // Recursively read any parent config files\n  const parentConfigs: AppConfig[] = [];\n  for (const importSpecifier of extendsArray) {\n    const resolvedPath = resolveParentConfig({ configPath, importSpecifier });\n    if (resolvedPath) {\n      const parentConfig = await readAppConfigInternal(resolvedPath);\n      if (parentConfig) {\n        parentConfigs.push(parentConfig);\n      }\n    }\n  }\n\n  return processDeprecatedValues(mergeParentConfig({ AppConfig, parentConfigs }));\n}\n\n/**\n * Delete deprecated values and convert them to the new format. (This mutates the `config` object.)\n */\nfunction processDeprecatedValues(config: AppConfig) {\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\n  return config;\n  /* eslint-enable etc/no-deprecated */\n}\n"]}
+{"version":3,"file":"readAppConfig.js","sourceRoot":"","sources":["../src/readAppConfig.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AppConfig, PackageSettings } from '@ms-cloudpack/common-types';\nimport { readJson } from '@ms-cloudpack/json-utilities';\nimport fs from 'fs';\nimport { getConfigPath } from './getConfigPath.js';\nimport { mergeParentConfig } from './mergeParentConfig.js';\nimport { resolveParentConfig } from './resolveParentConfig.js';\nimport { resolveModule } from '@ms-cloudpack/package-utilities';\nimport { validateMatch } from './validateMatch.js';\n\nexport interface ReadAppConfigOptions {\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/**\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<AppConfig> {\n  const { extraPackageSettings } = options || {};\n\n  const { appConfigPath } = getConfigPath(appPath);\n\n  // Do a separate existence check for the top-level config, since it's fine if that doesn't exist.\n  // (readAppConfigInternal throws if the file doesn't exist because it's also used for reading\n  // parent configs from \"extends\", which must exist if specified.)\n  let config: AppConfig;\n  if (!fs.existsSync(appConfigPath)) {\n    config = {};\n  } else {\n    config = (await readAppConfigInternal(appConfigPath)) || {};\n  }\n\n  if (extraPackageSettings) {\n    // Add these last so they take precedence.\n    (config.packageSettings ??= []).push(...extraPackageSettings);\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({ parentUrl: configPath, importSpecifier });\n      bundlerCapabilitiesRegistry[name] = moduleUrl;\n    } catch (e) {\n      throw new Error(`Error resolving bundler capability  \"${importSpecifier}\":\\n${(e as Error).message || e}`);\n    }\n  }\n}\n/**\n * Reads the user config, with any `extends` parent configs merged in.\n * Throws an error if the config file exists but is not valid JSON, or there's some error reading it.\n */\nasync function readAppConfigInternal(configPath: string): Promise<AppConfig> {\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(`Could not read config file ${configPath}`);\n  }\n\n  if (!validateConfig(appConfig)) {\n    throw new Error(`Config file ${configPath} has invalid settings (see above for details)`);\n  }\n\n  resolveBundlerCapabilities({ appConfig, configPath });\n\n  processDeprecatedValues(appConfig);\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 parentConfigs = await Promise.all(\n    extendsArray.map((importSpecifier) => readAppConfigInternal(resolveParentConfig({ configPath, importSpecifier }))),\n  );\n  return mergeParentConfig({ appConfig, parentConfigs });\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) {\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 * 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/lib/readConfig.d.ts

@@ -8,7 +8,10 @@ export interface ReadConfigOptions extends ReadAppConfigOptions {
     mode?: BundleMode;
 }
 /**
- * Reads the config file asynchronously (and merges generated config into the result.)
+ * Read the app config and generated config if they exist.
+ *
+ * Throws if there's an error reading a file or certain settings are invalid. (As of writing,
+ * this doesn't do full schema validation; it only validates certain specific settings.)
  */
 export declare function readConfig(appPath: string, options?: ReadConfigOptions): Promise<CloudpackConfig>;
 //# sourceMappingURL=readConfig.d.ts.map

package/lib/readConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"readConfig.d.ts","sourceRoot":"","sources":["../src/readConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,UAAU,EACV,eAAe,EAOhB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAiB,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAc9E,MAAM,WAAW,iBAAkB,SAAQ,oBAAoB;IAC7D;;;OAGG;IACH,IAAI,CAAC,EAAE,UAAU,CAAC;CACnB;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC,CAuBvG"}
+{"version":3,"file":"readConfig.d.ts","sourceRoot":"","sources":["../src/readConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,UAAU,EACV,eAAe,EAOhB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAiB,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAc9E,MAAM,WAAW,iBAAkB,SAAQ,oBAAoB;IAC7D;;;OAGG;IACH,IAAI,CAAC,EAAE,UAAU,CAAC;CACnB;AAED;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC,CAoBvG"}

package/lib/readConfig.js

@@ -7,14 +7,15 @@ import path from 'path';
 import { readJsonSync } from '@ms-cloudpack/json-utilities';
 import { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';
 /**
- * Reads the config file asynchronously (and merges generated config into the result.)
+ * Read the app config and generated config if they exist.
+ *
+ * Throws if there's an error reading a file or certain settings are invalid. (As of writing,
+ * this doesn't do full schema validation; it only validates certain specific settings.)
  */
 export async function readConfig(appPath, options) {
     const { mode = 'library', extraPackageSettings } = options || {};
-    const [appConfig, generatedConfig] = await Promise.all([
-        readAppConfig(appPath, { extraPackageSettings }),
-        readGeneratedConfig(appPath),
-    ]);
+    const { routes, ...appConfig } = await readAppConfig(appPath, { extraPackageSettings });
+    const generatedConfig = await readGeneratedConfig(appPath);
     const config = {
         ...appConfig,
         appPath,
@@ -23,7 +24,6 @@ export async function readConfig(appPath, options) {
         generatedSnapshot: structuredClone(generatedConfig),
     };
     // Expands all routes which refer to source files into fully transformed route objects.
-    const routes = appConfig.routes;
     if (routes?.length) {
         config.routes = expandRoutes(routes, appPath);
     }

package/lib/readConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"readConfig.js","sourceRoot":"","sources":["../src/readConfig.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,yBAAyB,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACjG,OAAO,EAAE,aAAa,EAA6B,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAClG,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAgB1E;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAAe,EAAE,OAA2B;IAC3E,MAAM,EAAE,IAAI,GAAG,SAAS,EAAE,oBAAoB,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAEjE,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACrD,aAAa,CAAC,OAAO,EAAE,EAAE,oBAAoB,EAAE,CAAC;QAChD,mBAAmB,CAAC,OAAO,CAAC;KAC7B,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG;QACb,GAAG,SAAS;QACZ,OAAO;QACP,IAAI;QACJ,SAAS,EAAE,eAAe;QAC1B,iBAAiB,EAAE,eAAe,CAAC,eAAe,CAAC;KACjC,CAAC;IAErB,uFAAuF;IACvF,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IAChC,IAAI,MAAM,EAAE,MAAM,EAAE,CAAC;QACnB,MAAM,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,SAAS,YAAY,CAAC,MAAwB,EAAE,OAAe;IAC7D,+DAA+D;IAC/D,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAEtD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC1B,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1E,+CAA+C;YAC/C,OAAO,KAAK,CAAC;QACf,CAAC;QAED,6CAA6C;QAC7C,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;QAC9C,MAAM,aAAa,GAAmC,IAAI,CAAC;QAE3D,IAAI,KAAK,EAAE,MAAM,EAAE,CAAC;YAClB,qDAAqD;YACrD,aAAa,CAAC,KAAK,GAAG,WAAW,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAC1E,CAAC;QAED,IAAI,WAAW,EAAE,CAAC;YAChB,wEAAwE;YACxE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;YAC/C,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CACb,mCAAmC,WAAW,wDAAwD,CACvG,CAAC;YACJ,CAAC;YAED,MAAM,QAAQ,GAAG,gBAAgB,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;YAClF,OAAO,CAAC,IAAI,CACV,+EAA+E,EAC/E,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,aAAa,EAAE,KAAK,EAAE,QAAQ,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAC1E,CAAC;YACF,CAAC,aAAa,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9C,CAAC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,WAAW,CAAC,MAIpB;IACC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,MAAM,CAAC;IACpD,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAErF,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAClC,gBAAgB,CAAC;QACf,uFAAuF;QACvF,UAAU,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;QAC/D,QAAQ,EAAE,gBAAgB,CAAC,SAAS,CAAC,IAAI,SAAS;QAClD,OAAO;KACR,CAAC,CACH,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,mBAAmB,CAAC,OAAe;IAC1C,6FAA6F;IAC7F,8CAA8C;IAC9C,MAAM,UAAU,GAAG,YAAY,CAAqB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,IAAI,EAAE,CAAC;IAC9F,MAAM,WAAW,GAAuC,iBAAiB,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IACpG,WAAW,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,IAAI,CAAC;IAC1D,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,iEAAiE;AACjE,SAAS,gBAAgB,CAAC,OAAmE;IAC3F,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAClD,MAAM,UAAU,GAAG,wBAAwB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAE/D,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,4CAA4C,QAAQ,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,OAAO;QACL,mCAAmC;QACnC,UAAU;QACV,iBAAiB;QACjB,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC,UAAU,CAAC;KAClG,CAAC;AACJ,CAAC","sourcesContent":["import type {\n  BootstrapRoute,\n  BundleMode,\n  CloudpackConfig,\n  ExpandedSourcePath,\n  PackageJson,\n  RenderedRoute,\n  Route,\n  ShorthandRenderedRoute,\n  ShorthandRoute,\n} from '@ms-cloudpack/common-types';\nimport { isShorthandBootstrapRoute, isShorthandRenderedRoute } from '@ms-cloudpack/common-types';\nimport { readAppConfig, type ReadAppConfigOptions } from './readAppConfig.js';\nimport { readGeneratedConfig } from './readGeneratedConfig.js';\nimport { intermediateToSourcePath, sourceToIntermediatePath } from '@ms-cloudpack/path-utilities';\nimport { flattenExportsMap } from '@ms-cloudpack/package-utilities';\nimport path from 'path';\nimport { readJsonSync } from '@ms-cloudpack/json-utilities';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\n\n/**\n * package.json with only the keys used in this file, since we're missing some logic from\n * PackageDefinitions which is assumed in the full type.\n */\ntype PartialPackageJson = Pick<PackageJson, 'exports' | 'module' | 'main'>;\n\nexport interface ReadConfigOptions extends ReadAppConfigOptions {\n  /**\n   * Override bundle mode.\n   * @default 'library'\n   */\n  mode?: BundleMode;\n}\n\n/**\n * Reads the config file asynchronously (and merges generated config into the result.)\n */\nexport async function readConfig(appPath: string, options?: ReadConfigOptions): Promise<CloudpackConfig> {\n  const { mode = 'library', extraPackageSettings } = options || {};\n\n  const [appConfig, generatedConfig] = await Promise.all([\n    readAppConfig(appPath, { extraPackageSettings }),\n    readGeneratedConfig(appPath),\n  ]);\n\n  const config = {\n    ...appConfig,\n    appPath,\n    mode,\n    generated: generatedConfig,\n    generatedSnapshot: structuredClone(generatedConfig),\n  } as CloudpackConfig;\n\n  // Expands all routes which refer to source files into fully transformed route objects.\n  const routes = appConfig.routes;\n  if (routes?.length) {\n    config.routes = expandRoutes(routes, appPath);\n  }\n\n  return config;\n}\n\n/**\n * Ensure all source entries in routes are expanded to fully qualified entry paths.\n */\nfunction expandRoutes(routes: ShorthandRoute[], appPath: string): Route[] {\n  // Cached flattened exports for appPath, used to expand entries\n  const flattenedExports = getFlattenedExports(appPath);\n\n  return routes.map((route) => {\n    if (!isShorthandRenderedRoute(route) && !isShorthandBootstrapRoute(route)) {\n      // Skip extra processing for other route types.\n      return route;\n    }\n\n    // eslint-disable-next-line etc/no-deprecated\n    const { entry, exportEntry, ...rest } = route;\n    const renderedRoute: RenderedRoute | BootstrapRoute = rest;\n\n    if (entry?.length) {\n      // Expand the entry to full info about the file path.\n      renderedRoute.entry = expandEntry({ entry, appPath, flattenedExports });\n    }\n\n    if (exportEntry) {\n      // Handle backwards compatibility with moving from exportEntry to entry.\n      const filePath = flattenedExports[exportEntry];\n      if (!filePath) {\n        throw new Error(\n          `A route referenced exportEntry \"${exportEntry}\" but this couldn't be resolved from the package.json.`,\n        );\n      }\n\n      const expanded = expandRouteEntry({ importPath: exportEntry, filePath, appPath });\n      console.warn(\n        'The route property \"exportEntry\" is deprecated. Update your route as follows:',\n        JSON.stringify({ ...renderedRoute, entry: expanded.sourcePath }, null, 2),\n      );\n      (renderedRoute.entry ??= []).push(expanded);\n    }\n\n    return renderedRoute;\n  });\n}\n\nfunction expandEntry(params: {\n  entry: ShorthandRenderedRoute['entry'];\n  appPath: string;\n  flattenedExports: Record<string, string | undefined>;\n}): ExpandedSourcePath[] {\n  const { entry, appPath, flattenedExports } = params;\n  const entryArray = Array.isArray(entry) ? entry : entry !== undefined ? [entry] : [];\n\n  return entryArray.map((entryPath) =>\n    expandRouteEntry({\n      // Usually entryPath will be a source path, but also handle if it's an exports map key.\n      importPath: flattenedExports[entryPath] ? entryPath : undefined,\n      filePath: flattenedExports[entryPath] || entryPath,\n      appPath,\n    }),\n  );\n}\n\n/**\n * Get flattened exports from package.json at `appPath`.\n * If there's no export for `.`, it will be filled in from `module || main`.\n */\nfunction getFlattenedExports(appPath: string): Record<string, string | undefined> {\n  // We can't use PackageDefinitions.get here because we're reading the config, and definitions\n  // cache requires config resulting in a cycle.\n  const definition = readJsonSync<PartialPackageJson>(path.join(appPath, 'package.json')) || {};\n  const flatExports: Record<string, string | undefined> = flattenExportsMap(definition.exports || {});\n  flatExports['.'] ??= definition.module || definition.main;\n  return flatExports;\n}\n\n/** Expands shorthand route entries into fully qualified ones. */\nfunction expandRouteEntry(options: { importPath?: string; filePath: string; appPath: string }): ExpandedSourcePath {\n  const { filePath, appPath, importPath } = options;\n  const sourcePath = intermediateToSourcePath(filePath, appPath);\n\n  if (!sourcePath) {\n    throw new Error(`Could not resolve source path for entry: ${filePath}`);\n  }\n\n  return {\n    // Used to derive bundle entry path\n    sourcePath,\n    // Import map key\n    importPath: importPath ? normalizeRelativePath(importPath) : sourceToIntermediatePath(sourcePath),\n  };\n}\n"]}
+{"version":3,"file":"readConfig.js","sourceRoot":"","sources":["../src/readConfig.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  BootstrapRoute,\n  BundleMode,\n  CloudpackConfig,\n  ExpandedSourcePath,\n  PackageJson,\n  RenderedRoute,\n  Route,\n  ShorthandRenderedRoute,\n  ShorthandRoute,\n} from '@ms-cloudpack/common-types';\nimport { isShorthandBootstrapRoute, isShorthandRenderedRoute } from '@ms-cloudpack/common-types';\nimport { readAppConfig, type ReadAppConfigOptions } from './readAppConfig.js';\nimport { readGeneratedConfig } from './readGeneratedConfig.js';\nimport { intermediateToSourcePath, sourceToIntermediatePath } from '@ms-cloudpack/path-utilities';\nimport { flattenExportsMap } from '@ms-cloudpack/package-utilities';\nimport path from 'path';\nimport { readJsonSync } from '@ms-cloudpack/json-utilities';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\n\n/**\n * package.json with only the keys used in this file, since we're missing some logic from\n * PackageDefinitions which is assumed in the full type.\n */\ntype PartialPackageJson = Pick<PackageJson, 'exports' | 'module' | 'main'>;\n\nexport interface ReadConfigOptions extends ReadAppConfigOptions {\n  /**\n   * Override bundle mode.\n   * @default 'library'\n   */\n  mode?: BundleMode;\n}\n\n/**\n * Read the app config and generated config if they exist.\n *\n * Throws if there's an error reading a file or certain settings are invalid. (As of writing,\n * this doesn't do full schema validation; it only validates certain specific settings.)\n */\nexport async function readConfig(appPath: string, options?: ReadConfigOptions): Promise<CloudpackConfig> {\n  const { mode = 'library', extraPackageSettings } = options || {};\n\n  const { routes, ...appConfig } = await readAppConfig(appPath, { extraPackageSettings });\n  const generatedConfig = await readGeneratedConfig(appPath);\n\n  const config: CloudpackConfig = {\n    ...appConfig,\n    appPath,\n    mode,\n    generated: generatedConfig,\n    generatedSnapshot: structuredClone(generatedConfig),\n  };\n\n  // Expands all routes which refer to source files into fully transformed route objects.\n  if (routes?.length) {\n    config.routes = expandRoutes(routes, appPath);\n  }\n\n  return config;\n}\n\n/**\n * Ensure all source entries in routes are expanded to fully qualified entry paths.\n */\nfunction expandRoutes(routes: ShorthandRoute[], appPath: string): Route[] {\n  // Cached flattened exports for appPath, used to expand entries\n  const flattenedExports = getFlattenedExports(appPath);\n\n  return routes.map((route) => {\n    if (!isShorthandRenderedRoute(route) && !isShorthandBootstrapRoute(route)) {\n      // Skip extra processing for other route types.\n      return route;\n    }\n\n    // eslint-disable-next-line etc/no-deprecated\n    const { entry, exportEntry, ...rest } = route;\n    const renderedRoute: RenderedRoute | BootstrapRoute = rest;\n\n    if (entry?.length) {\n      // Expand the entry to full info about the file path.\n      renderedRoute.entry = expandEntry({ entry, appPath, flattenedExports });\n    }\n\n    if (exportEntry) {\n      // Handle backwards compatibility with moving from exportEntry to entry.\n      const filePath = flattenedExports[exportEntry];\n      if (!filePath) {\n        throw new Error(\n          `A route referenced exportEntry \"${exportEntry}\" but this couldn't be resolved from the package.json.`,\n        );\n      }\n\n      const expanded = expandRouteEntry({ importPath: exportEntry, filePath, appPath });\n      console.warn(\n        'The route property \"exportEntry\" is deprecated. Update your route as follows:',\n        JSON.stringify({ ...renderedRoute, entry: expanded.sourcePath }, null, 2),\n      );\n      (renderedRoute.entry ??= []).push(expanded);\n    }\n\n    return renderedRoute;\n  });\n}\n\nfunction expandEntry(params: {\n  entry: ShorthandRenderedRoute['entry'];\n  appPath: string;\n  flattenedExports: Record<string, string | undefined>;\n}): ExpandedSourcePath[] {\n  const { entry, appPath, flattenedExports } = params;\n  const entryArray = Array.isArray(entry) ? entry : entry !== undefined ? [entry] : [];\n\n  return entryArray.map((entryPath) =>\n    expandRouteEntry({\n      // Usually entryPath will be a source path, but also handle if it's an exports map key.\n      importPath: flattenedExports[entryPath] ? entryPath : undefined,\n      filePath: flattenedExports[entryPath] || entryPath,\n      appPath,\n    }),\n  );\n}\n\n/**\n * Get flattened exports from package.json at `appPath`.\n * If there's no export for `.`, it will be filled in from `module || main`.\n */\nfunction getFlattenedExports(appPath: string): Record<string, string | undefined> {\n  // We can't use PackageDefinitions.get here because we're reading the config, and definitions\n  // cache requires config resulting in a cycle.\n  const definition = readJsonSync<PartialPackageJson>(path.join(appPath, 'package.json')) || {};\n  const flatExports: Record<string, string | undefined> = flattenExportsMap(definition.exports || {});\n  flatExports['.'] ??= definition.module || definition.main;\n  return flatExports;\n}\n\n/** Expands shorthand route entries into fully qualified ones. */\nfunction expandRouteEntry(options: { importPath?: string; filePath: string; appPath: string }): ExpandedSourcePath {\n  const { filePath, appPath, importPath } = options;\n  const sourcePath = intermediateToSourcePath(filePath, appPath);\n\n  if (!sourcePath) {\n    throw new Error(`Could not resolve source path for entry: ${filePath}`);\n  }\n\n  return {\n    // Used to derive bundle entry path\n    sourcePath,\n    // Import map key\n    importPath: importPath ? normalizeRelativePath(importPath) : sourceToIntermediatePath(sourcePath),\n  };\n}\n"]}

package/lib/resolveParentConfig.d.ts

@@ -1,11 +1,11 @@
 /**
  * Resolve an import specifier for a parent config file.
- * Returns undefined if it can't be resolved or doesn't exist.
+ * Throws if it can't be resolved or doesn't exist.
  */
 export declare function resolveParentConfig(params: {
     /** Path of the config file being processed. */
     configPath: string;
     /** The import specifier for the parent (extends) config file. */
     importSpecifier: string;
-}): string | undefined;
+}): string;
 //# sourceMappingURL=resolveParentConfig.d.ts.map

package/lib/resolveParentConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveParentConfig.d.ts","sourceRoot":"","sources":["../src/resolveParentConfig.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE;IAC1C,+CAA+C;IAC/C,UAAU,EAAE,MAAM,CAAC;IACnB,iEAAiE;IACjE,eAAe,EAAE,MAAM,CAAC;CACzB,GAAG,MAAM,GAAG,SAAS,CAUrB"}
+{"version":3,"file":"resolveParentConfig.d.ts","sourceRoot":"","sources":["../src/resolveParentConfig.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE;IAC1C,+CAA+C;IAC/C,UAAU,EAAE,MAAM,CAAC;IACnB,iEAAiE;IACjE,eAAe,EAAE,MAAM,CAAC;CACzB,GAAG,MAAM,CAWT"}

package/lib/resolveParentConfig.js

@@ -2,16 +2,18 @@ import { fileURLToPath } from 'url';
 import { resolveModule } from '@ms-cloudpack/package-utilities';
 /**
  * Resolve an import specifier for a parent config file.
- * Returns undefined if it can't be resolved or doesn't exist.
+ * Throws if it can't be resolved or doesn't exist.
  */
 export function resolveParentConfig(params) {
-    const { importSpecifier } = params;
+    const { importSpecifier, configPath } = params;
     try {
-        return fileURLToPath(resolveModule({ importSpecifier, parentUrl: params.configPath }));
+        return fileURLToPath(resolveModule({ importSpecifier, parentUrl: configPath }));
     }
     catch (err) {
-        console.warn(`Error resolving config "extends": "${importSpecifier}": ${err.message || err}`);
+        // The error message often includes the config path, so don't show it twice.
+        const errorMessage = String(err.message || err);
+        const fromPathPart = errorMessage.includes(configPath) ? '' : ` from ${configPath}`;
+        throw new Error(`Could not resolve "extends": "${importSpecifier}"${fromPathPart}:\n${errorMessage}`);
     }
-    return undefined;
 }
 //# sourceMappingURL=resolveParentConfig.js.map

package/lib/resolveParentConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveParentConfig.js","sourceRoot":"","sources":["../src/resolveParentConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAEhE;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAKnC;IACC,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;IAEnC,IAAI,CAAC;QACH,OAAO,aAAa,CAAC,aAAa,CAAC,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IACzF,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,IAAI,CAAC,sCAAsC,eAAe,MAAO,GAAa,CAAC,OAAO,IAAI,GAAG,EAAE,CAAC,CAAC;IAC3G,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC","sourcesContent":["import { fileURLToPath } from 'url';\nimport { resolveModule } from '@ms-cloudpack/package-utilities';\n\n/**\n * Resolve an import specifier for a parent config file.\n * Returns undefined if it can't be resolved or doesn't exist.\n */\nexport function resolveParentConfig(params: {\n  /** Path of the config file being processed. */\n  configPath: string;\n  /** The import specifier for the parent (extends) config file. */\n  importSpecifier: string;\n}): string | undefined {\n  const { importSpecifier } = params;\n\n  try {\n    return fileURLToPath(resolveModule({ importSpecifier, parentUrl: params.configPath }));\n  } catch (err) {\n    console.warn(`Error resolving config \"extends\": \"${importSpecifier}\": ${(err as Error).message || err}`);\n  }\n\n  return undefined;\n}\n"]}
+{"version":3,"file":"resolveParentConfig.js","sourceRoot":"","sources":["../src/resolveParentConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAEhE;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAKnC;IACC,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IAE/C,IAAI,CAAC;QACH,OAAO,aAAa,CAAC,aAAa,CAAC,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IAClF,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,4EAA4E;QAC5E,MAAM,YAAY,GAAG,MAAM,CAAE,GAAa,CAAC,OAAO,IAAI,GAAG,CAAC,CAAC;QAC3D,MAAM,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC;QACpF,MAAM,IAAI,KAAK,CAAC,iCAAiC,eAAe,IAAI,YAAY,MAAM,YAAY,EAAE,CAAC,CAAC;IACxG,CAAC;AACH,CAAC","sourcesContent":["import { fileURLToPath } from 'url';\nimport { resolveModule } from '@ms-cloudpack/package-utilities';\n\n/**\n * Resolve an import specifier for a parent config file.\n * Throws if it can't be resolved or doesn't exist.\n */\nexport function resolveParentConfig(params: {\n  /** Path of the config file being processed. */\n  configPath: string;\n  /** The import specifier for the parent (extends) config file. */\n  importSpecifier: string;\n}): string {\n  const { importSpecifier, configPath } = params;\n\n  try {\n    return fileURLToPath(resolveModule({ importSpecifier, parentUrl: configPath }));\n  } catch (err) {\n    // The error message often includes the config path, so don't show it twice.\n    const errorMessage = String((err as Error).message || err);\n    const fromPathPart = errorMessage.includes(configPath) ? '' : ` from ${configPath}`;\n    throw new Error(`Could not resolve \"extends\": \"${importSpecifier}\"${fromPathPart}:\\n${errorMessage}`);\n  }\n}\n"]}

package/lib/validateMatch.d.ts

@@ -0,0 +1,13 @@
+import type { PackageSettingsMatch } from '@ms-cloudpack/common-types';
+/**
+ * Validate a package settings match object.
+ * (As of writing, this just checks that negated matches don't have a version.)
+ * @returns object with validation info (so the caller can log and/or throw as needed)
+ */
+export declare function validateMatch(match: PackageSettingsMatch): {
+    isValid: false;
+    error: string;
+} | {
+    isValid: true;
+};
+//# sourceMappingURL=validateMatch.d.ts.map

package/lib/validateMatch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validateMatch.d.ts","sourceRoot":"","sources":["../src/validateMatch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAEvE;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,oBAAoB,GAAG;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,IAAI,CAAA;CAAE,CAQhH"}

package/lib/validateMatch.js

@@ -0,0 +1,15 @@
+/**
+ * Validate a package settings match object.
+ * (As of writing, this just checks that negated matches don't have a version.)
+ * @returns object with validation info (so the caller can log and/or throw as needed)
+ */
+export function validateMatch(match) {
+    if (typeof match === 'object' && match.name.startsWith('!') && match.version && match.version !== '*') {
+        return {
+            isValid: false,
+            error: `Negated match name "${match.name}" cannot have a version ("${match.version}")`,
+        };
+    }
+    return { isValid: true };
+}
+//# sourceMappingURL=validateMatch.js.map

package/lib/validateMatch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validateMatch.js","sourceRoot":"","sources":["../src/validateMatch.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,KAA2B;IACvD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,KAAK,GAAG,EAAE,CAAC;QACtG,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,uBAAuB,KAAK,CAAC,IAAI,6BAA6B,KAAK,CAAC,OAAO,IAAI;SACvF,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AAC3B,CAAC","sourcesContent":["import type { PackageSettingsMatch } from '@ms-cloudpack/common-types';\n\n/**\n * Validate a package settings match object.\n * (As of writing, this just checks that negated matches don't have a version.)\n * @returns object with validation info (so the caller can log and/or throw as needed)\n */\nexport function validateMatch(match: PackageSettingsMatch): { isValid: false; error: string } | { isValid: true } {\n  if (typeof match === 'object' && match.name.startsWith('!') && match.version && match.version !== '*') {\n    return {\n      isValid: false,\n      error: `Negated match name \"${match.name}\" cannot have a version (\"${match.version}\")`,\n    };\n  }\n  return { isValid: true };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/config",
-  "version": "0.31.6",
+  "version": "0.32.0",
   "description": "Configuration handling for cloudpack.",
   "license": "MIT",
   "type": "module",
@@ -14,11 +14,11 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/common-types": "^0.23.1",
+    "@ms-cloudpack/common-types": "^0.23.3",
     "@ms-cloudpack/json-utilities": "^0.1.8",
-    "@ms-cloudpack/package-utilities": "^10.2.6",
+    "@ms-cloudpack/package-utilities": "^10.2.8",
     "@ms-cloudpack/path-string-parsing": "^1.2.4",
-    "@ms-cloudpack/path-utilities": "^2.7.50",
+    "@ms-cloudpack/path-utilities": "^2.7.52",
     "semver": "^7.6.0"
   },
   "devDependencies": {