@danielx/civet 0.5.36 → 0.5.37

package/dist/main.mjs

@@ -848,6 +848,8 @@ ${input.slice(result.pos)}
       TypeDeclaration,
       TypeDeclarationModifier,
       TypeDeclarationRest,
+      InterfaceExtendsClause,
+      InterfaceExtendsTarget,
       TypeKeyword,
       Interface,
       Namespace,
@@ -880,10 +882,6 @@ ${input.slice(result.pos)}
       TypeBinaryOp,
       FunctionType,
       TypeArguments,
-      InlineTypeArguments,
-      InlineTypeArgument,
-      InlineTypeArgumentDelimiter,
-      CompactTypeArguments,
       TypeArgument,
       TypeArgumentDelimiter,
       TypeParameters,
@@ -1104,7 +1102,7 @@ ${input.slice(result.pos)}
     var $L164 = $L("infer");
     var $L165 = $L("[]");
     var $L166 = $L("civet");
-    var $R0 = $R(new RegExp("(for|of|then|when)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
+    var $R0 = $R(new RegExp("(as|for|of|satisfies|then|when)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
     var $R1 = $R(new RegExp("[&]", "suy"));
     var $R2 = $R(new RegExp("[!~+-]+", "suy"));
     var $R3 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$])*", "suy"));
@@ -1141,7 +1139,7 @@ ${input.slice(result.pos)}
     var $R34 = $R(new RegExp("(?:by)(?!\\p{ID_Continue})", "suy"));
     var $R35 = $R(new RegExp("(?:of)(?!\\p{ID_Continue})", "suy"));
     var $R36 = $R(new RegExp("(?:not)(?!\\p{ID_Continue})", "suy"));
-    var $R37 = $R(new RegExp("(?:and|as|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|let|loop|new|null|or|private|protected|public|return|satisfies|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})", "suy"));
+    var $R37 = $R(new RegExp("(?:and|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|let|loop|new|null|or|private|protected|public|return|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})", "suy"));
     var $R38 = $R(new RegExp("\\/\\/(?!\\/)[^\\r\\n]*", "suy"));
     var $R39 = $R(new RegExp(".", "suy"));
     var $R40 = $R(new RegExp("#(?!##(?!#))([^\\r\\n]*)", "suy"));
@@ -1351,7 +1349,7 @@ ${input.slice(result.pos)}
       }
     }
     var Arguments$0 = ExplicitArguments;
