build: remove custom types (#473)

Author: felixfbecker

package-lock.json

@@ -52,14 +52,17 @@
     "@types/minimatch": "^3.0.3",
     "@types/mocha": "^8.2.0",
     "@types/node": "^14.14.14",
+    "@types/relateurl": "^0.2.28",
     "@types/semver": "^7.3.4",
+    "@types/urlencode": "^1.1.2",
     "@types/xmldom": "^0.1.30",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "husky": "^4.3.6",
     "mocha": "^8.2.1",
     "nyc": "^15.1.0",
     "prettier": "2.2.1",
+    "relateurl": "^0.2.7",
     "semantic-release": "^17.3.0",
     "semantic-release-vsce": "^3.0.1",
     "semver": "^7.3.4",

package.json

@@ -1,8 +1,27 @@
-import urlRelative = require('url-relative')
 import fileUrl = require('file-url')
 import * as url from 'url'
 import * as path from 'path'
 import { decode } from 'urlencode'
+import RelateUrl from 'relateurl'
+
+/**
+ * Options to make sure that RelateUrl only outputs relative URLs and performs not other "smart" modifications.
+ * They would mess up things like prefix checking.
+ */
+const RELATE_URL_OPTIONS: RelateUrl.Options = {
+    // Make sure RelateUrl does not prefer root-relative URLs if shorter
+    output: RelateUrl.PATH_RELATIVE,
+    // Make sure RelateUrl does not remove trailing slash if present
+    removeRootTrailingSlash: false,
+    // Make sure RelateUrl does not remove default ports
+    defaultPorts: {},
+}
+
+/**
+ * Like `path.relative()` but for URLs.
+ * Inverse of `url.resolve()` or `new URL(relative, base)`.
+ */
+const relativeUrl = (from: string, to: string): string => RelateUrl.relate(from, to, RELATE_URL_OPTIONS)
 
 /** converts a server-side XDebug file URI to a local path for VS Code with respect to source root settings */
 export function convertDebuggerPathToClient(
@@ -85,7 +104,7 @@ export function convertClientPathToDebugger(localPath: string, pathMapping?: { [
             serverSourceRootUrl += '/'
         }
         // get the part of the path that is relative to the source root
-        const urlRelativeToSourceRoot = urlRelative(localSourceRootUrl, localFileUri)
+        const urlRelativeToSourceRoot = relativeUrl(localSourceRootUrl, localFileUri)
         // resolve from the server source root
         serverFileUri = url.resolve(serverSourceRootUrl, urlRelativeToSourceRoot)
     } else {

src/custom-typings/url-relative.d.ts

@@ -1,5 +1,5 @@
 {
-  "exclude": ["node_modules", "out"],
+  "include": ["src/**/*"],
   "compilerOptions": {
     "target": "es6",
     "module": "commonjs",
@@ -13,6 +13,7 @@
     "strictNullChecks": true,
     "noImplicitReturns": true,
     "allowUnreachableCode": false,
-    "noUnusedLocals": true
+    "noUnusedLocals": true,
+    "esModuleInterop": true
   }
 }