toilscript 0.1.15 → 0.1.16

package/dist/importmap.json

@@ -1,7 +1,7 @@
 {
   "imports": {
-    "toilscript": "https://cdn.jsdelivr.net/npm/toilscript@0.1.15/dist/toilscript.js",
-    "toilscript/cli": "https://cdn.jsdelivr.net/npm/toilscript@0.1.15/dist/cli.js",
+    "toilscript": "https://cdn.jsdelivr.net/npm/toilscript@0.1.16/dist/toilscript.js",
+    "toilscript/cli": "https://cdn.jsdelivr.net/npm/toilscript@0.1.16/dist/cli.js",
     "binaryen": "https://cdn.jsdelivr.net/npm/binaryen@129.0.0-nightly.20260428/index.js",
     "long": "https://cdn.jsdelivr.net/npm/long@5.3.2/index.js"
   }

package/dist/toilscript.js

@@ -322,7 +322,7 @@ declare interface __Record`),n.push(e.id.toString()),n.push(`<TOmittable> {
 `):r+="        "+Ag(o.ref.type,u)+`
 `}r+=`    }
 
-`,r+=`    public encode(): Uint8Array {
+`,r+=`    public encode(): Uint8Array<ArrayBuffer> {
 `,r+=`        const w = new DataWriter();
 `,r+="        w.writeU32("+e+`);
 `,r+=`        this.encodeInto(w);
@@ -364,18 +364,37 @@ declare interface __Record`),n.push(e.id.toString()),n.push(`<TOmittable> {
 `,e+=`    return path;
 `,e+=`}
 
-`,e+=`const __toilRest = {
-`;for(let r=0,n=t.rest.length;r<n;++r){let a=t.rest[r];e+="    "+a.key+`: {
-`;for(let s=0,l=a.routes.length;s<l;++s){let o=a.routes[s],u=Fg(o,i);e+="        async "+o.name+"("+u.argsParam+"): "+u.ret+` {
-`,e+="            const __url = __toilUrl("+JSON.stringify(o.pattern)+", "+(o.params.length?"args.params as any":"undefined")+`, args?.query);
-`;let c=o.bodyType!=null?o.stream=="Binary"?"application/octet-stream":"application/json":"",_="{ ";c.length&&(_+=JSON.stringify("content-type")+": "+JSON.stringify(c)+", "),_+="...(args?.headers ?? {}) }";let f=o.bodyType!=null?o.stream=="Binary"?", body: args.body.encode()":", body: JSON.stringify(args.body)":"";e+="            const __res = await fetch(__url, { method: "+JSON.stringify(o.http)+", headers: "+_+f+` });
-`,e+="            if (!__res.ok) throw new Error(`Server.REST."+a.key+"."+o.name+" ${__res.status}`);\n",o.returnsResponse?e+=`            return __res;
-`:o.returns.type=="void"?e+=`            return;
-`:o.stream=="Binary"?(e+=`            const __buf = new Uint8Array(await __res.arrayBuffer());
-`,e+="            return "+o.returns.type+`.decode(__buf);
-`):o.returns.array?(e+=`            const __j = await __res.json();
-`,e+="            return (Array.isArray(__j) ? __j : []).map((x: any) => "+o.returns.type+`.fromJSONValue(x));
-`):e+="            return "+o.returns.type+`.fromJSONValue(await __res.json());
+`;let r=!1;for(let n=0,a=t.rest.length;n<a&&!r;++n){let s=t.rest[n];for(let l=0,o=s.routes.length;l<o;++l){let u=s.routes[l];if(u.bodyType!=null&&u.stream!="Binary"){r=!0;break}}}r&&(e+=`function __toilJson(v: any): string {
+`,e+=`    if (v === null || v === undefined) return "null";
+`,e+=`    const t = typeof v;
+`,e+=`    if (t === "bigint") return v.toString();
+`,e+=`    if (t === "number") return Number.isFinite(v) ? String(v) : "null";
+`,e+=`    if (t === "boolean") return v ? "true" : "false";
+`,e+=`    if (t === "string") return JSON.stringify(v);
+`,e+=`    if (Array.isArray(v)) return "[" + v.map((x: any) => __toilJson(x)).join(",") + "]";
+`,e+=`    let s = "{", first = true;
+`,e+=`    for (const k in v) {
+`,e+=`        if (!Object.prototype.hasOwnProperty.call(v, k)) continue;
+`,e+=`        const val = v[k];
+`,e+=`        if (val === undefined || typeof val === "function") continue;
+`,e+=`        s += (first ? "" : ",") + JSON.stringify(k) + ":" + __toilJson(val);
+`,e+=`        first = false;
+`,e+=`    }
+`,e+=`    return s + "}";
+`,e+=`}
+
+`),e+=`const __toilRest = {
+`;for(let n=0,a=t.rest.length;n<a;++n){let s=t.rest[n];e+="    "+s.key+`: {
+`;for(let l=0,o=s.routes.length;l<o;++l){let u=s.routes[l],c=Fg(u,i);e+="        async "+u.name+"("+c.argsParam+"): "+c.ret+` {
+`,e+="            const __url = __toilUrl("+JSON.stringify(u.pattern)+", "+(u.params.length?"args.params as any":"undefined")+`, args?.query);
+`;let _=u.bodyType!=null?u.stream=="Binary"?"application/octet-stream":"application/json":"",f="{ ";_.length&&(f+=JSON.stringify("content-type")+": "+JSON.stringify(_)+", "),f+="...(args?.headers ?? {}) }";let h=u.bodyType!=null?u.stream=="Binary"?", body: args.body.encode()":", body: __toilJson(args.body)":"";e+="            const __res = await fetch(__url, { method: "+JSON.stringify(u.http)+", headers: "+f+h+` });
+`,e+="            if (!__res.ok) throw new Error(`Server.REST."+s.key+"."+u.name+" ${__res.status}`);\n",u.returnsResponse?e+=`            return __res;
+`:u.returns.type=="void"?e+=`            return;
+`:u.stream=="Binary"?(e+=`            const __buf = new Uint8Array(await __res.arrayBuffer());
+`,e+="            return "+u.returns.type+`.decode(__buf);
+`):u.returns.array?(e+=`            const __j = await __res.json();
+`,e+="            return (Array.isArray(__j) ? __j : []).map((x: any) => "+u.returns.type+`.fromJSONValue(x));
+`):e+="            return "+u.returns.type+`.fromJSONValue(await __res.json());
 `,e+=`        },
 `}e+=`    },
 `}return e+=`};