@danielx/civet 0.11.9 → 0.11.11

package/dist/node-worker.mjs

@@ -22,11 +22,22 @@ try {
         }
         return parentPort.postMessage({ id, result, errors: args[1]?.errors });
       } catch (error) {
-        return parentPort.postMessage({ id, error: {
-          type: error.constructor.name,
-          name: error.name,
-          message: error.message
-        } });
+        if (error instanceof Error) {
+          return parentPort.postMessage({ id, error: {
+            type: error.constructor.name,
+            name: error.name,
+            message: error.message
+          } });
+        } else {
+          return parentPort.postMessage({
+            id,
+            error: {
+              type: typeof error,
+              name: "Error",
+              message: String(error)
+            }
+          });
+        }
       }
     });
   }

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));