Merge pull request #318 from fwal/fwal/fix-version-lookup

Improved version lookup

Author: fwal

__tests__/get-version.test.ts

@@ -0,0 +1,25 @@
+import { versionFromString } from "../src/get-version";
+
+describe("version lookup", () => {
+  it("identifies version from swift version", async () => {
+    const version = versionFromString(
+      "Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57)"
+    );
+    expect(version).toBe("5.4.2");
+  });
+
+  it("identifies version from swift version with target", async () => {
+    const version = versionFromString(
+      `Apple Swift version 5.5 (swiftlang-1300.0.31.1 clang-1300.0.29.1)
+Target: x86_64-apple-macosx11.0`
+    );
+    expect(version).toBe("5.5");
+  });
+
+  it("identifies version from swift-driver version", async () => {
+    const version = versionFromString(
+      "swift-driver version: 1.26.9 Apple Swift version 5.5 (swiftlang-1300.0.31.1 clang-1300.0.29.1)"
+    );
+    expect(version).toBe("5.5");
+  });
+});

src/get-version.ts

@@ -20,11 +20,17 @@ export async function getVersion(
 
   await exec(command, args, options);
 
-  if (error) {
-    throw new Error(error);
+  if (!output && error) {
+    throw new Error("Error getting swift version " + error);
   }
 
-  const match = output.match(/(?<version>[0-9]+\.[0-9+]+(\.[0-9]+)?)/) || {
+  return versionFromString(output);
+}
+
+export function versionFromString(subject: string): string | null {
+  const match = subject.match(
+    /Apple\ Swift\ version (?<version>[0-9]+\.[0-9+]+(\.[0-9]+)?)/
+  ) || {
     groups: { version: null },
   };