npm - @danielx/civet - Versions diffs - 0.6.5 → 0.6.6 - Mend

@danielx/civet 0.6.5 → 0.6.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/browser.js CHANGED Viewed

@@ -2463,6 +2463,7 @@ var Civet = (() => {
         literalValue,
         makeAsConst,
         makeLeftHandSideExpression,
+        maybeRef,
         modifyString,
         needsRef,
         processBinaryOpExpression,
@@ -6330,11 +6331,11 @@ ${input.slice(result.pos)}
       }
       var MemberBracketContent$0 = $TS($S(OpenBracket, $C(SliceParameters, PostfixedExpression), __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
         var open = $1;
-        var exp = $2;
+        var expression = $2;
         var ws = $3;
         var close = $4;
-        if (exp.type === "SliceParameters") {
-          const { start, end, children } = exp;
+        if (expression.type === "SliceParameters") {
+          const { start, end, children } = expression;
           return {
             type: "SliceExpression",
             start,
@@ -6348,7 +6349,8 @@ ${input.slice(result.pos)}
         }
         return {
           type: "Index",
-          children: $0
+          children: $0,
+          expression
         };
       });
       var MemberBracketContent$1 = $TS($S(Dot, $C(TemplateLiteral, StringLiteral)), function($skip, $loc, $0, $1, $2) {
@@ -9739,12 +9741,40 @@ ${input.slice(result.pos)}
         const last = lastAccessInCallExpression(value);
         if (!last)
           return $skip;
-        let name;
-        if (last.type === "Index") {
-          name = {
-            type: "ComputedPropertyName",
-            children: last.children
-          };
+        let name, hoistDec, ref, refAssignment;
+        const { expression, type } = last;
+        if (type === "Index") {
+          ref = maybeRef(expression);
+          if (ref !== expression) {
+            hoistDec = {
+              type: "Declaration",
+              children: ["let ", ref]
+            };
+            refAssignment = {
+              type: "Assignment",
+              children: [ref, " = ", expression]
+            };
+            name = {
+              type: "ComputedPropertyName",
+              children: [last.children[0], "(", refAssignment, ",", ref, ")", ...last.children.slice(-2)]
+            };
+            value = {
+              ...value,
+              children: value.children.map((c) => {
+                if (c === last)
+                  return {
+                    type: "Index",
+                    children: ["[", ref, "]"]
+                  };
+                return c;
+              })
+            };
+          } else {
+            name = {
+              type: "ComputedPropertyName",
+              children: last.children
+            };
+          }
         } else {
           ({ name } = last);
           if (!name)
@@ -9755,7 +9785,8 @@ ${input.slice(result.pos)}
           children: [ws, name, ": ", value],
           name,
           value,
-          names: []
+          names: [],
+          hoistDec
         };
       });
       function PropertyDefinition(state) {
@@ -23375,6 +23406,7 @@ ${input.slice(result.pos)}
         lastAccessInCallExpression,
         literalValue,
         makeLeftHandSideExpression,
+        maybeRef,
         modifyString,
         processBinaryOpExpression,
         processCallMemberExpression,

package/dist/main.js CHANGED Viewed

@@ -2462,6 +2462,7 @@ var require_lib = __commonJS({
       literalValue,
       makeAsConst,
       makeLeftHandSideExpression,
+      maybeRef,
       modifyString,
       needsRef,
       processBinaryOpExpression,
@@ -6329,11 +6330,11 @@ ${input.slice(result.pos)}
     }
     var MemberBracketContent$0 = $TS($S(OpenBracket, $C(SliceParameters, PostfixedExpression), __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
       var open = $1;
-      var exp = $2;
+      var expression = $2;
       var ws = $3;
       var close = $4;
-      if (exp.type === "SliceParameters") {
-        const { start, end, children } = exp;
+      if (expression.type === "SliceParameters") {
+        const { start, end, children } = expression;
         return {
           type: "SliceExpression",
           start,
@@ -6347,7 +6348,8 @@ ${input.slice(result.pos)}
       }
       return {
         type: "Index",
-        children: $0
+        children: $0,
+        expression
       };
     });
     var MemberBracketContent$1 = $TS($S(Dot, $C(TemplateLiteral, StringLiteral)), function($skip, $loc, $0, $1, $2) {
@@ -9738,12 +9740,40 @@ ${input.slice(result.pos)}
       const last = lastAccessInCallExpression(value);
       if (!last)
         return $skip;
-      let name;
-      if (last.type === "Index") {
-        name = {
-          type: "ComputedPropertyName",
-          children: last.children
-        };
+      let name, hoistDec, ref, refAssignment;
+      const { expression, type } = last;
+      if (type === "Index") {
+        ref = maybeRef(expression);
+        if (ref !== expression) {
+          hoistDec = {
+            type: "Declaration",
+            children: ["let ", ref]
+          };
+          refAssignment = {
+            type: "Assignment",
+            children: [ref, " = ", expression]
+          };
+          name = {
+            type: "ComputedPropertyName",
+            children: [last.children[0], "(", refAssignment, ",", ref, ")", ...last.children.slice(-2)]
+          };
+          value = {
+            ...value,
+            children: value.children.map((c) => {
+              if (c === last)
+                return {
+                  type: "Index",
+                  children: ["[", ref, "]"]
+                };
+              return c;
+            })
+          };
+        } else {
+          name = {
+            type: "ComputedPropertyName",
+            children: last.children
+          };
+        }
       } else {
         ({ name } = last);
         if (!name)
@@ -9754,7 +9784,8 @@ ${input.slice(result.pos)}
         children: [ws, name, ": ", value],
         name,
         value,
-        names: []
+        names: [],
+        hoistDec
       };
     });
     function PropertyDefinition(state) {
@@ -23374,6 +23405,7 @@ ${input.slice(result.pos)}
       lastAccessInCallExpression,
       literalValue,
       makeLeftHandSideExpression,
+      maybeRef,
       modifyString,
       processBinaryOpExpression,
       processCallMemberExpression,

package/dist/main.mjs CHANGED Viewed

@@ -2460,6 +2460,7 @@ var require_lib = __commonJS({
       literalValue,
       makeAsConst,
       makeLeftHandSideExpression,
+      maybeRef,
       modifyString,
       needsRef,
       processBinaryOpExpression,
@@ -6327,11 +6328,11 @@ ${input.slice(result.pos)}
     }
     var MemberBracketContent$0 = $TS($S(OpenBracket, $C(SliceParameters, PostfixedExpression), __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
       var open = $1;
-      var exp = $2;
+      var expression = $2;
       var ws = $3;
       var close = $4;
-      if (exp.type === "SliceParameters") {
-        const { start, end, children } = exp;
+      if (expression.type === "SliceParameters") {
+        const { start, end, children } = expression;
         return {
           type: "SliceExpression",
           start,
@@ -6345,7 +6346,8 @@ ${input.slice(result.pos)}
       }
       return {
         type: "Index",
-        children: $0
+        children: $0,
+        expression
       };
     });
     var MemberBracketContent$1 = $TS($S(Dot, $C(TemplateLiteral, StringLiteral)), function($skip, $loc, $0, $1, $2) {
@@ -9736,12 +9738,40 @@ ${input.slice(result.pos)}
       const last = lastAccessInCallExpression(value);
       if (!last)
         return $skip;
-      let name;
-      if (last.type === "Index") {
-        name = {
-          type: "ComputedPropertyName",
-          children: last.children
-        };
+      let name, hoistDec, ref, refAssignment;
+      const { expression, type } = last;
+      if (type === "Index") {
+        ref = maybeRef(expression);
+        if (ref !== expression) {
+          hoistDec = {
+            type: "Declaration",
+            children: ["let ", ref]
+          };
+          refAssignment = {
+            type: "Assignment",
+            children: [ref, " = ", expression]
+          };
+          name = {
+            type: "ComputedPropertyName",
+            children: [last.children[0], "(", refAssignment, ",", ref, ")", ...last.children.slice(-2)]
+          };
+          value = {
+            ...value,
+            children: value.children.map((c) => {
+              if (c === last)
+                return {
+                  type: "Index",
+                  children: ["[", ref, "]"]
+                };
+              return c;
+            })
+          };
+        } else {
+          name = {
+            type: "ComputedPropertyName",
+            children: last.children
+          };
+        }
       } else {
         ({ name } = last);
         if (!name)
@@ -9752,7 +9782,8 @@ ${input.slice(result.pos)}
         children: [ws, name, ": ", value],
         name,
         value,
-        names: []
+        names: [],
+        hoistDec
       };
     });
     function PropertyDefinition(state) {
@@ -23372,6 +23403,7 @@ ${input.slice(result.pos)}
       lastAccessInCallExpression,
       literalValue,
       makeLeftHandSideExpression,
+      maybeRef,
       modifyString,
       processBinaryOpExpression,
       processCallMemberExpression,

package/package.json CHANGED Viewed

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