@ms-cloudpack/config 0.25.1 → 0.26.0

package/lib/readGeneratedConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"readGeneratedConfig.d.ts","sourceRoot":"","sources":["../src/readGeneratedConfig.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,4BAA4B,CAAC;AAEnF;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAMnF"}
+{"version":3,"file":"readGeneratedConfig.d.ts","sourceRoot":"","sources":["../src/readGeneratedConfig.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAElE;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAInF"}

package/lib/readGeneratedConfig.js

@@ -8,28 +8,6 @@ import { getConfigPath } from './getConfigPath.js';
  */
 export async function readGeneratedConfig(appPath) {
     const { generatedConfigPath } = getConfigPath(appPath);
-    return processDeprecatedValues((await readJson(generatedConfigPath, { throwOnError: true, mode: 'permissive' })) || {});
-}
-/**
- * Delete deprecated values and convert them to the new format. Note that this function
- * mutates the passed-in config object to avoid reallocation.
- */
-function processDeprecatedValues(config) {
-    // eslint-disable-next-line etc/no-deprecated
-    const { packageOverrides } = config;
-    // Convert package overrides into settings to preserve the deprecated support.
-    if (packageOverrides) {
-        config.packageSettings = config.packageSettings || [];
-        for (const override of packageOverrides) {
-            const settings = {
-                match: { name: override.name, version: override.versionRequirement },
-                exports: override.overrides.exports,
-            };
-            config.packageSettings.push(settings);
-        }
-        // eslint-disable-next-line etc/no-deprecated
-        delete config.packageOverrides;
-    }
-    return config;
+    return (await readJson(generatedConfigPath, { throwOnError: true, mode: 'permissive' })) || {};
 }
 //# sourceMappingURL=readGeneratedConfig.js.map

package/lib/readGeneratedConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"readGeneratedConfig.js","sourceRoot":"","sources":["../src/readGeneratedConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGnD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAAe;IACvD,MAAM,EAAE,mBAAmB,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAEvD,OAAO,uBAAuB,CAC5B,CAAC,MAAM,QAAQ,CAAC,mBAAmB,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC,IAAI,EAAE,CACxF,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,uBAAuB,CAAC,MAAuB;IACtD,6CAA6C;IAC7C,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,CAAC;IAEpC,8EAA8E;IAC9E,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,EAAE,CAAC;QAEtD,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE,CAAC;YACxC,MAAM,QAAQ,GAAoB;gBAChC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,kBAAkB,EAAE;gBACpE,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,OAAO;aACpC,CAAC;YACF,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC;QAED,6CAA6C;QAC7C,OAAO,MAAM,CAAC,gBAAgB,CAAC;IACjC,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import { readJson } from '@ms-cloudpack/json-utilities';\nimport { getConfigPath } from './getConfigPath.js';\nimport type { GeneratedConfig, PackageSettings } from '@ms-cloudpack/common-types';\n\n/**\n * Reads the generated config file asynchronously. This is only useful for the `init` verb generating or updated\n * the generated overrides. 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 readGeneratedConfig(appPath: string): Promise<GeneratedConfig> {\n  const { generatedConfigPath } = getConfigPath(appPath);\n\n  return processDeprecatedValues(\n    (await readJson(generatedConfigPath, { throwOnError: true, mode: 'permissive' })) || {},\n  );\n}\n\n/**\n * Delete deprecated values and convert them to the new format. Note that this function\n * mutates the passed-in config object to avoid reallocation.\n */\nfunction processDeprecatedValues(config: GeneratedConfig) {\n  // eslint-disable-next-line etc/no-deprecated\n  const { packageOverrides } = config;\n\n  // Convert package overrides into settings to preserve the deprecated support.\n  if (packageOverrides) {\n    config.packageSettings = config.packageSettings || [];\n\n    for (const override of packageOverrides) {\n      const settings: PackageSettings = {\n        match: { name: override.name, version: override.versionRequirement },\n        exports: override.overrides.exports,\n      };\n      config.packageSettings.push(settings);\n    }\n\n    // eslint-disable-next-line etc/no-deprecated\n    delete config.packageOverrides;\n  }\n\n  return config;\n}\n"]}
+{"version":3,"file":"readGeneratedConfig.js","sourceRoot":"","sources":["../src/readGeneratedConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGnD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAAe;IACvD,MAAM,EAAE,mBAAmB,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAEvD,OAAO,CAAC,MAAM,QAAQ,CAAC,mBAAmB,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AACjG,CAAC","sourcesContent":["import { readJson } from '@ms-cloudpack/json-utilities';\nimport { getConfigPath } from './getConfigPath.js';\nimport type { GeneratedConfig } from '@ms-cloudpack/common-types';\n\n/**\n * Reads the generated config file asynchronously. This is only useful for the `init` verb generating or updated\n * the generated overrides. 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 readGeneratedConfig(appPath: string): Promise<GeneratedConfig> {\n  const { generatedConfigPath } = getConfigPath(appPath);\n\n  return (await readJson(generatedConfigPath, { throwOnError: true, mode: 'permissive' })) || {};\n}\n"]}

package/lib/sortGeneratedConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sortGeneratedConfig.d.ts","sourceRoot":"","sources":["../src/sortGeneratedConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAyC,MAAM,4BAA4B,CAAC;AAKzG;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,eAAe,QAmC7D"}
+{"version":3,"file":"sortGeneratedConfig.d.ts","sourceRoot":"","sources":["../src/sortGeneratedConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAyC,MAAM,4BAA4B,CAAC;AAIzG;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,eAAe,QAiC7D"}

package/lib/sortGeneratedConfig.js

@@ -1,15 +1,12 @@
 import { sortObjectKeys } from './sortObjectKeys.js';
 import { compareSettings } from './compareSettings.js';
-import { compareOverrides } from './compareOverrides.js';
 /**
  * Sorts the generated config so that we don't have unneeded changes due to differences in
  * order of operations.
  */
 export function sortGeneratedConfig(generated) {
-    // eslint-disable-next-line etc/no-deprecated
-    const { packageSettings = [], packageOverrides } = generated;
+    const { packageSettings = [] } = generated;
     // Ensure package overrides are sorted based on package name and version requirement.
-    packageOverrides?.sort(compareOverrides);
     packageSettings.sort(compareSettings);
     for (let i = 0; i < packageSettings.length; i++) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/lib/sortGeneratedConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"sortGeneratedConfig.js","sourceRoot":"","sources":["../src/sortGeneratedConfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,SAA0B;IAC5D,6CAA6C;IAC7C,MAAM,EAAE,eAAe,GAAG,EAAE,EAAE,gBAAgB,EAAE,GAAG,SAAS,CAAC;IAE7D,qFAAqF;IACrF,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACzC,eAAe,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAEtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAChD,8DAA8D;QAC9D,MAAM,eAAe,GAAG,eAAe,CAAC,CAAC,CAAwB,CAAC;QAClE,MAAM,gBAAgB,GAGlB;YACF,mEAAmE;YACnE,KAAK,EAAE,eAAe,CAAC,KAAK;SAC7B,CAAC;QAEF,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,EAA+B,EAAE,CAAC;YACnF,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;gBACpB,mEAAmE;gBACnE,MAAM,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;gBACnC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;oBACzB,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;gBACvC,CAAC;qBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;oBACvD,gBAAgB,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;gBAChD,CAAC;qBAAM,CAAC;oBACN,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBAChC,CAAC;YACH,CAAC;QACH,CAAC;QAED,eAAe,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,gBAAgB,CAAC,CAAC;IACjD,CAAC;AACH,CAAC","sourcesContent":["import type { GeneratedConfig, PackageSettings, PackageSettingsMatch } from '@ms-cloudpack/common-types';\nimport { sortObjectKeys } from './sortObjectKeys.js';\nimport { compareSettings } from './compareSettings.js';\nimport { compareOverrides } from './compareOverrides.js';\n\n/**\n * Sorts the generated config so that we don't have unneeded changes due to differences in\n * order of operations.\n */\nexport function sortGeneratedConfig(generated: GeneratedConfig) {\n  // eslint-disable-next-line etc/no-deprecated\n  const { packageSettings = [], packageOverrides } = generated;\n\n  // Ensure package overrides are sorted based on package name and version requirement.\n  packageOverrides?.sort(compareOverrides);\n  packageSettings.sort(compareSettings);\n\n  for (let i = 0; i < packageSettings.length; i++) {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    const originalSetting = packageSettings[i] as Record<string, any>;\n    const formattedSetting: {\n      match: PackageSettingsMatch;\n      [key: string]: unknown;\n    } = {\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment\n      match: originalSetting.match,\n    };\n\n    for (const key of Object.keys(originalSetting).sort() as (keyof PackageSettings)[]) {\n      if (key !== 'match') {\n        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment\n        const value = originalSetting[key];\n        if (Array.isArray(value)) {\n          formattedSetting[key] = value.sort();\n        } else if (typeof value === 'object' && value !== null) {\n          formattedSetting[key] = sortObjectKeys(value);\n        } else {\n          formattedSetting[key] = value;\n        }\n      }\n    }\n\n    packageSettings.splice(i, 1, formattedSetting);\n  }\n}\n"]}
+{"version":3,"file":"sortGeneratedConfig.js","sourceRoot":"","sources":["../src/sortGeneratedConfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,SAA0B;IAC5D,MAAM,EAAE,eAAe,GAAG,EAAE,EAAE,GAAG,SAAS,CAAC;IAE3C,qFAAqF;IACrF,eAAe,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAEtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAChD,8DAA8D;QAC9D,MAAM,eAAe,GAAG,eAAe,CAAC,CAAC,CAAwB,CAAC;QAClE,MAAM,gBAAgB,GAGlB;YACF,mEAAmE;YACnE,KAAK,EAAE,eAAe,CAAC,KAAK;SAC7B,CAAC;QAEF,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,EAA+B,EAAE,CAAC;YACnF,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;gBACpB,mEAAmE;gBACnE,MAAM,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;gBACnC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;oBACzB,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;gBACvC,CAAC;qBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;oBACvD,gBAAgB,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;gBAChD,CAAC;qBAAM,CAAC;oBACN,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBAChC,CAAC;YACH,CAAC;QACH,CAAC;QAED,eAAe,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,gBAAgB,CAAC,CAAC;IACjD,CAAC;AACH,CAAC","sourcesContent":["import type { GeneratedConfig, PackageSettings, PackageSettingsMatch } from '@ms-cloudpack/common-types';\nimport { sortObjectKeys } from './sortObjectKeys.js';\nimport { compareSettings } from './compareSettings.js';\n\n/**\n * Sorts the generated config so that we don't have unneeded changes due to differences in\n * order of operations.\n */\nexport function sortGeneratedConfig(generated: GeneratedConfig) {\n  const { packageSettings = [] } = generated;\n\n  // Ensure package overrides are sorted based on package name and version requirement.\n  packageSettings.sort(compareSettings);\n\n  for (let i = 0; i < packageSettings.length; i++) {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    const originalSetting = packageSettings[i] as Record<string, any>;\n    const formattedSetting: {\n      match: PackageSettingsMatch;\n      [key: string]: unknown;\n    } = {\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment\n      match: originalSetting.match,\n    };\n\n    for (const key of Object.keys(originalSetting).sort() as (keyof PackageSettings)[]) {\n      if (key !== 'match') {\n        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment\n        const value = originalSetting[key];\n        if (Array.isArray(value)) {\n          formattedSetting[key] = value.sort();\n        } else if (typeof value === 'object' && value !== null) {\n          formattedSetting[key] = sortObjectKeys(value);\n        } else {\n          formattedSetting[key] = value;\n        }\n      }\n    }\n\n    packageSettings.splice(i, 1, formattedSetting);\n  }\n}\n"]}

package/lib/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.47.0"
+      "packageVersion": "7.47.6"
     }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/config",
-  "version": "0.25.1",
+  "version": "0.26.0",
   "description": "Configuration handling for cloudpack.",
   "license": "MIT",
   "type": "module",
@@ -14,10 +14,10 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/common-types": "^0.15.0",
+    "@ms-cloudpack/common-types": "^0.16.0",
     "@ms-cloudpack/json-utilities": "^0.1.7",
-    "@ms-cloudpack/package-utilities": "^9.0.1",
-    "@ms-cloudpack/path-utilities": "^2.7.32",
+    "@ms-cloudpack/package-utilities": "^9.0.2",
+    "@ms-cloudpack/path-utilities": "^2.7.33",
     "import-meta-resolve": "^4.0.0",
     "semver": "^7.6.0"
   },

package/lib/compareOverrides.d.ts

@@ -1,3 +0,0 @@
-import type { PackageOverride } from '@ms-cloudpack/common-types';
-export declare function compareOverrides(a: PackageOverride, b: PackageOverride): number;
-//# sourceMappingURL=compareOverrides.d.ts.map

package/lib/compareOverrides.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"compareOverrides.d.ts","sourceRoot":"","sources":["../src/compareOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAElE,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,eAAe,GAAG,MAAM,CAS/E"}

package/lib/compareOverrides.js

@@ -1,9 +0,0 @@
-export function compareOverrides(a, b) {
-    const { name: aName = '', versionRequirement: aVersion = '*' } = a;
-    const { name: bName = '', versionRequirement: bVersion = '*' } = b;
-    if (aName === bName) {
-        return aVersion.localeCompare(bVersion);
-    }
-    return aName.localeCompare(bName);
-}
-//# sourceMappingURL=compareOverrides.js.map

package/lib/compareOverrides.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"compareOverrides.js","sourceRoot":"","sources":["../src/compareOverrides.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,gBAAgB,CAAC,CAAkB,EAAE,CAAkB;IACrE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,EAAE,EAAE,kBAAkB,EAAE,QAAQ,GAAG,GAAG,EAAE,GAAG,CAAC,CAAC;IACnE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,EAAE,EAAE,kBAAkB,EAAE,QAAQ,GAAG,GAAG,EAAE,GAAG,CAAC,CAAC;IAEnE,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;QACpB,OAAO,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAED,OAAO,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AACpC,CAAC","sourcesContent":["import type { PackageOverride } from '@ms-cloudpack/common-types';\n\nexport function compareOverrides(a: PackageOverride, b: PackageOverride): number {\n  const { name: aName = '', versionRequirement: aVersion = '*' } = a;\n  const { name: bName = '', versionRequirement: bVersion = '*' } = b;\n\n  if (aName === bName) {\n    return aVersion.localeCompare(bVersion);\n  }\n\n  return aName.localeCompare(bName);\n}\n"]}