@xylabs/ts-scripts-yarn3 7.1.7 → 7.2.2

package/dist/xy/xy.mjs

@@ -274,7 +274,7 @@ var INIT_CWD = () => {
 
 // src/lib/generateIgnoreFiles.ts
 var localeCompare = (a, b) => a.localeCompare(b);
-var mergeEntries = (a, b) => [...union(a, b)].sort(localeCompare);
+var mergeEntries = (a, b) => [...union(a, b)].toSorted(localeCompare);
 var generateIgnoreFiles = (filename3, pkg) => {
   console.log(chalk4.green(`Generate ${filename3} Files`));
   const cwd = INIT_CWD() ?? ".";
@@ -650,6 +650,17 @@ function getBasePackageName(importName) {
 }
 
 // src/actions/deplint/getImportsFromFile.ts
+function isTypeOnlyImportClause(clause) {
+  if (clause === void 0) {
+    return false;
+  }
+  if ("phaseModifier" in clause) {
+    const mod = clause.phaseModifier;
+    const kind = typeof mod === "number" ? mod : mod?.kind;
+    return kind === ts.SyntaxKind.TypeKeyword;
+  }
+  return clause.isTypeOnly;
+}
 function getImportsFromFile(filePath, importPaths, typeImportPaths) {
   const sourceCode = fs3.readFileSync(filePath, "utf8");
   const isMjsFile = filePath.endsWith(".mjs");
@@ -666,7 +677,7 @@ function getImportsFromFile(filePath, importPaths, typeImportPaths) {
   function visit(node) {
     if (ts.isImportDeclaration(node) || ts.isExportDeclaration(node)) {
       const moduleSpecifier = node.moduleSpecifier?.getFullText();
-      const isTypeImport = ts.isImportDeclaration(node) ? node.importClause?.isTypeOnly ?? false : false;
+      const isTypeImport = ts.isImportDeclaration(node) ? isTypeOnlyImportClause(node.importClause) : false;
       if (typeof moduleSpecifier === "string") {
         const trimmed = moduleSpecifier.replaceAll("'", "").replaceAll('"', "").trim();
         if (isTypeImport || isDeclarationFile) {
@@ -1355,43 +1366,48 @@ var reinstall = () => {
 
 // src/actions/relint.ts
 import chalk22 from "chalk";
-var relintPackage = ({ pkg }) => {
-  console.log(chalk22.gray(`${"Relint"} [All-Packages]`));
+var relintPackage = ({
+  pkg,
+  fix: fix2,
+  verbose
+}) => {
+  console.log(chalk22.gray(`${fix2 ? "Fix" : "Lint"} [${pkg}]`));
   const start = Date.now();
-  const result = runSteps("Relint [All-Packages]", [
+  const result = runSteps(`${fix2 ? "Fix" : "Lint"}  [${pkg}]`, [
     ["yarn", [
       "workspace",
       pkg,
       "run",
-      "package-relint"
+      fix2 ? "package-fix" : verbose ? "package-lint-verbose" : "package-lint"
     ]]
   ]);
-  console.log(chalk22.gray(`${"Relinted in"} [${chalk22.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk22.gray("seconds")}`));
+  console.log(chalk22.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk22.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk22.gray("seconds")}`));
   return result;
 };
 var relint = ({
   pkg,
   verbose,
-  incremental
+  incremental,
+  fix: fix2
 } = {}) => {
-  return pkg ? relintPackage({ pkg }) : relintAllPackages({ verbose, incremental });
+  return pkg === void 0 ? relintAllPackages({
+    verbose,
+    incremental,
+    fix: fix2
+  }) : relintPackage({
+    pkg,
+    fix: fix2,
+    verbose
+  });
 };
-var relintAllPackages = ({ verbose = false, incremental } = {}) => {
-  console.log(chalk22.gray(`${"Relint"} [All-Packages]`));
+var relintAllPackages = ({ fix: fix2 = false } = {}) => {
+  console.log(chalk22.gray(`${fix2 ? "Fix" : "Lint"} [All-Packages]`));
   const start = Date.now();
-  const verboseOptions = verbose ? ["--verbose"] : ["--no-verbose"];
-  const incrementalOptions = incremental ? ["--since", "-Ap"] : ["--parallel", "-Ap"];
-  const result = runSteps(`${"Relint"}  [All-Packages]`, [
-    ["yarn", [
-      "workspaces",
-      "foreach",
-      ...verboseOptions,
-      ...incrementalOptions,
-      "run",
-      "package-relint"
-    ]]
+  const fixOptions = fix2 ? ["--fix"] : [];
+  const result = runSteps(`${fix2 ? "Fix" : "Lint"}  [All-Packages]`, [
+    ["yarn", ["eslint", ...fixOptions]]
   ]);
-  console.log(chalk22.gray(`Relinted in [${chalk22.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk22.gray("seconds")}`));
+  console.log(chalk22.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk22.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk22.gray("seconds")}`));
   return result;
 };