@ms-cloudpack/config 0.8.1 → 0.9.0

package/lib/createPackageOverrideTransform.d.ts

@@ -1,5 +1,5 @@
 import type { PackageDefinitionTransform } from '@ms-cloudpack/bundler-types';
-import type { CloudpackConfig } from '@ms-cloudpack/config';
+import type { CloudpackConfig } from './types/CloudpackConfig.js';
 /**
  * Creates a transform to be registered with a PackageDefinitions registry for applying overrides to from the config
  * to package.json definitions.

package/lib/createPackageOverrideTransform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createPackageOverrideTransform.d.ts","sourceRoot":"","sources":["../src/createPackageOverrideTransform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAe,MAAM,6BAA6B,CAAC;AAC3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG5D;;;GAGG;AACH,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,eAAe,GAAG,0BAA0B,CA4ClG"}
+{"version":3,"file":"createPackageOverrideTransform.d.ts","sourceRoot":"","sources":["../src/createPackageOverrideTransform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAe,MAAM,6BAA6B,CAAC;AAC3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAGlE;;;GAGG;AACH,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,eAAe,GAAG,0BAA0B,CA2DlG"}

package/lib/createPackageOverrideTransform.js

@@ -6,18 +6,28 @@ import { getPackageSettings } from './getPackageSettings.js';
 export function createPackageOverrideTransform(config) {
     return (packageDefinition) => {
         const { name = '', version = '' } = packageDefinition;
-        const packageSettings = getPackageSettings({ name, version, config });
-        if (!packageSettings) {
+        const { userPackageSettings, generatedPackageSettings } = getPackageSettings({ name, version, config });
+        if (!userPackageSettings && !generatedPackageSettings) {
             return undefined;
         }
         const result = { ...packageDefinition };
         // If we have a custom exports map for the package, apply it.
-        if (packageSettings.exports) {
-            result.exports = packageSettings.exports;
+        if (userPackageSettings?.exports) {
+            result.exports = userPackageSettings.exports;
+        }
+        // If we have generated overrides, apply them.
+        if (generatedPackageSettings?.exports) {
+            result.exports = result.exports
+                ? [result.exports, generatedPackageSettings.exports]
+                : generatedPackageSettings.exports;
         }
         // If we have included dependencies, add them.
-        if (packageSettings.includedDependencies?.length) {
-            for (const dep of packageSettings.includedDependencies) {
+        const includedDependencies = [
+            ...(userPackageSettings?.includedDependencies || []),
+            ...(generatedPackageSettings?.includedDependencies || []),
+        ];
+        if (includedDependencies.length) {
+            for (const dep of includedDependencies) {
                 if (!result.dependencies?.[dep]) {
                     // Initialize dependencies map if it doesn't exist.
                     result.dependencies ??= {};
@@ -31,8 +41,12 @@ export function createPackageOverrideTransform(config) {
             }
         }
         // If we have excluded dependencies, remove them.
-        if (packageSettings.excludedDependencies?.length) {
-            result.dependencies = Object.fromEntries(Object.entries(result.dependencies || {}).filter(([dep]) => !packageSettings.excludedDependencies?.includes(dep)));
+        const excludedDependencies = [
+            ...(userPackageSettings?.excludedDependencies || []),
+            ...(generatedPackageSettings?.excludedDependencies || []),
+        ];
+        if (excludedDependencies?.length) {
+            result.dependencies = Object.fromEntries(Object.entries(result.dependencies || {}).filter(([dep]) => !excludedDependencies?.includes(dep)));
         }
         return result;
     };

package/lib/createPackageOverrideTransform.js.map

@@ -1 +1 @@
-{"version":3,"file":"createPackageOverrideTransform.js","sourceRoot":"","sources":["../src/createPackageOverrideTransform.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D;;;GAGG;AACH,MAAM,UAAU,8BAA8B,CAAC,MAAuB;IACpE,OAAO,CAAC,iBAA8B,EAAE,EAAE;QACxC,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,GAAG,iBAAiB,CAAC;QACtD,MAAM,eAAe,GAAG,kBAAkB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QAEtE,IAAI,CAAC,eAAe,EAAE;YACpB,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,MAAM,GAAG,EAAE,GAAG,iBAAiB,EAAE,CAAC;QAExC,6DAA6D;QAC7D,IAAI,eAAe,CAAC,OAAO,EAAE;YAC3B,MAAM,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;SAC1C;QAED,8CAA8C;QAC9C,IAAI,eAAe,CAAC,oBAAoB,EAAE,MAAM,EAAE;YAChD,KAAK,MAAM,GAAG,IAAI,eAAe,CAAC,oBAAoB,EAAE;gBACtD,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC,EAAE;oBAC/B,mDAAmD;oBACnD,MAAM,CAAC,YAAY,KAAK,EAAE,CAAC;oBAE3B,4DAA4D;oBAC5D,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC;wBACtB,MAAM,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC;4BAC7B,MAAM,CAAC,gBAAgB,EAAE,CAAC,GAAG,CAAC;4BAC9B,MAAM,CAAC,oBAAoB,EAAE,CAAC,GAAG,CAAC;4BAClC,GAAG,CAAC;iBACP;aACF;SACF;QAED,iDAAiD;QACjD,IAAI,eAAe,CAAC,oBAAoB,EAAE,MAAM,EAAE;YAChD,MAAM,CAAC,YAAY,GAAG,MAAM,CAAC,WAAW,CACtC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,MAAM,CAC9C,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,eAAe,CAAC,oBAAoB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAChE,CACF,CAAC;SACH;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { PackageDefinitionTransform, PackageJson } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\nimport { getPackageSettings } from './getPackageSettings.js';\n\n/**\n * Creates a transform to be registered with a PackageDefinitions registry for applying overrides to from the config\n * to package.json definitions.\n */\nexport function createPackageOverrideTransform(config: CloudpackConfig): PackageDefinitionTransform {\n  return (packageDefinition: PackageJson) => {\n    const { name = '', version = '' } = packageDefinition;\n    const packageSettings = getPackageSettings({ name, version, config });\n\n    if (!packageSettings) {\n      return undefined;\n    }\n\n    const result = { ...packageDefinition };\n\n    // If we have a custom exports map for the package, apply it.\n    if (packageSettings.exports) {\n      result.exports = packageSettings.exports;\n    }\n\n    // If we have included dependencies, add them.\n    if (packageSettings.includedDependencies?.length) {\n      for (const dep of packageSettings.includedDependencies) {\n        if (!result.dependencies?.[dep]) {\n          // Initialize dependencies map if it doesn't exist.\n          result.dependencies ??= {};\n\n          // Add the dependency from other sources, or use a wildcard.\n          result.dependencies[dep] =\n            result.devDependencies?.[dep] ||\n            result.peerDependencies?.[dep] ||\n            result.optionalDependencies?.[dep] ||\n            '*';\n        }\n      }\n    }\n\n    // If we have excluded dependencies, remove them.\n    if (packageSettings.excludedDependencies?.length) {\n      result.dependencies = Object.fromEntries(\n        Object.entries(result.dependencies || {}).filter(\n          ([dep]) => !packageSettings.excludedDependencies?.includes(dep),\n        ),\n      );\n    }\n\n    return result;\n  };\n}\n"]}
+{"version":3,"file":"createPackageOverrideTransform.js","sourceRoot":"","sources":["../src/createPackageOverrideTransform.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D;;;GAGG;AACH,MAAM,UAAU,8BAA8B,CAAC,MAAuB;IACpE,OAAO,CAAC,iBAA8B,EAAE,EAAE;QACxC,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,GAAG,iBAAiB,CAAC;QACtD,MAAM,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,GAAG,kBAAkB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QAExG,IAAI,CAAC,mBAAmB,IAAI,CAAC,wBAAwB,EAAE;YACrD,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,MAAM,GAAG,EAAE,GAAG,iBAAiB,EAAE,CAAC;QAExC,6DAA6D;QAC7D,IAAI,mBAAmB,EAAE,OAAO,EAAE;YAChC,MAAM,CAAC,OAAO,GAAG,mBAAmB,CAAC,OAAO,CAAC;SAC9C;QAED,8CAA8C;QAC9C,IAAI,wBAAwB,EAAE,OAAO,EAAE;YACrC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO;gBAC7B,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,wBAAwB,CAAC,OAAO,CAAC;gBACpD,CAAC,CAAC,wBAAwB,CAAC,OAAO,CAAC;SACtC;QAED,8CAA8C;QAC9C,MAAM,oBAAoB,GAAG;YAC3B,GAAG,CAAC,mBAAmB,EAAE,oBAAoB,IAAI,EAAE,CAAC;YACpD,GAAG,CAAC,wBAAwB,EAAE,oBAAoB,IAAI,EAAE,CAAC;SAC1D,CAAC;QAEF,IAAI,oBAAoB,CAAC,MAAM,EAAE;YAC/B,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE;gBACtC,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC,EAAE;oBAC/B,mDAAmD;oBACnD,MAAM,CAAC,YAAY,KAAK,EAAE,CAAC;oBAE3B,4DAA4D;oBAC5D,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC;wBACtB,MAAM,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC;4BAC7B,MAAM,CAAC,gBAAgB,EAAE,CAAC,GAAG,CAAC;4BAC9B,MAAM,CAAC,oBAAoB,EAAE,CAAC,GAAG,CAAC;4BAClC,GAAG,CAAC;iBACP;aACF;SACF;QAED,iDAAiD;QACjD,MAAM,oBAAoB,GAAG;YAC3B,GAAG,CAAC,mBAAmB,EAAE,oBAAoB,IAAI,EAAE,CAAC;YACpD,GAAG,CAAC,wBAAwB,EAAE,oBAAoB,IAAI,EAAE,CAAC;SAC1D,CAAC;QAEF,IAAI,oBAAoB,EAAE,MAAM,EAAE;YAChC,MAAM,CAAC,YAAY,GAAG,MAAM,CAAC,WAAW,CACtC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,oBAAoB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAClG,CAAC;SACH;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { PackageDefinitionTransform, PackageJson } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig } from './types/CloudpackConfig.js';\nimport { getPackageSettings } from './getPackageSettings.js';\n\n/**\n * Creates a transform to be registered with a PackageDefinitions registry for applying overrides to from the config\n * to package.json definitions.\n */\nexport function createPackageOverrideTransform(config: CloudpackConfig): PackageDefinitionTransform {\n  return (packageDefinition: PackageJson) => {\n    const { name = '', version = '' } = packageDefinition;\n    const { userPackageSettings, generatedPackageSettings } = getPackageSettings({ name, version, config });\n\n    if (!userPackageSettings && !generatedPackageSettings) {\n      return undefined;\n    }\n\n    const result = { ...packageDefinition };\n\n    // If we have a custom exports map for the package, apply it.\n    if (userPackageSettings?.exports) {\n      result.exports = userPackageSettings.exports;\n    }\n\n    // If we have generated overrides, apply them.\n    if (generatedPackageSettings?.exports) {\n      result.exports = result.exports\n        ? [result.exports, generatedPackageSettings.exports]\n        : generatedPackageSettings.exports;\n    }\n\n    // If we have included dependencies, add them.\n    const includedDependencies = [\n      ...(userPackageSettings?.includedDependencies || []),\n      ...(generatedPackageSettings?.includedDependencies || []),\n    ];\n\n    if (includedDependencies.length) {\n      for (const dep of includedDependencies) {\n        if (!result.dependencies?.[dep]) {\n          // Initialize dependencies map if it doesn't exist.\n          result.dependencies ??= {};\n\n          // Add the dependency from other sources, or use a wildcard.\n          result.dependencies[dep] =\n            result.devDependencies?.[dep] ||\n            result.peerDependencies?.[dep] ||\n            result.optionalDependencies?.[dep] ||\n            '*';\n        }\n      }\n    }\n\n    // If we have excluded dependencies, remove them.\n    const excludedDependencies = [\n      ...(userPackageSettings?.excludedDependencies || []),\n      ...(generatedPackageSettings?.excludedDependencies || []),\n    ];\n\n    if (excludedDependencies?.length) {\n      result.dependencies = Object.fromEntries(\n        Object.entries(result.dependencies || {}).filter(([dep]) => !excludedDependencies?.includes(dep)),\n      );\n    }\n\n    return result;\n  };\n}\n"]}

package/lib/getPackageSettings.d.ts

@@ -3,9 +3,17 @@ import type { PackageSettings } from './types/PackageSettings.js';
 /**
  * Gets the single set of package settings for a given package using the given config.
  */
-export declare function getPackageSettings({ name, version, config, }: {
+export declare function getPackageSettings({ name, version, config, firstMatch, }: {
     name: string;
     version: string;
     config: CloudpackConfig;
-}): PackageSettings | undefined;
+    /**
+     * If true, only the first matching package settings will be returned, rather than the merge of all viable settings.
+     * This is useful in the `init` case, where we want to attach new settings to the first matching entry.
+     */
+    firstMatch?: boolean;
+}): {
+    userPackageSettings: PackageSettings | undefined;
+    generatedPackageSettings: PackageSettings | undefined;
+};
 //# sourceMappingURL=getPackageSettings.d.ts.map

package/lib/getPackageSettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPackageSettings.d.ts","sourceRoot":"","sources":["../src/getPackageSettings.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAElE;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,IAAI,EACJ,OAAO,EACP,MAAM,GACP,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,eAAe,CAAC;CACzB,GAAG,eAAe,GAAG,SAAS,CAoB9B"}
+{"version":3,"file":"getPackageSettings.d.ts","sourceRoot":"","sources":["../src/getPackageSettings.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAElE;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,IAAI,EACJ,OAAO,EACP,MAAM,EACN,UAAU,GACX,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,eAAe,CAAC;IAExB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,GAAG;IACF,mBAAmB,EAAE,eAAe,GAAG,SAAS,CAAC;IACjD,wBAAwB,EAAE,eAAe,GAAG,SAAS,CAAC;CACvD,CAgBA"}

package/lib/getPackageSettings.js

@@ -3,20 +3,29 @@ import { mergePackageSettings } from './mergePackageSettings.js';
 /**
  * Gets the single set of package settings for a given package using the given config.
  */
-export function getPackageSettings({ name, version, config, }) {
-    const { packageSettings = [] } = config;
-    if (!packageSettings.length) {
-        return undefined;
-    }
-    const matchedSettings = packageSettings.filter(({ match }) => {
-        if (match?.name === name) {
-            return !match.version || satisfies(version, match.version);
-        }
-        return false;
-    });
-    if (!matchedSettings.length) {
-        return undefined;
-    }
-    return mergePackageSettings(matchedSettings);
+export function getPackageSettings({ name, version, config, firstMatch, }) {
+    const userPackageSettings = config.packageSettings?.filter(filterPackageSettings(name, version));
+    const generatedPackageSettings = config.generated?.packageSettings?.filter(filterPackageSettings(name, version));
+    return {
+        userPackageSettings: userPackageSettings?.length
+            ? firstMatch
+                ? userPackageSettings?.[0]
+                : mergePackageSettings(userPackageSettings)
+            : undefined,
+        generatedPackageSettings: generatedPackageSettings?.length
+            ? firstMatch
+                ? generatedPackageSettings?.[0]
+                : mergePackageSettings(generatedPackageSettings)
+            : undefined,
+    };
 }
+/**
+ * Helper for filtering out package settings applicable to a given package name and version.
+ */
+const filterPackageSettings = (name, version) => ({ match }) => {
+    if (match?.name === name) {
+        return !match.version || satisfies(version, match.version);
+    }
+    return false;
+};
 //# sourceMappingURL=getPackageSettings.js.map

package/lib/getPackageSettings.js.map

@@ -1 +1 @@
-{"version":3,"file":"getPackageSettings.js","sourceRoot":"","sources":["../src/getPackageSettings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAIjE;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,EACjC,IAAI,EACJ,OAAO,EACP,MAAM,GAKP;IACC,MAAM,EAAE,eAAe,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC;IAExC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE;QAC3B,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;QAC3D,IAAI,KAAK,EAAE,IAAI,KAAK,IAAI,EAAE;YACxB,OAAO,CAAC,KAAK,CAAC,OAAO,IAAI,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;SAC5D;QAED,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE;QAC3B,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,oBAAoB,CAAC,eAAe,CAAC,CAAC;AAC/C,CAAC","sourcesContent":["import { satisfies } from 'semver';\nimport { mergePackageSettings } from './mergePackageSettings.js';\nimport type { CloudpackConfig } from './types/CloudpackConfig.js';\nimport type { PackageSettings } from './types/PackageSettings.js';\n\n/**\n * Gets the single set of package settings for a given package using the given config.\n */\nexport function getPackageSettings({\n  name,\n  version,\n  config,\n}: {\n  name: string;\n  version: string;\n  config: CloudpackConfig;\n}): PackageSettings | undefined {\n  const { packageSettings = [] } = config;\n\n  if (!packageSettings.length) {\n    return undefined;\n  }\n\n  const matchedSettings = packageSettings.filter(({ match }) => {\n    if (match?.name === name) {\n      return !match.version || satisfies(version, match.version);\n    }\n\n    return false;\n  });\n\n  if (!matchedSettings.length) {\n    return undefined;\n  }\n\n  return mergePackageSettings(matchedSettings);\n}\n"]}
+{"version":3,"file":"getPackageSettings.js","sourceRoot":"","sources":["../src/getPackageSettings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAIjE;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,EACjC,IAAI,EACJ,OAAO,EACP,MAAM,EACN,UAAU,GAWX;IAIC,MAAM,mBAAmB,GAAG,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IACjG,MAAM,wBAAwB,GAAG,MAAM,CAAC,SAAS,EAAE,eAAe,EAAE,MAAM,CAAC,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAEjH,OAAO;QACL,mBAAmB,EAAE,mBAAmB,EAAE,MAAM;YAC9C,CAAC,CAAC,UAAU;gBACV,CAAC,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC;gBAC1B,CAAC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC;YAC7C,CAAC,CAAC,SAAS;QACb,wBAAwB,EAAE,wBAAwB,EAAE,MAAM;YACxD,CAAC,CAAC,UAAU;gBACV,CAAC,CAAC,wBAAwB,EAAE,CAAC,CAAC,CAAC;gBAC/B,CAAC,CAAC,oBAAoB,CAAC,wBAAwB,CAAC;YAClD,CAAC,CAAC,SAAS;KACd,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,qBAAqB,GACzB,CAAC,IAAY,EAAE,OAAe,EAAE,EAAE,CAClC,CAAC,EAAE,KAAK,EAAmB,EAAE,EAAE;IAC7B,IAAI,KAAK,EAAE,IAAI,KAAK,IAAI,EAAE;QACxB,OAAO,CAAC,KAAK,CAAC,OAAO,IAAI,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;KAC5D;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC","sourcesContent":["import { satisfies } from 'semver';\nimport { mergePackageSettings } from './mergePackageSettings.js';\nimport type { CloudpackConfig } from './types/CloudpackConfig.js';\nimport type { PackageSettings } from './types/PackageSettings.js';\n\n/**\n * Gets the single set of package settings for a given package using the given config.\n */\nexport function getPackageSettings({\n  name,\n  version,\n  config,\n  firstMatch,\n}: {\n  name: string;\n  version: string;\n  config: CloudpackConfig;\n\n  /**\n   * If true, only the first matching package settings will be returned, rather than the merge of all viable settings.\n   * This is useful in the `init` case, where we want to attach new settings to the first matching entry.\n   */\n  firstMatch?: boolean;\n}): {\n  userPackageSettings: PackageSettings | undefined;\n  generatedPackageSettings: PackageSettings | undefined;\n} {\n  const userPackageSettings = config.packageSettings?.filter(filterPackageSettings(name, version));\n  const generatedPackageSettings = config.generated?.packageSettings?.filter(filterPackageSettings(name, version));\n\n  return {\n    userPackageSettings: userPackageSettings?.length\n      ? firstMatch\n        ? userPackageSettings?.[0]\n        : mergePackageSettings(userPackageSettings)\n      : undefined,\n    generatedPackageSettings: generatedPackageSettings?.length\n      ? firstMatch\n        ? generatedPackageSettings?.[0]\n        : mergePackageSettings(generatedPackageSettings)\n      : undefined,\n  };\n}\n\n/**\n * Helper for filtering out package settings applicable to a given package name and version.\n */\nconst filterPackageSettings =\n  (name: string, version: string) =>\n  ({ match }: PackageSettings) => {\n    if (match?.name === name) {\n      return !match.version || satisfies(version, match.version);\n    }\n\n    return false;\n  };\n"]}

package/lib/processConfig.d.ts

@@ -1,6 +1,6 @@
-import type { CloudpackConfig } from './types/CloudpackConfig.js';
+import type { GeneratedConfig } from './index.js';
 /**
  * An internal function for processing a config object after reading the json values.
  */
-export declare function processConfig(config: CloudpackConfig): void;
+export declare function processConfig(config?: GeneratedConfig): void;
 //# sourceMappingURL=processConfig.d.ts.map

package/lib/processConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"processConfig.d.ts","sourceRoot":"","sources":["../src/processConfig.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAElE;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,eAAe,QAmBpD"}
+{"version":3,"file":"processConfig.d.ts","sourceRoot":"","sources":["../src/processConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,YAAY,CAAC;AAEnE;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,CAAC,EAAE,eAAe,QAmBrD"}

package/lib/processConfig.js

@@ -3,7 +3,7 @@
  */
 export function processConfig(config) {
     // eslint-disable-next-line etc/no-deprecated
-    const { packageOverrides } = config;
+    const packageOverrides = config?.packageOverrides;
     // Convert package overrides into settings to preserve the deprecated support.
     if (packageOverrides) {
         config.packageSettings = config.packageSettings || [];

package/lib/processConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"processConfig.js","sourceRoot":"","sources":["../src/processConfig.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,MAAuB;IACnD,6CAA6C;IAC7C,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,CAAC;IAEpC,8EAA8E;IAC9E,IAAI,gBAAgB,EAAE;QACpB,MAAM,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,EAAE,CAAC;QAEtD,KAAK,MAAM,QAAQ,IAAI,gBAAgB,IAAI,EAAE,EAAE;YAC7C,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;SACvC;QAED,6CAA6C;QAC7C,OAAO,MAAM,CAAC,gBAAgB,CAAC;KAChC;AACH,CAAC","sourcesContent":["import type { PackageSettings } from './index.js';\nimport type { CloudpackConfig } from './types/CloudpackConfig.js';\n\n/**\n * An internal function for processing a config object after reading the json values.\n */\nexport function processConfig(config: CloudpackConfig) {\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"]}
+{"version":3,"file":"processConfig.js","sourceRoot":"","sources":["../src/processConfig.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,MAAwB;IACpD,6CAA6C;IAC7C,MAAM,gBAAgB,GAAG,MAAM,EAAE,gBAAgB,CAAC;IAElD,8EAA8E;IAC9E,IAAI,gBAAgB,EAAE;QACpB,MAAM,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,EAAE,CAAC;QAEtD,KAAK,MAAM,QAAQ,IAAI,gBAAgB,IAAI,EAAE,EAAE;YAC7C,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;SACvC;QAED,6CAA6C;QAC7C,OAAO,MAAM,CAAC,gBAAgB,CAAC;KAChC;AACH,CAAC","sourcesContent":["import type { GeneratedConfig, PackageSettings } from './index.js';\n\n/**\n * An internal function for processing a config object after reading the json values.\n */\nexport function processConfig(config?: GeneratedConfig) {\n  // eslint-disable-next-line etc/no-deprecated\n  const packageOverrides = config?.packageOverrides;\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"]}

package/lib/readConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"readConfig.d.ts","sourceRoot":"","sources":["../src/readConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAKlE;;GAEG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAc1E"}
+{"version":3,"file":"readConfig.d.ts","sourceRoot":"","sources":["../src/readConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAKlE;;GAEG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAU1E"}

package/lib/readConfig.js

@@ -7,13 +7,10 @@ import { readGeneratedConfig } from './readGeneratedConfig.js';
 export async function readConfig(appPath) {
     const [userConfig, generatedConfig] = await Promise.all([readUserConfig(appPath), readGeneratedConfig(appPath)]);
     const config = {
-        ...generatedConfig,
+        generated: generatedConfig,
         ...userConfig,
     };
-    if (userConfig.packageSettings || generatedConfig.packageSettings) {
-        config.packageSettings = [...(userConfig.packageSettings || []), ...(generatedConfig.packageSettings || [])];
-    }
-    processConfig(config);
+    processConfig(config.generated);
     return config;
 }
 //# sourceMappingURL=readConfig.js.map

package/lib/readConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"readConfig.js","sourceRoot":"","sources":["../src/readConfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAAe;IAC9C,MAAM,CAAC,UAAU,EAAE,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACjH,MAAM,MAAM,GAAoB;QAC9B,GAAG,eAAe;QAClB,GAAG,UAAU;KACd,CAAC;IAEF,IAAI,UAAU,CAAC,eAAe,IAAI,eAAe,CAAC,eAAe,EAAE;QACjE,MAAM,CAAC,eAAe,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,eAAe,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,eAAe,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,CAAC;KAC9G;IAED,aAAa,CAAC,MAAM,CAAC,CAAC;IAEtB,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import type { CloudpackConfig } from './types/CloudpackConfig.js';\nimport { processConfig } from './processConfig.js';\nimport { readUserConfig } from './readUserConfig.js';\nimport { readGeneratedConfig } from './readGeneratedConfig.js';\n\n/**\n * Reads the config file asynchronously (and merges generated config into the result.)\n */\nexport async function readConfig(appPath: string): Promise<CloudpackConfig> {\n  const [userConfig, generatedConfig] = await Promise.all([readUserConfig(appPath), readGeneratedConfig(appPath)]);\n  const config: CloudpackConfig = {\n    ...generatedConfig,\n    ...userConfig,\n  };\n\n  if (userConfig.packageSettings || generatedConfig.packageSettings) {\n    config.packageSettings = [...(userConfig.packageSettings || []), ...(generatedConfig.packageSettings || [])];\n  }\n\n  processConfig(config);\n\n  return config;\n}\n"]}
+{"version":3,"file":"readConfig.js","sourceRoot":"","sources":["../src/readConfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAAe;IAC9C,MAAM,CAAC,UAAU,EAAE,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACjH,MAAM,MAAM,GAAoB;QAC9B,SAAS,EAAE,eAAe;QAC1B,GAAG,UAAU;KACd,CAAC;IAEF,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAEhC,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import type { CloudpackConfig } from './types/CloudpackConfig.js';\nimport { processConfig } from './processConfig.js';\nimport { readUserConfig } from './readUserConfig.js';\nimport { readGeneratedConfig } from './readGeneratedConfig.js';\n\n/**\n * Reads the config file asynchronously (and merges generated config into the result.)\n */\nexport async function readConfig(appPath: string): Promise<CloudpackConfig> {\n  const [userConfig, generatedConfig] = await Promise.all([readUserConfig(appPath), readGeneratedConfig(appPath)]);\n  const config: CloudpackConfig = {\n    generated: generatedConfig,\n    ...userConfig,\n  };\n\n  processConfig(config.generated);\n\n  return config;\n}\n"]}

package/lib/tsdoc-metadata.json

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

package/lib/types/CloudpackConfig.d.ts

@@ -3,5 +3,7 @@ import type { UserConfig } from './UserConfig.js';
 /**
  * The merged result of user-provided and generated configuration for Cloudpack.
  */
-export type CloudpackConfig = UserConfig & GeneratedConfig;
+export type CloudpackConfig = UserConfig & {
+    generated: GeneratedConfig;
+};
 //# sourceMappingURL=CloudpackConfig.d.ts.map

package/lib/types/CloudpackConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CloudpackConfig.d.ts","sourceRoot":"","sources":["../../src/types/CloudpackConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD;;GAEG;AAEH,MAAM,MAAM,eAAe,GAAG,UAAU,GAAG,eAAe,CAAC"}
+{"version":3,"file":"CloudpackConfig.d.ts","sourceRoot":"","sources":["../../src/types/CloudpackConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD;;GAEG;AAEH,MAAM,MAAM,eAAe,GAAG,UAAU,GAAG;IACzC,SAAS,EAAE,eAAe,CAAC;CAC5B,CAAC"}

package/lib/types/CloudpackConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"CloudpackConfig.js","sourceRoot":"","sources":["../../src/types/CloudpackConfig.ts"],"names":[],"mappings":"","sourcesContent":["import type { GeneratedConfig } from './GeneratedConfig.js';\nimport type { UserConfig } from './UserConfig.js';\n\n/**\n * The merged result of user-provided and generated configuration for Cloudpack.\n */\n\nexport type CloudpackConfig = UserConfig & GeneratedConfig;\n"]}
+{"version":3,"file":"CloudpackConfig.js","sourceRoot":"","sources":["../../src/types/CloudpackConfig.ts"],"names":[],"mappings":"","sourcesContent":["import type { GeneratedConfig } from './GeneratedConfig.js';\nimport type { UserConfig } from './UserConfig.js';\n\n/**\n * The merged result of user-provided and generated configuration for Cloudpack.\n */\n\nexport type CloudpackConfig = UserConfig & {\n  generated: GeneratedConfig;\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/config",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "Configuration handling for cloudpack.",
   "license": "MIT",
   "type": "module",
@@ -16,7 +16,7 @@
     "@ms-cloudpack/bundler-types": "^0.16.0",
     "@ms-cloudpack/create-express-app": "^1.3.8",
     "@ms-cloudpack/json-utilities": "^0.0.7",
-    "@ms-cloudpack/package-utilities": "^5.0.0"
+    "@ms-cloudpack/package-utilities": "^5.0.1"
   },
   "devDependencies": {
     "@ms-cloudpack/eslint-plugin-internal": "*",