@danielx/civet 0.6.67 → 0.6.68

package/dist/main.mjs

@@ -4,7 +4,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 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 __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
@@ -31,10 +30,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
 
 // source/lib.civet
 var lib_exports = {};
@@ -642,7 +637,7 @@ function handleThisPrivateShorthands(value) {
         if (i === 0) {
           let s;
           [c, s] = handleThisPrivateShorthands(c);
-          suppressPrefix || (suppressPrefix = s);
+          suppressPrefix ||= s;
         }
         return c;
       })
@@ -3153,7 +3148,7 @@ function processReturnValue(func) {
       isFunction
     );
     if (ancestor) {
-      return declaration ?? (declaration = child);
+      return declaration ??= child;
     }
     ;
     return;
@@ -3324,6 +3319,9 @@ function reorderBindingRestProperty(props) {
         }
       ];
     }
+    if (rest.delim?.at(-1)?.token === ",") {
+      rest.delim.pop();
+    }
     const children = [...props, ...after, rest];
     return {
       children,
@@ -4175,6 +4173,7 @@ var require_parser = __commonJS({
       BareNestedBlock,
       BareBlock,
       ThenClause,
+      BracedThenClause,
       BracedOrEmptyBlock,
       NoCommaBracedOrEmptyBlock,
       NoPostfixBracedOrEmptyBlock,
@@ -5234,7 +5233,7 @@ var require_parser = __commonJS({
         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;
@@ -5759,11 +5758,29 @@ var require_parser = __commonJS({
     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);
     }
@@ -7463,6 +7480,21 @@ var require_parser = __commonJS({
     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];
@@ -8748,7 +8780,7 @@ var require_parser = __commonJS({
         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;
@@ -8885,7 +8917,7 @@ var require_parser = __commonJS({
       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 };
     });
@@ -8912,7 +8944,7 @@ var require_parser = __commonJS({
         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,
@@ -8964,7 +8996,7 @@ var require_parser = __commonJS({
         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",
@@ -8972,7 +9004,7 @@ var require_parser = __commonJS({
         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,
@@ -9985,7 +10017,7 @@ var require_parser = __commonJS({
     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",
@@ -10002,7 +10034,7 @@ var require_parser = __commonJS({
     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);
     }
@@ -12002,7 +12034,13 @@ var require_parser = __commonJS({
             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]]]);
       }
@@ -12910,8 +12948,29 @@ var require_parser = __commonJS({
       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" };
@@ -14128,6 +14187,7 @@ var require_parser = __commonJS({
     exports.BareNestedBlock = BareNestedBlock;
     exports.BareBlock = BareBlock;
     exports.ThenClause = ThenClause;
+    exports.BracedThenClause = BracedThenClause;
     exports.BracedOrEmptyBlock = BracedOrEmptyBlock;
     exports.NoCommaBracedOrEmptyBlock = NoCommaBracedOrEmptyBlock;
     exports.NoPostfixBracedOrEmptyBlock = NoPostfixBracedOrEmptyBlock;
@@ -14707,7 +14767,7 @@ function gen(node, options) {
       return "";
     }
     if (node.type === "Error") {
-      options.errors ?? (options.errors = []);
+      options.errors ??= [];
       options.errors.push(node);
       return "";
     }
@@ -15104,9 +15164,7 @@ remapPosition = function(position, sourcemapLines) {
 
 // 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]);
   }
@@ -15192,7 +15250,7 @@ function compile(src, options) {
   } 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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.6.67",
+  "version": "0.6.68",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -70,14 +70,14 @@
     "unplugin": "^1.6.0"
   },
   "devDependencies": {
-    "@danielx/civet": "0.6.59",
+    "@danielx/civet": "0.6.64",
     "@danielx/hera": "^0.8.11",
     "@prettier/sync": "^0.3.0",
     "@types/assert": "^1.5.6",
     "@types/mocha": "^9.1.1",
     "@types/node": "^20.5.1",
     "c8": "^7.12.0",
-    "esbuild": "0.16.17",
+    "esbuild": "0.20.0",
     "marked": "^4.2.4",
     "mocha": "^10.0.0",
     "prettier": "^3.1.1",