@d1g1tal/transportr 1.4.0 → 1.4.2

package/package.json

@@ -1,77 +1,69 @@
-{
-  "name": "@d1g1tal/transportr",
-  "version": "1.4.0",
-  "description": "JavaScript wrapper for the Fetch API",
-  "type": "module",
-  "exports": {
-    ".": {
-      "import": "./src/transportr.js",
-      "default": "./dist/transportr.min.js"
-    }
-  },
-  "browser": {
-    "transportr.js": "./dist/transportr.js",
-    "transportr.min.js": "./dist/transportr.min.js",
-    "transportr.min.js.map": "./dist/transportr.min.js.map"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "files": [
-    "/src",
-    "/dist",
-    "index.js"
-  ],
-  "scripts": {
-    "build": "rimraf dist && esbuild src/transportr.js --bundle --platform=browser --global-name=Transportr --footer:js='window.Transportr = Transportr.default;' --outfile=dist/transportr.js && esbuild src/transportr.js --bundle --sourcemap --minify --platform=browser --global-name=Transportr --footer:js='window.Transportr = Transportr.default;' --outfile=dist/transportr.min.js",
-    "lint": "eslint --ext .js --ignore-path .gitignore .",
-    "test": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/D1g1talEntr0py/transportr.git"
-  },
-  "keywords": [
-    "Fetch",
-    "JavaScript"
-  ],
-  "author": "Jason DiMeo",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/D1g1talEntr0py/transportr/issues"
-  },
-  "homepage": "https://github.com/D1g1talEntr0py/transportr#readme",
-  "devDependencies": {
-    "@skypack/package-check": "^0.2.2",
-    "@xmldom/xmldom": "^0.8.10",
-    "esbuild": "^0.19.3",
-    "eslint": "^8.50.0",
-    "eslint-plugin-compat": "^4.2.0",
-    "eslint-plugin-jsdoc": "^46.8.2",
-    "jest": "^29.7.0",
-    "rimraf": "^5.0.4"
-  },
-  "dependencies": {
-    "@d1g1tal/chrysalis": "^1.2.3",
-    "@d1g1tal/collections": "^0.2.3",
-    "@d1g1tal/media-type": "^4.1.0",
-    "@d1g1tal/subscribr": "^3.0.1"
-  },
-  "browserslist": [
-    "defaults",
-    "not ios_saf < 15",
-    "not op_mini all"
-  ],
-  "jest": {
-    "verbose": true,
-    "clearMocks": true,
-    "coverageDirectory": "./tests/coverage/",
-    "coveragePathIgnorePatterns": [
-      "/node_modules/"
-    ],
-    "collectCoverage": true,
-    "collectCoverageFrom": [
-      "src/**/*.js"
-    ]
-  }
-}
+{
+  "name": "@d1g1tal/transportr",
+  "version": "1.4.2",
+  "description": "JavaScript wrapper for the Fetch API",
+  "type": "module",
+  "exports": {
+    ".": "./src/transportr.js",
+    "./dist/*": "./dist/*"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "files": [
+    "/dist",
+    "/src"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/D1g1talEntr0py/transportr.git"
+  },
+  "keywords": [
+    "Fetch",
+    "JavaScript"
+  ],
+  "author": "Jason DiMeo",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/D1g1talEntr0py/transportr/issues"
+  },
+  "homepage": "https://github.com/D1g1talEntr0py/transportr#readme",
+  "packageManager": "pnpm@8.10.2+sha256.487609e857f1c11780cc98dd0bfe4c8a8b11c7f23bc3a4493ac7d263d6fb6c8c",
+  "dependencies": {
+    "@d1g1tal/chrysalis": "^2.2.0",
+    "@d1g1tal/media-type": "^5.0.0",
+    "@d1g1tal/subscribr": "^3.0.2"
+  },
+  "devDependencies": {
+    "@xmldom/xmldom": "^0.8.10",
+    "esbuild": "^0.19.5",
+    "esbuild-library": "^1.0.2",
+    "eslint": "^8.53.0",
+    "eslint-plugin-compat": "^4.2.0",
+    "eslint-plugin-jsdoc": "^46.9.0",
+    "jest": "^29.7.0"
+  },
+  "browserslist": [
+    "defaults",
+    "not ios_saf < 15",
+    "not op_mini all"
+  ],
+  "jest": {
+    "verbose": true,
+    "clearMocks": true,
+    "collectCoverage": true,
+    "coverageDirectory": "./tests/coverage",
+    "collectCoverageFrom": [
+      "src/**/*.js"
+    ],
+    "coveragePathIgnorePatterns": [
+      "/node_modules/"
+    ]
+  },
+  "scripts": {
+    "build": "node ./esbuild.js",
+    "lint": "eslint --ext .js --ignore-path .gitignore .",
+    "test": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js",
+    "check": "npx package-check"
+  }
+}

