@overmap-ai/core 1.0.78-bulk-update.15 → 1.0.78-bulk-update.17

package/dist/overmap-core.js

@@ -3024,7 +3024,7 @@ const A = (
     enqueueRequest: {
       reducer: (t, s) => t,
       prepare: (t) => {
-        console.debug("Preparing to enqueue request", t);
+        console.debug("Preparing to enqueue request", t.url);
         const { BASE_URL: s, serviceName: e, ...i } = t;
         return KS(i, s, e);
       }
@@ -3511,8 +3511,8 @@ function NI(t, s, e = 0) {
     t,
     `(${typeof t})`,
     `
-Action:`,
-    s,
+Url:`,
+    s.payload.url,
     `
 Retries:`,
     e
@@ -3532,7 +3532,7 @@ Retries:`,
     const p = s.meta.offline.rollback;
     throw p && (console.warn("Rolling back request due to SDK error:", s), i.dispatch(p)), t;
   }
-  if (t instanceof U && t.options.discard && (console.debug("Discarding request due to explicit discard:", s), o()), a.includes(r) && (console.debug("Discarding request due to deletion:", s), o()), t instanceof U) {
+  if (t instanceof U && t.options.discard && (console.debug("Discarding request due to explicit discard:", s.payload.url), o()), a.includes(r) && (console.debug("Discarding request due to deletion:", s.payload.url), o()), t instanceof U) {
     const u = t.status || ((c = t.response) == null ? void 0 : c.status);
     if (u || console.warn("Error has no status code:", t), u !== void 0 && dc.includes(u)) {
       console.warn("Discarding request due to error:", t, `
@@ -5126,19 +5126,15 @@ class Gg extends k {
     }), d = [];
     let c = null;
     for (const u of o) {
-      const { batchId: p, payload: y } = u, f = y.assets.map(({ uuid: v }) => v), T = y.assets.map(({ asset_type: v }) => v), b = y.assets.map(({ project: v }) => v), I = T.concat(b);
-      c && I.push(c);
-      const P = f;
-      P.push(p);
-      const g = this.enqueueRequest({
+      const { batchId: p, payload: y } = u, f = y.assets.map(({ uuid: g }) => g), T = y.assets.map(({ asset_type: g }) => g), b = y.assets.map(({ project: g }) => g), I = y.assets.map(({ status: g }) => g), P = this.enqueueRequest({
         description: O(l.POST, this.name, !0),
         method: l.POST,
         url: `${this.url}/bulk/`,
         payload: y,
-        blockers: I,
-        blocks: P
+        blockers: (c ? [c] : []).concat(T).concat(b).concat(I),
+        blocks: [p].concat(f)
       });
-      c = u.batchId, d.push(g);
+      c = u.batchId, d.push(P);
     }
     return Promise.all(d).then((u) => {
       const p = u.flat();
@@ -5171,8 +5167,8 @@ class Gg extends k {
         payload: {
           payloads: f
         },
-        blockers: b.concat(I).concat(y ? [y] : []),
-        blocks: b.concat([T])
+        blockers: (y ? [y] : []).concat(b).concat(I),
+        blocks: [T].concat(b)
       });
       p.push(P), y = T;
     }
@@ -8074,8 +8070,8 @@ class b_ extends k {
         payload: {
           payloads: f
         },
-        blockers: b.concat(I).concat(P).concat(y ? [y] : []),
-        blocks: b.concat([T])
+        blockers: (y ? [y] : []).concat(b).concat(I).concat(P),
+        blocks: [T].concat(b)
       });
       p.push(g), y = T;
     }
@@ -9787,7 +9783,7 @@ async function mc(t, s, e, i, n) {
   }[u];
   let z = j();
   if (n == null || n.addEventListener("abort", () => {
-    console.debug("aborting request:", s), z.abort();
+    console.debug("aborting request:", s.url), z.abort();
   }), T && a) {
     const V = i.auth.getAuthHeader();
     z = z.set("Authorization", V);
@@ -9943,8 +9939,8 @@ class nt {
     if (this.graph.addNode(s.payload.uuid, s), !(s.payload.blockers.length === 0 || this.graph.size() === 1))
       for (const e of this.graph.overallOrder()) {
         if (e === s.payload.uuid) continue;
-        const i = this.graph.getNodeData(e);
-        s.payload.blockers.some((n) => i.payload.blocks.includes(n)) && this._addDependency(s.payload.uuid, e);
+        const i = this.graph.getNodeData(e), n = new Set(i.payload.blocks);
+        s.payload.blockers.some((a) => n.has(a)) && this._addDependency(s.payload.uuid, e);
       }
   }
   /**
@@ -9958,7 +9954,8 @@ class nt {
     this.graph.addNode(s.payload.uuid, s);
     for (const e of this.graph.overallOrder()) {
       if (e === s.payload.uuid) continue;
-      this.graph.getNodeData(e).payload.blockers.some((n) => s.payload.blocks.includes(n)) && this._addDependency(e, s.payload.uuid);
+      const i = this.graph.getNodeData(e), n = new Set(i.payload.blocks);
+      i.payload.blockers.some((a) => n.has(a)) && this._addDependency(e, s.payload.uuid);
     }
   }
   /**
@@ -10089,7 +10086,7 @@ class Ac {
     if (this.next)
       return this.next.run(s);
     {
-      if (console.debug("Middleware finished. Performing request:", s), !rt()) throw new Error("Client store not set");
+      if (console.debug("Middleware finished. Performing request:", s.payload.url), !rt()) throw new Error("Client store not set");
       const i = sb();
       if (!i) throw new Error("Client SDK not set");
       return LI(s, i);