🤖 Merge PR DefinitelyTyped#72363 feat(git-url-parse,git-up): update types to match latest versions by @viceice

Signed-off-by: Michael Kriese <[email protected]>

Author: viceice

types/git-up/git-up-tests.ts

@@ -5,15 +5,15 @@ type PU = gitUp.ParsedUrl;
 
 const parsedUrl = gitUp("[email protected]:IonicaBizau/node-parse-url.git"); // $ExpectType ParsedUrl
 
-parsedUrl.protocols; // $ExpectType string[]
+parsedUrl.protocols; // $ExpectType Protocol[]
 parsedUrl.port; // $ExpectType string
 parsedUrl.resource; // $ExpectType string
-parsedUrl.user; // $ExpectType string | undefined
+parsedUrl.user; // $ExpectType string
 parsedUrl.pathname; // $ExpectType string
 parsedUrl.hash; // $ExpectType string
 parsedUrl.search; // $ExpectType string
 parsedUrl.href; // $ExpectType string
-parsedUrl.protocol; // $ExpectType string
+parsedUrl.protocol; // $ExpectType Protocol
 parsedUrl.token; // $ExpectType string
 parsedUrl.query; // $ExpectType Record<string, string>
-parsedUrl.parse_failed; // $ExpectType false
+parsedUrl.parse_failed; // $ExpectType boolean

types/git-up/index.d.ts

@@ -1,3 +1,5 @@
+import parseUrl = require("parse-url");
+
 export = gitUp;
 
 /**
@@ -12,7 +14,7 @@ export = gitUp;
  * console.log(gitUp("[email protected]:IonicaBizau/node-parse-url.git"));
  * // => {
  * //     protocols: []
- * //   , port: null
+ * //   , port: ""
  * //   , resource: "github.com"
  * //   , user: "git"
  * //   , pathname: "/IonicaBizau/node-parse-url.git"
@@ -25,7 +27,7 @@ export = gitUp;
  * console.log(gitUp("https://github.com/IonicaBizau/node-parse-url.git"));
  * // => {
  * //     protocols: [ "https" ]
- * //   , port: null
+ * //   , port: ""
  * //   , resource: "github.com"
  * //   , user: ""
  * //   , pathname: "/IonicaBizau/node-parse-url.git"
@@ -38,28 +40,14 @@ export = gitUp;
 declare function gitUp(input: string): gitUp.ParsedUrl;
 
 declare namespace gitUp {
-    interface ParsedUrl {
-        /** An array with the url protocols (usually it has one element). */
-        protocols: string[];
-        /** The domain port. */
-        port: string;
-        /** The url domain (including subdomains). */
-        resource: string;
-        /** The authentication user (usually for ssh urls). */
-        user: string | undefined;
-        /** The url pathname. */
-        pathname: string;
-        /** The url hash. */
-        hash: string;
-        /** The url querystring value. */
-        search: string;
-        /** The input url. */
-        href: string;
-        /** The git url protocol. */
-        protocol: string;
-        /** The oauth token (could appear in the https urls). */
+    interface ParsedUrl extends parseUrl.ParsedUrl {
+        /**
+         * The oauth token (could appear in the https urls).
+         *
+         * An empty string if not found.
+         * Set from user if password is `x-oauth-basic`.
+         * Set from password if user is `x-token-auth`.
+         */
         token: string;
-        query: Record<string, string>;
-        parse_failed: false;
     }
 }

types/git-up/package.json

@@ -1,10 +1,13 @@
 {
     "private": true,
     "name": "@types/git-up",
-    "version": "7.0.9999",
+    "version": "8.0.9999",
     "projects": [
         "https://github.com/IonicaBizau/git-up"
     ],
+    "dependencies": {
+        "parse-url": "^9.2.0"
+    },
     "devDependencies": {
         "@types/git-up": "workspace:."
     },

types/git-url-parse/git-url-parse-tests.ts

@@ -3,6 +3,11 @@ import gitUrlParse = require("git-url-parse");
 gitUrlParse("[email protected]:IonicaBizau/node-git-url-parse.git"); // $ExpectType GitUrl
 gitUrlParse("[email protected]:IonicaBizau/node-git-url-parse.git").toString(); // $ExpectType string
 gitUrlParse("[email protected]:IonicaBizau/node-git-url-parse.git").toString("git+ssh"); // $ExpectType string
+gitUrlParse("[email protected]:IonicaBizau/node-git-url-parse.git").port; // $ExpectType string
+gitUrlParse("[email protected]:IonicaBizau/node-git-url-parse.git").user; // $ExpectType string
+gitUrlParse("[email protected]:IonicaBizau/node-git-url-parse.git").password; // $ExpectType string
+gitUrlParse("[email protected]:IonicaBizau/node-git-url-parse.git").token; // $ExpectType string
+gitUrlParse("[email protected]:IonicaBizau/node-git-url-parse.git").protocol; // $ExpectType Protocol
 
 gitUrlParse.stringify(gitUrlParse("[email protected]:IonicaBizau/node-git-url-parse.git")); // $ExpectType string
 gitUrlParse.stringify(gitUrlParse("[email protected]:IonicaBizau/node-git-url-parse.git"), "https"); // $ExpectType string

types/git-url-parse/index.d.ts

@@ -1,19 +1,7 @@
+import gitUp = require("git-up");
+
 declare namespace gitUrlParse {
-    interface GitUrl {
-        /** An array with the url protocols (usually it has one element). */
-        protocols: string[];
-        port: number | null;
-        /** The url domain (including subdomains). */
-        resource: string;
-        /** The authentication user (usually for ssh urls). */
-        user: string;
-        pathname: string;
-        hash: string;
-        search: string;
-        href: string;
-        protocol: string;
-        /** The oauth token (could appear in the https urls). */
-        token: string;
+    interface GitUrl extends gitUp.ParsedUrl {
         /** The Git provider (e.g. `"github.com"`). */
         source: string;
         /** The repository owner. */

types/git-url-parse/package.json

@@ -1,10 +1,13 @@
 {
     "private": true,
     "name": "@types/git-url-parse",
-    "version": "9.0.9999",
+    "version": "16.0.9999",
     "projects": [
         "https://github.com/IonicaBizau/git-url-parse"
     ],
+    "dependencies": {
+        "@types/git-up": "^8.0.0"
+    },
     "devDependencies": {
         "@types/git-url-parse": "workspace:."
     },