-    var Arguments$1 = $TS($S($E($S(InlineTypeArguments, $N($S(__, ImplementsToken)))), ApplicationStart, InsertOpenParen, $Q(_), ArgumentList, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var Arguments$1 = $TS($S($E($S(TypeArguments, $N($S(__, ImplementsToken)))), ApplicationStart, InsertOpenParen, $Q(_), ArgumentList, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       var ta = $1;
       var open = $3;
       var ws = $4;
@@ -3047,7 +3045,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var AdditionalReservedWords$0 = $R$0($EXPECT($R0, fail, "AdditionalReservedWords /(for|of|then|when)(?!\\p{ID_Continue}|[\\u200C\\u200D$])/"));
+    var AdditionalReservedWords$0 = $R$0($EXPECT($R0, fail, "AdditionalReservedWords /(as|for|of|satisfies|then|when)(?!\\p{ID_Continue}|[\\u200C\\u200D$])/"));
     var AdditionalReservedWords$1 = AtAt;
     function AdditionalReservedWords(state) {
       let eventData;
@@ -4574,16 +4572,8 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ThenClause$0 = $TS($S(Then, $Q(TrailingComment), Statement), function($skip, $loc, $0, $1, $2, $3) {
-      var ws = $2;
-      var s = $3;
-      const expressions = [[ws, s]];
-      return {
-        type: "BlockStatement",
-        expressions,
-        children: [expressions],
-        bare: true
-      };
+    var ThenClause$0 = $T($S(Then, SingleLineStatements), function(value) {
+      return value[1];
     });
     function ThenClause(state) {
       let eventData;
@@ -4688,8 +4678,8 @@ ${input.slice(result.pos)}
       var c = $5;
       return {
         type: "BlockStatement",
-        expressions: s,
-        children: [o, s, ws, c]
+        expressions: s.expressions,
+        children: [o, s.children, ws, c]
       };
     });
     function BracedBlock(state) {
@@ -4714,13 +4704,18 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var SingleLineStatements$0 = $TS($S($S($Q(TrailingComment), Statement), $Q($S(SemicolonDelimiter, $E(Statement)))), function($skip, $loc, $0, $1, $2) {
-      var first = $1;
-      var rest = $2;
-      if (rest.length) {
-        return [first, ...rest];
-      }
-      return [first];
+    var SingleLineStatements$0 = $TS($S($Q($S($Q(_), Statement, SemicolonDelimiter)), $E($S($Q(_), Statement, $E(SemicolonDelimiter)))), function($skip, $loc, $0, $1, $2) {
+      var stmts = $1;
+      var last = $2;
+      const children = [...stmts];
+      if (last)
+        children.push(last);
+      return {
+        type: "BlockStatement",
+        expressions: children,
+        children,
+        bare: true
+      };
     });
     function SingleLineStatements(state) {
       let eventData;
@@ -8013,48 +8008,34 @@ ${input.slice(result.pos)}
       }
     }
     var CaseClause$0 = $T($S(Case, CaseExpressionList, $C(NestedBlockStatements, NoExpressions)), function(value) {
-      var cases = value[1];
-      var expressions = value[2];
-      return { "type": "CaseClause", "cases": cases, "expressions": expressions, "children": value };
+      return { "type": "CaseClause", "children": value };
     });
-    var CaseClause$1 = $TS($S(When, CaseExpressionList, InsertOpenBrace, $E($C(ThenClause, NestedBlockStatements)), InsertBreak, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+    var CaseClause$1 = $TS($S(When, CaseExpressionList, InsertOpenBrace, $C(ThenClause, NestedBlockStatements, NoExpressions), InsertBreak, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
       var cases = $2;
-      var expressions = $4;
+      var block = $4;
       var b = $5;
-      let children = $0;
-      if (!expressions) {
-        expressions = [];
-        children = children.map((c, i) => i === 3 ? expressions : c);
-      }
-      if (expressions.expressions) {
-        expressions = expressions.expressions;
-      }
       return {
         type: "WhenClause",
         cases,
-        expressions,
+        block,
         break: b,
-        children
+        children: $0
       };
     });
     var CaseClause$2 = $TS($S(Default, ImpliedColon, $C(NestedBlockStatements, NoExpressions)), function($skip, $loc, $0, $1, $2, $3) {
-      var expressions = $3;
-      if (expressions.expressions)
-        expressions = expressions.expressions;
+      var block = $3;
       return {
         type: "DefaultClause",
-        expressions,
+        block,
         children: $0
       };
     });
-    var CaseClause$3 = $TS($S(Else, ImpliedColon, InsertOpenBrace, $C(NestedBlockStatements, $S($Q(TrailingComment), Statement)), InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
-      var expressions = $4;
+    var CaseClause$3 = $TS($S(Else, ImpliedColon, InsertOpenBrace, $C(NestedBlockStatements, SingleLineStatements), InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+      var block = $4;
       $1.token = "default";
-      if (expressions.expressions)
-        expressions = expressions.expressions;
       return {
         type: "DefaultClause",
-        expressions,
+        block,
         children: $0
       };
     });
@@ -10383,7 +10364,7 @@ ${input.slice(result.pos)}
     var ReservedWord$3 = $S(CoffeeOfEnabled, $R$0($EXPECT($R35, fail, "ReservedWord /(?:of)(?!\\p{ID_Continue})/")));
     var ReservedWord$4 = $S(CoffeeNotEnabled, $R$0($EXPECT($R36, fail, "ReservedWord /(?:not)(?!\\p{ID_Continue})/")));
     var ReservedWord$5 = $S($EXPECT($L71, fail, 'ReservedWord "not"'), NonIdContinue, __, $EXPECT($L72, fail, 'ReservedWord "in"'), NonIdContinue);
-    var ReservedWord$6 = $R$0($EXPECT($R37, fail, "ReservedWord /(?:and|as|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|let|loop|new|null|or|private|protected|public|return|satisfies|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})/"));
+    var ReservedWord$6 = $R$0($EXPECT($R37, fail, "ReservedWord /(?:and|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|let|loop|new|null|or|private|protected|public|return|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})/"));
     function ReservedWord(state) {
       let eventData;
       if (state.events) {
@@ -12936,7 +12917,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXSelfClosingElement$0 = $TS($S($EXPECT($L120, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(CompactTypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L152, fail, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var JSXSelfClosingElement$0 = $TS($S($EXPECT($L120, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L152, fail, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       return { type: "JSXElement", children: $0 };
     });
     function JSXSelfClosingElement(state) {
@@ -12961,7 +12942,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXOpeningElement$0 = $S($EXPECT($L120, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(CompactTypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L25, fail, 'JSXOpeningElement ">"'));
+    var JSXOpeningElement$0 = $S($EXPECT($L120, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L25, fail, 'JSXOpeningElement ">"'));
     function JSXOpeningElement(state) {
       let eventData;
       if (state.events) {
@@ -14041,7 +14022,7 @@ ${input.slice(result.pos)}
       }
     }
     var TypeDeclarationRest$0 = $S(TypeKeyword, $Q(TrailingComment), IdentifierName, $E(TypeParameters), __, Equals, __, Type);
-    var TypeDeclarationRest$1 = $S(Interface, $Q(TrailingComment), IdentifierName, $E(TypeParameters), InterfaceBlock);
+    var TypeDeclarationRest$1 = $S(Interface, $Q(TrailingComment), IdentifierName, $E(TypeParameters), $E(InterfaceExtendsClause), InterfaceBlock);
     var TypeDeclarationRest$2 = $S(Namespace, $Q(TrailingComment), IdentifierName, NamespaceBlock);
     var TypeDeclarationRest$3 = FunctionSignature;
     function TypeDeclarationRest(state) {
@@ -14066,6 +14047,52 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var InterfaceExtendsClause$0 = $S(ExtendsToken, InterfaceExtendsTarget);
+    function InterfaceExtendsClause(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("InterfaceExtendsClause", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("InterfaceExtendsClause", state, InterfaceExtendsClause$0(state));
+        if (state.events)
+          state.events.exit?.("InterfaceExtendsClause", state, result, eventData);
+        return result;
+      } else {
+        const result = InterfaceExtendsClause$0(state);
+        if (state.events)
+          state.events.exit?.("InterfaceExtendsClause", state, result, eventData);
+        return result;
+      }
+    }
+    var InterfaceExtendsTarget$0 = ImplementsTarget;
+    function InterfaceExtendsTarget(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("InterfaceExtendsTarget", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("InterfaceExtendsTarget", state, InterfaceExtendsTarget$0(state));
+        if (state.events)
+          state.events.exit?.("InterfaceExtendsTarget", state, result, eventData);
+        return result;
+      } else {
+        const result = InterfaceExtendsTarget$0(state);
+        if (state.events)
+          state.events.exit?.("InterfaceExtendsTarget", state, result, eventData);
+        return result;
+      }
+    }
     var TypeKeyword$0 = $S($EXPECT($L159, fail, 'TypeKeyword "type"'), NonIdContinue);
     function TypeKeyword(state) {
       let eventData;
@@ -14851,7 +14878,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeArguments$0 = $TS($S(__, $EXPECT($L120, fail, 'TypeArguments "<"'), $P(TypeArgument), __, $EXPECT($L25, fail, 'TypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var TypeArguments$0 = $TS($S($EXPECT($L120, fail, 'TypeArguments "<"'), $P(TypeArgument), __, $EXPECT($L25, fail, 'TypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4) {
       return { ts: true, children: $0 };
     });
     function TypeArguments(state) {
@@ -14876,103 +14903,6 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InlineTypeArguments$0 = $TS($S($Q(_), $EXPECT($L120, fail, 'InlineTypeArguments "<"'), $P(InlineTypeArgument), $Q(_), $EXPECT($L25, fail, 'InlineTypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-      return { ts: true, children: $0 };
-    });
-    function InlineTypeArguments(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("InlineTypeArguments", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("InlineTypeArguments", state, InlineTypeArguments$0(state));
-        if (state.events)
-          state.events.exit?.("InlineTypeArguments", state, result, eventData);
-        return result;
-      } else {
-        const result = InlineTypeArguments$0(state);
-        if (state.events)
-          state.events.exit?.("InlineTypeArguments", state, result, eventData);
-        return result;
-      }
-    }
-    var InlineTypeArgument$0 = $S($Q(_), Type, InlineTypeArgumentDelimiter);
-    function InlineTypeArgument(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("InlineTypeArgument", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("InlineTypeArgument", state, InlineTypeArgument$0(state));
-        if (state.events)
-          state.events.exit?.("InlineTypeArgument", state, result, eventData);
-        return result;
-      } else {
-        const result = InlineTypeArgument$0(state);
-        if (state.events)
-          state.events.exit?.("InlineTypeArgument", state, result, eventData);
-        return result;
-      }
-    }
-    var InlineTypeArgumentDelimiter$0 = $S($Q(_), Comma);
-    var InlineTypeArgumentDelimiter$1 = $Y($S($Q(_), $EXPECT($L25, fail, 'InlineTypeArgumentDelimiter ">"')));
-    function InlineTypeArgumentDelimiter(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("InlineTypeArgumentDelimiter", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("InlineTypeArgumentDelimiter", state, InlineTypeArgumentDelimiter$0(state) || InlineTypeArgumentDelimiter$1(state));
-        if (state.events)
-          state.events.exit?.("InlineTypeArgumentDelimiter", state, result, eventData);
-        return result;
-      } else {
-        const result = InlineTypeArgumentDelimiter$0(state) || InlineTypeArgumentDelimiter$1(state);
-        if (state.events)
-          state.events.exit?.("InlineTypeArgumentDelimiter", state, result, eventData);
-        return result;
-      }
-    }
-    var CompactTypeArguments$0 = $TS($S($EXPECT($L120, fail, 'CompactTypeArguments "<"'), $P(TypeArgument), __, $EXPECT($L25, fail, 'CompactTypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4) {
-      return { ts: true, children: $0 };
-    });
-    function CompactTypeArguments(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("CompactTypeArguments", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("CompactTypeArguments", state, CompactTypeArguments$0(state));
-        if (state.events)
-          state.events.exit?.("CompactTypeArguments", state, result, eventData);
-        return result;
-      } else {
-        const result = CompactTypeArguments$0(state);
-        if (state.events)
-          state.events.exit?.("CompactTypeArguments", state, result, eventData);
-        return result;
-      }
-    }
     var TypeArgument$0 = $S(__, Type, TypeArgumentDelimiter);
     function TypeArgument(state) {
       let eventData;
@@ -16150,6 +16080,16 @@ ${input.slice(result.pos)}
           };
           module.prelude.push(["", ["const ", moduloRef, typeSuffix, " = (a, b) => (a % b + b) % b", "\n"]]);
         },
+        returnSymbol(ref) {
+          module.prelude.push({
+            children: [
+              "const ",
+              ref,
+              ` = Symbol("return")';
+`
+            ]
+          });
+        },
         JSX(jsxRef) {
           module.prelude.push({
             ts: true,
@@ -16446,35 +16386,19 @@ ${input.slice(result.pos)}
         if (!node)
           return;
         switch (node.type) {
-          case "AssignmentExpression":
-            node.children.unshift(ref, ".push(");
-            node.children.push(")");
-            return;
-          case "Identifier":
-            node.children.unshift(ref, ".push(");
-            node.children.push(")");
-            return;
           case "BlockStatement":
             insertPush(node.expressions[node.expressions.length - 1], ref);
             return;
-          case "ObjectBindingPattern":
-          case "ObjectExpression":
-            module.insertTrimmingSpace(node.children[0], "");
-            node.children.unshift(ref, ".push(");
-            node.children.push(")");
-            return;
           case "CaseBlock":
             node.clauses.forEach((clause) => {
               insertPush(clause, ref);
             });
             return;
-          case "CaseClause":
-            return;
           case "WhenClause":
-            insertPush(node.expressions[node.expressions.length - 1], ref);
+            insertPush(node.block, ref);
             return;
           case "DefaultClause":
-            insertPush(node.expressions[node.expressions.length - 1], ref);
+            insertPush(node.block, ref);
             return;
         }
         if (!Array.isArray(node))
@@ -16520,41 +16444,35 @@ ${input.slice(result.pos)}
         node.splice(1, 0, ref, ".push(");
         node.push(")");
       }
+      function wrapWithReturn(expression) {
+        const children = expression ? ["return ", expression] : ["return"];
+        return {
+          type: "ReturnStatement",
+          children
+        };
+      }
       function insertReturn(node) {
         if (!node)
           return;
         switch (node.type) {
-          case "AssignmentExpression":
-            node.children.unshift("return ");
-            return;
-          case "Identifier":
-            node.children.unshift("return ");
-            return;
           case "BlockStatement":
             insertReturn(node.expressions[node.expressions.length - 1]);
             return;
-          case "ObjectBindingPattern":
-          case "ObjectExpression":
-            module.insertTrimmingSpace(node.children[0], "");
-            node.children.unshift("return ");
-            return;
           case "CaseBlock":
             node.clauses.forEach((clause) => {
               insertReturn(clause);
             });
             return;
-          case "CaseClause":
-            return;
           case "WhenClause":
             node.children.splice(node.children.indexOf(node.break), 1);
-            if (node.expressions.length === 0) {
-              node.expressions.push("return");
+            if (node.block.length === 0) {
+              node.block.push(wrapWithReturn());
               return;
             }
-            insertReturn(node.expressions[node.expressions.length - 1]);
+            insertReturn(node.block);
             return;
           case "DefaultClause":
-            insertReturn(node.expressions[node.expressions.length - 1]);
+            insertReturn(node.block);
             return;
         }
         if (!Array.isArray(node))
@@ -16586,7 +16504,7 @@ ${input.slice(result.pos)}
             if (exp.children[3])
               insertReturn(exp.children[3][2]);
             else
-              exp.children.push(["\n", indent, "return"]);
+              exp.children.push(["\n", indent, wrapWithReturn()]);
             return;
           case "SwitchStatement":
             insertReturn(exp.children[2]);
@@ -16599,7 +16517,8 @@ ${input.slice(result.pos)}
         }
         if (node[node.length - 1]?.type === "SemicolonDelimiter")
           return;
-        node.splice(1, 0, "return ");
+        const returnStatement = wrapWithReturn(node[1]);
+        node.splice(1, 1, returnStatement);
       }
       module.makeLeftHandSideExpression = function(exp) {
         switch (exp.type) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.5.36",
+  "version": "0.5.37",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",