@danielx/civet 0.6.37 → 0.6.38

package/dist/rollup.js

@@ -37,6 +37,7 @@ module.exports = __toCommonJS(rollup_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/ts-diagnostic.js

@@ -0,0 +1,149 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var ts_diagnostic_exports = {};
+__export(ts_diagnostic_exports, {
+  convertDiagnostic: () => convertDiagnostic,
+  flattenDiagnosticMessageText: () => flattenDiagnosticMessageText,
+  rangeFromTextSpan: () => rangeFromTextSpan,
+  remapPosition: () => remapPosition,
+  remapRange: () => remapRange
+});
+module.exports = __toCommonJS(ts_diagnostic_exports);
+var import_typescript = __toESM(require("typescript"));
+var import_vscode_languageserver = __toESM(require("vscode-languageserver"));
+var import_vscode_languageserver_textdocument = require("vscode-languageserver-textdocument");
+const { DiagnosticCategory } = import_typescript.default;
+function remapPosition(position, sourcemapLines) {
+  if (!sourcemapLines)
+    return position;
+  const { line, character } = position;
+  const textLine = sourcemapLines[line];
+  if (!textLine?.length)
+    return position;
+  let i = 0, p = 0, l = textLine.length, lastMapping, lastMappingPosition = 0;
+  while (i < l) {
+    const mapping = textLine[i];
+    p += mapping[0];
+    if (mapping.length === 4) {
+      lastMapping = mapping;
+      lastMappingPosition = p;
+    }
+    if (p >= character) {
+      break;
+    }
+    i++;
+  }
+  if (lastMapping) {
+    const srcLine = lastMapping[2];
+    const srcChar = lastMapping[3];
+    const newChar = srcChar + character - lastMappingPosition;
+    return {
+      line: srcLine,
+      character: newChar
+    };
+  } else {
+    return position;
+  }
+}
+function remapRange(range, sourcemapLines) {
+  return {
+    start: remapPosition(range.start, sourcemapLines),
+    end: remapPosition(range.end, sourcemapLines)
+  };
+}
+function flattenDiagnosticMessageText(diag, indent = 0) {
+  if (typeof diag === "string") {
+    return diag;
+  } else if (diag === void 0) {
+    return "";
+  }
+  let result = "";
+  if (indent) {
+    result += "\n";
+    for (let i = 0; i < indent; i++) {
+      result += "  ";
+    }
+  }
+  result += diag.messageText;
+  indent++;
+  if (diag.next) {
+    for (const kid of diag.next) {
+      result += flattenDiagnosticMessageText(kid, indent);
+    }
+  }
+  return result;
+}
+function rangeFromTextSpan(span, document) {
+  return {
+    start: document.positionAt(span.start),
+    end: document.positionAt(span.start + span.length)
+  };
+}
+function convertDiagnostic(diagnostic, document, sourcemapLines) {
+  return {
+    message: flattenDiagnosticMessageText(diagnostic.messageText),
+    range: remapRange(
+      rangeFromTextSpan(
+        {
+          start: diagnostic.start || 0,
+          length: diagnostic.length ?? 1
+        },
+        document
+      ),
+      sourcemapLines
+    ),
+    severity: diagnosticCategoryToSeverity(diagnostic.category),
+    code: diagnostic.code,
+    source: diagnostic.source || "typescript"
+  };
+}
+function diagnosticCategoryToSeverity(category) {
+  switch (category) {
+    case DiagnosticCategory.Warning: {
+      return import_vscode_languageserver.DiagnosticSeverity.Warning;
+    }
+    case DiagnosticCategory.Error: {
+      return import_vscode_languageserver.DiagnosticSeverity.Error;
+    }
+    case DiagnosticCategory.Suggestion: {
+      return import_vscode_languageserver.DiagnosticSeverity.Hint;
+    }
+    case DiagnosticCategory.Message: {
+      return import_vscode_languageserver.DiagnosticSeverity.Information;
+    }
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  convertDiagnostic,
+  flattenDiagnosticMessageText,
+  rangeFromTextSpan,
+  remapPosition,
+  remapRange
+});

package/dist/ts-diagnostic.mjs

@@ -0,0 +1,111 @@
+import ts from "typescript";
+import vs, { DiagnosticSeverity, Position, Range } from "vscode-languageserver";
+import { TextDocument } from "vscode-languageserver-textdocument";
+const { DiagnosticCategory } = ts;
+function remapPosition(position, sourcemapLines) {
+  if (!sourcemapLines)
+    return position;
+  const { line, character } = position;
+  const textLine = sourcemapLines[line];
+  if (!textLine?.length)
+    return position;
+  let i = 0, p = 0, l = textLine.length, lastMapping, lastMappingPosition = 0;
+  while (i < l) {
+    const mapping = textLine[i];
+    p += mapping[0];
+    if (mapping.length === 4) {
+      lastMapping = mapping;
+      lastMappingPosition = p;
+    }
+    if (p >= character) {
+      break;
+    }
+    i++;
+  }
+  if (lastMapping) {
+    const srcLine = lastMapping[2];
+    const srcChar = lastMapping[3];
+    const newChar = srcChar + character - lastMappingPosition;
+    return {
+      line: srcLine,
+      character: newChar
+    };
+  } else {
+    return position;
+  }
+}
+function remapRange(range, sourcemapLines) {
+  return {
+    start: remapPosition(range.start, sourcemapLines),
+    end: remapPosition(range.end, sourcemapLines)
+  };
+}
+function flattenDiagnosticMessageText(diag, indent = 0) {
+  if (typeof diag === "string") {
+    return diag;
+  } else if (diag === void 0) {
+    return "";
+  }
+  let result = "";
+  if (indent) {
+    result += "\n";
+    for (let i = 0; i < indent; i++) {
+      result += "  ";
+    }
+  }
+  result += diag.messageText;
+  indent++;
+  if (diag.next) {
+    for (const kid of diag.next) {
+      result += flattenDiagnosticMessageText(kid, indent);
+    }
+  }
+  return result;
+}
+function rangeFromTextSpan(span, document) {
+  return {
+    start: document.positionAt(span.start),
+    end: document.positionAt(span.start + span.length)
+  };
+}
+function convertDiagnostic(diagnostic, document, sourcemapLines) {
+  return {
+    message: flattenDiagnosticMessageText(diagnostic.messageText),
+    range: remapRange(
+      rangeFromTextSpan(
+        {
+          start: diagnostic.start || 0,
+          length: diagnostic.length ?? 1
+        },
+        document
+      ),
+      sourcemapLines
+    ),
+    severity: diagnosticCategoryToSeverity(diagnostic.category),
+    code: diagnostic.code,
+    source: diagnostic.source || "typescript"
+  };
+}
+function diagnosticCategoryToSeverity(category) {
+  switch (category) {
+    case DiagnosticCategory.Warning: {
+      return DiagnosticSeverity.Warning;
+    }
+    case DiagnosticCategory.Error: {
+      return DiagnosticSeverity.Error;
+    }
+    case DiagnosticCategory.Suggestion: {
+      return DiagnosticSeverity.Hint;
+    }
+    case DiagnosticCategory.Message: {
+      return DiagnosticSeverity.Information;
+    }
+  }
+}
+export {
+  convertDiagnostic,
+  flattenDiagnosticMessageText,
+  rangeFromTextSpan,
+  remapPosition,
+  remapRange
+};

package/dist/unplugin-shared.mjs

@@ -1,6 +1,12 @@
 // src/index.ts
-import { createUnplugin } from "unplugin";
+import {
+  createUnplugin
+} from "unplugin";
 import civet from "@danielx/civet";
+import {
+  remapRange,
+  flattenDiagnosticMessageText
+} from "@danielx/civet/ts-diagnostic";
 import * as fs from "fs";
 import path from "path";
 import ts from "typescript";
@@ -16,15 +22,19 @@ var civetUnplugin = 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 = ts.findConfigFile(process.cwd(), ts.sys.fileExists);
         if (!configPath) {
           throw new Error("Could not find 'tsconfig.json'");
@@ -50,7 +60,7 @@ var civetUnplugin = createUnplugin((options = {}) => {
       }
     },
     buildEnd() {
-      if (options.dts) {
+      if (options.dts || options.typecheck) {
         const system = tsvfs.createFSBackedSystem(fsMap, process.cwd(), ts);
         const host = tsvfs.createVirtualCompilerHost(
           system,
@@ -62,20 +72,55 @@ var civetUnplugin = 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: path.relative(process.cwd(), filePath),
-                type: "asset"
-              });
+        const diagnostics = ts.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 = remapRange(
+            {
+              start: diagnostic.start || 0,
+              end: (diagnostic.start || 0) + (diagnostic.length || 1)
             },
-            void 0,
-            true
+            sourcemapLines
           );
+          return {
+            ...diagnostic,
+            messageText: flattenDiagnosticMessageText(diagnostic.messageText),
+            length: diagnostic.length,
+            start: range.start
+          };
+        });
+        if (diagnostics.length > 0) {
+          console.error(
+            ts.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 = path.dirname(filePath);
+                await fs.promises.mkdir(dir, { recursive: true });
+                const pathFromDistDir = path.relative(
+                  compilerOptions.outDir ?? process.cwd(),
+                  filePath
+                );
+                this.emitFile({
+                  source: content,
+                  fileName: pathFromDistDir,
+                  type: "asset"
+                });
+              },
+              void 0,
+              true
+            );
+          }
         }
       }
     },
