@danielx/civet 0.6.37 → 0.6.38

package/dist/main.js

@@ -892,6 +892,28 @@ var require_lib = __commonJS({
       }
       return expandedOps;
     }
+    function handleThisPrivateShorthands(value) {
+      if (value.privateShorthand) {
+        value = value.children[1].children[1];
+        return [value, false];
+      }
+      if (value.type === "MemberExpression" || value.type === "CallExpression") {
+        let suppressPrefix = value.thisShorthand;
+        value = {
+          ...value,
+          children: value.children.map((c, i) => {
+            if (i === 0) {
+              let s;
+              [c, s] = handleThisPrivateShorthands(c);
+              suppressPrefix || (suppressPrefix = s);
+            }
+            return c;
+          })
+        };
+        return [value, suppressPrefix];
+      }
+      return [value, value.thisShorthand];
+    }
     function processCallMemberExpression(node) {
       const { children } = node;
       for (let i = 0; i < children.length; i++) {
@@ -919,11 +941,15 @@ var require_lib = __commonJS({
               throw new Error("Glob pattern cannot have method definition");
             }
             if (part.value && !["CallExpression", "MemberExpression", "Identifier"].includes(part.value.type)) {
-              throw new Error("Glob pattern must have call or member expression value");
+              throw new Error(`Glob pattern must have call or member expression value, found ${JSON.stringify(part.value)}`);
             }
+            let suppressPrefix = false;
             let value = part.value ?? part.name;
             const wValue = getTrimmingSpace(part.value);
-            value = prefix.concat(insertTrimmingSpace(value, ""));
+            [value, suppressPrefix] = handleThisPrivateShorthands(value);
+            if (!suppressPrefix) {
+              value = prefix.concat(insertTrimmingSpace(value, ""));
+            }
             if (wValue)
               value.unshift(wValue);
             if (part.type === "SpreadProperty") {
@@ -1137,14 +1163,14 @@ var require_lib = __commonJS({
           chains.push(i);
         } else if (lowerPrecedenceOps.includes(op.token)) {
           processChains(op);
-          first = [];
+          first = void 0;
         }
         i++;
       }
       processChains(op);
       return results;
       function processChains(op2) {
-        if (isRelationalOp(op2)) {
+        if (first && isRelationalOp(op2)) {
           first = expandExistence(first);
         }
         if (chains.length > 1) {
@@ -1153,7 +1179,7 @@ var require_lib = __commonJS({
               results.push(" ", "&&", " ");
             }
             const binop = binops[index];
-            let [pre, op3, post, exp] = binop;
+            let [, , , exp] = binop;
             exp = binop[3] = expandExistence(exp);
             let endIndex;
             if (k < chains.length - 1) {
@@ -1166,10 +1192,13 @@ var require_lib = __commonJS({
             return start = endIndex;
           });
         } else {
-          results.push(first, ...binops.slice(start, i + 1).flat());
+          if (first) {
+            results.push(first);
+          }
+          results.push(...binops.slice(start, i + 1).flat());
           start = i + 1;
         }
-        return chains.length = 0;
+        chains.length = 0;
       }
       function expandExistence(exp) {
         const existence = isExistence(exp);
@@ -1251,6 +1280,23 @@ var require_lib = __commonJS({
         }
       }
     }
+    function replaceBlockExpression(node, child, replacement) {
+      let found = false;
+      const { expressions } = node;
+      for (let i = 0, l = expressions.length; i < l; i++) {
+        const statement = expressions[i];
+        const [, s] = statement;
+        if (s === child) {
+          statement[1] = replacement;
+          replacement.parent = node;
+          found = true;
+          break;
+        }
+      }
+      if (!found) {
+        throw new Error("Could not find child to replace");
+      }
+    }
     function findChildIndex(parent, child) {
       const children = Array.isArray(parent) ? parent : parent.children;
       const len = children.length;
@@ -2137,12 +2183,12 @@ var require_lib = __commonJS({
     }
     function processDeclarationConditions(node) {
       gatherRecursiveAll(node, (n) => {
-        return n.type === "IfStatement" || n.type === "IterationStatement";
+        return n.type === "IfStatement" || n.type === "IterationStatement" || n.type === "SwitchStatement";
       }).forEach(processDeclarationConditionStatement);
     }
     function processDeclarationConditionStatement(s) {
       const { condition } = s;
-      if (!condition) {
+      if (!condition?.expression) {
         return;
       }
       processDeclarationCondition(condition.expression);
@@ -2183,6 +2229,27 @@ var require_lib = __commonJS({
           updateParentPointers(newBlock, s);
           break;
         }
+        case "SwitchStatement": {
+          const { blockPrefix, ref: ref2 } = condition.expression;
+          if (!blockPrefix) {
+            return;
+          }
+          s.condition = {
+            type: "ParenthesizedExpression",
+            children: ["(", ref2, ")"],
+            expression: ref2,
+            parent: s
+          };
+          s.children[1] = s.condition;
+          const block = blockWithPrefix([["", [{
+            type: "Declaration",
+            children: ["let ", ...condition.expression.children]
+          }], ";"], ...blockPrefix], makeEmptyBlock());
+          replaceBlockExpression(s.parent, s, block);
+          block.expressions.push(["", s]);
+          s.parent = block;
+          break;
+        }
       }
     }
     function implicitFunctionBlock(f) {
@@ -2631,12 +2698,12 @@ var require_lib = __commonJS({
         }
         if (errors || !isPattern)
           return;
-        let { expression } = s;
-        if (expression.type === "ParenthesizedExpression") {
-          expression = expression.expression;
+        let { condition } = s;
+        if (condition.type === "ParenthesizedExpression") {
+          condition = condition.expression;
         }
-        let hoistDec, refAssignment = [], ref = maybeRef(expression, "m");
-        if (ref !== expression) {
+        let hoistDec, refAssignment = [], ref = maybeRef(condition, "m");
+        if (ref !== condition) {
           hoistDec = {
             type: "Declaration",
             children: ["let ", ref],
@@ -2644,7 +2711,7 @@ var require_lib = __commonJS({
           };
           refAssignment = [{
             type: "AssignmentExpression",
-            children: [ref, " = ", expression]
+            children: [ref, " = ", condition]
           }, ","];
         }
         let prev = [], root = prev;
@@ -2672,7 +2739,7 @@ var require_lib = __commonJS({
               return conditionArray;
             return [" || ", ...conditionArray];
           });
-          const condition = {
+          const condition2 = {
             type: "ParenthesizedExpression",
             children: ["(", ...refAssignment, conditionExpression, ")"],
             expression: conditionExpression
@@ -2707,7 +2774,7 @@ var require_lib = __commonJS({
             next.push("\n", "else ");
           prev.push(["", {
             type: "IfStatement",
-            children: ["if", condition, block, next],
+            children: ["if", condition2, block, next],
             then: block,
             else: next,
             hoistDec
@@ -5360,7 +5427,8 @@ var require_parser = __commonJS({
           type: "PropertyAccess",
           name: id,
           children: [".", id]
-        }]
+        }],
+        thisShorthand: true
       };
     });
     var ThisLiteral$2 = AtThis;
@@ -5381,7 +5449,8 @@ var require_parser = __commonJS({
           type: "PropertyAccess",
           name: id.name,
           children: [".", id]
-        }]
+        }],
+        privateShorthand: true
       };
     });
     var PrivateThis$$ = [PrivateThis$0, PrivateThis$1];
@@ -7233,20 +7302,7 @@ var require_parser = __commonJS({
     function ObjectPropertyDelimiter(ctx, state) {
       return $EVENT_C(ctx, state, "ObjectPropertyDelimiter", ObjectPropertyDelimiter$$);
     }
-    var PropertyDefinition$0 = $TS($S($E(_), AtThis, IdentifierReference), function($skip, $loc, $0, $1, $2, $3) {
-      var ws = $1;
-      var at = $2;
-      var id = $3;
-      const value = [at, ".", id];
-      return {
-        type: "Property",
-        children: [ws, id, ": ", ...value],
-        name: id,
-        names: id.names,
-        value
-      };
-    });
-    var PropertyDefinition$1 = $TS($S($E(_), NamedProperty), function($skip, $loc, $0, $1, $2) {
+    var PropertyDefinition$0 = $TS($S($E(_), NamedProperty), function($skip, $loc, $0, $1, $2) {
       var ws = $1;
       var prop = $2;
       return {
@@ -7254,7 +7310,7 @@ var require_parser = __commonJS({
         children: [ws, ...prop.children]
       };
     });
-    var PropertyDefinition$2 = $TS($S($E(_), $TEXT($EXPECT($R6, "PropertyDefinition /[!+-]/")), PropertyName), function($skip, $loc, $0, $1, $2, $3) {
+    var PropertyDefinition$1 = $TS($S($E(_), $TEXT($EXPECT($R6, "PropertyDefinition /[!+-]/")), PropertyName), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
       var toggle = $2;
       var id = $3;
@@ -7267,7 +7323,7 @@ var require_parser = __commonJS({
         value
       };
     });
-    var PropertyDefinition$3 = $TS($S($E(_), MethodDefinition), function($skip, $loc, $0, $1, $2) {
+    var PropertyDefinition$2 = $TS($S($E(_), MethodDefinition), function($skip, $loc, $0, $1, $2) {
       var ws = $1;
       var def = $2;
       if (!def.block || def.block.empty)
@@ -7277,7 +7333,7 @@ var require_parser = __commonJS({
         children: [ws, ...def.children]
       };
     });
-    var PropertyDefinition$4 = $TS($S($E(_), DotDotDot, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3) {
+    var PropertyDefinition$3 = $TS($S($E(_), DotDotDot, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
       var dots = $2;
       var exp = $3;
@@ -7289,7 +7345,7 @@ var require_parser = __commonJS({
         value: exp
       };
     });
-    var PropertyDefinition$5 = $TS($S($E(_), $N(EOS), CallExpression), function($skip, $loc, $0, $1, $2, $3) {
+    var PropertyDefinition$4 = $TS($S($E(_), $N(EOS), CallExpression), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
       var value = $3;
       switch (value.type) {
@@ -7348,16 +7404,18 @@ var require_parser = __commonJS({
         if (!name)
           return $skip;
       }
+      if (name[0] === "#")
+        name = name.slice(1);
       return {
         type: "Property",
         children: [ws, name, ": ", value],
         name,
-        value,
         names: [],
+        value,
         hoistDec
       };
     });
-    var PropertyDefinition$$ = [PropertyDefinition$0, PropertyDefinition$1, PropertyDefinition$2, PropertyDefinition$3, PropertyDefinition$4, PropertyDefinition$5];
+    var PropertyDefinition$$ = [PropertyDefinition$0, PropertyDefinition$1, PropertyDefinition$2, PropertyDefinition$3, PropertyDefinition$4];
     function PropertyDefinition(ctx, state) {
       return $EVENT_C(ctx, state, "PropertyDefinition", PropertyDefinition$$);
     }
@@ -8721,7 +8779,7 @@ var require_parser = __commonJS({
       return {
         type: "SwitchStatement",
         children: $0,
-        expression: condition,
+        condition,
         caseBlock
       };
     });
@@ -13417,6 +13475,7 @@ __export(main_exports, {
   generate: () => generate_default,
   isCompileError: () => isCompileError,
   parse: () => parse,
+  prune: () => prune,
   util: () => util_exports
 });
 module.exports = __toCommonJS(main_exports);
@@ -13585,7 +13644,10 @@ var SourceMap = function(sourceString) {
         sources: [srcFileName],
         mappings: this.renderMappings(),
         names: [],
-        sourcesContent: [sourceString]
+        sourcesContent: [sourceString],
+        toString: function() {
+          return JSON.stringify(this);
+        }
       };
     },
     updateSourceMap: function(outputStr, inputPos) {
@@ -14009,5 +14071,6 @@ var main_default = { parse, generate: generate_default, util: util_exports, comp
   generate,
   isCompileError,
   parse,
+  prune,
   util
 });

package/dist/main.mjs

@@ -890,6 +890,28 @@ var require_lib = __commonJS({
       }
       return expandedOps;
     }
+    function handleThisPrivateShorthands(value) {
+      if (value.privateShorthand) {
+        value = value.children[1].children[1];
+        return [value, false];
+      }
+      if (value.type === "MemberExpression" || value.type === "CallExpression") {
+        let suppressPrefix = value.thisShorthand;
+        value = {
+          ...value,
+          children: value.children.map((c, i) => {
+            if (i === 0) {
+              let s;
+              [c, s] = handleThisPrivateShorthands(c);
+              suppressPrefix || (suppressPrefix = s);
+            }
+            return c;
+          })
+        };
+        return [value, suppressPrefix];
+      }
+      return [value, value.thisShorthand];
+    }
     function processCallMemberExpression(node) {
       const { children } = node;
       for (let i = 0; i < children.length; i++) {
@@ -917,11 +939,15 @@ var require_lib = __commonJS({
               throw new Error("Glob pattern cannot have method definition");
             }
             if (part.value && !["CallExpression", "MemberExpression", "Identifier"].includes(part.value.type)) {
-              throw new Error("Glob pattern must have call or member expression value");
+              throw new Error(`Glob pattern must have call or member expression value, found ${JSON.stringify(part.value)}`);
             }
+            let suppressPrefix = false;
             let value = part.value ?? part.name;
             const wValue = getTrimmingSpace(part.value);
-            value = prefix.concat(insertTrimmingSpace(value, ""));
+            [value, suppressPrefix] = handleThisPrivateShorthands(value);
+            if (!suppressPrefix) {
+              value = prefix.concat(insertTrimmingSpace(value, ""));
+            }
             if (wValue)
               value.unshift(wValue);
             if (part.type === "SpreadProperty") {
@@ -1135,14 +1161,14 @@ var require_lib = __commonJS({
           chains.push(i);
         } else if (lowerPrecedenceOps.includes(op.token)) {
           processChains(op);
-          first = [];
+          first = void 0;
         }
         i++;
       }
       processChains(op);
       return results;
       function processChains(op2) {
-        if (isRelationalOp(op2)) {
+        if (first && isRelationalOp(op2)) {
           first = expandExistence(first);
         }
         if (chains.length > 1) {
@@ -1151,7 +1177,7 @@ var require_lib = __commonJS({
               results.push(" ", "&&", " ");
             }
             const binop = binops[index];
-            let [pre, op3, post, exp] = binop;
+            let [, , , exp] = binop;
             exp = binop[3] = expandExistence(exp);
             let endIndex;
             if (k < chains.length - 1) {
@@ -1164,10 +1190,13 @@ var require_lib = __commonJS({
             return start = endIndex;
           });
         } else {
-          results.push(first, ...binops.slice(start, i + 1).flat());
+          if (first) {
+            results.push(first);
+          }
+          results.push(...binops.slice(start, i + 1).flat());
           start = i + 1;
         }
-        return chains.length = 0;
+        chains.length = 0;
       }
       function expandExistence(exp) {
         const existence = isExistence(exp);
@@ -1249,6 +1278,23 @@ var require_lib = __commonJS({
         }
       }
     }
+    function replaceBlockExpression(node, child, replacement) {
+      let found = false;
+      const { expressions } = node;
+      for (let i = 0, l = expressions.length; i < l; i++) {
+        const statement = expressions[i];
+        const [, s] = statement;
+        if (s === child) {
+          statement[1] = replacement;
+          replacement.parent = node;
+          found = true;
+          break;
+        }
+      }
+      if (!found) {
+        throw new Error("Could not find child to replace");
+      }
+    }
     function findChildIndex(parent, child) {
       const children = Array.isArray(parent) ? parent : parent.children;
       const len = children.length;
@@ -2135,12 +2181,12 @@ var require_lib = __commonJS({
     }
     function processDeclarationConditions(node) {
       gatherRecursiveAll(node, (n) => {
-        return n.type === "IfStatement" || n.type === "IterationStatement";
+        return n.type === "IfStatement" || n.type === "IterationStatement" || n.type === "SwitchStatement";
       }).forEach(processDeclarationConditionStatement);
     }
     function processDeclarationConditionStatement(s) {
       const { condition } = s;
-      if (!condition) {
+      if (!condition?.expression) {
         return;
       }
       processDeclarationCondition(condition.expression);
@@ -2181,6 +2227,27 @@ var require_lib = __commonJS({
           updateParentPointers(newBlock, s);
           break;
         }
+        case "SwitchStatement": {
+          const { blockPrefix, ref: ref2 } = condition.expression;
+          if (!blockPrefix) {
+            return;
+          }
+          s.condition = {
+            type: "ParenthesizedExpression",
+            children: ["(", ref2, ")"],
+            expression: ref2,
+            parent: s
+          };
+          s.children[1] = s.condition;
+          const block = blockWithPrefix([["", [{
+            type: "Declaration",
+            children: ["let ", ...condition.expression.children]
+          }], ";"], ...blockPrefix], makeEmptyBlock());
+          replaceBlockExpression(s.parent, s, block);
+          block.expressions.push(["", s]);
+          s.parent = block;
+          break;
+        }
       }
     }
     function implicitFunctionBlock(f) {
@@ -2629,12 +2696,12 @@ var require_lib = __commonJS({
         }
         if (errors || !isPattern)
           return;
-        let { expression } = s;
-        if (expression.type === "ParenthesizedExpression") {
-          expression = expression.expression;
+        let { condition } = s;
+        if (condition.type === "ParenthesizedExpression") {
+          condition = condition.expression;
         }
-        let hoistDec, refAssignment = [], ref = maybeRef(expression, "m");
-        if (ref !== expression) {
+        let hoistDec, refAssignment = [], ref = maybeRef(condition, "m");
+        if (ref !== condition) {
           hoistDec = {
             type: "Declaration",
             children: ["let ", ref],
@@ -2642,7 +2709,7 @@ var require_lib = __commonJS({
           };
           refAssignment = [{
             type: "AssignmentExpression",
-            children: [ref, " = ", expression]
+            children: [ref, " = ", condition]
           }, ","];
         }
         let prev = [], root = prev;
@@ -2670,7 +2737,7 @@ var require_lib = __commonJS({
               return conditionArray;
             return [" || ", ...conditionArray];
           });
-          const condition = {
+          const condition2 = {
             type: "ParenthesizedExpression",
             children: ["(", ...refAssignment, conditionExpression, ")"],
             expression: conditionExpression
@@ -2705,7 +2772,7 @@ var require_lib = __commonJS({
             next.push("\n", "else ");
           prev.push(["", {
             type: "IfStatement",
-            children: ["if", condition, block, next],
+            children: ["if", condition2, block, next],
             then: block,
             else: next,
             hoistDec
@@ -5358,7 +5425,8 @@ var require_parser = __commonJS({
           type: "PropertyAccess",
           name: id,
           children: [".", id]
-        }]
+        }],
+        thisShorthand: true
       };
     });
     var ThisLiteral$2 = AtThis;
@@ -5379,7 +5447,8 @@ var require_parser = __commonJS({
           type: "PropertyAccess",
           name: id.name,
           children: [".", id]
-        }]
+        }],
+        privateShorthand: true
       };
     });
     var PrivateThis$$ = [PrivateThis$0, PrivateThis$1];
@@ -7231,20 +7300,7 @@ var require_parser = __commonJS({
     function ObjectPropertyDelimiter(ctx, state) {
       return $EVENT_C(ctx, state, "ObjectPropertyDelimiter", ObjectPropertyDelimiter$$);
     }
-    var PropertyDefinition$0 = $TS($S($E(_), AtThis, IdentifierReference), function($skip, $loc, $0, $1, $2, $3) {
-      var ws = $1;
-      var at = $2;
-      var id = $3;
-      const value = [at, ".", id];
-      return {
-        type: "Property",
-        children: [ws, id, ": ", ...value],
-        name: id,
-        names: id.names,
-        value
-      };
-    });
-    var PropertyDefinition$1 = $TS($S($E(_), NamedProperty), function($skip, $loc, $0, $1, $2) {
+    var PropertyDefinition$0 = $TS($S($E(_), NamedProperty), function($skip, $loc, $0, $1, $2) {
       var ws = $1;
       var prop = $2;
       return {
@@ -7252,7 +7308,7 @@ var require_parser = __commonJS({
         children: [ws, ...prop.children]
       };
     });
-    var PropertyDefinition$2 = $TS($S($E(_), $TEXT($EXPECT($R6, "PropertyDefinition /[!+-]/")), PropertyName), function($skip, $loc, $0, $1, $2, $3) {
+    var PropertyDefinition$1 = $TS($S($E(_), $TEXT($EXPECT($R6, "PropertyDefinition /[!+-]/")), PropertyName), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
       var toggle = $2;
       var id = $3;
@@ -7265,7 +7321,7 @@ var require_parser = __commonJS({
         value
       };
     });
-    var PropertyDefinition$3 = $TS($S($E(_), MethodDefinition), function($skip, $loc, $0, $1, $2) {
+    var PropertyDefinition$2 = $TS($S($E(_), MethodDefinition), function($skip, $loc, $0, $1, $2) {
       var ws = $1;
       var def = $2;
       if (!def.block || def.block.empty)
@@ -7275,7 +7331,7 @@ var require_parser = __commonJS({
         children: [ws, ...def.children]
       };
     });
-    var PropertyDefinition$4 = $TS($S($E(_), DotDotDot, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3) {
+    var PropertyDefinition$3 = $TS($S($E(_), DotDotDot, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
       var dots = $2;
       var exp = $3;
@@ -7287,7 +7343,7 @@ var require_parser = __commonJS({
         value: exp
       };
     });
-    var PropertyDefinition$5 = $TS($S($E(_), $N(EOS), CallExpression), function($skip, $loc, $0, $1, $2, $3) {
+    var PropertyDefinition$4 = $TS($S($E(_), $N(EOS), CallExpression), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
       var value = $3;
       switch (value.type) {
@@ -7346,16 +7402,18 @@ var require_parser = __commonJS({
         if (!name)
           return $skip;
       }
+      if (name[0] === "#")
+        name = name.slice(1);
       return {
         type: "Property",
         children: [ws, name, ": ", value],
         name,
-        value,
         names: [],
+        value,
         hoistDec
       };
     });
-    var PropertyDefinition$$ = [PropertyDefinition$0, PropertyDefinition$1, PropertyDefinition$2, PropertyDefinition$3, PropertyDefinition$4, PropertyDefinition$5];
+    var PropertyDefinition$$ = [PropertyDefinition$0, PropertyDefinition$1, PropertyDefinition$2, PropertyDefinition$3, PropertyDefinition$4];
     function PropertyDefinition(ctx, state) {
       return $EVENT_C(ctx, state, "PropertyDefinition", PropertyDefinition$$);
     }
@@ -8719,7 +8777,7 @@ var require_parser = __commonJS({
       return {
         type: "SwitchStatement",
         children: $0,
-        expression: condition,
+        condition,
         caseBlock
       };
     });
@@ -13573,7 +13631,10 @@ var SourceMap = function(sourceString) {
         sources: [srcFileName],
         mappings: this.renderMappings(),
         names: [],
-        sourcesContent: [sourceString]
+        sourcesContent: [sourceString],
+        toString: function() {
+          return JSON.stringify(this);
+        }
       };
     },
     updateSourceMap: function(outputStr, inputPos) {
@@ -13997,5 +14058,6 @@ export {
   generate_default as generate,
   isCompileError,
   parse,
+  prune,
   util_exports as util
 };