fixup

Author: Adam-it

src/m365/spfx/commands/project/project-azuredevops-pipeline-add.spec.ts

@@ -185,7 +185,7 @@ describe(commands.PROJECT_AZUREDEVOPS_PIPELINE_ADD, () => {
 
     sinon.stub(command as any, 'getProjectVersion').returns('');
 
-    sinon.stub(fs, 'writeFileSync').throws('error');
+    sinon.stub(fs, 'writeFileSync').throws(new Error('writeFileSync failed'));
 
     await assert.rejects(command.action(logger, { options: {} } as any),
       new CommandError(`Unable to determine the version of the current SharePoint Framework project`));
@@ -215,7 +215,7 @@ describe(commands.PROJECT_AZUREDEVOPS_PIPELINE_ADD, () => {
 
     sinon.stub(command as any, 'getProjectVersion').returns('99.99.99');
 
-    sinon.stub(fs, 'writeFileSync').throws('error');
+    sinon.stub(fs, 'writeFileSync').throws(new Error('writeFileSync failed'));
 
     await assert.rejects(command.action(logger, { options: {} } as any),
       new CommandError(`Could not find Node version for 99.99.99 of SharePoint Framework`));
@@ -250,4 +250,4 @@ describe(commands.PROJECT_AZUREDEVOPS_PIPELINE_ADD, () => {
     await assert.rejects(command.action(logger, { options: {} } as any),
       new CommandError('error'));
   });
-});
+});

src/m365/spfx/commands/project/project-github-workflow-add.spec.ts

@@ -186,7 +186,7 @@ describe(commands.PROJECT_GITHUB_WORKFLOW_ADD, () => {
 
     sinon.stub(command as any, 'getProjectVersion').returns(undefined);
 
-    sinon.stub(fs, 'writeFileSync').throws('error');
+    sinon.stub(fs, 'writeFileSync').throws(new Error('writeFileSync failed'));
 
     await assert.rejects(command.action(logger, { options: {} }),
       new CommandError(`Unable to determine the version of the current SharePoint Framework project`));
@@ -217,7 +217,7 @@ describe(commands.PROJECT_GITHUB_WORKFLOW_ADD, () => {
 
     sinon.stub(command as any, 'getProjectVersion').returns('99.99.99');
 
-    sinon.stub(fs, 'writeFileSync').throws('error');
+    sinon.stub(fs, 'writeFileSync').throws(new Error('writeFileSync failed'));
 
     await assert.rejects(command.action(logger, { options: {} }),
       new CommandError(`Could not find Node version for 99.99.99 of SharePoint Framework`));
@@ -247,9 +247,11 @@ describe(commands.PROJECT_GITHUB_WORKFLOW_ADD, () => {
 
     sinon.stub(command as any, 'getProjectVersion').returns('1.21.1');
 
-    sinon.stub(fs, 'writeFileSync').callsFake(() => { throw 'error'; });
+    sinon.stub(fs, 'writeFileSync').callsFake(() => {
+      throw new Error('writeFileSync failed');
+    });
 
     await assert.rejects(command.action(logger, { options: {} } as any),
-      new CommandError('error'));
+      new CommandError('writeFileSync failed'));
   });
-});
+});

src/utils/spfx.spec.ts

@@ -30,12 +30,12 @@ describe('utils/spfx', () => {
 
   it('returns correct Node version for a given range', () => {
     const version = spfx.getHighestNodeVersion('>=14.0.0 <15.0.0 || >=16.0.0 <17.0.0');
-    assert.strictEqual(version, '17.0.x');
+    assert.strictEqual(version, '16.0.0');
   });
 
   it('returns correct Node version for a single version', () => {
     const version = spfx.getHighestNodeVersion('^10');
-    assert.strictEqual(version, '10.0.x');
+    assert.strictEqual(version, '10.x');
   });
 
   it('returns correct Node version for a range with multiple versions', () => {
@@ -47,4 +47,9 @@ describe('utils/spfx', () => {
     const version = spfx.getHighestNodeVersion('8.1 || 8.2');
     assert.strictEqual(version, '8.2.x');
   });
-});
+
+  it('returns highest major for disjoint ranges', () => {
+    const version = spfx.getHighestNodeVersion('>=16.13.0 <17.0.0 || >=18.17.1 <19.0.0');
+    assert.strictEqual(version, '18.17.1');
+  });
+});

src/utils/spfx.ts

@@ -1,3 +1,4 @@
+import { minVersion, SemVer, validRange } from 'semver';
 import { Project } from '../m365/spfx/commands/project/project-model/index.js';
 
 export const spfx = {
@@ -17,35 +18,57 @@ export const spfx = {
   },
 
   getHighestNodeVersion(versionRange: string): string {
-    const ranges = versionRange.split('||').map(r => r.trim());
+    if (!versionRange) {
+      throw new Error('Node version range was not provided.');
+    }
 
-    const versions = ranges.map(range => {
-      if (range.includes('<')) {
-        const upperBound = range.split('<')[1].trim().split(' ')[0];
-        const parts = upperBound.split('.');
-        return `${parts[0]}.${parts[1]}`;
+    const ranges = versionRange
+      .split('||')
+      .map(range => range.trim())
+      .filter(range => range.length > 0);
+
+    let highest: { version: SemVer; source: string } | null = null;
+
+    for (const range of ranges) {
+      const normalized = validRange(range);
+      if (!normalized) {
+        continue;
       }
 
-      const cleaned = range.replace(/[\^>=<~]/g, '');
-      const parts = cleaned.split('.');
+      const minimum = minVersion(normalized);
+      if (!minimum) {
+        continue;
+      }
 
-      if (parts.length >= 2) {
-        return `${parts[0]}.${parts[1]}`;
+      if (!highest || minimum.compare(highest.version) > 0) {
+        highest = {
+          version: minimum,
+          source: range
+        };
       }
+    }
 
-      return `${parts[0]}.0`;
-    });
+    if (!highest) {
+      throw new Error(`Unable to resolve the highest Node version for range '${versionRange}'.`);
+    }
 
-    const sorted = versions.sort((a, b) => {
-      const [aMajor, aMinor] = a.split('.').map(Number);
-      const [bMajor, bMinor] = b.split('.').map(Number);
+    const source = highest.source.trim();
+    const compactSource = source.replace(/\s+/g, '');
+    const isCaretOrTilde = compactSource.startsWith('^') || compactSource.startsWith('~');
+    const isSimpleVersion = /^[0-9]+(\.[0-9]+){0,2}$/.test(compactSource);
 
-      if (aMajor !== bMajor) {
-        return bMajor - aMajor;
+    if (isCaretOrTilde || isSimpleVersion) {
+      const numeric = isCaretOrTilde ? compactSource.substring(1) : compactSource;
+      const parts = numeric.split('.').filter(part => part.length > 0);
+      const { major, minor } = highest.version;
+
+      if (parts.length >= 2) {
+        return `${major}.${parts[1]}.x`;
       }
-      return bMinor - aMinor;
-    });
 
-    return `${sorted[0]}.x`;
+      return `${major}.x`;
+    }
+
+    return highest.version.version;
   }
-};
+};