@danielx/civet 0.6.62 → 0.6.64

package/dist/browser.js

@@ -2563,19 +2563,7 @@ ${input.slice(result.pos)}
             const { initializer } = binding;
             if (initializer) {
               const exp = initializer[2];
-              if (exp?.type === "PipelineExpression") {
-                if (exp.children.at(-2) === ",") {
-                  const { parent } = exp;
-                  const parenthesizedExpression = makeLeftHandSideExpression(exp);
-                  parenthesizedExpression.parent = parent;
-                  exp.parent = parenthesizedExpression;
-                  return initializer[2] = parenthesizedExpression;
-                }
-                ;
-                return;
-              }
-              ;
-              return;
+              return exp;
             }
             ;
             return;
@@ -3316,6 +3304,14 @@ ${input.slice(result.pos)}
             };
           }
           children.push(arg);
+          if (!children.some(($3) => $3?.type === "ReturnStatement") && children.some(($4) => $4 === ",")) {
+            const { parent } = s;
+            const parenthesizedExpression = makeLeftHandSideExpression({ ...s });
+            Object.assign(s, parenthesizedExpression, {
+              parent,
+              hoistDec: void 0
+            });
+          }
           return addParentPointers(s, s.parent);
         });
       }

package/dist/esbuild.js

@@ -90,7 +90,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
   const implicitExtension = options.implicitExtension ?? true;
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
-  let compilerOptions;
+  let compilerOptions, compilerOptionsWithSourceMap;
   let rootDir = process.cwd();
   let esbuildOptions;
   const tsPromise = transformTS || options.ts === "tsc" ? import("typescript").then((m) => m.default) : null;
@@ -128,6 +128,10 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           ...configContents.options,
           target: ts.ScriptTarget.ESNext
         };
+        compilerOptionsWithSourceMap = {
+          ...compilerOptions,
+          sourceMap: true
+        };
         fsMap = /* @__PURE__ */ new Map();
       }
     },
@@ -174,6 +178,29 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
               getFormatHost(ts.sys)
             )
           );
+          if (options.typecheck) {
+            let failures = [];
+            if (typeof options.typecheck === "string") {
+              if (options.typecheck.includes("error"))
+                failures.push(1 /* Error */);
+              if (options.typecheck.includes("warning"))
+                failures.push(0 /* Warning */);
+              if (options.typecheck.includes("suggestion"))
+                failures.push(2 /* Suggestion */);
+              if (options.typecheck.includes("message"))
+                failures.push(3 /* Message */);
+              if (options.typecheck.includes("all")) {
+                failures = { includes: () => true };
+              }
+            } else {
+              failures.push(1 /* Error */);
+            }
+            const count = diagnostics.filter((d) => failures.includes(d.category)).length;
+            if (count) {
+              const reason = count === diagnostics.length ? count : `${count} out of ${diagnostics.length}`;
+              throw new Error(`Aborting build because of ${reason} TypeScript diagnostic${diagnostics.length > 1 ? "s" : ""} above`);
+            }
+          }
         }
         if (options.emitDeclaration) {
           if (meta.framework === "esbuild" && !esbuildOptions.outdir) {
@@ -235,7 +262,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
       const filename = import_path.default.resolve(process.cwd(), id.slice(0, -outExt.length));
       const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
       this.addWatchFile(filename);
-      let compiled = void 0;
+      let compiled;
       if (options.ts === "civet" && !transformTS) {
         compiled = import_civet.default.compile(rawCivetSource, {
           filename: id,
@@ -248,15 +275,16 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           js: false,
           sourceMap: true
         });
-        const resolved = import_path.default.resolve(process.cwd(), id);
+        const resolved = filename + outExt;
         sourceMaps.set(
           resolved,
           compiledTS.sourceMap
         );
         if (transformTS) {
-          fsMap.set(resolved, compiledTS.code);
-          const slashed = slash(resolved);
-          if (resolved !== slashed)
+          const tsx = filename + ".tsx";
+          fsMap.set(tsx, compiledTS.code);
+          const slashed = slash(tsx);
+          if (tsx !== slashed)
             fsMap.set(slashed, compiledTS.code);
         }
         switch (options.ts) {
@@ -273,10 +301,13 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           }
           case "tsc": {
             const tsTranspile = (await tsPromise).transpileModule;
-            const result = tsTranspile(compiledTS.code, { compilerOptions });
+            const result = tsTranspile(
+              compiledTS.code,
+              { compilerOptions: compilerOptionsWithSourceMap }
+            );
             compiled = {
               code: result.outputText,
-              sourceMap: result.sourceMapText ?? ""
+              sourceMap: result.sourceMapText
             };
             break;
           }
@@ -300,10 +331,10 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           }
         }
       }
