@blockml/framework 0.7.1 → 0.8.0

package/blocks/org/blockml/bml/framework/registry/BootstrapTrace.bml

@@ -0,0 +1,59 @@
+<!--
+  Framework — BootstrapTrace
+  FQN: org.blockml.bml.framework.registry.BootstrapTrace
+-->
+<block
+  xmlns="http://blockml.org/bml"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://blockml.org/bml https://blockml.org/schemas/bml.xsd
+                      "
+  xmlns:blockml="org.blockml.bml"
+  xmlns:bom="org.blockml.bml.bom"
+  xmlns:bomapi="org.blockml.bml.bom.api"
+  xmlns:bomblock="org.blockml.bml.bom.block"
+  xmlns:bomcommon="org.blockml.bml.bom.common"
+  xmlns:bomcomp="org.blockml.bml.bom.composition"
+  xmlns:bomdoc="org.blockml.bml.bom.document"
+  xmlns:bommember="org.blockml.bml.bom.member"
+  xmlns:bomtype="org.blockml.bml.bom.type"
+  xmlns:bomvalue="org.blockml.bml.bom.value"
+  xmlns:core="org.blockml.bml.core"
+  xmlns:def="org.blockml.bml.definition"
+  xmlns:framework="org.blockml.bml.framework"
+  xmlns:fwcap="org.blockml.bml.framework.capability"
+  xmlns:fwconfig="org.blockml.bml.framework.config"
+  xmlns:fwdocumentation="org.blockml.bml.framework.documentation"
+  xmlns:fwexpression="org.blockml.bml.framework.expression"
+  xmlns:fwregistry="org.blockml.bml.framework.registry"
+  xmlns:parser="org.blockml.bml.compiler.parser"
+  xmlns:type="org.blockml.bml.type"
+  xmlns:bomdocumentation="org.blockml.bml.bom.documentation"
+  xmlns:pardocumentation="org.blockml.bml.compiler.parser.documentation"
+  xmlns:valdocumentation="org.blockml.bml.compiler.validator.documentation">
+
+  <name>BootstrapTrace</name>
+  <type>fwregistry:BootstrapTrace</type>
+  <baseType>framework:FrameworkType</baseType>
+  <is>Resolved bootstrap sources for tracing</is>
+
+  <documentation>corpusPaths — scanned corpus roots. seeds — libraryPaths used. searchRoots — discovery index (not a corpus dump). librariesVisited — graph order. skippedCoveredRoots — library trees skipped because they sit inside corpus srcDir.</documentation>
+
+  <properties>
+    <corpusPaths type="type:Text[]">
+      <documentation>corpusPaths. TS type: type:Text[]. (required)</documentation>
+    </corpusPaths>
+    <seeds type="type:Text[]">
+      <documentation>seeds. TS type: type:Text[]. (required)</documentation>
+    </seeds>
+    <searchRoots type="type:Text[]">
+      <documentation>searchRoots. TS type: type:Text[]. (required)</documentation>
+    </searchRoots>
+    <librariesVisited type="type:Text[]">
+      <documentation>librariesVisited. TS type: type:Text[]. (required)</documentation>
+    </librariesVisited>
+    <skippedCoveredRoots type="type:Text[]">
+      <documentation>skippedCoveredRoots. TS type: type:Text[]. (required)</documentation>
+    </skippedCoveredRoots>
+  </properties>
+
+</block>

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { TypeRegistry } from "./registry/type-registry.js";
-export { bootstrapTypeRegistry, defaultBootstrapPaths, type BootstrapResult, type BootstrapOptions, } from "./registry/bootstrap.js";
+export { bootstrapTypeRegistry, defaultBootstrapPaths, resolveLibrarySeeds, type BootstrapResult, type BootstrapOptions, type BootstrapTrace, } from "./registry/bootstrap.js";
 export { rootFqnByFilePath, rootFqns } from "./registry/root-fqn.js";
 export { getExportedFqns } from "./registry/library-exports.js";
 export { forkBom } from "./fork/fork-bom.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,KAAK,eAAe,EACpB,KAAK,gBAAgB,GACtB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EACL,uBAAuB,EACvB,gBAAgB,EAChB,oBAAoB,EACpB,iBAAiB,GAClB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,YAAY,EACV,cAAc,EACd,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,aAAa,EACb,uBAAuB,EACvB,cAAc,GACf,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,mBAAmB,EACnB,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,cAAc,GACpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EACL,uBAAuB,EACvB,gBAAgB,EAChB,oBAAoB,EACpB,iBAAiB,GAClB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,YAAY,EACV,cAAc,EACd,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,aAAa,EACb,uBAAuB,EACvB,cAAc,GACf,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC"}

