@danielx/civet 0.6.67 → 0.6.68

package/dist/browser.js

@@ -6,13 +6,12 @@ var Civet = (() => {
   var __getOwnPropNames = Object.getOwnPropertyNames;
   var __getProtoOf = Object.getPrototypeOf;
   var __hasOwnProp = Object.prototype.hasOwnProperty;
-  var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
   var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
     get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
   }) : x)(function(x) {
     if (typeof require !== "undefined")
       return require.apply(this, arguments);
-    throw new Error('Dynamic require of "' + x + '" is not supported');
+    throw Error('Dynamic require of "' + x + '" is not supported');
   });
   var __esm = (fn, res) => function __init() {
     return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
@@ -41,10 +40,6 @@ var Civet = (() => {
     mod
   ));
   var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-  var __publicField = (obj, key, value) => {
-    __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-    return value;
-  };
 
   // source/lib.civet
   var lib_exports = {};
@@ -652,7 +647,7 @@ var Civet = (() => {
           if (i === 0) {
             let s;
             [c, s] = handleThisPrivateShorthands(c);
-            suppressPrefix || (suppressPrefix = s);
+            suppressPrefix ||= s;
           }
           return c;
         })
@@ -3163,7 +3158,7 @@ var Civet = (() => {
         isFunction
       );
       if (ancestor) {
-        return declaration ?? (declaration = child);
+        return declaration ??= child;
       }
       ;
       return;
@@ -3334,6 +3329,9 @@ var Civet = (() => {
           }
         ];
       }
+      if (rest.delim?.at(-1)?.token === ",") {
+        rest.delim.pop();
+      }
       const children = [...props, ...after, rest];
       return {
         children,
@@ -4185,6 +4183,7 @@ ${input.slice(result.pos)}
         BareNestedBlock,
         BareBlock,
         ThenClause,
+        BracedThenClause,
         BracedOrEmptyBlock,
         NoCommaBracedOrEmptyBlock,
         NoPostfixBracedOrEmptyBlock,
@@ -5244,7 +5243,7 @@ ${input.slice(result.pos)}
           return $0;
         return $skip;
       });
-      var ForbiddenImplicitCalls$5 = $TS($S(Not, $E(_), Identifier), function($skip, $loc, $0, $1, $2, $3) {
+      var ForbiddenImplicitCalls$5 = $TS($S(OmittedNegation, $E(_), Identifier), function($skip, $loc, $0, $1, $2, $3) {
         var id = $3;
         if (module.operators.has(id.name))
           return $0;
@@ -5769,11 +5768,29 @@ ${input.slice(result.pos)}
       function ParenthesizedExpression(ctx, state) {
         return $EVENT(ctx, state, "ParenthesizedExpression", ParenthesizedExpression$0);
       }
-      var ClassDeclaration$0 = ClassExpression;
+      var ClassDeclaration$0 = $TS($S(ClassExpression), function($skip, $loc, $0, $1) {
+        if ($1.binding)
+          return $1;
+        return makeLeftHandSideExpression($1);
+      });
       function ClassDeclaration(ctx, state) {
         return $EVENT(ctx, state, "ClassDeclaration", ClassDeclaration$0);
       }
-      var ClassExpression$0 = $S($E(Decorators), $E($S(Abstract, __)), Class, $N($EXPECT($L13, 'ClassExpression ":"')), $E(ClassBinding), $E(ClassHeritage), ClassBody);
+      var ClassExpression$0 = $TS($S($E(Decorators), $E($S(Abstract, __)), Class, $N($EXPECT($L13, 'ClassExpression ":"')), $E(ClassBinding), $E(ClassHeritage), ClassBody), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+        var decorators = $1;
+        var abstract = $2;
+        var binding = $5;
+        var heritage = $6;
+        var body = $7;
+        return {
+          decorators,
+          abstract,
+          binding,
+          heritage,
+          body,
+          children: $0
+        };
+      });
       function ClassExpression(ctx, state) {
         return $EVENT(ctx, state, "ClassExpression", ClassExpression$0);
       }
@@ -7473,6 +7490,21 @@ ${input.slice(result.pos)}
       function ThenClause(ctx, state) {
         return $EVENT(ctx, state, "ThenClause", ThenClause$0);
       }
+      var BracedThenClause$0 = $TS($S($Y(Then), InsertOpenBrace, ThenClause, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
+        var open = $2;
+        var exp = $3;
+        var close = $4;
+        const expressions = [exp];
+        return {
+          type: "BlockStatement",
+          expressions,
+          children: [open, expressions, " ", close],
+          bare: false
+        };
+      });
+      function BracedThenClause(ctx, state) {
+        return $EVENT(ctx, state, "BracedThenClause", BracedThenClause$0);
+      }
       var BracedOrEmptyBlock$0 = BracedBlock;
       var BracedOrEmptyBlock$1 = EmptyBlock;
       var BracedOrEmptyBlock$$ = [BracedOrEmptyBlock$0, BracedOrEmptyBlock$1];
@@ -8758,7 +8790,7 @@ ${input.slice(result.pos)}
           special: true
         };
       });
