@danielx/civet 0.4.15 → 0.4.16

package/README.md

@@ -99,6 +99,7 @@ Things Kept from CoffeeScript
 - Multiple `,` separated `case`/`when` expressions
 - `else` -> `default` in `switch`
 - Array slices `list[0...2]` -> `list.slice(0, 2)`
+- Slice assignment `numbers[3..6] = [-3, -4, -5, -6]`
 - Implicit returns
 - Simplified number method calls `1.toFixed()` -> `1..toFixed()`
 - JSX 😿
@@ -116,6 +117,7 @@ Things Removed from CoffeeScript
 - 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`
   - `switch` expressions
   - `if` expressions
   - Implicit `var` declarations (in compat mode only)
@@ -123,9 +125,9 @@ Things Removed from CoffeeScript
   - Braceless inline objects `x = coolStory: true`
   - Comprensions
   - `///` Heregexp
-  - Slice assignment `numbers[3..6] = [-3, -4, -5, -6]` (use `numbers.splice(3, 4, -3, -4, -5, -6)`)
   - Ranges `[0...10]`
   - Rest parameter in any assignment position
+  - Multiple slice assignment `otherNumbers[0...] = numbers[3..6] = [-3, -4, -5, -6]`
 
 Things Changed from CoffeeScript
 ---

package/dist/browser.js

