@tsonic/frontend 0.0.73 → 0.0.75

package/dist/resolver.test.js

@@ -1,290 +1,3 @@
-/**
- * Tests for module resolver
- */
-import { describe, it } from "mocha";
-import { expect } from "chai";
-import * as path from "node:path";
-import * as fs from "node:fs";
-import * as os from "node:os";
-import { resolveImport, getNamespaceFromPath, getClassNameFromPath, } from "./resolver.js";
-import { BindingRegistry } from "./program/bindings.js";
-describe("Module Resolver", () => {
-    describe("resolveImport", () => {
-        const tempDir = path.join(os.tmpdir(), "tsonic-test");
-        const sourceRoot = tempDir;
-        const createNodeBindings = (moduleType, extraModuleTypes = []) => {
-            const bindings = new BindingRegistry();
-            const moduleNames = Array.from(new Set([
-                moduleType.replace(/^nodejs\./, ""),
-                ...extraModuleTypes.map((t) => t.replace(/^nodejs\./, "")),
-            ]));
-            const moduleBindings = Object.fromEntries(moduleNames.flatMap((moduleName) => [
-                [
-                    `node:${moduleName}`,
-                    {
-                        kind: "module",
-                        assembly: "nodejs",
-                        type: `nodejs.${moduleName}`,
-                    },
-                ],
-                [
-                    moduleName,
-                    {
-                        kind: "module",
-                        assembly: "nodejs",
-                        type: `nodejs.${moduleName}`,
-                    },
-                ],
-            ]));
-            bindings.addBindings("/test/nodejs-bindings.json", {
-                bindings: moduleBindings,
-            });
-            bindings.addBindings("/test/nodejs-types.json", {
-                namespace: "nodejs",
-                types: moduleNames.map((moduleName) => ({
-                    clrName: `nodejs.${moduleName}`,
-                    assemblyName: "nodejs",
-                    methods: [],
-                    properties: [],
-                    fields: [],
-                })),
-            });
-            return bindings;
-        };
-        before(() => {
-            // Create temp directory structure
-            fs.mkdirSync(path.join(tempDir, "src", "models"), { recursive: true });
-            fs.writeFileSync(path.join(tempDir, "src", "models", "User.ts"), "export class User {}");
-            fs.writeFileSync(path.join(tempDir, "src", "index.ts"), "");
-        });
-        after(() => {
-            // Clean up
-            fs.rmSync(tempDir, { recursive: true, force: true });
-        });
-        it("should resolve local imports with .ts extension", () => {
-            const result = resolveImport("./models/User.ts", path.join(tempDir, "src", "index.ts"), sourceRoot);
-            expect(result.ok).to.equal(true);
-            if (result.ok) {
-                expect(result.value.isLocal).to.equal(true);
-                expect(result.value.isClr).to.equal(false);
-                expect(result.value.resolvedPath).to.equal(path.join(tempDir, "src", "models", "User.ts"));
-            }
-        });
-        it("should reject local imports that only match the source root by string prefix", () => {
-            fs.mkdirSync(path.join(tempDir, "src-private"), { recursive: true });
-            fs.writeFileSync(path.join(tempDir, "src-private", "Secret.ts"), "export const secret = 1;\n");
-            const result = resolveImport("../src-private/Secret.ts", path.join(tempDir, "src", "index.ts"), path.join(tempDir, "src"));
-            expect(result.ok).to.equal(false);
-            if (!result.ok) {
-                expect(result.error.code).to.equal("TSN1004");
-                expect(result.error.message).to.include("Import outside allowed module root");
-            }
-        });
-        it("should error on local imports without .js or .ts extension", () => {
-            const result = resolveImport("./models/User", path.join(tempDir, "src", "index.ts"), sourceRoot);
-            expect(result.ok).to.equal(false);
-            if (!result.ok) {
-                expect(result.error.code).to.equal("TSN1001");
-                expect(result.error.message).to.include("must have .js or .ts extension");
-            }
-        });
-        it("should not detect bare imports as .NET without resolver with bindings", () => {
-            // Import-driven resolution: bare imports like "System.IO" are only detected as .NET
-            // if a resolver is provided and the import resolves to a package with bindings.json.
-            // Without a resolver or package, bare imports are treated as unsupported node_modules.
-            const result = resolveImport("System.IO", path.join(tempDir, "src", "index.ts"), sourceRoot
-            // No dotnetResolver passed
-            );
-            expect(result.ok).to.equal(false);
-            if (!result.ok) {
-                expect(result.error.code).to.equal("TSN1004");
-                expect(result.error.message).to.include("Unsupported module import");
-            }
-        });
-        it("should reject node_modules imports", () => {
-            const result = resolveImport("express", path.join(tempDir, "src", "index.ts"), sourceRoot);
-            expect(result.ok).to.equal(false);
-            if (!result.ok) {
-                expect(result.error.code).to.equal("TSN1004");
-                expect(result.error.message).to.include("Unsupported module import");
-            }
-        });
-        it("should resolve installed tsonic source packages", () => {
-            const packageRoot = path.join(tempDir, "node_modules", "@acme", "math");
-            fs.mkdirSync(path.join(packageRoot, "tsonic"), { recursive: true });
-            fs.mkdirSync(path.join(packageRoot, "src"), { recursive: true });
-            fs.writeFileSync(path.join(packageRoot, "package.json"), JSON.stringify({ name: "@acme/math", version: "1.0.0", type: "module" }, null, 2));
-            fs.writeFileSync(path.join(packageRoot, "tsonic", "package-manifest.json"), JSON.stringify({
-                schemaVersion: 1,
-                kind: "tsonic-source-package",
-                surfaces: ["@tsonic/js"],
-                source: {
-                    exports: {
-                        ".": "./src/index.ts",
-                    },
-                },
-            }, null, 2));
-            fs.writeFileSync(path.join(packageRoot, "src", "index.ts"), "export const clamp = (x: number): number => x;\n");
-            const result = resolveImport("@acme/math", path.join(tempDir, "src", "index.ts"), sourceRoot, { projectRoot: tempDir, surface: "@tsonic/js" });
-            expect(result.ok).to.equal(true);
-            if (result.ok) {
-                expect(result.value.isLocal).to.equal(true);
-                expect(result.value.isSourcePackage).to.equal(true);
-                expect(result.value.resolvedPath).to.equal(path.join(packageRoot, "src", "index.ts"));
-            }
-        });
-        it("should reject source-package local imports that only match the package root by string prefix", () => {
-            const packageRoot = path.join(tempDir, "node_modules", "@acme", "math");
-            const packageEntry = path.join(packageRoot, "src", "index.ts");
-            const siblingRoot = path.join(tempDir, "node_modules", "@acme", "math-private");
-            fs.mkdirSync(path.join(packageRoot, "tsonic"), { recursive: true });
-            fs.mkdirSync(path.join(packageRoot, "src"), { recursive: true });
-            fs.mkdirSync(path.join(siblingRoot, "src"), { recursive: true });
-            fs.writeFileSync(path.join(packageRoot, "package.json"), JSON.stringify({ name: "@acme/math", version: "1.0.0", type: "module" }, null, 2));
-            fs.writeFileSync(path.join(packageRoot, "tsonic", "package-manifest.json"), JSON.stringify({
-                schemaVersion: 1,
-                kind: "tsonic-source-package",
-                surfaces: ["@tsonic/js"],
-                source: {
-                    exports: {
-                        ".": "./src/index.ts",
-                    },
-                },
-            }, null, 2));
-            fs.writeFileSync(packageEntry, "export const clamp = 1;\n");
-            fs.writeFileSync(path.join(siblingRoot, "src", "secret.ts"), "export const secret = 1;\n");
-            const result = resolveImport("../../math-private/src/secret.ts", packageEntry, path.join(tempDir, "src"));
-            expect(result.ok).to.equal(false);
-            if (!result.ok) {
-                expect(result.error.code).to.equal("TSN1004");
-                expect(result.error.message).to.include("Import outside allowed module root");
-            }
-        });
-        it("should reject source packages on incompatible surfaces", () => {
-            const packageRoot = path.join(tempDir, "node_modules", "@acme", "math");
-            fs.mkdirSync(path.join(packageRoot, "tsonic"), { recursive: true });
-            fs.mkdirSync(path.join(packageRoot, "src"), { recursive: true });
-            fs.writeFileSync(path.join(packageRoot, "package.json"), JSON.stringify({ name: "@acme/math", version: "1.0.0", type: "module" }, null, 2));
-            fs.writeFileSync(path.join(packageRoot, "tsonic", "package-manifest.json"), JSON.stringify({
-                schemaVersion: 1,
-                kind: "tsonic-source-package",
-                surfaces: ["clr"],
-                source: {
-                    exports: {
-                        ".": "./src/index.ts",
-                    },
-                },
-            }, null, 2));
-            fs.writeFileSync(path.join(packageRoot, "src", "index.ts"), "export const clamp = (x: number): number => x;\n");
-            const result = resolveImport("@acme/math", path.join(tempDir, "src", "index.ts"), sourceRoot, { projectRoot: tempDir, surface: "@tsonic/js" });
-            expect(result.ok).to.equal(false);
-            if (!result.ok) {
-                expect(result.error.message).to.include("not compatible with surface");
-            }
-        });
-        it("should allow source packages on compatible parent surfaces", () => {
-            const jsSurfaceRoot = path.join(tempDir, "node_modules", "@tsonic", "js");
-            fs.mkdirSync(jsSurfaceRoot, { recursive: true });
-            fs.writeFileSync(path.join(jsSurfaceRoot, "package.json"), JSON.stringify({ name: "@tsonic/js", version: "1.0.0", type: "module" }, null, 2));
-            fs.writeFileSync(path.join(jsSurfaceRoot, "tsonic.surface.json"), JSON.stringify({
-                schemaVersion: 1,
-                id: "@tsonic/js",
-                extends: [],
-                requiredTypeRoots: ["."],
-            }, null, 2));
-            const customSurfaceRoot = path.join(tempDir, "node_modules", "@acme", "surface-node");
-            fs.mkdirSync(customSurfaceRoot, { recursive: true });
-            fs.writeFileSync(path.join(customSurfaceRoot, "package.json"), JSON.stringify({ name: "@acme/surface-node", version: "1.0.0", type: "module" }, null, 2));
-            fs.writeFileSync(path.join(customSurfaceRoot, "tsonic.surface.json"), JSON.stringify({
-                schemaVersion: 1,
-                id: "@acme/surface-node",
-                extends: ["@tsonic/js"],
-                requiredTypeRoots: ["."],
-            }, null, 2));
-            const packageRoot = path.join(tempDir, "node_modules", "@acme", "math");
-            fs.mkdirSync(path.join(packageRoot, "tsonic"), { recursive: true });
-            fs.mkdirSync(path.join(packageRoot, "src"), { recursive: true });
-            fs.writeFileSync(path.join(packageRoot, "package.json"), JSON.stringify({ name: "@acme/math", version: "1.0.0", type: "module" }, null, 2));
-            fs.writeFileSync(path.join(packageRoot, "tsonic", "package-manifest.json"), JSON.stringify({
-                schemaVersion: 1,
-                kind: "tsonic-source-package",
-                surfaces: ["@tsonic/js"],
-                source: {
-                    exports: {
-                        ".": "./src/index.ts",
-                    },
-                },
-            }, null, 2));
-            fs.writeFileSync(path.join(packageRoot, "src", "index.ts"), "export const clamp = (x: number): number => x;\n");
-            const result = resolveImport("@acme/math", path.join(tempDir, "src", "index.ts"), sourceRoot, { projectRoot: tempDir, surface: "@acme/surface-node" });
-            expect(result.ok).to.equal(true);
-        });
-        it("should error on non-existent local files", () => {
-            const result = resolveImport("./nonexistent.ts", path.join(tempDir, "src", "index.ts"), sourceRoot);
-            expect(result.ok).to.equal(false);
-            if (!result.ok) {
-                expect(result.error.code).to.equal("TSN1004");
-                expect(result.error.message).to.include("Cannot find module");
-            }
-        });
-        it("should resolve node: aliases when matching module bindings exist", () => {
-            const bindings = createNodeBindings("nodejs.fs");
-            const result = resolveImport("node:fs", path.join(tempDir, "src", "index.ts"), sourceRoot, { bindings });
-            expect(result.ok).to.equal(true);
-            if (result.ok) {
-                expect(result.value.isLocal).to.equal(false);
-                expect(result.value.isClr).to.equal(false);
-                expect(result.value.resolvedClrType).to.equal("nodejs.fs");
-            }
-        });
-        it("should resolve extended node aliases when module bindings exist", () => {
-            const bindings = createNodeBindings("nodejs.url");
-            const result = resolveImport("node:url", path.join(tempDir, "src", "index.ts"), sourceRoot, { bindings });
-            expect(result.ok).to.equal(true);
-            if (result.ok) {
-                expect(result.value.resolvedClrType).to.equal("nodejs.url");
-            }
-        });
-        it("should resolve bare node module aliases when module bindings exist", () => {
-            const bindings = createNodeBindings("nodejs.path");
-            const result = resolveImport("path", path.join(tempDir, "src", "index.ts"), sourceRoot, { bindings });
-            expect(result.ok).to.equal(true);
-            if (result.ok) {
-                expect(result.value.resolvedClrType).to.equal("nodejs.path");
-            }
-        });
-        it("should reject node aliases when module bindings are missing", () => {
-            const result = resolveImport("node:fs", path.join(tempDir, "src", "index.ts"), sourceRoot, {
-                bindings: new BindingRegistry(),
-            });
-            expect(result.ok).to.equal(false);
-            if (!result.ok) {
-                expect(result.error.code).to.equal("TSN1004");
-            }
-        });
-    });
-    describe("getNamespaceFromPath", () => {
-        it("should generate namespace from directory structure", () => {
-            const namespace = getNamespaceFromPath("/project/src/models/auth/User.ts", "/project/src", "MyApp");
-            expect(namespace).to.equal("MyApp.models.auth");
-        });
-        it("should use root namespace for files in source root", () => {
-            const namespace = getNamespaceFromPath("/project/src/index.ts", "/project/src", "MyApp");
-            expect(namespace).to.equal("MyApp");
-        });
-        it("should preserve case in directory names", () => {
-            const namespace = getNamespaceFromPath("/project/src/Models/Auth/User.ts", "/project/src", "MyApp");
-            expect(namespace).to.equal("MyApp.Models.Auth");
-        });
-    });
-    describe("getClassNameFromPath", () => {
-        it("should extract class name from file name", () => {
-            expect(getClassNameFromPath("/src/User.ts")).to.equal("User");
-            expect(getClassNameFromPath("/src/models/UserProfile.ts")).to.equal("UserProfile");
-            expect(getClassNameFromPath("index.ts")).to.equal("index");
-            expect(getClassNameFromPath("/src/todo-list.ts")).to.equal("TodoList");
-            expect(getClassNameFromPath("/src/math.test.ts")).to.equal("MathTest");
-        });
-    });
-});
+import "./resolver-cases/namespace-and-classname.test.js";
+import "./resolver-cases/resolve-import.test.js";
 //# sourceMappingURL=resolver.test.js.map

