@stacksjs/buddy 0.70.71 → 0.70.73

package/dist/commands/lint.js

@@ -1,24 +1,9 @@
-import { existsSync } from "node:fs";
 import process from "node:process";
-import { intro, log, onUnknownSubcommand, outro, runCommand } from "@stacksjs/cli";
-import { path } from "@stacksjs/path";
+import { intro, log, onUnknownSubcommand, outro } from "@stacksjs/cli";
 import { ExitCode } from "@stacksjs/types";
-function lintActionCommand(entry) {
-  const vendored = path.projectPath(`storage/framework/core/actions/src/lint/${entry}.ts`);
-  if (existsSync(vendored))
-    return `bun storage/framework/core/actions/src/lint/${entry}.ts`;
-  try {
-    const pkgJson = Bun.resolveSync("@stacksjs/actions/package.json", path.projectPath()), dist = path.resolve(path.dirname(pkgJson), `dist/lint/${entry}.js`);
-    if (existsSync(dist))
-      return `bun ${dist}`;
-  } catch {}
-  return `bun storage/framework/core/actions/src/lint/${entry}.ts`;
-}
-function exitOnFailure(result, label) {
-  if (!result || typeof result !== "object" || !("isErr" in result))
-    return;
-  const marker = result.isErr;
-  if (typeof marker === "function" ? marker() : marker === !0) {
+async function runStyleAction(entry, label, options) {
+  const actions = await import("@stacksjs/actions"), { ok } = await actions[entry](options);
+  if (!ok) {
     log.error(`${label} reported failure`);
     process.exit(ExitCode.FatalError);
   }
@@ -34,28 +19,27 @@ export function lint(buddy) {
   };
   buddy.command("lint", descriptions.lint).option("-f, --fix", descriptions.lintFix, { default: !1 }).option("-p, --project [project]", descriptions.project, { default: !1 }).option("--verbose", descriptions.verbose, { default: !1 }).action(async (options) => {
     log.debug("Running `buddy lint` ...", options);
-    const startTime = await intro("buddy lint"), result = options.fix ? await runCommand(lintActionCommand("fix"), { cwd: path.projectPath() }) : await runCommand(lintActionCommand("index"), { cwd: path.projectPath() });
-    exitOnFailure(result, "lint");
+    const startTime = await intro("buddy lint");
+    await runStyleAction(options.fix ? "lintFix" : "lintProject", "lint");
     await outro("Linted your project", { startTime, useSeconds: !0 });
   });
   buddy.command("lint:fix", descriptions.lintFix).option("-p, --project [project]", descriptions.project, { default: !1 }).option("--verbose", descriptions.verbose, { default: !1 }).action(async (options) => {
     log.debug("Running `buddy lint:fix` ...", options);
     const startTime = await intro("buddy lint:fix");
     log.info("Fixing lint errors...");
-    const result = await runCommand(lintActionCommand("fix"), { cwd: path.projectPath() });
-    exitOnFailure(result, "lint:fix");
+    await runStyleAction("lintFix", "lint:fix");
     await outro("Fixed lint errors", { startTime, useSeconds: !0 });
   });
   buddy.command("format", descriptions.format).option("-w, --write", "Write changes to files", { default: !1 }).option("-c, --check", descriptions.formatCheck, { default: !1 }).option("--verbose", descriptions.verbose, { default: !1 }).action(async (options) => {
     log.debug("Running `buddy format` ...", options);
-    const startTime = await intro("buddy format"), result = options.check ? await runCommand("bunx --bun pickier run --mode format --config ./pickier.config.ts --check", { cwd: path.projectPath() }) : await runCommand("bunx --bun pickier run --mode format --config ./pickier.config.ts --write", { cwd: path.projectPath() });
-    exitOnFailure(result, "format");
+    const startTime = await intro("buddy format");
+    await runStyleAction("formatProject", "format", options.check ? { check: !0 } : { write: !0 });
     await outro("Formatted your project", { startTime, useSeconds: !0 });
   });
   buddy.command("format:check", descriptions.formatCheck).option("--verbose", descriptions.verbose, { default: !1 }).action(async (options) => {
     log.debug("Running `buddy format:check` ...", options);
-    const startTime = await intro("buddy format:check"), result = await runCommand("bunx --bun pickier run --mode format --config ./pickier.config.ts --check", { cwd: path.projectPath() });
-    exitOnFailure(result, "format:check");
+    const startTime = await intro("buddy format:check");
+    await runStyleAction("formatProject", "format:check", { check: !0 });
     await outro("Format check complete", { startTime, useSeconds: !0 });
   });
   onUnknownSubcommand(buddy, "lint");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/buddy",
   "type": "module",
-  "version": "0.70.71",
+  "version": "0.70.73",
   "description": "Meet Buddy. The Stacks runtime.",
   "author": "Chris Breuer",
   "contributors": [