@xylabs/ts-scripts-yarn3 7.4.22 → 7.4.24

package/dist/xy/index.mjs

@@ -988,8 +988,8 @@ var DEFAULT_SETTINGS = {
       "Skill"
     ],
     deny: [
-      "Bash(git push --force*)",
-      "Bash(git reset --hard*)",
+      "Bash(git push --force *)",
+      "Bash(git reset --hard *)",
       "Bash(rm -rf /*)"
     ]
   }
@@ -2417,6 +2417,161 @@ var license = async (pkg) => {
 var filename = ".npmignore";
 var npmignoreGen = (pkg) => generateIgnoreFiles(filename, pkg);
 
+// src/actions/package-lint.ts
+import { readFileSync as readFileSync13, writeFileSync as writeFileSync6 } from "fs";
+import PATH9 from "path";
+import chalk30 from "chalk";
+import picomatch from "picomatch";
+function emptyResult() {
+  return {
+    errors: [],
+    fixable: [],
+    warnings: []
+  };
+}
+function readRootPackageJson(cwd) {
+  const raw = readFileSync13(PATH9.resolve(cwd, "package.json"), "utf8");
+  return JSON.parse(raw);
+}
+function writeRootPackageJson(cwd, pkg) {
+  const path8 = PATH9.resolve(cwd, "package.json");
+  writeFileSync6(path8, `${JSON.stringify(pkg, null, 2)}
+`, "utf8");
+}
+function isMonorepo(pkg) {
+  const workspaces = pkg.workspaces;
+  return Array.isArray(workspaces) && workspaces.length > 0;
+}
+function checkPackagesFolder(workspaces) {
+  const result = emptyResult();
+  for (const { location, name } of workspaces) {
+    if (location === ".") continue;
+    if (!location.startsWith("packages/") && !location.startsWith("packages\\")) {
+      result.errors.push(`${name} (${location}) is not inside a packages/ folder`);
+    }
+  }
+  return result;
+}
+function checkRootPrivate(pkg) {
+  const result = emptyResult();
+  if (!pkg.private) {
+    result.fixable.push("Root package.json must be private to prevent accidental publishing");
+  }
+  return result;
+}
+function fixRootPrivate(cwd, pkg) {
+  pkg.private = true;
+  writeRootPackageJson(cwd, pkg);
+  console.log(chalk30.green('  \u2714 Fixed: set "private": true in root package.json'));
+}
+function checkNoPublishConfigOnPrivate(pkg) {
+  const result = emptyResult();
+  if (pkg.private && pkg.publishConfig) {
+    result.fixable.push("Root package.json has publishConfig but is private \u2014 publishConfig is unnecessary");
+  }
+  return result;
+}
+function fixNoPublishConfigOnPrivate(cwd, pkg) {
+  delete pkg.publishConfig;
+  writeRootPackageJson(cwd, pkg);
+  console.log(chalk30.green("  \u2714 Fixed: removed publishConfig from private root package.json"));
+}
+function checkDiscoverable(pkg, workspaces) {
+  const result = emptyResult();
+  const globs = pkg.workspaces;
+  const matchers = globs.map((glob2) => picomatch(glob2));
+  const isMatch = (location) => matchers.some((m) => m(location));
+  for (const { location, name } of workspaces) {
+    if (location === ".") continue;
+    if (!isMatch(location)) {
+      result.errors.push(`${name} (${location}) is not matched by any workspace glob in package.json`);
+    }
+  }
+  return result;
+}
+function logResults(label, result, fix2) {
+  let errors = 0;
+  let fixed = 0;
+  for (const error of result.errors) {
+    console.log(chalk30.red(`  \u2717 ${error}`));
+    errors++;
+  }
+  for (const fixable of result.fixable) {
+    if (fix2) {
+      fixed++;
+    } else {
+      console.log(chalk30.red(`  \u2717 ${fixable} (fixable)`));
+      errors++;
+    }
+  }
+  for (const warning of result.warnings) {
+    console.log(chalk30.yellow(`  \u26A0 ${warning}`));
+  }
+  if (errors === 0 && fixed === 0 && result.warnings.length === 0) {
+    console.log(chalk30.green(`  \u2713 ${label}`));
+  }
+  return { errors, fixed };
+}
+function runChecks(entries, cwd, pkg, fix2) {
+  let totalErrors = 0;
+  let totalFixed = 0;
+  for (const entry of entries) {
+    const result = entry.check();
+    const log = logResults(entry.label, result, fix2);
+    if (fix2 && entry.fix && result.fixable.length > 0) {
+      entry.fix(cwd, pkg);
+    }
+    totalErrors += log.errors;
+    totalFixed += log.fixed;
+  }
+  return { errors: totalErrors, fixed: totalFixed };
+}
+function logSummary(errors, fixed) {
+  if (fixed > 0) {
+    console.log(chalk30.green(`
+  Fixed ${fixed} issue(s)`));
+  }
+  if (errors > 0) {
+    console.log(chalk30.red(`
+  ${errors} error(s) found`));
+  } else if (fixed === 0) {
+    console.log(chalk30.green("\n  All checks passed"));
+  }
+}
+function packageLintMonorepo(fix2 = false) {
+  const cwd = INIT_CWD() ?? process.cwd();
+  let pkg;
+  try {
+    pkg = readRootPackageJson(cwd);
+  } catch {
+    console.error(chalk30.red("Could not read package.json"));
+    return 1;
+  }
+  if (!isMonorepo(pkg)) {
+    console.log(chalk30.gray("Not a monorepo \u2014 skipping package-lint checks"));
+    return 0;
+  }
+  console.log(chalk30.green("Package Lint"));
+  const workspaces = yarnWorkspaces();
+  const checks = [
+    {
+      check: () => checkRootPrivate(pkg),
+      fix: fixRootPrivate,
+      label: "Root package is private"
+    },
+    {
+      check: () => checkNoPublishConfigOnPrivate(pkg),
+      fix: fixNoPublishConfigOnPrivate,
+      label: "No publishConfig on private root"
+    },
+    { check: () => checkPackagesFolder(workspaces), label: "All packages are in packages/ folder" },
+    { check: () => checkDiscoverable(pkg, workspaces), label: "All packages are discoverable from workspace globs" }
+  ];
+  const { errors, fixed } = runChecks(checks, cwd, pkg, fix2);
+  logSummary(errors, fixed);
+  return errors > 0 ? 1 : 0;
+}
+
 // src/actions/publint.ts
 var publint = async ({ verbose, pkg }) => {
   return pkg === void 0 ? publintAll({ verbose }) : await publintPackage({ pkg, verbose });
@@ -2470,7 +2625,7 @@ var rebuild = ({ target }) => {
 };
 
 // src/actions/recompile.ts
-import chalk30 from "chalk";
+import chalk31 from "chalk";
 var recompile = async ({
   verbose,
   target,
@@ -2506,7 +2661,7 @@ var recompileAll = async ({
   const incrementalOptions = incremental ? ["--since", "-Apt", "--topological-dev"] : ["--parallel", "-Apt", "--topological-dev"];
   const jobsOptions = jobs ? ["-j", `${jobs}`] : [];
   if (jobs) {
-    console.log(chalk30.blue(`Jobs set to [${jobs}]`));
+    console.log(chalk31.blue(`Jobs set to [${jobs}]`));
   }
   const result = await runStepsAsync(`Recompile${incremental ? "-Incremental" : ""} [All]`, [
     [
@@ -2537,7 +2692,7 @@ var recompileAll = async ({
     ]
   ]);
   console.log(
-    `${chalk30.gray("Recompiled in")} [${chalk30.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk30.gray("seconds")}`
+    `${chalk31.gray("Recompiled in")} [${chalk31.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk31.gray("seconds")}`
   );
   return result;
 };
@@ -2568,13 +2723,13 @@ var reinstall = () => {
 };
 
 // src/actions/relint.ts
-import chalk31 from "chalk";
+import chalk32 from "chalk";
 var relintPackage = ({
   pkg,
   fix: fix2,
   verbose
 }) => {
-  console.log(chalk31.gray(`${fix2 ? "Fix" : "Lint"} [${pkg}]`));
+  console.log(chalk32.gray(`${fix2 ? "Fix" : "Lint"} [${pkg}]`));
   const start = Date.now();
   const result = runSteps(`${fix2 ? "Fix" : "Lint"}  [${pkg}]`, [
     ["yarn", [
@@ -2584,7 +2739,7 @@ var relintPackage = ({
       fix2 ? "package-fix" : verbose ? "package-lint-verbose" : "package-lint"
     ]]
   ]);
-  console.log(chalk31.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk31.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk31.gray("seconds")}`));
+  console.log(chalk32.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk32.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk32.gray("seconds")}`));
   return result;
 };
 var relint = ({
@@ -2604,13 +2759,13 @@ var relint = ({
   });
 };
 var relintAllPackages = ({ fix: fix2 = false } = {}) => {
-  console.log(chalk31.gray(`${fix2 ? "Fix" : "Lint"} [All-Packages]`));
+  console.log(chalk32.gray(`${fix2 ? "Fix" : "Lint"} [All-Packages]`));
   const start = Date.now();
   const fixOptions = fix2 ? ["--fix"] : [];
   const result = runSteps(`${fix2 ? "Fix" : "Lint"}  [All-Packages]`, [
     ["yarn", ["eslint", ...fixOptions]]
   ]);
-  console.log(chalk31.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk31.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk31.gray("seconds")}`));
+  console.log(chalk32.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk32.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk32.gray("seconds")}`));
   return result;
 };
 
@@ -2628,10 +2783,10 @@ var sonar = () => {
 };
 
 // src/actions/statics.ts
-import chalk32 from "chalk";
+import chalk33 from "chalk";
 var DefaultDependencies = ["axios", "@xylabs/pixel", "react", "graphql", "react-router", "@mui/material", "@mui/system"];
 var statics = () => {
-  console.log(chalk32.green("Check Required Static Dependencies"));
+  console.log(chalk33.green("Check Required Static Dependencies"));
   const statics2 = parsedPackageJSON()?.xy?.deps?.statics;
   return detectDuplicateDependencies(statics2, DefaultDependencies);
 };
@@ -3212,7 +3367,7 @@ var xyInstallCommands = (args) => {
 };
 
 // src/xy/lint/cycleCommand.ts
-import chalk33 from "chalk";
+import chalk34 from "chalk";
 var cycleCommand = {
   command: "cycle [package]",
   describe: "Cycle - Check for dependency cycles",
@@ -3223,12 +3378,12 @@ var cycleCommand = {
     const start = Date.now();
     if (argv.verbose) console.log("Cycle");
     process.exitCode = await cycle({ pkg: argv.package });
-    console.log(chalk33.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk34.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/deplintCommand.ts
-import chalk34 from "chalk";
+import chalk35 from "chalk";
 var deplintCommand = {
   command: "deplint [package]",
   describe: "Deplint - Run Deplint",
@@ -3266,12 +3421,12 @@ var deplintCommand = {
       peerDeps: !!argv.peerDeps,
       verbose: !!argv.verbose
     });
-    console.log(chalk34.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk35.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/fixCommand.ts
-import chalk35 from "chalk";
+import chalk36 from "chalk";
 var fixCommand = {
   command: "fix [package]",
   describe: "Fix - Run Eslint w/fix",
@@ -3282,12 +3437,12 @@ var fixCommand = {
     const start = Date.now();
     if (argv.verbose) console.log("Fix");
     process.exitCode = fix();
-    console.log(chalk35.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk36.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/knipCommand.ts
-import chalk36 from "chalk";
+import chalk37 from "chalk";
 var knipCommand = {
   command: "knip",
   describe: "Knip - Run Knip",
@@ -3298,12 +3453,12 @@ var knipCommand = {
     if (argv.verbose) console.log("Knip");
     const start = Date.now();
     process.exitCode = knip();
-    console.log(chalk36.blue(`Knip finished in ${Date.now() - start}ms`));
+    console.log(chalk37.blue(`Knip finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/lintCommand.ts
-import chalk37 from "chalk";
+import chalk38 from "chalk";
 var lintCommand = {
   command: "lint [package]",
   describe: "Lint - Run Eslint",
@@ -3332,12 +3487,29 @@ var lintCommand = {
       cache: argv.cache,
       verbose: !!argv.verbose
     });
-    console.log(chalk37.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk38.blue(`Finished in ${Date.now() - start}ms`));
+  }
+};
+
+// src/xy/lint/packageLintCommand.ts
+var packageLintCommand = {
+  builder: (yargs2) => {
+    return yargs2.option("fix", {
+      default: false,
+      description: "Auto-fix fixable issues",
+      type: "boolean"
+    });
+  },
+  command: "package-lint",
+  describe: "Package Lint - Check monorepo package structure",
+  handler: (argv) => {
+    if (argv.verbose) console.log("Package Lint");
+    process.exitCode = packageLintMonorepo(!!argv.fix);
   }
 };
 
 // src/xy/lint/publintCommand.ts
-import chalk38 from "chalk";
+import chalk39 from "chalk";
 var publintCommand = {
   command: "publint [package]",
   describe: "Publint - Run Publint",
@@ -3348,12 +3520,12 @@ var publintCommand = {
     if (argv.verbose) console.log("Publint");
     const start = Date.now();
     process.exitCode = await publint({ pkg: argv.package, verbose: !!argv.verbose });
-    console.log(chalk38.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk39.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/relintCommand.ts
-import chalk39 from "chalk";
+import chalk40 from "chalk";
 var relintCommand = {
   command: "relint [package]",
   describe: "Relint - Clean & Lint",
@@ -3364,12 +3536,12 @@ var relintCommand = {
     if (argv.verbose) console.log("Relinting");
     const start = Date.now();
     process.exitCode = relint();
-    console.log(chalk39.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk40.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/sonarCommand.ts
-import chalk40 from "chalk";
+import chalk41 from "chalk";
 var sonarCommand = {
   command: "sonar",
   describe: "Sonar - Run Sonar Check",
@@ -3380,17 +3552,17 @@ var sonarCommand = {
     const start = Date.now();
     if (argv.verbose) console.log("Sonar Check");
     process.exitCode = sonar();
-    console.log(chalk40.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk41.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/index.ts
 var xyLintCommands = (args) => {
-  return args.command(cycleCommand).command(lintCommand).command(deplintCommand).command(fixCommand).command(relintCommand).command(publintCommand).command(knipCommand).command(sonarCommand);
+  return args.command(cycleCommand).command(lintCommand).command(deplintCommand).command(fixCommand).command(relintCommand).command(publintCommand).command(knipCommand).command(packageLintCommand).command(sonarCommand);
 };
 
 // src/xy/xy.ts
-import chalk41 from "chalk";
+import chalk42 from "chalk";
 
 // src/xy/xyParseOptions.ts
 import yargs from "yargs";
@@ -3423,8 +3595,8 @@ var xyParseOptions = () => {
 var xy = async () => {
   const options = xyParseOptions();
   return await xyBuildCommands(xyCommonCommands(xyInstallCommands(xyDeployCommands(xyLintCommands(options))))).demandCommand(1).command("*", "", () => {
-    console.error(chalk41.yellow(`Command not found [${chalk41.magenta(process.argv[2])}]`));
-    console.log(chalk41.gray("Try 'yarn xy --help' for list of commands"));
+    console.error(chalk42.yellow(`Command not found [${chalk42.magenta(process.argv[2])}]`));
+    console.log(chalk42.gray("Try 'yarn xy --help' for list of commands"));
   }).version().help().argv;
 };
 export {