-      const jsonSourceMap = typeof compiled.sourceMap == "string" ? JSON.parse(compiled.sourceMap) : compiled.sourceMap.json(
+      const jsonSourceMap = compiled.sourceMap && (typeof compiled.sourceMap === "string" ? JSON.parse(compiled.sourceMap) : compiled.sourceMap.json(
         import_path.default.basename(id.replace(/\.[jt]sx$/, "")),
         import_path.default.basename(id)
-      );
+      ));
       let transformed = {
         code: compiled.code,
         map: jsonSourceMap

package/dist/main.js

@@ -2555,19 +2555,7 @@ var require_lib = __commonJS({
           const { initializer } = binding;
           if (initializer) {
             const exp = initializer[2];
-            if (exp?.type === "PipelineExpression") {
-              if (exp.children.at(-2) === ",") {
-                const { parent } = exp;
-                const parenthesizedExpression = makeLeftHandSideExpression(exp);
-                parenthesizedExpression.parent = parent;
-                exp.parent = parenthesizedExpression;
-                return initializer[2] = parenthesizedExpression;
-              }
-              ;
-              return;
-            }
-            ;
-            return;
+            return exp;
           }
           ;
           return;
@@ -3308,6 +3296,14 @@ var require_lib = __commonJS({
           };
         }
         children.push(arg);
+        if (!children.some(($3) => $3?.type === "ReturnStatement") && children.some(($4) => $4 === ",")) {
+          const { parent } = s;
+          const parenthesizedExpression = makeLeftHandSideExpression({ ...s });
+          Object.assign(s, parenthesizedExpression, {
+            parent,
+            hoistDec: void 0
+          });
+        }
         return addParentPointers(s, s.parent);
       });
     }

package/dist/main.mjs

@@ -2553,19 +2553,7 @@ var require_lib = __commonJS({
           const { initializer } = binding;
           if (initializer) {
             const exp = initializer[2];
-            if (exp?.type === "PipelineExpression") {
-              if (exp.children.at(-2) === ",") {
-                const { parent } = exp;
-                const parenthesizedExpression = makeLeftHandSideExpression(exp);
-                parenthesizedExpression.parent = parent;
-                exp.parent = parenthesizedExpression;
-                return initializer[2] = parenthesizedExpression;
-              }
-              ;
-              return;
-            }
-            ;
-            return;
+            return exp;
           }
           ;
           return;
@@ -3306,6 +3294,14 @@ var require_lib = __commonJS({
           };
         }
         children.push(arg);
+        if (!children.some(($3) => $3?.type === "ReturnStatement") && children.some(($4) => $4 === ",")) {
+          const { parent } = s;
+          const parenthesizedExpression = makeLeftHandSideExpression({ ...s });
+          Object.assign(s, parenthesizedExpression, {
+            parent,
+            hoistDec: void 0
+          });
+        }
         return addParentPointers(s, s.parent);
       });
     }

package/dist/rollup.js

@@ -90,7 +90,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
   const implicitExtension = options.implicitExtension ?? true;
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
-  let compilerOptions;
+  let compilerOptions, compilerOptionsWithSourceMap;
   let rootDir = process.cwd();
   let esbuildOptions;
   const tsPromise = transformTS || options.ts === "tsc" ? import("typescript").then((m) => m.default) : null;
@@ -128,6 +128,10 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           ...configContents.options,
           target: ts.ScriptTarget.ESNext
         };
+        compilerOptionsWithSourceMap = {
+          ...compilerOptions,
+          sourceMap: true
+        };
         fsMap = /* @__PURE__ */ new Map();
       }
     },
