@danielx/civet 0.4.25 → 0.4.27

package/README.md

@@ -118,13 +118,11 @@ Civet.
 - `for ... when <condition>` (use `continue if exp` inside loop, `"civet coffeeCompat"`, or `"civet coffeeForLoops"`)
 - `a ? b` (use `a ?? b`, though it doesn't check for undeclared variables, `"civet coffeeCompat"`, or `"civet coffeeBinaryExistential"` enables this at the cost of losing JS ternary operator)
 - `a of b` (use `a in b` matching JS, or `"civet coffeeCompat"`, or `"civet coffeeOf"`)
-- Iteration expression results
 - Backtick embedded JS (replaced by template literals)
 - Will likely add later
   - Optional assignment `x?.y = 3` -> `x != null ? x.y = 3 : undefined`
   - Conditional assignment `a?[x] = 3` -> `a ? a[x] = 3 : undefined`
 - Might add later
-  - Rest parameter in any assignment position
   - Multiple slice assignment `otherNumbers[0...] = numbers[3..6] = [-3, -4, -5, -6]`
 
 Things Changed from CoffeeScript
@@ -242,6 +240,8 @@ could be a valid property `1.e10` -> `1..e10`. The workaround is to add a traili
     @@methodDecorator
     method() {}
   ```
+- `when` inside switch automatically breaks and adds block scope.
+- `else` inside switch adds block scope.
 - No whitespace between unary operators and operands. Mandatory whitespace between condition and ternary `?` ex. `x ? a : b` since `x?` is the unary existential operator.
 - No labels (yet...)
 

package/dist/browser.js

@@ -6517,9 +6517,10 @@ ${input.slice(result.pos)}
         var expressions = value[2];
         return { "type": "CaseClause", "cases": cases, "expressions": expressions, "children": value };
       });
-      var CaseClause$1 = $TS($S(When, CaseExpressionList, $C(ThenClause, NestedBlockStatements), InsertBreak), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var CaseClause$1 = $TS($S(When, CaseExpressionList, InsertOpenBrace, $C(ThenClause, NestedBlockStatements), InsertBreak, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
         var cases = $2;
-        var expressions = $3;
+        var expressions = $4;
+        var b = $5;
         if (expressions.expressions) {
           expressions = expressions.expressions;
         }
@@ -6527,6 +6528,7 @@ ${input.slice(result.pos)}
           type: "WhenClause",
           cases,
           expressions,
+          break: b,
           children: $0
         };
       });
@@ -6540,8 +6542,8 @@ ${input.slice(result.pos)}
           children: $0
         };
       });
-      var CaseClause$3 = $TS($S(Else, ImpliedColon, $C(NestedBlockStatements, $S($Q(TrailingComment), Statement))), function($skip, $loc, $0, $1, $2, $3) {
-        var expressions = $3;
+      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;
         $1.token = "default";
         if (expressions.expressions)
           expressions = expressions.expressions;
@@ -11041,6 +11043,7 @@ ${input.slice(result.pos)}
       var TypeUnaryOp$0 = $EXPECT($L153, fail, 'TypeUnaryOp "keyof"');
       var TypeUnaryOp$1 = $EXPECT($L135, fail, 'TypeUnaryOp "typeof"');
       var TypeUnaryOp$2 = $EXPECT($L154, fail, 'TypeUnaryOp "infer"');
+      var TypeUnaryOp$3 = $EXPECT($L151, fail, 'TypeUnaryOp "readonly"');
       function TypeUnaryOp(state) {
         if (state.events) {
           const result = state.events.enter?.("TypeUnaryOp", state);
@@ -11048,12 +11051,12 @@ ${input.slice(result.pos)}
             return result.cache;
         }
         if (state.tokenize) {
-          const result = $TOKEN("TypeUnaryOp", state, TypeUnaryOp$0(state) || TypeUnaryOp$1(state) || TypeUnaryOp$2(state));
+          const result = $TOKEN("TypeUnaryOp", state, TypeUnaryOp$0(state) || TypeUnaryOp$1(state) || TypeUnaryOp$2(state) || TypeUnaryOp$3(state));
           if (state.events)
             state.events.exit?.("TypeUnaryOp", state, result);
           return result;
         } else {
-          const result = TypeUnaryOp$0(state) || TypeUnaryOp$1(state) || TypeUnaryOp$2(state);
+          const result = TypeUnaryOp$0(state) || TypeUnaryOp$1(state) || TypeUnaryOp$2(state) || TypeUnaryOp$3(state);
           if (state.events)
             state.events.exit?.("TypeUnaryOp", state, result);
           return result;
@@ -12418,7 +12421,7 @@ ${input.slice(result.pos)}
             case "CaseClause":
               return;
             case "WhenClause":
-              node.children.pop();
+              node.children.splice(node.children.indexOf(node.break), 1);
               insertReturn(node.expressions[node.expressions.length - 1]);
               return;
             case "DefaultClause":

package/dist/main.js

@@ -6516,9 +6516,10 @@ ${input.slice(result.pos)}
       var expressions = value[2];
       return { "type": "CaseClause", "cases": cases, "expressions": expressions, "children": value };
     });
-    var CaseClause$1 = $TS($S(When, CaseExpressionList, $C(ThenClause, NestedBlockStatements), InsertBreak), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var CaseClause$1 = $TS($S(When, CaseExpressionList, InsertOpenBrace, $C(ThenClause, NestedBlockStatements), InsertBreak, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
       var cases = $2;
-      var expressions = $3;
+      var expressions = $4;
+      var b = $5;
       if (expressions.expressions) {
         expressions = expressions.expressions;
       }
@@ -6526,6 +6527,7 @@ ${input.slice(result.pos)}
         type: "WhenClause",
         cases,
         expressions,
+        break: b,
         children: $0
       };
     });
@@ -6539,8 +6541,8 @@ ${input.slice(result.pos)}
         children: $0
       };
     });
-    var CaseClause$3 = $TS($S(Else, ImpliedColon, $C(NestedBlockStatements, $S($Q(TrailingComment), Statement))), function($skip, $loc, $0, $1, $2, $3) {
-      var expressions = $3;
+    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;
       $1.token = "default";
       if (expressions.expressions)
         expressions = expressions.expressions;
@@ -11040,6 +11042,7 @@ ${input.slice(result.pos)}
     var TypeUnaryOp$0 = $EXPECT($L153, fail, 'TypeUnaryOp "keyof"');
     var TypeUnaryOp$1 = $EXPECT($L135, fail, 'TypeUnaryOp "typeof"');
     var TypeUnaryOp$2 = $EXPECT($L154, fail, 'TypeUnaryOp "infer"');
+    var TypeUnaryOp$3 = $EXPECT($L151, fail, 'TypeUnaryOp "readonly"');
     function TypeUnaryOp(state) {
       if (state.events) {
         const result = state.events.enter?.("TypeUnaryOp", state);
@@ -11047,12 +11050,12 @@ ${input.slice(result.pos)}
           return result.cache;
       }
       if (state.tokenize) {
-        const result = $TOKEN("TypeUnaryOp", state, TypeUnaryOp$0(state) || TypeUnaryOp$1(state) || TypeUnaryOp$2(state));
+        const result = $TOKEN("TypeUnaryOp", state, TypeUnaryOp$0(state) || TypeUnaryOp$1(state) || TypeUnaryOp$2(state) || TypeUnaryOp$3(state));
         if (state.events)
           state.events.exit?.("TypeUnaryOp", state, result);
         return result;
       } else {
-        const result = TypeUnaryOp$0(state) || TypeUnaryOp$1(state) || TypeUnaryOp$2(state);
+        const result = TypeUnaryOp$0(state) || TypeUnaryOp$1(state) || TypeUnaryOp$2(state) || TypeUnaryOp$3(state);
         if (state.events)
           state.events.exit?.("TypeUnaryOp", state, result);
         return result;
@@ -12417,7 +12420,7 @@ ${input.slice(result.pos)}
           case "CaseClause":
             return;
           case "WhenClause":
-            node.children.pop();
+            node.children.splice(node.children.indexOf(node.break), 1);
             insertReturn(node.expressions[node.expressions.length - 1]);
             return;
           case "DefaultClause":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.4.25",
+  "version": "0.4.27",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "exports": {