@danielx/civet 0.6.83 → 0.6.84

package/dist/browser.js

@@ -1186,7 +1186,7 @@ var Civet = (() => {
   });
 
   // source/parser/pattern-matching.civet
-  function processPatternMatching(statements, ReservedWord) {
+  function processPatternMatching(statements, ReservedWord, getRef) {
     gatherRecursiveAll(statements, ($) => $.type === "SwitchStatement").forEach((s) => {
       const { caseBlock } = s;
       const { clauses } = caseBlock;
@@ -1246,7 +1246,7 @@ var Civet = (() => {
         const indent = block.expressions?.[0]?.[0] || "";
         const alternativeConditions = patterns.map((pattern2, i2) => {
           const conditions = [];
-          getPatternConditions(pattern2, ref, conditions);
+          getPatternConditions(pattern2, ref, conditions, getRef);
           return conditions;
         });
         const conditionExpression = alternativeConditions.map((conditions, i2) => {
@@ -1304,26 +1304,26 @@ var Civet = (() => {
       return addParentPointers(s, s.parent);
     });
   }
-  function getPatternConditions(pattern, ref, conditions) {
+  function getPatternConditions(pattern, ref, conditions, getRef) {
     if (pattern.rest)
       return;
     switch (pattern.type) {
       case "ArrayBindingPattern": {
-        const { elements, length } = pattern, hasRest = elements.some((e) => e.rest), comparator = hasRest ? " >= " : " === ", l = [comparator, (length - hasRest).toString()];
+        const { elements, length } = pattern, hasRest = elements.some((e) => e.rest), l = (length - hasRest).toString(), lengthCheck = hasRest ? [ref, ".length >= ", l] : [getRef("len"), "(", ref, ", ", l, ")"];
         conditions.push(
           ["Array.isArray(", ref, ")"],
-          [ref, ".length", l]
+          lengthCheck
         );
         elements.forEach(({ children: [, e] }, i) => {
           const subRef = [ref, "[", i.toString(), "]"];
-          return getPatternConditions(e, subRef, conditions);
+          return getPatternConditions(e, subRef, conditions, getRef);
         });
         const { blockPrefix } = pattern;
         if (blockPrefix) {
           const postElements = blockPrefix.children[1], { length: postLength } = postElements;
           postElements.forEach(({ children: [, e] }, i) => {
             const subRef = [ref, "[", ref, ".length - ", (postLength + i).toString(), "]"];
-            return getPatternConditions(e, subRef, conditions);
+            return getPatternConditions(e, subRef, conditions, getRef);
           });
         }
         break;
@@ -1355,7 +1355,7 @@ var Civet = (() => {
                   subRef = [ref, ".", name];
               }
               if (value) {
-                getPatternConditions(value, subRef, conditions);
+                getPatternConditions(value, subRef, conditions, getRef);
               }
               break;
             }
@@ -2218,12 +2218,14 @@ var Civet = (() => {
       ]
     });
   }
-  function processDeclarationConditions(node) {
+  function processDeclarationConditions(node, getRef) {
     gatherRecursiveAll(node, (n) => {
       return n.type === "IfStatement" || n.type === "IterationStatement" || n.type === "SwitchStatement";
-    }).forEach(processDeclarationConditionStatement);
+    }).forEach((s) => {
+      return processDeclarationConditionStatement(s, getRef);
+    });
   }
-  function processDeclarationConditionStatement(s) {
+  function processDeclarationConditionStatement(s, getRef) {
     const { condition } = s;
     if (!condition?.expression) {
       return;
@@ -2238,7 +2240,7 @@ var Civet = (() => {
     const { ref, pattern } = expression;
     if (pattern) {
       let conditions = [];
-      getPatternConditions(pattern, ref, conditions);
+      getPatternConditions(pattern, ref, conditions, getRef);
       conditions = conditions.filter((c) => {
         return !(c.length === 3 && c[0] === "typeof " && c[1] === ref && c[2] === " === 'object'") && !(c.length === 2 && c[0] === ref && c[1] === " != null");
       });
@@ -2634,17 +2636,21 @@ var Civet = (() => {
       stepExp = insertTrimmingSpace(stepExp, "");
       stepRef = maybeRef(stepExp, "step");
     }
-    const startRef = maybeRef(start, "start");
-    const endRef = maybeRef(end, "end");
+    let startRef = maybeRef(start, "start");
+    let endRef = maybeRef(end, "end");
     const startRefDec = startRef !== start ? [startRef, " = ", start, ", "] : [];
     const endRefDec = endRef !== end ? [endRef, " = ", end, ", "] : [];
     let ascDec = [], ascRef, asc;
     if (stepRef) {
-      if (stepRef !== stepExp) {
+      if (!(stepRef === stepExp)) {
         ascDec = [", ", stepRef, " = ", stepExp];
       }
-    } else if (start.type === "Literal" && end.type === "Literal") {
+    } else if ("Literal" === start.type && start.type === end.type) {
       asc = literalValue(start) <= literalValue(end);
+      if ("StringLiteral" === start.subtype && start.subtype === end.subtype) {
+        startRef = literalValue(start).charCodeAt(0).toString();
+        endRef = literalValue(end).charCodeAt(0).toString();
+      }
     } else {
       ascRef = makeRef("asc");
       ascDec = [", ", ascRef, " = ", startRef, " <= ", endRef];
@@ -2656,8 +2662,9 @@ var Civet = (() => {
         varAssign = [...insertTrimmingSpace(varName, ""), " = "];
         varLet = [",", ...varName, " = ", counterRef];
       } else {
+        const value = "StringLiteral" === start.subtype ? ["String.fromCharCode(", counterRef, ")"] : counterRef;
         blockPrefix = [
-          ["", forDeclaration, " = ", counterRef, ";"]
+          ["", forDeclaration, " = ", value, ";"]
         ];
       }
     } else if (forDeclaration) {
@@ -3911,12 +3918,12 @@ var Civet = (() => {
     addParentPointers(root);
     const { expressions: statements } = root;
     processTypes(statements);
-    processDeclarationConditions(statements);
+    processDeclarationConditions(statements, m.getRef);
     processPipelineExpressions(statements);
     processDeclarations(statements);
     processAssignments(statements);
     processStatementExpressions(statements);
-    processPatternMatching(statements, ReservedWord);
+    processPatternMatching(statements, ReservedWord, m.getRef);
     gatherRecursiveAll(statements, (n) => n.type === "IterationExpression").forEach((e) => expressionizeIteration(e));
     hoistRefDecs(statements);
     processFunctions(statements, config);
@@ -9493,8 +9500,9 @@ ${input.slice(result.pos)}
         return $EVENT_C(ctx, state, "MethodSignature", MethodSignature$$);
       }
       var ClassElementName$0 = PropertyName;
-      var ClassElementName$1 = PrivateIdentifier;
-      var ClassElementName$$ = [ClassElementName$0, ClassElementName$1];
+      var ClassElementName$1 = LengthShorthand;
+      var ClassElementName$2 = PrivateIdentifier;
+      var ClassElementName$$ = [ClassElementName$0, ClassElementName$1, ClassElementName$2];
       function ClassElementName(ctx, state) {
         return $EVENT_C(ctx, state, "ClassElementName", ClassElementName$$);
       }
@@ -11120,27 +11128,26 @@ ${input.slice(result.pos)}
           children: [imp, $0.slice(1)]
         };
       });
-      var ImportDeclaration$1 = $T($S(Import, __, TypeKeyword, __, ImportClause, __, FromClause, $E(ImportAssertion)), function(value) {
+      var ImportDeclaration$1 = $T($S(Import, __, TypeKeyword, __, ImportClause, __, FromClause), function(value) {
         return { "type": "ImportDeclaration", "ts": true, "children": value };
       });
-      var ImportDeclaration$2 = $T($S(Import, __, ImportClause, __, FromClause, $E(ImportAssertion)), function(value) {
+      var ImportDeclaration$2 = $T($S(Import, __, ImportClause, __, FromClause), function(value) {
         return { "type": "ImportDeclaration", "children": value };
       });
-      var ImportDeclaration$3 = $T($S(Import, __, ModuleSpecifier, $E(ImportAssertion)), function(value) {
+      var ImportDeclaration$3 = $T($S(Import, __, ModuleSpecifier), function(value) {
         return { "type": "ImportDeclaration", "children": value };
       });
-      var ImportDeclaration$4 = $TS($S(ImpliedImport, $E($S(TypeKeyword, __)), ImportClause, __, FromClause, $E(ImportAssertion)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+      var ImportDeclaration$4 = $TS($S(ImpliedImport, $E($S(TypeKeyword, __)), ImportClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         var i = $1;
         var t = $2;
         var c = $3;
         var w = $4;
         var f = $5;
-        var a = $6;
         i.$loc = {
           pos: f[0].$loc.pos - 1,
           length: f[0].$loc.length + 1
         };
-        const children = [i, t, c, w, f, a];
+        const children = [i, t, c, w, f];
         if (!t)
           return children;
         return { type: "ImportDeclaration", ts: true, children };
@@ -11299,7 +11306,8 @@ ${input.slice(result.pos)}
       function ModuleExportName(ctx, state) {
         return $EVENT_C(ctx, state, "ModuleExportName", ModuleExportName$$);
       }
-      var ModuleSpecifier$0 = $TS($S(UnprocessedModuleSpecifier), function($skip, $loc, $0, $1) {
+      var ModuleSpecifier$0 = $TS($S(UnprocessedModuleSpecifier, $E(ImportAssertion)), function($skip, $loc, $0, $1, $2) {
+        var a = $2;
         let { token } = $1;
         if (module.config.rewriteTsImports) {
           token = token.replace(/\.([mc])?ts(['"])$/, ".$1js$2");
@@ -11310,6 +11318,8 @@ ${input.slice(result.pos)}
             `${module.config.rewriteCivetImports.replace(/\$/g, "$$")}$1`
           );
         }
+        if (a)
+          return [{ ...$1, token }, a];
         return { ...$1, token };
       });
       function ModuleSpecifier(ctx, state) {
@@ -11674,7 +11684,11 @@ ${input.slice(result.pos)}
       function TripleSingleStringCharacters(ctx, state) {
         return $EVENT(ctx, state, "TripleSingleStringCharacters", TripleSingleStringCharacters$0);
       }
-      var CoffeeStringSubstitution$0 = $S(CoffeeSubstitutionStart, PostfixedExpression, __, CloseBrace);
+      var CoffeeStringSubstitution$0 = $TS($S(CoffeeSubstitutionStart, AllowAll, $E($S(PostfixedExpression, __, CloseBrace)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
+        if (!$3)
+          return $skip;
+        return [$1, ...$3];
+      });
       function CoffeeStringSubstitution(ctx, state) {
         return $EVENT(ctx, state, "CoffeeStringSubstitution", CoffeeStringSubstitution$0);
       }
@@ -11851,7 +11865,11 @@ ${input.slice(result.pos)}
       function _TemplateLiteral(ctx, state) {
         return $EVENT_C(ctx, state, "_TemplateLiteral", _TemplateLiteral$$);
       }
-      var TemplateSubstitution$0 = $S(SubstitutionStart, PostfixedExpression, __, CloseBrace);
+      var TemplateSubstitution$0 = $TS($S(SubstitutionStart, AllowAll, $E($S(PostfixedExpression, __, CloseBrace)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
+        if (!$3)
+          return $skip;
+        return [$1, ...$3];
+      });
       function TemplateSubstitution(ctx, state) {
         return $EVENT(ctx, state, "TemplateSubstitution", TemplateSubstitution$0);
       }
@@ -14602,6 +14620,19 @@ ${input.slice(result.pos)}
             };
             module.prelude.push(["", [preludeVar, isRef, typeSuffix, " = Object.is", asAny, ";\n"]]);
           },
+          /**
+           * Array length check with type guard.
+           * From tlgreg https://discord.com/channels/933472021310996512/1012166187196629113/1157386582546976873
+           */
+          len(lenRef) {
+            module.prelude.push(["", [{
+              ts: true,
+              children: ["function ", lenRef, "<T extends readonly unknown[], N extends number>(arr: T, length: N): arr is T & { length: N } { return arr.length === length }"]
+            }, {
+              js: true,
+              children: ["function ", lenRef, "(arr, length) { return arr.length === length }"]
+            }], "\n"]);
+          },
           modulo(moduloRef) {
             const typeSuffix = {
               ts: true,

package/dist/main.js

@@ -1178,7 +1178,7 @@ var init_op = __esm({
 });
 
 // source/parser/pattern-matching.civet
-function processPatternMatching(statements, ReservedWord) {
+function processPatternMatching(statements, ReservedWord, getRef) {
   gatherRecursiveAll(statements, ($) => $.type === "SwitchStatement").forEach((s) => {
     const { caseBlock } = s;
     const { clauses } = caseBlock;
@@ -1238,7 +1238,7 @@ function processPatternMatching(statements, ReservedWord) {
       const indent = block.expressions?.[0]?.[0] || "";
       const alternativeConditions = patterns.map((pattern2, i2) => {
         const conditions = [];
-        getPatternConditions(pattern2, ref, conditions);
+        getPatternConditions(pattern2, ref, conditions, getRef);
         return conditions;
       });
       const conditionExpression = alternativeConditions.map((conditions, i2) => {
@@ -1296,26 +1296,26 @@ function processPatternMatching(statements, ReservedWord) {
     return addParentPointers(s, s.parent);
   });
 }
-function getPatternConditions(pattern, ref, conditions) {
+function getPatternConditions(pattern, ref, conditions, getRef) {
   if (pattern.rest)
     return;
   switch (pattern.type) {
     case "ArrayBindingPattern": {
-      const { elements, length } = pattern, hasRest = elements.some((e) => e.rest), comparator = hasRest ? " >= " : " === ", l = [comparator, (length - hasRest).toString()];
+      const { elements, length } = pattern, hasRest = elements.some((e) => e.rest), l = (length - hasRest).toString(), lengthCheck = hasRest ? [ref, ".length >= ", l] : [getRef("len"), "(", ref, ", ", l, ")"];
       conditions.push(
         ["Array.isArray(", ref, ")"],
-        [ref, ".length", l]
+        lengthCheck
       );
       elements.forEach(({ children: [, e] }, i) => {
         const subRef = [ref, "[", i.toString(), "]"];
-        return getPatternConditions(e, subRef, conditions);
+        return getPatternConditions(e, subRef, conditions, getRef);
       });
       const { blockPrefix } = pattern;
       if (blockPrefix) {
         const postElements = blockPrefix.children[1], { length: postLength } = postElements;
         postElements.forEach(({ children: [, e] }, i) => {
           const subRef = [ref, "[", ref, ".length - ", (postLength + i).toString(), "]"];
-          return getPatternConditions(e, subRef, conditions);
+          return getPatternConditions(e, subRef, conditions, getRef);
         });
       }
       break;
@@ -1347,7 +1347,7 @@ function getPatternConditions(pattern, ref, conditions) {
                 subRef = [ref, ".", name];
             }
             if (value) {
-              getPatternConditions(value, subRef, conditions);
+              getPatternConditions(value, subRef, conditions, getRef);
             }
             break;
           }
@@ -2210,12 +2210,14 @@ function processDeclarationCondition(condition, rootCondition, parent) {
     ]
   });
 }
-function processDeclarationConditions(node) {
+function processDeclarationConditions(node, getRef) {
   gatherRecursiveAll(node, (n) => {
     return n.type === "IfStatement" || n.type === "IterationStatement" || n.type === "SwitchStatement";
-  }).forEach(processDeclarationConditionStatement);
+  }).forEach((s) => {
+    return processDeclarationConditionStatement(s, getRef);
+  });
 }
-function processDeclarationConditionStatement(s) {
+function processDeclarationConditionStatement(s, getRef) {
   const { condition } = s;
   if (!condition?.expression) {
     return;
@@ -2230,7 +2232,7 @@ function processDeclarationConditionStatement(s) {
   const { ref, pattern } = expression;
   if (pattern) {
     let conditions = [];
-    getPatternConditions(pattern, ref, conditions);
+    getPatternConditions(pattern, ref, conditions, getRef);
     conditions = conditions.filter((c) => {
       return !(c.length === 3 && c[0] === "typeof " && c[1] === ref && c[2] === " === 'object'") && !(c.length === 2 && c[0] === ref && c[1] === " != null");
     });
@@ -2626,17 +2628,21 @@ function forRange(open, forDeclaration, range, stepExp, close) {
     stepExp = insertTrimmingSpace(stepExp, "");
     stepRef = maybeRef(stepExp, "step");
   }
-  const startRef = maybeRef(start, "start");
-  const endRef = maybeRef(end, "end");
+  let startRef = maybeRef(start, "start");
+  let endRef = maybeRef(end, "end");
   const startRefDec = startRef !== start ? [startRef, " = ", start, ", "] : [];
   const endRefDec = endRef !== end ? [endRef, " = ", end, ", "] : [];
   let ascDec = [], ascRef, asc;
   if (stepRef) {
-    if (stepRef !== stepExp) {
+    if (!(stepRef === stepExp)) {
       ascDec = [", ", stepRef, " = ", stepExp];
     }
-  } else if (start.type === "Literal" && end.type === "Literal") {
+  } else if ("Literal" === start.type && start.type === end.type) {
     asc = literalValue(start) <= literalValue(end);
+    if ("StringLiteral" === start.subtype && start.subtype === end.subtype) {
+      startRef = literalValue(start).charCodeAt(0).toString();
+      endRef = literalValue(end).charCodeAt(0).toString();
+    }
   } else {
     ascRef = makeRef("asc");
     ascDec = [", ", ascRef, " = ", startRef, " <= ", endRef];
@@ -2648,8 +2654,9 @@ function forRange(open, forDeclaration, range, stepExp, close) {
       varAssign = [...insertTrimmingSpace(varName, ""), " = "];
       varLet = [",", ...varName, " = ", counterRef];
     } else {
+      const value = "StringLiteral" === start.subtype ? ["String.fromCharCode(", counterRef, ")"] : counterRef;
       blockPrefix = [
-        ["", forDeclaration, " = ", counterRef, ";"]
+        ["", forDeclaration, " = ", value, ";"]
       ];
     }
   } else if (forDeclaration) {
@@ -3903,12 +3910,12 @@ function processProgram(root, config, m, ReservedWord) {
   addParentPointers(root);
   const { expressions: statements } = root;
   processTypes(statements);
-  processDeclarationConditions(statements);
+  processDeclarationConditions(statements, m.getRef);
   processPipelineExpressions(statements);
   processDeclarations(statements);
   processAssignments(statements);
   processStatementExpressions(statements);
-  processPatternMatching(statements, ReservedWord);
+  processPatternMatching(statements, ReservedWord, m.getRef);
   gatherRecursiveAll(statements, (n) => n.type === "IterationExpression").forEach((e) => expressionizeIteration(e));
   hoistRefDecs(statements);
   processFunctions(statements, config);
@@ -9485,8 +9492,9 @@ var require_parser = __commonJS({
       return $EVENT_C(ctx, state, "MethodSignature", MethodSignature$$);
     }
     var ClassElementName$0 = PropertyName;
-    var ClassElementName$1 = PrivateIdentifier;
-    var ClassElementName$$ = [ClassElementName$0, ClassElementName$1];
+    var ClassElementName$1 = LengthShorthand;
+    var ClassElementName$2 = PrivateIdentifier;
+    var ClassElementName$$ = [ClassElementName$0, ClassElementName$1, ClassElementName$2];
     function ClassElementName(ctx, state) {
       return $EVENT_C(ctx, state, "ClassElementName", ClassElementName$$);
     }
@@ -11112,27 +11120,26 @@ var require_parser = __commonJS({
         children: [imp, $0.slice(1)]
       };
     });
-    var ImportDeclaration$1 = $T($S(Import, __, TypeKeyword, __, ImportClause, __, FromClause, $E(ImportAssertion)), function(value) {
+    var ImportDeclaration$1 = $T($S(Import, __, TypeKeyword, __, ImportClause, __, FromClause), function(value) {
       return { "type": "ImportDeclaration", "ts": true, "children": value };
     });
-    var ImportDeclaration$2 = $T($S(Import, __, ImportClause, __, FromClause, $E(ImportAssertion)), function(value) {
+    var ImportDeclaration$2 = $T($S(Import, __, ImportClause, __, FromClause), function(value) {
       return { "type": "ImportDeclaration", "children": value };
     });
-    var ImportDeclaration$3 = $T($S(Import, __, ModuleSpecifier, $E(ImportAssertion)), function(value) {
+    var ImportDeclaration$3 = $T($S(Import, __, ModuleSpecifier), function(value) {
       return { "type": "ImportDeclaration", "children": value };
     });
-    var ImportDeclaration$4 = $TS($S(ImpliedImport, $E($S(TypeKeyword, __)), ImportClause, __, FromClause, $E(ImportAssertion)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var ImportDeclaration$4 = $TS($S(ImpliedImport, $E($S(TypeKeyword, __)), ImportClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var i = $1;
       var t = $2;
       var c = $3;
       var w = $4;
       var f = $5;
-      var a = $6;
       i.$loc = {
         pos: f[0].$loc.pos - 1,
         length: f[0].$loc.length + 1
       };
-      const children = [i, t, c, w, f, a];
+      const children = [i, t, c, w, f];
       if (!t)
         return children;
       return { type: "ImportDeclaration", ts: true, children };
@@ -11291,7 +11298,8 @@ var require_parser = __commonJS({
     function ModuleExportName(ctx, state) {
       return $EVENT_C(ctx, state, "ModuleExportName", ModuleExportName$$);
     }
-    var ModuleSpecifier$0 = $TS($S(UnprocessedModuleSpecifier), function($skip, $loc, $0, $1) {
+    var ModuleSpecifier$0 = $TS($S(UnprocessedModuleSpecifier, $E(ImportAssertion)), function($skip, $loc, $0, $1, $2) {
+      var a = $2;
       let { token } = $1;
       if (module2.config.rewriteTsImports) {
         token = token.replace(/\.([mc])?ts(['"])$/, ".$1js$2");
@@ -11302,6 +11310,8 @@ var require_parser = __commonJS({
           `${module2.config.rewriteCivetImports.replace(/\$/g, "$$")}$1`
         );
       }
+      if (a)
+        return [{ ...$1, token }, a];
       return { ...$1, token };
     });
     function ModuleSpecifier(ctx, state) {
@@ -11666,7 +11676,11 @@ var require_parser = __commonJS({
     function TripleSingleStringCharacters(ctx, state) {
       return $EVENT(ctx, state, "TripleSingleStringCharacters", TripleSingleStringCharacters$0);
     }
-    var CoffeeStringSubstitution$0 = $S(CoffeeSubstitutionStart, PostfixedExpression, __, CloseBrace);
+    var CoffeeStringSubstitution$0 = $TS($S(CoffeeSubstitutionStart, AllowAll, $E($S(PostfixedExpression, __, CloseBrace)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
+      if (!$3)
+        return $skip;
+      return [$1, ...$3];
+    });
     function CoffeeStringSubstitution(ctx, state) {
       return $EVENT(ctx, state, "CoffeeStringSubstitution", CoffeeStringSubstitution$0);
     }
@@ -11843,7 +11857,11 @@ var require_parser = __commonJS({
     function _TemplateLiteral(ctx, state) {
       return $EVENT_C(ctx, state, "_TemplateLiteral", _TemplateLiteral$$);
     }
-    var TemplateSubstitution$0 = $S(SubstitutionStart, PostfixedExpression, __, CloseBrace);
+    var TemplateSubstitution$0 = $TS($S(SubstitutionStart, AllowAll, $E($S(PostfixedExpression, __, CloseBrace)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
+      if (!$3)
+        return $skip;
+      return [$1, ...$3];
+    });
     function TemplateSubstitution(ctx, state) {
       return $EVENT(ctx, state, "TemplateSubstitution", TemplateSubstitution$0);
     }
@@ -14594,6 +14612,19 @@ var require_parser = __commonJS({
           };
           module2.prelude.push(["", [preludeVar, isRef, typeSuffix, " = Object.is", asAny, ";\n"]]);
         },
+        /**
+         * Array length check with type guard.
+         * From tlgreg https://discord.com/channels/933472021310996512/1012166187196629113/1157386582546976873
+         */
+        len(lenRef) {
+          module2.prelude.push(["", [{
+            ts: true,
+            children: ["function ", lenRef, "<T extends readonly unknown[], N extends number>(arr: T, length: N): arr is T & { length: N } { return arr.length === length }"]
+          }, {
+            js: true,
+            children: ["function ", lenRef, "(arr, length) { return arr.length === length }"]
+          }], "\n"]);
+        },
         modulo(moduloRef) {
           const typeSuffix = {
             ts: true,

package/dist/main.mjs

@@ -1176,7 +1176,7 @@ var init_op = __esm({
 });
 
 // source/parser/pattern-matching.civet
-function processPatternMatching(statements, ReservedWord) {
+function processPatternMatching(statements, ReservedWord, getRef) {
   gatherRecursiveAll(statements, ($) => $.type === "SwitchStatement").forEach((s) => {
     const { caseBlock } = s;
     const { clauses } = caseBlock;
@@ -1236,7 +1236,7 @@ function processPatternMatching(statements, ReservedWord) {
       const indent = block.expressions?.[0]?.[0] || "";
       const alternativeConditions = patterns.map((pattern2, i2) => {
         const conditions = [];
-        getPatternConditions(pattern2, ref, conditions);
+        getPatternConditions(pattern2, ref, conditions, getRef);
         return conditions;
       });
       const conditionExpression = alternativeConditions.map((conditions, i2) => {
@@ -1294,26 +1294,26 @@ function processPatternMatching(statements, ReservedWord) {
     return addParentPointers(s, s.parent);
   });
 }
-function getPatternConditions(pattern, ref, conditions) {
+function getPatternConditions(pattern, ref, conditions, getRef) {
   if (pattern.rest)
     return;
   switch (pattern.type) {
     case "ArrayBindingPattern": {
-      const { elements, length } = pattern, hasRest = elements.some((e) => e.rest), comparator = hasRest ? " >= " : " === ", l = [comparator, (length - hasRest).toString()];
+      const { elements, length } = pattern, hasRest = elements.some((e) => e.rest), l = (length - hasRest).toString(), lengthCheck = hasRest ? [ref, ".length >= ", l] : [getRef("len"), "(", ref, ", ", l, ")"];
       conditions.push(
         ["Array.isArray(", ref, ")"],
-        [ref, ".length", l]
+        lengthCheck
       );
       elements.forEach(({ children: [, e] }, i) => {
         const subRef = [ref, "[", i.toString(), "]"];
-        return getPatternConditions(e, subRef, conditions);
+        return getPatternConditions(e, subRef, conditions, getRef);
       });
       const { blockPrefix } = pattern;
       if (blockPrefix) {
         const postElements = blockPrefix.children[1], { length: postLength } = postElements;
         postElements.forEach(({ children: [, e] }, i) => {
           const subRef = [ref, "[", ref, ".length - ", (postLength + i).toString(), "]"];
-          return getPatternConditions(e, subRef, conditions);
+          return getPatternConditions(e, subRef, conditions, getRef);
         });
       }
       break;
@@ -1345,7 +1345,7 @@ function getPatternConditions(pattern, ref, conditions) {
                 subRef = [ref, ".", name];
             }
             if (value) {
-              getPatternConditions(value, subRef, conditions);
+              getPatternConditions(value, subRef, conditions, getRef);
             }
             break;
           }
@@ -2208,12 +2208,14 @@ function processDeclarationCondition(condition, rootCondition, parent) {
     ]
   });
 }
-function processDeclarationConditions(node) {
+function processDeclarationConditions(node, getRef) {
   gatherRecursiveAll(node, (n) => {
     return n.type === "IfStatement" || n.type === "IterationStatement" || n.type === "SwitchStatement";
-  }).forEach(processDeclarationConditionStatement);
+  }).forEach((s) => {
+    return processDeclarationConditionStatement(s, getRef);
+  });
 }
-function processDeclarationConditionStatement(s) {
+function processDeclarationConditionStatement(s, getRef) {
   const { condition } = s;
   if (!condition?.expression) {
     return;
@@ -2228,7 +2230,7 @@ function processDeclarationConditionStatement(s) {
   const { ref, pattern } = expression;
   if (pattern) {
     let conditions = [];
-    getPatternConditions(pattern, ref, conditions);
+    getPatternConditions(pattern, ref, conditions, getRef);
     conditions = conditions.filter((c) => {
       return !(c.length === 3 && c[0] === "typeof " && c[1] === ref && c[2] === " === 'object'") && !(c.length === 2 && c[0] === ref && c[1] === " != null");
     });
@@ -2624,17 +2626,21 @@ function forRange(open, forDeclaration, range, stepExp, close) {
     stepExp = insertTrimmingSpace(stepExp, "");
     stepRef = maybeRef(stepExp, "step");
   }
-  const startRef = maybeRef(start, "start");
-  const endRef = maybeRef(end, "end");
+  let startRef = maybeRef(start, "start");
+  let endRef = maybeRef(end, "end");
   const startRefDec = startRef !== start ? [startRef, " = ", start, ", "] : [];
   const endRefDec = endRef !== end ? [endRef, " = ", end, ", "] : [];
   let ascDec = [], ascRef, asc;
   if (stepRef) {
-    if (stepRef !== stepExp) {
+    if (!(stepRef === stepExp)) {
       ascDec = [", ", stepRef, " = ", stepExp];
     }
-  } else if (start.type === "Literal" && end.type === "Literal") {
+  } else if ("Literal" === start.type && start.type === end.type) {
     asc = literalValue(start) <= literalValue(end);
+    if ("StringLiteral" === start.subtype && start.subtype === end.subtype) {
+      startRef = literalValue(start).charCodeAt(0).toString();
+      endRef = literalValue(end).charCodeAt(0).toString();
+    }
   } else {
     ascRef = makeRef("asc");
     ascDec = [", ", ascRef, " = ", startRef, " <= ", endRef];
@@ -2646,8 +2652,9 @@ function forRange(open, forDeclaration, range, stepExp, close) {
       varAssign = [...insertTrimmingSpace(varName, ""), " = "];
       varLet = [",", ...varName, " = ", counterRef];
     } else {
+      const value = "StringLiteral" === start.subtype ? ["String.fromCharCode(", counterRef, ")"] : counterRef;
       blockPrefix = [
-        ["", forDeclaration, " = ", counterRef, ";"]
+        ["", forDeclaration, " = ", value, ";"]
       ];
     }
   } else if (forDeclaration) {
@@ -3901,12 +3908,12 @@ function processProgram(root, config, m, ReservedWord) {
   addParentPointers(root);
   const { expressions: statements } = root;
   processTypes(statements);
-  processDeclarationConditions(statements);
+  processDeclarationConditions(statements, m.getRef);
   processPipelineExpressions(statements);
   processDeclarations(statements);
   processAssignments(statements);
   processStatementExpressions(statements);
-  processPatternMatching(statements, ReservedWord);
+  processPatternMatching(statements, ReservedWord, m.getRef);
   gatherRecursiveAll(statements, (n) => n.type === "IterationExpression").forEach((e) => expressionizeIteration(e));
   hoistRefDecs(statements);
   processFunctions(statements, config);
@@ -9483,8 +9490,9 @@ var require_parser = __commonJS({
       return $EVENT_C(ctx, state, "MethodSignature", MethodSignature$$);
     }
     var ClassElementName$0 = PropertyName;
-    var ClassElementName$1 = PrivateIdentifier;
-    var ClassElementName$$ = [ClassElementName$0, ClassElementName$1];
+    var ClassElementName$1 = LengthShorthand;
+    var ClassElementName$2 = PrivateIdentifier;
+    var ClassElementName$$ = [ClassElementName$0, ClassElementName$1, ClassElementName$2];
     function ClassElementName(ctx, state) {
       return $EVENT_C(ctx, state, "ClassElementName", ClassElementName$$);
     }
@@ -11110,27 +11118,26 @@ var require_parser = __commonJS({
         children: [imp, $0.slice(1)]
       };
     });
-    var ImportDeclaration$1 = $T($S(Import, __, TypeKeyword, __, ImportClause, __, FromClause, $E(ImportAssertion)), function(value) {
+    var ImportDeclaration$1 = $T($S(Import, __, TypeKeyword, __, ImportClause, __, FromClause), function(value) {
       return { "type": "ImportDeclaration", "ts": true, "children": value };
     });
-    var ImportDeclaration$2 = $T($S(Import, __, ImportClause, __, FromClause, $E(ImportAssertion)), function(value) {
+    var ImportDeclaration$2 = $T($S(Import, __, ImportClause, __, FromClause), function(value) {
       return { "type": "ImportDeclaration", "children": value };
     });
-    var ImportDeclaration$3 = $T($S(Import, __, ModuleSpecifier, $E(ImportAssertion)), function(value) {
+    var ImportDeclaration$3 = $T($S(Import, __, ModuleSpecifier), function(value) {
       return { "type": "ImportDeclaration", "children": value };
     });
-    var ImportDeclaration$4 = $TS($S(ImpliedImport, $E($S(TypeKeyword, __)), ImportClause, __, FromClause, $E(ImportAssertion)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var ImportDeclaration$4 = $TS($S(ImpliedImport, $E($S(TypeKeyword, __)), ImportClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var i = $1;
       var t = $2;
       var c = $3;
       var w = $4;
       var f = $5;
-      var a = $6;
       i.$loc = {
         pos: f[0].$loc.pos - 1,
         length: f[0].$loc.length + 1
       };
-      const children = [i, t, c, w, f, a];
+      const children = [i, t, c, w, f];
       if (!t)
         return children;
       return { type: "ImportDeclaration", ts: true, children };
@@ -11289,7 +11296,8 @@ var require_parser = __commonJS({
     function ModuleExportName(ctx, state) {
       return $EVENT_C(ctx, state, "ModuleExportName", ModuleExportName$$);
     }
-    var ModuleSpecifier$0 = $TS($S(UnprocessedModuleSpecifier), function($skip, $loc, $0, $1) {
+    var ModuleSpecifier$0 = $TS($S(UnprocessedModuleSpecifier, $E(ImportAssertion)), function($skip, $loc, $0, $1, $2) {
+      var a = $2;
       let { token } = $1;
       if (module.config.rewriteTsImports) {
         token = token.replace(/\.([mc])?ts(['"])$/, ".$1js$2");
@@ -11300,6 +11308,8 @@ var require_parser = __commonJS({
           `${module.config.rewriteCivetImports.replace(/\$/g, "$$")}$1`
         );
       }
+      if (a)
+        return [{ ...$1, token }, a];
       return { ...$1, token };
     });
     function ModuleSpecifier(ctx, state) {
@@ -11664,7 +11674,11 @@ var require_parser = __commonJS({
     function TripleSingleStringCharacters(ctx, state) {
       return $EVENT(ctx, state, "TripleSingleStringCharacters", TripleSingleStringCharacters$0);
     }
-    var CoffeeStringSubstitution$0 = $S(CoffeeSubstitutionStart, PostfixedExpression, __, CloseBrace);
+    var CoffeeStringSubstitution$0 = $TS($S(CoffeeSubstitutionStart, AllowAll, $E($S(PostfixedExpression, __, CloseBrace)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
+      if (!$3)
+        return $skip;
+      return [$1, ...$3];
+    });
     function CoffeeStringSubstitution(ctx, state) {
       return $EVENT(ctx, state, "CoffeeStringSubstitution", CoffeeStringSubstitution$0);
     }
@@ -11841,7 +11855,11 @@ var require_parser = __commonJS({
     function _TemplateLiteral(ctx, state) {
       return $EVENT_C(ctx, state, "_TemplateLiteral", _TemplateLiteral$$);
     }
-    var TemplateSubstitution$0 = $S(SubstitutionStart, PostfixedExpression, __, CloseBrace);
+    var TemplateSubstitution$0 = $TS($S(SubstitutionStart, AllowAll, $E($S(PostfixedExpression, __, CloseBrace)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
+      if (!$3)
+        return $skip;
+      return [$1, ...$3];
+    });
     function TemplateSubstitution(ctx, state) {
       return $EVENT(ctx, state, "TemplateSubstitution", TemplateSubstitution$0);
     }
@@ -14592,6 +14610,19 @@ var require_parser = __commonJS({
           };
           module.prelude.push(["", [preludeVar, isRef, typeSuffix, " = Object.is", asAny, ";\n"]]);
         },
+        /**
+         * Array length check with type guard.
+         * From tlgreg https://discord.com/channels/933472021310996512/1012166187196629113/1157386582546976873
+         */
+        len(lenRef) {
+          module.prelude.push(["", [{
+            ts: true,
+            children: ["function ", lenRef, "<T extends readonly unknown[], N extends number>(arr: T, length: N): arr is T & { length: N } { return arr.length === length }"]
+          }, {
+            js: true,
+            children: ["function ", lenRef, "(arr, length) { return arr.length === length }"]
+          }], "\n"]);
+        },
         modulo(moduloRef) {
           const typeSuffix = {
             ts: true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.6.83",
+  "version": "0.6.84",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",