@xylabs/ts-scripts-yarn3 6.1.5 → 6.1.7

package/dist/actions/index.mjs

@@ -1324,7 +1324,7 @@ var packageClean = /* @__PURE__ */ __name(async () => {
 }, "packageClean");
 
 // src/actions/package/compile/compile.ts
-import chalk23 from "chalk";
+import chalk24 from "chalk";
 
 // src/actions/package/publint.ts
 import { promises as fs2 } from "node:fs";
@@ -1375,19 +1375,19 @@ import { build as build2, defineConfig } from "tsup";
 
 // src/actions/package/compile/inputs.ts
 import { glob as glob2 } from "glob";
-var getAllInputs = /* @__PURE__ */ __name((folder) => {
+var getAllInputs = /* @__PURE__ */ __name((folder, ignore = [
+  "**/*.spec.*",
+  "**/*.stories.*",
+  "**/spec/**/*"
+]) => {
   return glob2.sync(`${folder}/**/*.*`, {
-    ignore: [
-      "**/*.spec.*",
-      "**/*.stories.*",
-      "**/spec/**/*"
-    ],
+    ignore,
     posix: true
   });
 }, "getAllInputs");
 
 // src/actions/package/compile/buildEntries.ts
-var buildEntries = /* @__PURE__ */ __name((folder, entryMode = "single", verbose = false) => {
+var buildEntries = /* @__PURE__ */ __name((folder, entryMode = "single", excludeSpecAndStory = true, verbose = false) => {
   let entries = [];
   switch (entryMode) {
     case "platform": {
@@ -1398,7 +1398,7 @@ var buildEntries = /* @__PURE__ */ __name((folder, entryMode = "single", verbose
       break;
     }
     case "all": {
-      entries = getAllInputs(folder).filter((entry) => !entry.includes(".spec.") && !entry.includes(".story."));
+      entries = excludeSpecAndStory ? getAllInputs(folder).filter((entry) => !entry.includes(".spec.") && !entry.includes(".stories.")) : getAllInputs(folder, []);
       break;
     }
     default: {
@@ -1412,11 +1412,9 @@ var buildEntries = /* @__PURE__ */ __name((folder, entryMode = "single", verbose
   return entries;
 }, "buildEntries");
 
-// src/actions/package/compile/compileTypes.ts
-import chalk22 from "chalk";
-
 // src/actions/package/compile/packageCompileTscTypes.ts
 import { cwd } from "node:process";
+import chalk22 from "chalk";
 import { createProgramFromConfig } from "tsc-prog";
 import { DiagnosticCategory, formatDiagnosticsWithColorAndContext, getPreEmitDiagnostics, sys as sys2 } from "typescript";
 
@@ -1446,9 +1444,6 @@ var getCompilerOptions = /* @__PURE__ */ __name((options = {}, tsconfig = "tscon
 var packageCompileTscTypes = /* @__PURE__ */ __name((folder = "src", config2 = {}, compilerOptionsParam) => {
   const pkg = process.env.INIT_CWD ?? cwd();
   const verbose = config2?.verbose ?? false;
-  if (verbose) {
-    console.log(`Compiling types [${pkg}]`);
-  }
   const compilerOptions = {
     ...getCompilerOptions({
       emitDeclarationOnly: true,
@@ -1472,6 +1467,7 @@ var packageCompileTscTypes = /* @__PURE__ */ __name((folder = "src", config2 = {
     ".d.mts"
   ];
   const files = buildEntries(folder, "all", verbose).filter((file) => validTsExt.find((ext) => file.endsWith(ext)));
+  console.log(chalk22.green(`Compiling Types ${pkg}: ${files.length}`));
   const program = createProgramFromConfig({
     basePath: pkg ?? cwd(),
     compilerOptions,
@@ -1500,7 +1496,6 @@ var packageCompileTscTypes = /* @__PURE__ */ __name((folder = "src", config2 = {
 // src/actions/package/compile/compileTypes.ts
 var packageCompileTypes = /* @__PURE__ */ __name(async (inConfig = {}) => {
   const pkg = process.env.INIT_CWD;
-  console.log(chalk22.green(`Compiling Types ${pkg}`));
   const config2 = await loadConfig(inConfig);
   return packageCompileTscTypes(void 0, config2);
 }, "packageCompileTypes");
@@ -1530,6 +1525,59 @@ function deepMergeObjects(objects) {
 }
 __name(deepMergeObjects, "deepMergeObjects");
 
+// src/actions/package/compile/packageCompileTsc.ts
+import { cwd as cwd2 } from "node:process";
+import chalk23 from "chalk";
+import { createProgramFromConfig as createProgramFromConfig2 } from "tsc-prog";
+import { DiagnosticCategory as DiagnosticCategory2, formatDiagnosticsWithColorAndContext as formatDiagnosticsWithColorAndContext2, getPreEmitDiagnostics as getPreEmitDiagnostics2, sys as sys3 } from "typescript";
+var packageCompileTsc = /* @__PURE__ */ __name((folder = "src", config2 = {}, compilerOptionsParam) => {
+  const pkg = process.env.INIT_CWD ?? cwd2();
+  const verbose = config2?.verbose ?? false;
+  const compilerOptions = {
+    ...getCompilerOptions({
+      outDir: "dist/types",
+      removeComments: false,
+      skipDefaultLibCheck: true,
+      skipLibCheck: true,
+      sourceMap: false
+    }),
+    ...compilerOptionsParam,
+    emitDeclarationOnly: false,
+    noEmit: true
+  };
+  const validTsExt = [
+    ".ts",
+    ".tsx",
+    ".d.ts",
+    ".cts",
+    ".d.cts",
+    ".mts",
+    ".d.mts"
+  ];
+  const files = buildEntries(folder, "all", verbose).filter((file) => validTsExt.find((ext) => file.endsWith(ext)));
+  console.log(chalk23.green(`Compiling Files ${pkg}: ${files.length}`));
+  const program = createProgramFromConfig2({
+    basePath: pkg ?? cwd2(),
+    compilerOptions,
+    exclude: [
+      "dist",
+      "docs"
+    ],
+    files
+  });
+  const diagnostics = getPreEmitDiagnostics2(program);
+  if (diagnostics.length > 0) {
+    const formattedDiagnostics = formatDiagnosticsWithColorAndContext2(diagnostics, {
+      getCanonicalFileName: /* @__PURE__ */ __name((fileName) => fileName, "getCanonicalFileName"),
+      getCurrentDirectory: /* @__PURE__ */ __name(() => folder, "getCurrentDirectory"),
+      getNewLine: /* @__PURE__ */ __name(() => sys3.newLine, "getNewLine")
+    });
+    console.error(formattedDiagnostics);
+  }
+  program.emit();
+  return diagnostics.reduce((acc, diag) => acc + (diag.category === DiagnosticCategory2.Error ? 1 : 0), 0);
+}, "packageCompileTsc");
+
 // src/actions/package/compile/packageCompileTsup.ts
 var compileFolder = /* @__PURE__ */ __name(async (folder, entryMode = "single", options, verbose) => {
   const outDir = options?.outDir ?? "dist";
@@ -1603,7 +1651,6 @@ var tsupOptions = /* @__PURE__ */ __name((options = []) => {
   ]);
 }, "tsupOptions");
 var packageCompileTsup = /* @__PURE__ */ __name(async (config2) => {
-  console.log("packageCompileTsup-types");
   const compile2 = config2?.compile;
   const verbose = config2?.verbose ?? false;
   if (verbose) {
@@ -1621,7 +1668,8 @@ var packageCompileTsup = /* @__PURE__ */ __name(async (config2) => {
   if (verbose) {
     console.log("Calling packageCompileTscTypes");
   }
-  const errors = await packageCompileTypes(config2);
+  let errors = await packageCompileTypes(config2);
+  errors = errors + packageCompileTsc(void 0, config2);
   if (errors > 0) {
     return errors;
   }
@@ -1664,7 +1712,7 @@ var packageCompileTsup = /* @__PURE__ */ __name(async (config2) => {
 // src/actions/package/compile/compile.ts
 var packageCompile = /* @__PURE__ */ __name(async (inConfig = {}) => {
   const pkg = process.env.INIT_CWD;
-  console.log(chalk23.green(`Compiling ${pkg}`));
+  console.log(chalk24.green(`Compiling ${pkg}`));
   const config2 = await loadConfig(inConfig);
   const publint2 = config2.publint;
   const tsupResults = await packageCompileTsup(config2);
@@ -1674,62 +1722,6 @@ var packageCompile = /* @__PURE__ */ __name(async (inConfig = {}) => {
   return publint2 ? await packagePublint(config2) : 0;
 }, "packageCompile");
 
-// src/actions/package/compile/packageCompileTsc.ts
-import { cwd as cwd2 } from "node:process";
-import chalk24 from "chalk";
-import { createProgramFromConfig as createProgramFromConfig2 } from "tsc-prog";
-import { DiagnosticCategory as DiagnosticCategory2, formatDiagnosticsWithColorAndContext as formatDiagnosticsWithColorAndContext2, getLineAndCharacterOfPosition, getPreEmitDiagnostics as getPreEmitDiagnostics2 } from "typescript";
-var packageCompileTsc = /* @__PURE__ */ __name(async (noEmit, config2, compilerOptionsParam) => {
-  const pkg = process.env.INIT_CWD ?? cwd2();
-  const publint2 = config2?.publint ?? true;
-  const verbose = config2?.verbose ?? false;
-  const formatHost = {
-    getCanonicalFileName: /* @__PURE__ */ __name((fileName) => fileName, "getCanonicalFileName"),
-    getCurrentDirectory: /* @__PURE__ */ __name(() => pkg, "getCurrentDirectory"),
-    getNewLine: /* @__PURE__ */ __name(() => "\n", "getNewLine")
-  };
-  if (verbose) {
-    console.log(`Compiling with NoEmit TSC [${pkg}]`);
-  }
-  const compilerOptions = {
-    ...getCompilerOptions({
-      outDir: "dist",
-      removeComments: true,
-      rootDir: "src"
-    }),
-    ...compilerOptionsParam,
-    ...noEmit === void 0 ? {} : {
-      noEmit
-    }
-  };
-  const program = createProgramFromConfig2({
-    basePath: pkg ?? cwd2(),
-    compilerOptions,
-    exclude: [
-      "dist",
-      "docs",
-      "**/*.spec.*",
-      "**/*.stories.*",
-      "src/**/spec/**/*"
-    ],
-    include: [
-      "src"
-    ]
-  });
-  const results = getPreEmitDiagnostics2(program);
-  for (const diag of results) {
-    const lineAndChar = diag.file ? getLineAndCharacterOfPosition(diag.file, diag.start ?? 0) : {
-      character: 0,
-      line: 0
-    };
-    console.log(chalk24.cyan(`${diag.file?.fileName}:${lineAndChar.line + 1}:${lineAndChar.character + 1}`));
-    console.log(formatDiagnosticsWithColorAndContext2([
-      diag
-    ], formatHost));
-  }
-  return results.reduce((prev, diag) => prev + diag.category === DiagnosticCategory2.Error ? 1 : 0, 0) || (publint2 ? await packagePublint() : 0);
-}, "packageCompileTsc");
-
 // src/actions/package/copy-assets.ts
 import path5 from "node:path/posix";
 import chalk25 from "chalk";