@danielx/civet 0.11.8 → 0.11.9

package/dist/main.js

@@ -504,6 +504,7 @@ __export(lib_exports, {
   braceBlock: () => braceBlock,
   bracedBlock: () => bracedBlock,
   buildExportSplitClause: () => buildExportSplitClause,
+  canExpressionizeIfAsTernary: () => canExpressionizeIfAsTernary,
   convertArrowFunctionToMethod: () => convertArrowFunctionToMethod,
   convertFunctionToMethod: () => convertFunctionToMethod,
   convertNamedImportsToObject: () => convertNamedImportsToObject,
@@ -950,12 +951,13 @@ function prepend(prefix, node) {
   }
   if (Array.isArray(node)) {
     return [prefix, ...node];
-  } else {
-    assert(isParent(node), "prepend: can't glom into an AST leaf");
+  } else if (isParent(node)) {
     return {
       ...node,
       children: [prefix, ...node.children]
     };
+  } else {
+    return [prefix, node];
   }
 }
 function append(node, suffix) {
@@ -5680,6 +5682,9 @@ function prependStatementExpressionBlock(initializer, statement) {
     return;
   }
   const statementExp = exp.statement;
+  if (statementExp.type === "IfStatement" && canExpressionizeIfAsTernary(statementExp)) {
+    return;
+  }
   const blockStatement = [ws || "", statementExp, ";"];
   const pre = [blockStatement];
   let ref;
@@ -7462,6 +7467,25 @@ function expressionizeBlock(blockOrExpression) {
     return blockOrExpression;
   }
 }
+function canExpressionizeIfAsTernary(statement) {
+  const { then: b, else: e } = statement;
+  return canExpressionizeBlock(b) && (e ? canExpressionizeBlock(e.block) : true);
+}
+function canExpressionizeBlock(blockOrExpression) {
+  if (blockOrExpression && typeof blockOrExpression === "object" && "expressions" in blockOrExpression) {
+    const { expressions } = blockOrExpression;
+    let results1 = true;
+    for (const [, s] of expressions) {
+      if (!isExpression(s)) {
+        results1 = false;
+        break;
+      }
+    }
+    return results1;
+  }
+  ;
+  return;
+}
 function expressionizeIfStatement(statement) {
   const { condition, then: b, else: e } = statement;
   const [...condRest] = condition.children, [closeParen] = condRest.splice(-1);
@@ -8596,11 +8620,11 @@ function attachPostfixStatementAsExpression(exp, post) {
   }
 }
 function processTypes(node) {
-  const results1 = [];
+  const results2 = [];
   for (let ref22 = gatherRecursiveAll(node, ($13) => $13.type === "TypeUnary"), i12 = 0, len11 = ref22.length; i12 < len11; i12++) {
     const unary = ref22[i12];
     let suffixIndex = unary.suffix.length - 1;
-    const results2 = [];
+    const results3 = [];
     while (suffixIndex >= 0) {
       const suffix = unary.suffix[suffixIndex];
       if (typeof suffix === "object" && suffix != null && "token" in suffix && suffix.token === "?") {
@@ -8660,7 +8684,7 @@ function processTypes(node) {
             children: [prefix, replace, outer]
           });
         }
-        results2.push(replaceNode(unary, replace, parent));
+        results3.push(replaceNode(unary, replace, parent));
       } else if (typeof suffix === "object" && suffix != null && "type" in suffix && suffix.type === "NonNullAssertion") {
         const {} = suffix;
         let m7;
@@ -8715,15 +8739,15 @@ function processTypes(node) {
             children: [prefix, replace, outer]
           });
         }
-        results2.push(replaceNode(unary, replace, parent));
+        results3.push(replaceNode(unary, replace, parent));
       } else {
-        results2.push(suffixIndex--);
+        results3.push(suffixIndex--);
       }
     }
-    results1.push(results2);
+    results2.push(results3);
   }
   ;
