@akanjs/language 3.2.0-rc.2 → 3.2.0-rc.5

package/guardResolver.d.ts

@@ -33,6 +33,8 @@ interface Declaration {
     name: string;
 }
 export declare const frameworkOwner = "akanjs";
+export declare const frameworkPattern: RegExp;
+export declare const starExportPattern: RegExp;
 export declare class GuardResolver {
     #private;
     constructor(source: AkanGraphSource, routes: RouteFactReader);

package/index.cjs

@@ -80,6 +80,9 @@ class AkanGraphDiff {
       ...head.edges.flatMap((edge) => !baseKeys.has(edgeKeyOf(edge)) ? [{ ...edge, change: "added" }] : marked.has(edge.from) || marked.has(edge.to) ? [edge] : []),
       ...base.edges.filter((edge) => !headKeys.has(edgeKeyOf(edge))).map((edge) => ({ ...edge, change: "removed" }))
     ];
+    const shown = new Set([...marked.keys(), ...edges.flatMap((edge) => [edge.from, edge.to])]);
+    const listed = new Set(edges.map(edgeKeyOf));
+    edges.push(...head.edges.filter((edge) => edge.kind === "binds" && shown.has(edge.from) && !listed.has(edgeKeyOf(edge))));
     const context = edges.flatMap((edge) => [edge.from, edge.to]).filter((id) => !marked.has(id)).flatMap((id) => {
       const node = headNodes.get(id) ?? baseNodes.get(id);
       return node ? [node] : [];
@@ -537,7 +540,7 @@ var createFactReader = (ts, ast) => {
     const [size, unit] = intervalUnits.find(([size]) => ms >= size && ms % size === 0) ?? [1, "ms"];
     return `${ms / size}${unit}`;
   };
-  const modesOf = (option) => {
+  const modesOf = (option, type) => {
     const object = option && unwrap(option);
     if (!object || !ts.isObjectLiteralExpression(object))
       return [];
@@ -547,9 +550,9 @@ var createFactReader = (ts, ast) => {
       if (name === "enabled")
         return value.kind === ts.SyntaxKind.FalseKeyword ? ["disabled"] : [];
       if (name === "once")
-        return value.kind === ts.SyntaxKind.TrueKeyword ? ["once"] : [];
+        return type === "initialize" && value.kind === ts.SyntaxKind.TrueKeyword ? ["once"] : [];
       if (name === "lock")
-        return value.kind === ts.SyntaxKind.FalseKeyword ? ["unlocked"] : [];
+        return type === "interval" && value.kind === ts.SyntaxKind.FalseKeyword ? ["unlocked"] : [];
       if (name !== "serverMode" && name !== "operationMode")
         return [];
       const values = ts.isArrayLiteralExpression(value) ? [...value.elements] : [value];
@@ -567,7 +570,8 @@ var createFactReader = (ts, ast) => {
       const { root } = chainOf(property.initializer);
       const type = root ? verbOf(root.expression) : null;
       const [first, second] = root?.arguments ?? [];
-      const schedule = type === "cron" && first ? ts.isStringLiteralLike(first) ? first.text : first.getText(source) : type === "interval" || type === "timeout" ? durationOf(first, source) : null;
+      const cron = type === "cron" && first ? unwrap(first) : null;
+      const schedule = cron ? ts.isStringLiteralLike(cron) ? cron.text : cron.getText(source) : type === "interval" || type === "timeout" ? durationOf(first, source) : null;
       const option = type === "initialize" || type === "destroy" ? first : second;
       return [
         {
@@ -576,7 +580,7 @@ var createFactReader = (ts, ast) => {
           extent: extentOf(source, property),
           type,
           schedule,
-          modes: modesOf(option)
+          modes: modesOf(option, type)
         }
       ];
     });
@@ -593,6 +597,19 @@ var createFactReader = (ts, ast) => {
       return name && targetName ? [{ name, span: spanOf(source, property.name), target: targetName }] : [];
     });
   };
+  const adaptorBindingsIn = (source) => {
+    const bindings = [];
+    const visit = (node) => {
+      if (ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && node.expression.name.text === "applyAdaptor") {
+        const [role, adaptor] = node.arguments.map(guardNameOf);
+        if (role && adaptor)
+          bindings.push({ role, adaptor, span: spanOf(source, node.expression.name) });
+      }
+      ts.forEachChild(node, visit);
+    };
+    visit(source);
+    return bindings;
+  };
   const endpointKeysOf = (source, builder, made, model) => {
     const verbOf = verbReaderOf(builder?.parameters[0]);
     return (returnedObject(builder)?.properties ?? []).flatMap((property) => {
@@ -713,6 +730,7 @@ var createFactReader = (ts, ast) => {
       endpoints: [],
       internals: [],
       adaptors: [],
+      adaptorBindings: source.text.includes("applyAdaptor") ? adaptorBindingsIn(source) : [],
       stores: []
     };
     for (const statement of source.statements) {
@@ -737,7 +755,8 @@ var createFactReader = (ts, ast) => {
           ...name,
           model: moduleRefOf(call.arguments[0], "db"),
           methods: methodsOf(source, statement),
-          plugs: plugsOf(source, builder)
+          plugs: plugsOf(source, builder),
+          fields: objectKeys(source, returnedObject(builder)).map(({ name }) => name)
         });
       else if (callee === "slice") {
         const model = moduleRefOf(call.arguments[0], "srv");
@@ -1502,6 +1521,7 @@ class GraphBuilder {
   #resolver;
   #adaptors = new Map;
   #plugs = new Map;
+  #serviceFields = new Set;
   constructor(source) {
     this.#source = source;
     this.#routes = new RouteFactReader(source.ts, source.reader, source.parse);
@@ -1517,16 +1537,26 @@ class GraphBuilder {
       ...[...constantsByOwner].filter(([key]) => key !== owner && key?.startsWith("libs/")).flatMap(([, list]) => list)
     ];
     const typed = [];
+    const adaptorCounts = new Map;
     for (const file of facts)
       for (const fact of file.adaptors) {
-        const declared = { fact, owner: file.owner, fileName: file.fileName };
-        this.#adaptors.set(fact.name, [...this.#adaptors.get(fact.name) ?? [], declared]);
-        this.#adaptorNodeOf(declared);
+        const key = this.#key("adaptor", file.owner, fact.name);
+        adaptorCounts.set(key, (adaptorCounts.get(key) ?? 0) + 1);
       }
+    const declaredAdaptors = facts.flatMap((file) => file.adaptors.map((fact) => {
+      const key = this.#key("adaptor", file.owner, fact.name);
+      const id = (adaptorCounts.get(key) ?? 0) > 1 ? this.#key("adaptor", file.owner, `${this.#resolver.inOwner(file.fileName, file.owner)}#${fact.name}`) : key;
+      const declared = { fact, owner: file.owner, fileName: file.fileName, id };
+      this.#adaptors.set(fact.name, [...this.#adaptors.get(fact.name) ?? [], declared]);
+      this.#adaptorNodeOf(declared);
+      return { declared, file };
+    }));
+    for (const { declared, file } of declaredAdaptors)
+      for (const plug of declared.fact.plugs)
+        this.#addEdge(declared.id, this.#adaptorIdOf(plug.target, file), "plugs", plug.name, this.#location(plug.span));
     for (const file of facts)
-      for (const fact of file.adaptors)
-        for (const plug of fact.plugs)
-          this.#addEdge(this.#key("adaptor", file.owner, fact.name), this.#adaptorIdOf(plug.target, file), "plugs", plug.name, this.#location(plug.span));
+      for (const binding of file.adaptorBindings)
+        this.#addEdge(this.#adaptorIdOf(binding.role, file), this.#adaptorIdOf(binding.adaptor, file), "binds", file.owner, this.#location(binding.span));
     for (const guard of this.#resolver.declare(facts))
       this.#guardNodeOf(guard);
     for (const file of facts) {
@@ -1559,10 +1589,18 @@ class GraphBuilder {
         }
         for (const method of service.methods)
           this.#addMember("method", owner, refName, method, `${service.name}.${method.name}`, file.fileName);
-        for (const plug of service.plugs)
-          this.#plugs.set(`${owner ?? ""}
+        for (const plug of service.plugs) {
+          const key = `${refName}
+${plug.name}`;
+          this.#plugs.set(key, [
+            ...this.#plugs.get(key) ?? [],
+            { owner, target: this.#adaptorIdOf(plug.target, file) }
+          ]);
+        }
+        for (const field of service.fields)
+          this.#serviceFields.add(`${owner ?? ""}
 ${refName}
-${plug.name}`, this.#adaptorIdOf(plug.target, file));
+${field}`);
       }
       for (const filter of file.filters) {
         if (!filter.name.endsWith("Filter"))
@@ -1821,18 +1859,70 @@ ${dir}`, node);
   #adaptorIdOf(local, file) {
     const [head, member] = local.split(".");
     const imported = file.imports.find((item) => item.name === head);
-    const from = imported ? this.#resolver.ownerOfSpecifier(file.fileName, imported.from) : undefined;
     const name = member ?? (imported && imported.imported !== "default" && imported.imported !== "*" ? imported.imported : head);
+    const path = imported ? this.#resolver.pathOfSpecifier(file.fileName, imported.from) : null;
+    if (imported && path === null && !frameworkPattern.test(imported.from))
+      return this.#packageAdaptorOf(name, imported.from);
+    const from = imported ? this.#resolver.ownerOfSpecifier(file.fileName, imported.from) : undefined;
     const declared = this.#adaptors.get(name) ?? [];
-    const found = from === undefined ? declared.find((adaptor) => adaptor.owner === file.owner) ?? declared.find((adaptor) => this.#resolver.visible(adaptor.owner, file.owner)) : declared.find((adaptor) => adaptor.owner === from) ?? (from === frameworkOwner ? undefined : declared.find((adaptor) => this.#resolver.visible(adaptor.owner, from)));
+    const found = from === undefined ? this.#adaptorIn(declared, file.owner, path, file.fileName) ?? declared.find((adaptor) => this.#resolver.visible(adaptor.owner, file.owner)) : this.#adaptorIn(declared, from, path, file.fileName) ?? (from === frameworkOwner ? undefined : declared.find((adaptor) => this.#resolver.visible(adaptor.owner, from)));
     if (found)
-      return this.#adaptorNodeOf(found);
+      return found.id;
+    const reexported = from && from !== frameworkOwner ? this.#packageShimOf(from, name, path) : null;
+    if (reexported)
+      return this.#packageAdaptorOf(reexported.name, reexported.from);
     const owner = from === frameworkOwner ? null : imported ? from ?? null : file.owner;
     const detail = from === frameworkOwner ? [frameworkOwner] : [];
     return this.#addNode(this.#key("adaptor", owner, name), "adaptor", owner, null, name, null, detail).id;
   }
-  #adaptorNodeOf({ fact, owner, fileName }) {
-    const id = this.#key("adaptor", owner, fact.name);
+  #adaptorIn(declared, owner, path, fileName) {
+    const own = declared.filter((adaptor) => adaptor.owner === owner);
+    if (own.length < 2)
+      return own.at(0);
+    const pathOf = (adaptor) => this.#source.relative(adaptor.fileName).replace(/\.tsx?$/, "");
+    const named = path === null ? own.find((adaptor) => adaptor.fileName === fileName) : own.find((adaptor) => pathOf(adaptor) === path || pathOf(adaptor) === `${path}/index`) ?? own.find((adaptor) => pathOf(adaptor).startsWith(`${path}/`));
+    return named ?? own.at(0);
+  }
+  #pluggedOf({ owner, module: module2 }, field) {
+    const plugs = this.#plugs.get(`${module2}
+${field}`) ?? [];
+    const own = plugs.filter((plug) => plug.owner === owner);
+    if (!own.length && this.#serviceFields.has(`${owner ?? ""}
+${module2}
+${field}`))
+      return [];
+    const inherited = own.length ? own : plugs.filter((plug) => this.#resolver.visible(plug.owner, owner));
+    return [...new Set(inherited.map(({ target }) => target))];
+  }
+  #packageAdaptorOf(name, specifier) {
+    if (frameworkPattern.test(specifier))
+      return this.#addNode(this.#key("adaptor", null, name), "adaptor", null, null, name, null, [frameworkOwner]).id;
+    const pkg = specifier.split("/").slice(0, specifier.startsWith("@") ? 2 : 1).join("/");
+    return this.#addNode(this.#key("adaptor", pkg, name), "adaptor", null, null, name, null, [pkg]).id;
+  }
+  #packageShimOf(owner, name, near) {
+    const reexport = this.#resolver.reexportOf(owner, name, near);
+    const [shim] = reexport?.site.imports ?? [];
+    if (reexport && shim && this.#resolver.pathOfSpecifier(reexport.site.fileName, shim.from) === null)
+      return { name: reexport.local === "default" ? name : reexport.local, from: shim.from };
+    if (reexport || !near)
+      return null;
+    const packages = new Set;
+    for (const [fileName, words] of this.#resolver.filesIn(owner)) {
+      const relative = this.#source.relative(fileName);
+      const isNear = relative.startsWith(`${near}/`) || relative.replace(/\.tsx?$/, "") === near;
+      if (!isNear || !words.includes(`
+export
+`))
+        continue;
+      for (const [, specifier = ""] of this.#source.readText(fileName)?.matchAll(starExportPattern) ?? [])
+        if (this.#resolver.pathOfSpecifier(fileName, specifier) === null)
+          packages.add(specifier);
+    }
+    const [only] = packages;
+    return packages.size === 1 && only && !this.#resolver.declares(owner, name) ? { name, from: only } : null;
+  }
+  #adaptorNodeOf({ fact, owner, fileName, id }) {
     const detail = fact.refName ? [fact.refName] : [];
     const node = this.#addNode(id, "adaptor", owner, null, fact.name, fact.span, detail);
     if (fact.doc && !node.doc)
@@ -1942,10 +2032,8 @@ st
     visit(source);
   }
   #link(fileName, source, identifier, chain, context, owner) {
-    const plugged = chain?.length === 2 && chain[0] === "this" && context.kind === "method" && this.#isServiceThis(identifier) ? this.#plugs.get(`${context.owner ?? ""}
-${context.module}
-${chain[1]}`) : undefined;
-    const resolved = plugged ? [plugged] : this.#source.resolve(fileName, identifier).map((target) => this.#targetNodeOf(target)).filter((id) => id !== null);
+    const plugged = chain?.length === 2 && chain[0] === "this" && context.kind === "method" && this.#isServiceThis(identifier) ? this.#pluggedOf(context, chain[1]) : [];
+    const resolved = plugged.length ? plugged : this.#source.resolve(fileName, identifier).map((target) => this.#targetNodeOf(target)).filter((id) => id !== null);
     const targets = resolved.length ? resolved : this.#plainTargetsOf(chain, identifier.text, context, owner);
     if (!targets.length)
       return;
@@ -2680,6 +2768,8 @@ canPass
 adapt
 `) || words.includes(`
 dangerouslyAdapt
+`) || words.includes(`
+applyAdaptor
 `);
   }
   static #sourceKeyOf({ family, sourceKey, label, detail, span }) {

package/index.js

@@ -28,6 +28,9 @@ class AkanGraphDiff {
       ...head.edges.flatMap((edge) => !baseKeys.has(edgeKeyOf(edge)) ? [{ ...edge, change: "added" }] : marked.has(edge.from) || marked.has(edge.to) ? [edge] : []),
       ...base.edges.filter((edge) => !headKeys.has(edgeKeyOf(edge))).map((edge) => ({ ...edge, change: "removed" }))
     ];
+    const shown = new Set([...marked.keys(), ...edges.flatMap((edge) => [edge.from, edge.to])]);
+    const listed = new Set(edges.map(edgeKeyOf));
+    edges.push(...head.edges.filter((edge) => edge.kind === "binds" && shown.has(edge.from) && !listed.has(edgeKeyOf(edge))));
     const context = edges.flatMap((edge) => [edge.from, edge.to]).filter((id) => !marked.has(id)).flatMap((id) => {
       const node = headNodes.get(id) ?? baseNodes.get(id);
       return node ? [node] : [];
@@ -485,7 +488,7 @@ var createFactReader = (ts, ast) => {
     const [size, unit] = intervalUnits.find(([size]) => ms >= size && ms % size === 0) ?? [1, "ms"];
     return `${ms / size}${unit}`;
   };
-  const modesOf = (option) => {
+  const modesOf = (option, type) => {
     const object = option && unwrap(option);
     if (!object || !ts.isObjectLiteralExpression(object))
       return [];
@@ -495,9 +498,9 @@ var createFactReader = (ts, ast) => {
       if (name === "enabled")
         return value.kind === ts.SyntaxKind.FalseKeyword ? ["disabled"] : [];
       if (name === "once")
-        return value.kind === ts.SyntaxKind.TrueKeyword ? ["once"] : [];
+        return type === "initialize" && value.kind === ts.SyntaxKind.TrueKeyword ? ["once"] : [];
       if (name === "lock")
-        return value.kind === ts.SyntaxKind.FalseKeyword ? ["unlocked"] : [];
+        return type === "interval" && value.kind === ts.SyntaxKind.FalseKeyword ? ["unlocked"] : [];
       if (name !== "serverMode" && name !== "operationMode")
         return [];
       const values = ts.isArrayLiteralExpression(value) ? [...value.elements] : [value];
@@ -515,7 +518,8 @@ var createFactReader = (ts, ast) => {
       const { root } = chainOf(property.initializer);
       const type = root ? verbOf(root.expression) : null;
       const [first, second] = root?.arguments ?? [];
-      const schedule = type === "cron" && first ? ts.isStringLiteralLike(first) ? first.text : first.getText(source) : type === "interval" || type === "timeout" ? durationOf(first, source) : null;
+      const cron = type === "cron" && first ? unwrap(first) : null;
+      const schedule = cron ? ts.isStringLiteralLike(cron) ? cron.text : cron.getText(source) : type === "interval" || type === "timeout" ? durationOf(first, source) : null;
       const option = type === "initialize" || type === "destroy" ? first : second;
       return [
         {
@@ -524,7 +528,7 @@ var createFactReader = (ts, ast) => {
           extent: extentOf(source, property),
           type,
           schedule,
-          modes: modesOf(option)
+          modes: modesOf(option, type)
         }
       ];
     });
@@ -541,6 +545,19 @@ var createFactReader = (ts, ast) => {
       return name && targetName ? [{ name, span: spanOf(source, property.name), target: targetName }] : [];
     });
   };
+  const adaptorBindingsIn = (source) => {
+    const bindings = [];
+    const visit = (node) => {
+      if (ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && node.expression.name.text === "applyAdaptor") {
+        const [role, adaptor] = node.arguments.map(guardNameOf);
+        if (role && adaptor)
+          bindings.push({ role, adaptor, span: spanOf(source, node.expression.name) });
+      }
+      ts.forEachChild(node, visit);
+    };
+    visit(source);
+    return bindings;
+  };
   const endpointKeysOf = (source, builder, made, model) => {
     const verbOf = verbReaderOf(builder?.parameters[0]);
     return (returnedObject(builder)?.properties ?? []).flatMap((property) => {
@@ -661,6 +678,7 @@ var createFactReader = (ts, ast) => {
       endpoints: [],
       internals: [],
       adaptors: [],
+      adaptorBindings: source.text.includes("applyAdaptor") ? adaptorBindingsIn(source) : [],
       stores: []
     };
     for (const statement of source.statements) {
@@ -685,7 +703,8 @@ var createFactReader = (ts, ast) => {
           ...name,
           model: moduleRefOf(call.arguments[0], "db"),
           methods: methodsOf(source, statement),
-          plugs: plugsOf(source, builder)
+          plugs: plugsOf(source, builder),
+          fields: objectKeys(source, returnedObject(builder)).map(({ name }) => name)
         });
       else if (callee === "slice") {
         const model = moduleRefOf(call.arguments[0], "srv");
@@ -1450,6 +1469,7 @@ class GraphBuilder {
   #resolver;
   #adaptors = new Map;
   #plugs = new Map;
+  #serviceFields = new Set;
   constructor(source) {
     this.#source = source;
     this.#routes = new RouteFactReader(source.ts, source.reader, source.parse);
@@ -1465,16 +1485,26 @@ class GraphBuilder {
       ...[...constantsByOwner].filter(([key]) => key !== owner && key?.startsWith("libs/")).flatMap(([, list]) => list)
     ];
     const typed = [];
+    const adaptorCounts = new Map;
     for (const file of facts)
       for (const fact of file.adaptors) {
-        const declared = { fact, owner: file.owner, fileName: file.fileName };
-        this.#adaptors.set(fact.name, [...this.#adaptors.get(fact.name) ?? [], declared]);
-        this.#adaptorNodeOf(declared);
+        const key = this.#key("adaptor", file.owner, fact.name);
+        adaptorCounts.set(key, (adaptorCounts.get(key) ?? 0) + 1);
       }
+    const declaredAdaptors = facts.flatMap((file) => file.adaptors.map((fact) => {
+      const key = this.#key("adaptor", file.owner, fact.name);
+      const id = (adaptorCounts.get(key) ?? 0) > 1 ? this.#key("adaptor", file.owner, `${this.#resolver.inOwner(file.fileName, file.owner)}#${fact.name}`) : key;
+      const declared = { fact, owner: file.owner, fileName: file.fileName, id };
+      this.#adaptors.set(fact.name, [...this.#adaptors.get(fact.name) ?? [], declared]);
+      this.#adaptorNodeOf(declared);
+      return { declared, file };
+    }));
+    for (const { declared, file } of declaredAdaptors)
+      for (const plug of declared.fact.plugs)
+        this.#addEdge(declared.id, this.#adaptorIdOf(plug.target, file), "plugs", plug.name, this.#location(plug.span));
     for (const file of facts)
-      for (const fact of file.adaptors)
-        for (const plug of fact.plugs)
-          this.#addEdge(this.#key("adaptor", file.owner, fact.name), this.#adaptorIdOf(plug.target, file), "plugs", plug.name, this.#location(plug.span));
+      for (const binding of file.adaptorBindings)
+        this.#addEdge(this.#adaptorIdOf(binding.role, file), this.#adaptorIdOf(binding.adaptor, file), "binds", file.owner, this.#location(binding.span));
     for (const guard of this.#resolver.declare(facts))
       this.#guardNodeOf(guard);
     for (const file of facts) {
@@ -1507,10 +1537,18 @@ class GraphBuilder {
         }
         for (const method of service.methods)
           this.#addMember("method", owner, refName, method, `${service.name}.${method.name}`, file.fileName);
-        for (const plug of service.plugs)
-          this.#plugs.set(`${owner ?? ""}
+        for (const plug of service.plugs) {
+          const key = `${refName}
+${plug.name}`;
+          this.#plugs.set(key, [
+            ...this.#plugs.get(key) ?? [],
+            { owner, target: this.#adaptorIdOf(plug.target, file) }
+          ]);
+        }
+        for (const field of service.fields)
+          this.#serviceFields.add(`${owner ?? ""}
 ${refName}
-${plug.name}`, this.#adaptorIdOf(plug.target, file));
+${field}`);
       }
       for (const filter of file.filters) {
         if (!filter.name.endsWith("Filter"))
@@ -1769,18 +1807,70 @@ ${dir}`, node);
   #adaptorIdOf(local, file) {
     const [head, member] = local.split(".");
     const imported = file.imports.find((item) => item.name === head);
-    const from = imported ? this.#resolver.ownerOfSpecifier(file.fileName, imported.from) : undefined;
     const name = member ?? (imported && imported.imported !== "default" && imported.imported !== "*" ? imported.imported : head);
+    const path = imported ? this.#resolver.pathOfSpecifier(file.fileName, imported.from) : null;
+    if (imported && path === null && !frameworkPattern.test(imported.from))
+      return this.#packageAdaptorOf(name, imported.from);
+    const from = imported ? this.#resolver.ownerOfSpecifier(file.fileName, imported.from) : undefined;
     const declared = this.#adaptors.get(name) ?? [];
-    const found = from === undefined ? declared.find((adaptor) => adaptor.owner === file.owner) ?? declared.find((adaptor) => this.#resolver.visible(adaptor.owner, file.owner)) : declared.find((adaptor) => adaptor.owner === from) ?? (from === frameworkOwner ? undefined : declared.find((adaptor) => this.#resolver.visible(adaptor.owner, from)));
+    const found = from === undefined ? this.#adaptorIn(declared, file.owner, path, file.fileName) ?? declared.find((adaptor) => this.#resolver.visible(adaptor.owner, file.owner)) : this.#adaptorIn(declared, from, path, file.fileName) ?? (from === frameworkOwner ? undefined : declared.find((adaptor) => this.#resolver.visible(adaptor.owner, from)));
     if (found)
-      return this.#adaptorNodeOf(found);
+      return found.id;
+    const reexported = from && from !== frameworkOwner ? this.#packageShimOf(from, name, path) : null;
+    if (reexported)
+      return this.#packageAdaptorOf(reexported.name, reexported.from);
     const owner = from === frameworkOwner ? null : imported ? from ?? null : file.owner;
     const detail = from === frameworkOwner ? [frameworkOwner] : [];
     return this.#addNode(this.#key("adaptor", owner, name), "adaptor", owner, null, name, null, detail).id;
   }
-  #adaptorNodeOf({ fact, owner, fileName }) {
-    const id = this.#key("adaptor", owner, fact.name);
+  #adaptorIn(declared, owner, path, fileName) {
+    const own = declared.filter((adaptor) => adaptor.owner === owner);
+    if (own.length < 2)
+      return own.at(0);
+    const pathOf = (adaptor) => this.#source.relative(adaptor.fileName).replace(/\.tsx?$/, "");
+    const named = path === null ? own.find((adaptor) => adaptor.fileName === fileName) : own.find((adaptor) => pathOf(adaptor) === path || pathOf(adaptor) === `${path}/index`) ?? own.find((adaptor) => pathOf(adaptor).startsWith(`${path}/`));
+    return named ?? own.at(0);
+  }
+  #pluggedOf({ owner, module }, field) {
+    const plugs = this.#plugs.get(`${module}
+${field}`) ?? [];
+    const own = plugs.filter((plug) => plug.owner === owner);
+    if (!own.length && this.#serviceFields.has(`${owner ?? ""}
+${module}
+${field}`))
+      return [];
+    const inherited = own.length ? own : plugs.filter((plug) => this.#resolver.visible(plug.owner, owner));
+    return [...new Set(inherited.map(({ target }) => target))];
+  }
+  #packageAdaptorOf(name, specifier) {
+    if (frameworkPattern.test(specifier))
+      return this.#addNode(this.#key("adaptor", null, name), "adaptor", null, null, name, null, [frameworkOwner]).id;
+    const pkg = specifier.split("/").slice(0, specifier.startsWith("@") ? 2 : 1).join("/");
+    return this.#addNode(this.#key("adaptor", pkg, name), "adaptor", null, null, name, null, [pkg]).id;
+  }
+  #packageShimOf(owner, name, near) {
+    const reexport = this.#resolver.reexportOf(owner, name, near);
+    const [shim] = reexport?.site.imports ?? [];
+    if (reexport && shim && this.#resolver.pathOfSpecifier(reexport.site.fileName, shim.from) === null)
+      return { name: reexport.local === "default" ? name : reexport.local, from: shim.from };
+    if (reexport || !near)
+      return null;
+    const packages = new Set;
+    for (const [fileName, words] of this.#resolver.filesIn(owner)) {
+      const relative = this.#source.relative(fileName);
+      const isNear = relative.startsWith(`${near}/`) || relative.replace(/\.tsx?$/, "") === near;
+      if (!isNear || !words.includes(`
+export
+`))
+        continue;
+      for (const [, specifier = ""] of this.#source.readText(fileName)?.matchAll(starExportPattern) ?? [])
+        if (this.#resolver.pathOfSpecifier(fileName, specifier) === null)
+          packages.add(specifier);
+    }
+    const [only] = packages;
+    return packages.size === 1 && only && !this.#resolver.declares(owner, name) ? { name, from: only } : null;
+  }
+  #adaptorNodeOf({ fact, owner, fileName, id }) {
     const detail = fact.refName ? [fact.refName] : [];
     const node = this.#addNode(id, "adaptor", owner, null, fact.name, fact.span, detail);
     if (fact.doc && !node.doc)
@@ -1890,10 +1980,8 @@ st
     visit(source);
   }
   #link(fileName, source, identifier, chain, context, owner) {
-    const plugged = chain?.length === 2 && chain[0] === "this" && context.kind === "method" && this.#isServiceThis(identifier) ? this.#plugs.get(`${context.owner ?? ""}
-${context.module}
-${chain[1]}`) : undefined;
-    const resolved = plugged ? [plugged] : this.#source.resolve(fileName, identifier).map((target) => this.#targetNodeOf(target)).filter((id) => id !== null);
+    const plugged = chain?.length === 2 && chain[0] === "this" && context.kind === "method" && this.#isServiceThis(identifier) ? this.#pluggedOf(context, chain[1]) : [];
+    const resolved = plugged.length ? plugged : this.#source.resolve(fileName, identifier).map((target) => this.#targetNodeOf(target)).filter((id) => id !== null);
     const targets = resolved.length ? resolved : this.#plainTargetsOf(chain, identifier.text, context, owner);
     if (!targets.length)
       return;
@@ -2628,6 +2716,8 @@ canPass
 adapt
 `) || words.includes(`
 dangerouslyAdapt
+`) || words.includes(`
+applyAdaptor
 `);
   }
   static #sourceKeyOf({ family, sourceKey, label, detail, span }) {

package/moduleFacts.d.ts

@@ -63,6 +63,7 @@ export interface PlugFact extends NamedFact {
 export interface ServiceClassFact extends ModuleClassFact {
     methods: MemberFact[];
     plugs: PlugFact[];
+    fields: string[];
 }
 export interface InternalKeyFact extends MemberFact {
     type: string | null;
@@ -77,6 +78,11 @@ export interface AdaptorFact extends MemberFact {
     plugs: PlugFact[];
     doc: string | null;
 }
+export interface AdaptorBindingFact {
+    role: string;
+    adaptor: string;
+    span: AkanSpan;
+}
 export interface StoreClassFact extends ModuleClassFact {
     stateKeys: NamedFact[];
     actions: MemberFact[];
@@ -103,6 +109,7 @@ export interface FileFacts {
     endpoints: EndpointClassFact[];
     internals: InternalClassFact[];
     adaptors: AdaptorFact[];
+    adaptorBindings: AdaptorBindingFact[];
     stores: StoreClassFact[];
 }
 export declare const testFilePattern: RegExp;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/language",
-  "version": "3.2.0-rc.2",
+  "version": "3.2.0-rc.5",
   "description": "Editor-independent Akan.js language core: resolves derived names (slices, queries, CRUD, form setters) back to the source key that produced them.",
   "sourceType": "module",
   "type": "module",

package/server.js

@@ -384,7 +384,7 @@ var createFactReader = (ts, ast) => {
     const [size, unit] = intervalUnits.find(([size]) => ms >= size && ms % size === 0) ?? [1, "ms"];
     return `${ms / size}${unit}`;
   };
-  const modesOf = (option) => {
+  const modesOf = (option, type) => {
     const object = option && unwrap(option);
     if (!object || !ts.isObjectLiteralExpression(object))
       return [];
@@ -394,9 +394,9 @@ var createFactReader = (ts, ast) => {
       if (name === "enabled")
         return value.kind === ts.SyntaxKind.FalseKeyword ? ["disabled"] : [];
       if (name === "once")
-        return value.kind === ts.SyntaxKind.TrueKeyword ? ["once"] : [];
+        return type === "initialize" && value.kind === ts.SyntaxKind.TrueKeyword ? ["once"] : [];
       if (name === "lock")
-        return value.kind === ts.SyntaxKind.FalseKeyword ? ["unlocked"] : [];
+        return type === "interval" && value.kind === ts.SyntaxKind.FalseKeyword ? ["unlocked"] : [];
       if (name !== "serverMode" && name !== "operationMode")
         return [];
       const values = ts.isArrayLiteralExpression(value) ? [...value.elements] : [value];
@@ -414,7 +414,8 @@ var createFactReader = (ts, ast) => {
       const { root } = chainOf(property.initializer);
       const type = root ? verbOf(root.expression) : null;
       const [first, second] = root?.arguments ?? [];
-      const schedule = type === "cron" && first ? ts.isStringLiteralLike(first) ? first.text : first.getText(source) : type === "interval" || type === "timeout" ? durationOf(first, source) : null;
+      const cron = type === "cron" && first ? unwrap(first) : null;
+      const schedule = cron ? ts.isStringLiteralLike(cron) ? cron.text : cron.getText(source) : type === "interval" || type === "timeout" ? durationOf(first, source) : null;
       const option = type === "initialize" || type === "destroy" ? first : second;
       return [
         {
@@ -423,7 +424,7 @@ var createFactReader = (ts, ast) => {
           extent: extentOf(source, property),
           type,
           schedule,
-          modes: modesOf(option)
+          modes: modesOf(option, type)
         }
       ];
     });
@@ -440,6 +441,19 @@ var createFactReader = (ts, ast) => {
       return name && targetName ? [{ name, span: spanOf(source, property.name), target: targetName }] : [];
     });
   };
+  const adaptorBindingsIn = (source) => {
+    const bindings = [];
+    const visit = (node) => {
+      if (ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && node.expression.name.text === "applyAdaptor") {
+        const [role, adaptor] = node.arguments.map(guardNameOf);
+        if (role && adaptor)
+          bindings.push({ role, adaptor, span: spanOf(source, node.expression.name) });
+      }
+      ts.forEachChild(node, visit);
+    };
+    visit(source);
+    return bindings;
+  };
   const endpointKeysOf = (source, builder, made, model) => {
     const verbOf = verbReaderOf(builder?.parameters[0]);
     return (returnedObject(builder)?.properties ?? []).flatMap((property) => {
@@ -560,6 +574,7 @@ var createFactReader = (ts, ast) => {
       endpoints: [],
       internals: [],
       adaptors: [],
+      adaptorBindings: source.text.includes("applyAdaptor") ? adaptorBindingsIn(source) : [],
       stores: []
     };
     for (const statement of source.statements) {
@@ -584,7 +599,8 @@ var createFactReader = (ts, ast) => {
           ...name,
           model: moduleRefOf(call.arguments[0], "db"),
           methods: methodsOf(source, statement),
-          plugs: plugsOf(source, builder)
+          plugs: plugsOf(source, builder),
+          fields: objectKeys(source, returnedObject(builder)).map(({ name }) => name)
         });
       else if (callee === "slice") {
         const model = moduleRefOf(call.arguments[0], "srv");
@@ -1349,6 +1365,7 @@ class GraphBuilder {
   #resolver;
   #adaptors = new Map;
   #plugs = new Map;
+  #serviceFields = new Set;
   constructor(source) {
     this.#source = source;
     this.#routes = new RouteFactReader(source.ts, source.reader, source.parse);
@@ -1364,16 +1381,26 @@ class GraphBuilder {
       ...[...constantsByOwner].filter(([key]) => key !== owner && key?.startsWith("libs/")).flatMap(([, list]) => list)
     ];
     const typed = [];
+    const adaptorCounts = new Map;
     for (const file of facts)
       for (const fact of file.adaptors) {
-        const declared = { fact, owner: file.owner, fileName: file.fileName };
-        this.#adaptors.set(fact.name, [...this.#adaptors.get(fact.name) ?? [], declared]);
-        this.#adaptorNodeOf(declared);
+        const key = this.#key("adaptor", file.owner, fact.name);
+        adaptorCounts.set(key, (adaptorCounts.get(key) ?? 0) + 1);
       }
+    const declaredAdaptors = facts.flatMap((file) => file.adaptors.map((fact) => {
+      const key = this.#key("adaptor", file.owner, fact.name);
+      const id = (adaptorCounts.get(key) ?? 0) > 1 ? this.#key("adaptor", file.owner, `${this.#resolver.inOwner(file.fileName, file.owner)}#${fact.name}`) : key;
+      const declared = { fact, owner: file.owner, fileName: file.fileName, id };
+      this.#adaptors.set(fact.name, [...this.#adaptors.get(fact.name) ?? [], declared]);
+      this.#adaptorNodeOf(declared);
+      return { declared, file };
+    }));
+    for (const { declared, file } of declaredAdaptors)
+      for (const plug of declared.fact.plugs)
+        this.#addEdge(declared.id, this.#adaptorIdOf(plug.target, file), "plugs", plug.name, this.#location(plug.span));
     for (const file of facts)
-      for (const fact of file.adaptors)
-        for (const plug of fact.plugs)
-          this.#addEdge(this.#key("adaptor", file.owner, fact.name), this.#adaptorIdOf(plug.target, file), "plugs", plug.name, this.#location(plug.span));
+      for (const binding of file.adaptorBindings)
+        this.#addEdge(this.#adaptorIdOf(binding.role, file), this.#adaptorIdOf(binding.adaptor, file), "binds", file.owner, this.#location(binding.span));
     for (const guard of this.#resolver.declare(facts))
       this.#guardNodeOf(guard);
     for (const file of facts) {
@@ -1406,10 +1433,18 @@ class GraphBuilder {
         }
         for (const method of service.methods)
           this.#addMember("method", owner, refName, method, `${service.name}.${method.name}`, file.fileName);
-        for (const plug of service.plugs)
-          this.#plugs.set(`${owner ?? ""}
+        for (const plug of service.plugs) {
+          const key = `${refName}
+${plug.name}`;
+          this.#plugs.set(key, [
+            ...this.#plugs.get(key) ?? [],
+            { owner, target: this.#adaptorIdOf(plug.target, file) }
+          ]);
+        }
+        for (const field of service.fields)
+          this.#serviceFields.add(`${owner ?? ""}
 ${refName}
-${plug.name}`, this.#adaptorIdOf(plug.target, file));
+${field}`);
       }
       for (const filter of file.filters) {
         if (!filter.name.endsWith("Filter"))
@@ -1668,18 +1703,70 @@ ${dir}`, node);
   #adaptorIdOf(local, file) {
     const [head, member] = local.split(".");
     const imported = file.imports.find((item) => item.name === head);
-    const from = imported ? this.#resolver.ownerOfSpecifier(file.fileName, imported.from) : undefined;
     const name = member ?? (imported && imported.imported !== "default" && imported.imported !== "*" ? imported.imported : head);
+    const path = imported ? this.#resolver.pathOfSpecifier(file.fileName, imported.from) : null;
+    if (imported && path === null && !frameworkPattern.test(imported.from))
+      return this.#packageAdaptorOf(name, imported.from);
+    const from = imported ? this.#resolver.ownerOfSpecifier(file.fileName, imported.from) : undefined;
     const declared = this.#adaptors.get(name) ?? [];
-    const found = from === undefined ? declared.find((adaptor) => adaptor.owner === file.owner) ?? declared.find((adaptor) => this.#resolver.visible(adaptor.owner, file.owner)) : declared.find((adaptor) => adaptor.owner === from) ?? (from === frameworkOwner ? undefined : declared.find((adaptor) => this.#resolver.visible(adaptor.owner, from)));
+    const found = from === undefined ? this.#adaptorIn(declared, file.owner, path, file.fileName) ?? declared.find((adaptor) => this.#resolver.visible(adaptor.owner, file.owner)) : this.#adaptorIn(declared, from, path, file.fileName) ?? (from === frameworkOwner ? undefined : declared.find((adaptor) => this.#resolver.visible(adaptor.owner, from)));
     if (found)
-      return this.#adaptorNodeOf(found);
+      return found.id;
+    const reexported = from && from !== frameworkOwner ? this.#packageShimOf(from, name, path) : null;
+    if (reexported)
+      return this.#packageAdaptorOf(reexported.name, reexported.from);
     const owner = from === frameworkOwner ? null : imported ? from ?? null : file.owner;
     const detail = from === frameworkOwner ? [frameworkOwner] : [];
     return this.#addNode(this.#key("adaptor", owner, name), "adaptor", owner, null, name, null, detail).id;
   }
-  #adaptorNodeOf({ fact, owner, fileName }) {
-    const id = this.#key("adaptor", owner, fact.name);
+  #adaptorIn(declared, owner, path, fileName) {
+    const own = declared.filter((adaptor) => adaptor.owner === owner);
+    if (own.length < 2)
+      return own.at(0);
+    const pathOf = (adaptor) => this.#source.relative(adaptor.fileName).replace(/\.tsx?$/, "");
+    const named = path === null ? own.find((adaptor) => adaptor.fileName === fileName) : own.find((adaptor) => pathOf(adaptor) === path || pathOf(adaptor) === `${path}/index`) ?? own.find((adaptor) => pathOf(adaptor).startsWith(`${path}/`));
+    return named ?? own.at(0);
+  }
+  #pluggedOf({ owner, module }, field) {
+    const plugs = this.#plugs.get(`${module}
+${field}`) ?? [];
+    const own = plugs.filter((plug) => plug.owner === owner);
+    if (!own.length && this.#serviceFields.has(`${owner ?? ""}
+${module}
+${field}`))
+      return [];
+    const inherited = own.length ? own : plugs.filter((plug) => this.#resolver.visible(plug.owner, owner));
+    return [...new Set(inherited.map(({ target }) => target))];
+  }
+  #packageAdaptorOf(name, specifier) {
+    if (frameworkPattern.test(specifier))
+      return this.#addNode(this.#key("adaptor", null, name), "adaptor", null, null, name, null, [frameworkOwner]).id;
+    const pkg = specifier.split("/").slice(0, specifier.startsWith("@") ? 2 : 1).join("/");
+    return this.#addNode(this.#key("adaptor", pkg, name), "adaptor", null, null, name, null, [pkg]).id;
+  }
+  #packageShimOf(owner, name, near) {
+    const reexport = this.#resolver.reexportOf(owner, name, near);
+    const [shim] = reexport?.site.imports ?? [];
+    if (reexport && shim && this.#resolver.pathOfSpecifier(reexport.site.fileName, shim.from) === null)
+      return { name: reexport.local === "default" ? name : reexport.local, from: shim.from };
+    if (reexport || !near)
+      return null;
+    const packages = new Set;
+    for (const [fileName, words] of this.#resolver.filesIn(owner)) {
+      const relative = this.#source.relative(fileName);
+      const isNear = relative.startsWith(`${near}/`) || relative.replace(/\.tsx?$/, "") === near;
+      if (!isNear || !words.includes(`
+export
+`))
+        continue;
+      for (const [, specifier = ""] of this.#source.readText(fileName)?.matchAll(starExportPattern) ?? [])
+        if (this.#resolver.pathOfSpecifier(fileName, specifier) === null)
+          packages.add(specifier);
+    }
+    const [only] = packages;
+    return packages.size === 1 && only && !this.#resolver.declares(owner, name) ? { name, from: only } : null;
+  }
+  #adaptorNodeOf({ fact, owner, fileName, id }) {
     const detail = fact.refName ? [fact.refName] : [];
     const node = this.#addNode(id, "adaptor", owner, null, fact.name, fact.span, detail);
     if (fact.doc && !node.doc)
@@ -1789,10 +1876,8 @@ st
     visit(source);
   }
   #link(fileName, source, identifier, chain, context, owner) {
-    const plugged = chain?.length === 2 && chain[0] === "this" && context.kind === "method" && this.#isServiceThis(identifier) ? this.#plugs.get(`${context.owner ?? ""}
-${context.module}
-${chain[1]}`) : undefined;
-    const resolved = plugged ? [plugged] : this.#source.resolve(fileName, identifier).map((target) => this.#targetNodeOf(target)).filter((id) => id !== null);
+    const plugged = chain?.length === 2 && chain[0] === "this" && context.kind === "method" && this.#isServiceThis(identifier) ? this.#pluggedOf(context, chain[1]) : [];
+    const resolved = plugged.length ? plugged : this.#source.resolve(fileName, identifier).map((target) => this.#targetNodeOf(target)).filter((id) => id !== null);
     const targets = resolved.length ? resolved : this.#plainTargetsOf(chain, identifier.text, context, owner);
     if (!targets.length)
       return;
@@ -2527,6 +2612,8 @@ canPass
 adapt
 `) || words.includes(`
 dangerouslyAdapt
+`) || words.includes(`
+applyAdaptor
 `);
   }
   static #sourceKeyOf({ family, sourceKey, label, detail, span }) {