@@ -174,6 +178,29 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
               getFormatHost(ts.sys)
             )
           );
+          if (options.typecheck) {
+            let failures = [];
+            if (typeof options.typecheck === "string") {
+              if (options.typecheck.includes("error"))
+                failures.push(1 /* Error */);
+              if (options.typecheck.includes("warning"))
+                failures.push(0 /* Warning */);
+              if (options.typecheck.includes("suggestion"))
+                failures.push(2 /* Suggestion */);
+              if (options.typecheck.includes("message"))
+                failures.push(3 /* Message */);
+              if (options.typecheck.includes("all")) {
+                failures = { includes: () => true };
+              }
+            } else {
+              failures.push(1 /* Error */);
+            }
+            const count = diagnostics.filter((d) => failures.includes(d.category)).length;
+            if (count) {
+              const reason = count === diagnostics.length ? count : `${count} out of ${diagnostics.length}`;
+              throw new Error(`Aborting build because of ${reason} TypeScript diagnostic${diagnostics.length > 1 ? "s" : ""} above`);
+            }
+          }
         }
         if (options.emitDeclaration) {
           if (meta.framework === "esbuild" && !esbuildOptions.outdir) {
@@ -235,7 +262,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
       const filename = import_path.default.resolve(process.cwd(), id.slice(0, -outExt.length));
       const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
       this.addWatchFile(filename);
-      let compiled = void 0;
+      let compiled;
       if (options.ts === "civet" && !transformTS) {
         compiled = import_civet.default.compile(rawCivetSource, {
           filename: id,
@@ -248,15 +275,16 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           js: false,
           sourceMap: true
         });
-        const resolved = import_path.default.resolve(process.cwd(), id);
+        const resolved = filename + outExt;
         sourceMaps.set(
           resolved,
           compiledTS.sourceMap
         );
         if (transformTS) {
-          fsMap.set(resolved, compiledTS.code);
-          const slashed = slash(resolved);
-          if (resolved !== slashed)
+          const tsx = filename + ".tsx";
+          fsMap.set(tsx, compiledTS.code);
+          const slashed = slash(tsx);
+          if (tsx !== slashed)
             fsMap.set(slashed, compiledTS.code);
         }
         switch (options.ts) {
@@ -273,10 +301,13 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           }
           case "tsc": {
             const tsTranspile = (await tsPromise).transpileModule;
-            const result = tsTranspile(compiledTS.code, { compilerOptions });
+            const result = tsTranspile(
+              compiledTS.code,
+              { compilerOptions: compilerOptionsWithSourceMap }
+            );
             compiled = {
               code: result.outputText,
-              sourceMap: result.sourceMapText ?? ""
+              sourceMap: result.sourceMapText
             };
             break;
           }
@@ -300,10 +331,10 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           }
         }
       }
