@knighted/duel 4.0.0-rc.2 → 4.0.0-rc.4

package/README.md

@@ -117,7 +117,7 @@ Project scope is helpful in monorepos or hoisted installs where hazards surface
 
 ## Options
 
-The available options are limited, because you should define most of them inside your project's `tsconfig.json` file.
+These are the CLI options `duel` supports to work alongside your project's `tsconfig.json` settings.
 
 - `--project, -p` The path to the project's configuration file. Defaults to `tsconfig.json`.
 - `--pkg-dir, -k` The directory to start looking for a package.json file. Defaults to `--project` dir.

package/dist/cjs/duel.cjs

@@ -428,8 +428,8 @@ const duel = async (args) => {
                                 rel = altRel;
                             }
                             else {
-                                (0, util_js_1.logWarn)(`Skipping copy for ${file} outside of project root ${projectRoot}`);
-                                continue;
+                                (0, util_js_1.logError)(`Referenced config or source is outside the project root and cannot be patched: ${file}. Move it inside ${projectRoot} (or its parent for project references) so Duel can create an isolated shadow build.`);
+                                process.exit(1);
                             }
                         }
                         const dest = (0, node_path_1.join)(subDir, rel);
@@ -464,14 +464,7 @@ const duel = async (args) => {
                     if (configFile === configPath)
                         continue;
                     const dest = (0, node_path_1.join)(subDir, (0, node_path_1.relative)(projectRoot, configFile));
-                    let parsed = null;
-                    try {
-                        parsed = (0, get_tsconfig_1.parseTsconfig)(dest);
-                    }
-                    catch (err) {
-                        (0, util_js_1.logWarn)(`Skipping referenced tsconfig at ${dest} (parse failed): ${err?.message ?? err}`);
-                        continue;
-                    }
+                    const parsed = (0, get_tsconfig_1.parseTsconfig)(dest);
                     const cfg = parsed?.tsconfig ?? parsed;
                     if (!cfg || typeof cfg !== 'object')
                         continue;

package/dist/cjs/resolver.cjs

@@ -1,14 +1,69 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rewriteSpecifiersAndExtensions = void 0;
 const promises_1 = require("node:fs/promises");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
+const magic_string_1 = __importDefault(require("magic-string"));
+const trace_mapping_1 = require("@jridgewell/trace-mapping");
+const gen_mapping_1 = require("@jridgewell/gen-mapping");
 const module_1 = require("@knighted/module");
-/**
- * Rewrites specifiers and file extensions for dual builds.
- * Currently mirrors existing behavior and provides hooks for future validation.
- */
+const loadMapIfExists = async (path) => {
+    try {
+        const raw = await (0, promises_1.readFile)(path, 'utf8');
+        return JSON.parse(raw);
+    }
+    catch {
+        return null;
+    }
+};
+const updateSourceMappingUrl = (content, mapFile) => {
+    const comment = `//# sourceMappingURL=${mapFile}`;
+    if (/\/\/# sourceMappingURL=/.test(content)) {
+        return content.replace(/\/\/# sourceMappingURL=.*/g, comment);
+    }
+    return `${content}\n${comment}\n`;
+};
+const composeSourceMaps = (rewriteMap, baseMap) => {
+    const outer = new trace_mapping_1.TraceMap(rewriteMap);
+    const inner = new trace_mapping_1.TraceMap(baseMap);
+    const file = rewriteMap.file ?? baseMap.file;
+    const gen = new gen_mapping_1.GenMapping({ file });
+    (0, trace_mapping_1.eachMapping)(outer, mapping => {
+        if (mapping.originalLine == null || mapping.originalColumn == null)
+            return;
+        const traced = (0, trace_mapping_1.originalPositionFor)(inner, {
+            line: mapping.originalLine,
+            column: mapping.originalColumn,
+        });
+        if (traced.line == null || traced.column == null || traced.source == null)
+            return;
+        (0, gen_mapping_1.addMapping)(gen, {
+            generated: { line: mapping.generatedLine, column: mapping.generatedColumn },
+            original: { line: traced.line, column: traced.column },
+            source: traced.source,
+            name: traced.name ?? mapping.name ?? null,
+        });
+    });
+    const sourcesContent = new Map();
+    const baseSources = Array.isArray(baseMap.sources) ? baseMap.sources : [];
+    const baseContents = Array.isArray(baseMap.sourcesContent) ? baseMap.sourcesContent : [];
+    baseSources.forEach((source, idx) => {
+        const content = baseContents[idx];
+        if (content != null) {
+            sourcesContent.set(source, content);
+        }
+    });
+    for (const [source, content] of sourcesContent.entries()) {
+        (0, gen_mapping_1.setSourceContent)(gen, source, content);
+    }
+    const composed = (0, gen_mapping_1.toDecodedMap)(gen);
+    composed.file = file;
+    return composed;
+};
 const rewriteSpecifiersAndExtensions = async (filenames, options = {}) => {
     const { target, ext, syntaxMode, rewritePolicy = 'safe', validateSpecifiers = false, onRewrite = () => { }, onWarn = () => { }, } = options;
     const rewrites = [];
@@ -20,13 +75,55 @@ const rewriteSpecifiersAndExtensions = async (filenames, options = {}) => {
             : filename.replace(/\.js$/, ext);
         if (isDts) {
             const source = await (0, promises_1.readFile)(filename, 'utf8');
-            const rewritten = source.replace(/(?<=["'`])(\.\.?(?:\/[\w.-]+)*)\.js(?=["'`])/g, `$1${ext}`);
-            if (rewritten !== source) {
+            const code = new magic_string_1.default(source);
+            let mutated = false;
+            for (const match of source.matchAll(/(?<=['"`])(\.{1,2}(?:\/[\w.-]+)*)\.js(?=['"`])/g)) {
+                if (match.index == null)
+                    continue;
+                const start = match.index;
+                const end = start + match[0].length;
+                code.overwrite(start, end, `${match[1]}${ext}`);
+                mutated = true;
+            }
+            const existingMapPath = `${filename}.map`;
+            const existingMap = await loadMapIfExists(existingMapPath);
+            if (mutated) {
                 rewrites.push({ file: filename, kind: 'dts' });
             }
-            await (0, promises_1.writeFile)(outFilename, rewritten);
+            const outMapPath = `${outFilename}.map`;
+            const mapFile = (0, node_path_1.basename)(outMapPath);
+            let output = code.toString();
+            let nextMap = null;
+            /*
+             * If an upstream map exists, carry it forward when we rename the file,
+             * and compose when the content was mutated. If no upstream map exists,
+             * do not emit a new one.
+             */
+            if (existingMap) {
+                if (mutated) {
+                    const rewriteMap = code.generateMap({
+                        hires: true,
+                        includeContent: true,
+                        file: outFilename,
+                        source: filename,
+                    });
+                    nextMap = composeSourceMaps(rewriteMap, existingMap);
+                }
+                else {
+                    nextMap = { ...existingMap };
+                }
+            }
+            if (nextMap) {
+                nextMap.file = (0, node_path_1.basename)(outFilename);
+                output = updateSourceMappingUrl(output, mapFile);
+                await (0, promises_1.writeFile)(outMapPath, JSON.stringify(nextMap));
+            }
+            await (0, promises_1.writeFile)(outFilename, output);
             if (outFilename !== filename) {
                 await (0, promises_1.rm)(filename, { force: true });
+                if (existingMap) {
+                    await (0, promises_1.rm)(existingMapPath, { force: true });
+                }
             }
             continue;
         }
@@ -82,11 +179,36 @@ const rewriteSpecifiersAndExtensions = async (filenames, options = {}) => {
             target,
             rewriteSpecifier,
             transformSyntax: syntaxMode,
+            sourceMap: true,
             ...(outFilename === filename ? { inPlace: true } : { out: outFilename }),
         };
-        await (0, module_1.transform)(filename, writeOptions);
+        const result = await (0, module_1.transform)(filename, writeOptions);
+        const nextCode = result?.code ?? result;
+        const rewriteMap = result?.map ?? null;
+        const existingMapPath = `${filename}.map`;
+        const existingMap = await loadMapIfExists(existingMapPath);
+        const outMapPath = `${outFilename}.map`;
+        let output = typeof nextCode === 'string' ? nextCode : String(nextCode);
+        let nextMap = null;
+        /*
+         * Compose the rewrite map with the upstream map when present; if the
+         * input had no map, we do not emit a new one.
+         */
+        if (rewriteMap && existingMap) {
+            nextMap = composeSourceMaps(rewriteMap, existingMap);
+        }
+        if (nextMap) {
+            const mapFile = (0, node_path_1.basename)(outMapPath);
+            nextMap.file = (0, node_path_1.basename)(outFilename);
+            output = updateSourceMappingUrl(output, mapFile);
+            await (0, promises_1.writeFile)(outMapPath, JSON.stringify(nextMap));
+        }
+        await (0, promises_1.writeFile)(outFilename, output);
         if (outFilename !== filename) {
             await (0, promises_1.rm)(filename, { force: true });
+            if (existingMap) {
+                await (0, promises_1.rm)(existingMapPath, { force: true });
+            }
         }
         rewrites.push({ file: filename, kind: 'source' });
         onRewrite(filename, outFilename);

package/dist/cjs/resolver.d.cts

@@ -1,7 +1,3 @@
-/**
- * Rewrites specifiers and file extensions for dual builds.
- * Currently mirrors existing behavior and provides hooks for future validation.
- */
 export function rewriteSpecifiersAndExtensions(filenames: any, options?: {}): Promise<{
     rewrites: {
         file: any;

package/dist/esm/duel.js

@@ -425,8 +425,8 @@ const duel = async (args) => {
                                 rel = altRel;
                             }
                             else {
-                                logWarn(`Skipping copy for ${file} outside of project root ${projectRoot}`);
-                                continue;
+                                logError(`Referenced config or source is outside the project root and cannot be patched: ${file}. Move it inside ${projectRoot} (or its parent for project references) so Duel can create an isolated shadow build.`);
+                                process.exit(1);
                             }
                         }
                         const dest = join(subDir, rel);
@@ -461,14 +461,7 @@ const duel = async (args) => {
                     if (configFile === configPath)
                         continue;
                     const dest = join(subDir, relative(projectRoot, configFile));
-                    let parsed = null;
-                    try {
-                        parsed = parseTsconfig(dest);
-                    }
-                    catch (err) {
-                        logWarn(`Skipping referenced tsconfig at ${dest} (parse failed): ${err?.message ?? err}`);
-                        continue;
-                    }
+                    const parsed = parseTsconfig(dest);
                     const cfg = parsed?.tsconfig ?? parsed;
                     if (!cfg || typeof cfg !== 'object')
                         continue;

package/dist/esm/resolver.d.ts

@@ -1,7 +1,3 @@
-/**
- * Rewrites specifiers and file extensions for dual builds.
- * Currently mirrors existing behavior and provides hooks for future validation.
- */
 export function rewriteSpecifiersAndExtensions(filenames: any, options?: {}): Promise<{
     rewrites: {
         file: any;

package/dist/esm/resolver.js

@@ -1,11 +1,63 @@
 import { readFile, writeFile, rm } from 'node:fs/promises';
 import { accessSync } from 'node:fs';
-import { dirname, resolve } from 'node:path';
+import { basename, dirname, resolve } from 'node:path';
+import MagicString from 'magic-string';
+import { TraceMap, eachMapping, originalPositionFor } from '@jridgewell/trace-mapping';
+import { GenMapping, addMapping, setSourceContent, toDecodedMap, } from '@jridgewell/gen-mapping';
 import { transform } from '@knighted/module';
-/**
- * Rewrites specifiers and file extensions for dual builds.
- * Currently mirrors existing behavior and provides hooks for future validation.
- */
+const loadMapIfExists = async (path) => {
+    try {
+        const raw = await readFile(path, 'utf8');
+        return JSON.parse(raw);
+    }
+    catch {
+        return null;
+    }
+};
+const updateSourceMappingUrl = (content, mapFile) => {
+    const comment = `//# sourceMappingURL=${mapFile}`;
+    if (/\/\/# sourceMappingURL=/.test(content)) {
+        return content.replace(/\/\/# sourceMappingURL=.*/g, comment);
+    }
+    return `${content}\n${comment}\n`;
+};
+const composeSourceMaps = (rewriteMap, baseMap) => {
+    const outer = new TraceMap(rewriteMap);
+    const inner = new TraceMap(baseMap);
+    const file = rewriteMap.file ?? baseMap.file;
+    const gen = new GenMapping({ file });
+    eachMapping(outer, mapping => {
+        if (mapping.originalLine == null || mapping.originalColumn == null)
+            return;
+        const traced = originalPositionFor(inner, {
+            line: mapping.originalLine,
+            column: mapping.originalColumn,
+        });
+        if (traced.line == null || traced.column == null || traced.source == null)
+            return;
+        addMapping(gen, {
+            generated: { line: mapping.generatedLine, column: mapping.generatedColumn },
+            original: { line: traced.line, column: traced.column },
+            source: traced.source,
+            name: traced.name ?? mapping.name ?? null,
+        });
+    });
+    const sourcesContent = new Map();
+    const baseSources = Array.isArray(baseMap.sources) ? baseMap.sources : [];
+    const baseContents = Array.isArray(baseMap.sourcesContent) ? baseMap.sourcesContent : [];
+    baseSources.forEach((source, idx) => {
+        const content = baseContents[idx];
+        if (content != null) {
+            sourcesContent.set(source, content);
+        }
+    });
+    for (const [source, content] of sourcesContent.entries()) {
+        setSourceContent(gen, source, content);
+    }
+    const composed = toDecodedMap(gen);
+    composed.file = file;
+    return composed;
+};
 const rewriteSpecifiersAndExtensions = async (filenames, options = {}) => {
     const { target, ext, syntaxMode, rewritePolicy = 'safe', validateSpecifiers = false, onRewrite = () => { }, onWarn = () => { }, } = options;
     const rewrites = [];
@@ -17,13 +69,55 @@ const rewriteSpecifiersAndExtensions = async (filenames, options = {}) => {
             : filename.replace(/\.js$/, ext);
         if (isDts) {
             const source = await readFile(filename, 'utf8');
-            const rewritten = source.replace(/(?<=["'`])(\.\.?(?:\/[\w.-]+)*)\.js(?=["'`])/g, `$1${ext}`);
-            if (rewritten !== source) {
+            const code = new MagicString(source);
+            let mutated = false;
+            for (const match of source.matchAll(/(?<=['"`])(\.{1,2}(?:\/[\w.-]+)*)\.js(?=['"`])/g)) {
+                if (match.index == null)
+                    continue;
+                const start = match.index;
+                const end = start + match[0].length;
+                code.overwrite(start, end, `${match[1]}${ext}`);
+                mutated = true;
+            }
+            const existingMapPath = `${filename}.map`;
+            const existingMap = await loadMapIfExists(existingMapPath);
+            if (mutated) {
                 rewrites.push({ file: filename, kind: 'dts' });
             }
-            await writeFile(outFilename, rewritten);
+            const outMapPath = `${outFilename}.map`;
+            const mapFile = basename(outMapPath);
+            let output = code.toString();
+            let nextMap = null;
+            /*
+             * If an upstream map exists, carry it forward when we rename the file,
+             * and compose when the content was mutated. If no upstream map exists,
+             * do not emit a new one.
+             */
+            if (existingMap) {
+                if (mutated) {
+                    const rewriteMap = code.generateMap({
+                        hires: true,
+                        includeContent: true,
+                        file: outFilename,
+                        source: filename,
+                    });
+                    nextMap = composeSourceMaps(rewriteMap, existingMap);
+                }
+                else {
+                    nextMap = { ...existingMap };
+                }
+            }
+            if (nextMap) {
+                nextMap.file = basename(outFilename);
+                output = updateSourceMappingUrl(output, mapFile);
+                await writeFile(outMapPath, JSON.stringify(nextMap));
+            }
+            await writeFile(outFilename, output);
             if (outFilename !== filename) {
                 await rm(filename, { force: true });
+                if (existingMap) {
+                    await rm(existingMapPath, { force: true });
+                }
             }
             continue;
         }
@@ -79,11 +173,36 @@ const rewriteSpecifiersAndExtensions = async (filenames, options = {}) => {
             target,
             rewriteSpecifier,
             transformSyntax: syntaxMode,
+            sourceMap: true,
             ...(outFilename === filename ? { inPlace: true } : { out: outFilename }),
         };
-        await transform(filename, writeOptions);
+        const result = await transform(filename, writeOptions);
+        const nextCode = result?.code ?? result;
+        const rewriteMap = result?.map ?? null;
+        const existingMapPath = `${filename}.map`;
+        const existingMap = await loadMapIfExists(existingMapPath);
+        const outMapPath = `${outFilename}.map`;
+        let output = typeof nextCode === 'string' ? nextCode : String(nextCode);
+        let nextMap = null;
+        /*
+         * Compose the rewrite map with the upstream map when present; if the
+         * input had no map, we do not emit a new one.
+         */
+        if (rewriteMap && existingMap) {
+            nextMap = composeSourceMaps(rewriteMap, existingMap);
+        }
+        if (nextMap) {
+            const mapFile = basename(outMapPath);
+            nextMap.file = basename(outFilename);
+            output = updateSourceMappingUrl(output, mapFile);
+            await writeFile(outMapPath, JSON.stringify(nextMap));
+        }
+        await writeFile(outFilename, output);
         if (outFilename !== filename) {
             await rm(filename, { force: true });
+            if (existingMap) {
+                await rm(existingMapPath, { force: true });
+            }
         }
         rewrites.push({ file: filename, kind: 'source' });
         onRewrite(filename, outFilename);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knighted/duel",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0-rc.4",
   "description": "TypeScript dual packages.",
   "type": "module",
   "main": "dist/esm/duel.js",
@@ -87,10 +87,13 @@
     "vite": "^7.2.4"
   },
   "dependencies": {
-    "@knighted/module": "^1.4.0",
+    "@jridgewell/gen-mapping": "^0.3.13",
+    "@jridgewell/trace-mapping": "^0.3.31",
+    "@knighted/module": "^1.5.0-rc.0",
     "find-up": "^8.0.0",
     "get-tsconfig": "^4.13.0",
     "glob": "^13.0.0",
+    "magic-string": "^0.30.21",
     "read-package-up": "^12.0.0"
   },
   "lint-staged": {