fix: bugfix (#367)

ybiquitous · Apr 5, 2021 · 35cc9be · 35cc9be
1 parent 46f8a79
commit 35cc9be
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -2104,7 +2104,7 @@ module.exports = async function updateNpm(version) {
   await exec("sudo", ["npm", ...npmArgs("install", "--global", `npm@${version}`)]);
 
   let actualVersion = "";
-  exec("npm", ["--version"], {
+  await exec("npm", ["--version"], {
     listeners: {
       stdout: (data) => {
         actualVersion += data.toString();
@@ -4065,14 +4065,21 @@ module.exports = async function listPackages() {
   const packages = /** @type {Map<string, string>} */ new Map();
   lines
     .split("\n")
-    .filter(Boolean)
+    .filter((line) => line.trim())
     .forEach((line) => {
-      const [, pkg] = line.split(":");
+      const [, pkg] = line.split(":", 2);
       if (pkg == null) {
         throw new Error(`Invalid line: "${line}"`);
       }
 
-      const [name, version] = pkg.split("@");
+      const match = /^(?<name>@?\S+)@(?<version>\S+)$/u.exec(pkg);
+      if (match == null || match.groups == null) {
+        throw new Error(`Invalid line: "${line}"`);
+      }
+      /* eslint-disable dot-notation, prefer-destructuring -- Prevent TS4111 */
+      const name = match.groups["name"];
+      const version = match.groups["version"];
+      /* eslint-enable */
       if (name == null || version == null) {
         throw new Error(`Invalid name and version: "${line}"`);
       }

diff --git a/lib/__tests__/listPackages.test.js b/lib/__tests__/listPackages.test.js
@@ -4,4 +4,5 @@ test("listPackages()", async () => {
   const packages = await listPackages();
   expect(packages.size).not.toEqual(0);
   expect(packages.get("jest")).toMatch(/^\d+\.\d+\.\d+$/u);
+  expect(packages.get("@actions/core")).toMatch(/^\d+\.\d+\.\d+$/u);
 });
diff --git a/lib/listPackages.js b/lib/listPackages.js
@@ -17,14 +17,21 @@ module.exports = async function listPackages() {
   const packages = /** @type {Map<string, string>} */ new Map();
   lines
     .split("\n")
-    .filter(Boolean)
+    .filter((line) => line.trim())
     .forEach((line) => {
-      const [, pkg] = line.split(":");
+      const [, pkg] = line.split(":", 2);
       if (pkg == null) {
         throw new Error(`Invalid line: "${line}"`);
       }
 
-      const [name, version] = pkg.split("@");
+      const match = /^(?<name>@?\S+)@(?<version>\S+)$/u.exec(pkg);
+      if (match == null || match.groups == null) {
+        throw new Error(`Invalid line: "${line}"`);
+      }
+      /* eslint-disable dot-notation, prefer-destructuring -- Prevent TS4111 */
+      const name = match.groups["name"];
+      const version = match.groups["version"];
+      /* eslint-enable */
       if (name == null || version == null) {
         throw new Error(`Invalid name and version: "${line}"`);
       }

diff --git a/lib/updateNpm.js b/lib/updateNpm.js
@@ -8,7 +8,7 @@ module.exports = async function updateNpm(version) {
   await exec("sudo", ["npm", ...npmArgs("install", "--global", `npm@${version}`)]);
 
   let actualVersion = "";
-  exec("npm", ["--version"], {
+  await exec("npm", ["--version"], {
     listeners: {
       stdout: (data) => {
         actualVersion += data.toString();