@getpaseo/protocol 0.2.2 → 0.2.4

package/dist/git-remote.d.ts

@@ -1,6 +1,13 @@
 export interface GitRemoteLocation {
     transport: "scp" | "ssh" | "http" | "https";
     host: string;
+    /**
+     * Explicit non-default port from the remote (e.g. a self-hosted forge on
+     * `:60443`), or undefined for a default-port or scp-form remote. Kept separate
+     * from `host` so host-identity matching (forge detection, cloud-host checks)
+     * stays port-agnostic; only consumers that reconstruct a URL (web links) use it.
+     */
+    port?: string;
     path: string;
 }
 export interface GitHubRemoteIdentity {

package/dist/git-remote.js

@@ -5,6 +5,11 @@ const TRANSPORT_BY_PROTOCOL = {
     "http:": "http",
     "ssh:": "ssh",
 };
+const DEFAULT_PORT_BY_PROTOCOL = {
+    "https:": "443",
+    "http:": "80",
+    "ssh:": "22",
+};
 export function parseGitHubRemoteUrl(remoteUrl) {
     const location = parseGitRemoteLocation(remoteUrl);
     if (!location || !isGitHubHost(location.host))
@@ -27,7 +32,9 @@ export function parseGitRemoteLocation(remoteUrl) {
     const trimmed = remoteUrl.trim();
     if (!trimmed)
         return null;
-    const scpLike = trimmed.match(/^[^@]+@([^:]+):(.+)$/u);
+    // scp form has no scheme. Testing it first would match `ssh://git@host:22/x`
+    // — `[^@]+` happily eats `ssh://git` — and swallow the port into the path.
+    const scpLike = trimmed.includes("://") ? null : trimmed.match(/^[^@]+@([^:]+):(.+)$/u);
     if (scpLike) {
         const host = normalizeHost(scpLike[1] ?? "");
         const path = normalizeRemotePath(scpLike[2] ?? "");
@@ -56,7 +63,9 @@ export function parseGitRemoteLocation(remoteUrl) {
     const normalizedPath = normalizeRemotePath(path);
     if (!isValidRemoteHost(host) || !normalizedPath)
         return null;
-    return { transport, host, path: normalizedPath };
+    const protocol = parsed.protocol.toLowerCase();
+    const port = parsed.port && parsed.port !== DEFAULT_PORT_BY_PROTOCOL[protocol] ? parsed.port : undefined;
+    return { transport, host, port, path: normalizedPath };
 }
 export function parseGitHubRemoteIdentity(path) {
     const segments = path.split("/").filter(Boolean);