-  return results1;
+  return results2;
 }
 function processStatementExpressions(statements) {
   for (let ref24 = gatherRecursiveAll(statements, ($14) => $14.type === "StatementExpression"), i13 = 0, len12 = ref24.length; i13 < len12; i13++) {
@@ -8908,12 +8932,12 @@ function processCoffeeClasses(statements) {
         index + 1,
         0,
         ...(() => {
-          const results3 = [];
+          const results4 = [];
           for (let i16 = 0, len15 = autoBinds.length; i16 < len15; i16++) {
             const [, a] = autoBinds[i16];
-            results3.push([indent, ["this.", a.name, " = this.", a.name, ".bind(this)"], ";"]);
+            results4.push([indent, ["this.", a.name, " = this.", a.name, ".bind(this)"], ";"]);
           }
-          return results3;
+          return results4;
         })()
       );
     }
@@ -17558,11 +17582,12 @@ function PropertyAccess$5($$ctx, $$state) {
       optional: modifier?.token === "?"
     };
     if (id) {
+      const access = id.unicode ? ["prototype[", propertyKey(id), "]"] : ["prototype.", id];
       return {
         type: "PropertyAccess",
         name: id.name,
         dot: start,
-        children: [start, "prototype.", id]
+        children: [start, ...access]
       };
     } else {
       return {
@@ -17686,10 +17711,11 @@ function PropertyBind($$ctx, $$state) {
     var dot = $3;
     var id = $4;
     var args = $5;
+    const children = id.unicode ? [modifier, modifier?.token === "?" ? dot : null, "[", propertyKey(id), "]"] : [modifier, dot, id];
     return {
       type: "PropertyBind",
       name: id.name,
-      children: [modifier, dot, id],
+      children,
       // omit `@` from children
       args: args?.children.slice(1, -1) ?? []
       // remove the parens from the arg list, or give an empty list
@@ -17725,10 +17751,11 @@ function PropertyBindExplicitArguments($$ctx, $$state) {
     var dot = $3;
     var id = $4;
     var args = $5;
+    const children = id.unicode ? [modifier, modifier?.token === "?" ? dot : null, "[", propertyKey(id), "]"] : [modifier, dot, id];
     return {
       type: "PropertyBind",
       name: id.name,
-      children: [modifier, dot, id],
+      children,
       // omit `@` from children
       args: args?.children.slice(1, -1) ?? []
       // remove the parens from the arg list, or give an empty list
@@ -21874,9 +21901,16 @@ function SymbolLiteral($$ctx, $$state) {
   const $$m = (function($skip, $loc, $0, $1, $2) {
     var colon = $1;
     var id = $2;
-    let name, token;
+    let name, token, quoted;
     if (id.type === "Identifier") {
-      ({ name, children: [token] } = id);
+      if (id.unicode) {
+        name = id.unicode;
+        token = { $loc: id.children?.[0]?.$loc, token: `"${id.unicode}"` };
+        quoted = true;
+      } else {
+        ({ name, children: [token] } = id);
+        quoted = false;
+      }
     } else {
       name = literalValue({
         type: "Literal",
@@ -21885,17 +21919,18 @@ function SymbolLiteral($$ctx, $$state) {
         children: [id]
       });
       token = id;
+      quoted = true;
     }
     if (config.symbols.includes(name)) {
       return {
         type: "SymbolLiteral",
-        children: id.type === "Identifier" ? [
-          { ...colon, token: "Symbol." },
-          token
-        ] : [
+        children: quoted ? [
           { ...colon, token: "Symbol[" },
           token,
           "]"
+        ] : [
+          { ...colon, token: "Symbol." },
+          token
         ],
         name
       };
@@ -21904,7 +21939,7 @@ function SymbolLiteral($$ctx, $$state) {
         type: "SymbolLiteral",
         children: [
           { ...colon, token: "Symbol.for(" },
-          id.type === "Identifier" ? ['"', token, '"'] : token,
+          quoted ? token : ['"', token, '"'],
           ")"
         ],
         name

package/dist/main.mjs

@@ -483,6 +483,7 @@ __export(lib_exports, {
   braceBlock: () => braceBlock,
   bracedBlock: () => bracedBlock,
   buildExportSplitClause: () => buildExportSplitClause,
+  canExpressionizeIfAsTernary: () => canExpressionizeIfAsTernary,
   convertArrowFunctionToMethod: () => convertArrowFunctionToMethod,
   convertFunctionToMethod: () => convertFunctionToMethod,
   convertNamedImportsToObject: () => convertNamedImportsToObject,
@@ -929,12 +930,13 @@ function prepend(prefix, node) {
   }
   if (Array.isArray(node)) {
     return [prefix, ...node];
-  } else {
-    assert(isParent(node), "prepend: can't glom into an AST leaf");
+  } else if (isParent(node)) {
     return {
       ...node,
       children: [prefix, ...node.children]
     };
+  } else {
+    return [prefix, node];
   }
 }
 function append(node, suffix) {
@@ -5659,6 +5661,9 @@ function prependStatementExpressionBlock(initializer, statement) {
     return;
   }
   const statementExp = exp.statement;
+  if (statementExp.type === "IfStatement" && canExpressionizeIfAsTernary(statementExp)) {
+    return;
+  }
   const blockStatement = [ws || "", statementExp, ";"];
   const pre = [blockStatement];
   let ref;
@@ -7441,6 +7446,25 @@ function expressionizeBlock(blockOrExpression) {
     return blockOrExpression;
   }
 }
+function canExpressionizeIfAsTernary(statement) {
+  const { then: b, else: e } = statement;
+  return canExpressionizeBlock(b) && (e ? canExpressionizeBlock(e.block) : true);
+}
+function canExpressionizeBlock(blockOrExpression) {
+  if (blockOrExpression && typeof blockOrExpression === "object" && "expressions" in blockOrExpression) {
+    const { expressions } = blockOrExpression;
+    let results1 = true;
+    for (const [, s] of expressions) {
+      if (!isExpression(s)) {
+        results1 = false;
+        break;
+      }
+    }
+    return results1;
+  }
+  ;
+  return;
+}
 function expressionizeIfStatement(statement) {
   const { condition, then: b, else: e } = statement;
   const [...condRest] = condition.children, [closeParen] = condRest.splice(-1);
@@ -8575,11 +8599,11 @@ function attachPostfixStatementAsExpression(exp, post) {
   }
 }
 function processTypes(node) {
-  const results1 = [];
+  const results2 = [];
   for (let ref22 = gatherRecursiveAll(node, ($13) => $13.type === "TypeUnary"), i12 = 0, len11 = ref22.length; i12 < len11; i12++) {
     const unary = ref22[i12];
     let suffixIndex = unary.suffix.length - 1;
-    const results2 = [];
+    const results3 = [];
     while (suffixIndex >= 0) {
       const suffix = unary.suffix[suffixIndex];
       if (typeof suffix === "object" && suffix != null && "token" in suffix && suffix.token === "?") {
@@ -8639,7 +8663,7 @@ function processTypes(node) {
             children: [prefix, replace, outer]
           });
         }
-        results2.push(replaceNode(unary, replace, parent));
+        results3.push(replaceNode(unary, replace, parent));
       } else if (typeof suffix === "object" && suffix != null && "type" in suffix && suffix.type === "NonNullAssertion") {
         const {} = suffix;
         let m7;
@@ -8694,15 +8718,15 @@ function processTypes(node) {
             children: [prefix, replace, outer]
           });
         }
-        results2.push(replaceNode(unary, replace, parent));
+        results3.push(replaceNode(unary, replace, parent));
       } else {
-        results2.push(suffixIndex--);
+        results3.push(suffixIndex--);
       }
     }
-    results1.push(results2);
+    results2.push(results3);
   }
   ;
-  return results1;
+  return results2;
 }
 function processStatementExpressions(statements) {
   for (let ref24 = gatherRecursiveAll(statements, ($14) => $14.type === "StatementExpression"), i13 = 0, len12 = ref24.length; i13 < len12; i13++) {
@@ -8887,12 +8911,12 @@ function processCoffeeClasses(statements) {
         index + 1,
         0,
         ...(() => {
-          const results3 = [];
+          const results4 = [];
           for (let i16 = 0, len15 = autoBinds.length; i16 < len15; i16++) {
             const [, a] = autoBinds[i16];
-            results3.push([indent, ["this.", a.name, " = this.", a.name, ".bind(this)"], ";"]);
+            results4.push([indent, ["this.", a.name, " = this.", a.name, ".bind(this)"], ";"]);
           }
-          return results3;
+          return results4;
         })()
       );
     }
@@ -17537,11 +17561,12 @@ function PropertyAccess$5($$ctx, $$state) {
       optional: modifier?.token === "?"
     };
     if (id) {
+      const access = id.unicode ? ["prototype[", propertyKey(id), "]"] : ["prototype.", id];
       return {
         type: "PropertyAccess",
         name: id.name,
         dot: start,
-        children: [start, "prototype.", id]
+        children: [start, ...access]
       };
     } else {
       return {
@@ -17665,10 +17690,11 @@ function PropertyBind($$ctx, $$state) {
     var dot = $3;
     var id = $4;
     var args = $5;
+    const children = id.unicode ? [modifier, modifier?.token === "?" ? dot : null, "[", propertyKey(id), "]"] : [modifier, dot, id];
     return {
       type: "PropertyBind",
       name: id.name,
-      children: [modifier, dot, id],
+      children,
       // omit `@` from children
       args: args?.children.slice(1, -1) ?? []
       // remove the parens from the arg list, or give an empty list
@@ -17704,10 +17730,11 @@ function PropertyBindExplicitArguments($$ctx, $$state) {
     var dot = $3;
     var id = $4;
     var args = $5;
+    const children = id.unicode ? [modifier, modifier?.token === "?" ? dot : null, "[", propertyKey(id), "]"] : [modifier, dot, id];
     return {
       type: "PropertyBind",
       name: id.name,
-      children: [modifier, dot, id],
+      children,
       // omit `@` from children
       args: args?.children.slice(1, -1) ?? []
       // remove the parens from the arg list, or give an empty list
@@ -21853,9 +21880,16 @@ function SymbolLiteral($$ctx, $$state) {
   const $$m = (function($skip, $loc, $0, $1, $2) {
     var colon = $1;
     var id = $2;
-    let name, token;
+    let name, token, quoted;
     if (id.type === "Identifier") {
-      ({ name, children: [token] } = id);
+      if (id.unicode) {
+        name = id.unicode;
+        token = { $loc: id.children?.[0]?.$loc, token: `"${id.unicode}"` };
+        quoted = true;
+      } else {
+        ({ name, children: [token] } = id);
+        quoted = false;
+      }
     } else {
       name = literalValue({
         type: "Literal",
@@ -21864,17 +21898,18 @@ function SymbolLiteral($$ctx, $$state) {
         children: [id]
       });
       token = id;
+      quoted = true;
     }
     if (config.symbols.includes(name)) {
       return {
         type: "SymbolLiteral",
-        children: id.type === "Identifier" ? [
-          { ...colon, token: "Symbol." },
-          token
-        ] : [
+        children: quoted ? [
           { ...colon, token: "Symbol[" },
           token,
           "]"
+        ] : [
+          { ...colon, token: "Symbol." },
+          token
         ],
         name
       };
@@ -21883,7 +21918,7 @@ function SymbolLiteral($$ctx, $$state) {
         type: "SymbolLiteral",
         children: [
           { ...colon, token: "Symbol.for(" },
-          id.type === "Identifier" ? ['"', token, '"'] : token,
+          quoted ? token : ['"', token, '"'],
           ")"
         ],
         name