@danielx/civet 0.6.44 → 0.6.46

package/README.md

@@ -20,7 +20,7 @@ The modern way to write TypeScript.
   (including metaframeworks such as Astro),
   <!--
   [esbuild](source/esbuild-plugin.civet),
-  [Vite](https://github.com/lorefnon/vite-plugin-civet),
+  [Vite](https://github.com/edemaine/vite-plugin-civet),
   -->
   [Babel](source/babel-plugin.mjs),
   [Gulp](integration/gulp),

package/dist/browser.js

@@ -820,7 +820,6 @@ ${input.slice(result.pos)}
             const part = strWithSubstitutions[i2];
             results1.push(part.token ?? "s");
           }
-          ;
           return results1;
         })().join("");
         const dedent = /^[ \t]*\r?\n/.test(stringPart) ? getIndentOfBlockString(stringPart, tab) : false;
@@ -2307,7 +2306,6 @@ ${input.slice(result.pos)}
         if (!condition?.expression) {
           return;
         }
-        ;
         let { expression } = condition;
         if (typeof expression === "object" && expression != null && "type" in expression && expression.type === "UnaryExpression" && "children" in expression && Array.isArray(expression.children) && expression.children.length === 2 && expression.children[0] === "!" && typeof expression.children[1] === "object" && expression.children[1] != null && "type" in expression.children[1] && expression.children[1].type === "ParenthesizedExpression" && "expression" in expression.children[1]) {
           const { type: type1, children: [, { type: type2, expression: expression2 }] } = expression;
@@ -2591,6 +2589,7 @@ ${input.slice(result.pos)}
         }
         switch (following.type) {
           case "ParenthesizedExpression":
+          case "ArrayExpression":
           case "ArrowFunction":
           case "TemplateLiteral":
           case "RegularExpressionLiteral": {
@@ -14355,7 +14354,6 @@ ${input.slice(result.pos)}
     if (filename.endsWith(".coffee") && !/^(#![^\r\n]*(\r\n|\n|\r))?\s*['"]civet/.test(src)) {
       options.parseOptions.coffeeCompat = true;
     }
-    ;
     const { hits, trace, noCache } = options;
     let events;
     if (!noCache) {
@@ -14450,7 +14448,6 @@ ${counts}`;
         if (uncacheable.has(ruleName)) {
           return;
         }
-        ;
         const [stateKey, tagKey] = getStateKey();
         const key = [tagKey, stateKey, state.pos, ruleName];
         if (stateCache.has(key)) {

package/dist/civet

@@ -113,7 +113,6 @@ parseArgs = function(args) {
           char = ref[i1];
           results.push(`-${char}`);
         }
-        ;
         return results;
       })());
       continue;
@@ -178,7 +177,6 @@ parseArgs = function(args) {
     }
     i++;
   }
-  ;
   return { filenames, scriptArgs, options };
 };
 readFiles = async function* (filenames, options) {
@@ -216,7 +214,6 @@ readFiles = async function* (filenames, options) {
             for await (chunk of process.stdin) {
               results2.push(chunk);
             }
-            ;
             return results2;
           })()).join("");
         }
@@ -404,7 +401,6 @@ cli = async function() {
             process.exit(1);
           }
         }
-        ;
         const { fork } = await import("child_process");
         execArgv = ["--loader", "@danielx/civet/esm"];
         debugRe = /--debug|--inspect/;

package/dist/esbuild.js

@@ -49,6 +49,7 @@ var formatHost = {
 };
 var isCivet = (id) => /\.civet$/.test(id);
 var isCivetTranspiled = (id) => /\.civet\.(m?)(j|t)s(x?)$/.test(id);
+var isCivetTranspiledTS = (id) => /\.civet\.(m?)ts(x?)$/.test(id);
 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`.");
@@ -56,7 +57,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
   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 transpileToJS = options.js ?? false;
   const outExt = options.outputExtension ?? (transpileToJS ? ".jsx" : ".tsx");
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
@@ -194,8 +195,11 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
         transformed = await options.transformOutput(transformed.code, id);
       return transformed;
     },
+    transformInclude(id) {
+      return isCivetTranspiledTS(id);
+    },
     transform(code, id) {
-      if (!/\.civet\.tsx?$/.test(id))
+      if (!isCivetTranspiledTS(id))
         return null;
       if (options.dts || options.typecheck) {
         const resolved = import_path.default.resolve(process.cwd(), id);

package/dist/main.js

@@ -812,7 +812,6 @@ var require_lib = __commonJS({
           const part = strWithSubstitutions[i2];
           results1.push(part.token ?? "s");
         }
-        ;
         return results1;
       })().join("");
       const dedent = /^[ \t]*\r?\n/.test(stringPart) ? getIndentOfBlockString(stringPart, tab) : false;
@@ -2299,7 +2298,6 @@ var require_lib = __commonJS({
       if (!condition?.expression) {
         return;
       }
-      ;
       let { expression } = condition;
       if (typeof expression === "object" && expression != null && "type" in expression && expression.type === "UnaryExpression" && "children" in expression && Array.isArray(expression.children) && expression.children.length === 2 && expression.children[0] === "!" && typeof expression.children[1] === "object" && expression.children[1] != null && "type" in expression.children[1] && expression.children[1].type === "ParenthesizedExpression" && "expression" in expression.children[1]) {
         const { type: type1, children: [, { type: type2, expression: expression2 }] } = expression;
@@ -2583,6 +2581,7 @@ var require_lib = __commonJS({
       }
       switch (following.type) {
         case "ParenthesizedExpression":
+        case "ArrayExpression":
         case "ArrowFunction":
         case "TemplateLiteral":
         case "RegularExpressionLiteral": {
@@ -14348,7 +14347,6 @@ function compile(src, options) {
   if (filename.endsWith(".coffee") && !/^(#![^\r\n]*(\r\n|\n|\r))?\s*['"]civet/.test(src)) {
     options.parseOptions.coffeeCompat = true;
   }
-  ;
   const { hits, trace, noCache } = options;
   let events;
   if (!noCache) {
@@ -14443,7 +14441,6 @@ function makeCache({ hits, trace } = {}) {
       if (uncacheable.has(ruleName)) {
         return;
       }
-      ;
       const [stateKey, tagKey] = getStateKey();
       const key = [tagKey, stateKey, state.pos, ruleName];
       if (stateCache.has(key)) {

package/dist/main.mjs

@@ -810,7 +810,6 @@ var require_lib = __commonJS({
           const part = strWithSubstitutions[i2];
           results1.push(part.token ?? "s");
         }
-        ;
         return results1;
       })().join("");
       const dedent = /^[ \t]*\r?\n/.test(stringPart) ? getIndentOfBlockString(stringPart, tab) : false;
@@ -2297,7 +2296,6 @@ var require_lib = __commonJS({
       if (!condition?.expression) {
         return;
       }
-      ;
       let { expression } = condition;
       if (typeof expression === "object" && expression != null && "type" in expression && expression.type === "UnaryExpression" && "children" in expression && Array.isArray(expression.children) && expression.children.length === 2 && expression.children[0] === "!" && typeof expression.children[1] === "object" && expression.children[1] != null && "type" in expression.children[1] && expression.children[1].type === "ParenthesizedExpression" && "expression" in expression.children[1]) {
         const { type: type1, children: [, { type: type2, expression: expression2 }] } = expression;
@@ -2581,6 +2579,7 @@ var require_lib = __commonJS({
       }
       switch (following.type) {
         case "ParenthesizedExpression":
+        case "ArrayExpression":
         case "ArrowFunction":
         case "TemplateLiteral":
         case "RegularExpressionLiteral": {
@@ -14335,7 +14334,6 @@ function compile(src, options) {
   if (filename.endsWith(".coffee") && !/^(#![^\r\n]*(\r\n|\n|\r))?\s*['"]civet/.test(src)) {
     options.parseOptions.coffeeCompat = true;
   }
-  ;
   const { hits, trace, noCache } = options;
   let events;
   if (!noCache) {
@@ -14430,7 +14428,6 @@ function makeCache({ hits, trace } = {}) {
       if (uncacheable.has(ruleName)) {
         return;
       }
-      ;
       const [stateKey, tagKey] = getStateKey();
       const key = [tagKey, stateKey, state.pos, ruleName];
       if (stateCache.has(key)) {

package/dist/rollup.js

@@ -49,6 +49,7 @@ var formatHost = {
 };
 var isCivet = (id) => /\.civet$/.test(id);
 var isCivetTranspiled = (id) => /\.civet\.(m?)(j|t)s(x?)$/.test(id);
+var isCivetTranspiledTS = (id) => /\.civet\.(m?)ts(x?)$/.test(id);
 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`.");
@@ -56,7 +57,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
   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 transpileToJS = options.js ?? false;
   const outExt = options.outputExtension ?? (transpileToJS ? ".jsx" : ".tsx");
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
@@ -194,8 +195,11 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
         transformed = await options.transformOutput(transformed.code, id);
       return transformed;
     },
+    transformInclude(id) {
+      return isCivetTranspiledTS(id);
+    },
     transform(code, id) {
-      if (!/\.civet\.tsx?$/.test(id))
+      if (!isCivetTranspiledTS(id))
         return null;
       if (options.dts || options.typecheck) {
         const resolved = import_path.default.resolve(process.cwd(), id);

package/dist/unplugin-shared.mjs

@@ -18,6 +18,7 @@ var formatHost = {
 };
 var isCivet = (id) => /\.civet$/.test(id);
 var isCivetTranspiled = (id) => /\.civet\.(m?)(j|t)s(x?)$/.test(id);
+var isCivetTranspiledTS = (id) => /\.civet\.(m?)ts(x?)$/.test(id);
 var civetUnplugin = createUnplugin((options = {}) => {
   if (options.dts && options.js) {
     throw new Error("Can't have both `dts` and `js` be set to `true`.");
@@ -25,7 +26,7 @@ var civetUnplugin = createUnplugin((options = {}) => {
   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 transpileToJS = options.js ?? false;
   const outExt = options.outputExtension ?? (transpileToJS ? ".jsx" : ".tsx");
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
@@ -163,8 +164,11 @@ var civetUnplugin = createUnplugin((options = {}) => {
         transformed = await options.transformOutput(transformed.code, id);
       return transformed;
     },
+    transformInclude(id) {
+      return isCivetTranspiledTS(id);
+    },
     transform(code, id) {
-      if (!/\.civet\.tsx?$/.test(id))
+      if (!isCivetTranspiledTS(id))
         return null;
       if (options.dts || options.typecheck) {
         const resolved = path.resolve(process.cwd(), id);

package/dist/unplugin.js

@@ -47,6 +47,7 @@ var formatHost = {
 };
 var isCivet = (id) => /\.civet$/.test(id);
 var isCivetTranspiled = (id) => /\.civet\.(m?)(j|t)s(x?)$/.test(id);
+var isCivetTranspiledTS = (id) => /\.civet\.(m?)ts(x?)$/.test(id);
 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`.");
@@ -54,7 +55,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
   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 transpileToJS = options.js ?? false;
   const outExt = options.outputExtension ?? (transpileToJS ? ".jsx" : ".tsx");
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
@@ -192,8 +193,11 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
         transformed = await options.transformOutput(transformed.code, id);
       return transformed;
     },
+    transformInclude(id) {
+      return isCivetTranspiledTS(id);
+    },
     transform(code, id) {
-      if (!/\.civet\.tsx?$/.test(id))
+      if (!isCivetTranspiledTS(id))
         return null;
       if (options.dts || options.typecheck) {
         const resolved = import_path.default.resolve(process.cwd(), id);

package/dist/vite.js

@@ -49,6 +49,7 @@ var formatHost = {
 };
 var isCivet = (id) => /\.civet$/.test(id);
 var isCivetTranspiled = (id) => /\.civet\.(m?)(j|t)s(x?)$/.test(id);
+var isCivetTranspiledTS = (id) => /\.civet\.(m?)ts(x?)$/.test(id);
 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`.");
@@ -56,7 +57,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
   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 transpileToJS = options.js ?? false;
   const outExt = options.outputExtension ?? (transpileToJS ? ".jsx" : ".tsx");
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
@@ -194,8 +195,11 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
         transformed = await options.transformOutput(transformed.code, id);
       return transformed;
     },
+    transformInclude(id) {
+      return isCivetTranspiledTS(id);
+    },
     transform(code, id) {
-      if (!/\.civet\.tsx?$/.test(id))
+      if (!isCivetTranspiledTS(id))
         return null;
       if (options.dts || options.typecheck) {
         const resolved = import_path.default.resolve(process.cwd(), id);

package/dist/webpack.js

@@ -49,6 +49,7 @@ var formatHost = {
 };
 var isCivet = (id) => /\.civet$/.test(id);
 var isCivetTranspiled = (id) => /\.civet\.(m?)(j|t)s(x?)$/.test(id);
+var isCivetTranspiledTS = (id) => /\.civet\.(m?)ts(x?)$/.test(id);
 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`.");
@@ -56,7 +57,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
   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 transpileToJS = options.js ?? false;
   const outExt = options.outputExtension ?? (transpileToJS ? ".jsx" : ".tsx");
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
@@ -194,8 +195,11 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
         transformed = await options.transformOutput(transformed.code, id);
       return transformed;
     },
+    transformInclude(id) {
+      return isCivetTranspiledTS(id);
+    },
     transform(code, id) {
-      if (!/\.civet\.tsx?$/.test(id))
+      if (!isCivetTranspiledTS(id))
         return null;
       if (options.dts || options.typecheck) {
         const resolved = import_path.default.resolve(process.cwd(), id);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.6.44",
+  "version": "0.6.46",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -70,7 +70,7 @@
     "unplugin": "^1.4.0"
   },
   "devDependencies": {
-    "@danielx/civet": "0.6.43",
+    "@danielx/civet": "0.6.45",
     "@danielx/hera": "^0.8.10",
     "@types/assert": "^1.5.6",
     "@types/mocha": "^9.1.1",