-      var _BinaryOp$2 = $TS($S(Not, __, Identifier), function($skip, $loc, $0, $1, $2, $3) {
+      var _BinaryOp$2 = $TS($S(OmittedNegation, __, Identifier), function($skip, $loc, $0, $1, $2, $3) {
         var id = $3;
         if (!module.operators.has(id.name))
           return $skip;
@@ -8895,7 +8927,7 @@ ${input.slice(result.pos)}
         var op = value[1];
         return op;
       });
-      var BinaryOpSymbol$41 = $TS($S(Not, __, NotOp), function($skip, $loc, $0, $1, $2, $3) {
+      var BinaryOpSymbol$41 = $TS($S(OmittedNegation, __, NotOp), function($skip, $loc, $0, $1, $2, $3) {
         var op = $3;
         return { ...op, $loc };
       });
@@ -8922,7 +8954,7 @@ ${input.slice(result.pos)}
           negated: true
         };
       });
-      var BinaryOpSymbol$45 = $TV($C($S(Is, __, Not, __, In), $EXPECT($L99, 'BinaryOpSymbol "\u2209"')), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$45 = $TV($C($S(Is, __, OmittedNegation, __, In), $EXPECT($L99, 'BinaryOpSymbol "\u2209"')), function($skip, $loc, $0, $1) {
         return {
           method: "includes",
           relational: true,
@@ -8974,7 +9006,7 @@ ${input.slice(result.pos)}
           special: true
         };
       });
-      var CoffeeOfOp$2 = $TS($S(Not, __, Of, NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var CoffeeOfOp$2 = $TS($S(OmittedNegation, __, Of, NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4) {
         return {
           $loc,
           token: "in",
@@ -8982,7 +9014,7 @@ ${input.slice(result.pos)}
           negated: true
         };
       });
-      var CoffeeOfOp$3 = $TS($S(Not, __, In), function($skip, $loc, $0, $1, $2, $3) {
+      var CoffeeOfOp$3 = $TS($S(OmittedNegation, __, In), function($skip, $loc, $0, $1, $2, $3) {
         return {
           call: [module.getRef("indexOf"), ".call"],
           relational: true,
@@ -9995,7 +10027,7 @@ ${input.slice(result.pos)}
       function TryExpression(ctx, state) {
         return $EVENT(ctx, state, "TryExpression", TryExpression$0);
       }
-      var CatchClause$0 = $TS($S($C(Nested, _), Catch, $E(CatchBind), $C(ThenClause, BracedOrEmptyBlock)), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var CatchClause$0 = $TS($S($C(Nested, _), Catch, $E(CatchBind), $C(BracedThenClause, BracedOrEmptyBlock)), function($skip, $loc, $0, $1, $2, $3, $4) {
         var block = $4;
         return {
           type: "CatchClause",
@@ -10012,7 +10044,7 @@ ${input.slice(result.pos)}
       function CatchBind(ctx, state) {
         return $EVENT_C(ctx, state, "CatchBind", CatchBind$$);
       }
-      var FinallyClause$0 = $S($C(Nested, _), Finally, $C(ThenClause, BracedOrEmptyBlock));
+      var FinallyClause$0 = $S($C(Nested, _), Finally, $C(BracedThenClause, BracedOrEmptyBlock));
       function FinallyClause(ctx, state) {
         return $EVENT(ctx, state, "FinallyClause", FinallyClause$0);
       }
@@ -12012,7 +12044,13 @@ ${input.slice(result.pos)}
               classValue = ["{[", ...exprs, '].filter(Boolean).join(" ")}'];
             }
           } else {
-            classValue = JSON.stringify(stringPart);
+            if (!stringPart.includes("&") && !stringPart.includes('"')) {
+              classValue = `"${stringPart}"`;
+            } else if (!stringPart.includes("&") && !stringPart.includes("'")) {
+              classValue = `'${stringPart}'`;
+            } else {
+              classValue = `{${JSON.stringify(stringPart)}}`;
+            }
           }
           attrs.splice(0, 0, [" ", [className, ["=", classValue]]]);
         }
@@ -12920,8 +12958,29 @@ ${input.slice(result.pos)}
         return $EVENT_C(ctx, state, "TypeUnaryOp", TypeUnaryOp$$);
       }
       var TypeIndexedAccess$0 = $S(OpenBracket, $E(Type), __, CloseBracket);
+      var TypeIndexedAccess$1 = $TS($S(Dot, $C(TemplateLiteral, StringLiteral, IntegerLiteral)), function($skip, $loc, $0, $1, $2) {
+        var dot = $1;
+        var literal = $2;
+        const open = { ...dot, token: "[" };
+        return [
+          open,
+          literal,
+          "]"
+        ];
+      });
+      var TypeIndexedAccess$2 = $TS($S(CoffeePrototypeEnabled, DoubleColon, $E(IdentifierName)), function($skip, $loc, $0, $1, $2, $3) {
+        var p = $2;
+        var id = $3;
+        const open = { ...p, token: '["' };
+        return [
+          open,
+          id,
+          '"]'
+        ];
+      });
+      var TypeIndexedAccess$$ = [TypeIndexedAccess$0, TypeIndexedAccess$1, TypeIndexedAccess$2];
       function TypeIndexedAccess(ctx, state) {
-        return $EVENT(ctx, state, "TypeIndexedAccess", TypeIndexedAccess$0);
+        return $EVENT_C(ctx, state, "TypeIndexedAccess", TypeIndexedAccess$$);
       }
       var UnknownAlias$0 = $TV($EXPECT($L211, 'UnknownAlias "???"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "unknown" };
@@ -14138,6 +14197,7 @@ ${input.slice(result.pos)}
       exports.BareNestedBlock = BareNestedBlock;
       exports.BareBlock = BareBlock;
       exports.ThenClause = ThenClause;
+      exports.BracedThenClause = BracedThenClause;
       exports.BracedOrEmptyBlock = BracedOrEmptyBlock;
       exports.NoCommaBracedOrEmptyBlock = NoCommaBracedOrEmptyBlock;
       exports.NoPostfixBracedOrEmptyBlock = NoPostfixBracedOrEmptyBlock;
@@ -14728,7 +14788,7 @@ ${input.slice(result.pos)}
         return "";
       }
       if (node.type === "Error") {
-        options.errors ?? (options.errors = []);
+        options.errors ??= [];
         options.errors.push(node);
         return "";
       }
@@ -15125,9 +15185,7 @@ ${input.slice(result.pos)}
 
   // source/state-cache.civet
   var StateCache = class {
-    constructor() {
-      __publicField(this, "cache", /* @__PURE__ */ new Map());
-    }
+    cache = /* @__PURE__ */ new Map();
     get(key) {
       return this.cache.get(key[0])?.get(key[1])?.get(key[2])?.get(key[3]);
     }
@@ -15213,7 +15271,7 @@ ${input.slice(result.pos)}
     } else {
       options = { ...options };
     }
-    options.parseOptions ?? (options.parseOptions = {});
+    options.parseOptions ??= {};
     const filename = options.filename || "unknown";
     if (filename.endsWith(".coffee") && !/^(#![^\r\n]*(\r\n|\n|\r))?\s*['"]civet/.test(src)) {
       options.parseOptions.coffeeCompat = true;

package/dist/civet

@@ -310,7 +310,7 @@ cli = async function() {
   argv = process.argv;
   ({ filenames, scriptArgs, options } = parseArgs(argv.slice(2)));
   if (options.config !== false) {
-    options.config ?? (options.config = await (0, import_config.findConfig)(process.cwd()));
+    options.config ??= await (0, import_config.findConfig)(process.cwd());
   }
   if (options.config) {
     options = {

package/dist/config.js

@@ -82,16 +82,16 @@ async function loadConfig(path2) {
     return JSON.parse(config);
   } else {
     const js = (0, import_main.compile)(config, { js: true });
-    let exports;
+    let exports2;
     try {
-      exports = await import(`data:text/javascript,${encodeURIComponent(js)}`);
+      exports2 = await import(`data:text/javascript,${encodeURIComponent(js)}`);
     } catch (e) {
       console.error("Error loading config file", path2, e);
     }
-    if (typeof exports.default !== "object" || exports.default === null) {
+    if (typeof exports2.default !== "object" || exports2.default === null) {
       throw new Error("civet config file must export an object");
     }
-    return exports.default;
+    return exports2.default;
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/esbuild-plugin.js

@@ -128,6 +128,4 @@ function civet(options = {}) {
 var defaultPlugin = civet();
 civet.setup = defaultPlugin.setup;
 var esbuild_plugin_default = civet;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
 module.exports = module.exports.default;