@marko/type-check 1.0.6 → 1.1.0

package/dist/cli.js

@@ -45,6 +45,8 @@ var currentDirectory = import_tsserverlibrary.default.sys.getCurrentDirectory();
 var getCanonicalFileName = import_tsserverlibrary.default.sys.useCaseSensitiveFileNames ? (fileName) => fileName : (fileName) => fileName.toLowerCase();
 var fsPathReg = /^(?:[./\\]|[A-Z]:)/i;
 var modulePartsReg = /^((?:@(?:[^/]+)\/)?(?:[^/]+))(.*)$/;
+var isRemapExtensionReg = /\.ts$/;
+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 requiredTSCompilerOptions = {
   allowJs: true,
@@ -87,6 +89,43 @@ function run(opts) {
         getCanonicalFileName,
         options
       );
+      const getJSFileIfTSExists = (source, importer) => compilerHost.fileExists(import_path.default.join(importer, "..", `${source}.ts`)) && `${source}.js`;
+      const customTransformers = {
+        after: [
+          (ctx) => (sourceFile) => {
+            return import_tsserverlibrary.default.visitNode(sourceFile, visit);
+            function visit(node) {
+              if (import_tsserverlibrary.default.isSourceFile(node)) {
+                return import_tsserverlibrary.default.visitEachChild(node, visit, ctx);
+              }
+              if ((import_tsserverlibrary.default.isImportDeclaration(node) || import_tsserverlibrary.default.isExportDeclaration(node)) && node.moduleSpecifier && import_tsserverlibrary.default.isStringLiteral(node.moduleSpecifier)) {
+                const value = node.moduleSpecifier.text;
+                if (value[0] === "." && !skipRemapExtensionsReg.test(value)) {
+                  const { fileName } = sourceFile;
+                  const remap = isRemapExtensionReg.test(value) ? `${value.slice(0, -2)}js` : getJSFileIfTSExists(value, fileName) || getJSFileIfTSExists(`${value}/index`, fileName);
+                  if (remap) {
+                    return import_tsserverlibrary.default.isImportDeclaration(node) ? ctx.factory.updateImportDeclaration(
+                      node,
+                      node.modifiers,
+                      node.importClause,
+                      ctx.factory.createStringLiteral(remap),
+                      node.attributes
+                    ) : ctx.factory.updateExportDeclaration(
+                      node,
+                      node.modifiers,
+                      node.isTypeOnly,
+                      node.exportClause,
+                      ctx.factory.createStringLiteral(remap),
+                      node.attributes
+                    );
+                  }
+                }
+              }
+              return node;
+            }
+          }
+        ]
+      };
       const { readDirectory = import_tsserverlibrary.default.sys.readDirectory } = compilerHost;
       compilerHost.readDirectory = (path3, extensions, exclude, include, depth) => readDirectory(
         path3,
@@ -224,7 +263,7 @@ function run(opts) {
       );
       const program = builderProgram.getProgram();
       const builderEmit = builderProgram.emit.bind(builderProgram);
-      builderProgram.emit = (targetSourceFile, _writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) => {
+      builderProgram.emit = (targetSourceFile, _writeFile, cancellationToken, emitOnlyDtsFiles) => {
         let writeFile = _writeFile;
         if (_writeFile) {
           const typeChecker = program.getTypeChecker();
@@ -354,48 +393,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,11 +1,11 @@
 {
   "name": "@marko/type-check",
   "description": "A CLI to type check Marko projects",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "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.10",
+    "@marko/language-tools": "^2.2.0",
     "arg": "^5.0.2",
     "kleur": "^4.1.5",
     "strip-json-comments": "^3.1.1",