thinkwell 0.5.4 → 0.5.6

package/dist-pkg/cli-dependency-check.cjs

@@ -41,33 +41,25 @@ var LOCKFILES = [
 function detectByLockfile(projectDir) {
   for (const { file, pm } of LOCKFILES) {
     const lockfilePath = (0, import_node_path.join)(projectDir, file);
-    if ((0, import_node_fs.existsSync)(lockfilePath)) {
+    if ((0, import_node_fs.existsSync)(lockfilePath))
       return { pm, lockfile: file };
-    }
   }
   return null;
 }
 __name(detectByLockfile, "detectByLockfile");
 function parsePackageManagerField(value) {
-  if (typeof value !== "string") {
+  if (typeof value != "string")
     return null;
-  }
-  const atIndex = value.indexOf("@");
-  const name = atIndex > 0 ? value.slice(0, atIndex) : value;
-  if (name === "pnpm" || name === "npm" || name === "yarn") {
-    return name;
-  }
-  return null;
+  const atIndex = value.indexOf("@"), name = atIndex > 0 ? value.slice(0, atIndex) : value;
+  return name === "pnpm" || name === "npm" || name === "yarn" ? name : null;
 }
 __name(parsePackageManagerField, "parsePackageManagerField");
 function detectByPackageJson(projectDir) {
   const pkgPath = (0, import_node_path.join)(projectDir, "package.json");
-  if (!(0, import_node_fs.existsSync)(pkgPath)) {
+  if (!(0, import_node_fs.existsSync)(pkgPath))
     return null;
-  }
   try {
-    const content = (0, import_node_fs.readFileSync)(pkgPath, "utf-8");
-    const pkg = JSON.parse(content);
+    const content = (0, import_node_fs.readFileSync)(pkgPath, "utf-8"), pkg = JSON.parse(content);
     return parsePackageManagerField(pkg.packageManager);
   } catch {
     return null;
@@ -103,23 +95,18 @@ function createPackageManagerInfo(name, lockfile) {
 __name(createPackageManagerInfo, "createPackageManagerInfo");
 function detectPackageManager(projectDir) {
   const lockfileResult = detectByLockfile(projectDir);
-  if (lockfileResult) {
+  if (lockfileResult)
     return createPackageManagerInfo(lockfileResult.pm, lockfileResult.lockfile);
-  }
   const fromField = detectByPackageJson(projectDir);
-  if (fromField) {
-    return createPackageManagerInfo(fromField, null);
-  }
-  return createPackageManagerInfo("npm", null);
+  return createPackageManagerInfo(fromField || "npm", null);
 }
 __name(detectPackageManager, "detectPackageManager");
 
 // dist/cli/dependency-check.js
 function readPackageJson(dir) {
   const pkgPath = (0, import_node_path2.join)(dir, "package.json");
-  if (!(0, import_node_fs2.existsSync)(pkgPath)) {
+  if (!(0, import_node_fs2.existsSync)(pkgPath))
     return null;
-  }
   try {
     const content = (0, import_node_fs2.readFileSync)(pkgPath, "utf-8");
     return JSON.parse(content);
@@ -135,42 +122,31 @@ function checkPackageJsonDirect(pkg, packageName) {
     pkg.peerDependencies,
     pkg.optionalDependencies
   ];
-  for (const deps of depTypes) {
-    if (deps && packageName in deps) {
+  for (const deps of depTypes)
+    if (deps && packageName in deps)
       return {
         found: true,
         version: deps[packageName],
         source: "package.json"
       };
-    }
-  }
   return null;
 }
 __name(checkPackageJsonDirect, "checkPackageJsonDirect");
 function execCommand(cmd, cwd) {
   return new Promise((resolve, reject) => {
-    const [command, ...args] = cmd;
-    const proc = (0, import_node_child_process.spawn)(command, args, {
+    const [command, ...args] = cmd, proc = (0, import_node_child_process.spawn)(command, args, {
       cwd,
       stdio: ["ignore", "pipe", "pipe"]
     });
-    let stdout = "";
-    let stderr = "";
+    let stdout = "", stderr = "";
     proc.stdout.on("data", (data) => {
       stdout += data.toString();
-    });
-    proc.stderr.on("data", (data) => {
+    }), proc.stderr.on("data", (data) => {
       stderr += data.toString();
-    });
-    proc.on("error", (err) => {
+    }), proc.on("error", (err) => {
       reject(err);
-    });
-    proc.on("close", (code) => {
-      if (code === 0) {
-        resolve({ stdout, stderr });
-      } else {
-        reject(new Error(`Command failed with exit code ${code}: ${stderr}`));
-      }
+    }), proc.on("close", (code) => {
+      code === 0 ? resolve({ stdout, stderr }) : reject(new Error(`Command failed with exit code ${code}: ${stderr}`));
     });
   });
 }
@@ -178,15 +154,11 @@ __name(execCommand, "execCommand");
 function parsePnpmWhyOutput(stdout, packageName) {
   try {
     const result = JSON.parse(stdout);
-    if (result && typeof result === "object" && packageName in result) {
-      const info = result[packageName];
-      return {
-        found: true,
-        version: info?.version,
-        source: "workspace"
-      };
-    }
-    return null;
+    return result && typeof result == "object" && packageName in result ? {
+      found: true,
+      version: result[packageName]?.version,
+      source: "workspace"
+    } : null;
   } catch {
     return null;
   }
@@ -195,15 +167,11 @@ __name(parsePnpmWhyOutput, "parsePnpmWhyOutput");
 function parseNpmWhyOutput(stdout, _packageName) {
   try {
     const result = JSON.parse(stdout);
-    if (Array.isArray(result) && result.length > 0) {
-      const first = result[0];
-      return {
-        found: true,
-        version: first?.version,
-        source: "workspace"
-      };
-    }
-    return null;
+    return Array.isArray(result) && result.length > 0 ? {
+      found: true,
+      version: result[0]?.version,
+      source: "workspace"
+    } : null;
   } catch {
     return null;
   }
@@ -213,7 +181,8 @@ function parseYarnWhyOutput(stdout, _packageName) {
   if (stdout.trim().length > 0) {
     let version;
     try {
-      const lines = stdout.trim().split("\n");
+      const lines = stdout.trim().split(`
+`);
       for (const line of lines) {
         const obj = JSON.parse(line);
         if (obj.type === "info" && obj.data) {
@@ -253,31 +222,21 @@ async function checkViaPackageManager(pm, packageName, cwd) {
 }
 __name(checkViaPackageManager, "checkViaPackageManager");
 async function checkDependencies(projectDir) {
-  const pm = detectPackageManager(projectDir);
-  const pkg = readPackageJson(projectDir);
-  let thinkwellStatus = { found: false };
-  let typescriptStatus = { found: false };
+  const pm = detectPackageManager(projectDir), pkg = readPackageJson(projectDir);
+  let thinkwellStatus = { found: false }, typescriptStatus = { found: false };
   if (pkg) {
     const thinkwellDirect = checkPackageJsonDirect(pkg, "thinkwell");
-    if (thinkwellDirect) {
-      thinkwellStatus = thinkwellDirect;
-    }
+    thinkwellDirect && (thinkwellStatus = thinkwellDirect);
     const typescriptDirect = checkPackageJsonDirect(pkg, "typescript");
-    if (typescriptDirect) {
-      typescriptStatus = typescriptDirect;
-    }
+    typescriptDirect && (typescriptStatus = typescriptDirect);
   }
   if (!thinkwellStatus.found) {
     const result = await checkViaPackageManager(pm, "thinkwell", projectDir);
-    if (result) {
-      thinkwellStatus = result;
-    }
+    result && (thinkwellStatus = result);
   }
   if (!typescriptStatus.found) {
     const result = await checkViaPackageManager(pm, "typescript", projectDir);
-    if (result) {
-      typescriptStatus = result;
-    }
+    result && (typescriptStatus = result);
   }
   return {
     thinkwell: thinkwellStatus,
@@ -292,14 +251,12 @@ function hasPackageJson(projectDir) {
 __name(hasPackageJson, "hasPackageJson");
 function findProjectRoot(startDir) {
   let dir = startDir;
-  while (true) {
-    if ((0, import_node_fs2.existsSync)((0, import_node_path2.join)(dir, "package.json"))) {
+  for (; ; ) {
+    if ((0, import_node_fs2.existsSync)((0, import_node_path2.join)(dir, "package.json")))
       return dir;
-    }
     const parent = (0, import_node_path2.dirname)(dir);
-    if (parent === dir) {
-      return void 0;
-    }
+    if (parent === dir)
+      return;
     dir = parent;
   }
 }

package/dist-pkg/cli-dependency-errors.cjs

@@ -28,34 +28,12 @@ __export(dependency_errors_exports, {
 });
 module.exports = __toCommonJS(dependency_errors_exports);
 function formatMissingDependencyError(result) {
-  const { thinkwell, typescript, packageManager } = result;
-  const pm = packageManager;
-  const missing = [];
-  if (!thinkwell.found)
-    missing.push("thinkwell");
-  if (!typescript.found)
-    missing.push("typescript");
-  if (missing.length === 0) {
+  const { thinkwell, typescript, packageManager } = result, pm = packageManager, missing = [];
+  if (thinkwell.found || missing.push("thinkwell"), typescript.found || missing.push("typescript"), missing.length === 0)
     return "";
-  }
   const lines = [];
-  if (missing.length === 1) {
-    lines.push(`Error: This project has a package.json but no dependency on '${missing[0]}'.`);
-  } else {
-    lines.push(`Error: This project has a package.json but is missing required dependencies.`);
-  }
-  lines.push("");
-  lines.push("When a project has explicit configuration, thinkwell expects explicit dependencies.");
-  lines.push("This ensures you get the versions you expect, not versions bundled with the CLI.");
-  lines.push("");
-  lines.push("Run 'thinkwell init' to add the required dependencies, or add them manually:");
-  if (!thinkwell.found) {
-    lines.push(`  ${pm.addCommand("thinkwell")}`);
-  }
-  if (!typescript.found) {
-    lines.push(`  ${pm.addCommand("typescript", true)}`);
-  }
-  return lines.join("\n");
+  return missing.length === 1 ? lines.push(`Error: This project has a package.json but no dependency on '${missing[0]}'.`) : lines.push("Error: This project has a package.json but is missing required dependencies."), lines.push(""), lines.push("When a project has explicit configuration, thinkwell expects explicit dependencies."), lines.push("This ensures you get the versions you expect, not versions bundled with the CLI."), lines.push(""), lines.push("Run 'thinkwell init' to add the required dependencies, or add them manually:"), thinkwell.found || lines.push(`  ${pm.addCommand("thinkwell")}`), typescript.found || lines.push(`  ${pm.addCommand("typescript", true)}`), lines.join(`
+`);
 }
 __name(formatMissingDependencyError, "formatMissingDependencyError");
 function hasMissingDependencies(result) {
@@ -63,24 +41,14 @@ function hasMissingDependencies(result) {
 }
 __name(hasMissingDependencies, "hasMissingDependencies");
 function hasMissingDeps(result, options) {
-  if (!result.thinkwell.found)
-    return true;
-  if (options.requireTypescript && !result.typescript.found)
-    return true;
-  return false;
+  return !!(!result.thinkwell.found || options.requireTypescript && !result.typescript.found);
 }
 __name(hasMissingDeps, "hasMissingDeps");
 function formatMissingDepsError(result, options) {
-  if (!options.requireTypescript && result.thinkwell.found) {
-    return "";
-  }
-  if (!options.requireTypescript) {
-    return formatMissingDependencyError({
-      ...result,
-      typescript: { found: true }
-    });
-  }
-  return formatMissingDependencyError(result);
+  return !options.requireTypescript && result.thinkwell.found ? "" : options.requireTypescript ? formatMissingDependencyError(result) : formatMissingDependencyError({
+    ...result,
+    typescript: { found: true }
+  });
 }
 __name(formatMissingDepsError, "formatMissingDepsError");
 // Annotate the CommonJS export names for ESM import in node: