@danielx/civet 0.5.5 → 0.5.7

package/README.md

@@ -11,6 +11,11 @@ The CoffeeScript of TypeScript. Much closer to ES2015+ (for better or worse).
 - [Online Civet Playground](https://civet-web.vercel.app/)
 - [Civet VSCode Extension](https://marketplace.visualstudio.com/items?itemName=DanielX.civet)
 - [Discord Server](https://discord.gg/xkrW9GebBc)
+- Plugins for
+  [Vite](https://github.com/lorefnon/vite-plugin-civet),
+  [esbuild](source/esbuild-plugin.civet),
+  [ESM module resolution](source/esm.civet)
+- Starter templates for [Solid](https://github.com/orenelbaum/solid-civet-template) and [Solid Start](https://github.com/orenelbaum/solid-start-civet-template)
 
 Quickstart Guide
 ---
@@ -240,7 +245,7 @@ Things Changed from ES6
   behave more differently than they already do is bad. Passing an anonymous function to an
   application without parens is also convenient.
 - `for(i of x) ...` defaults to const declaration → `for(const i of x) ...`
-- Disallow comma operator in conditionals and many other places. `if x, y` is not allowed.
+- Disallow comma operator in conditionals and many other places. `if x, y` is not allowed. But `for i = 0, l = a.length; i < l; i++, i *= 2` is allowed.
 - Comma operator in `case`/`when` instead becomes multiple conditions.
 - Numbers can't end with a dot (otherwise would be ambiguous with CoffeeScript slices `y[0..x]`). This also implies that you can't access properties
 of numbers with `1..toString()` use `1.toString()` instead. When exponent follows a dot it is treated as a property access since an exponent

package/dist/browser.js

@@ -2302,9 +2302,8 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var ClassElement$0 = MethodDefinition;
-      var ClassElement$1 = $S($E($S(Static, $Q(TrailingComment))), $C(MethodDefinition, FieldDefinition));
-      var ClassElement$2 = $S(Static, BracedBlock);
+      var ClassElement$0 = $S($E(Decorators), $E($S(Static, $Q(TrailingComment))), $C(MethodDefinition, FieldDefinition));
+      var ClassElement$1 = $S(Static, BracedBlock);
       function ClassElement(state) {
         if (state.events) {
           const result = state.events.enter?.("ClassElement", state);
@@ -2312,12 +2311,12 @@ ${input.slice(result.pos)}
             return result.cache;
         }
         if (state.tokenize) {
-          const result = $TOKEN("ClassElement", state, ClassElement$0(state) || ClassElement$1(state) || ClassElement$2(state));
+          const result = $TOKEN("ClassElement", state, ClassElement$0(state) || ClassElement$1(state));
           if (state.events)
             state.events.exit?.("ClassElement", state, result);
           return result;
         } else {
-          const result = ClassElement$0(state) || ClassElement$1(state) || ClassElement$2(state);
+          const result = ClassElement$0(state) || ClassElement$1(state);
           if (state.events)
             state.events.exit?.("ClassElement", state, result);
           return result;
@@ -2722,6 +2721,7 @@ ${input.slice(result.pos)}
         }
       }
       var SuperProperty$0 = $S($EXPECT($L13, fail, 'SuperProperty "super["'), ExtendedExpression, __, CloseBracket);
+      var SuperProperty$1 = $S($EXPECT($L10, fail, 'SuperProperty "super"'), $N($C(QuestionMark, NonNullAssertion)), PropertyAccess);
       function SuperProperty(state) {
         if (state.events) {
           const result = state.events.enter?.("SuperProperty", state);
@@ -2729,12 +2729,12 @@ ${input.slice(result.pos)}
             return result.cache;
         }
         if (state.tokenize) {
-          const result = $TOKEN("SuperProperty", state, SuperProperty$0(state));
+          const result = $TOKEN("SuperProperty", state, SuperProperty$0(state) || SuperProperty$1(state));
           if (state.events)
             state.events.exit?.("SuperProperty", state, result);
           return result;
         } else {
-          const result = SuperProperty$0(state);
+          const result = SuperProperty$0(state) || SuperProperty$1(state);
           if (state.events)
             state.events.exit?.("SuperProperty", state, result);
           return result;
@@ -5103,15 +5103,13 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var MethodDefinition$0 = $TS($S($E(Decorators), MethodSignature, BracedBlock), function($skip, $loc, $0, $1, $2, $3) {
-        var decorators = $1;
-        var signature = $2;
-        var block = $3;
+      var MethodDefinition$0 = $TS($S(MethodSignature, BracedBlock), function($skip, $loc, $0, $1, $2) {
+        var signature = $1;
+        var block = $2;
         return {
           type: "MethodDefinition",
           children: $0,
           name: signature.name,
-          decorators,
           signature,
           block,
           parameters: signature.parameters
@@ -7001,8 +6999,8 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var CatchParameter$0 = BindingIdentifier;
-      var CatchParameter$1 = BindingPattern;
+      var CatchParameter$0 = $S(BindingIdentifier, $E(TypeSuffix));
+      var CatchParameter$1 = $S(BindingPattern, $E(TypeSuffix));
       function CatchParameter(state) {
         if (state.events) {
           const result = state.events.enter?.("CatchParameter", state);
@@ -13727,12 +13725,12 @@ ${input.slice(result.pos)}
           if (node == null)
             return [];
           if (Array.isArray(node)) {
-            return node.flatMap((n) => gatherNodes(n, predicate));
+            return node.flatMap((n) => gatherRecursive(n, predicate));
           }
           if (predicate(node)) {
             return [node];
           }
-          return gatherNodes(node.children, predicate);
+          return gatherRecursive(node.children, predicate);
         }
         function gatherRecursiveAll(node, predicate) {
           if (node == null)
@@ -13911,7 +13909,7 @@ ${input.slice(result.pos)}
           }
         };
         module.convertMethodToFunction = function(method) {
-          const { decorators, signature, block } = method;
+          const { signature, block } = method;
           let opening = signature.children[0];
           if (opening) {
             if (opening[0].type === "GetOrSet") {
@@ -13929,7 +13927,6 @@ ${input.slice(result.pos)}
             id: signature.name,
             type: "FunctionExpression",
             children: [
-              decorators,
               [opening, ...signature.children.slice(1)],
               block
             ],
@@ -14050,6 +14047,13 @@ ${input.slice(result.pos)}
           function hasDec(name) {
             return scopes.some((s) => s.has(name));
           }
+          function findVarDecs(statements2, decs) {
+            const declarationNames = gatherRecursive(
+              statements2,
+              (node) => node.type === "Declaration" && node.children && node.children.length > 0 && node.children[0].token && node.children[0].token.startsWith("var") || node.type === "FunctionExpression"
+            ).filter((node) => node.type === "Declaration").flatMap((node) => node.names);
+            return new Set(declarationNames);
+          }
           function insertBeforeAssignment(assignment, content) {
             if (assignment.children && assignment.children.length) {
               let indent = assignment.children[0][0][0];
@@ -14062,10 +14066,11 @@ ${input.slice(result.pos)}
           scopes.push(currentScope);
           const fnNodes = gatherNodes(statements, (s) => s.type === "FunctionExpression");
           const forNodes = gatherNodes(statements, (s) => s.type === "ForStatement");
-          const nodes = gatherNodes(statements, (s) => s.type === "BlockStatement" || s.type === "AssignmentExpression");
+          const nodes = gatherNodes(statements, (s) => s.type === "BlockStatement" || s.type === "AssignmentExpression" || s.type === "Declaration");
+          let declaredIdentifiers = findVarDecs(statements);
           for (const node of nodes) {
             if (node.type == "AssignmentExpression") {
-              let undeclaredIdentifiers = node.names.filter((name) => !hasDec(name));
+              let undeclaredIdentifiers = node.names.filter((name) => !(hasDec(name) || declaredIdentifiers.has(name)));
               if (node.children.length)
                 createLetDecs(node.children, scopes);
               undeclaredIdentifiers.forEach((name) => currentScope.add(name));
@@ -14074,6 +14079,8 @@ ${input.slice(result.pos)}
               } else if (undeclaredIdentifiers.length > 0) {
                 insertBeforeAssignment(node, ["let ", undeclaredIdentifiers.join(", "), "\n"]);
               }
+            } else if (node.type == "Declaration") {
+              node.names.forEach((name) => currentScope.add(name));
             } else {
               let block = node;
               let fnNode = fnNodes.find((fnNode2) => fnNode2.block === block);

package/dist/main.js

@@ -2301,9 +2301,8 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ClassElement$0 = MethodDefinition;
-    var ClassElement$1 = $S($E($S(Static, $Q(TrailingComment))), $C(MethodDefinition, FieldDefinition));
-    var ClassElement$2 = $S(Static, BracedBlock);
+    var ClassElement$0 = $S($E(Decorators), $E($S(Static, $Q(TrailingComment))), $C(MethodDefinition, FieldDefinition));
+    var ClassElement$1 = $S(Static, BracedBlock);
     function ClassElement(state) {
       if (state.events) {
         const result = state.events.enter?.("ClassElement", state);
@@ -2311,12 +2310,12 @@ ${input.slice(result.pos)}
           return result.cache;
       }
       if (state.tokenize) {
-        const result = $TOKEN("ClassElement", state, ClassElement$0(state) || ClassElement$1(state) || ClassElement$2(state));
+        const result = $TOKEN("ClassElement", state, ClassElement$0(state) || ClassElement$1(state));
         if (state.events)
           state.events.exit?.("ClassElement", state, result);
         return result;
       } else {
-        const result = ClassElement$0(state) || ClassElement$1(state) || ClassElement$2(state);
+        const result = ClassElement$0(state) || ClassElement$1(state);
         if (state.events)
           state.events.exit?.("ClassElement", state, result);
         return result;
@@ -2721,6 +2720,7 @@ ${input.slice(result.pos)}
       }
     }
     var SuperProperty$0 = $S($EXPECT($L13, fail, 'SuperProperty "super["'), ExtendedExpression, __, CloseBracket);
+    var SuperProperty$1 = $S($EXPECT($L10, fail, 'SuperProperty "super"'), $N($C(QuestionMark, NonNullAssertion)), PropertyAccess);
     function SuperProperty(state) {
       if (state.events) {
         const result = state.events.enter?.("SuperProperty", state);
@@ -2728,12 +2728,12 @@ ${input.slice(result.pos)}
           return result.cache;
       }
       if (state.tokenize) {
-        const result = $TOKEN("SuperProperty", state, SuperProperty$0(state));
+        const result = $TOKEN("SuperProperty", state, SuperProperty$0(state) || SuperProperty$1(state));
         if (state.events)
           state.events.exit?.("SuperProperty", state, result);
         return result;
       } else {
-        const result = SuperProperty$0(state);
+        const result = SuperProperty$0(state) || SuperProperty$1(state);
         if (state.events)
           state.events.exit?.("SuperProperty", state, result);
         return result;
@@ -5102,15 +5102,13 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var MethodDefinition$0 = $TS($S($E(Decorators), MethodSignature, BracedBlock), function($skip, $loc, $0, $1, $2, $3) {
-      var decorators = $1;
-      var signature = $2;
-      var block = $3;
+    var MethodDefinition$0 = $TS($S(MethodSignature, BracedBlock), function($skip, $loc, $0, $1, $2) {
+      var signature = $1;
+      var block = $2;
       return {
         type: "MethodDefinition",
         children: $0,
         name: signature.name,
-        decorators,
         signature,
         block,
         parameters: signature.parameters
@@ -7000,8 +6998,8 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CatchParameter$0 = BindingIdentifier;
-    var CatchParameter$1 = BindingPattern;
+    var CatchParameter$0 = $S(BindingIdentifier, $E(TypeSuffix));
+    var CatchParameter$1 = $S(BindingPattern, $E(TypeSuffix));
     function CatchParameter(state) {
       if (state.events) {
         const result = state.events.enter?.("CatchParameter", state);
@@ -13726,12 +13724,12 @@ ${input.slice(result.pos)}
         if (node == null)
           return [];
         if (Array.isArray(node)) {
-          return node.flatMap((n) => gatherNodes(n, predicate));
+          return node.flatMap((n) => gatherRecursive(n, predicate));
         }
         if (predicate(node)) {
           return [node];
         }
-        return gatherNodes(node.children, predicate);
+        return gatherRecursive(node.children, predicate);
       }
       function gatherRecursiveAll(node, predicate) {
         if (node == null)
@@ -13910,7 +13908,7 @@ ${input.slice(result.pos)}
         }
       };
       module2.convertMethodToFunction = function(method) {
-        const { decorators, signature, block } = method;
+        const { signature, block } = method;
         let opening = signature.children[0];
         if (opening) {
           if (opening[0].type === "GetOrSet") {
@@ -13928,7 +13926,6 @@ ${input.slice(result.pos)}
           id: signature.name,
           type: "FunctionExpression",
           children: [
-            decorators,
             [opening, ...signature.children.slice(1)],
             block
           ],
@@ -14049,6 +14046,13 @@ ${input.slice(result.pos)}
         function hasDec(name) {
           return scopes.some((s) => s.has(name));
         }
+        function findVarDecs(statements2, decs) {
+          const declarationNames = gatherRecursive(
+            statements2,
+            (node) => node.type === "Declaration" && node.children && node.children.length > 0 && node.children[0].token && node.children[0].token.startsWith("var") || node.type === "FunctionExpression"
+          ).filter((node) => node.type === "Declaration").flatMap((node) => node.names);
+          return new Set(declarationNames);
+        }
         function insertBeforeAssignment(assignment, content) {
           if (assignment.children && assignment.children.length) {
             let indent = assignment.children[0][0][0];
@@ -14061,10 +14065,11 @@ ${input.slice(result.pos)}
         scopes.push(currentScope);
         const fnNodes = gatherNodes(statements, (s) => s.type === "FunctionExpression");
         const forNodes = gatherNodes(statements, (s) => s.type === "ForStatement");
-        const nodes = gatherNodes(statements, (s) => s.type === "BlockStatement" || s.type === "AssignmentExpression");
+        const nodes = gatherNodes(statements, (s) => s.type === "BlockStatement" || s.type === "AssignmentExpression" || s.type === "Declaration");
+        let declaredIdentifiers = findVarDecs(statements);
         for (const node of nodes) {
           if (node.type == "AssignmentExpression") {
-            let undeclaredIdentifiers = node.names.filter((name) => !hasDec(name));
+            let undeclaredIdentifiers = node.names.filter((name) => !(hasDec(name) || declaredIdentifiers.has(name)));
             if (node.children.length)
               createLetDecs(node.children, scopes);
             undeclaredIdentifiers.forEach((name) => currentScope.add(name));
@@ -14073,6 +14078,8 @@ ${input.slice(result.pos)}
             } else if (undeclaredIdentifiers.length > 0) {
               insertBeforeAssignment(node, ["let ", undeclaredIdentifiers.join(", "), "\n"]);
             }
+          } else if (node.type == "Declaration") {
+            node.names.forEach((name) => currentScope.add(name));
           } else {
             let block = node;
             let fnNode = fnNodes.find((fnNode2) => fnNode2.block === block);

package/package.json

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