@marko/type-check 2.0.2 → 2.1.1

package/dist/cli.js

@@ -49,7 +49,7 @@ var modulePartsReg = /^((?:@(?:[^/]+)\/)?(?:[^/]+))(.*)$/;
 var isRemapExtensionReg = /\.ts$/;
 var isSourceMapExtensionReg = /\.map$/;
 var skipRemapExtensionsReg = /\.(?:[cm]?jsx?|json|marko|css|less|sass|scss|styl|stylus|pcss|postcss|sss|a?png|jpe?g|jfif|pipeg|pjp|gif|svg|ico|web[pm]|avif|mp4|ogg|mp3|wav|flac|aac|opus|woff2?|eot|[ot]tf|webmanifest|pdf|txt)$/;
-var extractCache = /* @__PURE__ */ new WeakMap();
+var extractCache = /* @__PURE__ */ new Map();
 var requiredTSCompilerOptions = {
   allowJs: true,
   composite: true,
@@ -60,12 +60,47 @@ var requiredTSCompilerOptions = {
   allowNonTsExtensions: true
 };
 function run(opts) {
+  var _a, _b;
   const {
     display = Display.codeframe,
     project: configFile = findRootConfigFile("tsconfig.json") || findRootConfigFile("jsconfig.json")
   } = opts;
-  if (!configFile)
+  if (!configFile) {
     throw new Error("Could not find tsconfig.json or jsconfig.json");
+  }
+  if (opts.generateTrace) {
+    (_b = (_a = import_tsserverlibrary.default).startTracing) == null ? void 0 : _b.call(
+      _a,
+      "build",
+      import_path.default.resolve(opts.generateTrace),
+      configFile
+    );
+    const tracing = import_tsserverlibrary.default.tracing;
+    if (!tracing) {
+      throw new Error("generateTrace not available in TypeScript compiler.");
+    }
+    const { push } = tracing;
+    tracing.push = (phase, name, args2, separateBeginAndEnd) => {
+      if (args2 && typeof args2 === "object" && "pos" in args2 && typeof args2.pos === "number" && "end" in args2 && typeof args2.end === "number") {
+        const fileName = "path" in args2 ? args2.path : "fileName" in args2 ? args2.fileName : void 0;
+        if (typeof fileName === "string") {
+          const extracted = extractCache.get(getCanonicalFileName(fileName));
+          if (extracted) {
+            const sourceRange = extracted.sourceRangeAt(args2.pos, args2.end);
+            if (sourceRange) {
+              args2.pos = sourceRange.start;
+              args2.end = sourceRange.end;
+            } else {
+              args2.pos = args2.end = void 0;
+            }
+            args2.generatedPos = args2.pos;
+            args2.generatedEnd = args2.end;
+          }
+        }
+      }
+      return push.call(tracing, phase, name, args2, separateBeginAndEnd);
+    };
+  }
   const formatSettings = import_tsserverlibrary.default.getDefaultFormatCodeSettings(
     import_tsserverlibrary.default.sys.newLine
   );
@@ -255,7 +290,7 @@ function run(opts) {
               processor.getScriptKind(fileName)
             );
             sourceFile.version = import_crypto.default.createHash("md5").update(extractedCode).digest("hex");
-            extractCache.set(sourceFile, extracted);
+            extractCache.set(getCanonicalFileName(fileName), extracted);
             return sourceFile;
           }
           return getSourceFile(
@@ -317,7 +352,7 @@ function run(opts) {
                 outFileName = fileName.slice(0, -inExt.length) + (isDts ? ".d" : "") + processorExt;
               }
               const extracted = extractCache.get(
-                program.getSourceFile(sourceFile.fileName)
+                getCanonicalFileName(sourceFile.fileName)
               );
               const printContext = {
                 extracted,
@@ -368,7 +403,7 @@ function run(opts) {
     return ext ? processors[ext] : void 0;
   };
   solutionHost.getParsedCommandLine = (fileName) => {
-    var _a, _b;
+    var _a2, _b2;
     const parsedCommandLine = import_tsserverlibrary.default.getParsedCommandLineOfConfigFile(
       fileName,
       requiredTSCompilerOptions,
@@ -385,7 +420,7 @@ function run(opts) {
     if (!parsedCommandLine) return;
     const finalRootNames = new Set(parsedCommandLine.fileNames);
     for (const name in processors) {
-      const rootNames = (_b = (_a = processors[name]).getRootNames) == null ? void 0 : _b.call(_a);
+      const rootNames = (_b2 = (_a2 = processors[name]).getRootNames) == null ? void 0 : _b2.call(_a2);
       if (rootNames) {
         for (const rootName of rootNames) {
           finalRootNames.add(rootName);
@@ -413,7 +448,9 @@ function reportDiagnostic(report, diag) {
     let code = diag.file.text;
     let loc = void 0;
     if (diag.start !== void 0) {
-      const extracted = extractCache.get(diag.file);
+      const extracted = extractCache.get(
+        getCanonicalFileName(diag.file.fileName)
+      );
       if (extracted) {
         loc = extracted.sourceLocationAt(
           diag.start,
@@ -515,6 +552,7 @@ var args = (0, import_arg.default)(
   {
     "--project": String,
     "--display": String,
+    "--generateTrace": String,
     "--help": Boolean,
     "--version": Boolean,
     "-p": "--project",
@@ -575,6 +613,7 @@ For more information, visit ${import_kleur2.default.blue(
   );
 } else {
   const {
+    "--generateTrace": generateTrace,
     "--display": display = process.env.CI ? Display.condensed : Display.codeframe
   } = args;
   let { "--project": project } = args;
@@ -585,7 +624,7 @@ For more information, visit ${import_kleur2.default.blue(
     }
   }
   checkDisplay(display);
-  run({ project, display });
+  run({ generateTrace, project, display });
 }
 function checkDisplay(display) {
   if (display && Display[display] === void 0) {

package/dist/run.d.ts

@@ -7,5 +7,6 @@ export interface Options {
     project?: string;
     display?: Display;
     emit?: boolean;
+    generateTrace?: string;
 }
 export default function run(opts: Options): void;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@marko/type-check",
   "description": "A CLI to type check Marko projects",
-  "version": "2.0.2",
+  "version": "2.1.1",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "dependencies": {
     "@babel/code-frame": "^7.27.1",
     "@luxass/strip-json-comments": "^1.4.0",
-    "@marko/language-tools": "^2.5.27",
+    "@marko/language-tools": "^2.5.28",
     "arg": "^5.0.2",
     "kleur": "^4.1.5",
     "typescript": "^5.8.3"