keq 5.0.0-alpha.26 → 5.0.0-alpha.27

package/dist/index.mjs

@@ -990,7 +990,7 @@ function assignSharedContext(target, source) {
 
 // src/orchestrator/orchestrator.ts
 var KeqMiddlewareOrchestrator = class _KeqMiddlewareOrchestrator {
-  constructor(context, middlewares = []) {
+  constructor(context, middlewares = [], inherit) {
     __publicField(this, "main");
     __publicField(this, "status", "idle");
     __publicField(this, "context");
@@ -998,6 +998,7 @@ var KeqMiddlewareOrchestrator = class _KeqMiddlewareOrchestrator {
     __publicField(this, "current", -1);
     this.context = context;
     this.executors = middlewares.map((mw) => new KeqMiddlewareExecutor(mw));
+    if (inherit == null ? void 0 : inherit.main) this.main = inherit.main;
   }
   cancelNotFinished() {
     const current = this.current;
@@ -1056,11 +1057,12 @@ var KeqMiddlewareOrchestrator = class _KeqMiddlewareOrchestrator {
     const context = cloneSharedContext(this.context);
     const next = this.current + 1;
     const middlewares = this.executors.slice(next).map((executor) => executor.middleware);
-    const forkedOrchestrator = new _KeqMiddlewareOrchestrator(context, middlewares);
-    forkedOrchestrator.main = {
-      orchestrator: this.main ? this.main.orchestrator : this,
-      index: this.main ? this.main.index + next : next
-    };
+    const forkedOrchestrator = new _KeqMiddlewareOrchestrator(context, middlewares, {
+      main: {
+        orchestrator: this.main ? this.main.orchestrator : this,
+        index: this.main ? this.main.index + next : next
+      }
+    });
     return forkedOrchestrator;
   }
   merge(source) {
@@ -1253,26 +1255,30 @@ var Core = class {
       ...options,
       url: new URL(url.href)
     });
+    if (options.middlewares) {
+      this.__append_middlewares__.push(...options.middlewares);
+    }
   }
   get __middlewares__() {
     return [...this.__prepend_middlewares__, ...this.__append_middlewares__];
   }
-  prependMiddlewares(...middlewares) {
+  // prependMiddlewares(...middlewares: KeqMiddleware[]): this {
+  //   this.__prepend_middlewares__.push(...middlewares)
+  //   return this
+  // }
+  // /**
+  //  * Appends middlewares to the end of the middleware chain.
+  //  * Using this method indiscriminately is discouraged;
+  //  * prefer using `.use` to maintain predictable execution order.
+  //  */
+  // appendMiddlewares(...middlewares: KeqMiddleware[]): this {
+  //   this.__append_middlewares__.unshift(...middlewares)
+  //   return this
+  // }
+  use(...middlewares) {
     this.__prepend_middlewares__.push(...middlewares);
     return this;
   }
-  /**
-   * Appends middlewares to the end of the middleware chain.
-   * Using this method indiscriminately is discouraged;
-   * prefer using `.use` to maintain predictable execution order.
-   */
-  appendMiddlewares(...middlewares) {
-    this.__append_middlewares__.unshift(...middlewares);
-    return this;
-  }
-  use(...middlewares) {
-    return this.prependMiddlewares(...middlewares);
-  }
   on(event, listener) {
     this.__listeners__[event] = this.__listeners__[event] || [];
     this.__listeners__[event].push(listener);
@@ -1725,14 +1731,15 @@ function keqSerialFlowControlMiddleware() {
     const { signal } = ctx.options.flowControl;
     const concurrent = ctx.options.flowControl.mode === "serial" ? 1 : !ctx.options.flowControl.concurrencyLimit ? 1 : ctx.options.flowControl.concurrencyLimit < 1 ? 1 : parseInt(ctx.options.flowControl.concurrencyLimit, 10);
     const key = typeof signal === "string" ? signal : signal(ctx);
-    if (!ctx.global.serialFlowControl) ctx.global.serialFlowControl = {};
-    if (!ctx.global.serialFlowControl[key]) {
-      ctx.global.serialFlowControl[key] = fastq.promise(async (next2) => {
+    if (!ctx.global.core) ctx.global.core = {};
+    if (!ctx.global.core.serialFlowControl) ctx.global.core.serialFlowControl = {};
+    if (!ctx.global.core.serialFlowControl[key]) {
+      ctx.global.core.serialFlowControl[key] = fastq.promise(async ({ next: next2 }) => {
         await next2();
       }, concurrent);
     }
-    const queue = ctx.global.serialFlowControl[key];
-    await queue.push(next);
+    const queue = ctx.global.core.serialFlowControl[key];
+    await queue.push({ next });
   };
 }
 
@@ -1745,19 +1752,20 @@ function keqAbortFlowControlMiddleware() {
     }
     const { signal } = ctx.options.flowControl;
     const key = typeof signal === "string" ? signal : signal(ctx);
-    if (!ctx.global.abortFlowControl) ctx.global.abortFlowControl = {};
-    const abort = ctx.global.abortFlowControl[key];
+    if (!ctx.global.core) ctx.global.core = {};
+    if (!ctx.global.core.abortFlowControl) ctx.global.core.abortFlowControl = {};
+    const abort = ctx.global.core.abortFlowControl[key];
     if (abort) {
       const reason = new AbortException('Previous request was aborted by AbortFlowControl with key "'.concat(key, '"'));
       abort(reason);
     }
     const fn = ctx.request.abort.bind(ctx.request);
-    ctx.global.abortFlowControl[key] = fn;
+    ctx.global.core.abortFlowControl[key] = fn;
     try {
       await next();
     } finally {
-      if (ctx.global.abortFlowControl[key] === fn) {
-        ctx.global.abortFlowControl[key] = void 0;
+      if (ctx.global.core.abortFlowControl[key] === fn) {
+        ctx.global.core.abortFlowControl[key] = void 0;
       }
     }
   };
@@ -1814,9 +1822,19 @@ var KeqRequest = class {
     return new URL(url.href);
   }
   __fetch__(url, init, locationId) {
-    const keq = new Keq(this.__formatUrl__(url), { ...init, locationId, global: this.global, qs: this.qs });
-    keq.appendMiddlewares(...this.postMiddlewares);
-    keq.prependMiddlewares(...this.preMiddlewares);
+    const keq = new Keq(
+      this.__formatUrl__(url),
+      {
+        ...init,
+        locationId,
+        global: this.global,
+        qs: this.qs,
+        middlewares: [
+          ...this.preMiddlewares,
+          ...this.postMiddlewares
+        ]
+      }
+    );
     return keq;
   }
   fetch(url, init) {
@@ -1834,18 +1852,11 @@ var KeqRequest = class {
     );
   }
   put(url) {
-    const locationId = getLocationId(1);
-    const keq = new Keq(
-      this.__formatUrl__(url),
-      {
-        method: "put",
-        locationId,
-        global: this.global
-      }
+    return this.__fetch__(
+      url,
+      { method: "put" },
+      getLocationId(1)
     );
-    keq.appendMiddlewares(...this.postMiddlewares);
-    keq.prependMiddlewares(...this.preMiddlewares);
-    return keq;
   }
   delete(url) {
     return this.__fetch__(