package/dist/index.js

@@ -1,5 +1,5 @@
 export { TypeRegistry } from "./registry/type-registry.js";
-export { bootstrapTypeRegistry, defaultBootstrapPaths, } from "./registry/bootstrap.js";
+export { bootstrapTypeRegistry, defaultBootstrapPaths, resolveLibrarySeeds, } from "./registry/bootstrap.js";
 export { rootFqnByFilePath, rootFqns } from "./registry/root-fqn.js";
 export { getExportedFqns } from "./registry/library-exports.js";
 export { forkBom } from "./fork/fork-bom.js";

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EACL,qBAAqB,EACrB,qBAAqB,GAGtB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EACL,uBAAuB,EACvB,gBAAgB,EAChB,oBAAoB,EACpB,iBAAiB,GAClB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAMnE,OAAO,EACL,aAAa,EACb,uBAAuB,EACvB,cAAc,GACf,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,mBAAmB,GAIpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EACL,uBAAuB,EACvB,gBAAgB,EAChB,oBAAoB,EACpB,iBAAiB,GAClB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAMnE,OAAO,EACL,aAAa,EACb,uBAAuB,EACvB,cAAc,GACf,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC"}

package/dist/registry/bootstrap.d.ts

@@ -8,12 +8,29 @@ export interface BootstrapOptions {
     /** Working directory for relative paths. */
     rootDir?: string;
 }
+/**
+ * Corpus fallback: BlockML packages among the nearest package.json production
+ * dependencies (dependencies + optionalDependencies), resolved via node_modules.
+ */
 export declare function defaultBootstrapPaths(rootDir?: string): string[];
+/**
+ * Library graph seeds for this package: package.json blockml.library first,
+ * then extras (config.libraries or --libraries). Deduped by realpath.
+ */
+export declare function resolveLibrarySeeds(rootDir?: string, extras?: string[]): string[];
+export interface BootstrapTrace {
+    corpusPaths: string[];
+    seeds: string[];
+    searchRoots: string[];
+    librariesVisited: string[];
+    skippedCoveredRoots: string[];
+}
 export interface BootstrapResult {
     registry: TypeRegistry;
     diagnostics: Diagnostic[];
     /** Present when bootstrap used libraryPaths mode. */
     exportsByLibrary?: Map<string, Set<string>>;
+    trace?: BootstrapTrace;
 }
 export declare function bootstrapTypeRegistry(optionsOrPaths?: BootstrapOptions | string[], rootDirArg?: string): BootstrapResult;
 //# sourceMappingURL=bootstrap.d.ts.map

