@knighted/module 1.4.0-rc.2 → 1.4.0

package/README.md

@@ -125,6 +125,7 @@ type ModuleOptions = {
     | '.mts'
     | '.cts'
     | ((value: string) => string | null | undefined)
+  rewriteTemplateLiterals?: 'allow' | 'static-only'
   dirFilename?: 'inject' | 'preserve' | 'error'
   importMeta?: 'preserve' | 'shim' | 'error'
   importMetaMain?: 'shim' | 'warn' | 'error'
@@ -151,15 +152,16 @@ type ModuleOptions = {
 - `appendJsExtension` (`relative-only` when targeting ESM): append `.js` to relative specifiers; never touches bare specifiers.
 - `appendDirectoryIndex` (`index.js`): when a relative specifier ends with a slash, append this index filename (set `false` to disable).
 - `appenders` precedence: `rewriteSpecifier` runs first; if it returns a string, that result is used. If it returns `undefined` or `null`, `appendJsExtension` and `appendDirectoryIndex` still run. Bare specifiers are never modified by appenders.
+- `rewriteTemplateLiterals` (`allow`): when `static-only`, interpolated template literals are left untouched by specifier rewriting; string literals and non-interpolated templates still rewrite.
 - `dirFilename` (`inject`): inject `__dirname`/`__filename`, preserve existing, or throw.
 - `importMeta` (`shim`): rewrite `import.meta.*` to CommonJS equivalents.
 - `importMetaMain` (`shim`): gate `import.meta.main` with shimming/warning/error when Node support is too old.
 - `requireMainStrategy` (`import-meta-main`): use `import.meta.main` or the realpath-based `pathToFileURL(realpathSync(process.argv[1])).href` check.
 - `importMetaPrelude` (`auto`): emit a no-op `void import.meta.filename;` touch. `on` always emits; `off` never emits; `auto` emits only when helpers that reference `import.meta.*` are synthesized (e.g., `__dirname`/`__filename` in CJS→ESM, require-main shims, createRequire helpers). Useful for bundlers/transpilers that do usage-based `import.meta` polyfilling.
-- `detectCircularRequires` (`off`): optionally detect relative static require cycles and warn/throw.
+- `detectCircularRequires` (`off`): optionally detect relative static require cycles across `.js`/`.mjs`/`.cjs`/`.ts`/`.mts`/`.cts` (realpath-normalized) and warn/throw.
 - `detectDualPackageHazard` (`warn`): flag when `import` and `require` mix for the same package or root/subpath are combined in ways that can resolve to separate module instances (dual packages). Set to `error` to fail the transform.
 - `dualPackageHazardScope` (`file`): `file` preserves the legacy per-file detector; `project` aggregates package usage across all CLI inputs (useful in monorepos/hoisted installs) and emits one diagnostic per package.
-- `topLevelAwait` (`error`): throw, wrap, or preserve when TLA appears in CommonJS output.
+- `topLevelAwait` (`error`): throw, wrap, or preserve when TLA appears in CommonJS output. `wrap` runs the file body inside an async IIFE (exports may resolve after the initial tick); `preserve` leaves `await` at top level, which Node will reject for CJS.
 - `rewriteSpecifier` (off): rewrite relative specifiers to a chosen extension or via a callback. Precedence: the callback (if provided) runs first; if it returns a string, that wins. If it returns `undefined` or `null`, the appenders still apply.
 - `requireSource` (`builtin`): whether `require` comes from Node or `createRequire`.
 - `cjsDefault` (`auto`): bundler-style default interop vs direct `module.exports`.

package/dist/builtinSpecifiers.d.ts

@@ -0,0 +1,2 @@
+declare const builtinSpecifiers: Set<string>;
+export { builtinSpecifiers };

package/dist/cjs/builtinSpecifiers.d.cts

@@ -0,0 +1,2 @@
+declare const builtinSpecifiers: Set<string>;
+export { builtinSpecifiers };

package/dist/cjs/cli.cjs

@@ -9,19 +9,20 @@ var _nodeProcess = require("node:process");
 var _nodeUtil = require("node:util");
 var _promises = require("node:fs/promises");
 var _nodePath = require("node:path");
-var _nodeModule = require("node:module");
 var _glob = require("glob");
 var _module = require("./module.cjs");
 var _parse = require("./parse.cjs");
 var _format = require("./format.cjs");
 var _specifier = require("./specifier.cjs");
 var _lang = require("./utils/lang.cjs");
+var _builtinSpecifiers = require("./utils/builtinSpecifiers.cjs");
 const defaultOptions = {
   target: 'commonjs',
   sourceType: 'auto',
   transformSyntax: true,
   liveBindings: 'strict',
   rewriteSpecifier: undefined,
+  rewriteTemplateLiterals: 'allow',
   appendJsExtension: undefined,
   appendDirectoryIndex: 'index.js',
   dirFilename: 'inject',
@@ -77,11 +78,6 @@ const colorize = enabled => {
     cyan: wrap(codes.cyan)
   };
 };
-const builtinSpecifiers = new Set(_nodeModule.builtinModules.map(mod => mod.startsWith('node:') ? mod.slice(5) : mod).flatMap(mod => {
-  const parts = mod.split('/');
-  const base = parts[0];
-  return parts.length > 1 ? [mod, base] : [mod];
-}));
 const collapseSpecifier = value => value.replace(/['"`+)\s]|new String\(/g, '');
 const appendExtensionIfNeeded = (value, mode, dirIndex) => {
   if (mode === 'off') return;
@@ -117,7 +113,7 @@ const normalizeBuiltinSpecifier = value => {
   if (/^[a-zA-Z][a-zA-Z+.-]*:/.test(specPart) && !specPart.startsWith('node:')) return;
   const bare = specPart.startsWith('node:') ? specPart.slice(5) : specPart;
   const base = bare.split('/')[0] ?? '';
-  if (!builtinSpecifiers.has(bare) && !builtinSpecifiers.has(base)) return;
+  if (!_builtinSpecifiers.builtinSpecifiers.has(bare) && !_builtinSpecifiers.builtinSpecifiers.has(base)) return;
   if (specPart.startsWith('node:')) return;
   const quote = /^['"`]/.exec(value)?.[0] ?? '';
   return quote ? `${quote}node:${value.slice(quote.length)}` : `node:${value}`;
@@ -137,6 +133,11 @@ const optionsTable = [{
   short: 'r',
   type: 'string',
   desc: 'Rewrite import specifiers (.js/.mjs/.cjs/.ts/.mts/.cts)'
+}, {
+  long: 'rewrite-template-literals',
+  short: undefined,
+  type: 'string',
+  desc: 'Rewrite template literals (allow|static-only)'
 }, {
   long: 'append-js-extension',
   short: 'j',
@@ -283,6 +284,7 @@ const parseAppendDirectoryIndex = value => {
 const toModuleOptions = values => {
   const target = parseEnum(values.target, ['module', 'commonjs']) ?? defaultOptions.target;
   const transformSyntax = parseTransformSyntax(values['transform-syntax']);
+  const rewriteTemplateLiterals = parseEnum(values['rewrite-template-literals'], ['allow', 'static-only']) ?? defaultOptions.rewriteTemplateLiterals;
   const appendJsExtension = parseEnum(values['append-js-extension'], ['off', 'relative-only', 'all']);
   const appendDirectoryIndex = parseAppendDirectoryIndex(values['append-directory-index']);
   const opts = {
@@ -290,6 +292,7 @@ const toModuleOptions = values => {
     target,
     transformSyntax,
     rewriteSpecifier: values['rewrite-specifier'] ?? undefined,
+    rewriteTemplateLiterals,
     appendJsExtension: appendJsExtension,
     appendDirectoryIndex,
     detectCircularRequires: parseEnum(values['detect-circular-requires'], ['off', 'warn', 'error']) ?? defaultOptions.detectCircularRequires,
@@ -347,6 +350,10 @@ const applySpecifierUpdates = async (source, filename, opts, appendMode, dirInde
   if (!opts.rewriteSpecifier && appendMode === 'off' && !dirIndex) return source;
   const lang = (0, _lang.getLangFromExt)(filename);
   const updated = await _specifier.specifier.updateSrc(source, lang, spec => {
+    if (spec.type === 'TemplateLiteral' && opts.rewriteTemplateLiterals === 'static-only') {
+      const node = spec.node;
+      if (node.expressions.length > 0) return;
+    }
     const normalized = normalizeBuiltinSpecifier(spec.value);
     const rewritten = rewriteSpecifierValue(normalized ?? spec.value, opts.rewriteSpecifier);
     const baseValue = rewritten ?? normalized ?? spec.value;

package/dist/cjs/format.cjs

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.format = exports.dualPackageHazardDiagnostics = exports.collectDualPackageUsage = void 0;
-var _nodeModule = require("node:module");
 var _nodePath = require("node:path");
 var _promises = require("node:fs/promises");
 var _magicString = _interopRequireDefault(require("magic-string"));
@@ -24,14 +23,10 @@ var _interopHelpers = require("./pipeline/interopHelpers.cjs");
 var _exports = require("./utils/exports.cjs");
 var _identifiers = require("./utils/identifiers.cjs");
 var _url = require("./utils/url.cjs");
+var _builtinSpecifiers = require("./utils/builtinSpecifiers.cjs");
 var _walk = require("./walk.cjs");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const isRequireMainMember = (node, shadowed) => node.type === 'MemberExpression' && node.object.type === 'Identifier' && node.object.name === 'require' && !shadowed.has('require') && node.property.type === 'Identifier' && node.property.name === 'main';
-const builtinSpecifiers = new Set(_nodeModule.builtinModules.map(mod => mod.startsWith('node:') ? mod.slice(5) : mod).flatMap(mod => {
-  const parts = mod.split('/');
-  const base = parts[0];
-  return parts.length > 1 ? [mod, base] : [mod];
-}));
 const stripQuery = value => value.includes('?') || value.includes('#') ? value.split(/[?#]/)[0] ?? value : value;
 const packageFromSpecifier = spec => {
   const cleaned = stripQuery(spec);
@@ -43,7 +38,7 @@ const packageFromSpecifier = spec => {
   if (cleaned.startsWith('@')) {
     if (parts.length < 2) return null;
     const pkg = `${parts[0]}/${parts[1]}`;
-    if (builtinSpecifiers.has(pkg) || builtinSpecifiers.has(parts[1] ?? '')) return null;
+    if (_builtinSpecifiers.builtinSpecifiers.has(pkg) || _builtinSpecifiers.builtinSpecifiers.has(parts[1] ?? '')) return null;
     const subpath = parts.slice(2).join('/');
     return {
       pkg,
@@ -51,7 +46,7 @@ const packageFromSpecifier = spec => {
     };
   }
   const pkg = parts[0] ?? '';
-  if (!pkg || builtinSpecifiers.has(pkg)) return null;
+  if (!pkg || _builtinSpecifiers.builtinSpecifiers.has(pkg)) return null;
   const subpath = parts.slice(1).join('/');
   return {
     pkg,

package/dist/cjs/module.cjs

@@ -10,15 +10,10 @@ var _specifier = require("./specifier.cjs");
 var _parse = require("./parse.cjs");
 var _format = require("./format.cjs");
 var _lang = require("./utils/lang.cjs");
-var _nodeModule = require("node:module");
 var _walk = require("./walk.cjs");
 var _identifiers = require("./utils/identifiers.cjs");
+var _builtinSpecifiers = require("./utils/builtinSpecifiers.cjs");
 const collapseSpecifier = value => value.replace(/['"`+)\s]|new String\(/g, '');
-const builtinSpecifiers = new Set(_nodeModule.builtinModules.map(mod => mod.startsWith('node:') ? mod.slice(5) : mod).flatMap(mod => {
-  const parts = mod.split('/');
-  const base = parts[0];
-  return parts.length > 1 ? [mod, base] : [mod];
-}));
 const appendExtensionIfNeeded = (spec, mode, dirIndex, value = spec.value) => {
   if (mode === 'off') return;
   if (spec.type === 'TemplateLiteral') {
@@ -63,7 +58,7 @@ const normalizeBuiltinSpecifier = value => {
   if (/^[a-zA-Z][a-zA-Z+.-]*:/.test(specPart) && !specPart.startsWith('node:')) return;
   const bare = specPart.startsWith('node:') ? specPart.slice(5) : specPart;
   const base = bare.split('/')[0] ?? '';
-  if (!builtinSpecifiers.has(bare) && !builtinSpecifiers.has(base)) return;
+  if (!_builtinSpecifiers.builtinSpecifiers.has(bare) && !_builtinSpecifiers.builtinSpecifiers.has(base)) return;
   if (specPart.startsWith('node:')) return;
   const quote = /^['"`]/.exec(value)?.[0] ?? '';
   return quote ? `${quote}node:${value.slice(quote.length)}` : `node:${value}`;
@@ -76,6 +71,7 @@ const fileExists = async candidate => {
     return false;
   }
 };
+const normalizePath = async p => (0, _nodePath.resolve)(await (0, _promises.realpath)(p).catch(() => p));
 const resolveRequirePath = async (fromFile, spec, dirIndex) => {
   if (!spec.startsWith('./') && !spec.startsWith('../')) return null;
   const base = (0, _nodePath.resolve)((0, _nodePath.dirname)(fromFile), spec);
@@ -84,11 +80,11 @@ const resolveRequirePath = async (fromFile, spec, dirIndex) => {
   if (ext) {
     candidates.push(base);
   } else {
-    candidates.push(`${base}.js`, `${base}.cjs`, `${base}.mjs`);
+    candidates.push(`${base}.js`, `${base}.cjs`, `${base}.mjs`, `${base}.ts`, `${base}.mts`, `${base}.cts`);
     candidates.push((0, _nodePath.join)(base, dirIndex));
   }
   for (const candidate of candidates) {
-    if (await fileExists(candidate)) return candidate;
+    if (await fileExists(candidate)) return await normalizePath(candidate);
   }
   return null;
 };
@@ -118,8 +114,9 @@ const detectCircularRequireGraph = async (entryFile, mode, dirIndex) => {
   const visiting = new Set();
   const visited = new Set();
   const dfs = async (file, stack) => {
-    if (visiting.has(file)) {
-      const cycle = [...stack, file];
+    const normalized = await normalizePath(file);
+    if (visiting.has(normalized)) {
+      const cycle = [...stack, normalized];
       const msg = `Circular require detected: ${cycle.join(' -> ')}`;
       if (mode === 'error') {
         throw new Error(msg);
@@ -128,22 +125,22 @@ const detectCircularRequireGraph = async (entryFile, mode, dirIndex) => {
       console.warn(msg);
       return;
     }
-    if (visited.has(file)) return;
-    visiting.add(file);
-    stack.push(file);
-    let deps = cache.get(file);
+    if (visited.has(normalized)) return;
+    visiting.add(normalized);
+    stack.push(normalized);
+    let deps = cache.get(normalized);
     if (!deps) {
-      deps = await collectStaticRequires(file, dirIndex);
-      cache.set(file, deps);
+      deps = await collectStaticRequires(normalized, dirIndex);
+      cache.set(normalized, deps);
     }
     for (const dep of deps) {
       await dfs(dep, stack);
     }
     stack.pop();
-    visiting.delete(file);
-    visited.add(file);
+    visiting.delete(normalized);
+    visited.add(normalized);
   };
-  await dfs(entryFile, []);
+  await dfs(await normalizePath(entryFile), []);
 };
 const mergeUsageMaps = (target, source) => {
   for (const [pkg, usage] of source) {
@@ -186,12 +183,13 @@ const collectProjectDualPackageHazards = async (files, opts) => {
   return byFile;
 };
 exports.collectProjectDualPackageHazards = collectProjectDualPackageHazards;
-const defaultOptions = {
+const createDefaultOptions = () => ({
   target: 'commonjs',
   sourceType: 'auto',
   transformSyntax: true,
   liveBindings: 'strict',
   rewriteSpecifier: undefined,
+  rewriteTemplateLiterals: 'allow',
   appendJsExtension: undefined,
   appendDirectoryIndex: 'index.js',
   dirFilename: 'inject',
@@ -210,12 +208,16 @@ const defaultOptions = {
   cwd: undefined,
   out: undefined,
   inPlace: false
-};
-const transform = async (filename, options = defaultOptions) => {
-  const opts = {
-    ...defaultOptions,
+});
+const transform = async (filename, options) => {
+  const base = createDefaultOptions();
+  const opts = options ? {
+    ...base,
     ...options,
     filePath: filename
+  } : {
+    ...base,
+    filePath: filename
   };
   const cwdBase = opts.cwd ? (0, _nodePath.resolve)(opts.cwd) : process.cwd();
   const appendMode = options?.appendJsExtension ?? (opts.target === 'module' ? 'relative-only' : 'off');
@@ -227,6 +229,10 @@ const transform = async (filename, options = defaultOptions) => {
   let source = await (0, _format.format)(code, ast, opts);
   if (opts.rewriteSpecifier || appendMode !== 'off' || dirIndex) {
     const code = await _specifier.specifier.updateSrc(source, (0, _lang.getLangFromExt)(filename), spec => {
+      if (spec.type === 'TemplateLiteral' && opts.rewriteTemplateLiterals === 'static-only') {
+        const node = spec.node;
+        if (node.expressions.length > 0) return;
+      }
       const normalized = normalizeBuiltinSpecifier(spec.value);
       const rewritten = rewriteSpecifierValue(normalized ?? spec.value, opts.rewriteSpecifier);
       const baseValue = rewritten ?? normalized ?? spec.value;

package/dist/cjs/types.d.cts

@@ -17,6 +17,8 @@ export type ModuleOptions = {
     liveBindings?: 'strict' | 'loose' | 'off';
     /** Rewrite import specifiers (e.g. add extensions). */
     rewriteSpecifier?: RewriteSpecifier;
+    /** Whether to rewrite template literals that contain expressions. Default allows rewrites; set to 'static-only' to skip interpolated templates. */
+    rewriteTemplateLiterals?: 'allow' | 'static-only';
     /** Whether to append .js to relative imports. */
     appendJsExtension?: 'off' | 'relative-only' | 'all';
     /** Add directory index (e.g. /index.js) or disable. */

package/dist/cjs/utils/builtinSpecifiers.cjs

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.builtinSpecifiers = void 0;
+var _nodeModule = require("node:module");
+const builtinSpecifiers = exports.builtinSpecifiers = new Set(_nodeModule.builtinModules.map(mod => mod.startsWith('node:') ? mod.slice(5) : mod).flatMap(mod => {
+  const parts = mod.split('/');
+  const base = parts[0];
+  return parts.length > 1 ? [mod, base] : [mod];
+}));

package/dist/cli.js

@@ -3,19 +3,20 @@ import { stdin as defaultStdin, stdout as defaultStdout, stderr as defaultStderr
 import { parseArgs } from 'node:util';
 import { readFile, mkdir } from 'node:fs/promises';
 import { dirname, resolve, relative, join } from 'node:path';
-import { builtinModules } from 'node:module';
 import { glob } from 'glob';
 import { transform, collectProjectDualPackageHazards } from './module.js';
 import { parse } from './parse.js';
 import { format } from './format.js';
 import { specifier } from './specifier.js';
 import { getLangFromExt } from './utils/lang.js';
+import { builtinSpecifiers } from './utils/builtinSpecifiers.js';
 const defaultOptions = {
   target: 'commonjs',
   sourceType: 'auto',
   transformSyntax: true,
   liveBindings: 'strict',
   rewriteSpecifier: undefined,
+  rewriteTemplateLiterals: 'allow',
   appendJsExtension: undefined,
   appendDirectoryIndex: 'index.js',
   dirFilename: 'inject',
@@ -71,11 +72,6 @@ const colorize = enabled => {
     cyan: wrap(codes.cyan)
   };
 };
-const builtinSpecifiers = new Set(builtinModules.map(mod => mod.startsWith('node:') ? mod.slice(5) : mod).flatMap(mod => {
-  const parts = mod.split('/');
-  const base = parts[0];
-  return parts.length > 1 ? [mod, base] : [mod];
-}));
 const collapseSpecifier = value => value.replace(/['"`+)\s]|new String\(/g, '');
 const appendExtensionIfNeeded = (value, mode, dirIndex) => {
   if (mode === 'off') return;
@@ -131,6 +127,11 @@ const optionsTable = [{
   short: 'r',
   type: 'string',
   desc: 'Rewrite import specifiers (.js/.mjs/.cjs/.ts/.mts/.cts)'
+}, {
+  long: 'rewrite-template-literals',
+  short: undefined,
+  type: 'string',
+  desc: 'Rewrite template literals (allow|static-only)'
 }, {
   long: 'append-js-extension',
   short: 'j',
@@ -277,6 +278,7 @@ const parseAppendDirectoryIndex = value => {
 const toModuleOptions = values => {
   const target = parseEnum(values.target, ['module', 'commonjs']) ?? defaultOptions.target;
   const transformSyntax = parseTransformSyntax(values['transform-syntax']);
+  const rewriteTemplateLiterals = parseEnum(values['rewrite-template-literals'], ['allow', 'static-only']) ?? defaultOptions.rewriteTemplateLiterals;
   const appendJsExtension = parseEnum(values['append-js-extension'], ['off', 'relative-only', 'all']);
   const appendDirectoryIndex = parseAppendDirectoryIndex(values['append-directory-index']);
   const opts = {
@@ -284,6 +286,7 @@ const toModuleOptions = values => {
     target,
     transformSyntax,
     rewriteSpecifier: values['rewrite-specifier'] ?? undefined,
+    rewriteTemplateLiterals,
     appendJsExtension: appendJsExtension,
     appendDirectoryIndex,
     detectCircularRequires: parseEnum(values['detect-circular-requires'], ['off', 'warn', 'error']) ?? defaultOptions.detectCircularRequires,
@@ -341,6 +344,10 @@ const applySpecifierUpdates = async (source, filename, opts, appendMode, dirInde
   if (!opts.rewriteSpecifier && appendMode === 'off' && !dirIndex) return source;
   const lang = getLangFromExt(filename);
   const updated = await specifier.updateSrc(source, lang, spec => {
+    if (spec.type === 'TemplateLiteral' && opts.rewriteTemplateLiterals === 'static-only') {
+      const node = spec.node;
+      if (node.expressions.length > 0) return;
+    }
     const normalized = normalizeBuiltinSpecifier(spec.value);
     const rewritten = rewriteSpecifierValue(normalized ?? spec.value, opts.rewriteSpecifier);
     const baseValue = rewritten ?? normalized ?? spec.value;

package/dist/format.js

@@ -1,4 +1,3 @@
-import { builtinModules } from 'node:module';
 import { dirname, join, resolve as pathResolve } from 'node:path';
 import { readFile as fsReadFile, stat as fsStat } from 'node:fs/promises';
 import MagicString from 'magic-string';
@@ -18,13 +17,9 @@ import { interopHelper } from './pipeline/interopHelpers.js';
 import { collectCjsExports } from './utils/exports.js';
 import { collectModuleIdentifiers } from './utils/identifiers.js';
 import { isValidUrl } from './utils/url.js';
+import { builtinSpecifiers } from './utils/builtinSpecifiers.js';
 import { ancestorWalk } from './walk.js';
 const isRequireMainMember = (node, shadowed) => node.type === 'MemberExpression' && node.object.type === 'Identifier' && node.object.name === 'require' && !shadowed.has('require') && node.property.type === 'Identifier' && node.property.name === 'main';
-const builtinSpecifiers = new Set(builtinModules.map(mod => mod.startsWith('node:') ? mod.slice(5) : mod).flatMap(mod => {
-  const parts = mod.split('/');
-  const base = parts[0];
-  return parts.length > 1 ? [mod, base] : [mod];
-}));
 const stripQuery = value => value.includes('?') || value.includes('#') ? value.split(/[?#]/)[0] ?? value : value;
 const packageFromSpecifier = spec => {
   const cleaned = stripQuery(spec);

package/dist/module.js

@@ -4,18 +4,13 @@ import { specifier } from './specifier.js';
 import { parse } from './parse.js';
 import { format, collectDualPackageUsage, dualPackageHazardDiagnostics } from './format.js';
 import { getLangFromExt } from './utils/lang.js';
-import { builtinModules } from 'node:module';
 import { resolve as pathResolve, dirname as pathDirname, extname, join } from 'node:path';
-import { readFile as fsReadFile, stat } from 'node:fs/promises';
+import { readFile as fsReadFile, stat, realpath } from 'node:fs/promises';
 import { parse as parseModule } from './parse.js';
 import { walk } from './walk.js';
 import { collectModuleIdentifiers } from './utils/identifiers.js';
+import { builtinSpecifiers } from './utils/builtinSpecifiers.js';
 const collapseSpecifier = value => value.replace(/['"`+)\s]|new String\(/g, '');
-const builtinSpecifiers = new Set(builtinModules.map(mod => mod.startsWith('node:') ? mod.slice(5) : mod).flatMap(mod => {
-  const parts = mod.split('/');
-  const base = parts[0];
-  return parts.length > 1 ? [mod, base] : [mod];
-}));
 const appendExtensionIfNeeded = (spec, mode, dirIndex, value = spec.value) => {
   if (mode === 'off') return;
   if (spec.type === 'TemplateLiteral') {
@@ -73,6 +68,7 @@ const fileExists = async candidate => {
     return false;
   }
 };
+const normalizePath = async p => pathResolve(await realpath(p).catch(() => p));
 const resolveRequirePath = async (fromFile, spec, dirIndex) => {
   if (!spec.startsWith('./') && !spec.startsWith('../')) return null;
   const base = pathResolve(pathDirname(fromFile), spec);
@@ -81,11 +77,11 @@ const resolveRequirePath = async (fromFile, spec, dirIndex) => {
   if (ext) {
     candidates.push(base);
   } else {
-    candidates.push(`${base}.js`, `${base}.cjs`, `${base}.mjs`);
+    candidates.push(`${base}.js`, `${base}.cjs`, `${base}.mjs`, `${base}.ts`, `${base}.mts`, `${base}.cts`);
     candidates.push(join(base, dirIndex));
   }
   for (const candidate of candidates) {
-    if (await fileExists(candidate)) return candidate;
+    if (await fileExists(candidate)) return await normalizePath(candidate);
   }
   return null;
 };
@@ -115,8 +111,9 @@ const detectCircularRequireGraph = async (entryFile, mode, dirIndex) => {
   const visiting = new Set();
   const visited = new Set();
   const dfs = async (file, stack) => {
-    if (visiting.has(file)) {
-      const cycle = [...stack, file];
+    const normalized = await normalizePath(file);
+    if (visiting.has(normalized)) {
+      const cycle = [...stack, normalized];
       const msg = `Circular require detected: ${cycle.join(' -> ')}`;
       if (mode === 'error') {
         throw new Error(msg);
@@ -125,22 +122,22 @@ const detectCircularRequireGraph = async (entryFile, mode, dirIndex) => {
       console.warn(msg);
       return;
     }
-    if (visited.has(file)) return;
-    visiting.add(file);
-    stack.push(file);
-    let deps = cache.get(file);
+    if (visited.has(normalized)) return;
+    visiting.add(normalized);
+    stack.push(normalized);
+    let deps = cache.get(normalized);
     if (!deps) {
-      deps = await collectStaticRequires(file, dirIndex);
-      cache.set(file, deps);
+      deps = await collectStaticRequires(normalized, dirIndex);
+      cache.set(normalized, deps);
     }
     for (const dep of deps) {
       await dfs(dep, stack);
     }
     stack.pop();
-    visiting.delete(file);
-    visited.add(file);
+    visiting.delete(normalized);
+    visited.add(normalized);
   };
-  await dfs(entryFile, []);
+  await dfs(await normalizePath(entryFile), []);
 };
 const mergeUsageMaps = (target, source) => {
   for (const [pkg, usage] of source) {
@@ -182,12 +179,13 @@ const collectProjectDualPackageHazards = async (files, opts) => {
   }
   return byFile;
 };
-const defaultOptions = {
+const createDefaultOptions = () => ({
   target: 'commonjs',
   sourceType: 'auto',
   transformSyntax: true,
   liveBindings: 'strict',
   rewriteSpecifier: undefined,
+  rewriteTemplateLiterals: 'allow',
   appendJsExtension: undefined,
   appendDirectoryIndex: 'index.js',
   dirFilename: 'inject',
@@ -206,12 +204,16 @@ const defaultOptions = {
   cwd: undefined,
   out: undefined,
   inPlace: false
-};
-const transform = async (filename, options = defaultOptions) => {
-  const opts = {
-    ...defaultOptions,
+});
+const transform = async (filename, options) => {
+  const base = createDefaultOptions();
+  const opts = options ? {
+    ...base,
     ...options,
     filePath: filename
+  } : {
+    ...base,
+    filePath: filename
   };
   const cwdBase = opts.cwd ? resolve(opts.cwd) : process.cwd();
   const appendMode = options?.appendJsExtension ?? (opts.target === 'module' ? 'relative-only' : 'off');
@@ -223,6 +225,10 @@ const transform = async (filename, options = defaultOptions) => {
   let source = await format(code, ast, opts);
   if (opts.rewriteSpecifier || appendMode !== 'off' || dirIndex) {
     const code = await specifier.updateSrc(source, getLangFromExt(filename), spec => {
+      if (spec.type === 'TemplateLiteral' && opts.rewriteTemplateLiterals === 'static-only') {
+        const node = spec.node;
+        if (node.expressions.length > 0) return;
+      }
       const normalized = normalizeBuiltinSpecifier(spec.value);
       const rewritten = rewriteSpecifierValue(normalized ?? spec.value, opts.rewriteSpecifier);
       const baseValue = rewritten ?? normalized ?? spec.value;

package/dist/types.d.ts

@@ -17,6 +17,8 @@ export type ModuleOptions = {
     liveBindings?: 'strict' | 'loose' | 'off';
     /** Rewrite import specifiers (e.g. add extensions). */
     rewriteSpecifier?: RewriteSpecifier;
+    /** Whether to rewrite template literals that contain expressions. Default allows rewrites; set to 'static-only' to skip interpolated templates. */
+    rewriteTemplateLiterals?: 'allow' | 'static-only';
     /** Whether to append .js to relative imports. */
     appendJsExtension?: 'off' | 'relative-only' | 'all';
     /** Add directory index (e.g. /index.js) or disable. */

package/dist/utils/builtinSpecifiers.d.ts

@@ -0,0 +1,2 @@
+declare const builtinSpecifiers: Set<string>;
+export { builtinSpecifiers };

package/dist/utils/builtinSpecifiers.js

@@ -0,0 +1,7 @@
+import { builtinModules } from 'node:module';
+const builtinSpecifiers = new Set(builtinModules.map(mod => mod.startsWith('node:') ? mod.slice(5) : mod).flatMap(mod => {
+  const parts = mod.split('/');
+  const base = parts[0];
+  return parts.length > 1 ? [mod, base] : [mod];
+}));
+export { builtinSpecifiers };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knighted/module",
-  "version": "1.4.0-rc.2",
+  "version": "1.4.0",
   "description": "Bidirectional transform for ES modules and CommonJS.",
   "type": "module",
   "main": "dist/module.js",