package/src/abort-signal.js

@@ -1,21 +1,23 @@
 import { SignalEvents, abortEvent } from './constants.js';
 
+/** @typedef {globalThis.AbortSignal} NativeAbortSignal */
+
 /**
  * @typedef {function(Event):void} EventListener
  * @param {Event} event The event object
  */
 
-export default class AbortSignal extends EventTarget {
+export default class AbortSignal {
 	/** @type {AbortController} */
 	#abortController;
 	/** @type {number} */
 	#timeoutId;
 
 	/**
-	 * @param {AbortSignal} signal The signal to listen to
+	 * @param {NativeAbortSignal} signal The signal to chain.
+	 * This signal will be able to abort the request, but will not be notified if the request is aborted by the timeout.
 	 */
 	constructor(signal) {
-		super();
 		this.#abortController = new AbortController();
 		signal?.addEventListener(SignalEvents.ABORT, (event) => this.#abort(event));
 	}

package/src/constants.js

@@ -1,6 +1,6 @@
 import HttpRequestMethod from './http-request-methods.js';
 import ResponseStatus from './response-status.js';
-import { MediaType } from '@d1g1tal/media-type';
+import MediaType from '@d1g1tal/media-type';
 import HttpMediaType from './http-media-type.js';
 
 /** @typedef {'configured'|'success'|'error'|'aborted'|'timeout'|'complete'} RequestEvent */

package/src/transportr.js

@@ -1,4 +1,3 @@
-import SetMultiMap from '@d1g1tal/collections/set-multi-map.js';
 import Subscribr from '@d1g1tal/subscribr';
 import AbortSignal from './abort-signal.js';
 import HttpError from './http-error.js';
@@ -8,7 +7,7 @@ import HttpRequestMethod from './http-request-methods.js';
 import HttpResponseHeader from './http-response-headers.js';
 import ParameterMap from './parameter-map.js';
 import ResponseStatus from './response-status.js';
-import { MediaType } from '@d1g1tal/media-type';
+import MediaType from '@d1g1tal/media-type';
 import { _objectMerge, _type } from '@d1g1tal/chrysalis';
 import { RequestEvents, abortEvent, abortSignalProxyHandler, endsWithSlashRegEx, eventResponseStatuses, internalServerError, mediaTypes, requestBodyMethods } from './constants.js';
 
@@ -132,8 +131,8 @@ export default class Transportr {
 	static #globalSubscribr = new Subscribr();
 	/** @type {Set<AbortSignal>} */
 	static #activeRequests = new Set();
-	/** @type {SetMultiMap<ResponseHandler<ResponseBody>, string>} */
-	static #contentTypeHandlers = new SetMultiMap([
+	/** @type {Map<ResponseHandler<ResponseBody>, string>} */
+	static #contentTypeHandlers = new Map([
 		[_handleImage, mediaTypes.get(HttpMediaType.PNG).type],
 		[_handleText, mediaTypes.get(HttpMediaType.TEXT).type],
 		[_handleJson, mediaTypes.get(HttpMediaType.JSON).subtype],
@@ -257,7 +256,7 @@ export default class Transportr {
 		body: null,
 		cache: Transportr.CachingPolicy.NO_STORE,
 		credentials: Transportr.CredentialsPolicy.SAME_ORIGIN,
-		headers: { [HttpRequestHeader.CONTENT_TYPE]: mediaTypes.get(HttpMediaType.JSON).toString(), [HttpRequestHeader.ACCEPT]: mediaTypes.get(HttpMediaType.JSON).toString() },
+		headers: { [HttpRequestHeader.CONTENT_TYPE]: `${mediaTypes.get(HttpMediaType.JSON)}`, [HttpRequestHeader.ACCEPT]: `${mediaTypes.get(HttpMediaType.JSON)}` },
 		searchParams: {},
 		integrity: undefined,
 		keepalive: undefined,
@@ -366,8 +365,10 @@ export default class Transportr {
 	 * @param {RequestOptions} [options] The options for the request.
 	 * @returns {Promise<ResponseBody>} A promise that resolves to the response body.
 	 */
-	async post(path, body, options) {
-		return this.#request(path, { ...options, body }, { method: HttpRequestMethod.POST });
+	async post(path, body = {}, options = {}) {
+		if (_type(path) != String) { [ path, body, options ] = [ undefined, path, body ] }
+
+		return this.#request(path, Object.assign(options, { body }), { method: HttpRequestMethod.POST });
 	}
 
 	/**
@@ -454,7 +455,7 @@ export default class Transportr {
 	 * @returns {Promise<JsonObject>} A promise that resolves to the response body as a JSON object.
 	 */
 	async getJson(path, options) {
-		return this.#get(path, options, { headers: { [HttpRequestHeader.ACCEPT]: mediaTypes.get(HttpMediaType.JSON).toString() } }, _handleJson);
+		return this.#get(path, options, { headers: { [HttpRequestHeader.ACCEPT]: `${mediaTypes.get(HttpMediaType.JSON)}` } }, _handleJson);
 	}
 
 	/**
@@ -466,7 +467,7 @@ export default class Transportr {
 	 * @returns {Promise<Document>} The result of the function call to #get.
 	 */
 	async getXml(path, options) {
-		return this.#get(path, options, { headers: { [HttpRequestHeader.ACCEPT]: mediaTypes.get(HttpMediaType.XML).toString() } }, _handleXml);
+		return this.#get(path, options, { headers: { [HttpRequestHeader.ACCEPT]: `${mediaTypes.get(HttpMediaType.XML)}` } }, _handleXml);
 	}
 
 	/**
@@ -480,7 +481,7 @@ export default class Transportr {
 	 * method of the promise returned by the `#get` method.
 	 */
 	async getHtml(path, options) {
-		return this.#get(path, options, { headers: { [HttpRequestHeader.ACCEPT]: mediaTypes.get(HttpMediaType.HTML).toString() } }, _handleHtml);
+		return this.#get(path, options, { headers: { [HttpRequestHeader.ACCEPT]: `${mediaTypes.get(HttpMediaType.HTML)}` } }, _handleHtml);
 	}
 
 	/**
@@ -493,7 +494,7 @@ export default class Transportr {
 	 * @returns {Promise<DocumentFragment>} A promise that resolves to an HTML fragment.
 	 */
 	async getHtmlFragment(path, options) {
-		return this.#get(path, options, { headers: { [HttpRequestHeader.ACCEPT]: mediaTypes.get(HttpMediaType.HTML).toString() } }, _handleHtmlFragment);
+		return this.#get(path, options, { headers: { [HttpRequestHeader.ACCEPT]: `${mediaTypes.get(HttpMediaType.HTML)}` } }, _handleHtmlFragment);
 	}
 
 	/**
@@ -506,7 +507,7 @@ export default class Transportr {
 	 * @returns {Promise<void>} A promise that has been resolved.
 	 */
 	async getScript(path, options) {
-		return this.#get(path, options, { headers: { [HttpRequestHeader.ACCEPT]: mediaTypes.get(HttpMediaType.JAVA_SCRIPT).toString() } }, _handleScript);
+		return this.#get(path, options, { headers: { [HttpRequestHeader.ACCEPT]: `${mediaTypes.get(HttpMediaType.JAVA_SCRIPT)}` } }, _handleScript);
 	}
 
 	/**
@@ -518,7 +519,7 @@ export default class Transportr {
 	 * @returns {Promise<void>} A promise that has been resolved.
 	 */
 	async getStylesheet(path, options) {
-		return this.#get(path, options, { headers: { [HttpRequestHeader.ACCEPT]: mediaTypes.get(HttpMediaType.CSS).toString() } }, _handleCss);
+		return this.#get(path, options, { headers: { [HttpRequestHeader.ACCEPT]: `${mediaTypes.get(HttpMediaType.CSS)}` } }, _handleCss);
 	}
 
 	/**
@@ -632,7 +633,7 @@ export default class Transportr {
 
 				Transportr.#activeRequests.delete(options.signal);
 
-				if (Transportr.#activeRequests.size === 0) {
+				if (Transportr.#activeRequests.size == 0) {
 					this.#publish({ name: RequestEvents.ALL_COMPLETE, global: options.global });
 				}
 			}
@@ -753,7 +754,7 @@ export default class Transportr {
 	static #createUrl(url, path, searchParams) {
 		const requestUrl = path ? new URL(`${url.pathname.replace(endsWithSlashRegEx, '')}${path}`, url.origin) : new URL(url);
 
-		searchParams?.forEach((value, key) => requestUrl.searchParams.append(key, value));
+		searchParams?.forEach((value, name) => requestUrl.searchParams.append(name, value));
 
 		return requestUrl;
 	}
@@ -814,19 +815,15 @@ export default class Transportr {
 	 * @returns {ResponseHandler<ResponseBody>} The response handler.
 	 */
 	#getResponseHandler(contentType) {
-		let handler;
 		const mediaType = MediaType.parse(contentType);
 
 		if (mediaType) {
-			for (const [responseHandler, contentTypes] of Transportr.#contentTypeHandlers) {
-				if (contentTypes.has(mediaType.type) || contentTypes.has(mediaType.subtype)) {
-					handler = responseHandler;
-					break;
-				}
+			for (const [responseHandler, contentType] of Transportr.#contentTypeHandlers) {
+				if (mediaType.matches(contentType)) {	return responseHandler }
 			}
 		}
 
-		return handler;
+		return undefined;
 	}
 
 	/**

package/index.js

@@ -1 +0,0 @@
-export { default as Transportr } from './src/transportr.js';