@ms-cloudpack/config - npm Package Compare versions

Comparing version 0.17.1 to 0.17.2

lib/compareSettings.js

 export function compareSettings(a, b) {
-    const { name: aName = '', version: aVersion = '*' } = a.match || {};
-    const { name: bName = '', version: bVersion = '*' } = b.match || {};
+    // TypeScript's type narrowing doesn't work well with object properties,
+    // so we can assign them to variables to help it out.
+    const aMatch = a.match;
+    const bMatch = b.match;
+    // Check if the match is a string.
+    const isAString = typeof aMatch === 'string';
+    const isBString = typeof bMatch === 'string';
+    // Place string matches at the beginning of the list.
+    if (isAString && isBString) {
+        return aMatch.localeCompare(bMatch);
+    }
+    else if (isAString) {
+        return 1;
+    }
+    else if (isBString) {
+        return -1;
+    }
+    const { name: aName = '', version: aVersion = '*' } = aMatch || {};
+    const { name: bName = '', version: bVersion = '*' } = bMatch || {};
     if (aName === bName) {
@@ -5,0 +22,0 @@ return aVersion.localeCompare(bVersion);

lib/getPackageSettings.d.ts

@@ -18,2 +18,16 @@ import type { PackageSettings, CloudpackConfig } from '@ms-cloudpack/config-types';
 };
+/**
+ * Checks if the package is a match for the given package settings.
+ * @param name The name of the package.
+ * @param version The version of the package.
+ * @param match The match to check against.
+ * @param firstMatch If true, only the first matching package settings will be returned, rather than the merge of all viable settings.
+ * @returns True if the package is a match for the given package settings.
+ */
+export declare function checkMatch(params: {
+    name: string;
+    version: string;
+    match: PackageSettings['match'];
+    firstMatch?: boolean;
+}): boolean;
 //# sourceMappingURL=getPackageSettings.d.ts.map

lib/getPackageSettings.js

@@ -10,3 +10,6 @@ import { satisfies } from 'semver';
         userPackageSettings: filterSettings({ ...params, packageSettings: config.packageSettings }),
-        generatedPackageSettings: filterSettings({ ...params, packageSettings: config.generated?.packageSettings }),
+        generatedPackageSettings: filterSettings({
+            ...params,
+            packageSettings: config.generated?.packageSettings,
+        }),
     };
@@ -19,9 +22,31 @@ }
     const { name, version, packageSettings, firstMatch } = params;
-    const filteredSettings = packageSettings?.filter(({ match }) => match?.name === name && (!match.version || satisfies(version, match.version)));
-    return filteredSettings?.length
-        ? firstMatch
-            ? filteredSettings[0]
-            : mergePackageSettings(filteredSettings)
-        : undefined;
+    if (firstMatch) {
+        return packageSettings?.find(({ match }) => checkMatch({ name, version, match, firstMatch }));
+    }
+    const filteredSettings = packageSettings?.filter(({ match }) => checkMatch({ name, version, match }));
+    return filteredSettings?.length ? mergePackageSettings(filteredSettings) : undefined;
 }
+/**
+ * Checks if the package is a match for the given package settings.
+ * @param name The name of the package.
+ * @param version The version of the package.
+ * @param match The match to check against.
+ * @param firstMatch If true, only the first matching package settings will be returned, rather than the merge of all viable settings.
+ * @returns True if the package is a match for the given package settings.
+ */
+export function checkMatch(params) {
+    const { name, version, match, firstMatch } = params;
+    let matchName, matchVersion;
+    if (typeof match === 'string') {
+        matchName = match;
+    }
+    else {
+        matchName = match?.name;
+        matchVersion = match?.version;
+    }
+    if (firstMatch || !matchName.endsWith('*')) {
+        return matchName === name && (!matchVersion || satisfies(version, matchVersion));
+    }
+    return name.startsWith(matchName.slice(0, -1)) && (!matchVersion || satisfies(version, matchVersion));
+}
 //# sourceMappingURL=getPackageSettings.js.map

lib/index.d.ts

@@ -5,3 +5,3 @@ export { configTemplate } from './configTemplate.js';
 export { getConfigPath } from './getConfigPath.js';
-export { getPackageSettings } from './getPackageSettings.js';
+export { getPackageSettings, checkMatch } from './getPackageSettings.js';
 export { readConfig } from './readConfig.js';
@@ -8,0 +8,0 @@ export { readGeneratedConfig } from './readGeneratedConfig.js';

lib/index.js

@@ -5,3 +5,3 @@ export { configTemplate } from './configTemplate.js';
 export { getConfigPath } from './getConfigPath.js';
-export { getPackageSettings } from './getPackageSettings.js';
+export { getPackageSettings, checkMatch } from './getPackageSettings.js';
 export { readConfig } from './readConfig.js';
@@ -8,0 +8,0 @@ export { readGeneratedConfig } from './readGeneratedConfig.js';

lib/mergePackageSettings.js

@@ -0,1 +1,2 @@
+const defaultInputPaths = ['src/**', '*.json', '!**/node_modules/**'];
 /**
@@ -41,2 +42,9 @@ * Merges package settings together. Takes care to merge exports maps correctly.
         }
+        if (setting.inputPaths) {
+            const defaultInputPathsIndex = setting.inputPaths.indexOf('...');
+            if (defaultInputPathsIndex > -1) {
+                setting.inputPaths.splice(defaultInputPathsIndex, 1, ...defaultInputPaths);
+            }
+            acc.inputPaths = [...(acc.inputPaths || []), ...setting.inputPaths];
+        }
         return acc;
@@ -43,0 +51,0 @@ }, {});

package.json

 {
   "name": "@ms-cloudpack/config",
-  "version": "0.17.1",
+  "version": "0.17.2",
   "description": "Configuration handling for cloudpack.",
@@ -17,6 +17,6 @@ "license": "MIT",
   "dependencies": {
-    "@ms-cloudpack/bundler-types": "^0.22.0",
-    "@ms-cloudpack/config-types": "^0.1.0",
+    "@ms-cloudpack/bundler-types": "^0.23.0",
+    "@ms-cloudpack/config-types": "^0.1.1",
     "@ms-cloudpack/json-utilities": "^0.1.2",
-    "@ms-cloudpack/package-utilities": "^5.5.2",
+    "@ms-cloudpack/package-utilities": "^5.6.0",
     "semver": "^7.3.7"
@@ -23,0 +23,0 @@ },

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

55076

increased by12.96%

Lines of code

444

increased by16.84%

Dependency changes

• + Added@ms-cloudpack/bundler-types@0.23.12(transitive)

• + Added@ms-cloudpack/config-types@0.4.4(transitive)

• - Removed@ms-cloudpack/bundler-types@0.22.0(transitive)

• Updated@ms-cloudpack/bundler-types@^0.23.0

• Updated@ms-cloudpack/config-types@^0.1.1

• Updated@ms-cloudpack/package-utilities@^5.6.0