@danielx/civet 0.11.8 → 0.11.10

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;
         })()
       );
     }
@@ -9491,6 +9515,7 @@ var grammar = {
   ImplicitAccessStart,
   PropertyAccessModifier,
   PropertyAccess,
+  AccessLiteral,
   ExplicitPropertyGlob,
   PropertyGlob,
   PropertyBind,
@@ -15519,13 +15544,14 @@ function ClassElement$0($$ctx, $$state) {
   }
   if ($$ctx.tokenize) return $$r;
   const $$loc = $$r.loc, $$value = $$r.value;
-  const $$m = /* @__PURE__ */ (function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+  const $$m = (function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
     var decorators = $2;
     var declare = $3;
     var access = $4;
     var static_ = $5;
     var override = $6;
     var assignment = $7;
+    if (assignment.assigned?.type === "SymbolLiteral") return $skip;
     return {
       type: static_ ? "CoffeeClassPublic" : "CoffeeClassPrivate",
       children: [decorators, declare, access, static_, override, assignment],
@@ -17364,7 +17390,7 @@ function PropertyAccessModifier($$ctx, $$state) {
   if ($$ctx.exit) $$ctx.exit("PropertyAccessModifier", $$state, $$final, $$eventData);
   return $$final;
 }
-var PropertyAccess$0$parser = (0, import_lib2.$S)(AccessStart, (0, import_lib2.$C)(TemplateLiteral, StringLiteral, IntegerLiteral, SymbolLiteral));
+var PropertyAccess$0$parser = (0, import_lib2.$S)(AccessStart, (0, import_lib2.$C)(TemplateLiteral, AccessLiteral, SymbolLiteral));
 var PropertyAccess$1$parser = (0, import_lib2.$S)(AccessStart, (0, import_lib2.$EXPECT)($L22, 'PropertyAccess "-"'), IntegerLiteral);
 var PropertyAccess$2$parser = (0, import_lib2.$S)(AccessStart, (0, import_lib2.$Q)(InlineComment), (0, import_lib2.$C)(IdentifierName, PrivateIdentifier, LengthShorthand));
 var PropertyAccess$3$parser = (0, import_lib2.$S)(ExplicitAccessStart, (0, import_lib2.$Y)(EOS));
@@ -17379,12 +17405,14 @@ function PropertyAccess$0($$ctx, $$state) {
   const $$loc = $$r.loc, $$value = $$r.value;
   const $$m = (function($skip, $loc, $0, $1, $2) {
     var dot = $1;
-    var literal = $2;
+    var expression = $2;
     return {
       type: "Index",
+      expression,
       children: [
         adjustIndexAccess(dot),
-        literal,
+        expression,
+        "",
         "]"
       ]
     };
@@ -17442,12 +17470,21 @@ function PropertyAccess$2($$ctx, $$state) {
     var comments = $2;
     var id = $3;
     if (id.unicode) {
+      const key = propertyKey(id);
+      const expression = {
+        type: "Literal",
+        subtype: "StringLiteral",
+        children: [key],
+        raw: key.token
+      };
       return {
         type: "Index",
+        expression,
         children: [
           adjustIndexAccess(dot),
           ...comments,
-          propertyKey(id),
+          expression,
+          "",
           "]"
         ]
       };
@@ -17537,11 +17574,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 {
@@ -17580,6 +17618,40 @@ function PropertyAccess($$ctx, $$state) {
   if ($$ctx.exit) $$ctx.exit("PropertyAccess", $$state, $$final, $$eventData);
   return $$final;
 }
+var AccessLiteral$parser = (0, import_lib2.$C)(StringLiteral, IntegerLiteral);
+function AccessLiteral($$ctx, $$state) {
+  const $$entered = $$ctx.enter && $$ctx.enter("AccessLiteral", $$state);
+  if ($$entered && "cache" in $$entered) return $$entered.cache;
+  const $$eventData = $$entered && $$entered.data;
+  const $$r = AccessLiteral$parser($$ctx, $$state);
+  if (!$$r) {
+    if ($$ctx.exit) $$ctx.exit("AccessLiteral", $$state, void 0, $$eventData);
+    return void 0;
+  }
+  if ($$ctx.tokenize) {
+    const $$tok = $$r;
+    $$tok.value = { type: "AccessLiteral", children: [$$r.value].flat(), token: $$state.input.substring($$state.pos, $$r.pos), loc: $$r.loc };
+    if ($$ctx.exit) $$ctx.exit("AccessLiteral", $$state, $$tok, $$eventData);
+    return $$tok;
+  }
+  const $$loc = $$r.loc, $$value = $$r.value;
+  const $$m = (function($skip, $loc, $0, $1) {
+    var literal = $0;
+    return {
+      type: "Literal",
+      subtype: literal.type,
+      children: [literal],
+      raw: literal.token
+    };
+  })(import_lib2.SKIP, $$loc, $$value, $$value);
+  let $$final = void 0;
+  if ($$m !== import_lib2.SKIP) {
+    $$r.value = $$m;
+    $$final = $$r;
+  }
+  if ($$ctx.exit) $$ctx.exit("AccessLiteral", $$state, $$final, $$eventData);
+  return $$final;
+}
 var ExplicitPropertyGlob$parser = (0, import_lib2.$S)((0, import_lib2.$Y)(ExplicitAccessStart), PropertyGlob);
 function ExplicitPropertyGlob($$ctx, $$state) {
   const $$entered = $$ctx.enter && $$ctx.enter("ExplicitPropertyGlob", $$state);
@@ -17665,10 +17737,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 +17777,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 +21927,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 +21945,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 +21965,7 @@ function SymbolLiteral($$ctx, $$state) {
         type: "SymbolLiteral",
         children: [
           { ...colon, token: "Symbol.for(" },
-          id.type === "Identifier" ? ['"', token, '"'] : token,
+          quoted ? token : ['"', token, '"'],
           ")"
         ],
         name
@@ -34164,7 +34246,7 @@ function IntegerLiteral($$ctx, $$state) {
   const $$loc = $$r.loc, $$value = $$r.value;
   const $$m = /* @__PURE__ */ (function($skip, $loc, $0, $1, $2) {
     var token = $2;
-    return { $loc, token };
+    return { type: "NumericLiteral", $loc, token };
   })(import_lib2.SKIP, $$loc, $$value, $$value[0], $$value[1]);
   let $$final = void 0;
   if ($$m !== import_lib2.SKIP) {
@@ -35325,11 +35407,11 @@ function TemplateBlockCharacters($$ctx, $$state) {
   if ($$ctx.exit) $$ctx.exit("TemplateBlockCharacters", $$state, $$final, $$eventData);
   return $$final;
 }
-var ReservedWord$0$parser = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($R67, "ReservedWord /(?:off|yes|on|no)/"), NonIdContinue, CoffeeBooleansEnabled);
-var ReservedWord$1$parser = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($R68, "ReservedWord /isnt/"), NonIdContinue, CoffeeIsntEnabled);
-var ReservedWord$2$parser = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($R69, "ReservedWord /by/"), NonIdContinue, CoffeeForLoopsEnabled);
-var ReservedWord$3$parser = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($R70, "ReservedWord /of/"), NonIdContinue, CoffeeOfEnabled);
-var ReservedWord$4$parser = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($R71, "ReservedWord /(?:instanceof|interface|protected|continue|debugger|function|default|extends|finally|private|delete|export|import|public|return|static|switch|typeof|unless|await|break|catch|class|const|false|super|throw|until|while|yield|case|else|enum|loop|null|this|true|void|with|and|for|let|new|not|try|var|do|if|in|is|or)/"), NonIdContinue);
+var ReservedWord$0$parser = (0, import_lib2.$S)((0, import_lib2.$TEXT)((0, import_lib2.$EXPECT)($R67, "ReservedWord /(?:off|yes|on|no)/")), NonIdContinue, CoffeeBooleansEnabled);
+var ReservedWord$1$parser = (0, import_lib2.$S)((0, import_lib2.$TEXT)((0, import_lib2.$EXPECT)($R68, "ReservedWord /isnt/")), NonIdContinue, CoffeeIsntEnabled);
+var ReservedWord$2$parser = (0, import_lib2.$S)((0, import_lib2.$TEXT)((0, import_lib2.$EXPECT)($R69, "ReservedWord /by/")), NonIdContinue, CoffeeForLoopsEnabled);
+var ReservedWord$3$parser = (0, import_lib2.$S)((0, import_lib2.$TEXT)((0, import_lib2.$EXPECT)($R70, "ReservedWord /of/")), NonIdContinue, CoffeeOfEnabled);
+var ReservedWord$4$parser = (0, import_lib2.$S)((0, import_lib2.$TEXT)((0, import_lib2.$EXPECT)($R71, "ReservedWord /(?:instanceof|interface|protected|continue|debugger|function|default|extends|finally|private|delete|export|import|public|return|static|switch|typeof|unless|await|break|catch|class|const|false|super|throw|until|while|yield|case|else|enum|loop|null|this|true|void|with|and|for|let|new|not|try|var|do|if|in|is|or)/")), NonIdContinue);
 function ReservedWord$0($$ctx, $$state) {
   const $$r = ReservedWord$0$parser($$ctx, $$state);
   if (!$$r) {

package/dist/ts-diagnostic.js

@@ -21,14 +21,22 @@ __export(ts_diagnostic_exports, {
   flattenDiagnosticMessageText: () => flattenDiagnosticMessageText,
   forwardMap: () => forwardMap,
   remapPosition: () => remapPosition,
+  remapPositionStrict: () => remapPositionStrict,
   remapRange: () => remapRange
 });
 module.exports = __toCommonJS(ts_diagnostic_exports);
 function remapPosition(position, sourcemapLines) {
-  if (!sourcemapLines) return position;
+  if (!sourcemapLines) {
+    return position;
+  }
+  return remapPositionStrict(position, sourcemapLines) ?? walkBack(position, sourcemapLines) ?? position;
+}
+function remapPositionStrict(position, sourcemapLines) {
   const { line, character } = position;
   const textLine = sourcemapLines[line];
-  if (!textLine?.length) return position;
+  if (!textLine?.length) {
+    return void 0;
+  }
   let i = 0, p = 0, l = textLine.length, lastMapping, lastMappingPosition = 0;
   while (i < l) {
     const mapping = textLine[i];
@@ -42,18 +50,42 @@ function remapPosition(position, sourcemapLines) {
     }
     i++;
   }
-  if (lastMapping) {
-    const srcLine = lastMapping[2];
-    const srcChar = lastMapping[3];
-    const newChar = srcChar + character - lastMappingPosition;
-    return {
-      line: srcLine,
-      character: Math.max(0, newChar)
-    };
-  } else {
-    return position;
+  if (!lastMapping) {
+    return void 0;
   }
+  const srcLine = lastMapping[2];
+  const srcChar = lastMapping[3];
+  const newChar = srcChar + character - lastMappingPosition;
+  return {
+    line: srcLine,
+    character: Math.max(0, newChar)
+  };
 }
+const walkBack = function(position, sourcemapLines) {
+  for (let i1 = Math.min(position.line, sourcemapLines.length) + -1; i1 >= 0; --i1) {
+    const l = i1;
+    const prevLine = sourcemapLines[l];
+    if (!prevLine?.length) {
+      continue;
+    }
+    let results = void 0;
+    for (let i2 = prevLine.length + -1; i2 >= 0; --i2) {
+      const i = i2;
+      if (!(prevLine[i].length === 4)) continue;
+      results = prevLine[i];
+      break;
+    }
+    ;
+    const lastMapping = results;
+    if (lastMapping) {
+      return {
+        line: lastMapping[2],
+        character: Math.max(0, lastMapping[3])
+      };
+    }
+  }
+  return void 0;
+};
 function remapRange(range, sourcemapLines) {
   return {
     start: remapPosition(range.start, sourcemapLines),
@@ -126,5 +158,6 @@ function flattenDiagnosticMessageText(diag, indent = 0) {
   flattenDiagnosticMessageText,
   forwardMap,
   remapPosition,
+  remapPositionStrict,
   remapRange
 });

package/dist/ts-diagnostic.mjs

@@ -1,8 +1,15 @@
 function remapPosition(position, sourcemapLines) {
-  if (!sourcemapLines) return position;
+  if (!sourcemapLines) {
+    return position;
+  }
+  return remapPositionStrict(position, sourcemapLines) ?? walkBack(position, sourcemapLines) ?? position;
+}
+function remapPositionStrict(position, sourcemapLines) {
   const { line, character } = position;
   const textLine = sourcemapLines[line];
-  if (!textLine?.length) return position;
+  if (!textLine?.length) {
+    return void 0;
+  }
   let i = 0, p = 0, l = textLine.length, lastMapping, lastMappingPosition = 0;
   while (i < l) {
     const mapping = textLine[i];
@@ -16,18 +23,42 @@ function remapPosition(position, sourcemapLines) {
     }
     i++;
   }
-  if (lastMapping) {
-    const srcLine = lastMapping[2];
-    const srcChar = lastMapping[3];
-    const newChar = srcChar + character - lastMappingPosition;
-    return {
-      line: srcLine,
-      character: Math.max(0, newChar)
-    };
-  } else {
-    return position;
+  if (!lastMapping) {
+    return void 0;
   }
+  const srcLine = lastMapping[2];
+  const srcChar = lastMapping[3];
+  const newChar = srcChar + character - lastMappingPosition;
+  return {
+    line: srcLine,
+    character: Math.max(0, newChar)
+  };
 }
+const walkBack = function(position, sourcemapLines) {
+  for (let i1 = Math.min(position.line, sourcemapLines.length) + -1; i1 >= 0; --i1) {
+    const l = i1;
+    const prevLine = sourcemapLines[l];
+    if (!prevLine?.length) {
+      continue;
+    }
+    let results = void 0;
+    for (let i2 = prevLine.length + -1; i2 >= 0; --i2) {
+      const i = i2;
+      if (!(prevLine[i].length === 4)) continue;
+      results = prevLine[i];
+      break;
+    }
+    ;
+    const lastMapping = results;
+    if (lastMapping) {
+      return {
+        line: lastMapping[2],
+        character: Math.max(0, lastMapping[3])
+      };
+    }
+  }
+  return void 0;
+};
 function remapRange(range, sourcemapLines) {
   return {
     start: remapPosition(range.start, sourcemapLines),
@@ -99,5 +130,6 @@ export {
   flattenDiagnosticMessageText,
   forwardMap,
   remapPosition,
+  remapPositionStrict,
   remapRange
 };

package/dist/ts-service/index.js

@@ -223,7 +223,26 @@ function parseTsConfigForCivet(projectPath, transpilers, options = {}) {
   } else ref2 = system;
   const configSys = ref2;
   const tsConfigPath = import_node_path2.default.join(projectPath, "tsconfig.json");
-  const config = options.tsConfig ?? import_typescript4.default.readConfigFile(tsConfigPath, system.readFile).config;
+  let config;
+  let configFound;
+  if (options.tsConfig != null) {
+    config = options.tsConfig;
+    configFound = true;
+  } else {
+    configFound = system.fileExists(tsConfigPath);
+    let ref3;
+    if (configFound) {
+      ref3 = import_typescript4.default.readConfigFile(tsConfigPath, system.readFile).config;
+    } else {
+      if (extraExtensions.length > 0) {
+        ref3 = { include: extraExtensions.map((ext) => `**/*${ext}`) };
+      } else {
+        ref3 = {};
+      }
+    }
+    ;
+    config = ref3;
+  }
   const parsed = import_typescript4.default.parseJsonConfigFileContent(
     config,
     configSys,
@@ -235,6 +254,7 @@ function parseTsConfigForCivet(projectPath, transpilers, options = {}) {
   parsed.options.allowNonTsExtensions ??= true;
   parsed.options.jsx ??= import_typescript4.default.JsxEmit.Preserve;
   parsed.options.rootDir ??= projectPath;
+  parsed.configFound = configFound;
   return parsed;
 }
 
@@ -695,6 +715,7 @@ function TSService(projectPath, options) {
   };
   return Object.assign({}, service, {
     host,
+    configFound: parsedConfig.configFound,
     /** `foo.civet.tsx` → `foo.civet`; passthrough for non-transpiled files. */
     getSourceFileName(fileName) {
       return getCanonicalFileName(remapFileName(fileName, transpilers));