package/dist/registry/bootstrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../src/registry/bootstrap.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAMlD,MAAM,WAAW,gBAAgB;IAC/B,uCAAuC;IACvC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,uDAAuD;IACvD,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,4CAA4C;IAC5C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,qBAAqB,CAAC,OAAO,SAAgB,GAAG,MAAM,EAAE,CAKvE;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,YAAY,CAAC;IACvB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,qDAAqD;IACrD,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;CAC7C;AAeD,wBAAgB,qBAAqB,CACnC,cAAc,CAAC,EAAE,gBAAgB,GAAG,MAAM,EAAE,EAC5C,UAAU,CAAC,EAAE,MAAM,GAClB,eAAe,CAoCjB"}
+{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../src/registry/bootstrap.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAMlD,MAAM,WAAW,gBAAgB;IAC/B,uCAAuC;IACvC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,uDAAuD;IACvD,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,4CAA4C;IAC5C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAqKD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,SAAgB,GAAG,MAAM,EAAE,CAwBvE;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,SAAgB,EAAE,MAAM,GAAE,MAAM,EAAO,GAAG,MAAM,EAAE,CA0B5F;AAED,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,mBAAmB,EAAE,MAAM,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,YAAY,CAAC;IACvB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,qDAAqD;IACrD,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5C,KAAK,CAAC,EAAE,cAAc,CAAC;CACxB;AAeD,wBAAgB,qBAAqB,CACnC,cAAc,CAAC,EAAE,gBAAgB,GAAG,MAAM,EAAE,EAC5C,UAAU,CAAC,EAAE,MAAM,GAClB,eAAe,CA4DjB"}

package/dist/registry/bootstrap.js

@@ -1,11 +1,214 @@
-import { join } from "node:path";
+import { existsSync, readdirSync, readFileSync, realpathSync, statSync } from "node:fs";
+import { dirname, join, resolve } from "node:path";
 import { TypeRegistry } from "./type-registry.js";
 import { bootstrapFromCorpusPaths, bootstrapFromLibraryPaths, } from "./library-bootstrap.js";
+const CONFIG_FILE = "blockml.config.json";
+const DEFAULT_SRC_DIR = "blocks";
+function ancestorDirs(fromDir) {
+    const dirs = [];
+    let dir = resolve(fromDir);
+    for (;;) {
+        dirs.push(dir);
+        const parent = dirname(dir);
+        if (parent === dir) {
+            return dirs;
+        }
+        dir = parent;
+    }
+}
+function nearestPackageJsonDir(fromDir) {
+    for (const dir of ancestorDirs(fromDir)) {
+        if (existsSync(join(dir, "package.json"))) {
+            return dir;
+        }
+    }
+    return undefined;
+}
+function resolveInstalledPackageDir(packageName, fromDir) {
+    for (const dir of ancestorDirs(fromDir)) {
+        const candidate = join(dir, "node_modules", packageName);
+        if (existsSync(join(candidate, "package.json"))) {
+            return candidate;
+        }
+    }
+    return undefined;
+}
+function readJson(path) {
+    try {
+        return JSON.parse(readFileSync(path, "utf8"));
+    }
+    catch {
+        return undefined;
+    }
+}
+function canonicalPath(path) {
+    const abs = resolve(path);
+    try {
+        return realpathSync(abs);
+    }
+    catch {
+        return abs;
+    }
+}
+function resolveBootstrapPath(path, rootDir) {
+    return path.startsWith("/") || path.includes(":") ? path : join(rootDir, path);
+}
+/** srcDir for a package: blockml.config.json override, else default "blocks". */
+function packageSrcDir(packageDir) {
+    const configPath = join(packageDir, CONFIG_FILE);
+    if (existsSync(configPath)) {
+        const cfg = readJson(configPath);
+        if (typeof cfg?.srcDir === "string" && cfg.srcDir.length > 0) {
+            return resolve(packageDir, cfg.srcDir);
+        }
+    }
+    return resolve(packageDir, DEFAULT_SRC_DIR);
+}
+/** Blocks/srcDir root when the package is a BlockML module; otherwise undefined. */
+function blockmlPackageBlocksRoot(packageDir) {
+    const pkg = readJson(join(packageDir, "package.json"));
+    const library = pkg?.blockml?.library;
+    const hasLibrary = typeof library === "string" && library.length > 0;
+    const hasConfig = existsSync(join(packageDir, CONFIG_FILE));
+    if (!hasLibrary && !hasConfig) {
+        return undefined;
+    }
+    return packageSrcDir(packageDir);
+}
+function scanNodeModulesForBlockml(nodeModulesDir, out) {
+    let entries;
+    try {
+        entries = readdirSync(nodeModulesDir);
+    }
+    catch {
+        return;
+    }
+    for (const entry of entries) {
+        if (entry.startsWith(".")) {
+            continue;
+        }
+        const full = join(nodeModulesDir, entry);
+        if (entry.startsWith("@")) {
+            let scoped;
+            try {
+                scoped = readdirSync(full);
+            }
+            catch {
+                continue;
+            }
+            for (const name of scoped) {
+                const root = blockmlPackageBlocksRoot(join(full, name));
+                if (root) {
+                    out.add(root);
+                }
+            }
+            continue;
+        }
+        const root = blockmlPackageBlocksRoot(full);
+        if (root) {
+            out.add(root);
+        }
+    }
+}
+function scanWorkspacePackages(packagesDir, out) {
+    let entries;
+    try {
+        entries = readdirSync(packagesDir);
+    }
+    catch {
+        return;
+    }
+    for (const entry of entries) {
+        const pkgDir = join(packagesDir, entry);
+        try {
+            if (!statSync(pkgDir).isDirectory()) {
+                continue;
+            }
+        }
+        catch {
+            continue;
+        }
+        const root = blockmlPackageBlocksRoot(pkgDir);
+        if (root) {
+            out.add(root);
+        }
+    }
+}
+/**
+ * Library.bml FQN index roots: every BlockML package under node_modules and
+ * workspace packages/ along the directory walk (not a corpus dump).
+ * Stops at the first ancestor that has node_modules (same idea as LSP resolveBootstrapRoot).
+ */
+function discoverBlockmlSearchRoots(rootDir) {
+    const npm = new Set();
+    const workspace = new Set();
+    for (const dir of ancestorDirs(rootDir)) {
+        scanWorkspacePackages(join(dir, "packages"), workspace);
+        const nodeModulesDir = join(dir, "node_modules");
+        if (existsSync(nodeModulesDir)) {
+            scanNodeModulesForBlockml(nodeModulesDir, npm);
+            break;
+        }
+    }
+    const local = blockmlPackageBlocksRoot(resolve(rootDir));
+    const out = [...npm, ...workspace];
+    if (local && !out.includes(local)) {
+        out.push(local);
+    }
+    return out;
+}
+/**
+ * Corpus fallback: BlockML packages among the nearest package.json production
+ * dependencies (dependencies + optionalDependencies), resolved via node_modules.
+ */
 export function defaultBootstrapPaths(rootDir = process.cwd()) {
-    return [
-        join(rootDir, "node_modules/@blockml/core/blocks"),
-        join(rootDir, "node_modules/@machineblocks/core/blocks"),
+    const pkgDir = nearestPackageJsonDir(rootDir) ?? resolve(rootDir);
+    const pkg = readJson(join(pkgDir, "package.json"));
+    const names = [
+        ...Object.keys(pkg?.dependencies ?? {}),
+        ...Object.keys(pkg?.optionalDependencies ?? {}),
     ];
+    const out = new Set();
+    for (const name of names) {
+        const installed = resolveInstalledPackageDir(name, rootDir);
+        if (!installed) {
+            continue;
+        }
+        const blocksRoot = blockmlPackageBlocksRoot(installed);
+        if (blocksRoot) {
+            out.add(blocksRoot);
+        }
+    }
+    return [...out];
+}
+/**
+ * Library graph seeds for this package: package.json blockml.library first,
+ * then extras (config.libraries or --libraries). Deduped by realpath.
+ */
+export function resolveLibrarySeeds(rootDir = process.cwd(), extras = []) {
+    const ordered = [];
+    const pkg = readJson(join(rootDir, "package.json"));
+    const identity = pkg?.blockml?.library;
+    if (typeof identity === "string" && identity.length > 0) {
+        ordered.push(identity);
+    }
+    for (const extra of extras) {
+        if (typeof extra === "string" && extra.trim().length > 0) {
+            ordered.push(extra.trim());
+        }
+    }
+    const seen = new Set();
+    const out = [];
+    for (const seed of ordered) {
+        const abs = resolveBootstrapPath(seed, rootDir);
+        const key = canonicalPath(abs);
+        if (seen.has(key)) {
+            continue;
+        }
+        seen.add(key);
+        out.push(key);
+    }
+    return out;
 }
 function normalizeOptions(optionsOrPaths, rootDirArg) {
     if (Array.isArray(optionsOrPaths)) {
@@ -19,14 +222,15 @@ function normalizeOptions(optionsOrPaths, rootDirArg) {
 export function bootstrapTypeRegistry(optionsOrPaths, rootDirArg) {
     const options = normalizeOptions(optionsOrPaths, rootDirArg);
     const rootDir = options.rootDir ?? process.cwd();
+    const discovered = discoverBlockmlSearchRoots(rootDir).map((p) => resolveBootstrapPath(p, rootDir));
     const searchRoots = [
+        ...discovered,
         ...(options.paths ?? []),
         ...(options.libraryPaths ?? []),
-        ...defaultBootstrapPaths(rootDir),
-        join(rootDir, "packages"),
-    ].map((p) => (p.startsWith("/") || p.includes(":") ? p : join(rootDir, p)));
+    ].map((p) => resolveBootstrapPath(p, rootDir));
     if (options.libraryPaths && options.libraryPaths.length > 0) {
-        const result = bootstrapFromLibraryPaths(options.libraryPaths, searchRoots, rootDir);
+        const coveredRoots = (options.paths ?? []).map((p) => resolveBootstrapPath(p, rootDir));
+        const result = bootstrapFromLibraryPaths(options.libraryPaths, searchRoots, rootDir, coveredRoots);
         if (options.paths && options.paths.length > 0) {
             const corpus = bootstrapFromCorpusPaths(options.paths, rootDir);
             for (const fqn of corpus.registry.keys()) {
@@ -37,13 +241,31 @@ export function bootstrapTypeRegistry(optionsOrPaths, rootDirArg) {
             }
             result.diagnostics.push(...corpus.diagnostics);
         }
+        const seeds = options.libraryPaths.map((p) => canonicalPath(resolveBootstrapPath(p, rootDir)));
         return {
             registry: result.registry,
             diagnostics: result.diagnostics,
             exportsByLibrary: result.exportsByLibrary,
+            trace: {
+                corpusPaths: coveredRoots,
+                seeds,
+                searchRoots: discovered,
+                librariesVisited: result.librariesVisited,
+                skippedCoveredRoots: result.skippedCoveredRoots,
+            },
         };
     }
     const paths = options.paths && options.paths.length > 0 ? options.paths : defaultBootstrapPaths(rootDir);
-    return bootstrapFromCorpusPaths(paths, rootDir);
+    const corpus = bootstrapFromCorpusPaths(paths, rootDir);
+    return {
+        ...corpus,
+        trace: {
+            corpusPaths: paths.map((p) => resolveBootstrapPath(p, rootDir)),
+            seeds: [],
+            searchRoots: discovered,
+            librariesVisited: [],
+            skippedCoveredRoots: [],
+        },
+    };
 }
 //# sourceMappingURL=bootstrap.js.map

package/dist/registry/bootstrap.js.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../src/registry/bootstrap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../src/registry/bootstrap.ts"],"names":[],"mappings":"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"}

package/dist/registry/library-bootstrap.d.ts

@@ -1,9 +1,11 @@
 import type { BomDocument, Diagnostic } from "@blockml/bom";
 import { TypeRegistry } from "./type-registry.js";
-export declare function bootstrapFromLibraryPaths(libraryPaths: string[], searchRoots: string[], rootDir: string): {
+export declare function bootstrapFromLibraryPaths(libraryPaths: string[], searchRoots: string[], rootDir: string, coveredRoots?: string[]): {
     registry: TypeRegistry;
     diagnostics: Diagnostic[];
     exportsByLibrary: Map<string, Set<string>>;
+    librariesVisited: string[];
+    skippedCoveredRoots: string[];
 };
 export declare function bootstrapFromCorpusPaths(paths: string[], rootDir: string): {
     registry: TypeRegistry;

package/dist/registry/library-bootstrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"library-bootstrap.d.ts","sourceRoot":"","sources":["../../src/registry/library-bootstrap.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAkC,WAAW,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE5F,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAsNlD,wBAAgB,yBAAyB,CACvC,YAAY,EAAE,MAAM,EAAE,EACtB,WAAW,EAAE,MAAM,EAAE,EACrB,OAAO,EAAE,MAAM,GACd;IACD,QAAQ,EAAE,YAAY,CAAC;IACvB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;CAC5C,CAqBA;AAED,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,EAAE,MAAM,GACd;IAAE,QAAQ,EAAE,YAAY,CAAC;IAAC,WAAW,EAAE,UAAU,EAAE,CAAA;CAAE,CAevD;AAED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EAAE,GACpB,MAAM,GAAG,SAAS,CAEpB;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAI5E"}
+{"version":3,"file":"library-bootstrap.d.ts","sourceRoot":"","sources":["../../src/registry/library-bootstrap.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAkC,WAAW,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE5F,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AA4QlD,wBAAgB,yBAAyB,CACvC,YAAY,EAAE,MAAM,EAAE,EACtB,WAAW,EAAE,MAAM,EAAE,EACrB,OAAO,EAAE,MAAM,EACf,YAAY,GAAE,MAAM,EAAO,GAC1B;IACD,QAAQ,EAAE,YAAY,CAAC;IACvB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3C,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,mBAAmB,EAAE,MAAM,EAAE,CAAC;CAC/B,CAiCA;AAED,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,EAAE,MAAM,GACd;IAAE,QAAQ,EAAE,YAAY,CAAC;IAAC,WAAW,EAAE,UAAU,EAAE,CAAA;CAAE,CAevD;AAED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EAAE,GACpB,MAAM,GAAG,SAAS,CAEpB;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAI5E"}

package/dist/registry/library-bootstrap.js

@@ -1,5 +1,5 @@
-import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
+import { existsSync, readdirSync, readFileSync, realpathSync, statSync } from "node:fs";
+import { dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { parse } from "@blockml/parser";
 import { TypeRegistry } from "./type-registry.js";
 function collectBmlFiles(dir, out = []) {
@@ -27,14 +27,42 @@ function collectBmlFiles(dir, out = []) {
     }
     return out;
 }
+const CONFIG_FILE = "blockml.config.json";
+const DEFAULT_SRC_DIR = "blocks";
+function packageSrcDir(packageDir) {
+    const configPath = join(packageDir, CONFIG_FILE);
+    if (existsSync(configPath)) {
+        try {
+            const cfg = JSON.parse(readFileSync(configPath, "utf8"));
+            if (typeof cfg.srcDir === "string" && cfg.srcDir.length > 0) {
+                return resolve(packageDir, cfg.srcDir);
+            }
+        }
+        catch {
+            // fall through to default
+        }
+    }
+    return resolve(packageDir, DEFAULT_SRC_DIR);
+}
 function blocksRootFromLibraryPath(libraryPath) {
+    let dir = dirname(canonicalPath(libraryPath));
+    for (;;) {
+        if (existsSync(join(dir, "package.json"))) {
+            return packageSrcDir(dir);
+        }
+        const parent = dirname(dir);
+        if (parent === dir) {
+            break;
+        }
+        dir = parent;
+    }
     const normalized = libraryPath.replace(/\\/g, "/");
-    const marker = "/blocks/";
+    const marker = `/${DEFAULT_SRC_DIR}/`;
     const idx = normalized.indexOf(marker);
     if (idx >= 0) {
-        return normalized.slice(0, idx + "/blocks".length);
+        return normalized.slice(0, idx + `/${DEFAULT_SRC_DIR}`.length);
     }
-    return dirname(dirname(libraryPath));
+    return dirname(libraryPath);
 }
 function aggregationInstances(block, name) {
     const agg = block.members.find((m) => m.kind === "aggregation" && m.name === name);
@@ -45,6 +73,15 @@ function aggregationInstances(block, name) {
         .filter((child) => child.kind === "blockInstance")
         .map((child) => child.instance);
 }
+function canonicalPath(path) {
+    const abs = resolve(path);
+    try {
+        return realpathSync(abs);
+    }
+    catch {
+        return abs;
+    }
+}
 function indexLibraryFiles(searchRoots) {
     const index = new Map();
     for (const root of searchRoots) {
@@ -57,7 +94,11 @@ function indexLibraryFiles(searchRoots) {
                 const parsed = parse(source, { filePath: file, continueOnError: true });
                 const type = parsed.document?.block.type;
                 if (type) {
-                    index.set(type, file);
+                    const files = index.get(type) ?? [];
+                    if (!files.includes(file)) {
+                        files.push(file);
+                        index.set(type, files);
+                    }
                 }
             }
             catch {
@@ -80,7 +121,7 @@ function resolveLibraryGraph(seedPaths, searchRoots, rootDir, diagnostics) {
     const visited = new Set();
     const exportsByLibrary = new Map();
     const visit = (libraryPath) => {
-        const abs = resolve(rootDir, libraryPath);
+        const abs = canonicalPath(resolve(rootDir, libraryPath));
         if (visited.has(abs)) {
             return;
         }
@@ -121,13 +162,18 @@ function resolveLibraryGraph(seedPaths, searchRoots, rootDir, diagnostics) {
             return;
         }
         const libType = parsed.document.block.type;
-        libraryIndex.set(libType, abs);
+        const indexed = libraryIndex.get(libType) ?? [];
+        if (!indexed.includes(abs)) {
+            indexed.push(abs);
+            libraryIndex.set(libType, indexed);
+        }
         exportsByLibrary.set(abs, exportedBlockFqns(parsed.document.block));
         for (const dep of [
             ...aggregationInstances(parsed.document.block, "dependencies"),
             ...aggregationInstances(parsed.document.block, "subLibraries"),
         ]) {
-            const depPath = libraryIndex.get(dep.typeFqn);
+            const candidates = libraryIndex.get(dep.typeFqn) ?? [];
+            const depPath = candidates.find((file) => canonicalPath(file) !== abs);
             if (!depPath) {
                 diagnostics.push({
                     severity: "error",
@@ -191,20 +237,38 @@ function registerFiles(registry, files, diagnostics) {
         }
     }
 }
-export function bootstrapFromLibraryPaths(libraryPaths, searchRoots, rootDir) {
+function isPathInsideOrEqual(inner, outer) {
+    const a = canonicalPath(inner);
+    const b = canonicalPath(outer);
+    const rel = relative(b, a);
+    return rel === "" || (!rel.startsWith("..") && !isAbsolute(rel));
+}
+export function bootstrapFromLibraryPaths(libraryPaths, searchRoots, rootDir, coveredRoots = []) {
     const registry = new TypeRegistry();
     const diagnostics = [];
     const { orderedPaths, exportsByLibrary } = resolveLibraryGraph(libraryPaths, searchRoots, rootDir, diagnostics);
     checkNestingViolations(exportsByLibrary, diagnostics);
+    const absCovered = coveredRoots.map((root) => resolve(rootDir, root));
     const seenFiles = new Set();
+    const skippedCoveredRoots = [];
     for (const libraryPath of orderedPaths) {
         const blocksRoot = blocksRootFromLibraryPath(libraryPath);
+        if (absCovered.some((root) => isPathInsideOrEqual(blocksRoot, root))) {
+            skippedCoveredRoots.push(blocksRoot);
+            continue;
+        }
         for (const file of collectBmlFiles(blocksRoot)) {
             seenFiles.add(file);
         }
     }
     registerFiles(registry, [...seenFiles], diagnostics);
-    return { registry, diagnostics, exportsByLibrary };
+    return {
+        registry,
+        diagnostics,
+        exportsByLibrary,
+        librariesVisited: orderedPaths,
+        skippedCoveredRoots,
+    };
 }
 export function bootstrapFromCorpusPaths(paths, rootDir) {
     const registry = new TypeRegistry();
@@ -221,7 +285,7 @@ export function bootstrapFromCorpusPaths(paths, rootDir) {
     return { registry, diagnostics };
 }
 export function findLibraryFileForType(typeFqn, searchRoots) {
-    return indexLibraryFiles(searchRoots).get(typeFqn);
+    return indexLibraryFiles(searchRoots).get(typeFqn)?.[0];
 }
 export function parseLibraryDocument(libraryPath) {
     const source = readFileSync(libraryPath, "utf8");