-      const jsonSourceMap = typeof compiled.sourceMap == "string" ? JSON.parse(compiled.sourceMap) : compiled.sourceMap.json(
+      const jsonSourceMap = compiled.sourceMap && (typeof compiled.sourceMap === "string" ? JSON.parse(compiled.sourceMap) : compiled.sourceMap.json(
         import_path.default.basename(id.replace(/\.[jt]sx$/, "")),
         import_path.default.basename(id)
-      );
+      ));
       let transformed = {
         code: compiled.code,
         map: jsonSourceMap

package/dist/unplugin-shared.mjs

@@ -57,7 +57,7 @@ var civetUnplugin = createUnplugin((options = {}, meta) => {
   const implicitExtension = options.implicitExtension ?? true;
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
-  let compilerOptions;
+  let compilerOptions, compilerOptionsWithSourceMap;
   let rootDir = process.cwd();
   let esbuildOptions;
   const tsPromise = transformTS || options.ts === "tsc" ? import("typescript").then((m) => m.default) : null;
@@ -95,6 +95,10 @@ var civetUnplugin = createUnplugin((options = {}, meta) => {
           ...configContents.options,
           target: ts.ScriptTarget.ESNext
         };
+        compilerOptionsWithSourceMap = {
+          ...compilerOptions,
+          sourceMap: true
+        };
         fsMap = /* @__PURE__ */ new Map();
       }
     },
@@ -141,6 +145,29 @@ var civetUnplugin = createUnplugin((options = {}, meta) => {
               getFormatHost(ts.sys)
             )
           );
+          if (options.typecheck) {
+            let failures = [];
+            if (typeof options.typecheck === "string") {
+              if (options.typecheck.includes("error"))
+                failures.push(1 /* Error */);
+              if (options.typecheck.includes("warning"))
+                failures.push(0 /* Warning */);
+              if (options.typecheck.includes("suggestion"))
+                failures.push(2 /* Suggestion */);
+              if (options.typecheck.includes("message"))
+                failures.push(3 /* Message */);
+              if (options.typecheck.includes("all")) {
+                failures = { includes: () => true };
+              }
+            } else {
+              failures.push(1 /* Error */);
+            }
+            const count = diagnostics.filter((d) => failures.includes(d.category)).length;
+            if (count) {
+              const reason = count === diagnostics.length ? count : `${count} out of ${diagnostics.length}`;
+              throw new Error(`Aborting build because of ${reason} TypeScript diagnostic${diagnostics.length > 1 ? "s" : ""} above`);
+            }
+          }
         }
         if (options.emitDeclaration) {
           if (meta.framework === "esbuild" && !esbuildOptions.outdir) {
@@ -202,7 +229,7 @@ var civetUnplugin = createUnplugin((options = {}, meta) => {
       const filename = path.resolve(process.cwd(), id.slice(0, -outExt.length));
       const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
       this.addWatchFile(filename);
-      let compiled = void 0;
+      let compiled;
       if (options.ts === "civet" && !transformTS) {
         compiled = civet.compile(rawCivetSource, {
           filename: id,
@@ -215,15 +242,16 @@ var civetUnplugin = createUnplugin((options = {}, meta) => {
           js: false,
           sourceMap: true
         });
-        const resolved = path.resolve(process.cwd(), id);
+        const resolved = filename + outExt;
         sourceMaps.set(
           resolved,
           compiledTS.sourceMap
         );
         if (transformTS) {
-          fsMap.set(resolved, compiledTS.code);
-          const slashed = slash(resolved);
-          if (resolved !== slashed)
+          const tsx = filename + ".tsx";
+          fsMap.set(tsx, compiledTS.code);
+          const slashed = slash(tsx);
+          if (tsx !== slashed)
             fsMap.set(slashed, compiledTS.code);
         }
         switch (options.ts) {
@@ -240,10 +268,13 @@ var civetUnplugin = createUnplugin((options = {}, meta) => {
           }
           case "tsc": {
             const tsTranspile = (await tsPromise).transpileModule;
-            const result = tsTranspile(compiledTS.code, { compilerOptions });
+            const result = tsTranspile(
+              compiledTS.code,
+              { compilerOptions: compilerOptionsWithSourceMap }
+            );
             compiled = {
               code: result.outputText,
-              sourceMap: result.sourceMapText ?? ""
+              sourceMap: result.sourceMapText
             };
             break;
           }
@@ -267,10 +298,10 @@ var civetUnplugin = createUnplugin((options = {}, meta) => {
           }
         }
       }
-      const jsonSourceMap = typeof compiled.sourceMap == "string" ? JSON.parse(compiled.sourceMap) : compiled.sourceMap.json(
+      const jsonSourceMap = compiled.sourceMap && (typeof compiled.sourceMap === "string" ? JSON.parse(compiled.sourceMap) : compiled.sourceMap.json(
         path.basename(id.replace(/\.[jt]sx$/, "")),
         path.basename(id)
-      );
+      ));
       let transformed = {
         code: compiled.code,
         map: jsonSourceMap

package/dist/unplugin.d.mts

@@ -6,7 +6,7 @@ type PluginOptions = {
     outputExtension?: string;
     transformOutput?: (code: string, id: string) => TransformResult | Promise<TransformResult>;
     emitDeclaration?: boolean;
-    typecheck?: boolean;
+    typecheck?: boolean | string;
     ts?: 'civet' | 'esbuild' | 'tsc' | 'preserve';
     /** @deprecated Use "ts" option instead */
     js?: boolean;

package/dist/unplugin.d.ts

@@ -6,7 +6,7 @@ type PluginOptions = {
     outputExtension?: string;
     transformOutput?: (code: string, id: string) => TransformResult | Promise<TransformResult>;
     emitDeclaration?: boolean;
-    typecheck?: boolean;
+    typecheck?: boolean | string;
     ts?: 'civet' | 'esbuild' | 'tsc' | 'preserve';
     /** @deprecated Use "ts" option instead */
     js?: boolean;

package/dist/unplugin.js

@@ -89,7 +89,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
   const implicitExtension = options.implicitExtension ?? true;
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
-  let compilerOptions;
+  let compilerOptions, compilerOptionsWithSourceMap;
   let rootDir = process.cwd();
   let esbuildOptions;
   const tsPromise = transformTS || options.ts === "tsc" ? import("typescript").then((m) => m.default) : null;
@@ -127,6 +127,10 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           ...configContents.options,
           target: ts.ScriptTarget.ESNext
         };
+        compilerOptionsWithSourceMap = {
+          ...compilerOptions,
+          sourceMap: true
+        };
         fsMap = /* @__PURE__ */ new Map();
       }
     },
@@ -173,6 +177,29 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
               getFormatHost(ts.sys)
             )
           );
+          if (options.typecheck) {
+            let failures = [];
+            if (typeof options.typecheck === "string") {
+              if (options.typecheck.includes("error"))
+                failures.push(1 /* Error */);
+              if (options.typecheck.includes("warning"))
+                failures.push(0 /* Warning */);
+              if (options.typecheck.includes("suggestion"))
+                failures.push(2 /* Suggestion */);
+              if (options.typecheck.includes("message"))
+                failures.push(3 /* Message */);
+              if (options.typecheck.includes("all")) {
+                failures = { includes: () => true };
+              }
+            } else {
+              failures.push(1 /* Error */);
+            }
+            const count = diagnostics.filter((d) => failures.includes(d.category)).length;
+            if (count) {
+              const reason = count === diagnostics.length ? count : `${count} out of ${diagnostics.length}`;
+              throw new Error(`Aborting build because of ${reason} TypeScript diagnostic${diagnostics.length > 1 ? "s" : ""} above`);
+            }
+          }
         }
         if (options.emitDeclaration) {
           if (meta.framework === "esbuild" && !esbuildOptions.outdir) {
@@ -234,7 +261,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
       const filename = import_path.default.resolve(process.cwd(), id.slice(0, -outExt.length));
       const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
       this.addWatchFile(filename);
-      let compiled = void 0;
+      let compiled;
       if (options.ts === "civet" && !transformTS) {
         compiled = import_civet.default.compile(rawCivetSource, {
           filename: id,
@@ -247,15 +274,16 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           js: false,
           sourceMap: true
         });
-        const resolved = import_path.default.resolve(process.cwd(), id);
+        const resolved = filename + outExt;
         sourceMaps.set(
           resolved,
           compiledTS.sourceMap
         );
         if (transformTS) {
-          fsMap.set(resolved, compiledTS.code);
-          const slashed = slash(resolved);
-          if (resolved !== slashed)
+          const tsx = filename + ".tsx";
+          fsMap.set(tsx, compiledTS.code);
+          const slashed = slash(tsx);
+          if (tsx !== slashed)
             fsMap.set(slashed, compiledTS.code);
         }
         switch (options.ts) {
@@ -272,10 +300,13 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           }
           case "tsc": {
             const tsTranspile = (await tsPromise).transpileModule;
-            const result = tsTranspile(compiledTS.code, { compilerOptions });
+            const result = tsTranspile(
+              compiledTS.code,
+              { compilerOptions: compilerOptionsWithSourceMap }
+            );
             compiled = {
               code: result.outputText,
-              sourceMap: result.sourceMapText ?? ""
+              sourceMap: result.sourceMapText
             };
             break;
           }
@@ -299,10 +330,10 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           }
         }
       }
-      const jsonSourceMap = typeof compiled.sourceMap == "string" ? JSON.parse(compiled.sourceMap) : compiled.sourceMap.json(
+      const jsonSourceMap = compiled.sourceMap && (typeof compiled.sourceMap === "string" ? JSON.parse(compiled.sourceMap) : compiled.sourceMap.json(
         import_path.default.basename(id.replace(/\.[jt]sx$/, "")),
         import_path.default.basename(id)
-      );
+      ));
       let transformed = {
         code: compiled.code,
         map: jsonSourceMap

package/dist/vite.js

@@ -90,7 +90,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
   const implicitExtension = options.implicitExtension ?? true;
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
-  let compilerOptions;
+  let compilerOptions, compilerOptionsWithSourceMap;
   let rootDir = process.cwd();
   let esbuildOptions;
   const tsPromise = transformTS || options.ts === "tsc" ? import("typescript").then((m) => m.default) : null;
@@ -128,6 +128,10 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           ...configContents.options,
           target: ts.ScriptTarget.ESNext
         };
+        compilerOptionsWithSourceMap = {
+          ...compilerOptions,
+          sourceMap: true
+        };
         fsMap = /* @__PURE__ */ new Map();
       }
     },
@@ -174,6 +178,29 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
               getFormatHost(ts.sys)
             )
           );
+          if (options.typecheck) {
+            let failures = [];
+            if (typeof options.typecheck === "string") {
+              if (options.typecheck.includes("error"))
+                failures.push(1 /* Error */);
+              if (options.typecheck.includes("warning"))
+                failures.push(0 /* Warning */);
+              if (options.typecheck.includes("suggestion"))
+                failures.push(2 /* Suggestion */);
+              if (options.typecheck.includes("message"))
+                failures.push(3 /* Message */);
+              if (options.typecheck.includes("all")) {
+                failures = { includes: () => true };
+              }
+            } else {
+              failures.push(1 /* Error */);
+            }
+            const count = diagnostics.filter((d) => failures.includes(d.category)).length;
+            if (count) {
+              const reason = count === diagnostics.length ? count : `${count} out of ${diagnostics.length}`;
+              throw new Error(`Aborting build because of ${reason} TypeScript diagnostic${diagnostics.length > 1 ? "s" : ""} above`);
+            }
+          }
         }
         if (options.emitDeclaration) {
           if (meta.framework === "esbuild" && !esbuildOptions.outdir) {
@@ -235,7 +262,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
       const filename = import_path.default.resolve(process.cwd(), id.slice(0, -outExt.length));
       const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
       this.addWatchFile(filename);
-      let compiled = void 0;
+      let compiled;
       if (options.ts === "civet" && !transformTS) {
         compiled = import_civet.default.compile(rawCivetSource, {
           filename: id,
@@ -248,15 +275,16 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           js: false,
           sourceMap: true
         });
-        const resolved = import_path.default.resolve(process.cwd(), id);
+        const resolved = filename + outExt;
         sourceMaps.set(
           resolved,
           compiledTS.sourceMap
         );
         if (transformTS) {
-          fsMap.set(resolved, compiledTS.code);
-          const slashed = slash(resolved);
-          if (resolved !== slashed)
+          const tsx = filename + ".tsx";
+          fsMap.set(tsx, compiledTS.code);
+          const slashed = slash(tsx);
+          if (tsx !== slashed)
             fsMap.set(slashed, compiledTS.code);
         }
         switch (options.ts) {
@@ -273,10 +301,13 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           }
           case "tsc": {
             const tsTranspile = (await tsPromise).transpileModule;
-            const result = tsTranspile(compiledTS.code, { compilerOptions });
+            const result = tsTranspile(
+              compiledTS.code,
+              { compilerOptions: compilerOptionsWithSourceMap }
+            );
             compiled = {
               code: result.outputText,
-              sourceMap: result.sourceMapText ?? ""
+              sourceMap: result.sourceMapText
             };
             break;
           }
@@ -300,10 +331,10 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           }
         }
       }
-      const jsonSourceMap = typeof compiled.sourceMap == "string" ? JSON.parse(compiled.sourceMap) : compiled.sourceMap.json(
+      const jsonSourceMap = compiled.sourceMap && (typeof compiled.sourceMap === "string" ? JSON.parse(compiled.sourceMap) : compiled.sourceMap.json(
         import_path.default.basename(id.replace(/\.[jt]sx$/, "")),
         import_path.default.basename(id)
-      );
+      ));
       let transformed = {
         code: compiled.code,
         map: jsonSourceMap

package/dist/webpack.js

@@ -90,7 +90,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
   const implicitExtension = options.implicitExtension ?? true;
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
-  let compilerOptions;
+  let compilerOptions, compilerOptionsWithSourceMap;
   let rootDir = process.cwd();
   let esbuildOptions;
   const tsPromise = transformTS || options.ts === "tsc" ? import("typescript").then((m) => m.default) : null;
@@ -128,6 +128,10 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           ...configContents.options,
           target: ts.ScriptTarget.ESNext
         };
+        compilerOptionsWithSourceMap = {
+          ...compilerOptions,
+          sourceMap: true
+        };
         fsMap = /* @__PURE__ */ new Map();
       }
     },