@@ -99,13 +144,20 @@ var civetUnplugin = createUnplugin((options = {}) => {
         return null;
       const filename = path.resolve(process.cwd(), id.slice(0, -outExt.length));
       const code = await fs.promises.readFile(filename, "utf-8");
+      const compiled = civet.compile(code, {
+        // inlineMap: true,
+        filename: id,
+        js: transpileToJS,
+        sourceMap: true
+      });
+      sourceMaps.set(path.resolve(process.cwd(), id), compiled.sourceMap);
+      const jsonSourceMap = compiled.sourceMap.json(
+        path.basename(id.replace(/\.[jt]sx$/, "")),
+        path.basename(id)
+      );
       let transformed = {
-        code: civet.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);
@@ -114,8 +166,12 @@ var civetUnplugin = createUnplugin((options = {}) => {
     transform(code, id) {
       if (!/\.civet\.tsx?$/.test(id))
         return null;
-      if (options.dts) {
-        fsMap.set(path.resolve(process.cwd(), id), code);
+      if (options.dts || options.typecheck) {
+        const resolved = path.resolve(process.cwd(), id);
+        fsMap.set(resolved, code);
+        const slash = resolved.replace(/\\/g, "/");
+        if (resolved !== slash)
+          fsMap.set(slash, code);
       }
       return null;
     },

package/dist/unplugin.d.mts

@@ -6,9 +6,11 @@ type PluginOptions = {
     transformOutput?: (code: string, id: string) => TransformResult | Promise<TransformResult>;
 } & ({
     dts?: false;
+    typecheck?: false;
     js?: false | true;
 } | {
     dts?: true;
+    typecheck?: true;
     js?: false;
 });
 declare const civetUnplugin: unplugin.UnpluginInstance<PluginOptions, boolean>;

package/dist/unplugin.d.ts

@@ -6,9 +6,11 @@ type PluginOptions = {
     transformOutput?: (code: string, id: string) => TransformResult | Promise<TransformResult>;
 } & ({
     dts?: false;
+    typecheck?: false;
     js?: false | true;
 } | {
     dts?: true;
+    typecheck?: true;
     js?: false;
 });
 declare const civetUnplugin: unplugin.UnpluginInstance<PluginOptions, boolean>;