@workglow/task-graph 0.2.3 → 0.2.5

package/dist/browser.js

@@ -294,16 +294,32 @@ function entitlementCovers(granted, required) {
 function resourcePatternMatches(grantPattern, requiredResource) {
   if (grantPattern === requiredResource)
     return true;
-  const starIdx = grantPattern.indexOf("*");
-  if (starIdx === -1)
+  if (!grantPattern.includes("*"))
     return false;
-  const prefix = grantPattern.slice(0, starIdx);
-  const suffix = grantPattern.slice(starIdx + 1);
-  if (!requiredResource.startsWith(prefix))
+  const parts = grantPattern.split("*");
+  const first = parts[0];
+  const last = parts[parts.length - 1];
+  if (!requiredResource.startsWith(first))
     return false;
-  if (!requiredResource.endsWith(suffix))
+  if (!requiredResource.endsWith(last))
     return false;
-  return requiredResource.length >= prefix.length + suffix.length;
+  let fixedLength = 0;
+  for (const p of parts)
+    fixedLength += p.length;
+  if (requiredResource.length < fixedLength)
+    return false;
+  let searchStart = first.length;
+  const searchEnd = requiredResource.length - last.length;
+  for (let i = 1;i < parts.length - 1; i++) {
+    const part = parts[i];
+    if (part.length === 0)
+      continue;
+    const idx = requiredResource.indexOf(part, searchStart);
+    if (idx === -1 || idx + part.length > searchEnd)
+      return false;
+    searchStart = idx + part.length;
+  }
+  return true;
 }
 function grantCoversResources(grant, required) {
   if (grant.resources === undefined)
@@ -1371,6 +1387,9 @@ class TaskRunner {
         signal: this.abortController?.signal
       });
     }
+    if (this.task.constructor.hasDynamicEntitlements) {
+      this.task.emit("entitlementChange", this.task.entitlements());
+    }
     return i;
   }
   async executeTask(input) {
@@ -3551,6 +3570,73 @@ class GraphAsTask extends Task {
     this.events.emit("regenerate");
     this.emitEntitlementChange();
   }
+  _entitlementUnsub;
+  _subscribingEntitlements = false;
+  _subscribeToSubGraphEntitlements(graph) {
+    this._entitlementUnsub?.();
+    this._entitlementUnsub = undefined;
+    this._subscribingEntitlements = true;
+    try {
+      this._entitlementUnsub = graph.subscribeToTaskEntitlements(() => {
+        this.emitEntitlementChange();
+      });
+    } finally {
+      this._subscribingEntitlements = false;
+    }
+  }
+  _syncSubGraphEntitlementSubscription(graph = this._subGraph) {
+    if (this._subscribingEntitlements)
+      return;
+    if ((this._events?.listenerCount("entitlementChange") ?? 0) === 0) {
+      this._entitlementUnsub?.();
+      this._entitlementUnsub = undefined;
+      return;
+    }
+    if (!graph || this._entitlementUnsub) {
+      return;
+    }
+    this._subscribeToSubGraphEntitlements(graph);
+  }
+  subscribe(name, fn) {
+    const unsub = super.subscribe(name, fn);
+    if (name !== "entitlementChange") {
+      return unsub;
+    }
+    this._syncSubGraphEntitlementSubscription();
+    return () => {
+      unsub();
+      this._syncSubGraphEntitlementSubscription();
+    };
+  }
+  on(name, fn) {
+    super.on(name, fn);
+    if (name === "entitlementChange") {
+      this._syncSubGraphEntitlementSubscription();
+    }
+  }
+  off(name, fn) {
+    super.off(name, fn);
+    if (name === "entitlementChange") {
+      this._syncSubGraphEntitlementSubscription();
+    }
+  }
+  once(name, fn) {
+    super.once(name, fn);
+    if (name === "entitlementChange") {
+      this._syncSubGraphEntitlementSubscription();
+    }
+  }
+  set subGraph(subGraph) {
+    this._entitlementUnsub?.();
+    this._entitlementUnsub = undefined;
+    super.subGraph = subGraph;
+    this._syncSubGraphEntitlementSubscription(subGraph);
+  }
+  get subGraph() {
+    const graph = super.subGraph;
+    this._syncSubGraphEntitlementSubscription(graph);
+    return graph;
+  }
   toJSON(options) {
     let json = super.toJSON(options);
     const hasChildren = this.hasChildren();
@@ -8122,4 +8208,4 @@ export {
   BROWSER_GRANTS
 };
 
-//# debugId=B6E689E8C44EE76C64756E2164756E21
+//# debugId=7A0EA069F263434964756E2164756E21