@goodbones/oxlint 0.1.0-beta.5 → 0.1.0-beta.7

package/build/esm/surface-rule.js

@@ -1,122 +1,5 @@
 import { evaluateSurface, formatMessage, surfaceRulesSelecting, } from "@goodbones/core";
-import { toRepoRelative, } from "./oxlint-api.js";
-const isStatementList = (value) => Array.isArray(value);
-const nameOf = (node) => {
-    if (node === null || node === undefined)
-        return null;
-    if (typeof node.name === "string")
-        return node.name;
-    return typeof node.value === "string" ? node.value : null;
-};
-// The identifiers a binding pattern introduces.
-const patternNames = (pattern) => {
-    if (pattern === null || pattern === undefined)
-        return [];
-    switch (pattern.type) {
-        case "Identifier":
-            return typeof pattern.name === "string" ? [pattern.name] : [];
-        case "ObjectPattern":
-            return (pattern.properties ?? []).flatMap((property) => patternNames(property.value ?? property.argument));
-        case "ArrayPattern":
-            return (pattern.elements ?? []).flatMap(patternNames);
-        case "AssignmentPattern":
-            return patternNames(pattern.left);
-        case "RestElement":
-            return patternNames(pattern.argument);
-        default:
-            return [];
-    }
-};
-// The names a declaration statement introduces, with what it declares them as.
-const declaredNamesOf = (statement) => {
-    const named = (declares) => {
-        const name = nameOf(statement.id);
-        return name === null ? [] : [[name, declares]];
-    };
-    switch (statement.type) {
-        case "FunctionDeclaration":
-            return named("function");
-        case "ClassDeclaration":
-            return named("class");
-        case "VariableDeclaration":
-            return (statement.declarations ?? []).flatMap((declaration) => patternNames(declaration.id).map((name) => [name, "variable"]));
-        case "TSTypeAliasDeclaration":
-            return named("type");
-        case "TSInterfaceDeclaration":
-            return named("interface");
-        case "TSEnumDeclaration":
-            return named("enum");
-        case "TSModuleDeclaration":
-            return named("other");
-        default:
-            return [];
-    }
-};
-// A file's surface, read off the program body rather than by visiting export
-// nodes: an `export` inside a namespace body is that namespace's, not the
-// module's, and reading the top level directly is what says so without a
-// parent pointer. Mirrors the CLI's `exportSitesOf`.
-const surfaceOf = (file, body) => {
-    const locals = new Map();
-    for (const statement of body) {
-        const declaration = statement.type === "ExportNamedDeclaration" || statement.type === "ExportDefaultDeclaration"
-            ? statement.declaration
-            : statement;
-        if (declaration === null || declaration === undefined)
-            continue;
-        for (const [name, declares] of declaredNamesOf(declaration))
-            locals.set(name, declares);
-    }
-    const found = [];
-    const site = (node, name, kind, declares, reexport) => {
-        found.push({ node, site: { file, name, kind, declares, reexport } });
-    };
-    for (const statement of body) {
-        switch (statement.type) {
-            case "ExportNamedDeclaration": {
-                const declaration = statement.declaration;
-                if (declaration !== null && declaration !== undefined) {
-                    for (const [name, declares] of declaredNamesOf(declaration)) {
-                        site(declaration, name, "named", declares, false);
-                    }
-                    break;
-                }
-                const reexport = typeof statement.source?.value === "string";
-                for (const specifier of statement.specifiers ?? []) {
-                    const name = nameOf(specifier.exported);
-                    if (name === null)
-                        continue;
-                    const local = nameOf(specifier.local) ?? name;
-                    const declares = reexport ? "other" : (locals.get(local) ?? "other");
-                    site(specifier, name, name === "default" ? "default" : "named", declares, reexport);
-                }
-                break;
-            }
-            case "ExportDefaultDeclaration": {
-                const declaration = statement.declaration;
-                const declares = declaration === null || declaration === undefined
-                    ? "expression"
-                    : declaration.type === "FunctionDeclaration"
-                        ? "function"
-                        : declaration.type === "ClassDeclaration"
-                            ? "class"
-                            : declaration.type === "TSInterfaceDeclaration"
-                                ? "interface"
-                                : declaration.type === "Identifier"
-                                    ? (locals.get(nameOf(declaration) ?? "") ?? "expression")
-                                    : "expression";
-                site(statement, "default", "default", declares, false);
-                break;
-            }
-            case "ExportAllDeclaration":
-                site(statement, nameOf(statement.exported) ?? "*", "namespace", "other", true);
-                break;
-            default:
-                break;
-        }
-    }
-    return found;
-};
+import { at, factsOfProgram, toRepoRelative, } from "./oxlint-api.js";
 export const makeSurfaceRule = (policy) => ({
     meta: {
         type: "problem",
@@ -137,22 +20,23 @@ export const makeSurfaceRule = (policy) => ({
                 return selected.length > 0;
             },
             Program(node) {
-                if (!isStatementList(node.body))
-                    return;
-                const found = surfaceOf(file, node.body);
-                const violations = evaluateSurface(selected, file, found.map((one) => one.site));
+                const sites = factsOfProgram(file, node).exportSites;
+                const violations = evaluateSurface(selected, file, sites);
                 // A per-site violation lands on the site's own node; a `count` one, on
                 // the program — it is about the file.
                 const used = new Set();
                 for (const violation of violations) {
                     if (policy.baseline.isBaselined(violation))
                         continue;
-                    const at = violation.subject === null
+                    const site = violation.subject === null
                         ? undefined
-                        : found.find((one) => one.site.name === violation.subject && !used.has(one));
-                    if (at !== undefined)
-                        used.add(at);
-                    context.report({ node: at?.node ?? node, message: formatMessage(violation) });
+                        : sites.find((one) => one.name === violation.subject && !used.has(one));
+                    if (site !== undefined)
+                        used.add(site);
+                    context.report({
+                        node: site === undefined ? node : at(site.node),
+                        message: formatMessage(violation),
+                    });
                 }
             },
         };

package/build/esm/surface-rule.js.map

@@ -1 +1 @@
-{"version":3,"file":"surface-rule.js","sourceRoot":"","sources":["../../src/surface-rule.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EAEf,aAAa,EAEb,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAIL,cAAc,GACf,MAAM,iBAAiB,CAAC;AAwCzB,MAAM,eAAe,GAAG,CAAC,KAAc,EAAyC,EAAE,CAChF,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAEvB,MAAM,MAAM,GAAG,CAAC,IAAkC,EAAiB,EAAE;IACnE,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACrD,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC,IAAI,CAAC;IACpD,OAAO,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;AAC5D,CAAC,CAAC;AAEF,gDAAgD;AAChD,MAAM,YAAY,GAAG,CAAC,OAAuC,EAAyB,EAAE;IACtF,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IACzD,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,KAAK,YAAY;YACf,OAAO,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,KAAK,eAAe;YAClB,OAAO,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CACrD,YAAY,CAAC,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAClD,CAAC;QACJ,KAAK,cAAc;YACjB,OAAO,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACxD,KAAK,mBAAmB;YACtB,OAAO,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACpC,KAAK,aAAa;YAChB,OAAO,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACxC;YACE,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAEF,+EAA+E;AAC/E,MAAM,eAAe,GAAG,CACtB,SAAwB,EAC2B,EAAE;IACrD,MAAM,KAAK,GAAG,CAAC,QAAyB,EAAqD,EAAE;QAC7F,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAClC,OAAO,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IACjD,CAAC,CAAC;IACF,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;QACvB,KAAK,qBAAqB;YACxB,OAAO,KAAK,CAAC,UAAU,CAAC,CAAC;QAC3B,KAAK,kBAAkB;YACrB,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC;QACxB,KAAK,qBAAqB;YACxB,OAAO,CAAC,SAAS,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,CAC5D,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,UAAU,CAAU,CAAC,CACxE,CAAC;QACJ,KAAK,wBAAwB;YAC3B,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC;QACvB,KAAK,wBAAwB;YAC3B,OAAO,KAAK,CAAC,WAAW,CAAC,CAAC;QAC5B,KAAK,mBAAmB;YACtB,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC;QACvB,KAAK,qBAAqB;YACxB,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC;QACxB;YACE,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAIF,6EAA6E;AAC7E,0EAA0E;AAC1E,yEAAyE;AACzE,qDAAqD;AACrD,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,IAAkC,EAAwB,EAAE;IAC3F,MAAM,MAAM,GAAG,IAAI,GAAG,EAA2B,CAAC;IAClD,KAAK,MAAM,SAAS,IAAI,IAAI,EAAE,CAAC;QAC7B,MAAM,WAAW,GACf,SAAS,CAAC,IAAI,KAAK,wBAAwB,IAAI,SAAS,CAAC,IAAI,KAAK,0BAA0B;YAC1F,CAAC,CAAC,SAAS,CAAC,WAAW;YACvB,CAAC,CAAC,SAAS,CAAC;QAChB,IAAI,WAAW,KAAK,IAAI,IAAI,WAAW,KAAK,SAAS;YAAE,SAAS;QAChE,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,eAAe,CAAC,WAAW,CAAC;YAAE,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC1F,CAAC;IAED,MAAM,KAAK,GAAiB,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,CACX,IAAoB,EACpB,IAAY,EACZ,IAAwB,EACxB,QAAyB,EACzB,QAAiB,EACX,EAAE;QACR,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;IACvE,CAAC,CAAC;IAEF,KAAK,MAAM,SAAS,IAAI,IAAI,EAAE,CAAC;QAC7B,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;YACvB,KAAK,wBAAwB,EAAE,CAAC;gBAC9B,MAAM,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC;gBAC1C,IAAI,WAAW,KAAK,IAAI,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;oBACtD,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,eAAe,CAAC,WAAW,CAAC,EAAE,CAAC;wBAC5D,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;oBACpD,CAAC;oBACD,MAAM;gBACR,CAAC;gBACD,MAAM,QAAQ,GAAG,OAAO,SAAS,CAAC,MAAM,EAAE,KAAK,KAAK,QAAQ,CAAC;gBAC7D,KAAK,MAAM,SAAS,IAAI,SAAS,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC;oBACnD,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;oBACxC,IAAI,IAAI,KAAK,IAAI;wBAAE,SAAS;oBAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC;oBAC9C,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,CAAC;oBACrE,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;gBACtF,CAAC;gBACD,MAAM;YACR,CAAC;YACD,KAAK,0BAA0B,EAAE,CAAC;gBAChC,MAAM,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC;gBAC1C,MAAM,QAAQ,GACZ,WAAW,KAAK,IAAI,IAAI,WAAW,KAAK,SAAS;oBAC/C,CAAC,CAAC,YAAY;oBACd,CAAC,CAAC,WAAW,CAAC,IAAI,KAAK,qBAAqB;wBAC1C,CAAC,CAAC,UAAU;wBACZ,CAAC,CAAC,WAAW,CAAC,IAAI,KAAK,kBAAkB;4BACvC,CAAC,CAAC,OAAO;4BACT,CAAC,CAAC,WAAW,CAAC,IAAI,KAAK,wBAAwB;gCAC7C,CAAC,CAAC,WAAW;gCACb,CAAC,CAAC,WAAW,CAAC,IAAI,KAAK,YAAY;oCACjC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,IAAI,YAAY,CAAC;oCACzD,CAAC,CAAC,YAAY,CAAC;gBAC3B,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;gBACvD,MAAM;YACR,CAAC;YACD,KAAK,sBAAsB;gBACzB,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;gBAC/E,MAAM;YACR;gBACE,MAAM;QACV,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,MAAoB,EAAc,EAAE,CAAC,CAAC;IACpE,IAAI,EAAE;QACJ,IAAI,EAAE,SAAkB;QACxB,IAAI,EAAE;YACJ,WAAW,EACT,iHAAiH;SACpH;QACD,MAAM,EAAE,EAAE;KACX;IAED,UAAU,CAAC,OAAoB;QAC7B,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,IAAI,QAAQ,GAAuC,EAAE,CAAC;QAEtD,OAAO;YACL,MAAM;gBACJ,IAAI,GAAG,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;gBACzD,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;oBAAE,OAAO,KAAK,CAAC;gBACxC,QAAQ,GAAG,qBAAqB,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;gBAC5D,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;YAC7B,CAAC;YAED,OAAO,CAAC,IAAiB;gBACvB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;oBAAE,OAAO;gBACxC,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBACzC,MAAM,UAAU,GAAG,eAAe,CAChC,QAAQ,EACR,IAAI,EACJ,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAC7B,CAAC;gBAEF,uEAAuE;gBACvE,sCAAsC;gBACtC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAS,CAAC;gBAC9B,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;oBACnC,IAAI,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC;wBAAE,SAAS;oBACrD,MAAM,EAAE,GACN,SAAS,CAAC,OAAO,KAAK,IAAI;wBACxB,CAAC,CAAC,SAAS;wBACX,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;oBACjF,IAAI,EAAE,KAAK,SAAS;wBAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBACnC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,IAAI,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;gBAChF,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"surface-rule.js","sourceRoot":"","sources":["../../src/surface-rule.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EACf,aAAa,EAEb,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,EAAE,EACF,cAAc,EAId,cAAc,GACf,MAAM,iBAAiB,CAAC;AAEzB,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,MAAoB,EAAc,EAAE,CAAC,CAAC;IACpE,IAAI,EAAE;QACJ,IAAI,EAAE,SAAkB;QACxB,IAAI,EAAE;YACJ,WAAW,EACT,iHAAiH;SACpH;QACD,MAAM,EAAE,EAAE;KACX;IAED,UAAU,CAAC,OAAoB;QAC7B,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,IAAI,QAAQ,GAAuC,EAAE,CAAC;QAEtD,OAAO;YACL,MAAM;gBACJ,IAAI,GAAG,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;gBACzD,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;oBAAE,OAAO,KAAK,CAAC;gBACxC,QAAQ,GAAG,qBAAqB,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;gBAC5D,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;YAC7B,CAAC;YAED,OAAO,CAAC,IAAa;gBACnB,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,WAAW,CAAC;gBACrD,MAAM,UAAU,GAAG,eAAe,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;gBAE1D,uEAAuE;gBACvE,sCAAsC;gBACtC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAkB,CAAC;gBACvC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;oBACnC,IAAI,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC;wBAAE,SAAS;oBACrD,MAAM,IAAI,GACR,SAAS,CAAC,OAAO,KAAK,IAAI;wBACxB,CAAC,CAAC,SAAS;wBACX,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;oBAC5E,IAAI,IAAI,KAAK,SAAS;wBAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBACvC,OAAO,CAAC,MAAM,CAAC;wBACb,IAAI,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;wBAC/C,OAAO,EAAE,aAAa,CAAC,SAAS,CAAC;qBAClC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodbones/oxlint",
-  "version": "0.1.0-beta.5",
+  "version": "0.1.0-beta.7",
   "type": "module",
   "license": "MIT",
   "description": "The oxlint plugin for @goodbones/core: the imports, exports, members, structure and surface families as five oxlint rules, evaluated in the editor and in CI from the same manifest the CLI reads.",
@@ -44,8 +44,8 @@
   ],
   "dependencies": {
     "effect": "4.0.0-beta.94",
-    "@goodbones/typescript": "0.1.0-beta.5",
-    "@goodbones/core": "0.1.0-beta.5"
+    "@goodbones/core": "0.1.0-beta.7",
+    "@goodbones/typescript": "0.1.0-beta.7"
   },
   "peerDependencies": {
     "oxlint": ">=1.77.0"

package/src/exports-rule.ts

@@ -1,97 +1,29 @@
 import {
-  type Binding,
   evaluateSelectedBindings,
   exportRulesSelecting,
   formatMessage,
   type LoadedPolicy,
   type SelectedExportRule,
 } from "@goodbones/core";
+import type { ReadBinding, ReadEdge } from "@goodbones/typescript";
 import * as Result from "effect/Result";
 
 import {
-  type CallNode,
+  at,
+  factsOfProgram,
   type Fixer,
-  type ImportEqualsNode,
-  importEqualsSpecifierOf,
-  type ImportExpressionNode,
-  importExpressionSpecifierOf,
   type OxlintRule,
-  type ReportableNode,
-  requireSpecifierOf,
+  type Program,
   type RuleContext,
   toRepoRelative,
 } from "./oxlint-api.js";
 
-type NamedNode = ReportableNode & { readonly name?: unknown; readonly value?: unknown };
-
-type SpecifierNode = ReportableNode & {
-  readonly type: string;
-  readonly imported?: NamedNode | null;
-  readonly local?: NamedNode | null;
-};
-
-type DeclarationNode = ReportableNode & {
-  readonly source?: { readonly value?: unknown } | null;
-  readonly specifiers?: ReadonlyArray<SpecifierNode> | null;
-};
-
-const nameOf = (node: NamedNode | null | undefined): string | null => {
-  if (node === null || node === undefined) return null;
-  if (typeof node.name === "string") return node.name;
-  // `import { "a-b" as ab }` — a string-literal export name.
-  return typeof node.value === "string" ? node.value : null;
-};
-
-type Bound = Binding & { readonly node: ReportableNode; readonly local: string };
-
-// The whole module, as one binding. `export * from "m"`, `export * as ns from
-// "m"`, `import x = require("m")`, `import("m")` and `require("m")` all carry
-// every export of `m` at once, exactly as `import * as ns` does — and are the
-// same way around a rule about a name. A side-effect import carries nothing.
-const wholeModule = (node: ReportableNode, local = ""): Bound => ({
-  symbol: "*",
-  kind: "namespace",
-  node,
-  local,
-});
-
-type ExportAllNode = DeclarationNode & { readonly exported?: NamedNode | null };
-
-const boundOf = (specifier: SpecifierNode): Bound | null => {
-  const local = nameOf(specifier.local) ?? "";
-  switch (specifier.type) {
-    case "ImportSpecifier": {
-      const symbol = nameOf(specifier.imported);
-      return symbol === null ? null : { symbol, kind: "named", node: specifier, local };
-    }
-    case "ImportDefaultSpecifier":
-      return { symbol: "default", kind: "default", node: specifier, local };
-    case "ImportNamespaceSpecifier":
-      return { symbol: "*", kind: "namespace", node: specifier, local };
-    // `export { a } from "…"` — `local` is the name in the source module.
-    case "ExportSpecifier": {
-      const symbol = nameOf(specifier.local);
-      return symbol === null ? null : { symbol, kind: "named", node: specifier, local: symbol };
-    }
-    default:
-      return null;
-  }
-};
-
-const specifierOf = (node: DeclarationNode): string | null => {
-  const value = node.source?.value;
-  return typeof value === "string" ? value : null;
-};
-
-const boundSpecifiers = (node: DeclarationNode): ReadonlyArray<Bound> =>
-  (node.specifiers ?? []).map(boundOf).filter((one): one is Bound => one !== null);
-
 // `import { A, B as C } from "pkg"` becomes `import * as A from "pkg/A"` and
 // `import * as C from "pkg/B"`. Only whole-declaration rewrites are offered: a
 // declaration mixing restricted named imports with a default or namespace one
 // would need comma surgery inside the braces, and a fix that is subtly wrong is
 // worse than a diagnostic the author resolves by hand.
-const subpathNamespaceImport = (specifier: string, bound: ReadonlyArray<Bound>): string =>
+const subpathNamespaceImport = (specifier: string, bound: ReadonlyArray<ReadBinding>): string =>
   bound
     .map((binding) => `import * as ${binding.local} from "${specifier}/${binding.symbol}";`)
     .join("\n");
@@ -111,20 +43,16 @@ export const makeExportsRule = (policy: LoadedPolicy): OxlintRule => ({
     let importer = "";
     let selected: ReadonlyArray<SelectedExportRule> = [];
 
-    // `fixable` is whether a rewrite could apply: only an `import` declaration
-    // can be rewritten into subpath namespace imports. `export *` and the
-    // whole-module forms are reported and left for the author.
-    const check = (
-      node: ReportableNode,
-      specifierValue: string | null,
-      bound: ReadonlyArray<Bound>,
-      fixable: boolean,
-    ): void => {
-      if (specifierValue === null || bound.length === 0) return;
+    // Only an `import` declaration can be rewritten into subpath namespace
+    // imports. `export *` and the whole-module forms are reported and left
+    // for the author.
+    const check = (edge: ReadEdge): void => {
+      const { bindings: bound, node, specifier } = edge;
+      if (bound.length === 0) return;
 
       const outcome = evaluateSelectedBindings(selected, policy.resolver, {
         importer,
-        specifier: specifierValue,
+        specifier,
         bindings: bound,
       });
 
@@ -136,30 +64,30 @@ export const makeExportsRule = (policy: LoadedPolicy): OxlintRule => ({
 
       for (const { bindings, rule, violation } of outcome.success) {
         if (policy.baseline.isBaselined(violation)) continue;
-        const offending = bound.filter((one: Bound) =>
+        const offending = bound.filter((one) =>
           bindings.some((binding) => binding.symbol === one.symbol && binding.kind === one.kind),
         );
         // The rewrite is `import * as X from "pkg/<name>"`, which only means
         // something for a named binding — a namespace one has no name to put
         // in the subpath.
         const rewritable =
-          fixable &&
+          edge.form === "import" &&
           rule.fix === "subpath-namespace-import" &&
           offending.length === bound.length &&
           offending.every((one) => one.kind === "named");
 
         if (rewritable) {
           context.report({
-            node,
+            node: at(node),
             message: formatMessage(violation),
             fix: (fixer: Fixer) =>
-              fixer.replaceText(node, subpathNamespaceImport(specifierValue, offending)),
+              fixer.replaceText(at(node), subpathNamespaceImport(specifier, offending)),
           });
           continue;
         }
 
         context.report({
-          node: offending[0]?.node ?? node,
+          node: at(offending[0]?.node ?? node),
           message: formatMessage(violation),
         });
       }
@@ -172,23 +100,8 @@ export const makeExportsRule = (policy: LoadedPolicy): OxlintRule => ({
         selected = exportRulesSelecting(policy.exportRules, importer);
         return selected.length > 0;
       },
-      ImportDeclaration(node: DeclarationNode) {
-        check(node, specifierOf(node), boundSpecifiers(node), true);
-      },
-      ExportNamedDeclaration(node: DeclarationNode) {
-        check(node, specifierOf(node), boundSpecifiers(node), false);
-      },
-      ExportAllDeclaration(node: ExportAllNode) {
-        check(node, specifierOf(node), [wholeModule(node, nameOf(node.exported) ?? "")], false);
-      },
-      ImportExpression(node: ImportExpressionNode) {
-        check(node, importExpressionSpecifierOf(node), [wholeModule(node)], false);
-      },
-      CallExpression(node: CallNode) {
-        check(node, requireSpecifierOf(node), [wholeModule(node)], false);
-      },
-      TSImportEqualsDeclaration(node: ImportEqualsNode) {
-        check(node, importEqualsSpecifierOf(node), [wholeModule(node)], false);
+      Program(node: Program) {
+        for (const edge of factsOfProgram(importer, node).edges) check(edge);
       },
     };
   },

package/src/imports-rule.ts

@@ -5,20 +5,15 @@ import {
   rulesSelecting,
   type SelectedRule,
 } from "@goodbones/core";
+import type { ReadEdge } from "@goodbones/typescript";
 import * as Result from "effect/Result";
 
 import {
-  type CallNode,
-  type ImportEqualsNode,
-  importEqualsSpecifierOf,
-  type ImportExpressionNode,
-  importExpressionSpecifierOf,
+  at,
+  factsOfProgram,
   type OxlintRule,
-  type ReportableNode,
-  requireSpecifierOf,
+  type Program,
   type RuleContext,
-  type SourceNode,
-  specifierOf,
   toRepoRelative,
 } from "./oxlint-api.js";
 
@@ -44,32 +39,29 @@ export const makeImportsRule = (policy: LoadedPolicy): OxlintRule => ({
     let importer = "";
     let selected: ReadonlyArray<SelectedRule> = [];
 
-    const check = (node: ReportableNode, specifier: string | null): void => {
-      if (specifier === null) return;
-
+    const check = (edge: ReadEdge): void => {
+      const { specifier } = edge;
       const outcome = evaluateSelectedEdge(selected, policy.resolver, { importer, specifier });
 
       if (Result.isFailure(outcome)) {
         if (policy.config.resolve.unresolved === "off") return;
         if (policy.ignoreUnresolved.some((pattern) => pattern.test(specifier))) return;
-        context.report({ node, message: unresolvedMessage(specifier, outcome.failure.detail) });
+        context.report({
+          node: at(edge.node),
+          message: unresolvedMessage(specifier, outcome.failure.detail),
+        });
         return;
       }
 
       for (const violation of outcome.success) {
         if (policy.baseline.isBaselined(violation)) continue;
-        context.report({ node, message: formatMessage(violation) });
+        context.report({ node: at(edge.node), message: formatMessage(violation) });
       }
     };
 
-    const checkSource = (node: SourceNode): void => {
-      check(node, specifierOf(node));
-    };
-
-    // Every form that names a module is an edge. The CLI adapter reads the same
-    // five out of TypeScript's tree, and the parity suite holds the two to it: a
-    // `require` the plugin skipped would be a rule that enforces nothing under
-    // `oxlint` while failing under `architecture check`.
+    // Every form that names a module is an edge, and the pack's reader is
+    // what says which forms those are — the same reader the CLI reads a file
+    // through, so a form one host sees the other sees too.
     return {
       before() {
         importer = toRepoRelative(policy.repoRoot, context.filename);
@@ -77,19 +69,8 @@ export const makeImportsRule = (policy: LoadedPolicy): OxlintRule => ({
         selected = rulesSelecting(policy.importRules, importer);
         return selected.length > 0;
       },
-      ImportDeclaration: checkSource,
-      ExportNamedDeclaration: checkSource,
-      ExportAllDeclaration: checkSource,
-      // `import("m")` with a literal argument. A computed one is not a fact a
-      // static policy can speak about, in either adapter.
-      ImportExpression(node: ImportExpressionNode) {
-        check(node, importExpressionSpecifierOf(node));
-      },
-      CallExpression(node: CallNode) {
-        check(node, requireSpecifierOf(node));
-      },
-      TSImportEqualsDeclaration(node: ImportEqualsNode) {
-        check(node, importEqualsSpecifierOf(node));
+      Program(node: Program) {
+        for (const edge of factsOfProgram(importer, node).edges) check(edge);
       },
     };
   },