mobbdev 0.0.77 → 0.0.80

package/dist/index.mjs

@@ -991,46 +991,67 @@ import { Octokit } from "octokit";
 import { z as z3 } from "zod";
 
 // src/features/analysis/scm/urlParser.ts
-var pathnameParsingMap = {
-  "dev.azure.com": (pathname) => {
-    if (pathname.length < 2)
-      return null;
-    return {
-      organization: pathname[0],
-      repoName: pathname[pathname.length - 1],
-      projectName: pathname[1]
-    };
-  },
-  "gitlab.com": (pathname) => {
-    if (pathname.length < 2)
-      return null;
-    return {
-      organization: pathname[0],
-      repoName: pathname[pathname.length - 1],
-      projectName: void 0
-    };
-  },
-  "github.com": (pathname) => {
-    if (pathname.length !== 2)
-      return null;
-    return {
-      organization: pathname[0],
-      repoName: pathname[1],
-      projectName: void 0
-    };
+function getRepoInfo(pathname, hostname) {
+  const hostnameParts = hostname.split(".");
+  if (hostnameParts.length === 3 && hostnameParts[1] === "visualstudio" && hostnameParts[2] === "com") {
+    if (pathname.length === 2 && pathname[0] === "_git") {
+      return {
+        organization: hostnameParts[0],
+        projectName: pathname[1],
+        repoName: pathname[1]
+      };
+    }
+    if (pathname.length === 3 && pathname[1] === "_git") {
+      return {
+        organization: hostnameParts[0],
+        projectName: pathname[0],
+        repoName: pathname[2]
+      };
+    }
   }
-};
+  if (hostname === "dev.azure.com") {
+    if (pathname.length === 3 && pathname[1] === "_git") {
+      return {
+        organization: pathname[0],
+        projectName: pathname[2],
+        repoName: pathname[2]
+      };
+    }
+    if (pathname.length === 4 && pathname[2] === "_git") {
+      return {
+        organization: pathname[0],
+        projectName: pathname[1],
+        repoName: pathname[3]
+      };
+    }
+  }
+  if (hostname === "github.com") {
+    if (pathname.length === 2) {
+      return {
+        organization: pathname[0],
+        projectName: void 0,
+        repoName: pathname[1]
+      };
+    }
+  }
+  if (hostname === "gitlab.com") {
+    if (pathname.length >= 2) {
+      return {
+        organization: pathname[0],
+        projectName: void 0,
+        repoName: pathname[pathname.length - 1]
+      };
+    }
+  }
+  return null;
+}
 var NAME_REGEX = /[a-z0-9\-_.+]+/i;
 var parseScmURL = (scmURL) => {
   try {
     const url = new URL(scmURL);
     const hostname = url.hostname.toLowerCase();
-    if (!(hostname in pathnameParsingMap))
-      return null;
     const projectPath = url.pathname.substring(1).replace(/.git$/i, "");
-    const repo = pathnameParsingMap[hostname](
-      projectPath.split("/")
-    );
+    const repo = getRepoInfo(projectPath.split("/"), hostname);
     if (!repo)
       return null;
     const { organization, repoName, projectName } = repo;
@@ -1039,7 +1060,7 @@ var parseScmURL = (scmURL) => {
     if (!organization.match(NAME_REGEX) || !repoName.match(NAME_REGEX))
       return null;
     return {
-      hostname: url.hostname,
+      hostname,
       organization,
       projectPath,
       repoName,
@@ -1860,13 +1881,15 @@ function getScmLibTypeFromUrl(url) {
   if (!url) {
     return void 0;
   }
-  if (url.toLowerCase().startsWith("https://gitlab.com/")) {
+  const urlObject = new URL(url);
+  const hostname = urlObject.hostname;
+  if (hostname === "gitlab.com") {
     return "GITLAB" /* GITLAB */;
   }
-  if (url.toLowerCase().startsWith("https://github.com/")) {
+  if (hostname === "github.com") {
     return "GITHUB" /* GITHUB */;
   }
-  if (url.toLowerCase().startsWith("https://dev.azure.com/")) {
+  if (hostname === "dev.azure.com" || hostname.endsWith(".visualstudio.com")) {
     return "ADO" /* ADO */;
   }
   return void 0;
@@ -1973,7 +1996,7 @@ var SCMLib = class {
   }) {
     let trimmedUrl = void 0;
     if (url) {
-      trimmedUrl = url.trim().replace(/\/$/, "");
+      trimmedUrl = url.trim().replace(/\/$/, "").replace(/.git$/i, "");
     }
     try {
       if ("GITHUB" /* GITHUB */ === scmType) {
@@ -3089,7 +3112,7 @@ async function getAdoReferenceData({
 function parseAdoOwnerAndRepo(adoUrl) {
   adoUrl = removeTrailingSlash3(adoUrl);
   const parsingResult = parseScmURL(adoUrl);
-  if (!parsingResult || parsingResult.hostname !== "dev.azure.com") {
+  if (!parsingResult || parsingResult.hostname !== "dev.azure.com" && !parsingResult.hostname.endsWith(".visualstudio.com")) {
     throw new InvalidUrlPatternError(`invalid ADO repo URL: ${adoUrl}`);
   }
   const { organization, repoName, projectName, projectPath, pathElements } = parsingResult;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobbdev",
-  "version": "0.0.77",
+  "version": "0.0.80",
   "description": "Automated secure code remediation tool",
   "repository": "https://github.com/mobb-dev/bugsy",
   "main": "dist/index.js",
@@ -31,7 +31,7 @@
     "@octokit/request-error": "3.0.3",
     "@types/libsodium-wrappers": "0.7.13",
     "adm-zip": "0.5.10",
-    "axios": "1.6.5",
+    "axios": "1.6.7",
     "azure-devops-node-api": "12.1.0",
     "chalk": "5.3.0",
     "chalk-animation": "2.0.3",
@@ -48,34 +48,34 @@
     "istextorbinary": "6.0.0",
     "libsodium-wrappers": "0.7.13",
     "nanospinner": "1.1.0",
-    "node-fetch": "3.3.1",
+    "node-fetch": "3.3.2",
     "octokit": "2.0.14",
     "open": "8.4.2",
     "parse-diff": "0.11.1",
-    "semver": "7.5.0",
+    "semver": "7.5.4",
     "simple-git": "3.19.1",
     "snyk": "1.1118.0",
     "supports-color": "9.4.0",
     "tar": "6.2.0",
     "tmp": "0.2.1",
-    "uuid": "9.0.0",
+    "uuid": "9.0.1",
     "ws": "8.10.0",
     "yargs": "17.7.2",
-    "zod": "3.22.3"
+    "zod": "3.22.4"
   },
   "devDependencies": {
     "@octokit/plugin-rest-endpoint-methods": "7.0.1",
     "@octokit/request-error": "3.0.3",
     "@octokit/types": "12.4.0",
     "@types/adm-zip": "0.5.0",
-    "@types/chalk-animation": "1.6.1",
-    "@types/configstore": "6.0.0",
-    "@types/debug": "4.1.8",
-    "@types/inquirer": "9.0.3",
-    "@types/semver": "7.5.0",
-    "@types/tar": "^6.1.6",
+    "@types/chalk-animation": "1.6.3",
+    "@types/configstore": "6.0.2",
+    "@types/debug": "4.1.12",
+    "@types/inquirer": "9.0.7",
+    "@types/semver": "7.5.6",
+    "@types/tar": "6.1.11",
     "@types/tmp": "0.2.3",
-    "@types/uuid": "9.0.1",
+    "@types/uuid": "9.0.8",
     "@types/ws": "8.5.3",
     "@types/yargs": "17.0.24",
     "@typescript-eslint/eslint-plugin": "5.44.0",
@@ -86,8 +86,8 @@
     "eslint-plugin-simple-import-sort": "10.0.0",
     "prettier": "2.8.4",
     "tsup": "7.2.0",
-    "typescript": "4.9.3",
-    "vitest": "0.26.2"
+    "typescript": "4.9.5",
+    "vitest": "0.34.6"
   },
   "engines": {
     "node": ">=12.20.0"