@marko/type-check 1.0.5 → 1.0.7

package/dist/cli.js

@@ -354,48 +354,55 @@ function run(opts) {
   );
 }
 function reportDiagnostic(report, diag) {
-  if (diag.file && diag.start !== void 0) {
-    const extracted = extractCache.get(diag.file);
+  const diagMessage = flattenDiagnosticMessage(
+    diag.messageText,
+    report.display,
+    report.formatSettings.newLineCharacter
+  );
+  if (diag.file) {
     let code = diag.file.text;
-    let loc;
-    if (extracted) {
-      loc = extracted.sourceLocationAt(
-        diag.start,
-        diag.start + (diag.length || 0)
+    let loc = void 0;
+    if (diag.start !== void 0) {
+      const extracted = extractCache.get(diag.file);
+      if (extracted) {
+        loc = extracted.sourceLocationAt(
+          diag.start,
+          diag.start + (diag.length || 0)
+        );
+        code = extracted.parsed.code;
+      } else {
+        const start = import_tsserverlibrary.default.getLineAndCharacterOfPosition(diag.file, diag.start);
+        const end = diag.length ? import_tsserverlibrary.default.getLineAndCharacterOfPosition(
+          diag.file,
+          diag.start + diag.length
+        ) : start;
+        loc = {
+          start,
+          end
+        };
+      }
+    }
+    if (loc) {
+      report.out.push(
+        `${import_kleur.default.cyan(
+          import_path.default.relative(currentDirectory, diag.file.fileName)
+        )}:${import_kleur.default.yellow(loc.start.line + 1)}:${import_kleur.default.yellow(
+          loc.start.character + 1
+        )} - ${coloredDiagnosticCategory(diag.category)} ${import_kleur.default.dim(
+          `TS${diag.code}`
+        )}${report.formatSettings.newLineCharacter}${report.display === Display.codeframe ? report.formatSettings.newLineCharacter + formatCodeFrameMessage(code, loc, diagMessage) : diagMessage}`
       );
-      code = extracted.parsed.code;
-      if (!loc)
-        return;
     } else {
-      const start = import_tsserverlibrary.default.getLineAndCharacterOfPosition(diag.file, diag.start);
-      const end = diag.length ? import_tsserverlibrary.default.getLineAndCharacterOfPosition(diag.file, diag.start + diag.length) : start;
-      loc = {
-        start,
-        end
-      };
+      report.out.push(
+        `${import_kleur.default.cyan(
+          import_path.default.relative(currentDirectory, diag.file.fileName)
+        )} - ${coloredDiagnosticCategory(diag.category)} ${import_kleur.default.dim(
+          `TS${diag.code}`
+        )}${report.formatSettings.newLineCharacter}${diagMessage}`
+      );
     }
-    const diagMessage = flattenDiagnosticMessage(
-      diag.messageText,
-      report.display,
-      report.formatSettings.newLineCharacter
-    );
-    report.out.push(
-      `${import_kleur.default.cyan(
-        import_path.default.relative(currentDirectory, diag.file.fileName)
-      )}:${import_kleur.default.yellow(loc.start.line + 1)}:${import_kleur.default.yellow(
-        loc.start.character + 1
-      )} - ${coloredDiagnosticCategory(diag.category)} ${import_kleur.default.dim(
-        `TS${diag.code}`
-      )}${report.formatSettings.newLineCharacter}${report.display === Display.codeframe ? report.formatSettings.newLineCharacter + formatCodeFrameMessage(code, loc, diagMessage) : diagMessage}`
-    );
   } else {
-    report.out.push(
-      flattenDiagnosticMessage(
-        diag.messageText,
-        report.display,
-        report.formatSettings.newLineCharacter
-      )
-    );
+    report.out.push(diagMessage);
   }
   if (!report.hasErrors && diag.category === import_tsserverlibrary.default.DiagnosticCategory.Error) {
     report.hasErrors = true;

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@marko/type-check",
   "description": "A CLI to type check Marko projects",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "dependencies": {
     "@babel/code-frame": "^7.23.5",
-    "@marko/language-tools": "^2.1.9",
+    "@marko/language-tools": "^2.1.11",
     "arg": "^5.0.2",
     "kleur": "^4.1.5",
     "strip-json-comments": "^3.1.1",
-    "typescript": "^5.3.2"
+    "typescript": "^5.3.3"
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.0.6"