@danielx/civet 0.7.33 → 0.7.34

package/CHANGELOG.md

@@ -4,6 +4,14 @@ This changelog is generated automatically by [`build/changelog.civet`](build/cha
 For each version of Civet, it lists and links to all incorporated PRs,
 as well as a full diff and commit list.
 
+## 0.7.34 (2024-10-06, [diff](https://github.com/DanielXMoore/Civet/compare/v0.7.33...v0.7.34), [commits](https://github.com/DanielXMoore/Civet/commits/v0.7.34))
+* Use new Civet icon in VSCode extension [[#1420](https://github.com/DanielXMoore/Civet/pull/1420)]
+* `"civet globals"` directive to prevent some auto declarations [[#1423](https://github.com/DanielXMoore/Civet/pull/1423)]
+* Fix arrow type with `?` postfix [[#1425](https://github.com/DanielXMoore/Civet/pull/1425)]
+* Enable `worker.civet?worker` import in Vite [[#1426](https://github.com/DanielXMoore/Civet/pull/1426)]
+* Fix missing semicolon in if/unless followed by else [[#1428](https://github.com/DanielXMoore/Civet/pull/1428)]
+* Support `export default` in `declare` blocks [[#1427](https://github.com/DanielXMoore/Civet/pull/1427)]
+
 ## 0.7.33 (2024-10-05, [diff](https://github.com/DanielXMoore/Civet/compare/v0.7.32...v0.7.33), [commits](https://github.com/DanielXMoore/Civet/commits/v0.7.33))
 * VSCode plugin ignores CoffeeScript files [[#1409](https://github.com/DanielXMoore/Civet/pull/1409)]
 * Add syntax highlighting support for /d, /s and /v RegExp flags [[#1413](https://github.com/DanielXMoore/Civet/pull/1413)]

package/dist/browser.js

@@ -38,9 +38,9 @@ var Civet = (() => {
   ));
   var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-  // node_modules/@danielx/hera/dist/machine.js
+  // node_modules/.pnpm/@danielx+hera@0.8.16/node_modules/@danielx/hera/dist/machine.js
   var require_machine = __commonJS({
-    "node_modules/@danielx/hera/dist/machine.js"(exports, module) {
+    "node_modules/.pnpm/@danielx+hera@0.8.16/node_modules/@danielx/hera/dist/machine.js"(exports, module) {
       "use strict";
       var __defProp2 = Object.defineProperty;
       var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -1094,12 +1094,11 @@ ${body}`;
     ]);
   }
   var typeNeedsNoParens = /* @__PURE__ */ new Set([
-    "IdentifierType",
+    "TypeIdentifier",
     "ImportType",
-    "LiteralType",
+    "TypeLiteral",
     "TupleType",
-    "ParenthesizedType",
-    "UnaryType"
+    "TypeParenthesized"
   ]);
   function parenthesizeType(type) {
     if (typeNeedsNoParens.has(type.type)) {
@@ -1589,16 +1588,16 @@ ${body}`;
 
   // source/parser/function.civet
   function isVoidType(t) {
-    return t?.type === "LiteralType" && t.t.type === "VoidType";
+    return t?.type === "TypeLiteral" && t.t.type === "VoidType";
   }
   function isPromiseVoidType(t) {
-    return t?.type === "IdentifierType" && t.raw === "Promise" && t.args?.types?.length === 1 && isVoidType(t.args.types[0]);
+    return t?.type === "TypeIdentifier" && t.raw === "Promise" && t.args?.types?.length === 1 && isVoidType(t.args.types[0]);
   }
   function isGeneratorVoidType(t) {
-    return t?.type === "IdentifierType" && (t.raw === "Iterator" || t.raw === "Generator") && t.args?.types?.length >= 2 && isVoidType(t.args.types[1]);
+    return t?.type === "TypeIdentifier" && (t.raw === "Iterator" || t.raw === "Generator") && t.args?.types?.length >= 2 && isVoidType(t.args.types[1]);
   }
   function isAsyncGeneratorVoidType(t) {
-    return t?.type === "IdentifierType" && (t.raw === "AsyncIterator" || t.raw === "AsyncGenerator") && t.args?.types?.length >= 2 && isVoidType(t.args.types[1]);
+    return t?.type === "TypeIdentifier" && (t.raw === "AsyncIterator" || t.raw === "AsyncGenerator") && t.args?.types?.length >= 2 && isVoidType(t.args.types[1]);
   }
   function implicitFunctionBlock(f) {
     if (f.abstract || f.block || f.signature?.optional)
@@ -1796,14 +1795,13 @@ ${body}`;
     if (isExit(exp)) {
       return;
     }
+    exp = exp;
     const outer = exp;
-    let { type } = exp;
-    if (type === "LabelledStatement") {
+    if (exp.type === "LabelledStatement") {
       exp = exp.statement;
-      ({ type } = exp);
     }
     let ref4;
-    switch (type) {
+    switch (exp.type) {
       case "BreakStatement":
       case "ContinueStatement":
       case "DebuggerStatement":
@@ -3805,9 +3803,6 @@ ${body}`;
           }
         } else {
           const block = blockWithPrefix(blockPrefix, s.then);
-          if (block.bare && e && !block.semicolon) {
-            block.children.push(block.semicolon = ";");
-          }
           s.children = s.children.map(($2) => $2 === s.then ? block : $2);
           s.then = block;
           updateParentPointers(s);
@@ -4516,7 +4511,8 @@ ${body}`;
   function findDecs(statements) {
     const declarations = gatherNodes(statements, ($) => $.type === "Declaration");
     const declarationNames = declarations.flatMap((d) => d.names);
-    return new Set(declarationNames);
+    const globals = getConfig().globals || [];
+    return new Set(globals.concat(declarationNames));
   }
   function createConstLetDecs(statements, scopes, letOrConst) {
     function findVarDecs(statements2, decs) {
@@ -5383,7 +5379,7 @@ ${js}`
   function expressionizeTypeIf([ifOp, condition, t, e]) {
     const children = [
       "(",
-      insertTrimmingSpace(condition, ""),
+      trimFirstSpace(condition),
       "?"
     ];
     if (!xor(ifOp.negated, condition.negated)) {
@@ -5566,7 +5562,7 @@ ${js}`
             [name, value] = [value, name];
           }
           if (!suppressPrefix) {
-            value = prefix.concat(insertTrimmingSpace(value, ""));
+            value = prefix.concat(trimFirstSpace(value));
           }
           if (wValue)
             value.unshift(wValue);
@@ -5792,7 +5788,7 @@ ${js}`
           if (part.name.type === "ComputedPropertyName") {
             rest.push(part);
           } else {
-            parts.push([part.name, "={", insertTrimmingSpace(part.value, ""), "}"]);
+            parts.push([part.name, "={", trimFirstSpace(part.value), "}"]);
           }
           break;
         case "SpreadProperty":
@@ -5817,7 +5813,7 @@ ${js}`
   }
   function makeGetterMethod(name, ws, value, returnType, block, kind = { token: "get" }, autoReturn = true) {
     const { token } = kind;
-    ws = insertTrimmingSpace(ws, "");
+    ws = trimFirstSpace(ws);
     let setVal;
     const parameters = token === "get" ? {
       type: "Parameters",
@@ -6178,7 +6174,7 @@ ${js}`
     }
   }
   function processTypes(node) {
-    return gatherRecursiveAll(node, (n) => n.type === "UnaryType").forEach((unary) => {
+    return gatherRecursiveAll(node, (n) => n.type === "TypeUnary").forEach((unary) => {
       let last;
       let count = 0;
       let ref10;
@@ -6189,6 +6185,12 @@ ${js}`
       if (!count) {
         return;
       }
+      let ref11;
+      if (unary.suffix.length || unary.prefix.length)
+        ref11 = unary;
+      else
+        ref11 = unary.t;
+      const t = ref11;
       if (unary.parent?.type === "TypeTuple") {
         if (count === 1) {
           unary.suffix.push(last);
@@ -6197,18 +6199,22 @@ ${js}`
         replaceNode(unary, [
           getTrimmingSpace(unary),
           "(",
-          parenthesizeType(insertTrimmingSpace(unary, "")),
+          parenthesizeType(trimFirstSpace(t)),
           " | null)",
           last
         ]);
       } else {
-        replaceNode(unary, [
-          getTrimmingSpace(unary),
-          "(",
-          parenthesizeType(insertTrimmingSpace(unary, "")),
-          count === 1 ? " | undefined" : " | undefined | null",
-          ")"
-        ]);
+        replaceNode(unary, {
+          type: "TypeParenthesized",
+          ts: true,
+          children: [
+            getTrimmingSpace(unary),
+            "(",
+            parenthesizeType(trimFirstSpace(t)),
+            count === 1 ? " | undefined" : " | undefined | null",
+            ")"
+          ]
+        });
       }
     });
   }
@@ -6216,11 +6222,11 @@ ${js}`
     gatherRecursiveAll(statements, ($7) => $7.type === "StatementExpression").forEach((_exp) => {
       const exp = _exp;
       const { statement } = exp;
-      let ref11;
+      let ref12;
       switch (statement.type) {
         case "IfStatement": {
-          if (ref11 = expressionizeIfStatement(statement)) {
-            const expression = ref11;
+          if (ref12 = expressionizeIfStatement(statement)) {
+            const expression = ref12;
             return replaceNode(statement, expression, exp);
           } else {
             return replaceNode(statement, wrapIIFE([["", statement]]), exp);
@@ -6448,8 +6454,8 @@ ${js}`
       for (let i4 = 0, len3 = placeholders.length; i4 < len3; i4++) {
         const placeholder = placeholders[i4];
         typeSuffix ??= placeholder.typeSuffix;
-        let ref12;
-        replaceNode((ref12 = placeholder.children)[ref12.length - 1], ref);
+        let ref13;
+        replaceNode((ref13 = placeholder.children)[ref13.length - 1], ref);
       }
       const { parent } = ancestor;
       const body = maybeUnwrap(ancestor);
@@ -6466,16 +6472,16 @@ ${js}`
         }
         case "PipelineExpression": {
           const i = findChildIndex(parent, ancestor);
-          let ref13;
+          let ref14;
           if (i === 1) {
-            ref13 = ancestor === parent.children[i];
+            ref14 = ancestor === parent.children[i];
           } else if (i === 2) {
-            ref13 = ancestor === parent.children[i][findChildIndex(parent.children[i], ancestor)][3];
+            ref14 = ancestor === parent.children[i][findChildIndex(parent.children[i], ancestor)][3];
           } else {
-            ref13 = void 0;
+            ref14 = void 0;
           }
           ;
-          outer = ref13;
+          outer = ref14;
           break;
         }
         case "AssignmentExpression":
@@ -6490,9 +6496,9 @@ ${js}`
         fnExp = makeLeftHandSideExpression(fnExp);
       }
       replaceNode(ancestor, fnExp, parent);
-      let ref14;
-      if (ref14 = getTrimmingSpace(body)) {
-        const ws = ref14;
+      let ref15;
+      if (ref15 = getTrimmingSpace(body)) {
+        const ws = ref15;
         inplaceInsertTrimmingSpace(body, "");
         inplacePrepend(ws, fnExp);
       }
@@ -6537,8 +6543,8 @@ ${js}`
         }
       ];
     }
-    let ref15;
-    if (Array.isArray(rest.delim) && (ref15 = rest.delim)[ref15.length - 1]?.token === ",") {
+    let ref16;
+    if (Array.isArray(rest.delim) && (ref16 = rest.delim)[ref16.length - 1]?.token === ",") {
       rest.delim = rest.delim.slice(0, -1);
       rest.children = [...rest.children.slice(0, -1), rest.delim];
     }
@@ -7302,6 +7308,7 @@ ${js}`
     NamespaceDeclaration,
     OptionalEquals,
     TypeLexicalDeclaration,
+    TypeLetOrConstDeclaration,
     TypeDeclarationBinding,
     InterfaceExtendsClause,
     InterfaceExtendsTarget,
@@ -7795,7 +7802,7 @@ ${js}`
   var $R91 = (0, import_lib3.$R)(new RegExp("#![^\\r\\n]*", "suy"));
   var $R92 = (0, import_lib3.$R)(new RegExp("[\\t ]*", "suy"));
   var $R93 = (0, import_lib3.$R)(new RegExp("[\\s]*", "suy"));
-  var $R94 = (0, import_lib3.$R)(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
+  var $R94 = (0, import_lib3.$R)(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([\\p{ID_Continue}.,+-]*))?", "suy"));
   var $R95 = (0, import_lib3.$R)(new RegExp("\\/\\/\\/[^\\r\\n]*", "suy"));
   var $R96 = (0, import_lib3.$R)(new RegExp("(?=[ \\t\\r\\n\\/#]|$)", "suy"));
   var $R97 = (0, import_lib3.$R)(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
@@ -12732,6 +12739,14 @@ ${js}`
       kind = { ...kind, token: "if" };
       condition = negateCondition(condition);
     }
+    if (block.bare && e) {
+      const semicolon = ";";
+      block = {
+        ...block,
+        semicolon,
+        children: [...block.children, semicolon]
+      };
+    }
     return {
       type: "IfStatement",
       children: [kind, ws, condition, block, e],
@@ -12745,6 +12760,13 @@ ${js}`
     var clause = $1;
     var block = $2;
     var e = $3;
+    if (block.bare && e) {
+      block = {
+        ...block,
+        semicolon: ";",
+        children: [...block.children, ";"]
+      };
+    }
     return {
       type: "IfStatement",
       children: [...clause.children, block, e],
@@ -16421,7 +16443,17 @@ ${js}`
   function OptionalEquals(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "OptionalEquals", OptionalEquals$$);
   }
-  var TypeLexicalDeclaration$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(__, LetOrConstOrVar, TypeDeclarationBinding, (0, import_lib3.$Q)((0, import_lib3.$S)(CommaDelimiter, __, TypeDeclarationBinding))), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var TypeLexicalDeclaration$0 = TypeLetOrConstDeclaration;
+  var TypeLexicalDeclaration$1 = (0, import_lib3.$S)(__, EnumDeclaration);
+  var TypeLexicalDeclaration$2 = ClassSignature;
+  var TypeLexicalDeclaration$3 = (0, import_lib3.$S)(Namespace, (0, import_lib3.$E)(_), IdentifierName, DeclareBlock);
+  var TypeLexicalDeclaration$4 = (0, import_lib3.$S)(Module, _, StringLiteral, (0, import_lib3.$E)(DeclareBlock));
+  var TypeLexicalDeclaration$5 = (0, import_lib3.$S)(Global, (0, import_lib3.$E)(DeclareBlock));
+  var TypeLexicalDeclaration$$ = [TypeLexicalDeclaration$0, TypeLexicalDeclaration$1, TypeLexicalDeclaration$2, TypeLexicalDeclaration$3, TypeLexicalDeclaration$4, TypeLexicalDeclaration$5];
+  function TypeLexicalDeclaration(ctx, state2) {
+    return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeLexicalDeclaration", TypeLexicalDeclaration$$);
+  }
+  var TypeLetOrConstDeclaration$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(__, LetOrConstOrVar, TypeDeclarationBinding, (0, import_lib3.$Q)((0, import_lib3.$S)(CommaDelimiter, __, TypeDeclarationBinding))), function($skip, $loc, $0, $1, $2, $3, $4) {
     var first = $3;
     var rest = $4;
     const names = first.names.concat(...rest.map((b) => b[2].names));
@@ -16432,14 +16464,8 @@ ${js}`
       names
     };
   });
-  var TypeLexicalDeclaration$1 = (0, import_lib3.$S)(__, EnumDeclaration);
-  var TypeLexicalDeclaration$2 = ClassSignature;
-  var TypeLexicalDeclaration$3 = (0, import_lib3.$S)(Namespace, (0, import_lib3.$E)(_), IdentifierName, DeclareBlock);
-  var TypeLexicalDeclaration$4 = (0, import_lib3.$S)(Module, _, StringLiteral, (0, import_lib3.$E)(DeclareBlock));
-  var TypeLexicalDeclaration$5 = (0, import_lib3.$S)(Global, (0, import_lib3.$E)(DeclareBlock));
-  var TypeLexicalDeclaration$$ = [TypeLexicalDeclaration$0, TypeLexicalDeclaration$1, TypeLexicalDeclaration$2, TypeLexicalDeclaration$3, TypeLexicalDeclaration$4, TypeLexicalDeclaration$5];
-  function TypeLexicalDeclaration(ctx, state2) {
-    return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeLexicalDeclaration", TypeLexicalDeclaration$$);
+  function TypeLetOrConstDeclaration(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "TypeLetOrConstDeclaration", TypeLetOrConstDeclaration$0);
   }
   var TypeDeclarationBinding$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$C)(BindingPattern, BindingIdentifier), (0, import_lib3.$E)(TypeSuffix)), function($skip, $loc, $0, $1, $2) {
     return {
@@ -16583,13 +16609,14 @@ ${js}`
   function NestedDeclareElement(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "NestedDeclareElement", NestedDeclareElement$0);
   }
-  var DeclareElement$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$E)(Decorators), (0, import_lib3.$E)((0, import_lib3.$S)(Export, (0, import_lib3.$E)(_))), TypeLexicalDeclaration), function(value) {
+  var DeclareElement$0 = (0, import_lib3.$S)((0, import_lib3.$E)(Decorators), Export, __, Default, __, (0, import_lib3.$C)(Identifier, ClassSignature, InterfaceDeclaration));
+  var DeclareElement$1 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$E)(Decorators), (0, import_lib3.$E)((0, import_lib3.$S)(Export, (0, import_lib3.$E)(_))), TypeLexicalDeclaration), function(value) {
     return { "ts": true, "children": value };
   });
-  var DeclareElement$1 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$E)((0, import_lib3.$S)(Export, (0, import_lib3.$E)(_))), TypeDeclarationRest), function(value) {
+  var DeclareElement$2 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$E)((0, import_lib3.$S)(Export, (0, import_lib3.$E)(_))), TypeDeclarationRest), function(value) {
     return { "ts": true, "children": value };
   });
-  var DeclareElement$$ = [DeclareElement$0, DeclareElement$1];
+  var DeclareElement$$ = [DeclareElement$0, DeclareElement$1, DeclareElement$2];
   function DeclareElement(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "DeclareElement", DeclareElement$$);
   }
@@ -16859,7 +16886,7 @@ ${js}`
     if (!prefix.length && !suffix.length)
       return t;
     return {
-      type: "UnaryType",
+      type: "TypeUnary",
       prefix,
       suffix,
       t,
@@ -16937,14 +16964,14 @@ ${js}`
   var TypePrimary$7 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), TypeLiteral), function($skip, $loc, $0, $1, $2) {
     var t = $2;
     return {
-      type: "LiteralType",
+      type: "TypeLiteral",
       t,
       children: $0
     };
   });
   var TypePrimary$8 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), UnknownAlias), function($skip, $loc, $0, $1, $2) {
     return {
-      type: "IdentifierType",
+      type: "TypeIdentifier",
       children: $0,
       raw: $2.token,
       args: void 0
@@ -16953,7 +16980,7 @@ ${js}`
   var TypePrimary$9 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), Identifier, (0, import_lib3.$Q)((0, import_lib3.$S)(Dot, IdentifierName)), (0, import_lib3.$E)((0, import_lib3.$C)(TypeArguments, ImplicitTypeArguments))), function($skip, $loc, $0, $1, $2, $3, $4) {
     var args = $4;
     return {
-      type: "IdentifierType",
+      type: "TypeIdentifier",
       children: $0,
       raw: [$2.name, ...$3.map(([dot, id]) => dot.token + id.name)].join(""),
       args
@@ -16963,7 +16990,7 @@ ${js}`
     if (!$4)
       return $skip;
     return {
-      type: "ParenthesizedType",
+      type: "TypeParenthesized",
       children: [$1, $2, $4, $6, $7]
       // omit AllowAll/RestoreAll
     };
@@ -17329,16 +17356,20 @@ ${js}`
   }
   var TypeFunction$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)((0, import_lib3.$S)(Abstract, (0, import_lib3.$E)(_))), (0, import_lib3.$E)((0, import_lib3.$S)(New, (0, import_lib3.$E)(_))), Parameters, __, TypeArrowFunction, (0, import_lib3.$E)(ReturnType)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
     var type = $6;
-    const ret = [...$0];
+    const children = [...$0];
     if ($1 && !$2) {
-      ret[1] = {
+      children[1] = {
         type: "Error",
         message: "abstract function types must be constructors (abstract new)"
       };
     }
     if (!type)
-      ret.push("void");
-    return ret;
+      children.push("void");
+    return {
+      type: "TypeFunction",
+      children,
+      ts: true
+    };
   });
   function TypeFunction(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "TypeFunction", TypeFunction$0);
@@ -17520,17 +17551,22 @@ ${js}`
   function CivetPrologueContent(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "CivetPrologueContent", CivetPrologueContent$0);
   }
-  var CivetOption$0 = (0, import_lib3.$TR)((0, import_lib3.$EXPECT)($R94, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+  var CivetOption$0 = (0, import_lib3.$TR)((0, import_lib3.$EXPECT)($R94, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([\\p{ID_Continue}.,+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
     const optionName = $2.replace(/-+([a-z]?)/g, (_2, l) => {
       if (l)
         return l.toUpperCase();
       return "";
     });
     let value = $3 ? $4 : $1 === "-" ? false : true;
-    if (optionName === "tab") {
-      value = parseFloat(value);
-      if (isNaN(value))
-        value = 0;
+    switch (optionName) {
+      case "tab":
+        value = parseFloat(value);
+        if (isNaN(value))
+          value = 0;
+        break;
+      case "globals":
+        value = value.split(",").filter(Boolean);
+        break;
     }
     return [optionName, value];
   });
@@ -17883,6 +17919,7 @@ ${js}`
       coffeeOf: false,
       coffeePrototype: false,
       defaultElement: "div",
+      globals: [],
       implicitReturns: true,
       jsxCode: false,
       objectIs: false,