package/dist/resolver.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.test.js","sourceRoot":"","sources":["../src/resolver.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolver.test.js","sourceRoot":"","sources":["../src/resolver.test.ts"],"names":[],"mappings":"AAAA,OAAO,kDAAkD,CAAC;AAC1D,OAAO,yCAAyC,CAAC"}

package/dist/surface/profiles.d.ts

@@ -4,10 +4,10 @@ export type SurfaceCapabilities = {
     readonly includesClr: boolean;
     readonly resolvedModes: readonly SurfaceMode[];
     readonly requiredTypeRoots: readonly string[];
-    readonly useStandardLib: boolean;
 };
 type ResolveSurfaceOptions = {
     readonly projectRoot?: string;
+    readonly authoritativePackageRoots?: ReadonlyMap<string, string>;
 };
 export declare const resolveSurfaceCapabilities: (mode: SurfaceMode | undefined, options?: ResolveSurfaceOptions) => SurfaceCapabilities;
 export declare const hasResolvedSurfaceProfile: (mode: SurfaceMode | undefined, options?: ResolveSurfaceOptions) => boolean;

package/dist/surface/profiles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"profiles.d.ts","sourceRoot":"","sources":["../../src/surface/profiles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAavD,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,aAAa,EAAE,SAAS,WAAW,EAAE,CAAC;IAC/C,QAAQ,CAAC,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAC;IAC9C,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;CAClC,CAAC;AAUF,KAAK,qBAAqB,GAAG;IAC3B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AAiRF,eAAO,MAAM,0BAA0B,GACrC,MAAM,WAAW,GAAG,SAAS,EAC7B,UAAS,qBAA0B,KAClC,mBAYF,CAAC;AAEF,eAAO,MAAM,yBAAyB,GACpC,MAAM,WAAW,GAAG,SAAS,EAC7B,UAAS,qBAA0B,KAClC,OAOF,CAAC"}
+{"version":3,"file":"profiles.d.ts","sourceRoot":"","sources":["../../src/surface/profiles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAWvD,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,aAAa,EAAE,SAAS,WAAW,EAAE,CAAC;IAC/C,QAAQ,CAAC,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAC;CAC/C,CAAC;AASF,KAAK,qBAAqB,GAAG;IAC3B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,yBAAyB,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClE,CAAC;AAgZF,eAAO,MAAM,0BAA0B,GACrC,MAAM,WAAW,GAAG,SAAS,EAC7B,UAAS,qBAA0B,KAClC,mBAWF,CAAC;AAEF,eAAO,MAAM,yBAAyB,GACpC,MAAM,WAAW,GAAG,SAAS,EAC7B,UAAS,qBAA0B,KAClC,OAKF,CAAC"}

package/dist/surface/profiles.js

@@ -1,13 +1,11 @@
-import { existsSync, readFileSync, readdirSync } from "node:fs";
+import { existsSync, readFileSync, readdirSync, realpathSync } from "node:fs";
 import { createRequire } from "node:module";
 import { dirname, isAbsolute, join, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
 const BUILTIN_SURFACE_PROFILES = {
     clr: {
         mode: "clr",
         extends: [],
         requiredTypeRoots: ["node_modules/@tsonic/globals"],
-        useStandardLib: false,
     },
 };
 const mergeUnique = (buckets) => {
@@ -27,12 +25,17 @@ const normalizeSurfaceMode = (mode) => {
     const trimmed = mode.trim();
     return trimmed.length > 0 ? trimmed : "clr";
 };
-const isWithinDirectory = (parent, candidate) => {
-    const base = resolve(parent).replace(/[/\\]+$/, "");
-    const resolvedCandidate = resolve(candidate).replace(/[/\\]+$/, "");
-    return (resolvedCandidate === base ||
-        resolvedCandidate.startsWith(`${base}/`) ||
-        resolvedCandidate.startsWith(`${base}\\`));
+const isSourceSurfacePackageRoot = (packageRoot) => {
+    const manifestPath = join(packageRoot, "tsonic.package.json");
+    if (!existsSync(manifestPath))
+        return false;
+    try {
+        const parsed = JSON.parse(readFileSync(manifestPath, "utf-8"));
+        return parsed.kind === "tsonic-source-package";
+    }
+    catch {
+        return false;
+    }
 };
 const readPackageName = (pkgJsonPath) => {
     if (!existsSync(pkgJsonPath))
@@ -60,31 +63,40 @@ const sortVersionDirs = (dirs) => {
         return right.localeCompare(left);
     });
 };
-const tryResolveSiblingSurfacePackage = (candidate) => {
+const resolveSiblingSearchRoots = (projectRoot) => {
+    const roots = new Set();
+    for (const candidateRoot of findAncestorLookupRoots(projectRoot)) {
+        roots.add(resolve(candidateRoot));
+        roots.add(resolve(candidateRoot, ".."));
+    }
+    return Array.from(roots);
+};
+const tryResolveSiblingSurfacePackage = (candidate, projectRoot) => {
     const scoped = candidate.match(/^@tsonic\/([^/]+)$/);
     if (!scoped)
         return undefined;
     const pkgDirName = scoped[1];
     if (!pkgDirName)
         return undefined;
-    const here = fileURLToPath(import.meta.url);
-    const repoRoot = resolve(dirname(here), "../../../../");
-    const siblingRepoRoot = resolve(repoRoot, "..", pkgDirName);
-    const repoPackageName = readPackageName(join(siblingRepoRoot, "package.json"));
-    if (repoPackageName === candidate) {
-        return { packageName: candidate, packageRoot: siblingRepoRoot };
-    }
-    const versionsRoot = join(siblingRepoRoot, "versions");
-    if (!existsSync(versionsRoot))
-        return undefined;
-    const versionDirs = sortVersionDirs(readdirSync(versionsRoot, { withFileTypes: true })
-        .filter((entry) => entry.isDirectory())
-        .map((entry) => entry.name));
-    for (const versionDir of versionDirs) {
-        const candidateRoot = join(versionsRoot, versionDir);
-        const name = readPackageName(join(candidateRoot, "package.json"));
-        if (name === candidate) {
-            return { packageName: candidate, packageRoot: candidateRoot };
+    for (const searchRoot of resolveSiblingSearchRoots(projectRoot)) {
+        const siblingRepoRoot = join(searchRoot, pkgDirName);
+        const repoPackageName = readPackageName(join(siblingRepoRoot, "package.json"));
+        if (repoPackageName === candidate) {
+            return { packageName: candidate, packageRoot: siblingRepoRoot };
+        }
+        const versionsRoot = join(siblingRepoRoot, "versions");
+        if (!existsSync(versionsRoot)) {
+            continue;
+        }
+        const versionDirs = sortVersionDirs(readdirSync(versionsRoot, { withFileTypes: true })
+            .filter((entry) => entry.isDirectory())
+            .map((entry) => entry.name));
+        for (const versionDir of versionDirs) {
+            const candidateRoot = join(versionsRoot, versionDir);
+            const name = readPackageName(join(candidateRoot, "package.json"));
+            if (name === candidate) {
+                return { packageName: candidate, packageRoot: candidateRoot };
+            }
         }
     }
     return undefined;
@@ -95,17 +107,90 @@ const getSurfacePackageName = (mode) => {
         return undefined;
     return trimmed;
 };
-const resolveSurfacePackage = (mode, projectRoot) => {
+const findAncestorLookupRoots = (projectRoot) => {
+    const roots = [];
+    let current = resolve(projectRoot);
+    let encounteredPackageJson = false;
+    for (;;) {
+        const hasPackageJson = existsSync(join(current, "package.json"));
+        if (!encounteredPackageJson || hasPackageJson) {
+            roots.push(current);
+        }
+        if (hasPackageJson) {
+            encounteredPackageJson = true;
+        }
+        const parent = dirname(current);
+        if (parent === current) {
+            return roots;
+        }
+        current = parent;
+    }
+};
+const tryResolveWorkspaceInstalledSurfacePackage = (packageName, projectRoot) => {
+    const packagePathParts = packageName.startsWith("@")
+        ? packageName.split("/")
+        : [packageName];
+    const candidateRoot = join(projectRoot, "node_modules", ...packagePathParts);
+    if (!existsSync(join(candidateRoot, "package.json"))) {
+        return undefined;
+    }
+    try {
+        return {
+            packageName,
+            packageRoot: realpathSync(candidateRoot),
+        };
+    }
+    catch {
+        return {
+            packageName,
+            packageRoot: resolve(candidateRoot),
+        };
+    }
+};
+const tryResolveProjectInstalledSurfacePackage = (packageName, projectRoot) => {
+    for (const candidateRoot of findAncestorLookupRoots(projectRoot)) {
+        const installed = tryResolveWorkspaceInstalledSurfacePackage(packageName, candidateRoot);
+        if (installed) {
+            return installed;
+        }
+    }
+    return undefined;
+};
+const resolveSurfacePackage = (mode, projectRoot, options) => {
     const req = createRequire(join(projectRoot, "package.json"));
     const packageName = getSurfacePackageName(mode);
     if (!packageName)
         return undefined;
-    const sibling = tryResolveSiblingSurfacePackage(packageName);
+    const authoritativePackageRoot = options.authoritativePackageRoots?.get(packageName);
+    if (authoritativePackageRoot) {
+        return {
+            packageName,
+            packageRoot: authoritativePackageRoot,
+        };
+    }
+    const sibling = tryResolveSiblingSurfacePackage(packageName, projectRoot);
+    if (sibling && isSourceSurfacePackageRoot(sibling.packageRoot)) {
+        return sibling;
+    }
+    const workspaceInstalled = tryResolveProjectInstalledSurfacePackage(packageName, projectRoot);
+    if (workspaceInstalled &&
+        isSourceSurfacePackageRoot(workspaceInstalled.packageRoot)) {
+        return workspaceInstalled;
+    }
+    if (workspaceInstalled &&
+        existsSync(join(workspaceInstalled.packageRoot, "tsonic.surface.json"))) {
+        return workspaceInstalled;
+    }
     try {
         const pkgJsonPath = req.resolve(`${packageName}/package.json`);
         const installed = { packageName, packageRoot: dirname(pkgJsonPath) };
+        if (sibling && isSourceSurfacePackageRoot(sibling.packageRoot)) {
+            return sibling;
+        }
+        if (isSourceSurfacePackageRoot(installed.packageRoot)) {
+            return installed;
+        }
         if (sibling &&
-            !isWithinDirectory(projectRoot, installed.packageRoot) &&
             existsSync(join(sibling.packageRoot, "tsonic.surface.json"))) {
             return sibling;
         }
@@ -152,35 +237,45 @@ const resolveManifestTypeRoots = (packageRoot, requiredTypeRoots) => {
         : ["."];
     return roots.map((entry) => isAbsolute(entry) ? entry : resolve(packageRoot, entry));
 };
-const loadCustomSurfaceProfile = (mode, projectRoot) => {
-    const resolvedPackage = resolveSurfacePackage(mode, projectRoot);
+const loadCustomSurfaceProfile = (mode, options) => {
+    const projectRoot = options.projectRoot;
+    if (!projectRoot) {
+        return undefined;
+    }
+    const resolvedPackage = resolveSurfacePackage(mode, projectRoot, options);
     if (!resolvedPackage)
         return undefined;
     const packageRoot = resolvedPackage.packageRoot;
     const manifestPath = join(packageRoot, "tsonic.surface.json");
-    if (!existsSync(manifestPath))
-        return undefined;
-    let parsed;
-    try {
-        parsed = JSON.parse(readFileSync(manifestPath, "utf-8"));
+    if (existsSync(manifestPath)) {
+        let parsed;
+        try {
+            parsed = JSON.parse(readFileSync(manifestPath, "utf-8"));
+        }
+        catch {
+            return undefined;
+        }
+        const extendsList = (parseManifestStringArray(parsed.extends) ?? []).map((parent) => normalizeExtendsMode(mode, parent));
+        const requiredTypeRoots = resolveManifestTypeRoots(packageRoot, parseManifestStringArray(parsed.requiredTypeRoots));
+        return {
+            mode,
+            extends: extendsList,
+            requiredTypeRoots,
+        };
     }
-    catch {
-        return undefined;
+    if (isSourceSurfacePackageRoot(packageRoot)) {
+        return {
+            mode,
+            extends: [],
+            requiredTypeRoots: [packageRoot],
+        };
     }
-    const extendsList = (parseManifestStringArray(parsed.extends) ?? []).map((parent) => normalizeExtendsMode(mode, parent));
-    const requiredTypeRoots = resolveManifestTypeRoots(packageRoot, parseManifestStringArray(parsed.requiredTypeRoots));
-    const useStandardLib = parsed.useStandardLib === true;
-    return {
-        mode,
-        extends: extendsList,
-        requiredTypeRoots,
-        useStandardLib,
-    };
+    return undefined;
 };
 const getSurfaceProfile = (mode, options) => {
     const projectRoot = options.projectRoot;
     if (projectRoot) {
-        const custom = loadCustomSurfaceProfile(mode, projectRoot);
+        const custom = loadCustomSurfaceProfile(mode, options);
         if (custom)
             return custom;
     }
@@ -191,7 +286,6 @@ const getSurfaceProfile = (mode, options) => {
         mode,
         extends: [],
         requiredTypeRoots: [],
-        useStandardLib: false,
     };
 };
 const resolveProfileChain = (mode, options) => {
@@ -218,7 +312,6 @@ export const resolveSurfaceCapabilities = (mode, options = {}) => {
         includesClr: chain.some((profile) => profile.mode === "clr"),
         resolvedModes: chain.map((profile) => profile.mode),
         requiredTypeRoots: mergeUnique(chain.map((profile) => profile.requiredTypeRoots)),
-        useStandardLib: chain.some((profile) => profile.useStandardLib),
     };
 };
 export const hasResolvedSurfaceProfile = (mode, options = {}) => {
@@ -227,6 +320,6 @@ export const hasResolvedSurfaceProfile = (mode, options = {}) => {
         return true;
     if (!options.projectRoot)
         return false;
-    return (loadCustomSurfaceProfile(normalizedMode, options.projectRoot) !== undefined);
+    return loadCustomSurfaceProfile(normalizedMode, options) !== undefined;
 };
 //# sourceMappingURL=profiles.js.map