api-def 0.7.1-alpha.1 → 0.7.2

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2019 James Waterhouse
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+MIT License
+
+Copyright (c) 2019 James Waterhouse
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

package/README.md

@@ -1,34 +1,34 @@
-# [api-def](https://github.com/Censkh/api-def/) · [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/Censkh/api-def/blob/master/LICENSE) [![npm version](https://img.shields.io/npm/v/api-def.svg?style=flat)](https://www.npmjs.com/package/api-def) [![build status](https://img.shields.io/github/workflow/status/censkh/api-def/Node.js%20CI)](https://github.com/Censkh/api-def/actions)
-
-Typed APIs with middleware support
-
-API def provides a unified way to type your endpoints allowing for compile time checking of query, body, response and even url parameters
-
-``` npm i api-def ```
-
-- [Documentation](https://censkh.github.io/api-def/)
-
-```typescript
-import {Api} from "api-def";
-
-const api = new Api({
-  baseUrl: "https://my-api/",
-  name: "My API",
-});
-
-const fetchData = api.endpoint()
-    .queryOf<{ includeAwesome: boolean; }>()
-    .responseOf<{ data: {awesome: boolean; } }>()
-    .build({
-      id: "fetch_data",
-      method: "get",
-      path: "/data"
-    });
-
-// calls GET https://my-api/data?includeAwesome=true
-const res = await fetchData.submit({
-  query: {includeAwesome: true}
-});
-
-console.log(res.data); // { data: { awesome: true } }
-```
+# [api-def](https://github.com/Censkh/api-def/) &middot; [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/Censkh/api-def/blob/master/LICENSE) [![npm version](https://img.shields.io/npm/v/api-def.svg?style=flat)](https://www.npmjs.com/package/api-def) [![build status](https://img.shields.io/github/workflow/status/censkh/api-def/Node.js%20CI)](https://github.com/Censkh/api-def/actions)
+
+Typed APIs with middleware support
+
+API def provides a unified way to type your endpoints allowing for compile time checking of query, body, response and even url parameters
+
+``` npm i api-def ```
+
+- [Documentation](https://censkh.github.io/api-def/)
+
+```typescript
+import {Api} from "api-def";
+
+const api = new Api({
+  baseUrl: "https://my-api/",
+  name: "My API",
+});
+
+const fetchData = api.endpoint()
+    .queryOf<{ includeAwesome: boolean; }>()
+    .responseOf<{ data: {awesome: boolean; } }>()
+    .build({
+      id: "fetch_data",
+      method: "get",
+      path: "/data"
+    });
+
+// calls GET https://my-api/data?includeAwesome=true
+const res = await fetchData.submit({
+  query: {includeAwesome: true}
+});
+
+console.log(res.data); // { data: { awesome: true } }
+```

package/cjs/ApiUtils.js

@@ -34,7 +34,7 @@ var isAcceptableStatus = function (status, acceptableStatus) {
 exports.isAcceptableStatus = isAcceptableStatus;
 var TEXT_CONTENT_TYPES = ["text/plain"];
 var JSON_CONTENT_TYPES = ["text/json", "application/json"];
-var ARRRAY_BUFFER_CONTENT_TYPES = ["application/octet-stream"];
+var ARRAY_BUFFER_CONTENT_TYPES = ["application/octet-stream"];
 var inferResponseType = function (contentType) {
     var contentTypePart = contentType === null || contentType === void 0 ? void 0 : contentType.split(";")[0].trim();
     if (contentTypePart) {
@@ -44,7 +44,7 @@ var inferResponseType = function (contentType) {
         else if (JSON_CONTENT_TYPES.includes(contentTypePart)) {
             return "json";
         }
-        else if (ARRRAY_BUFFER_CONTENT_TYPES.includes(contentTypePart)) {
+        else if (ARRAY_BUFFER_CONTENT_TYPES.includes(contentTypePart)) {
             return "arraybuffer";
         }
     }

package/cjs/RequestContext.js

@@ -129,7 +129,7 @@ var RequestContext = /** @class */ (function () {
         var _a;
         if (this.computedConfig.body && this.computedConfig.headers) {
             var contentTypeKey = Object.keys(this.computedConfig.headers).find(function (key) { return key.toLowerCase() === "content-type"; });
-            var contentType = contentTypeKey && ((_a = this.computedConfig.headers[contentTypeKey]) === null || _a === void 0 ? void 0 : _a.toString());
+            var contentType = contentTypeKey && ((_a = this.computedConfig.headers[contentTypeKey]) === null || _a === void 0 ? void 0 : _a.toString().split(";")[0].trim());
             if (contentType === "application/x-www-form-urlencoded") {
                 var searchParams = new URLSearchParams();
                 for (var _i = 0, _b = Object.keys(this.computedConfig.body); _i < _b.length; _i++) {

package/cjs/backend/FetchRequestBackend.js

@@ -84,7 +84,7 @@ var FetchRequestBackend = /** @class */ (function () {
     };
     FetchRequestBackend.prototype.convertResponse = function (context, response) {
         return __awaiter(this, void 0, void 0, function () {
-            var contentType, responseType, _a, data, status, headers, error_1;
+            var contentType, responseType, _a, data, status, headers, error_1, processedHeaders;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -118,11 +118,17 @@ var FetchRequestBackend = /** @class */ (function () {
                         throw Object.assign(new Error("[api-def] Invalid '".concat(context.responseType, "' response, got: '").concat(response.__text, "'")), {
                             response: response,
                         });
-                    case 8: return [2 /*return*/, {
-                            data: data,
-                            status: status,
-                            headers: headers,
-                        }];
+                    case 8:
+                        processedHeaders = {};
+                        headers.forEach(function (value, key) {
+                            processedHeaders[key] = value;
+                        });
+                        return [2 /*return*/, {
+                                __lowercaseHeaders: processedHeaders,
+                                data: data,
+                                status: status,
+                                headers: processedHeaders,
+                            }];
                 }
             });
         });

package/esm/ApiUtils.js

@@ -28,7 +28,7 @@ export var isAcceptableStatus = function (status, acceptableStatus) {
 };
 var TEXT_CONTENT_TYPES = ["text/plain"];
 var JSON_CONTENT_TYPES = ["text/json", "application/json"];
-var ARRRAY_BUFFER_CONTENT_TYPES = ["application/octet-stream"];
+var ARRAY_BUFFER_CONTENT_TYPES = ["application/octet-stream"];
 export var inferResponseType = function (contentType) {
     var contentTypePart = contentType === null || contentType === void 0 ? void 0 : contentType.split(";")[0].trim();
     if (contentTypePart) {
@@ -38,7 +38,7 @@ export var inferResponseType = function (contentType) {
         else if (JSON_CONTENT_TYPES.includes(contentTypePart)) {
             return "json";
         }
-        else if (ARRRAY_BUFFER_CONTENT_TYPES.includes(contentTypePart)) {
+        else if (ARRAY_BUFFER_CONTENT_TYPES.includes(contentTypePart)) {
             return "arraybuffer";
         }
     }

package/esm/RequestContext.js

@@ -127,7 +127,7 @@ var RequestContext = /** @class */ (function () {
         var _a;
         if (this.computedConfig.body && this.computedConfig.headers) {
             var contentTypeKey = Object.keys(this.computedConfig.headers).find(function (key) { return key.toLowerCase() === "content-type"; });
-            var contentType = contentTypeKey && ((_a = this.computedConfig.headers[contentTypeKey]) === null || _a === void 0 ? void 0 : _a.toString());
+            var contentType = contentTypeKey && ((_a = this.computedConfig.headers[contentTypeKey]) === null || _a === void 0 ? void 0 : _a.toString().split(";")[0].trim());
             if (contentType === "application/x-www-form-urlencoded") {
                 var searchParams = new URLSearchParams();
                 for (var _i = 0, _b = Object.keys(this.computedConfig.body); _i < _b.length; _i++) {

package/esm/backend/FetchRequestBackend.js

@@ -82,7 +82,7 @@ var FetchRequestBackend = /** @class */ (function () {
     };
     FetchRequestBackend.prototype.convertResponse = function (context, response) {
         return __awaiter(this, void 0, void 0, function () {
-            var contentType, responseType, _a, data, status, headers, error_1;
+            var contentType, responseType, _a, data, status, headers, error_1, processedHeaders;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -116,11 +116,17 @@ var FetchRequestBackend = /** @class */ (function () {
                         throw Object.assign(new Error("[api-def] Invalid '".concat(context.responseType, "' response, got: '").concat(response.__text, "'")), {
                             response: response,
                         });
-                    case 8: return [2 /*return*/, {
-                            data: data,
-                            status: status,
-                            headers: headers,
-                        }];
+                    case 8:
+                        processedHeaders = {};
+                        headers.forEach(function (value, key) {
+                            processedHeaders[key] = value;
+                        });
+                        return [2 /*return*/, {
+                                __lowercaseHeaders: processedHeaders,
+                                data: data,
+                                status: status,
+                                headers: processedHeaders,
+                            }];
                 }
             });
         });

package/package.json

@@ -1,76 +1,76 @@
-{
-  "name": "api-def",
-  "version": "0.7.1-alpha.1",
-  "description": "Typed API definitions with middleware support",
-  "main": "cjs/index.js",
-  "types": "esm/index.d.ts",
-  "module": "esm/index.js",
-  "sideEffects": false,
-  "scripts": {
-    "prepublishOnly": "npm run test && npm run build",
-    "test": "npm run test:types && npm run test:lint && npm run test:unit",
-    "test:unit": "ava",
-    "test:lint": "npm run lint:strict",
-    "test:types": "tsc --noEmit -p .",
-    "example:start": "cd example && npm run start",
-    "lint": "esw --ext .tsx,.ts src",
-    "lint:watch": "npm run lint -- --watch",
-    "lint:fix": "npm run lint -- --fix",
-    "lint:strict": "npm run lint -- --max-warnings 0",
-    "cleanup": "rimraf esm && rimraf cjs",
-    "build": "npm run cleanup && npm run build:esm && npm run build:cjs",
-    "build:esm": "tsc --module es2015 --target es5 --outDir esm --preserveWatchOutput",
-    "build:cjs": "tsc --module commonjs --target es5 --outDir cjs --preserveWatchOutput",
-    "build:watch": "npm-run-all -p \"build:esm -- -w\" \"build:cjs -- -w\" \"lint:watch\"",
-    "website:dev": "cd website && npm run start",
-    "website:deploy": "cd website && npm run deploy"
-  },
-  "keywords": [
-    "typescript",
-    "javascript",
-    "node",
-    "web",
-    "api",
-    "typed",
-    "cache",
-    "fetch",
-    "retry",
-    "middleware"
-  ],
-  "author": "James Waterhouse <09jwater@gmail.com>",
-  "license": "MIT",
-  "files": [
-    "LICENSE",
-    "README.md",
-    "esm/",
-    "cjs/"
-  ],
-  "repository": "https://github.com/Censkh/api-def",
-  "ava": {
-    "extensions": [
-      "ts"
-    ],
-    "files": [
-      "src/tests/**/*.test.ts"
-    ],
-    "nodeArguments": [
-      "--require=@esbuild-kit/cjs-loader"
-    ]
-  },
-  "devDependencies": {
-    "@babel/preset-env": "7.14.8",
-    "@babel/preset-typescript": "7.14.5",
-    "@esbuild-kit/cjs-loader": "2.4.0",
-    "@types/axios": "0.14.0",
-    "@types/node": "16.4.6",
-    "@typescript-eslint/eslint-plugin": "4.28.5",
-    "@typescript-eslint/parser": "4.28.5",
-    "ava": "5.0.1",
-    "axios": "1.1.3",
-    "cross-env": "7.0.3",
-    "eslint": "7.31.0",
-    "eslint-watch": "7.0.0",
-    "npm-run-all": "4.1.5",
-    "typescript": "4.8.4"
-  }
-}
+{
+  "name": "api-def",
+  "version": "0.7.2",
+  "description": "Typed API definitions with middleware support",
+  "main": "cjs/index.js",
+  "types": "esm/index.d.ts",
+  "module": "esm/index.js",
+  "sideEffects": false,
+  "scripts": {
+    "prepublishOnly": "npm run test && npm run build",
+    "test": "npm run test:types && npm run test:lint && npm run test:unit",
+    "test:unit": "ava",
+    "test:lint": "npm run lint:strict",
+    "test:types": "tsc --noEmit -p .",
+    "example:start": "cd example && npm run start",
+    "lint": "esw --ext .tsx,.ts src",
+    "lint:watch": "npm run lint -- --watch",
+    "lint:fix": "npm run lint -- --fix",
+    "lint:strict": "npm run lint -- --max-warnings 0",
+    "cleanup": "rimraf esm && rimraf cjs",
+    "build": "npm run cleanup && npm run build:esm && npm run build:cjs",
+    "build:esm": "tsc --module es2015 --target es5 --outDir esm --preserveWatchOutput",
+    "build:cjs": "tsc --module commonjs --target es5 --outDir cjs --preserveWatchOutput",
+    "build:watch": "npm-run-all -p \"build:esm -- -w\" \"build:cjs -- -w\" \"lint:watch\"",
+    "website:dev": "cd website && npm run start",
+    "website:deploy": "cd website && npm run deploy"
+  },
+  "keywords": [
+    "typescript",
+    "javascript",
+    "node",
+    "web",
+    "api",
+    "typed",
+    "cache",
+    "fetch",
+    "retry",
+    "middleware"
+  ],
+  "author": "James Waterhouse <09jwater@gmail.com>",
+  "license": "MIT",
+  "files": [
+    "LICENSE",
+    "README.md",
+    "esm/",
+    "cjs/"
+  ],
+  "repository": "https://github.com/Censkh/api-def",
+  "ava": {
+    "extensions": [
+      "ts"
+    ],
+    "files": [
+      "src/tests/**/*.test.ts"
+    ],
+    "nodeArguments": [
+      "--require=@esbuild-kit/cjs-loader"
+    ]
+  },
+  "devDependencies": {
+    "@babel/preset-env": "7.14.8",
+    "@babel/preset-typescript": "7.14.5",
+    "@esbuild-kit/cjs-loader": "2.4.0",
+    "@types/axios": "0.14.0",
+    "@types/node": "16.4.6",
+    "@typescript-eslint/eslint-plugin": "4.28.5",
+    "@typescript-eslint/parser": "4.28.5",
+    "ava": "5.0.1",
+    "axios": "1.1.3",
+    "cross-env": "7.0.3",
+    "eslint": "7.31.0",
+    "eslint-watch": "7.0.0",
+    "npm-run-all": "4.1.5",
+    "typescript": "4.8.4"
+  }
+}