Refactor based on request from review

pickware · Jul 30, 2024 · 3f612e0 · 3f612e0
1 parent 84212b2
commit 3f612e0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ### Bug fixes
 
-* Fixes version check does not support composer version ranges.
+* Fixes plugin binary version checks to support composer version constraints.
 
 ## 4.0.0
 

diff --git a/lib/commands/compatibility.js b/lib/commands/compatibility.js
@@ -2,7 +2,7 @@
 
 const Chalk = require('chalk');
 const Program = require('commander');
-const { compareVersions, compareVersionsWithComperator } = require('composer-version-constraint-evaluator');
+const { compareVersions, compareVersionsWithComparator } = require('composer-version-constraint-evaluator');
 const { promisify } = require('util');
 
 const ShopwareStoreCommander = require('../shopwareStoreCommander');
@@ -74,19 +74,19 @@ async function main() {
                 ).shift().name;
             }
 
-            if (compareVersionsWithComperator(Program.opts().minVersion, minCompatibleVersion, '<')) {
+            if (compareVersionsWithComparator(Program.opts().minVersion, minCompatibleVersion, '<')) {
                 // Add new version compatibility entries to lower the minimum compatibility
                 console.log(`Lowering minimum compatible Shopware version of binary ${binary.version} to ${Program.opts().minVersion}...`);
                 binary.compatibleSoftwareVersions = binary.compatibleSoftwareVersions.concat(shopwareVersions.filter(
                     version => version.selectable
-                        && compareVersionsWithComperator(version.name, Program.opts().minVersion, '>=')
-                        && compareVersionsWithComperator(version.name, minCompatibleVersion, '<'),
+                        && compareVersionsWithComparator(version.name, Program.opts().minVersion, '>=')
+                        && compareVersionsWithComparator(version.name, minCompatibleVersion, '<'),
                 ));
-            } else if (compareVersionsWithComperator(Program.opts().minVersion, minCompatibleVersion, '>')) {
+            } else if (compareVersionsWithComparator(Program.opts().minVersion, minCompatibleVersion, '>')) {
                 // Remove some version compatibilities to raise the minimum compatibility
                 console.log(`Raising minimum compatible Shopware version of binary ${binary.version} to ${Program.opts().minVersion}...`);
                 binary.compatibleSoftwareVersions = binary.compatibleSoftwareVersions.filter(
-                    version => version.selectable && compareVersionsWithComperator(version.name, Program.opts().minVersion, '>='),
+                    version => version.selectable && compareVersionsWithComparator(version.name, Program.opts().minVersion, '>='),
                 );
             } else {
                 console.log(`Minimum compatible Shopware version of binary ${binary.version} already matches ${Program.opts().minVersion}`);
@@ -97,7 +97,7 @@ async function main() {
             if (binary.compatibleSoftwareVersions.length === 0) {
                 // Add at least the minimum compatible shopware version
                 binary.compatibleSoftwareVersions = [
-                    shopwareVersions.find(version => version.selectable && compareVersionsWithComperator(version.name, Program.opts().minVersion, '=')),
+                    shopwareVersions.find(version => version.selectable && compareVersionsWithComparator(version.name, Program.opts().minVersion, '=')),
                 ];
             }
 

diff --git a/package.json b/package.json
@@ -59,4 +59,4 @@
         "node": ">=18.0.0"
     },
     "preferGlobal": true
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,4 +59,4 @@ @@
             "node": ">=18.0.0"
         },
         "preferGlobal": true
-    }
+    }