@@ -174,6 +178,29 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
               getFormatHost(ts.sys)
             )
           );
+          if (options.typecheck) {
+            let failures = [];
+            if (typeof options.typecheck === "string") {
+              if (options.typecheck.includes("error"))
+                failures.push(1 /* Error */);
+              if (options.typecheck.includes("warning"))
+                failures.push(0 /* Warning */);
+              if (options.typecheck.includes("suggestion"))
+                failures.push(2 /* Suggestion */);
+              if (options.typecheck.includes("message"))
+                failures.push(3 /* Message */);
+              if (options.typecheck.includes("all")) {
+                failures = { includes: () => true };
+              }
+            } else {
+              failures.push(1 /* Error */);
+            }
+            const count = diagnostics.filter((d) => failures.includes(d.category)).length;
+            if (count) {
+              const reason = count === diagnostics.length ? count : `${count} out of ${diagnostics.length}`;
+              throw new Error(`Aborting build because of ${reason} TypeScript diagnostic${diagnostics.length > 1 ? "s" : ""} above`);
+            }
+          }
         }
         if (options.emitDeclaration) {
           if (meta.framework === "esbuild" && !esbuildOptions.outdir) {
@@ -235,7 +262,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
       const filename = import_path.default.resolve(process.cwd(), id.slice(0, -outExt.length));
       const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
       this.addWatchFile(filename);
-      let compiled = void 0;
+      let compiled;
       if (options.ts === "civet" && !transformTS) {
         compiled = import_civet.default.compile(rawCivetSource, {
           filename: id,
@@ -248,15 +275,16 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           js: false,
           sourceMap: true
         });
-        const resolved = import_path.default.resolve(process.cwd(), id);
+        const resolved = filename + outExt;
         sourceMaps.set(
           resolved,
           compiledTS.sourceMap
         );
         if (transformTS) {
-          fsMap.set(resolved, compiledTS.code);
-          const slashed = slash(resolved);
-          if (resolved !== slashed)
+          const tsx = filename + ".tsx";
+          fsMap.set(tsx, compiledTS.code);
+          const slashed = slash(tsx);
+          if (tsx !== slashed)
             fsMap.set(slashed, compiledTS.code);
         }
         switch (options.ts) {
@@ -273,10 +301,13 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           }
           case "tsc": {
             const tsTranspile = (await tsPromise).transpileModule;
-            const result = tsTranspile(compiledTS.code, { compilerOptions });
+            const result = tsTranspile(
+              compiledTS.code,
+              { compilerOptions: compilerOptionsWithSourceMap }
+            );
             compiled = {
               code: result.outputText,
-              sourceMap: result.sourceMapText ?? ""
+              sourceMap: result.sourceMapText
             };
             break;
           }
@@ -300,10 +331,10 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           }
         }
       }
-      const jsonSourceMap = typeof compiled.sourceMap == "string" ? JSON.parse(compiled.sourceMap) : compiled.sourceMap.json(
+      const jsonSourceMap = compiled.sourceMap && (typeof compiled.sourceMap === "string" ? JSON.parse(compiled.sourceMap) : compiled.sourceMap.json(
         import_path.default.basename(id.replace(/\.[jt]sx$/, "")),
         import_path.default.basename(id)
-      );
+      ));
       let transformed = {
         code: compiled.code,
         map: jsonSourceMap

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.6.62",
+  "version": "0.6.64",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",