carrick 0.3.58 → 0.3.59

package/sidecar/dist/src/capture/index.js

@@ -37,6 +37,8 @@ import { installedVersions, lockfileVersions } from './lockfile.js';
 import { rewriteEmittedSpecifiers } from './paths-rewrite.js';
 import { selfCheckStub } from './self-check.js';
 import { collectSpecifiers, isRelative, packageNameOf } from './specifiers.js';
+import { DenoProject, findDenoConfig } from './deno-project.js';
+export { DenoProject, findDenoConfig } from './deno-project.js';
 // v2 check core ("tsc as the judge"). Same bundle, same seam: the sidecar
 // reaches it only through this door (index.js).
 export { runCheck } from './check.js';
@@ -90,10 +92,23 @@ export function captureStub(opts) {
     const stubDir = path.resolve(opts.outDir);
     const errors = [];
     const configPath = opts.tsconfigPath
-        ? path.resolve(opts.tsconfigPath)
+        ? path.resolve(repoRoot, opts.tsconfigPath)
         : path.join(repoRoot, 'tsconfig.json');
     let parsed;
-    if (!fs.existsSync(configPath)) {
+    let deno;
+    try {
+        const config = findDenoConfig(repoRoot, opts.tsconfigPath);
+        if (config)
+            deno = new DenoProject(config, repoRoot);
+    }
+    catch (err) {
+        return fail(stubDir, packageName, [err instanceof Error ? err.message : String(err)]);
+    }
+    if (deno) {
+        parsed = deno.parsed;
+        errors.push(...deno.diagnostics);
+    }
+    else if (!fs.existsSync(configPath)) {
         if (opts.tsconfigPath) {
             // An explicitly named tsconfig that does not exist is a caller bug.
             return fail(stubDir, packageName, [`tsconfig not found at ${configPath}`]);
@@ -137,17 +152,20 @@ export function captureStub(opts) {
     const entryDir = parsed.options.rootDir
         ? path.resolve(path.dirname(configPath), parsed.options.rootDir)
         : repoRoot;
-    const entryPath = path.join(entryDir, `${SURFACE_ENTRY_BASENAME}.ts`);
+    const entryPath = deno
+        ? path.join(deno.cacheDir, `${SURFACE_ENTRY_BASENAME}.ts`)
+        : path.join(entryDir, `${SURFACE_ENTRY_BASENAME}.ts`);
+    fs.mkdirSync(path.dirname(entryPath), { recursive: true });
     // ---- Phase A: analysis program over placeholder entry + anchor sources ----
     let resolved;
     try {
-        resolved = resolveAnchors(opts, parsed, { repoRoot, entryDir, entryPath });
+        resolved = resolveAnchors(opts, parsed, { repoRoot, entryDir: path.dirname(entryPath), entryPath }, deno);
     }
     catch (err) {
         return fail(stubDir, packageName, [err instanceof Error ? err.message : String(err)]);
     }
     // ---- Augmentation detection over the tsconfig's full file list ----
-    const augmentationSources = findAugmentationFiles(parsed.fileNames.filter((f) => !f.includes(`${path.sep}node_modules${path.sep}`)));
+    const augmentationSources = [...new Set([...findAugmentationFiles(parsed.fileNames.filter((f) => !f.includes(`${path.sep}node_modules${path.sep}`))), ...(deno?.globals ?? [])])];
     // ---- Phase B: declaration emit of the final entry ----
     const entryLines = ['// Generated by Carrick capture v2. Deleted after emit.'];
     for (const anchor of resolved) {
@@ -162,6 +180,7 @@ export function captureStub(opts) {
     // hand-written declarations in the import closure) are never re-emitted by
     // tsc; they must ship verbatim or the tree's references to them dangle.
     const declarationSources = new Map();
+    const sourceByEmitted = new Map();
     let emitPartial = false;
     try {
         fs.writeFileSync(entryPath, entryLines.join('\n') + '\n');
@@ -179,8 +198,12 @@ export function captureStub(opts) {
             outDir: staging,
             rootDir: entryDir,
         };
-        const program = ts.createProgram([entryPath, ...augmentationSources], emitOptions);
-        const emitResult = program.emit(undefined, (fileName, text) => emitted.set(fileName, text), undefined, 
+        const program = ts.createProgram([entryPath, ...augmentationSources], emitOptions, deno?.host(emitOptions));
+        const emitResult = program.emit(undefined, (fileName, text, _bom, _error, sources) => {
+            emitted.set(fileName, text);
+            if (sources?.[0])
+                sourceByEmitted.set(path.relative(staging, fileName).split(path.sep).join('/'), sources[0].fileName);
+        }, undefined, 
         /* emitOnlyDtsFiles */ true);
         // emitSkipped is PER-PROGRAM even when only one file's declaration emit
         // failed (e.g. TS4023 from a hand-rolled ambient stub shadowing a real
@@ -202,6 +225,7 @@ export function captureStub(opts) {
             if (rel.startsWith('..') || rel.includes('node_modules/'))
                 continue;
             declarationSources.set(rel, sourceFile.getFullText());
+            sourceByEmitted.set(rel, abs);
         }
     }
     catch (err) {
@@ -235,8 +259,13 @@ export function captureStub(opts) {
     let surfaceAbsPath = '';
     for (const [fileName, text] of emitted) {
         let rel = path.relative(staging, fileName).split(path.sep).join('/');
-        if (rel === `${SURFACE_ENTRY_BASENAME}.d.ts`)
+        if (path.basename(rel) === `${SURFACE_ENTRY_BASENAME}.d.ts`) {
+            const source = sourceByEmitted.get(rel);
+            sourceByEmitted.delete(rel);
             rel = 'surface.d.ts';
+            if (source)
+                sourceByEmitted.set(rel, source);
+        }
         const dest = path.join(typesDir, rel);
         fs.mkdirSync(path.dirname(dest), { recursive: true });
         fs.writeFileSync(dest, text);
@@ -268,7 +297,14 @@ export function captureStub(opts) {
         .filter((rel) => emittedFiles.includes(rel))
         .map((rel) => `types/${rel}`);
     // ---- Post-emit specifier rewrite (paths mappings + absolute internals) ----
-    const specifierRewrites = rewriteEmittedSpecifiers({
+    let denoRewrites = 0;
+    try {
+        denoRewrites = deno?.rewrite(typesDir, emittedFiles, sourceByEmitted) ?? 0;
+    }
+    catch (err) {
+        return fail(stubDir, packageName, [err instanceof Error ? err.message : String(err)]);
+    }
+    const specifierRewrites = denoRewrites + rewriteEmittedSpecifiers({
         typesDir,
         files: emittedFiles,
         options: parsed.options,
@@ -297,16 +333,19 @@ export function captureStub(opts) {
     // only transitives resolve").
     const installed = installedVersions(repoRoot, externalSpecs);
     const lockVersions = lockfileVersions(repoRoot);
+    for (const name of Object.keys(deno?.pinned ?? {}))
+        externalSpecs.add(name);
     const pinned = {};
     const unpinned = [];
     for (const name of [...externalSpecs].sort()) {
-        const version = installed.get(name) ?? lockVersions.get(name);
+        const version = deno?.pinned[name] ?? installed.get(name) ?? lockVersions.get(name);
         if (version)
             pinned[name] = version;
         else
             unpinned.push(name);
     }
-    const bareCheckout = !fs.existsSync(path.join(repoRoot, 'node_modules'));
+    const dependencyRoot = deno?.config.workspaceRoot ?? repoRoot;
+    const bareCheckout = !deno && !fs.existsSync(path.join(dependencyRoot, 'node_modules'));
     fs.writeFileSync(path.join(stubDir, 'package.json'), JSON.stringify({
         name: packageName,
         version: '0.0.0-carrick',
@@ -329,7 +368,8 @@ export function captureStub(opts) {
         resolved,
         pinned,
         bareCheckout,
-        repoRoot,
+        repoRoot: dependencyRoot,
+        compilerHost: deno ? options => deno.host(options) : undefined,
     });
     const fidelity = computeFidelity(aliases);
     fs.writeFileSync(path.join(stubDir, 'carrick-manifest.json'), JSON.stringify({
@@ -371,7 +411,7 @@ function demoteDanglingAliases(args) {
     let surfaceKey;
     for (const fileName of args.emitted.keys()) {
         const rel = path.relative(args.staging, fileName).split(path.sep).join('/');
-        if (rel === `${SURFACE_ENTRY_BASENAME}.d.ts`)
+        if (path.basename(rel) === `${SURFACE_ENTRY_BASENAME}.d.ts`)
             surfaceKey = fileName;
         if (rel.endsWith('.d.ts'))
             treeModules.add(rel.slice(0, -'.d.ts'.length));
@@ -380,10 +420,10 @@ function demoteDanglingAliases(args) {
         if (rel.endsWith('.d.ts'))
             treeModules.add(rel.slice(0, -'.d.ts'.length));
     }
-    // The surface sits at the tree root, so its relative specifiers resolve
-    // against the root; anything escaping the root cannot be in the tree.
+    // Deno's temporary surface lives in the cache inside the emitted tree.
+    const surfaceDir = surfaceKey ? path.posix.dirname(path.relative(args.staging, surfaceKey).split(path.sep).join('/')) : '.';
     const moduleInTree = (spec) => {
-        const id = path.posix.normalize(spec);
+        const id = path.posix.normalize(path.posix.join(surfaceDir, spec));
         if (id.startsWith('..'))
             return false;
         return treeModules.has(id) || treeModules.has(`${id}/index`);
@@ -429,7 +469,7 @@ function rewriteSurfaceAliasesToUnknown(text, demoted) {
     return out;
 }
 /** Phase A: build the placeholder entry, then resolve every anchor. */
-function resolveAnchors(opts, parsed, ctx) {
+function resolveAnchors(opts, parsed, ctx, deno) {
     const placeholderLines = ['// Carrick capture v2 analysis placeholder.'];
     for (const anchor of opts.anchors) {
         placeholderLines.push(`export type ${anchor.alias} = unknown;`);
@@ -441,10 +481,11 @@ function resolveAnchors(opts, parsed, ctx) {
                 .filter((a) => a.kind !== 'literal')
                 .map((a) => path.join(ctx.repoRoot, a.source_file))),
         ].filter((f) => fs.existsSync(f));
-        const program = ts.createProgram([ctx.entryPath, ...anchorSources], {
+        const options = {
             ...parsed.options,
             noEmit: true,
-        });
+        };
+        const program = ts.createProgram([ctx.entryPath, ...anchorSources, ...(deno?.globals ?? [])], options, deno?.host(options));
         const entrySource = program.getSourceFile(ctx.entryPath);
         const placeholders = new Map();
         if (entrySource) {

package/sidecar/dist/src/capture/self-check.d.ts

@@ -24,6 +24,7 @@
  * (import-type seeds, then BFS over relative imports). The spike's
  * file-granularity shortcut is gone.
  */
+import ts from 'typescript';
 import type { CaptureAliasRecord } from './api.js';
 import type { ResolvedAnchor } from './anchors.js';
 export interface SelfCheckArgs {
@@ -34,5 +35,6 @@ export interface SelfCheckArgs {
     bareCheckout: boolean;
     /** Producer repo root; its node_modules (if any) backs resolution. */
     repoRoot: string;
+    compilerHost?: (options: ts.CompilerOptions) => ts.CompilerHost;
 }
 export declare function selfCheckStub(args: SelfCheckArgs): CaptureAliasRecord[];

package/sidecar/dist/src/capture/self-check.js

@@ -61,7 +61,7 @@ export function selfCheckStub(args) {
     }
 }
 function runSelfCheck(args, treeFiles) {
-    const program = ts.createProgram(treeFiles, {
+    const options = {
         noEmit: true,
         strict: true,
         // MUST be false: the whole stub tree is .d.ts (see module header).
@@ -69,7 +69,8 @@ function runSelfCheck(args, treeFiles) {
         module: ts.ModuleKind.ESNext,
         moduleResolution: ts.ModuleResolutionKind.Bundler,
         types: [],
-    });
+    };
+    const program = ts.createProgram(treeFiles, options, args.compilerHost?.(options));
     const checker = program.getTypeChecker();
     const diagnostics = ts.getPreEmitDiagnostics(program);
     // Failed module specifiers, split external-pinned vs internal, per FILE.

package/sidecar/dist/src/project-loader.js

@@ -12,6 +12,7 @@
 import { Project } from 'ts-morph';
 import * as path from 'node:path';
 import * as fs from 'node:fs';
+import { DenoProject, findDenoConfig } from './capture/index.js';
 /**
  * Source-file patterns used when the repo declares no tsconfig, relative to
  * the repo root. `node_modules` is excluded explicitly: a glob that matches
@@ -169,7 +170,27 @@ export class ProjectLoader {
             // Priority 2: Use tsconfig.json file
             else {
                 const tsconfigPath = this.findTsConfig();
-                if (tsconfigPath) {
+                const denoConfig = findDenoConfig(this.repoRoot, this.tsconfigPath);
+                if (denoConfig) {
+                    this.log(`Project will load with Deno config: ${denoConfig.configPath}`);
+                    this.buildProject = () => {
+                        const deno = new DenoProject(denoConfig, this.repoRoot);
+                        const project = new Project({
+                            compilerOptions: deno.parsed.options,
+                            skipAddingFilesFromTsConfig: true,
+                            resolutionHost: (host, getOptions) => ({
+                                resolveModuleNames: (names, from) => names.map(name => deno.resolve(name, from, getOptions(), host)),
+                                resolveTypeReferenceDirectives: (names, from) => names.map(name => deno.resolveTypeReference(typeof name === 'string' ? name : name.fileName, from, getOptions(), host)),
+                            }),
+                        });
+                        for (const file of deno.parsed.fileNames)
+                            project.addSourceFileAtPath(file);
+                        for (const diagnostic of deno.diagnostics)
+                            this.logError(diagnostic);
+                        return project;
+                    };
+                }
+                else if (tsconfigPath) {
                     this.log(`Project will load with tsconfig: ${tsconfigPath}`);
                     this.buildProject = () => new Project({
                         tsConfigFilePath: tsconfigPath,

package/dist/init/identity.d.ts

@@ -1,20 +0,0 @@
-export type Identity = {
-    /** The GitHub login, when the source could name one. */
-    login: string | null;
-    source: "gh" | "token";
-};
-export type IdentityLookup = {
-    identity: Identity | null;
-    /** What to do about it, ready to print. Null when there is an identity. */
-    problem: string | null;
-};
-export type IdentityOptions = {
-    env?: NodeJS.ProcessEnv;
-    /** Injectable for tests: runs `gh auth status` and returns its output. */
-    ghStatus?: () => string;
-};
-/** The login out of `gh auth status`, whatever wording it used. */
-export declare function loginFromGhStatus(output: string): string | null;
-export declare function githubIdentity(options?: IdentityOptions): IdentityLookup;
-/** One line for the summary. */
-export declare function describeIdentity(identity: Identity): string;

package/dist/init/identity.js

@@ -1,60 +0,0 @@
-// The GitHub identity `carrick init` requires.
-//
-// There is no anonymous tier (carrick#729, ruled 2026-09-08): the local index
-// is built from the identified free tier's allowance, so setup asks who you are
-// before it writes anything. The check is offline and reuses whatever the
-// machine already has — the GitHub CLI's login, or a token in the environment —
-// rather than opening a browser flow of its own.
-//
-// This states the identity. Spending an allowance against it is the cloud's
-// side (carrick-cloud#601) and is not wired here.
-import { spawnSync } from "node:child_process";
-function defaultGhStatus() {
-    // Both streams: `gh auth status` writes to stderr on older versions and to
-    // stdout on newer ones, and a run that reads one of them finds nothing on
-    // half the machines it runs on.
-    const run = spawnSync("gh", ["auth", "status"], { encoding: "utf8" });
-    if (run.error)
-        throw run.error;
-    return `${run.stdout ?? ""}\n${run.stderr ?? ""}`;
-}
-/** The login out of `gh auth status`, whatever wording it used. */
-export function loginFromGhStatus(output) {
-    const match = /Logged in to \S+ account (\S+)/.exec(output) ?? /Logged in to \S+ as (\S+)/.exec(output);
-    return match?.[1] ?? null;
-}
-export function githubIdentity(options = {}) {
-    const env = options.env ?? process.env;
-    const ghStatus = options.ghStatus ?? defaultGhStatus;
-    try {
-        const login = loginFromGhStatus(ghStatus());
-        if (login)
-            return { identity: { login, source: "gh" }, problem: null };
-    }
-    catch {
-        // No gh, or gh is not logged in. The token below is the other way in.
-    }
-    const token = env["GITHUB_TOKEN"] || env["GH_TOKEN"];
-    if (token)
-        return { identity: { login: null, source: "token" }, problem: null };
-    return {
-        identity: null,
-        problem: [
-            "carrick init needs your GitHub identity, and this machine has none it can use.",
-            "",
-            "Either:",
-            "  gh auth login                 (the GitHub CLI: https://cli.github.com)",
-            "  export GITHUB_TOKEN=<token>   (any token that identifies you)",
-            "",
-            "Carrick indexes what you already have access to, and the free tier's",
-            "allowance is counted against the account that asks for it.",
-        ].join("\n"),
-    };
-}
-/** One line for the summary. */
-export function describeIdentity(identity) {
-    return identity.login
-        ? `GitHub identity: ${identity.login} (from the GitHub CLI)`
-        : "GitHub identity: the token in this environment";
-}
-//# sourceMappingURL=identity.js.map

package/dist/init/identity.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../src/init/identity.ts"],"names":[],"mappings":"AAAA,+CAA+C;AAC/C,EAAE;AACF,8EAA8E;AAC9E,gFAAgF;AAChF,0EAA0E;AAC1E,gFAAgF;AAChF,iDAAiD;AACjD,EAAE;AACF,4EAA4E;AAC5E,kDAAkD;AAElD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAoB/C,SAAS,eAAe;IACtB,2EAA2E;IAC3E,0EAA0E;IAC1E,gCAAgC;IAChC,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IACtE,IAAI,GAAG,CAAC,KAAK;QAAE,MAAM,GAAG,CAAC,KAAK,CAAC;IAC/B,OAAO,GAAG,GAAG,CAAC,MAAM,IAAI,EAAE,KAAK,GAAG,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;AACpD,CAAC;AAED,mEAAmE;AACnE,MAAM,UAAU,iBAAiB,CAAC,MAAc;IAC9C,MAAM,KAAK,GACT,gCAAgC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,2BAA2B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5F,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,UAA2B,EAAE;IAC1D,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACvC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,eAAe,CAAC;IACrD,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5C,IAAI,KAAK;YAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IACzE,CAAC;IAAC,MAAM,CAAC;QACP,sEAAsE;IACxE,CAAC;IAED,MAAM,KAAK,GAAG,GAAG,CAAC,cAAc,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;IACrD,IAAI,KAAK;QAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAEhF,OAAO;QACL,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE;YACP,gFAAgF;YAChF,EAAE;YACF,SAAS;YACT,0EAA0E;YAC1E,iEAAiE;YACjE,EAAE;YACF,sEAAsE;YACtE,4DAA4D;SAC7D,CAAC,IAAI,CAAC,IAAI,CAAC;KACb,CAAC;AACJ,CAAC;AAED,gCAAgC;AAChC,MAAM,UAAU,gBAAgB,CAAC,QAAkB;IACjD,OAAO,QAAQ,CAAC,KAAK;QACnB,CAAC,CAAC,oBAAoB,QAAQ,CAAC,KAAK,wBAAwB;QAC5D,CAAC,CAAC,gDAAgD,CAAC;AACvD,CAAC"}