@wairon/cli 5.1.1-dev.67 → 5.1.1-dev.68

package/dist/index.js

@@ -11567,7 +11567,7 @@ function defaultTargetConfig(type) {
     enabled: true
   };
 }
-var WAIRON_VERSION = "5.1.1-dev.67";
+var WAIRON_VERSION = "5.1.1-dev.68";
 var GITHUB_REPO = "SYW-Apps/Waffle-AIron";
 var ARCHITECT_AGENT_ID = "agent-architect";
 var ARCHITECT_TEMPLATE_ID = "architect";
@@ -17176,19 +17176,34 @@ var exportConformanceRule = {
       }
     }
     const takenFrom = /* @__PURE__ */ new Map();
+    const take = (consumer, writtenIn, specifier, names) => {
+      const target = resolveImport(writtenIn, specifier, code.paths);
+      if (!target) return;
+      let byName = takenFrom.get(target);
+      if (!byName) takenFrom.set(target, byName = /* @__PURE__ */ new Map());
+      for (const name of names) {
+        if (!name) continue;
+        let takers = byName.get(name);
+        if (!takers) byName.set(name, takers = /* @__PURE__ */ new Set());
+        takers.add(consumer);
+      }
+    };
     for (const consumer of realization.paths) {
       if (!code.exactPaths.has(consumer)) continue;
-      for (const [local, binding] of Object.entries(code.factsAt(consumer)?.importBindings ?? {})) {
+      const facts = code.factsAt(consumer);
+      if (!facts) continue;
+      for (const [local, binding] of Object.entries(facts.importBindings ?? {})) {
         if (binding.namespace) continue;
-        const target = resolveImport(consumer, binding.from, code.paths);
-        if (!target) continue;
-        let names = takenFrom.get(target);
-        if (!names) takenFrom.set(target, names = /* @__PURE__ */ new Map());
-        for (const name of [local, binding.imported]) {
-          if (!name) continue;
-          let takers = names.get(name);
-          if (!takers) names.set(name, takers = /* @__PURE__ */ new Set());
-          takers.add(consumer);
+        take(consumer, consumer, binding.from, [local, binding.imported]);
+      }
+      for (const sites of Object.values(facts.functionCallSites ?? {})) {
+        for (const site of sites) {
+          if (!site.member || !site.via) continue;
+          const writtenIn = site.from ? pathKey(site.from) : consumer;
+          const scope = site.from ? code.factsAt(writtenIn) : facts;
+          if (!scope) continue;
+          const binding = importBindingOf(scope, site.via);
+          if (binding?.namespace) take(consumer, writtenIn, binding.from, [site.name]);
         }
       }
     }