@ms-cloudpack/config 0.33.28 → 0.33.30

package/lib/builtInSettings/builtInSettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builtInSettings.d.ts","sourceRoot":"","sources":["../../src/builtInSettings/builtInSettings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAG/E,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,eAAe,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,GAAG,SAAS,CAAC,CAAC;IAC7D;;;;OAIG;IACH,WAAW,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,GAAG,WAAW,CAAC,CAAC;CACnE;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgJ1B,CAAC"}
+{"version":3,"file":"builtInSettings.d.ts","sourceRoot":"","sources":["../../src/builtInSettings/builtInSettings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAG/E,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,eAAe,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,GAAG,SAAS,CAAC,CAAC;IAC7D;;;;OAIG;IACH,WAAW,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,GAAG,WAAW,CAAC,CAAC;CACnE;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqL1B,CAAC"}

package/lib/builtInSettings/builtInSettings.js

@@ -71,6 +71,28 @@ export const builtInSettings = deepFreeze({
             },
         },
     },
+    'html-dom-parser': {
+        '>=0 <6.0.0': {
+            // Old versions of this package are CJS,
+            // and newer versions have an ESM entry that imports CJS code with `require`.
+            // This causes the runtime issue "Dynamic require of {package} is not supported" when bundling with ori,
+            // so we need to use rollup instead.
+            packageSettings: {
+                bundler: 'rollup',
+            },
+        },
+    },
+    'html-react-parser': {
+        // Old versions of this package are CJS,
+        // and newer versions have an ESM entry that imports CJS code with `require`.
+        // This causes the runtime issue "Dynamic require of {package} is not supported" when bundling with ori,
+        // so we need to use rollup instead.
+        '>=0 <6.0.0': {
+            packageSettings: {
+                bundler: 'rollup',
+            },
+        },
+    },
     htmlparser2: {
         // Issue below starts in 8.0.1 and continues in 9
         '^8.0.1 || ^9.0.0': {
@@ -122,6 +144,18 @@ export const builtInSettings = deepFreeze({
             },
         },
     },
+    'style-to-object': {
+        // Old versions of this package are CJS,
+        // and newer versions have an ESM entry that imports CJS code with `require`.
+        // This causes the runtime issue "Dynamic require of {package} is not supported" when bundling with ori,
+        // so we need to use rollup instead.
+        '>=0 <2.0.0': {
+            // Package is
+            packageSettings: {
+                bundler: 'rollup',
+            },
+        },
+    },
     tslib: {
         '>=0 <2.5.3': {
             // Remove unneeded exports

package/lib/builtInSettings/builtInSettings.js.map

@@ -1 +1 @@
-{"version":3,"file":"builtInSettings.js","sourceRoot":"","sources":["../../src/builtInSettings/builtInSettings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAgB7C;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,UAAU,CAMvC;IACA,uCAAuC,EAAE;QACvC,QAAQ,EAAE;YACR,mGAAmG;YACnG,sDAAsD;YACtD,wEAAwE;YACxE,WAAW,EAAE;gBACX,OAAO,EAAE,0CAA0C;aACpD;SACF;KACF;IAED,IAAI,EAAE;QACJ,QAAQ,EAAE;YACR,sFAAsF;YACtF,gFAAgF;YAChF,+EAA+E;YAC/E,sDAAsD;YACtD,oEAAoE;YACpE,qFAAqF;YACrF,wDAAwD;YACxD,uCAAuC;YACvC,eAAe,EAAE;gBACf,OAAO,EAAE,KAAK;aACf;SACF;KACF;IAED,MAAM,EAAE;QACN,QAAQ,EAAE;YACR,8FAA8F;YAC9F,yCAAyC;YACzC,WAAW,EAAE;gBACX,OAAO,EAAE;oBACP,iBAAiB,EAAE,iBAAiB;iBACrC;aACF;SACF;KACF;IAED,IAAI,EAAE;QACJ,kBAAkB,EAAE;YAClB,2FAA2F;YAC3F,kFAAkF;YAClF,eAAe,EAAE;gBACf,OAAO,EAAE,QAAQ;gBACjB,sBAAsB,EAAE,CAAC,mDAAmD,CAAC;aAC9E;SACF;KACF;IAED,UAAU,EAAE;QACV,QAAQ,EAAE;YACR,0DAA0D;YAC1D,0EAA0E;YAC1E,4CAA4C;YAC5C,eAAe,EAAE;gBACf,oBAAoB,EAAE,CAAC,mBAAmB,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,YAAY,CAAC;aACvG;YACD,WAAW,EAAE;gBACX,OAAO,EAAE,qBAAqB;aAC/B;SACF;KACF;IAED,WAAW,EAAE;QACX,iDAAiD;QACjD,kBAAkB,EAAE;YAClB,uFAAuF;YACvF,8CAA8C;YAC9C,WAAW,EAAE;gBACX,OAAO,EAAE,oBAAoB;aAC9B;SACF;KACF;IAED,KAAK,EAAE;QACL,qBAAqB,EAAE;YACrB,oCAAoC;YACpC,iDAAiD;YACjD,WAAW,EAAE;gBACX,OAAO,EAAE;oBACP,GAAG,EAAE,YAAY;oBACjB,eAAe,EAAE,kBAAkB;oBACnC,mBAAmB,EAAE,sBAAsB;iBAC5C;aACF;SACF;KACF;IAED,SAAS,EAAE;QACT,aAAa,EAAE;YACb,oCAAoC;YACpC,yDAAyD;YACzD,WAAW,EAAE;gBACX,OAAO,EAAE;oBACP,GAAG,EAAE,YAAY;oBACjB,WAAW,EAAE,cAAc;iBAC5B;aACF;SACF;QACD,iBAAiB,EAAE;YACjB,oCAAoC;YACpC,yDAAyD;YACzD,WAAW,EAAE;gBACX,OAAO,EAAE,YAAY;aACtB;SACF;KACF;IAED,kBAAkB,EAAE;QAClB,QAAQ,EAAE;YACR,0BAA0B;YAC1B,2DAA2D;YAC3D,WAAW,EAAE;gBACX,OAAO,EAAE,sBAAsB;aAChC;SACF;KACF;IAED,KAAK,EAAE;QACL,YAAY,EAAE;YACZ,0BAA0B;YAC1B,oDAAoD;YACpD,WAAW,EAAE;gBACX,OAAO,EAAE,gBAAgB;aAC1B;SACF;QACD,QAAQ,EAAE;YACR,0BAA0B;YAC1B,oDAAoD;YACpD,WAAW,EAAE;gBACX,OAAO,EAAE,iBAAiB;aAC3B;SACF;KACF;IAED,wDAAwD;CACzD,CAAC,CAAC","sourcesContent":["import type { PackageJson, PackageSettings } from '@ms-cloudpack/common-types';\nimport { deepFreeze } from './deepFreeze.js';\n\nexport interface BuiltInSettings {\n  /**\n   * Package settings to automatically apply for this package name/version.\n   * (These are merged by `getPackageSettings`, mostly as called by `createPackageSettingsTransform`.)\n   */\n  packageSettings?: Omit<PackageSettings, 'match' | 'exports'>;\n  /**\n   * package.json settings to automatically apply for this package name/version.\n   * These **overwrite** original properties of the `package.json` and are applied by\n   * `PackageDefinitions` using `createBuiltInSettingsTransform`.\n   */\n  packageJson?: Omit<PackageJson, 'name' | 'version' | 'cloudpack'>;\n}\n\n/**\n * Mapping from package name to version range to built-in settings.\n *\n * This object is frozen to prevent accidental modification.\n *\n * The reason we're handling package.json modifications (just `exports` as of writing) and\n * `PackageSettings` separately is mainly to get around issues with merging exports maps.\n * https://github.com/microsoft/cloudpack/pull/2452#discussion_r1835192676\n * (If the exports merging issue is fixed in the future, and we don't find any cases where we want\n * to override other package.json properties, they could potentially be combined and handled with\n * only package settings.)\n */\nexport const builtInSettings = deepFreeze<\n  Partial<{\n    [packageName: string]: {\n      [versionRange: string]: BuiltInSettings;\n    };\n  }>\n>({\n  '@microsoft/recognizers-text-date-time': {\n    '^1.0.0': {\n      // This has a \"browser\" entry which doesn't provide exports correctly in the browser when bundled??\n      // Switching to the regular entry point makes it work.\n      // https://unpkg.com/browse/@microsoft/recognizers-text-date-time@1.3.2/\n      packageJson: {\n        exports: './dist/recognizers-text-date-time.es5.js',\n      },\n    },\n  },\n\n  asap: {\n    '^2.0.0': {\n      // This package has different browser and non-browser versions in the \"browser\" field.\n      // Trying to bundle it with rollup (which creates an ESM stub) gives this error:\n      //   [ESM stub generation] /<repo path>/node_modules/asap/browser-asap.js:10:33\n      //     Error creating stub for entry \"./browser-asap\":\n      //     TypeError: rawAsap.makeRequestCallFromTimer is not a function\n      // It's not clear why this happens, but bundling this CJS package with ori works okay\n      // since the package doesn't require() any dependencies.\n      // https://unpkg.com/browse/asap@2.0.6/\n      packageSettings: {\n        bundler: 'ori',\n      },\n    },\n  },\n\n  brotli: {\n    '^1.0.0': {\n      // index.js also imports a compress entry point with a reference to nonexistent Browser global\n      // https://unpkg.com/browse/brotli@1.3.3/\n      packageJson: {\n        exports: {\n          './decompress.js': './decompress.js',\n        },\n      },\n    },\n  },\n\n  bson: {\n    '^5.0.0 || ^6.0.0': {\n      // Package conditionally references \"crypto\", causing an error even though it's never used.\n      // Bundle with rollup instead, and ignore the warning about the empty crypto stub.\n      packageSettings: {\n        bundler: 'rollup',\n        ignoredBundlerWarnings: ['Generated an empty chunk: \"_polyfill-node.crypto\"'],\n      },\n    },\n  },\n\n  'gql.tada': {\n    '^1.0.0': {\n      // This package has a combination of browser and CLI code.\n      // Remove the dependencies and entries which aren't needed in the browser.\n      // https://unpkg.com/browse/gql.tada@1.8.10/\n      packageSettings: {\n        excludedDependencies: ['@0no-co/graphqlsp', '@gql.tada/cli-utils', '@gql.tada/internal', 'typescript'],\n      },\n      packageJson: {\n        exports: './dist/gql-tada.mjs',\n      },\n    },\n  },\n\n  htmlparser2: {\n    // Issue below starts in 8.0.1 and continues in 9\n    '^8.0.1 || ^9.0.0': {\n      // This has an additional ./lib/WritableStream exports map entry which uses node stream\n      // https://unpkg.com/browse/htmlparser2@9.1.0/\n      packageJson: {\n        exports: './lib/esm/index.js',\n      },\n    },\n  },\n\n  react: {\n    '^16.14.0 || ^17.0.0': {\n      // Package is missing an exports map\n      // https://unpkg.com/browse/react@17/package.json\n      packageJson: {\n        exports: {\n          '.': './index.js',\n          './jsx-runtime': './jsx-runtime.js',\n          './jsx-dev-runtime': './jsx-dev-runtime.js',\n        },\n      },\n    },\n  },\n\n  scheduler: {\n    '>=0 <0.21.0': {\n      // Package is missing an exports map\n      // https://unpkg.com/browse/scheduler@0.20.x/package.json\n      packageJson: {\n        exports: {\n          '.': './index.js',\n          './tracing': './tracing.js',\n        },\n      },\n    },\n    '>=0.21.0 <1.0.0': {\n      // Package is missing an exports map\n      // https://unpkg.com/browse/scheduler@0.21.0/package.json\n      packageJson: {\n        exports: './index.js',\n      },\n    },\n  },\n\n  'socket.io-client': {\n    '^4.4.1': {\n      // Remove unneeded exports\n      // https://unpkg.com/browse/socket.io-client@4/package.json\n      packageJson: {\n        exports: './build/esm/index.js',\n      },\n    },\n  },\n\n  tslib: {\n    '>=0 <2.5.3': {\n      // Remove unneeded exports\n      // https://unpkg.com/browse/tslib@2.5.2/package.json\n      packageJson: {\n        exports: './tslib.es6.js',\n      },\n    },\n    '^2.5.3': {\n      // Remove unneeded exports\n      // https://unpkg.com/browse/tslib@2.5.3/package.json\n      packageJson: {\n        exports: './tslib.es6.mjs',\n      },\n    },\n  },\n\n  // Please add new entries in alphabetical order by name!\n});\n"]}
+{"version":3,"file":"builtInSettings.js","sourceRoot":"","sources":["../../src/builtInSettings/builtInSettings.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageJson, PackageSettings } from '@ms-cloudpack/common-types';\nimport { deepFreeze } from './deepFreeze.js';\n\nexport interface BuiltInSettings {\n  /**\n   * Package settings to automatically apply for this package name/version.\n   * (These are merged by `getPackageSettings`, mostly as called by `createPackageSettingsTransform`.)\n   */\n  packageSettings?: Omit<PackageSettings, 'match' | 'exports'>;\n  /**\n   * package.json settings to automatically apply for this package name/version.\n   * These **overwrite** original properties of the `package.json` and are applied by\n   * `PackageDefinitions` using `createBuiltInSettingsTransform`.\n   */\n  packageJson?: Omit<PackageJson, 'name' | 'version' | 'cloudpack'>;\n}\n\n/**\n * Mapping from package name to version range to built-in settings.\n *\n * This object is frozen to prevent accidental modification.\n *\n * The reason we're handling package.json modifications (just `exports` as of writing) and\n * `PackageSettings` separately is mainly to get around issues with merging exports maps.\n * https://github.com/microsoft/cloudpack/pull/2452#discussion_r1835192676\n * (If the exports merging issue is fixed in the future, and we don't find any cases where we want\n * to override other package.json properties, they could potentially be combined and handled with\n * only package settings.)\n */\nexport const builtInSettings = deepFreeze<\n  Partial<{\n    [packageName: string]: {\n      [versionRange: string]: BuiltInSettings;\n    };\n  }>\n>({\n  '@microsoft/recognizers-text-date-time': {\n    '^1.0.0': {\n      // This has a \"browser\" entry which doesn't provide exports correctly in the browser when bundled??\n      // Switching to the regular entry point makes it work.\n      // https://unpkg.com/browse/@microsoft/recognizers-text-date-time@1.3.2/\n      packageJson: {\n        exports: './dist/recognizers-text-date-time.es5.js',\n      },\n    },\n  },\n\n  asap: {\n    '^2.0.0': {\n      // This package has different browser and non-browser versions in the \"browser\" field.\n      // Trying to bundle it with rollup (which creates an ESM stub) gives this error:\n      //   [ESM stub generation] /<repo path>/node_modules/asap/browser-asap.js:10:33\n      //     Error creating stub for entry \"./browser-asap\":\n      //     TypeError: rawAsap.makeRequestCallFromTimer is not a function\n      // It's not clear why this happens, but bundling this CJS package with ori works okay\n      // since the package doesn't require() any dependencies.\n      // https://unpkg.com/browse/asap@2.0.6/\n      packageSettings: {\n        bundler: 'ori',\n      },\n    },\n  },\n\n  brotli: {\n    '^1.0.0': {\n      // index.js also imports a compress entry point with a reference to nonexistent Browser global\n      // https://unpkg.com/browse/brotli@1.3.3/\n      packageJson: {\n        exports: {\n          './decompress.js': './decompress.js',\n        },\n      },\n    },\n  },\n\n  bson: {\n    '^5.0.0 || ^6.0.0': {\n      // Package conditionally references \"crypto\", causing an error even though it's never used.\n      // Bundle with rollup instead, and ignore the warning about the empty crypto stub.\n      packageSettings: {\n        bundler: 'rollup',\n        ignoredBundlerWarnings: ['Generated an empty chunk: \"_polyfill-node.crypto\"'],\n      },\n    },\n  },\n\n  'gql.tada': {\n    '^1.0.0': {\n      // This package has a combination of browser and CLI code.\n      // Remove the dependencies and entries which aren't needed in the browser.\n      // https://unpkg.com/browse/gql.tada@1.8.10/\n      packageSettings: {\n        excludedDependencies: ['@0no-co/graphqlsp', '@gql.tada/cli-utils', '@gql.tada/internal', 'typescript'],\n      },\n      packageJson: {\n        exports: './dist/gql-tada.mjs',\n      },\n    },\n  },\n\n  'html-dom-parser': {\n    '>=0 <6.0.0': {\n      // Old versions of this package are CJS,\n      // and newer versions have an ESM entry that imports CJS code with `require`.\n      // This causes the runtime issue \"Dynamic require of {package} is not supported\" when bundling with ori,\n      // so we need to use rollup instead.\n      packageSettings: {\n        bundler: 'rollup',\n      },\n    },\n  },\n\n  'html-react-parser': {\n    // Old versions of this package are CJS,\n    // and newer versions have an ESM entry that imports CJS code with `require`.\n    // This causes the runtime issue \"Dynamic require of {package} is not supported\" when bundling with ori,\n    // so we need to use rollup instead.\n    '>=0 <6.0.0': {\n      packageSettings: {\n        bundler: 'rollup',\n      },\n    },\n  },\n\n  htmlparser2: {\n    // Issue below starts in 8.0.1 and continues in 9\n    '^8.0.1 || ^9.0.0': {\n      // This has an additional ./lib/WritableStream exports map entry which uses node stream\n      // https://unpkg.com/browse/htmlparser2@9.1.0/\n      packageJson: {\n        exports: './lib/esm/index.js',\n      },\n    },\n  },\n\n  react: {\n    '^16.14.0 || ^17.0.0': {\n      // Package is missing an exports map\n      // https://unpkg.com/browse/react@17/package.json\n      packageJson: {\n        exports: {\n          '.': './index.js',\n          './jsx-runtime': './jsx-runtime.js',\n          './jsx-dev-runtime': './jsx-dev-runtime.js',\n        },\n      },\n    },\n  },\n\n  scheduler: {\n    '>=0 <0.21.0': {\n      // Package is missing an exports map\n      // https://unpkg.com/browse/scheduler@0.20.x/package.json\n      packageJson: {\n        exports: {\n          '.': './index.js',\n          './tracing': './tracing.js',\n        },\n      },\n    },\n    '>=0.21.0 <1.0.0': {\n      // Package is missing an exports map\n      // https://unpkg.com/browse/scheduler@0.21.0/package.json\n      packageJson: {\n        exports: './index.js',\n      },\n    },\n  },\n\n  'socket.io-client': {\n    '^4.4.1': {\n      // Remove unneeded exports\n      // https://unpkg.com/browse/socket.io-client@4/package.json\n      packageJson: {\n        exports: './build/esm/index.js',\n      },\n    },\n  },\n\n  'style-to-object': {\n    // Old versions of this package are CJS,\n    // and newer versions have an ESM entry that imports CJS code with `require`.\n    // This causes the runtime issue \"Dynamic require of {package} is not supported\" when bundling with ori,\n    // so we need to use rollup instead.\n    '>=0 <2.0.0': {\n      // Package is\n      packageSettings: {\n        bundler: 'rollup',\n      },\n    },\n  },\n\n  tslib: {\n    '>=0 <2.5.3': {\n      // Remove unneeded exports\n      // https://unpkg.com/browse/tslib@2.5.2/package.json\n      packageJson: {\n        exports: './tslib.es6.js',\n      },\n    },\n    '^2.5.3': {\n      // Remove unneeded exports\n      // https://unpkg.com/browse/tslib@2.5.3/package.json\n      packageJson: {\n        exports: './tslib.es6.mjs',\n      },\n    },\n  },\n\n  // Please add new entries in alphabetical order by name!\n});\n"]}

package/lib/packageSettings/checkMatch.d.ts

@@ -1,4 +1,4 @@
-import type { PackageSettings } from '@ms-cloudpack/common-types';
+import type { PackageSettings, PackageSettingsMatchObject } from '@ms-cloudpack/common-types';
 interface CheckMatchParams {
     /** The name of the package. */
     name: string;
@@ -15,5 +15,6 @@ interface CheckMatchParams {
  * Throws if the match is invalid (shouldn't happen due to previous validation).
  */
 export declare function checkMatch(params: CheckMatchParams): boolean;
+export declare function toMatchObject(match: PackageSettingsMatchObject | string): PackageSettingsMatchObject;
 export {};
 //# sourceMappingURL=checkMatch.d.ts.map

package/lib/packageSettings/checkMatch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkMatch.d.ts","sourceRoot":"","sources":["../../src/packageSettings/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"}
+{"version":3,"file":"checkMatch.d.ts","sourceRoot":"","sources":["../../src/packageSettings/checkMatch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAwB,0BAA0B,EAAE,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;AA6BD,wBAAgB,aAAa,CAAC,KAAK,EAAE,0BAA0B,GAAG,MAAM,GAAG,0BAA0B,CAWpG"}

package/lib/packageSettings/checkMatch.js

@@ -48,7 +48,7 @@ function checkMatchArray(params) {
     }
     return hasMatch;
 }
-function toMatchObject(match) {
+export function toMatchObject(match) {
     let name;
     let version;
     if (typeof match === 'string') {

package/lib/packageSettings/checkMatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkMatch.js","sourceRoot":"","sources":["../../src/packageSettings/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"]}
+{"version":3,"file":"checkMatch.js","sourceRoot":"","sources":["../../src/packageSettings/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\nexport function 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/packageSettings/getGeneratedPackageSettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getGeneratedPackageSettings.d.ts","sourceRoot":"","sources":["../../src/packageSettings/getGeneratedPackageSettings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAG3E;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,wBAAwB,EAAE,wBAAwB,EAAE,GAAG,SAAS,CAAC;CAClE,GAAG,wBAAwB,GAAG,SAAS,CAGvC"}
+{"version":3,"file":"getGeneratedPackageSettings.d.ts","sourceRoot":"","sources":["../../src/packageSettings/getGeneratedPackageSettings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAI3E;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,wBAAwB,EAAE,wBAAwB,EAAE,GAAG,SAAS,CAAC;CAClE,GAAG,wBAAwB,GAAG,SAAS,CA+BvC"}

package/lib/packageSettings/getGeneratedPackageSettings.js

@@ -1,4 +1,5 @@
-import { checkMatch } from './checkMatch.js';
+import { checkMatch, toMatchObject } from './checkMatch.js';
+import { getMostSpecificMatchingRange } from './getMostSpecificMatchingRange.js';
 /**
  * Get the first matching generated package settings for this package name and version.
  * This will return the original object which currently is mutated to update the settings.
@@ -7,6 +8,25 @@ import { checkMatch } from './checkMatch.js';
  */
 export function getGeneratedPackageSettings(params) {
     const { name, version, generatedPackageSettings } = params;
-    return generatedPackageSettings?.find(({ match }) => checkMatch({ name, version, match, exactMatch: true }));
+    const allMatches = generatedPackageSettings?.filter(({ match }) => checkMatch({ name, version, match, exactMatch: true }));
+    if (!allMatches) {
+        return undefined;
+    }
+    // If there is only one match, return it.
+    if (allMatches.length == 1) {
+        return allMatches[0];
+    }
+    // If there are multiple matches, we need to find the one with the minimum satisfying version range.
+    // This is needed to ensure that we get the most specific match.
+    // Extract all version ranges from those matches
+    const versionRanges = allMatches.map((s) => toMatchObject(s.match).version).filter(Boolean);
+    // Now determine the most specific matching range
+    const mostSpecificRange = getMostSpecificMatchingRange(version, versionRanges);
+    // It is impossible have undefined in this case, so this should never happen.
+    if (!mostSpecificRange) {
+        return undefined;
+    }
+    // Now find the match with the most specific matching range
+    return allMatches.find(({ match }) => toMatchObject(match).version === mostSpecificRange);
 }
 //# sourceMappingURL=getGeneratedPackageSettings.js.map

package/lib/packageSettings/getGeneratedPackageSettings.js.map

@@ -1 +1 @@
-{"version":3,"file":"getGeneratedPackageSettings.js","sourceRoot":"","sources":["../../src/packageSettings/getGeneratedPackageSettings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C;;;;;GAKG;AACH,MAAM,UAAU,2BAA2B,CAAC,MAI3C;IACC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,wBAAwB,EAAE,GAAG,MAAM,CAAC;IAC3D,OAAO,wBAAwB,EAAE,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAC/G,CAAC","sourcesContent":["import type { GeneratedPackageSettings } from '@ms-cloudpack/common-types';\nimport { checkMatch } from './checkMatch.js';\n\n/**\n * Get the first matching generated package settings for this package name and version.\n * This will return the original object which currently is mutated to update the settings.\n *\n * To get all matching user and generated package settings, use `getPackageSettings` instead.\n */\nexport function getGeneratedPackageSettings(params: {\n  name: string;\n  version: string;\n  generatedPackageSettings: GeneratedPackageSettings[] | undefined;\n}): GeneratedPackageSettings | undefined {\n  const { name, version, generatedPackageSettings } = params;\n  return generatedPackageSettings?.find(({ match }) => checkMatch({ name, version, match, exactMatch: true }));\n}\n"]}
+{"version":3,"file":"getGeneratedPackageSettings.js","sourceRoot":"","sources":["../../src/packageSettings/getGeneratedPackageSettings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAEjF;;;;;GAKG;AACH,MAAM,UAAU,2BAA2B,CAAC,MAI3C;IACC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,wBAAwB,EAAE,GAAG,MAAM,CAAC;IAC3D,MAAM,UAAU,GAAG,wBAAwB,EAAE,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAChE,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CACvD,CAAC;IAEF,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,yCAAyC;IACzC,IAAI,UAAU,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QAC3B,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC;IAED,oGAAoG;IACpG,gEAAgE;IAEhE,gDAAgD;IAChD,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAa,CAAC;IAExG,iDAAiD;IACjD,MAAM,iBAAiB,GAAG,4BAA4B,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAE/E,6EAA6E;IAC7E,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,2DAA2D;IAC3D,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,OAAO,KAAK,iBAAiB,CAAC,CAAC;AAC5F,CAAC","sourcesContent":["import type { GeneratedPackageSettings } from '@ms-cloudpack/common-types';\nimport { checkMatch, toMatchObject } from './checkMatch.js';\nimport { getMostSpecificMatchingRange } from './getMostSpecificMatchingRange.js';\n\n/**\n * Get the first matching generated package settings for this package name and version.\n * This will return the original object which currently is mutated to update the settings.\n *\n * To get all matching user and generated package settings, use `getPackageSettings` instead.\n */\nexport function getGeneratedPackageSettings(params: {\n  name: string;\n  version: string;\n  generatedPackageSettings: GeneratedPackageSettings[] | undefined;\n}): GeneratedPackageSettings | undefined {\n  const { name, version, generatedPackageSettings } = params;\n  const allMatches = generatedPackageSettings?.filter(({ match }) =>\n    checkMatch({ name, version, match, exactMatch: true }),\n  );\n\n  if (!allMatches) {\n    return undefined;\n  }\n\n  // If there is only one match, return it.\n  if (allMatches.length == 1) {\n    return allMatches[0];\n  }\n\n  // If there are multiple matches, we need to find the one with the minimum satisfying version range.\n  // This is needed to ensure that we get the most specific match.\n\n  // Extract all version ranges from those matches\n  const versionRanges = allMatches.map((s) => toMatchObject(s.match).version).filter(Boolean) as string[];\n\n  // Now determine the most specific matching range\n  const mostSpecificRange = getMostSpecificMatchingRange(version, versionRanges);\n\n  // It is impossible have undefined in this case, so this should never happen.\n  if (!mostSpecificRange) {\n    return undefined;\n  }\n\n  // Now find the match with the most specific matching range\n  return allMatches.find(({ match }) => toMatchObject(match).version === mostSpecificRange);\n}\n"]}

package/lib/packageSettings/getMostSpecificMatchingRange.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Returns the most specific semver range (i.e., with the highest minVersion)
+ * from a list of ranges that satisfies a given version.
+ */
+export declare function getMostSpecificMatchingRange(version: string, ranges: string[]): string | undefined;
+//# sourceMappingURL=getMostSpecificMatchingRange.d.ts.map

package/lib/packageSettings/getMostSpecificMatchingRange.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getMostSpecificMatchingRange.d.ts","sourceRoot":"","sources":["../../src/packageSettings/getMostSpecificMatchingRange.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAkBlG"}

package/lib/packageSettings/getMostSpecificMatchingRange.js

@@ -0,0 +1,22 @@
+import { compare, minVersion, satisfies } from 'semver';
+/**
+ * Returns the most specific semver range (i.e., with the highest minVersion)
+ * from a list of ranges that satisfies a given version.
+ */
+export function getMostSpecificMatchingRange(version, ranges) {
+    // Filter ranges that satisfy the given version
+    const matching = ranges.filter((r) => satisfies(version, r));
+    // Sort matching ranges by their minVersion (higher min = more specific)
+    const sorted = matching.sort((a, b) => {
+        const minA = minVersion(a);
+        const minB = minVersion(b);
+        // If either range is invalid or unparsable, treat them as equal
+        if (!minA || !minB)
+            return 0;
+        // Compare their minimum versions
+        return compare(minA, minB);
+    });
+    // Return the most specific one (last in the sorted list)
+    return sorted.at(-1);
+}
+//# sourceMappingURL=getMostSpecificMatchingRange.js.map

package/lib/packageSettings/getMostSpecificMatchingRange.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getMostSpecificMatchingRange.js","sourceRoot":"","sources":["../../src/packageSettings/getMostSpecificMatchingRange.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAExD;;;GAGG;AACH,MAAM,UAAU,4BAA4B,CAAC,OAAe,EAAE,MAAgB;IAC5E,+CAA+C;IAC/C,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;IAE7D,wEAAwE;IACxE,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACpC,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAE3B,gEAAgE;QAChE,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,CAAC;QAE7B,iCAAiC;QACjC,OAAO,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,yDAAyD;IACzD,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AACvB,CAAC","sourcesContent":["import { compare, minVersion, satisfies } from 'semver';\n\n/**\n * Returns the most specific semver range (i.e., with the highest minVersion)\n * from a list of ranges that satisfies a given version.\n */\nexport function getMostSpecificMatchingRange(version: string, ranges: string[]): string | undefined {\n  // Filter ranges that satisfy the given version\n  const matching = ranges.filter((r) => satisfies(version, r));\n\n  // Sort matching ranges by their minVersion (higher min = more specific)\n  const sorted = matching.sort((a, b) => {\n    const minA = minVersion(a);\n    const minB = minVersion(b);\n\n    // If either range is invalid or unparsable, treat them as equal\n    if (!minA || !minB) return 0;\n\n    // Compare their minimum versions\n    return compare(minA, minB);\n  });\n\n  // Return the most specific one (last in the sorted list)\n  return sorted.at(-1);\n}\n"]}

package/lib/packageSettings/getPackageSettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPackageSettings.d.ts","sourceRoot":"","sources":["../../src/packageSettings/getPackageSettings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAK5F,8CAA8C;AAC9C,MAAM,WAAW,wBAAwB;IACvC,0DAA0D;IAC1D,mBAAmB,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;IAChE,+DAA+D;IAC/D,wBAAwB,EAAE,IAAI,CAAC,wBAAwB,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;CAC/E;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,4CAA4C;IAC5C,mBAAmB,EAAE,eAAe,EAAE,GAAG,SAAS,CAAC;IACnD,iDAAiD;IACjD,wBAAwB,EAAE,wBAAwB,EAAE,GAAG,SAAS,CAAC;IACjE,+EAA+E;IAC/E,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GAAG,wBAAwB,CAwB3B"}
+{"version":3,"file":"getPackageSettings.d.ts","sourceRoot":"","sources":["../../src/packageSettings/getPackageSettings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAM5F,8CAA8C;AAC9C,MAAM,WAAW,wBAAwB;IACvC,0DAA0D;IAC1D,mBAAmB,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;IAChE,+DAA+D;IAC/D,wBAAwB,EAAE,IAAI,CAAC,wBAAwB,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;CAC/E;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,4CAA4C;IAC5C,mBAAmB,EAAE,eAAe,EAAE,GAAG,SAAS,CAAC;IACnD,iDAAiD;IACjD,wBAAwB,EAAE,wBAAwB,EAAE,GAAG,SAAS,CAAC;IACjE,+EAA+E;IAC/E,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GAAG,wBAAwB,CAyB3B"}

package/lib/packageSettings/getPackageSettings.js

@@ -1,6 +1,7 @@
 import { checkMatch } from './checkMatch.js';
 import { mergePackageSettings } from './mergePackageSettings.js';
 import { getBuiltInSettings } from '../builtInSettings/getBuiltInSettings.js';
+import { getGeneratedPackageSettings } from './getGeneratedPackageSettings.js';
 /**
  * Gets the user and generated package settings which apply to this package name and version,
  * with the settings from each source merged together.
@@ -19,12 +20,15 @@ export function getPackageSettings(params) {
         }
     }
     // For generated settings, restrict to exact matches since the name won't have wildcards
-    const matchingGeneratedSettings = generatedPackageSettings?.filter(({ match }) => checkMatch({ name, version, match, exactMatch: true }));
+    const matchingGeneratedSettings = getGeneratedPackageSettings({
+        name,
+        version,
+        generatedPackageSettings: generatedPackageSettings || [],
+    });
     return {
         userPackageSettings: matchingUserSettings.length ? mergePackageSettings(matchingUserSettings) : undefined,
-        generatedPackageSettings: matchingGeneratedSettings?.length
-            ? mergePackageSettings(matchingGeneratedSettings)
-            : undefined,
+        // Even with a single generated setting, we use mergePackageSettings to remove the 'match' property from the result
+        generatedPackageSettings: matchingGeneratedSettings ? mergePackageSettings([matchingGeneratedSettings]) : undefined,
     };
 }
 //# sourceMappingURL=getPackageSettings.js.map

package/lib/packageSettings/getPackageSettings.js.map

@@ -1 +1 @@
-{"version":3,"file":"getPackageSettings.js","sourceRoot":"","sources":["../../src/packageSettings/getPackageSettings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAU9E;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB,CAAC,MASlC;IACC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;IAEhG,MAAM,oBAAoB,GAAG,mBAAmB,EAAE,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAEpH,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,eAAe,GAAG,kBAAkB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QAC9D,IAAI,eAAe,EAAE,eAAe,EAAE,CAAC;YACrC,6EAA6E;YAC7E,oBAAoB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,GAAG,eAAe,CAAC,eAAe,EAAE,CAAC,CAAC;QACjG,CAAC;IACH,CAAC;IAED,wFAAwF;IACxF,MAAM,yBAAyB,GAAG,wBAAwB,EAAE,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAC/E,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CACvD,CAAC;IAEF,OAAO;QACL,mBAAmB,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,SAAS;QACzG,wBAAwB,EAAE,yBAAyB,EAAE,MAAM;YACzD,CAAC,CAAC,oBAAoB,CAAC,yBAAyB,CAAC;YACjD,CAAC,CAAC,SAAS;KACd,CAAC;AACJ,CAAC","sourcesContent":["import type { PackageSettings, GeneratedPackageSettings } from '@ms-cloudpack/common-types';\nimport { checkMatch } from './checkMatch.js';\nimport { mergePackageSettings } from './mergePackageSettings.js';\nimport { getBuiltInSettings } from '../builtInSettings/getBuiltInSettings.js';\n\n/** Result of calling `getPackageSettings`. */\nexport interface GetPackageSettingsResult {\n  /** Merged user package settings, with `match` removed. */\n  userPackageSettings: Omit<PackageSettings, 'match'> | undefined;\n  /** Merged generated package settings, with `match` removed. */\n  generatedPackageSettings: Omit<GeneratedPackageSettings, 'match'> | undefined;\n}\n\n/**\n * Gets the user and generated package settings which apply to this package name and version,\n * with the settings from each source merged together.\n *\n * NOTE: If you're calling from init-related code and would like to modify the result to update\n * the generated config, use `getGeneratedPackageSettings` instead.\n */\nexport function getPackageSettings(params: {\n  name: string;\n  version: string;\n  /** User package settings from the config */\n  userPackageSettings: PackageSettings[] | undefined;\n  /** Generated package settings from the config */\n  generatedPackageSettings: GeneratedPackageSettings[] | undefined;\n  /** If true, merge built-in package settings with the user package settings. */\n  includeBuiltIn?: boolean;\n}): GetPackageSettingsResult {\n  const { name, version, userPackageSettings, generatedPackageSettings, includeBuiltIn } = params;\n\n  const matchingUserSettings = userPackageSettings?.filter(({ match }) => checkMatch({ name, version, match })) || [];\n\n  if (includeBuiltIn) {\n    const builtInSettings = getBuiltInSettings({ name, version });\n    if (builtInSettings?.packageSettings) {\n      // Put the built-in settings first so they can be overridden by user settings\n      matchingUserSettings.unshift({ match: { name, version }, ...builtInSettings.packageSettings });\n    }\n  }\n\n  // For generated settings, restrict to exact matches since the name won't have wildcards\n  const matchingGeneratedSettings = generatedPackageSettings?.filter(({ match }) =>\n    checkMatch({ name, version, match, exactMatch: true }),\n  );\n\n  return {\n    userPackageSettings: matchingUserSettings.length ? mergePackageSettings(matchingUserSettings) : undefined,\n    generatedPackageSettings: matchingGeneratedSettings?.length\n      ? mergePackageSettings(matchingGeneratedSettings)\n      : undefined,\n  };\n}\n"]}
+{"version":3,"file":"getPackageSettings.js","sourceRoot":"","sources":["../../src/packageSettings/getPackageSettings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAU/E;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB,CAAC,MASlC;IACC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;IAEhG,MAAM,oBAAoB,GAAG,mBAAmB,EAAE,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAEpH,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,eAAe,GAAG,kBAAkB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QAC9D,IAAI,eAAe,EAAE,eAAe,EAAE,CAAC;YACrC,6EAA6E;YAC7E,oBAAoB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,GAAG,eAAe,CAAC,eAAe,EAAE,CAAC,CAAC;QACjG,CAAC;IACH,CAAC;IAED,wFAAwF;IACxF,MAAM,yBAAyB,GAAG,2BAA2B,CAAC;QAC5D,IAAI;QACJ,OAAO;QACP,wBAAwB,EAAE,wBAAwB,IAAI,EAAE;KACzD,CAAC,CAAC;IAEH,OAAO;QACL,mBAAmB,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,SAAS;QACzG,mHAAmH;QACnH,wBAAwB,EAAE,yBAAyB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;KACpH,CAAC;AACJ,CAAC","sourcesContent":["import type { PackageSettings, GeneratedPackageSettings } from '@ms-cloudpack/common-types';\nimport { checkMatch } from './checkMatch.js';\nimport { mergePackageSettings } from './mergePackageSettings.js';\nimport { getBuiltInSettings } from '../builtInSettings/getBuiltInSettings.js';\nimport { getGeneratedPackageSettings } from './getGeneratedPackageSettings.js';\n\n/** Result of calling `getPackageSettings`. */\nexport interface GetPackageSettingsResult {\n  /** Merged user package settings, with `match` removed. */\n  userPackageSettings: Omit<PackageSettings, 'match'> | undefined;\n  /** Merged generated package settings, with `match` removed. */\n  generatedPackageSettings: Omit<GeneratedPackageSettings, 'match'> | undefined;\n}\n\n/**\n * Gets the user and generated package settings which apply to this package name and version,\n * with the settings from each source merged together.\n *\n * NOTE: If you're calling from init-related code and would like to modify the result to update\n * the generated config, use `getGeneratedPackageSettings` instead.\n */\nexport function getPackageSettings(params: {\n  name: string;\n  version: string;\n  /** User package settings from the config */\n  userPackageSettings: PackageSettings[] | undefined;\n  /** Generated package settings from the config */\n  generatedPackageSettings: GeneratedPackageSettings[] | undefined;\n  /** If true, merge built-in package settings with the user package settings. */\n  includeBuiltIn?: boolean;\n}): GetPackageSettingsResult {\n  const { name, version, userPackageSettings, generatedPackageSettings, includeBuiltIn } = params;\n\n  const matchingUserSettings = userPackageSettings?.filter(({ match }) => checkMatch({ name, version, match })) || [];\n\n  if (includeBuiltIn) {\n    const builtInSettings = getBuiltInSettings({ name, version });\n    if (builtInSettings?.packageSettings) {\n      // Put the built-in settings first so they can be overridden by user settings\n      matchingUserSettings.unshift({ match: { name, version }, ...builtInSettings.packageSettings });\n    }\n  }\n\n  // For generated settings, restrict to exact matches since the name won't have wildcards\n  const matchingGeneratedSettings = getGeneratedPackageSettings({\n    name,\n    version,\n    generatedPackageSettings: generatedPackageSettings || [],\n  });\n\n  return {\n    userPackageSettings: matchingUserSettings.length ? mergePackageSettings(matchingUserSettings) : undefined,\n    // Even with a single generated setting, we use mergePackageSettings to remove the 'match' property from the result\n    generatedPackageSettings: matchingGeneratedSettings ? mergePackageSettings([matchingGeneratedSettings]) : undefined,\n  };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/config",
-  "version": "0.33.28",
+  "version": "0.33.30",
   "description": "Configuration handling for cloudpack.",
   "license": "MIT",
   "type": "module",
@@ -14,12 +14,12 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/common-types": "^0.24.13",
+    "@ms-cloudpack/common-types": "^0.24.14",
     "@ms-cloudpack/environment": "^0.1.1",
     "@ms-cloudpack/json-utilities": "^0.1.10",
-    "@ms-cloudpack/package-utilities": "^12.2.1",
+    "@ms-cloudpack/package-utilities": "^12.2.2",
     "@ms-cloudpack/path-string-parsing": "^1.2.7",
-    "@ms-cloudpack/path-utilities": "^3.0.10",
+    "@ms-cloudpack/path-utilities": "^3.0.11",
     "semver": "^7.6.0"
   },
   "devDependencies": {