@danielx/civet 0.5.2 → 0.5.3

package/README.md

@@ -1,7 +1,7 @@
 Civet
 =====
 
-[![Build Status](https://img.shields.io/github/workflow/status/DanielXMoore/Civet/Build?logo=github&style=for-the-badge)](https://github.com/DanielXMoore/Civet/actions/workflows/build.yml)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/DanielXMoore/Civet/build.yml?branch=master&logo=github&style=for-the-badge)](https://github.com/DanielXMoore/Civet/actions/workflows/build.yml)
 [![NPM Version](https://img.shields.io/npm/v/@danielx/civet.svg?style=for-the-badge)](https://www.npmjs.com/package/@danielx/civet)
 [![NPM Downloads](https://img.shields.io/npm/dm/@danielx/civet.svg?style=for-the-badge)](https://www.npmjs.com/package/@danielx/civet)
 [![Discord](https://img.shields.io/discord/933472021310996512?style=for-the-badge)](https://discord.com/invite/xkrW9GebBc)

package/dist/browser.js

@@ -897,6 +897,7 @@ ${input.slice(result.pos)}
         TypeBinaryOp,
         FunctionType,
         TypeArguments,
+        CompactTypeArguments,
         TypeParameters,
         TypeParameter,
         TypeConstraint,
@@ -2801,7 +2802,7 @@ ${input.slice(result.pos)}
           }
           let blockPrefix;
           if (after.length) {
-            const spliceRef = module.getSpliceRef();
+            const spliceRef = module.getRef("splice");
             blockPrefix = {
               children: ["[", module.insertTrimmingSpace(after, ""), "] = ", spliceRef, ".call(", restIdentifier, ", -", after.length.toString(), ")"],
               names: after.flatMap((p) => p.names)
@@ -2816,6 +2817,7 @@ ${input.slice(result.pos)}
               { ...rest, children: rest.children.slice(0, -1) },
               close
             ],
+            tp,
             names,
             blockPrefix
           };
@@ -2823,7 +2825,8 @@ ${input.slice(result.pos)}
         return {
           type: "Parameters",
           children: [tp, open, ...pes, close],
-          names: pes.flatMap((p) => p.names)
+          names: pes.flatMap((p) => p.names),
+          tp
         };
       });
       function NonEmptyParameters(state) {
@@ -3126,7 +3129,7 @@ ${input.slice(result.pos)}
             names.push(...restBinding.names);
           }
           if (after.length) {
-            const spliceRef = module.getSpliceRef();
+            const spliceRef = module.getRef("splice");
             blockPrefix = {
               children: ["[", module.insertTrimmingSpace(after, ""), "] = ", spliceRef, ".call(", restIdentifier, ", -", after.length.toString(), ")"],
               names: after.flatMap((p) => p.names)
@@ -3359,7 +3362,7 @@ ${input.slice(result.pos)}
             restIdentifier = restBinding.names[0];
           }
           if (after.length) {
-            const spliceRef = module.getSpliceRef();
+            const spliceRef = module.getRef("splice");
             blockPrefix = {
               children: ["[", module.insertTrimmingSpace(after, ""), "] = ", spliceRef, ".call(", restIdentifier, ", -", after.length.toString(), ")"],
               names: after.flatMap((p) => p.names)
@@ -5427,14 +5430,14 @@ ${input.slice(result.pos)}
       });
       var BinaryOpSymbol$29 = $TS($S(CoffeeOfEnabled, $EXPECT($L74, fail, 'BinaryOpSymbol "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
         return {
-          ref: module.getIndexOfRef(),
+          ref: module.getRef("indexOf"),
           suffix: " >= 0",
           special: true
         };
       });
       var BinaryOpSymbol$30 = $TS($S(CoffeeOfEnabled, $EXPECT($L73, fail, 'BinaryOpSymbol "not"'), NonIdContinue, __, $EXPECT($L74, fail, 'BinaryOpSymbol "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
         return {
-          ref: module.getIndexOfRef(),
+          ref: module.getRef("indexOf"),
           suffix: " < 0",
           special: true
         };
@@ -6245,7 +6248,7 @@ ${input.slice(result.pos)}
           }
           if (declaration.own) {
             const indent2 = module.currentIndent.token + "  ";
-            const hasPropRef = module.getHasPropRef();
+            const hasPropRef = module.getRef("hasProp");
             blockPrefix.push([indent2, "if (!", hasPropRef, ".call(", exp, ", ", declaration, ")) continue\n"]);
           }
           kind.token = "in";
@@ -10601,7 +10604,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXSelfClosingElement$0 = $S($EXPECT($L5, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L147, fail, 'JSXSelfClosingElement "/>"'));
+      var JSXSelfClosingElement$0 = $S($EXPECT($L5, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(CompactTypeArguments), $E(JSXAttributes), __, $EXPECT($L147, fail, 'JSXSelfClosingElement "/>"'));
       function JSXSelfClosingElement(state) {
         if (state.events) {
           const result = state.events.enter?.("JSXSelfClosingElement", state);
@@ -10620,7 +10623,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXOpeningElement$0 = $S($EXPECT($L5, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L27, fail, 'JSXOpeningElement ">"'));
+      var JSXOpeningElement$0 = $S($EXPECT($L5, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(CompactTypeArguments), $E(JSXAttributes), __, $EXPECT($L27, fail, 'JSXOpeningElement ">"'));
       function JSXOpeningElement(state) {
         if (state.events) {
           const result = state.events.enter?.("JSXOpeningElement", state);
@@ -12011,9 +12014,36 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var TypeParameters$0 = $TS($S(__, $EXPECT($L5, fail, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L27, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var CompactTypeArguments$0 = $TS($S($EXPECT($L5, fail, 'CompactTypeArguments "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L27, fail, 'CompactTypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
         return { ts: true, children: $0 };
       });
+      function CompactTypeArguments(state) {
+        if (state.events) {
+          const result = state.events.enter?.("CompactTypeArguments", state);
+          if (result)
+            return result.cache;
+        }
+        if (state.tokenize) {
+          const result = $TOKEN("CompactTypeArguments", state, CompactTypeArguments$0(state));
+          if (state.events)
+            state.events.exit?.("CompactTypeArguments", state, result);
+          return result;
+        } else {
+          const result = CompactTypeArguments$0(state);
+          if (state.events)
+            state.events.exit?.("CompactTypeArguments", state, result);
+          return result;
+        }
+      }
+      var TypeParameters$0 = $TS($S(__, $EXPECT($L5, fail, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L27, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+        var parameters = $3;
+        return {
+          type: "TypeParameters",
+          parameters,
+          ts: true,
+          children: $0
+        };
+      });
       function TypeParameters(state) {
         if (state.events) {
           const result = state.events.enter?.("TypeParameters", state);
@@ -12898,51 +12928,48 @@ ${input.slice(result.pos)}
           tab: void 0,
           verbose: false
         };
-        let indexOfRef, hasPropRef, spliceRef;
-        const asAny = {
+        module.asAny = {
           ts: true,
           children: [" as any"]
         };
         module.prelude = [];
-        module.getSpliceRef = function() {
-          if (spliceRef)
-            return spliceRef;
-          spliceRef = {
-            type: "Ref",
-            base: "splice",
-            id: "splice"
-          };
-          return spliceRef;
-        };
-        module.getIndexOfRef = function() {
-          if (indexOfRef)
-            return indexOfRef;
-          indexOfRef = {
-            type: "Ref",
-            base: "indexOf",
-            id: "indexOf"
-          };
-          const typeSuffix = {
-            ts: true,
-            children: [": <T>(this: T[], searchElement: T) => boolean"]
-          };
-          module.prelude.push(["", ["const ", indexOfRef, typeSuffix, " = [].indexOf", asAny, "\n"]]);
-          return indexOfRef;
+        const declareRef = {
+          indexOf(indexOfRef) {
+            const typeSuffix = {
+              ts: true,
+              children: [": <T>(this: T[], searchElement: T) => boolean"]
+            };
+            module.prelude.push(["", ["const ", indexOfRef, typeSuffix, " = [].indexOf", module.asAny, "\n"]]);
+          },
+          hasProp(hasPropRef) {
+            const typeSuffix = {
+              ts: true,
+              children: [": <T>(this: T, prop: keyof T) => boolean"]
+            };
+            module.prelude.push(["", ["const ", hasPropRef, typeSuffix, " = {}.hasOwnProperty", module.asAny, "\n"]]);
+          }
         };
-        module.getHasPropRef = function() {
-          if (hasPropRef)
-            return hasPropRef;
-          hasPropRef = {
+        const refs = {};
+        module.getRef = function(base) {
+          if (refs.hasOwnProperty(base))
+            return refs[base];
+          const ref = {
             type: "Ref",
-            base: "hasProp",
-            id: "hasProp"
-          };
-          const typeSuffix = {
-            ts: true,
-            children: [": <T>(this: T, prop: keyof T) => boolean"]
+            base,
+            id: base
           };
-          module.prelude.push(["", ["const ", hasPropRef, typeSuffix, " = {}.hasOwnProperty", asAny, "\n"]]);
-          return hasPropRef;
+          if (declareRef.hasOwnProperty(base))
+            declareRef[base](ref);
+          return refs[base] = ref;
+        };
+        module.typeOfJSXElement = function($12) {
+          if (module.config.solid) {
+            let open = $12;
+            while (Array.isArray(open[0]))
+              open = open[0];
+            open = open[1];
+            return typeof open === "string" && open[0] === open[0].toLowerCase() ? [module.getRef("IntrinsicElements"), '<"', open, '">'] : ["ReturnType<typeof ", open, ">"];
+          }
         };
         Object.defineProperty(module.config, "coffeeCompat", {
           set(b) {
@@ -13519,7 +13546,10 @@ ${input.slice(result.pos)}
           return nodes;
         }
         function processParams(f) {
-          const { parameters, block } = f;
+          const { type, parameters, block } = f;
+          if (type === "ArrowFunction" && parameters && parameters.tp && parameters.tp.parameters.length === 1) {
+            parameters.tp.parameters.push(",");
+          }
           if (!block)
             return;
           const { expressions } = block;
@@ -13652,17 +13682,13 @@ ${input.slice(result.pos)}
           });
         }
         function checkSpliceRef(statements) {
-          const spliceRef = module.getSpliceRef();
+          const spliceRef = module.getRef("splice");
           if (gatherRecursiveAll(statements, (n) => n === spliceRef).length) {
             const typeSuffix = {
               ts: true,
               children: [": <T>(this: T[], start: number, deleteCount?: number) => T[]"]
             };
-            const asAny = {
-              ts: true,
-              children: [" as any"]
-            };
-            module.prelude.push(["", ["const ", spliceRef, typeSuffix, " = [].splice", asAny, "\n"]]);
+            module.prelude.push(["", ["const ", spliceRef, typeSuffix, " = [].splice", module.asAny, "\n"]]);
           }
         }
         module.attachPostfixStatementAsExpression = function(exp, post) {

package/dist/main.js

@@ -896,6 +896,7 @@ ${input.slice(result.pos)}
       TypeBinaryOp,
       FunctionType,
       TypeArguments,
+      CompactTypeArguments,
       TypeParameters,
       TypeParameter,
       TypeConstraint,
@@ -2800,7 +2801,7 @@ ${input.slice(result.pos)}
         }
         let blockPrefix;
         if (after.length) {
-          const spliceRef = module2.getSpliceRef();
+          const spliceRef = module2.getRef("splice");
           blockPrefix = {
             children: ["[", module2.insertTrimmingSpace(after, ""), "] = ", spliceRef, ".call(", restIdentifier, ", -", after.length.toString(), ")"],
             names: after.flatMap((p) => p.names)
@@ -2815,6 +2816,7 @@ ${input.slice(result.pos)}
             { ...rest, children: rest.children.slice(0, -1) },
             close
           ],
+          tp,
           names,
           blockPrefix
         };
@@ -2822,7 +2824,8 @@ ${input.slice(result.pos)}
       return {
         type: "Parameters",
         children: [tp, open, ...pes, close],
-        names: pes.flatMap((p) => p.names)
+        names: pes.flatMap((p) => p.names),
+        tp
       };
     });
     function NonEmptyParameters(state) {
@@ -3125,7 +3128,7 @@ ${input.slice(result.pos)}
           names.push(...restBinding.names);
         }
         if (after.length) {
-          const spliceRef = module2.getSpliceRef();
+          const spliceRef = module2.getRef("splice");
           blockPrefix = {
             children: ["[", module2.insertTrimmingSpace(after, ""), "] = ", spliceRef, ".call(", restIdentifier, ", -", after.length.toString(), ")"],
             names: after.flatMap((p) => p.names)
@@ -3358,7 +3361,7 @@ ${input.slice(result.pos)}
           restIdentifier = restBinding.names[0];
         }
         if (after.length) {
-          const spliceRef = module2.getSpliceRef();
+          const spliceRef = module2.getRef("splice");
           blockPrefix = {
             children: ["[", module2.insertTrimmingSpace(after, ""), "] = ", spliceRef, ".call(", restIdentifier, ", -", after.length.toString(), ")"],
             names: after.flatMap((p) => p.names)
@@ -5426,14 +5429,14 @@ ${input.slice(result.pos)}
     });
     var BinaryOpSymbol$29 = $TS($S(CoffeeOfEnabled, $EXPECT($L74, fail, 'BinaryOpSymbol "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
       return {
-        ref: module2.getIndexOfRef(),
+        ref: module2.getRef("indexOf"),
         suffix: " >= 0",
         special: true
       };
     });
     var BinaryOpSymbol$30 = $TS($S(CoffeeOfEnabled, $EXPECT($L73, fail, 'BinaryOpSymbol "not"'), NonIdContinue, __, $EXPECT($L74, fail, 'BinaryOpSymbol "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       return {
-        ref: module2.getIndexOfRef(),
+        ref: module2.getRef("indexOf"),
         suffix: " < 0",
         special: true
       };
@@ -6244,7 +6247,7 @@ ${input.slice(result.pos)}
         }
         if (declaration.own) {
           const indent2 = module2.currentIndent.token + "  ";
-          const hasPropRef = module2.getHasPropRef();
+          const hasPropRef = module2.getRef("hasProp");
           blockPrefix.push([indent2, "if (!", hasPropRef, ".call(", exp, ", ", declaration, ")) continue\n"]);
         }
         kind.token = "in";
@@ -10600,7 +10603,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXSelfClosingElement$0 = $S($EXPECT($L5, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L147, fail, 'JSXSelfClosingElement "/>"'));
+    var JSXSelfClosingElement$0 = $S($EXPECT($L5, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(CompactTypeArguments), $E(JSXAttributes), __, $EXPECT($L147, fail, 'JSXSelfClosingElement "/>"'));
     function JSXSelfClosingElement(state) {
       if (state.events) {
         const result = state.events.enter?.("JSXSelfClosingElement", state);
@@ -10619,7 +10622,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXOpeningElement$0 = $S($EXPECT($L5, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L27, fail, 'JSXOpeningElement ">"'));
+    var JSXOpeningElement$0 = $S($EXPECT($L5, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(CompactTypeArguments), $E(JSXAttributes), __, $EXPECT($L27, fail, 'JSXOpeningElement ">"'));
     function JSXOpeningElement(state) {
       if (state.events) {
         const result = state.events.enter?.("JSXOpeningElement", state);
@@ -12010,9 +12013,36 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeParameters$0 = $TS($S(__, $EXPECT($L5, fail, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L27, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var CompactTypeArguments$0 = $TS($S($EXPECT($L5, fail, 'CompactTypeArguments "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L27, fail, 'CompactTypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
       return { ts: true, children: $0 };
     });
+    function CompactTypeArguments(state) {
+      if (state.events) {
+        const result = state.events.enter?.("CompactTypeArguments", state);
+        if (result)
+          return result.cache;
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("CompactTypeArguments", state, CompactTypeArguments$0(state));
+        if (state.events)
+          state.events.exit?.("CompactTypeArguments", state, result);
+        return result;
+      } else {
+        const result = CompactTypeArguments$0(state);
+        if (state.events)
+          state.events.exit?.("CompactTypeArguments", state, result);
+        return result;
+      }
+    }
+    var TypeParameters$0 = $TS($S(__, $EXPECT($L5, fail, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L27, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var parameters = $3;
+      return {
+        type: "TypeParameters",
+        parameters,
+        ts: true,
+        children: $0
+      };
+    });
     function TypeParameters(state) {
       if (state.events) {
         const result = state.events.enter?.("TypeParameters", state);
@@ -12897,51 +12927,48 @@ ${input.slice(result.pos)}
         tab: void 0,
         verbose: false
       };
-      let indexOfRef, hasPropRef, spliceRef;
-      const asAny = {
+      module2.asAny = {
         ts: true,
         children: [" as any"]
       };
       module2.prelude = [];
-      module2.getSpliceRef = function() {
-        if (spliceRef)
-          return spliceRef;
-        spliceRef = {
-          type: "Ref",
-          base: "splice",
-          id: "splice"
-        };
-        return spliceRef;
-      };
-      module2.getIndexOfRef = function() {
-        if (indexOfRef)
-          return indexOfRef;
-        indexOfRef = {
-          type: "Ref",
-          base: "indexOf",
-          id: "indexOf"
-        };
-        const typeSuffix = {
-          ts: true,
-          children: [": <T>(this: T[], searchElement: T) => boolean"]
-        };
-        module2.prelude.push(["", ["const ", indexOfRef, typeSuffix, " = [].indexOf", asAny, "\n"]]);
-        return indexOfRef;
+      const declareRef = {
+        indexOf(indexOfRef) {
+          const typeSuffix = {
+            ts: true,
+            children: [": <T>(this: T[], searchElement: T) => boolean"]
+          };
+          module2.prelude.push(["", ["const ", indexOfRef, typeSuffix, " = [].indexOf", module2.asAny, "\n"]]);
+        },
+        hasProp(hasPropRef) {
+          const typeSuffix = {
+            ts: true,
+            children: [": <T>(this: T, prop: keyof T) => boolean"]
+          };
+          module2.prelude.push(["", ["const ", hasPropRef, typeSuffix, " = {}.hasOwnProperty", module2.asAny, "\n"]]);
+        }
       };
-      module2.getHasPropRef = function() {
-        if (hasPropRef)
-          return hasPropRef;
-        hasPropRef = {
+      const refs = {};
+      module2.getRef = function(base) {
+        if (refs.hasOwnProperty(base))
+          return refs[base];
+        const ref = {
           type: "Ref",
-          base: "hasProp",
-          id: "hasProp"
-        };
-        const typeSuffix = {
-          ts: true,
-          children: [": <T>(this: T, prop: keyof T) => boolean"]
+          base,
+          id: base
         };
-        module2.prelude.push(["", ["const ", hasPropRef, typeSuffix, " = {}.hasOwnProperty", asAny, "\n"]]);
-        return hasPropRef;
+        if (declareRef.hasOwnProperty(base))
+          declareRef[base](ref);
+        return refs[base] = ref;
+      };
+      module2.typeOfJSXElement = function($12) {
+        if (module2.config.solid) {
+          let open = $12;
+          while (Array.isArray(open[0]))
+            open = open[0];
+          open = open[1];
+          return typeof open === "string" && open[0] === open[0].toLowerCase() ? [module2.getRef("IntrinsicElements"), '<"', open, '">'] : ["ReturnType<typeof ", open, ">"];
+        }
       };
       Object.defineProperty(module2.config, "coffeeCompat", {
         set(b) {
@@ -13518,7 +13545,10 @@ ${input.slice(result.pos)}
         return nodes;
       }
       function processParams(f) {
-        const { parameters, block } = f;
+        const { type, parameters, block } = f;
+        if (type === "ArrowFunction" && parameters && parameters.tp && parameters.tp.parameters.length === 1) {
+          parameters.tp.parameters.push(",");
+        }
         if (!block)
           return;
         const { expressions } = block;
@@ -13651,17 +13681,13 @@ ${input.slice(result.pos)}
         });
       }
       function checkSpliceRef(statements) {
-        const spliceRef = module2.getSpliceRef();
+        const spliceRef = module2.getRef("splice");
         if (gatherRecursiveAll(statements, (n) => n === spliceRef).length) {
           const typeSuffix = {
             ts: true,
             children: [": <T>(this: T[], start: number, deleteCount?: number) => T[]"]
           };
-          const asAny = {
-            ts: true,
-            children: [" as any"]
-          };
-          module2.prelude.push(["", ["const ", spliceRef, typeSuffix, " = [].splice", asAny, "\n"]]);
+          module2.prelude.push(["", ["const ", spliceRef, typeSuffix, " = [].splice", module2.asAny, "\n"]]);
         }
       }
       module2.attachPostfixStatementAsExpression = function(exp, post) {

package/package.json

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