@fatcherjs/middleware-json 3.0.0-alpha-11 → 3.0.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Fansy
+Copyright (c) 2022 fatcherjs
 
 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,8 +1,25 @@
 # @fatcherjs/middleware-json
 
-<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>
-[![install size](https://packagephobia.com/badge?p=@fatcherjs/middleware-json)](https://packagephobia.com/result?p=@fatcherjs/middleware-json)
-<a href="https://unpkg.com/@fatcherjs/middleware-json"><img alt="Size" src="https://img.badgesize.io/https://unpkg.com/@fatcherjs/middleware-json"></a>
+<div align="center">
+  <a href="https://codecov.io/github/fatcherjs/middleware-json" > 
+    <img src="https://codecov.io/github/fatcherjs/middleware-json/graph/badge.svg?token=TFKUGW6YNI"/> 
+ </a>
+  <a href="https://www.jsdelivr.com/package/npm/@fatcherjs/middleware-json">
+    <img src="https://data.jsdelivr.com/v1/package/npm/@fatcherjs/middleware-json/badge?style=rounded" alt="jsDelivr">
+  </a>
+  <a href="https://packagephobia.com/result?p=@fatcherjs/middleware-json">
+    <img src="https://packagephobia.com/badge?p=@fatcherjs/middleware-json" alt="install size">
+  </a>
+  <a href="https://unpkg.com/@fatcherjs/middleware-json">
+    <img src="https://img.badgesize.io/https://unpkg.com/@fatcherjs/middleware-json" alt="Size">
+  </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>
+</div>
 
 ## Install
 
@@ -15,7 +32,20 @@
 ### CDN
 
 ```html
+<script src="https://cdn.jsdelivr.net/npm/fatcher/dist/fatcher.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/@fatcherjs/middleware-json/dist/index.min.js"></script>
+
+<script>
+  Fatcher.fatcher('url', {
+    middlewares: [FatcherMiddlewareJson],
+    progressive: {
+      isPlaceholder: (value) => value.startsWith('$$');
+    }
+  }).then(response => {
+    console.log(response.skeleton); // Promise Tree
+    console.log(response.snapshot); // Progressive Json
+  });
+</script>
 ```
 
 ## Usage
@@ -26,13 +56,101 @@ import { json } from '@fatcherjs/middleware-json';
 
 const res = await fatcher('https://foo.bar/get', {
   middlewares: [json],
+  progressive: {
+    isPlaceholder: (value) => value.startsWith('$$');
+  }
 });
 
-const streamingJson = await res.readStreamAsJson((string: string, buffer: Uint8Array) => {
-  console.log(string, buffer); // chunks for streaming string
-}); // full result
+console.log(response.skeleton); // Promise Tree
+console.log(response.snapshot); // Progressive Json
+```
+
+## Examples
+
+### React 19
+
+```jsx
+import { useState } from 'react';
+import { json } from '@fatcherjs/middleware-json';
+import { fatcher } from 'fatcher';
+import { use, Suspense } from 'react';
+function delay(ms) {
+  return new Promise(resolve => {
+    setTimeout(() => {
+      resolve();
+    }, ms);
+  });
+}
+
+async function fetchMessage() {
+  const response = await fatcher('https://test.com', {
+    progressive: {
+      isPlaceholder: value => value.startsWith('$$'),
+    },
+    middlewares: [
+      json,
+      () => {
+        return new Response(
+          new ReadableStream({
+            async start(controller) {
+              controller.enqueue(new TextEncoder().encode(JSON.stringify({ userInfo: '$$1' })));
+              await delay(300);
+              controller.enqueue(
+                new TextEncoder().encode(
+                  JSON.stringify({
+                    $$1: { name: 'Alice', age: 18 },
+                  }),
+                ),
+              );
+              controller.close();
+            },
+          }),
+        );
+      },
+    ],
+  });
+
+  return response.skeleton;
+}
+
+function UserInfo({ userInfoPromise }) {
+  const userInfo = use(userInfoPromise);
+
+  return userInfo ? `${userInfo.name} (${userInfo.age})` : 'loading...';
+}
+
+function Message({ skeleton }) {
+  const data = use(skeleton);
+
+  return (
+    <p>
+      Here is the message:{' '}
+      <Suspense fallback={<p>⌛Downloading UserInfo...</p>}>
+        <UserInfo userInfoPromise={data.userInfo} />
+      </Suspense>
+    </p>
+  );
+}
+
+export default function App() {
+  const [skeleton, setSkeleton] = useState(null);
+
+  async function download() {
+    setSkeleton(fetchMessage());
+  }
+
+  if (!skeleton) {
+    return <button onClick={download}>Download message</button>;
+  }
+
+  return (
+    <Suspense fallback={<p>⌛Downloading message...</p>}>
+      <Message skeleton={skeleton} />
+    </Suspense>
+  );
+}
 ```
 
 ## License
 
-[MIT](https://github.com/fanhaoyuan/fatcher/blob/master/LICENSE)
+[MIT](https://github.com/fatcherjs/middleware-json/blob/master/LICENSE)

package/dist/assembler.d.ts

@@ -0,0 +1,13 @@
+type ProgressiveJSON = Record<string, any>;
+export declare class Assembler {
+    readonly isPlaceholder: (value: string) => boolean;
+    skeleton: ProgressiveJSON | null;
+    snapshot: ProgressiveJSON;
+    private buffer;
+    constructor(isPlaceholder: (value: string) => boolean);
+    consume(frame: ProgressiveJSON): void;
+    replaceFrameValues(frame: ProgressiveJSON, path?: string): {
+        [k: string]: any;
+    };
+}
+export {};

package/dist/index.d.ts

@@ -1,11 +1,2 @@
-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 };
+export * from './middleware';
+export * from './types';

package/dist/index.esm.js

@@ -1,32 +1,304 @@
-import { readStreamByChunk } from '@fatcherjs/utils-shared';
-import 'fatcher';
-
-const json = {
-  name: "fatcher-middleware-json",
-  use: async (context, next) => {
-    const response = await next();
-    if (response.bodyUsed || !response.body) {
-      response.readStreamAsJson = async () => null;
-      return response;
+async function A(e, t) {
+  async function r(s) {
+    const { value: n, done: c } = await s.read();
+    c || (await t(n), await r(s));
+  }
+  return r(e.getReader());
+}
+function x(e) {
+  return typeof e == "symbol" || e instanceof Symbol;
+}
+function y(e) {
+  if (!e || typeof e != "object")
+    return !1;
+  const t = Object.getPrototypeOf(e);
+  return t === null || t === Object.prototype || Object.getPrototypeOf(t) === null ? Object.prototype.toString.call(e) === "[object Object]" : !1;
+}
+function h(e) {
+  return e === "__proto__";
+}
+function m(e, t) {
+  const r = {}, s = Object.keys(e);
+  for (let n = 0; n < s.length; n++) {
+    const c = s[n], i = e[c];
+    t(i, c) && (r[c] = i);
+  }
+  return r;
+}
+function T(e, t) {
+  return e === t || Number.isNaN(e) && Number.isNaN(t);
+}
+function b(e) {
+  return e instanceof Promise;
+}
+function I(e) {
+  return typeof e == "string";
+}
+function R(e) {
+  switch (typeof e) {
+    case "number":
+    case "symbol":
+      return !1;
+    case "string":
+      return e.includes(".") || e.includes("[") || e.includes("]");
+  }
+}
+function p(e) {
+  return typeof e == "string" || typeof e == "symbol" ? e : Object.is(e?.valueOf?.(), -0) ? "-0" : String(e);
+}
+function w(e) {
+  if (e == null)
+    return "";
+  if (typeof e == "string")
+    return e;
+  if (Array.isArray(e))
+    return e.map(w).join(",");
+  const t = String(e);
+  return t === "0" && Object.is(Number(e), -0) ? "-0" : t;
+}
+function O(e) {
+  if (Array.isArray(e))
+    return e.map(p);
+  if (typeof e == "symbol")
+    return [e];
+  e = w(e);
+  const t = [], r = e.length;
+  if (r === 0)
+    return t;
+  let s = 0, n = "", c = "", i = !1;
+  for (e.charCodeAt(0) === 46 && (t.push(""), s++); s < r; ) {
+    const o = e[s];
+    c ? o === "\\" && s + 1 < r ? (s++, n += e[s]) : o === c ? c = "" : n += o : i ? o === '"' || o === "'" ? c = o : o === "]" ? (i = !1, t.push(n), n = "") : n += o : o === "[" ? (i = !0, n && (t.push(n), n = "")) : o === "." ? n && (t.push(n), n = "") : n += o, s++;
+  }
+  return n && t.push(n), t;
+}
+function P(e, t, r) {
+  if (e == null)
+    return r;
+  switch (typeof t) {
+    case "string": {
+      if (h(t))
+        return r;
+      const s = e[t];
+      return s === void 0 ? R(t) ? P(e, O(t), r) : r : s;
+    }
+    case "number":
+    case "symbol": {
+      typeof t == "number" && (t = p(t));
+      const s = e[t];
+      return s === void 0 ? r : s;
+    }
+    default: {
+      if (Array.isArray(t))
+        return _(e, t, r);
+      if (Object.is(t?.valueOf(), -0) ? t = "-0" : t = String(t), h(t))
+        return r;
+      const s = e[t];
+      return s === void 0 ? r : s;
+    }
+  }
+}
+function _(e, t, r) {
+  if (t.length === 0)
+    return r;
+  let s = e;
+  for (let n = 0; n < t.length; n++) {
+    if (s == null || h(t[n]))
+      return r;
+    s = s[t[n]];
+  }
+  return s === void 0 ? r : s;
+}
+function d(e) {
+  return e !== null && (typeof e == "object" || typeof e == "function");
+}
+const D = /^(?:0|[1-9]\d*)$/;
+function F(e, t = Number.MAX_SAFE_INTEGER) {
+  switch (typeof e) {
+    case "number":
+      return Number.isInteger(e) && e >= 0 && e < t;
+    case "symbol":
+      return !1;
+    case "string":
+      return D.test(e);
+  }
+}
+const q = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/, B = /^\w*$/;
+function C(e, t) {
+  return Array.isArray(e) ? !1 : typeof e == "number" || typeof e == "boolean" || e == null || x(e) ? !0 : typeof e == "string" && (B.test(e) || !q.test(e)) || t != null && Object.hasOwn(t, e);
+}
+const G = (e, t, r) => {
+  const s = e[t];
+  (!(Object.hasOwn(e, t) && T(s, r)) || r === void 0 && !(t in e)) && (e[t] = r);
+};
+function U(e, t, r, s) {
+  if (e == null && !d(e))
+    return e;
+  let n;
+  C(t, e) ? n = [t] : Array.isArray(t) ? n = t : n = O(t);
+  const c = r(P(e, n));
+  let i = e;
+  for (let o = 0; o < n.length && i != null; o++) {
+    const f = p(n[o]);
+    if (h(f))
+      continue;
+    let u;
+    if (o === n.length - 1)
+      u = c;
+    else {
+      const l = i[f], a = s?.(l, f, e);
+      u = a !== void 0 ? a : d(l) ? l : F(n[o + 1]) ? [] : {};
+    }
+    G(i, f, u), i = i[f];
+  }
+  return e;
+}
+function g(e, t, r) {
+  return U(e, t, () => r, () => {
+  });
+}
+function k() {
+  let e, t;
+  return { promise: new Promise((s, n) => {
+    e = s, t = n;
+  }), resolve: e, reject: t };
+}
+class J {
+  constructor(t) {
+    this.isPlaceholder = t;
+  }
+  skeleton = null;
+  snapshot = {};
+  buffer = /* @__PURE__ */ new Map();
+  consume(t) {
+    if (!y(t))
+      throw new TypeError("Frame must be an object");
+    if (!this.skeleton) {
+      this.skeleton = this.replaceFrameValues(t), this.snapshot = m(this.skeleton, (s) => !b(s));
+      return;
     }
-    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;
+    const r = Object.keys(t);
+    if (r.some((s) => !this.isPlaceholder(s)))
+      throw new TypeError("Patch has an invalid key");
+    for (const s of r) {
+      if (!this.buffer.has(s))
+        throw new TypeError("It is a unknown patch");
+      const { resolve: n, path: c } = this.buffer.get(s), i = t[s];
+      if (y(i)) {
+        const o = this.replaceFrameValues(i, c);
+        g(
+          this.snapshot,
+          c,
+          m(o, (f) => !b(f))
+        ), n(o);
+        continue;
       }
-    };
-    return response;
+      g(this.snapshot, c, i), n(i);
+    }
+  }
+  replaceFrameValues(t, r) {
+    return Object.fromEntries(
+      Object.entries(t).map((s) => {
+        const [n, c] = s, i = [r, n].filter(Boolean).join(".");
+        if (I(c) && this.isPlaceholder(c)) {
+          const o = k();
+          return this.buffer.set(c, {
+            promise: o.promise,
+            resolve: o.resolve,
+            path: i
+          }), [n, o.promise];
+        }
+        return s;
+      })
+    );
+  }
+}
+class M {
+  buffer = "";
+  cursor = 0;
+  stack = [];
+  inString = !1;
+  escaped = !1;
+  started = !1;
+  frames = [];
+  parse(t) {
+    for (this.buffer += t; this.cursor < this.buffer.length; ) {
+      const r = this.buffer[this.cursor];
+      if (!this.started) {
+        if (/\s/.test(r)) {
+          this.cursor++;
+          continue;
+        }
+        if (r !== "{" && r !== "[")
+          throw new TypeError("Parse Error");
+        this.started = !0, this.stack.push(r), this.cursor++;
+        continue;
+      }
+      if (this.inString) {
+        if (this.escaped) {
+          this.escaped = !1, this.cursor++;
+          continue;
+        }
+        if (r === "\\") {
+          this.escaped = !0, this.cursor++;
+          continue;
+        }
+        r === '"' && (this.inString = !1), this.cursor++;
+        continue;
+      }
+      if (r === '"') {
+        this.inString = !0, this.cursor++;
+        continue;
+      }
+      if (r === "{" || r === "[") {
+        this.stack.push(r), this.cursor++;
+        continue;
+      }
+      if (r === "}" || r === "]") {
+        const s = this.stack.pop();
+        if (r === "}" && s !== "{" || r === "]" && s !== "[")
+          throw new TypeError("Parse Error");
+        if (this.cursor++, !this.stack.length) {
+          const n = this.buffer.slice(0, this.cursor);
+          this.buffer = this.buffer.slice(this.cursor), this.cursor = 0, this.started = !1, this.inString = !1, this.escaped = !1;
+          const c = JSON.parse(n);
+          this.frames.push(c);
+          continue;
+        }
+        continue;
+      }
+      this.cursor++;
+    }
   }
+  drain() {
+    const t = this.frames;
+    return this.frames = [], t;
+  }
+}
+const W = {
+  name: "fatcher-middleware-json",
+  use: async (e, t) => {
+    const r = await t();
+    if (!e.progressive || r.bodyUsed || !r.body)
+      return r;
+    let s = !1;
+    const { promise: n, resolve: c } = k(), i = new J(e.progressive.isPlaceholder), o = new ReadableStream({
+      async start(u) {
+        const l = new TextDecoder(), a = new M();
+        await A(r.clone().body, (S) => {
+          const E = l.decode(S, { stream: !0 });
+          a.parse(E);
+          const N = a.drain();
+          for (const j of N)
+            i.consume(j), !s && i.skeleton && (s = !0, c(i.skeleton));
+        }), u.enqueue(new TextEncoder().encode(JSON.stringify(i.snapshot))), u.close();
+      }
+    });
+    await n;
+    const f = new Response(o, r);
+    return f.skeleton = i.skeleton, f.snapshot = i.snapshot, f;
+  }
+};
+export {
+  W as json
 };
-
-export { json };

package/dist/index.js

@@ -1,36 +1 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var utilsShared = require('@fatcherjs/utils-shared');
-require('fatcher');
-
-const json = {
-  name: "fatcher-middleware-json",
-  use: 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;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});async function A(e,t){async function r(s){const{value:n,done:c}=await s.read();c||(await t(n),await r(s))}return r(e.getReader())}function T(e){return typeof e=="symbol"||e instanceof Symbol}function y(e){if(!e||typeof e!="object")return!1;const t=Object.getPrototypeOf(e);return t===null||t===Object.prototype||Object.getPrototypeOf(t)===null?Object.prototype.toString.call(e)==="[object Object]":!1}function h(e){return e==="__proto__"}function m(e,t){const r={},s=Object.keys(e);for(let n=0;n<s.length;n++){const c=s[n],i=e[c];t(i,c)&&(r[c]=i)}return r}function x(e,t){return e===t||Number.isNaN(e)&&Number.isNaN(t)}function b(e){return e instanceof Promise}function I(e){return typeof e=="string"}function R(e){switch(typeof e){case"number":case"symbol":return!1;case"string":return e.includes(".")||e.includes("[")||e.includes("]")}}function p(e){return typeof e=="string"||typeof e=="symbol"?e:Object.is(e?.valueOf?.(),-0)?"-0":String(e)}function w(e){if(e==null)return"";if(typeof e=="string")return e;if(Array.isArray(e))return e.map(w).join(",");const t=String(e);return t==="0"&&Object.is(Number(e),-0)?"-0":t}function O(e){if(Array.isArray(e))return e.map(p);if(typeof e=="symbol")return[e];e=w(e);const t=[],r=e.length;if(r===0)return t;let s=0,n="",c="",i=!1;for(e.charCodeAt(0)===46&&(t.push(""),s++);s<r;){const o=e[s];c?o==="\\"&&s+1<r?(s++,n+=e[s]):o===c?c="":n+=o:i?o==='"'||o==="'"?c=o:o==="]"?(i=!1,t.push(n),n=""):n+=o:o==="["?(i=!0,n&&(t.push(n),n="")):o==="."?n&&(t.push(n),n=""):n+=o,s++}return n&&t.push(n),t}function P(e,t,r){if(e==null)return r;switch(typeof t){case"string":{if(h(t))return r;const s=e[t];return s===void 0?R(t)?P(e,O(t),r):r:s}case"number":case"symbol":{typeof t=="number"&&(t=p(t));const s=e[t];return s===void 0?r:s}default:{if(Array.isArray(t))return _(e,t,r);if(Object.is(t?.valueOf(),-0)?t="-0":t=String(t),h(t))return r;const s=e[t];return s===void 0?r:s}}}function _(e,t,r){if(t.length===0)return r;let s=e;for(let n=0;n<t.length;n++){if(s==null||h(t[n]))return r;s=s[t[n]]}return s===void 0?r:s}function d(e){return e!==null&&(typeof e=="object"||typeof e=="function")}const D=/^(?:0|[1-9]\d*)$/;function F(e,t=Number.MAX_SAFE_INTEGER){switch(typeof e){case"number":return Number.isInteger(e)&&e>=0&&e<t;case"symbol":return!1;case"string":return D.test(e)}}const q=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,B=/^\w*$/;function C(e,t){return Array.isArray(e)?!1:typeof e=="number"||typeof e=="boolean"||e==null||T(e)?!0:typeof e=="string"&&(B.test(e)||!q.test(e))||t!=null&&Object.hasOwn(t,e)}const G=(e,t,r)=>{const s=e[t];(!(Object.hasOwn(e,t)&&x(s,r))||r===void 0&&!(t in e))&&(e[t]=r)};function M(e,t,r,s){if(e==null&&!d(e))return e;let n;C(t,e)?n=[t]:Array.isArray(t)?n=t:n=O(t);const c=r(P(e,n));let i=e;for(let o=0;o<n.length&&i!=null;o++){const f=p(n[o]);if(h(f))continue;let u;if(o===n.length-1)u=c;else{const l=i[f],a=s?.(l,f,e);u=a!==void 0?a:d(l)?l:F(n[o+1])?[]:{}}G(i,f,u),i=i[f]}return e}function g(e,t,r){return M(e,t,()=>r,()=>{})}function S(){let e,t;return{promise:new Promise((s,n)=>{e=s,t=n}),resolve:e,reject:t}}class U{constructor(t){this.isPlaceholder=t}skeleton=null;snapshot={};buffer=new Map;consume(t){if(!y(t))throw new TypeError("Frame must be an object");if(!this.skeleton){this.skeleton=this.replaceFrameValues(t),this.snapshot=m(this.skeleton,s=>!b(s));return}const r=Object.keys(t);if(r.some(s=>!this.isPlaceholder(s)))throw new TypeError("Patch has an invalid key");for(const s of r){if(!this.buffer.has(s))throw new TypeError("It is a unknown patch");const{resolve:n,path:c}=this.buffer.get(s),i=t[s];if(y(i)){const o=this.replaceFrameValues(i,c);g(this.snapshot,c,m(o,f=>!b(f))),n(o);continue}g(this.snapshot,c,i),n(i)}}replaceFrameValues(t,r){return Object.fromEntries(Object.entries(t).map(s=>{const[n,c]=s,i=[r,n].filter(Boolean).join(".");if(I(c)&&this.isPlaceholder(c)){const o=S();return this.buffer.set(c,{promise:o.promise,resolve:o.resolve,path:i}),[n,o.promise]}return s}))}}class J{buffer="";cursor=0;stack=[];inString=!1;escaped=!1;started=!1;frames=[];parse(t){for(this.buffer+=t;this.cursor<this.buffer.length;){const r=this.buffer[this.cursor];if(!this.started){if(/\s/.test(r)){this.cursor++;continue}if(r!=="{"&&r!=="[")throw new TypeError("Parse Error");this.started=!0,this.stack.push(r),this.cursor++;continue}if(this.inString){if(this.escaped){this.escaped=!1,this.cursor++;continue}if(r==="\\"){this.escaped=!0,this.cursor++;continue}r==='"'&&(this.inString=!1),this.cursor++;continue}if(r==='"'){this.inString=!0,this.cursor++;continue}if(r==="{"||r==="["){this.stack.push(r),this.cursor++;continue}if(r==="}"||r==="]"){const s=this.stack.pop();if(r==="}"&&s!=="{"||r==="]"&&s!=="[")throw new TypeError("Parse Error");if(this.cursor++,!this.stack.length){const n=this.buffer.slice(0,this.cursor);this.buffer=this.buffer.slice(this.cursor),this.cursor=0,this.started=!1,this.inString=!1,this.escaped=!1;const c=JSON.parse(n);this.frames.push(c);continue}continue}this.cursor++}}drain(){const t=this.frames;return this.frames=[],t}}const W={name:"fatcher-middleware-json",use:async(e,t)=>{const r=await t();if(!e.progressive||r.bodyUsed||!r.body)return r;let s=!1;const{promise:n,resolve:c}=S(),i=new U(e.progressive.isPlaceholder),o=new ReadableStream({async start(u){const l=new TextDecoder,a=new J;await A(r.clone().body,k=>{const j=l.decode(k,{stream:!0});a.parse(j);const E=a.drain();for(const N of E)i.consume(N),!s&&i.skeleton&&(s=!0,c(i.skeleton))}),u.enqueue(new TextEncoder().encode(JSON.stringify(i.snapshot))),u.close()}});await n;const f=new Response(o,r);return f.skeleton=i.skeleton,f.snapshot=i.snapshot,f}};exports.json=W;

package/dist/index.min.js

@@ -1 +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={name:"fatcher-middleware-json",use: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 d="";await n(s.body,c=>{const u=o.decode(c,{stream:!0});d+=u,r==null||r(u,c)}),d+=o.decode(void 0,{stream:!1});try{return JSON.parse(d)}catch(c){return null}},e}};t.json=f,Object.defineProperty(t,"__esModule",{value:!0})});
+(function(u,a){typeof exports=="object"&&typeof module<"u"?a(exports):typeof define=="function"&&define.amd?define(["exports"],a):(u=typeof globalThis<"u"?globalThis:u||self,a(u.FatcherMiddlewareJson={}))})(this,(function(u){"use strict";async function a(e,t){async function s(r){const{value:n,done:c}=await r.read();c||(await t(n),await s(r))}return s(e.getReader())}function E(e){return typeof e=="symbol"||e instanceof Symbol}function m(e){if(!e||typeof e!="object")return!1;const t=Object.getPrototypeOf(e);return t===null||t===Object.prototype||Object.getPrototypeOf(t)===null?Object.prototype.toString.call(e)==="[object Object]":!1}function y(e){return e==="__proto__"}function b(e,t){const s={},r=Object.keys(e);for(let n=0;n<r.length;n++){const c=r[n],i=e[c];t(i,c)&&(s[c]=i)}return s}function N(e,t){return e===t||Number.isNaN(e)&&Number.isNaN(t)}function g(e){return e instanceof Promise}function A(e){return typeof e=="string"}function T(e){switch(typeof e){case"number":case"symbol":return!1;case"string":return e.includes(".")||e.includes("[")||e.includes("]")}}function d(e){return typeof e=="string"||typeof e=="symbol"?e:Object.is(e?.valueOf?.(),-0)?"-0":String(e)}function w(e){if(e==null)return"";if(typeof e=="string")return e;if(Array.isArray(e))return e.map(w).join(",");const t=String(e);return t==="0"&&Object.is(Number(e),-0)?"-0":t}function O(e){if(Array.isArray(e))return e.map(d);if(typeof e=="symbol")return[e];e=w(e);const t=[],s=e.length;if(s===0)return t;let r=0,n="",c="",i=!1;for(e.charCodeAt(0)===46&&(t.push(""),r++);r<s;){const o=e[r];c?o==="\\"&&r+1<s?(r++,n+=e[r]):o===c?c="":n+=o:i?o==='"'||o==="'"?c=o:o==="]"?(i=!1,t.push(n),n=""):n+=o:o==="["?(i=!0,n&&(t.push(n),n="")):o==="."?n&&(t.push(n),n=""):n+=o,r++}return n&&t.push(n),t}function P(e,t,s){if(e==null)return s;switch(typeof t){case"string":{if(y(t))return s;const r=e[t];return r===void 0?T(t)?P(e,O(t),s):s:r}case"number":case"symbol":{typeof t=="number"&&(t=d(t));const r=e[t];return r===void 0?s:r}default:{if(Array.isArray(t))return x(e,t,s);if(Object.is(t?.valueOf(),-0)?t="-0":t=String(t),y(t))return s;const r=e[t];return r===void 0?s:r}}}function x(e,t,s){if(t.length===0)return s;let r=e;for(let n=0;n<t.length;n++){if(r==null||y(t[n]))return s;r=r[t[n]]}return r===void 0?s:r}function S(e){return e!==null&&(typeof e=="object"||typeof e=="function")}const I=/^(?:0|[1-9]\d*)$/;function R(e,t=Number.MAX_SAFE_INTEGER){switch(typeof e){case"number":return Number.isInteger(e)&&e>=0&&e<t;case"symbol":return!1;case"string":return I.test(e)}}const _=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,F=/^\w*$/;function D(e,t){return Array.isArray(e)?!1:typeof e=="number"||typeof e=="boolean"||e==null||E(e)?!0:typeof e=="string"&&(F.test(e)||!_.test(e))||t!=null&&Object.hasOwn(t,e)}const M=(e,t,s)=>{const r=e[t];(!(Object.hasOwn(e,t)&&N(r,s))||s===void 0&&!(t in e))&&(e[t]=s)};function q(e,t,s,r){if(e==null&&!S(e))return e;let n;D(t,e)?n=[t]:Array.isArray(t)?n=t:n=O(t);const c=s(P(e,n));let i=e;for(let o=0;o<n.length&&i!=null;o++){const f=d(n[o]);if(y(f))continue;let l;if(o===n.length-1)l=c;else{const h=i[f],p=r?.(h,f,e);l=p!==void 0?p:S(h)?h:R(n[o+1])?[]:{}}M(i,f,l),i=i[f]}return e}function k(e,t,s){return q(e,t,()=>s,()=>{})}function j(){let e,t;return{promise:new Promise((r,n)=>{e=r,t=n}),resolve:e,reject:t}}class B{constructor(t){this.isPlaceholder=t}skeleton=null;snapshot={};buffer=new Map;consume(t){if(!m(t))throw new TypeError("Frame must be an object");if(!this.skeleton){this.skeleton=this.replaceFrameValues(t),this.snapshot=b(this.skeleton,r=>!g(r));return}const s=Object.keys(t);if(s.some(r=>!this.isPlaceholder(r)))throw new TypeError("Patch has an invalid key");for(const r of s){if(!this.buffer.has(r))throw new TypeError("It is a unknown patch");const{resolve:n,path:c}=this.buffer.get(r),i=t[r];if(m(i)){const o=this.replaceFrameValues(i,c);k(this.snapshot,c,b(o,f=>!g(f))),n(o);continue}k(this.snapshot,c,i),n(i)}}replaceFrameValues(t,s){return Object.fromEntries(Object.entries(t).map(r=>{const[n,c]=r,i=[s,n].filter(Boolean).join(".");if(A(c)&&this.isPlaceholder(c)){const o=j();return this.buffer.set(c,{promise:o.promise,resolve:o.resolve,path:i}),[n,o.promise]}return r}))}}class C{buffer="";cursor=0;stack=[];inString=!1;escaped=!1;started=!1;frames=[];parse(t){for(this.buffer+=t;this.cursor<this.buffer.length;){const s=this.buffer[this.cursor];if(!this.started){if(/\s/.test(s)){this.cursor++;continue}if(s!=="{"&&s!=="[")throw new TypeError("Parse Error");this.started=!0,this.stack.push(s),this.cursor++;continue}if(this.inString){if(this.escaped){this.escaped=!1,this.cursor++;continue}if(s==="\\"){this.escaped=!0,this.cursor++;continue}s==='"'&&(this.inString=!1),this.cursor++;continue}if(s==='"'){this.inString=!0,this.cursor++;continue}if(s==="{"||s==="["){this.stack.push(s),this.cursor++;continue}if(s==="}"||s==="]"){const r=this.stack.pop();if(s==="}"&&r!=="{"||s==="]"&&r!=="[")throw new TypeError("Parse Error");if(this.cursor++,!this.stack.length){const n=this.buffer.slice(0,this.cursor);this.buffer=this.buffer.slice(this.cursor),this.cursor=0,this.started=!1,this.inString=!1,this.escaped=!1;const c=JSON.parse(n);this.frames.push(c);continue}continue}this.cursor++}}drain(){const t=this.frames;return this.frames=[],t}}const G={name:"fatcher-middleware-json",use:async(e,t)=>{const s=await t();if(!e.progressive||s.bodyUsed||!s.body)return s;let r=!1;const{promise:n,resolve:c}=j(),i=new B(e.progressive.isPlaceholder),o=new ReadableStream({async start(l){const h=new TextDecoder,p=new C;await a(s.clone().body,J=>{const U=h.decode(J,{stream:!0});p.parse(U);const W=p.drain();for(const $ of W)i.consume($),!r&&i.skeleton&&(r=!0,c(i.skeleton))}),l.enqueue(new TextEncoder().encode(JSON.stringify(i.snapshot))),l.close()}});await n;const f=new Response(o,s);return f.skeleton=i.skeleton,f.snapshot=i.snapshot,f}};u.json=G,Object.defineProperty(u,Symbol.toStringTag,{value:"Module"})}));

package/dist/middleware.d.ts

@@ -0,0 +1,2 @@
+import { FatcherMiddleware } from 'fatcher';
+export declare const json: FatcherMiddleware;

package/dist/parser.d.ts

@@ -0,0 +1,11 @@
+export declare class Parser {
+    private buffer;
+    private cursor;
+    private stack;
+    private inString;
+    private escaped;
+    private started;
+    private frames;
+    parse(value: string): void;
+    drain(): any[];
+}

package/dist/types.d.ts

@@ -0,0 +1,12 @@
+declare module 'fatcher' {
+    interface FatcherOptions {
+        progressive?: {
+            isPlaceholder: (value: string) => boolean;
+        };
+    }
+    interface FatcherResponse {
+        skeleton: Record<string, any>;
+        snapshot: Record<string, any>;
+    }
+}
+export {};

package/dist/utils.d.ts

@@ -0,0 +1,5 @@
+export declare function withResolvers<T>(): {
+    promise: Promise<T>;
+    resolve: (v: T) => void;
+    reject: () => void;
+};

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@fatcherjs/middleware-json",
-  "homepage": "https://github.com/fanhaoyuan/fatcher",
+  "version": "3.0.0",
+  "homepage": "https://github.com/fatcherjs/middleware-json",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/fanhaoyuan/fatcher.git"
+    "url": "git+https://github.com/fatcherjs/middleware-json.git"
   },
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
@@ -13,19 +14,36 @@
     "dist"
   ],
   "peerDependencies": {
-    "fatcher": "3.0.0-alpha-11"
+    "fatcher": "^3.0.0"
   },
   "dependencies": {
-    "@fatcherjs/utils-shared": "3.0.0-alpha-11"
+    "@fatcherjs/utils-shared": "^3.0.0-alpha-11",
+    "es-toolkit": "^1.43.0"
   },
   "devDependencies": {
-    "fatcher": "3.0.0-alpha-11"
+    "@fansy/eslint-config": "^1.4.2",
+    "@fansy/prettier-config": "^1.1.0",
+    "@types/node": "^24.3.1",
+    "@typescript-eslint/eslint-plugin": "^8.11.0",
+    "@typescript-eslint/parser": "^8.11.0",
+    "@vitest/coverage-v8": "3.2.4",
+    "eslint": "^8.57.1",
+    "eslint-plugin-prettier": "^5.2.1",
+    "fatcher": "^3.0.0",
+    "husky": "^9.1.7",
+    "lint-staged": "^16.1.6",
+    "msw": "^2.11.1",
+    "prettier": "^3.3.3",
+    "prettier-plugin-organize-imports": "^4.1.0",
+    "typescript": "^5.9.2",
+    "vite": "^7.1.5",
+    "vite-plugin-dts": "^4.5.4",
+    "vitest": "^3.2.4"
   },
-  "version": "3.0.0-alpha-11",
   "scripts": {
-    "clean": "rimraf dist",
-    "build": "npm run clean && rollup -c rollup.config.ts",
-    "test": "jest",
-    "test:cov": "jest --coverage"
+    "build": "vite build",
+    "test": "vitest run",
+    "test:cov": "vitest run --coverage",
+    "eslint": "eslint ."
   }
 }