@danielx/civet 0.6.37 → 0.6.39

package/dist/vite.js

@@ -37,6 +37,7 @@ module.exports = __toCommonJS(vite_exports);
 // src/index.ts
 var import_unplugin = require("unplugin");
 var import_civet = __toESM(require("@danielx/civet"));
+var import_ts_diagnostic = require("@danielx/civet/ts-diagnostic");
 var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_typescript = __toESM(require("typescript"));
@@ -52,15 +53,19 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
   if (options.dts && options.js) {
     throw new Error("Can't have both `dts` and `js` be set to `true`.");
   }
-  const transpileToJS = options.js ?? !options.dts;
+  if (options.typecheck && options.js) {
+    throw new Error("Can't have both `typecheck` and `js` be set to `true`.");
+  }
+  const transpileToJS = options.js ?? !(options.dts || options.typecheck);
   const outExt = options.outputExtension ?? (transpileToJS ? ".jsx" : ".tsx");
   let fsMap = /* @__PURE__ */ new Map();
+  const sourceMaps = /* @__PURE__ */ new Map();
   let compilerOptions;
   return {
     name: "unplugin-civet",
     enforce: "pre",
     async buildStart() {
-      if (options.dts) {
+      if (options.dts || options.typecheck) {
         const configPath = import_typescript.default.findConfigFile(process.cwd(), import_typescript.default.sys.fileExists);
         if (!configPath) {
           throw new Error("Could not find 'tsconfig.json'");
@@ -86,7 +91,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
       }
     },
     buildEnd() {
-      if (options.dts) {
+      if (options.dts || options.typecheck) {
         const system = tsvfs.createFSBackedSystem(fsMap, process.cwd(), import_typescript.default);
         const host = tsvfs.createVirtualCompilerHost(
           system,
@@ -98,20 +103,55 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
           options: compilerOptions,
           host: host.compilerHost
         });
-        for (const file of fsMap.keys()) {
-          const sourceFile = program.getSourceFile(file);
-          program.emit(
-            sourceFile,
-            (filePath, content) => {
-              this.emitFile({
-                source: content,
-                fileName: import_path.default.relative(process.cwd(), filePath),
-                type: "asset"
-              });
+        const diagnostics = import_typescript.default.getPreEmitDiagnostics(program).map((diagnostic) => {
+          const file = diagnostic.file;
+          if (!file)
+            return diagnostic;
+          const sourceMap = sourceMaps.get(file.fileName);
+          if (!sourceMap)
+            return diagnostic;
+          const sourcemapLines = sourceMap.data.lines;
+          const range = (0, import_ts_diagnostic.remapRange)(
+            {
+              start: diagnostic.start || 0,
+              end: (diagnostic.start || 0) + (diagnostic.length || 1)
             },
-            void 0,
-            true
+            sourcemapLines
           );
+          return {
+            ...diagnostic,
+            messageText: (0, import_ts_diagnostic.flattenDiagnosticMessageText)(diagnostic.messageText),
+            length: diagnostic.length,
+            start: range.start
+          };
+        });
+        if (diagnostics.length > 0) {
+          console.error(
+            import_typescript.default.formatDiagnosticsWithColorAndContext(diagnostics, formatHost)
+          );
+        }
+        if (options.dts) {
+          for (const file of fsMap.keys()) {
+            const sourceFile = program.getSourceFile(file);
+            program.emit(
+              sourceFile,
+              async (filePath, content) => {
+                const dir = import_path.default.dirname(filePath);
+                await fs.promises.mkdir(dir, { recursive: true });
+                const pathFromDistDir = import_path.default.relative(
+                  compilerOptions.outDir ?? process.cwd(),
+                  filePath
+                );
+                this.emitFile({
+                  source: content,
+                  fileName: pathFromDistDir,
+                  type: "asset"
+                });
+              },
+              void 0,
+              true
+            );
+          }
         }
       }
     },
@@ -135,13 +175,20 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
         return null;
       const filename = import_path.default.resolve(process.cwd(), id.slice(0, -outExt.length));
       const code = await fs.promises.readFile(filename, "utf-8");
+      const compiled = import_civet.default.compile(code, {
+        // inlineMap: true,
+        filename: id,
+        js: transpileToJS,
+        sourceMap: true
+      });
+      sourceMaps.set(import_path.default.resolve(process.cwd(), id), compiled.sourceMap);
+      const jsonSourceMap = compiled.sourceMap.json(
+        import_path.default.basename(id.replace(/\.[jt]sx$/, "")),
+        import_path.default.basename(id)
+      );
       let transformed = {
-        code: import_civet.default.compile(code, {
-          inlineMap: true,
-          filename: id,
-          js: transpileToJS
-        }),
-        map: null
+        code: compiled.code,
+        map: jsonSourceMap
       };
       if (options.transformOutput)
         transformed = await options.transformOutput(transformed.code, id);
@@ -150,8 +197,12 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
     transform(code, id) {
       if (!/\.civet\.tsx?$/.test(id))
         return null;
-      if (options.dts) {
-        fsMap.set(import_path.default.resolve(process.cwd(), id), code);
+      if (options.dts || options.typecheck) {
+        const resolved = import_path.default.resolve(process.cwd(), id);
+        fsMap.set(resolved, code);
+        const slash = resolved.replace(/\\/g, "/");
+        if (resolved !== slash)
+          fsMap.set(slash, code);
       }
       return null;
     },

package/dist/webpack.js

@@ -37,6 +37,7 @@ module.exports = __toCommonJS(webpack_exports);
 // src/index.ts
 var import_unplugin = require("unplugin");
 var import_civet = __toESM(require("@danielx/civet"));
+var import_ts_diagnostic = require("@danielx/civet/ts-diagnostic");
 var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_typescript = __toESM(require("typescript"));
@@ -52,15 +53,19 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
   if (options.dts && options.js) {
     throw new Error("Can't have both `dts` and `js` be set to `true`.");
   }
-  const transpileToJS = options.js ?? !options.dts;
+  if (options.typecheck && options.js) {
+    throw new Error("Can't have both `typecheck` and `js` be set to `true`.");
+  }
+  const transpileToJS = options.js ?? !(options.dts || options.typecheck);
   const outExt = options.outputExtension ?? (transpileToJS ? ".jsx" : ".tsx");
   let fsMap = /* @__PURE__ */ new Map();
+  const sourceMaps = /* @__PURE__ */ new Map();
   let compilerOptions;
   return {
     name: "unplugin-civet",
     enforce: "pre",
     async buildStart() {
-      if (options.dts) {
+      if (options.dts || options.typecheck) {
         const configPath = import_typescript.default.findConfigFile(process.cwd(), import_typescript.default.sys.fileExists);
         if (!configPath) {
           throw new Error("Could not find 'tsconfig.json'");
@@ -86,7 +91,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
       }
     },
     buildEnd() {
-      if (options.dts) {
+      if (options.dts || options.typecheck) {
         const system = tsvfs.createFSBackedSystem(fsMap, process.cwd(), import_typescript.default);
         const host = tsvfs.createVirtualCompilerHost(
           system,
@@ -98,20 +103,55 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
           options: compilerOptions,
           host: host.compilerHost
         });
-        for (const file of fsMap.keys()) {
-          const sourceFile = program.getSourceFile(file);
-          program.emit(
-            sourceFile,
-            (filePath, content) => {
-              this.emitFile({
-                source: content,
-                fileName: import_path.default.relative(process.cwd(), filePath),
-                type: "asset"
-              });
+        const diagnostics = import_typescript.default.getPreEmitDiagnostics(program).map((diagnostic) => {
+          const file = diagnostic.file;
+          if (!file)
+            return diagnostic;
+          const sourceMap = sourceMaps.get(file.fileName);
+          if (!sourceMap)
+            return diagnostic;
+          const sourcemapLines = sourceMap.data.lines;
+          const range = (0, import_ts_diagnostic.remapRange)(
+            {
+              start: diagnostic.start || 0,
+              end: (diagnostic.start || 0) + (diagnostic.length || 1)
             },
-            void 0,
-            true
+            sourcemapLines
           );
+          return {
+            ...diagnostic,
+            messageText: (0, import_ts_diagnostic.flattenDiagnosticMessageText)(diagnostic.messageText),
+            length: diagnostic.length,
+            start: range.start
+          };
+        });
+        if (diagnostics.length > 0) {
+          console.error(
+            import_typescript.default.formatDiagnosticsWithColorAndContext(diagnostics, formatHost)
+          );
+        }
+        if (options.dts) {
+          for (const file of fsMap.keys()) {
+            const sourceFile = program.getSourceFile(file);
+            program.emit(
+              sourceFile,
+              async (filePath, content) => {
+                const dir = import_path.default.dirname(filePath);
+                await fs.promises.mkdir(dir, { recursive: true });
+                const pathFromDistDir = import_path.default.relative(
+                  compilerOptions.outDir ?? process.cwd(),
+                  filePath
+                );
+                this.emitFile({
+                  source: content,
+                  fileName: pathFromDistDir,
+                  type: "asset"
+                });
+              },
+              void 0,
+              true
+            );
+          }
         }
       }
     },
@@ -135,13 +175,20 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
         return null;
       const filename = import_path.default.resolve(process.cwd(), id.slice(0, -outExt.length));
       const code = await fs.promises.readFile(filename, "utf-8");
+      const compiled = import_civet.default.compile(code, {
+        // inlineMap: true,
+        filename: id,
+        js: transpileToJS,
+        sourceMap: true
+      });
+      sourceMaps.set(import_path.default.resolve(process.cwd(), id), compiled.sourceMap);
+      const jsonSourceMap = compiled.sourceMap.json(
+        import_path.default.basename(id.replace(/\.[jt]sx$/, "")),
+        import_path.default.basename(id)
+      );
       let transformed = {
-        code: import_civet.default.compile(code, {
-          inlineMap: true,
-          filename: id,
-          js: transpileToJS
-        }),
-        map: null
+        code: compiled.code,
+        map: jsonSourceMap
       };
       if (options.transformOutput)
         transformed = await options.transformOutput(transformed.code, id);
@@ -150,8 +197,12 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
     transform(code, id) {
       if (!/\.civet\.tsx?$/.test(id))
         return null;
-      if (options.dts) {
-        fsMap.set(import_path.default.resolve(process.cwd(), id), code);
+      if (options.dts || options.typecheck) {
+        const resolved = import_path.default.resolve(process.cwd(), id);
+        fsMap.set(resolved, code);
+        const slash = resolved.replace(/\\/g, "/");
+        if (resolved !== slash)
+          fsMap.set(slash, code);
       }
       return null;
     },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.6.37",
+  "version": "0.6.39",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -36,6 +36,10 @@
       "require": "./dist/esbuild.js",
       "import": "./dist/esbuild.mjs"
     },
+    "./ts-diagnostic": {
+      "require": "./dist/ts-diagnostic.js",
+      "import": "./dist/ts-diagnostic.mjs"
+    },
     "./*": "./*",
     "./dist/*": "./dist/*"
   },
@@ -66,7 +70,7 @@
     "unplugin": "^1.4.0"
   },
   "devDependencies": {
-    "@danielx/civet": "0.6.34",
+    "@danielx/civet": "0.6.38",
     "@danielx/hera": "^0.8.10",
     "@types/assert": "^1.5.6",
     "@types/mocha": "^9.1.1",
@@ -84,6 +88,8 @@
     "typescript": "^5.2.2",
     "vite": "^4.4.9",
     "vitepress": "^1.0.0-alpha.35",
+    "vscode-languageserver": "^8.1.0",
+    "vscode-languageserver-textdocument": "^1.0.8",
     "vue": "^3.2.45"
   },
   "peerDependencies": {