@@ -1201,8 +1201,37 @@ var Civet = (() => {
       var AssignmentExpressionRest$0 = AwaitExpression;
       var AssignmentExpressionRest$1 = YieldExpression;
       var AssignmentExpressionRest$2 = $S($E($S(Async, __)), ArrowFunction);
-      var AssignmentExpressionRest$3 = $T($S($P($S(__, LeftHandSideExpression, __, AssignmentOp)), Expression), function(value) {
-        return { "type": "AssignmentExpression", "children": value };
+      var AssignmentExpressionRest$3 = $TS($S($P($S(__, LeftHandSideExpression, __, AssignmentOp)), Expression), function($skip, $loc, $0, $1, $2) {
+        const lastAssignment = $1[$1.length - 1];
+        if (lastAssignment[3].token === "=") {
+          const lhs = lastAssignment[1];
+          if (Array.isArray(lhs) && lhs.length > 1) {
+            const props = lhs[lhs.length - 1];
+            if (Array.isArray(props)) {
+              const lastProp = props[props.length - 1];
+              if (lastProp.type === "SliceExpression") {
+                const { start, end, children: c } = lastProp;
+                c[0].token = ".splice(";
+                c[1] = start;
+                c[2] = ", ";
+                if (end)
+                  c[3] = [end, " - ", start];
+                else
+                  c[3] = ["1/0"];
+                c[4] = [", ...", $2];
+                c[5] = ")";
+                lastAssignment.pop();
+                if (module.isWhitespaceOrEmpty(lastAssignment[2]))
+                  lastAssignment.pop();
+                return $1;
+              }
+            }
+          }
+        }
+        return {
+          type: "AssignmentExpression",
+          children: $0
+        };
       });
       var AssignmentExpressionRest$4 = ConditionalExpression;
       function AssignmentExpressionRest(state) {
@@ -1547,7 +1576,11 @@ var Civet = (() => {
           return MemberExpression$0(state) || MemberExpression$1(state) || MemberExpression$2(state);
         }
       }
-      var MemberExpressionRest$0 = $S($E($C(OptionalShorthand, NonNullAssertion)), MemberBracketContent);
+      var MemberExpressionRest$0 = $TS($S($E($C(OptionalShorthand, NonNullAssertion)), MemberBracketContent), function($skip, $loc, $0, $1, $2) {
+        if ($1)
+          return $0;
+        return $2;
+      });
       var MemberExpressionRest$1 = $S($E($S($Y(EOS), IndentedFurther)), PropertyAccess);
       var MemberExpressionRest$2 = $TS($S($E($S($Y(EOS), IndentedFurther)), $EXPECT($L12, fail, 'MemberExpressionRest "::"'), $E(IdentifierName)), function($skip, $loc, $0, $1, $2, $3) {
         var id = $3;
@@ -1574,17 +1607,23 @@ var Civet = (() => {
           if (!end) {
             return {
               type: "SliceExpression",
+              start: $2,
+              end: void 0,
               children: [$1, $2, $4, $5]
             };
           }
           if (inclusive) {
             return {
               type: "SliceExpression",
+              start: $2,
+              end: ["1 + ", end],
               children: [$1, $2, sep, ["1 + ", end, " || 1/0"], $4, $5]
             };
           }
           return {
             type: "SliceExpression",
+            start: $2,
+            end,
             children: [$1, $2, sep, end, $4, $5]
           };
         }

package/dist/main.js

@@ -1200,8 +1200,37 @@ var require_parser = __commonJS({
     var AssignmentExpressionRest$0 = AwaitExpression;
     var AssignmentExpressionRest$1 = YieldExpression;
     var AssignmentExpressionRest$2 = $S($E($S(Async, __)), ArrowFunction);
-    var AssignmentExpressionRest$3 = $T($S($P($S(__, LeftHandSideExpression, __, AssignmentOp)), Expression), function(value) {
-      return { "type": "AssignmentExpression", "children": value };
+    var AssignmentExpressionRest$3 = $TS($S($P($S(__, LeftHandSideExpression, __, AssignmentOp)), Expression), function($skip, $loc, $0, $1, $2) {
+      const lastAssignment = $1[$1.length - 1];
+      if (lastAssignment[3].token === "=") {
+        const lhs = lastAssignment[1];
+        if (Array.isArray(lhs) && lhs.length > 1) {
+          const props = lhs[lhs.length - 1];
+          if (Array.isArray(props)) {
+            const lastProp = props[props.length - 1];
+            if (lastProp.type === "SliceExpression") {
+              const { start, end, children: c } = lastProp;
+              c[0].token = ".splice(";
+              c[1] = start;
+              c[2] = ", ";
+              if (end)
+                c[3] = [end, " - ", start];
+              else
+                c[3] = ["1/0"];
+              c[4] = [", ...", $2];
+              c[5] = ")";
+              lastAssignment.pop();
+              if (module2.isWhitespaceOrEmpty(lastAssignment[2]))
+                lastAssignment.pop();
+              return $1;
+            }
+          }
+        }
+      }
+      return {
+        type: "AssignmentExpression",
+        children: $0
+      };
     });
     var AssignmentExpressionRest$4 = ConditionalExpression;
     function AssignmentExpressionRest(state) {
@@ -1546,7 +1575,11 @@ var require_parser = __commonJS({
         return MemberExpression$0(state) || MemberExpression$1(state) || MemberExpression$2(state);
       }
     }
-    var MemberExpressionRest$0 = $S($E($C(OptionalShorthand, NonNullAssertion)), MemberBracketContent);
+    var MemberExpressionRest$0 = $TS($S($E($C(OptionalShorthand, NonNullAssertion)), MemberBracketContent), function($skip, $loc, $0, $1, $2) {
+      if ($1)
+        return $0;
+      return $2;
+    });
     var MemberExpressionRest$1 = $S($E($S($Y(EOS), IndentedFurther)), PropertyAccess);
     var MemberExpressionRest$2 = $TS($S($E($S($Y(EOS), IndentedFurther)), $EXPECT($L12, fail, 'MemberExpressionRest "::"'), $E(IdentifierName)), function($skip, $loc, $0, $1, $2, $3) {
       var id = $3;
@@ -1573,17 +1606,23 @@ var require_parser = __commonJS({
         if (!end) {
           return {
             type: "SliceExpression",
+            start: $2,
+            end: void 0,
             children: [$1, $2, $4, $5]
           };
         }
         if (inclusive) {
           return {
             type: "SliceExpression",
+            start: $2,
+            end: ["1 + ", end],
             children: [$1, $2, sep, ["1 + ", end, " || 1/0"], $4, $5]
           };
         }
         return {
           type: "SliceExpression",
+          start: $2,
+          end,
           children: [$1, $2, sep, end, $4, $5]
         };
       }

package/package.json

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