@fatcherjs/middleware-json 2.0.0 → 3.0.0-alpha-5

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 fatcherjs
+Copyright (c) 2022 Fansy
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -1,12 +1,4 @@
-# @fatcherjs/middleware-json
-
-A middleware for transform response to JSON
-
-[![codecov](https://codecov.io/gh/fatcherjs/middleware-json/branch/master/graph/badge.svg?token=TFKUGW6YNI)](https://codecov.io/gh/fatcherjs/middleware-json)
-[![install size](https://packagephobia.com/badge?p=@fatcherjs/middleware-json)](https://packagephobia.com/result?p=@fatcherjs/middleware-json)
-<a href="https://unpkg.com/fatcher"><img alt="Size" src="https://img.badgesize.io/https://unpkg.com/fatcher"></a>
-<a href="https://npmjs.com/package/@fatcherjs/middleware-json"><img src="https://img.shields.io/npm/v/@fatcherjs/middleware-json.svg" alt="npm package"></a>
-<a href="https://github.com/fatcherjs/middleware-json/actions/workflows/ci.yml"><img src="https://github.com/fatcherjs/middleware-json/actions/workflows/ci.yml/badge.svg?branch=master" alt="build status"></a>
+# @fatcher/middleware-json
 
 ## Install
 
@@ -19,30 +11,20 @@ A middleware for transform response to JSON
 ### CDN
 
 ```html
-<script src="https://cdn.jsdelivr.net/npm/@fatcherjs/middleware-json/dist/json.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/@fatcherjs/middleware-json/dist/index.min.js"></script>
 ```
 
 ## Usage
 
 ```ts
-import { json } from '@fatcherjs/middleware-json';
 import { fatcher } from 'fatcher';
+import { json } from '@fatcherjs/middleware-json';
 
-fatcher({
-    url: '/bar/foo',
-    middlewares: [json()],
-    body: {
-        bar: 'foo',
-    },
-})
-    .then(res => {
-        console.log(res);
-    })
-    .catch(err => {
-        console.error(error);
-    });
+fatcher('https://foo.bar', {
+  middlewares: [json()],
+});
 ```
 
 ## License
 
-[LICENSE](https://github.com/fatcherjs/fatcher/blob/master/LICENSE)
+[MIT](https://github.com/fanhaoyuan/fatcher/blob/master/LICENSE)

package/dist/index.d.ts

@@ -0,0 +1,11 @@
+import { FatcherMiddleware } from 'fatcher';
+
+declare const json: () => FatcherMiddleware;
+
+declare module 'fatcher' {
+    interface FatcherResponse {
+        readStreamAsJson: <T>(onRead?: (chunk: string, buffer: Uint8Array) => void | Promise<void>) => Promise<T | null>;
+    }
+}
+
+export { json };

package/dist/index.esm.js

@@ -0,0 +1,31 @@
+import { readStreamByChunk } from '@fatcherjs/utils-shared';
+import 'fatcher';
+
+const json = () => {
+  return async (context, next) => {
+    const response = await next();
+    if (response.bodyUsed || !response.body) {
+      response.readStreamAsJson = async () => null;
+      return response;
+    }
+    const clonedResponse = response.clone();
+    response.readStreamAsJson = async (onRead) => {
+      const textDecoder = new TextDecoder();
+      let string = "";
+      await readStreamByChunk(clonedResponse.body, (chunk) => {
+        const currentChunkString = textDecoder.decode(chunk, { stream: true });
+        string += currentChunkString;
+        onRead?.(currentChunkString, chunk);
+      });
+      string += textDecoder.decode(void 0, { stream: false });
+      try {
+        return JSON.parse(string);
+      } catch {
+        return null;
+      }
+    };
+    return response;
+  };
+};
+
+export { json };

package/dist/index.js

@@ -0,0 +1,35 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var utilsShared = require('@fatcherjs/utils-shared');
+require('fatcher');
+
+const json = () => {
+  return async (context, next) => {
+    const response = await next();
+    if (response.bodyUsed || !response.body) {
+      response.readStreamAsJson = async () => null;
+      return response;
+    }
+    const clonedResponse = response.clone();
+    response.readStreamAsJson = async (onRead) => {
+      const textDecoder = new TextDecoder();
+      let string = "";
+      await utilsShared.readStreamByChunk(clonedResponse.body, (chunk) => {
+        const currentChunkString = textDecoder.decode(chunk, { stream: true });
+        string += currentChunkString;
+        onRead?.(currentChunkString, chunk);
+      });
+      string += textDecoder.decode(void 0, { stream: false });
+      try {
+        return JSON.parse(string);
+      } catch {
+        return null;
+      }
+    };
+    return response;
+  };
+};
+
+exports.json = json;

package/dist/index.min.js

@@ -0,0 +1 @@
+(function(t,n){typeof exports=="object"&&typeof module!="undefined"?n(exports):typeof define=="function"&&define.amd?define(["exports"],n):(t=typeof globalThis!="undefined"?globalThis:t||self,n(t.FatcherMiddlewareJson={}))})(this,function(t){"use strict";async function n(i,a){async function e(s){const{value:r,done:o}=await s.read();o||(await a(r),await e(s))}return e(i.getReader())}const f=()=>async(i,a)=>{const e=await a();if(e.bodyUsed||!e.body)return e.readStreamAsJson=async()=>null,e;const s=e.clone();return e.readStreamAsJson=async r=>{const o=new TextDecoder;let c="";await n(s.body,d=>{const u=o.decode(d,{stream:!0});c+=u,r==null||r(u,d)}),c+=o.decode(void 0,{stream:!1});try{return JSON.parse(c)}catch(d){return null}},e};t.json=f,Object.defineProperty(t,"__esModule",{value:!0})});

package/package.json

@@ -1,55 +1,32 @@
 {
   "name": "@fatcherjs/middleware-json",
-  "version": "2.0.0",
-  "main": "dist/json.js",
-  "module": "dist/json.esm.js",
-  "browser": "dist/json.min.js",
-  "typings": "dist/json.d.ts",
-  "license": "MIT",
-  "description": "A fatcher middleware for transforming stream into json",
-  "keywords": [
-    "fatcher",
-    "middleware",
-    "json"
-  ],
+  "homepage": "https://github.com/fanhaoyuan/fatcher",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/fanhaoyuan/fatcher.git"
+  },
+  "main": "dist/index.js",
+  "module": "dist/index.esm.js",
+  "browser": "dist/index.min.js",
+  "typings": "dist/index.d.ts",
   "files": [
     "dist"
   ],
-  "homepage": "https://github.com/fatcherjs/middleware-json",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/fatcherjs/middleware-json"
+  "peerDependencies": {
+    "fatcher": "3.0.0-alpha-5"
   },
-  "devDependencies": {
-    "@fansy/eslint-config": "^1.1.0",
-    "@fansy/prettier-config": "^1.0.0",
-    "@jest/types": "^29.1.2",
-    "@rollup/plugin-node-resolve": "^15.0.0",
-    "@types/jest": "^29.1.2",
-    "@types/node": "^18.11.2",
-    "esbuild": "^0.15.10",
-    "fatcher": "^2.0.0",
-    "jest": "^29.1.2",
-    "jest-fetch-mock": "^3.0.3",
-    "rimraf": "^3.0.2",
-    "rollup": "^2.79.1",
-    "rollup-plugin-dts": "^4.2.3",
-    "rollup-plugin-esbuild": "^4.10.1",
-    "ts-jest": "^29.0.3",
-    "ts-node": "^10.9.1",
-    "typescript": "^4.8.4"
+  "dependencies": {
+    "@fatcherjs/utils-shared": "3.0.0-alpha-5"
   },
-  "peerDependencies": {
-    "fatcher": "^2.0.0"
+  "devDependencies": {
+    "fatcher": "3.0.0-alpha-5"
   },
+  "version": "3.0.0-alpha-5",
   "scripts": {
-    "dev": "rimraf dist && rollup -c rollup.config.ts -w",
-    "build": "rimraf dist && rollup -c rollup.config.ts",
-    "deploy": "pnpm run build && pnpm publish --no-git-check",
+    "clean": "rimraf dist",
+    "build": "npm run clean && rollup -c rollup.config.ts",
     "test": "jest",
     "test:cov": "jest --coverage",
-    "eslint": "eslint .",
-    "tsc": "tsc --noEmit",
-    "ci": "npm run eslint && npm run tsc && npm run build  && npm run test"
+    "tsc": "tsc --noEmit"
   }
 }

package/dist/json.d.ts

@@ -1,12 +0,0 @@
-import { Middleware } from 'fatcher';
-
-/**
- * A middleware for transforming stream into json
- *
- * If response.body never used, will try to transform into json.
- *
- * But if transform error. Will return a origin response.
- */
-declare function json(): Middleware;
-
-export { json };

package/dist/json.esm.js

@@ -1,18 +0,0 @@
-import { defineMiddleware, canActivate } from 'fatcher';
-
-function json() {
-  return defineMiddleware(async (context, next) => {
-    const result = await next();
-    if (canActivate(result.data)) {
-      const clonedResponse = result.data.clone();
-      try {
-        const data = await clonedResponse.json();
-        return Object.assign(result, { data });
-      } catch (e) {
-      }
-    }
-    return result;
-  }, "fatcher-middleware-json");
-}
-
-export { json };

package/dist/json.js

@@ -1,22 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var fatcher = require('fatcher');
-
-function json() {
-  return fatcher.defineMiddleware(async (context, next) => {
-    const result = await next();
-    if (fatcher.canActivate(result.data)) {
-      const clonedResponse = result.data.clone();
-      try {
-        const data = await clonedResponse.json();
-        return Object.assign(result, { data });
-      } catch (e) {
-      }
-    }
-    return result;
-  }, "fatcher-middleware-json");
-}
-
-exports.json = json;

package/dist/json.min.js

@@ -1 +0,0 @@
-(function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(exports,require("fatcher")):typeof define=="function"&&define.amd?define(["exports","fatcher"],t):(e=typeof globalThis!="undefined"?globalThis:e||self,t(e.FatcherMiddlewareJson={},e.Fatcher))})(this,function(e,t){"use strict";function o(){return t.defineMiddleware(async(a,s)=>{const n=await s();if(t.canActivate(n.data)){const d=n.data.clone();try{const i=await d.json();return Object.assign(n,{data:i})}catch(i){}}return n},"fatcher-middleware-json")}e.json=o,Object.defineProperty(e,"__esModule",{value:!0})});