@danielx/civet 0.7.15 → 0.7.17

package/dist/{unplugin-shared.mjs → unplugin/unplugin.mjs}

@@ -1,6 +1,6 @@
-// src/index.ts
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
 import { createUnplugin } from "unplugin";
-import civet from "@danielx/civet";
+import civet, { SourceMap } from "@danielx/civet";
 import { findInDir, loadConfig } from "@danielx/civet/config";
 import {
   remapRange,
@@ -11,10 +11,15 @@ import path from "path";
 import * as tsvfs from "@typescript/vfs";
 import os from "os";
 
-// src/constants.ts
+// source/unplugin/constants.mjs
 var DEFAULT_EXTENSIONS = [".mjs", ".js", ".mts", ".ts", ".jsx", ".tsx", ".json"];
 
-// src/index.ts
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
+var DiagnosticCategory = {};
+DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
+DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
+DiagnosticCategory[DiagnosticCategory["Suggestion"] = 2] = "Suggestion";
+DiagnosticCategory[DiagnosticCategory["Message"] = 3] = "Message";
 var isCivetTranspiled = /(\.civet)(\.[jt]sx)([?#].*)?$/;
 var postfixRE = /[?#].*$/s;
 var isWindows = os.platform() === "win32";
@@ -69,7 +74,7 @@ var rawPlugin = (options = {}, meta) => {
   let esbuildOptions;
   let configErrors;
   let configFileNames;
-  const tsPromise = transformTS || options.ts === "tsc" ? import("typescript").then((m) => m.default) : null;
+  const tsPromise = transformTS || options.ts === "tsc" ? import("typescript").then(($) => $.default) : null;
   const getFormatHost = (sys) => {
     return {
       getCurrentDirectory: () => sys.getCurrentDirectory(),
@@ -83,16 +88,17 @@ var rawPlugin = (options = {}, meta) => {
     enforce: "pre",
     async buildStart() {
       if (transformTS || options.ts === "tsc") {
-        let mogrify2 = function(key) {
+        let mogrify = function(key) {
           if (key in config && Array.isArray(config[key])) {
-            config[key] = config[key].map((item) => {
+            return config[key] = config[key].map((item) => {
               if (typeof item !== "string")
                 return item;
               return item.replace(/\.civet\b(?!\.)/g, ".civet.tsx");
             });
           }
+          ;
+          return;
         };
-        var mogrify = mogrify2;
         const ts = await tsPromise;
         const civetConfigPath = "config" in options ? options.config : await findInDir(process.cwd());
         if (civetConfigPath) {
@@ -114,12 +120,12 @@ var rawPlugin = (options = {}, meta) => {
           console.error(ts.formatDiagnostic(error, getFormatHost(ts.sys)));
           throw error;
         }
-        mogrify2("files");
+        mogrify("files");
         const system = { ...ts.sys };
         const { readDirectory: systemReadDirectory } = system;
         system.readDirectory = (path2, extensions, excludes, includes, depth) => {
           extensions = [...extensions ?? [], ".civet"];
-          return systemReadDirectory(path2, extensions, excludes, includes, depth).map((name) => name.endsWith(".civet") ? name + ".tsx" : name);
+          return systemReadDirectory(path2, extensions, excludes, includes, depth).map(($1) => $1.endsWith(".civet") ? $1 + ".tsx" : $1);
         };
         const configContents = ts.parseJsonConfigFileContent(
           config,
@@ -133,7 +139,7 @@ var rawPlugin = (options = {}, meta) => {
           target: ts.ScriptTarget.ESNext,
           composite: false
         };
-        compilerOptions.jsx ?? (compilerOptions.jsx = ts.JsxEmit.Preserve);
+        compilerOptions.jsx ??= ts.JsxEmit.Preserve;
         compilerOptionsWithSourceMap = {
           ...compilerOptions,
           sourceMap: true
@@ -157,10 +163,12 @@ var rawPlugin = (options = {}, meta) => {
             return true;
           return systemFileExists(filename.slice(0, -4));
         };
-        system.readDirectory = (path2) => systemReadDirectory(path2).map((name) => name.endsWith(".civet") ? name + ".tsx" : name);
+        system.readDirectory = (path2) => {
+          return systemReadDirectory(path2).map(($2) => $2.endsWith(".civet") ? $2 + ".tsx" : $2);
+        };
         system.readFile = (filename, encoding = "utf-8") => {
           if (path.basename(filename) === "package.json") {
-            let recurse2 = function(node) {
+            let recurse = function(node) {
               if (node && typeof node === "object") {
                 for (const key in node) {
                   const value = node[key];
@@ -170,18 +178,17 @@ var rawPlugin = (options = {}, meta) => {
                       modified = true;
                     }
                   } else if (value) {
-                    recurse2(value);
+                    recurse(value);
                   }
                 }
               }
             };
-            var recurse = recurse2;
             const json = systemReadFile(filename, encoding);
             if (!json)
               return json;
             const parsed = JSON.parse(json);
             let modified = false;
-            recurse2(parsed.imports);
+            recurse(parsed.imports);
             return modified ? JSON.stringify(parsed) : json;
           }
           if (!filename.endsWith(".civet.tsx"))
@@ -213,28 +220,30 @@ var rawPlugin = (options = {}, meta) => {
           options: compilerOptions,
           host: host.compilerHost
         });
-        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)
-            },
-            sourcemapLines
-          );
-          return {
-            ...diagnostic,
-            messageText: flattenDiagnosticMessageText(diagnostic.messageText),
-            length: diagnostic.length,
-            start: range.start
-          };
-        });
+        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)
+              },
+              sourcemapLines
+            );
+            return {
+              ...diagnostic,
+              messageText: flattenDiagnosticMessageText(diagnostic.messageText),
+              length: diagnostic.length,
+              start: range.start
+            };
+          }
+        );
         if (configErrors?.length) {
           diagnostics.unshift(...configErrors);
         }
@@ -249,18 +258,18 @@ var rawPlugin = (options = {}, meta) => {
             let failures = [];
             if (typeof options.typecheck === "string") {
               if (options.typecheck.includes("error"))
-                failures.push(1 /* Error */);
+                failures.push(DiagnosticCategory.Error);
               if (options.typecheck.includes("warning"))
-                failures.push(0 /* Warning */);
+                failures.push(DiagnosticCategory.Warning);
               if (options.typecheck.includes("suggestion"))
-                failures.push(2 /* Suggestion */);
+                failures.push(DiagnosticCategory.Suggestion);
               if (options.typecheck.includes("message"))
-                failures.push(3 /* Message */);
+                failures.push(DiagnosticCategory.Message);
               if (options.typecheck.includes("all")) {
                 failures = { includes: () => true };
               }
             } else {
-              failures.push(1 /* Error */);
+              failures.push(DiagnosticCategory.Error);
             }
             const count = diagnostics.filter((d) => failures.includes(d.category)).length;
             if (count) {
@@ -432,42 +441,49 @@ var rawPlugin = (options = {}, meta) => {
         code: compiled.code,
         map: jsonSourceMap
       };
-      if (options.transformOutput)
+      if (options.transformOutput) {
         transformed = await options.transformOutput(transformed.code, id);
+      }
       cache?.set(filename, { mtime, result: transformed });
       return transformed;
     },
     esbuild: {
       config(options2) {
-        esbuildOptions = options2;
+        return esbuildOptions = options2;
       }
     },
     vite: {
       config(config) {
-        var _a;
         rootDir = path.resolve(process.cwd(), config.root ?? "");
         if (implicitExtension) {
-          config.resolve ?? (config.resolve = {});
-          (_a = config.resolve).extensions ?? (_a.extensions = DEFAULT_EXTENSIONS);
+          config.resolve ??= {};
+          config.resolve.extensions ??= DEFAULT_EXTENSIONS;
           config.resolve.extensions.push(".civet");
         }
+        ;
+        return;
       },
       async transformIndexHtml(html) {
         return html.replace(
           /<!--[^]*?-->|<[^<>]*>/g,
-          (tag) => tag.replace(
-            /<\s*script\b[^<>]*>/gi,
-            (script) => (
-              // https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
-              script.replace(
-                /([:_\p{ID_Start}][:\p{ID_Continue}]*)(\s*=\s*("[^"]*"|'[^']*'|[^\s"'=<>`]*))?/gu,
-                (attr, name, value) => name.toLowerCase() === "src" && value ? attr.replace(
-                  /(\.civet)(['"]?)$/,
-                  (_, extension, endQuote) => `${extension}${outExt}?transform${endQuote}`
-                ) : attr
-              )
-            )
-          )
+          (tag) => {
+            return tag.replace(
+              /<\s*script\b[^<>]*>/gi,
+              (script) => {
+                return script.replace(
+                  /([:_\p{ID_Start}][:\p{ID_Continue}]*)(\s*=\s*("[^"]*"|'[^']*'|[^\s"'=<>`]*))?/gu,
+                  (attr, name, value) => {
+                    return name.toLowerCase() === "src" && value ? attr.replace(
+                      /(\.civet)(['"]?)$/,
+                      (_, extension, endQuote) => {
+                        return `${extension}${outExt}?transform${endQuote}`;
+                      }
+                    ) : attr;
+                  }
+                );
+              }
+            );
+          }
         );
       },
       handleHotUpdate({ file, server, modules }) {
@@ -485,10 +501,9 @@ var rawPlugin = (options = {}, meta) => {
   };
 };
 var unplugin = createUnplugin(rawPlugin);
-var src_default = unplugin;
-
+var unplugin_civet_default = unplugin;
 export {
-  slash,
+  unplugin_civet_default as default,
   rawPlugin,
-  src_default
+  slash
 };

package/dist/unplugin/vite.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (options: import("./unplugin.js").PluginOptions) => import("vite").Plugin | import("vite").Plugin[];
+export default _default;

package/dist/unplugin/vite.js

@@ -0,0 +1,36 @@
+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);
+
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\vite.civet.jsx
+var vite_civet_exports = {};
+__export(vite_civet_exports, {
+  default: () => vite_civet_default
+});
+module.exports = __toCommonJS(vite_civet_exports);
+var import_unplugin = __toESM(require("./unplugin.js"));
+var vite_civet_default = import_unplugin.default.vite;

package/dist/unplugin/vite.mjs

@@ -0,0 +1,6 @@
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\vite.civet.jsx
+import civetUnplugin from "./unplugin.mjs";
+var vite_civet_default = civetUnplugin.vite;
+export {
+  vite_civet_default as default
+};

package/dist/unplugin/webpack.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (options: import("./unplugin.js").PluginOptions) => WebpackPluginInstance;
+export default _default;

package/dist/unplugin/webpack.js

@@ -0,0 +1,36 @@
+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);
+
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\webpack.civet.jsx
+var webpack_civet_exports = {};
+__export(webpack_civet_exports, {
+  default: () => webpack_civet_default
+});
+module.exports = __toCommonJS(webpack_civet_exports);
+var import_unplugin = __toESM(require("./unplugin.js"));
+var webpack_civet_default = import_unplugin.default.webpack;

package/dist/unplugin/webpack.mjs

@@ -0,0 +1,6 @@
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\webpack.civet.jsx
+import civetUnplugin from "./unplugin.mjs";
+var webpack_civet_default = civetUnplugin.webpack;
+export {
+  webpack_civet_default as default
+};

package/package.json

@@ -1,44 +1,55 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.7.15",
+  "version": "0.7.17",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
   "exports": {
     ".": {
       "import": "./dist/main.mjs",
-      "require": "./dist/main.js"
+      "require": "./dist/main.js",
+      "types": "./dist/types.d.ts"
     },
     "./babel-plugin": "./dist/babel-plugin.mjs",
     "./bun-civet": "./dist/bun-civet.mjs",
     "./esm": "./dist/esm.mjs",
     "./esbuild-plugin": "./dist/esbuild-plugin.js",
     "./register": "./register.js",
-    "./config": "./dist/config.js",
+    "./config": {
+      "require": "./dist/config.js",
+      "import": "./dist/config.mjs",
+      "types": "./dist/config.d.ts"
+    },
     "./unplugin": {
-      "require": "./dist/unplugin.js",
-      "import": "./dist/unplugin.mjs"
+      "require": "./dist/unplugin/unplugin.js",
+      "import": "./dist/unplugin/unplugin.mjs",
+      "types": "./dist/unplugin/unplugin.d.ts"
     },
     "./vite": {
-      "require": "./dist/vite.js",
-      "import": "./dist/vite.mjs"
+      "require": "./dist/unplugin/vite.js",
+      "import": "./dist/unplugin/vite.mjs",
+      "types": "./dist/unplugin/vite.d.ts"
     },
     "./webpack": {
-      "require": "./dist/webpack.js",
-      "import": "./dist/webpack.mjs"
+      "require": "./dist/unplugin/webpack.js",
+      "import": "./dist/unplugin/webpack.mjs",
+      "types": "./dist/unplugin/webpack.d.ts"
     },
     "./rollup": {
-      "require": "./dist/rollup.js",
-      "import": "./dist/rollup.mjs"
+      "require": "./dist/unplugin/rollup.js",
+      "import": "./dist/unplugin/rollup.mjs",
+      "types": "./dist/unplugin/rollup.d.ts"
     },
     "./esbuild": {
-      "require": "./dist/esbuild.js",
-      "import": "./dist/esbuild.mjs"
+      "require": "./dist/unplugin/esbuild.js",
+      "import": "./dist/unplugin/esbuild.mjs",
+      "types": "./dist/unplugin/esbuild.d.ts"
     },
     "./astro": {
-      "require": "./dist/astro.js",
-      "import": "./dist/astro.mjs"
+      "require": "./dist/unplugin/astro.js",
+      "import": "./dist/unplugin/astro.mjs",
+      "types": "./dist/unplugin/astro.d.ts"
     },
     "./ts-diagnostic": {
       "require": "./dist/ts-diagnostic.js",
@@ -75,7 +86,7 @@
     "unplugin": "^1.6.0"
   },
   "devDependencies": {
-    "@danielx/civet": "0.7.11",
+    "@danielx/civet": "0.7.16",
     "@danielx/hera": "^0.8.14",
     "@prettier/sync": "^0.5.2",
     "@types/assert": "^1.5.6",
@@ -89,7 +100,6 @@
     "terser": "^5.16.1",
     "ts-node": "^10.9.1",
     "tslib": "^2.4.0",
-    "tsup": "^7.2.0",
     "typescript": "^5.5.2",
     "vite": "^4.4.12",
     "vitepress": "^1.0.0-alpha.35",

package/dist/astro.d.mts

@@ -1,16 +0,0 @@
-import { PluginOptions } from './unplugin.mjs';
-import 'unplugin';
-import '@danielx/civet';
-
-interface AstroIntegration {
-    name: string;
-    hooks: {
-        "astro:config:setup": (data: {
-            updateConfig: (config: unknown) => void;
-        }) => void;
-    };
-}
-
-declare function export_default(opts?: PluginOptions): AstroIntegration;
-
-export { export_default as default };

package/dist/astro.d.ts

@@ -1,16 +0,0 @@
-import { PluginOptions } from './unplugin.js';
-import 'unplugin';
-import '@danielx/civet';
-
-interface AstroIntegration {
-    name: string;
-    hooks: {
-        "astro:config:setup": (data: {
-            updateConfig: (config: unknown) => void;
-        }) => void;
-    };
-}
-
-declare function export_default(opts?: PluginOptions): AstroIntegration;
-
-export { export_default as default };