@reliverse/dler 1.5.1 → 1.5.3

package/bin/app/agg/cmd.d.ts

@@ -65,5 +65,15 @@ declare const _default: import("@reliverse/rempts").Command<{
         type: "string";
         default: string;
     };
+    separateTypesFile: {
+        description: string;
+        type: "boolean";
+        default: false;
+    };
+    typesOut: {
+        description: string;
+        type: "string";
+        required: false;
+    };
 }>;
 export default _default;

package/bin/app/agg/cmd.js

@@ -68,6 +68,16 @@ export default defineCommand({
       description: "Comma-separated list of file extensions to process (default: .ts,.js,.mts,.cts,.mjs,.cjs)",
       type: "string",
       default: ".ts,.js,.mts,.cts,.mjs,.cjs"
+    },
+    separateTypesFile: {
+      description: "Create a separate file for type exports",
+      type: "boolean",
+      default: false
+    },
+    typesOut: {
+      description: "Output file path for types (used when separateTypesFile is true)",
+      type: "string",
+      required: false
     }
   }),
   async run({ args }) {
@@ -84,7 +94,9 @@ export default defineCommand({
       includeInternal: !!args.includeInternal,
       internalMarker: args.internalMarker,
       overrideFile: !!args.override,
-      fileExtensions: args.extensions.split(",").map((ext) => ext.trim())
+      fileExtensions: args.extensions.split(",").map((ext) => ext.trim()),
+      separateTypesFile: !!args.separateTypesFile,
+      typesOutFile: args.typesOut ? path.resolve(args.typesOut) : void 0
     });
   }
 });

package/bin/app/agg/impl.d.ts

@@ -15,7 +15,7 @@
  * - By default, updates only the auto-generated block in the aggregator file,
  *   leaving any other content intact. Pass `overrideFile: true` to rewrite the entire file.
  */
-export declare function useAggregator({ inputDir, isRecursive, outFile, stripPrefix, useImport, useNamed, ignoreDirs, sortLines, headerComment, verbose, includeInternal, internalMarker, overrideFile, fileExtensions, }: {
+export declare function useAggregator({ inputDir, isRecursive, outFile, stripPrefix, useImport, useNamed, ignoreDirs, sortLines, headerComment, verbose, includeInternal, internalMarker, overrideFile, fileExtensions, separateTypesFile, typesOutFile, }: {
     inputDir: string;
     isRecursive: boolean;
     outFile: string;
@@ -30,6 +30,8 @@ export declare function useAggregator({ inputDir, isRecursive, outFile, stripPre
     internalMarker?: string;
     overrideFile?: boolean;
     fileExtensions?: string[];
+    separateTypesFile?: boolean;
+    typesOutFile?: string;
 }): Promise<void>;
 /**
  * Prints usage examples based on whether dev mode or not.

package/bin/app/agg/impl.js

@@ -1,7 +1,6 @@
 import path from "@reliverse/pathkit";
 import fs from "@reliverse/relifso";
 import { relinka } from "@reliverse/relinka";
-import MagicString from "magic-string";
 const AGGREGATOR_START = "// AUTO-GENERATED AGGREGATOR START";
 const AGGREGATOR_END = "// AUTO-GENERATED AGGREGATOR END";
 export async function useAggregator({
@@ -18,7 +17,9 @@ export async function useAggregator({
   includeInternal = false,
   internalMarker = "#",
   overrideFile = false,
-  fileExtensions = [".ts", ".js", ".mts", ".cts", ".mjs", ".cjs"]
+  fileExtensions = [".ts", ".js", ".mts", ".cts", ".mjs", ".cjs"],
+  separateTypesFile = false,
+  typesOutFile
 }) {
   try {
     const st = await fs.stat(inputDir).catch(() => null);
@@ -37,6 +38,19 @@ ${error}`
       );
       process.exit(1);
     }
+    if (separateTypesFile && typesOutFile) {
+      const typesOutDir = path.dirname(typesOutFile);
+      try {
+        await fs.ensureDir(typesOutDir);
+      } catch (error) {
+        relinka(
+          "error",
+          `Error: Cannot create types output directory: ${typesOutDir}
+${error}`
+        );
+        process.exit(1);
+      }
+    }
     const outExt = path.extname(outFile).toLowerCase();
     if (!fileExtensions.includes(outExt)) {
       relinka(
@@ -98,62 +112,48 @@ ${error}`
       )
     );
     const allLines = aggregatorLinesArrays.flat();
+    const typeLines = [];
+    const valueLines = [];
+    for (const line of allLines) {
+      if (line.includes("type {")) {
+        typeLines.push(line);
+      } else {
+        valueLines.push(line);
+      }
+    }
     if (sortLines) {
-      allLines.sort();
+      typeLines.sort();
+      valueLines.sort();
       if (verbose) relinka("log", "Sorted aggregator lines alphabetically.");
     }
-    const aggregatorContent = allLines.join("\n");
-    const aggregatorBlock = `${headerComment ? `${headerComment}
+    const buildAggregatorBlock = (lines) => `${headerComment ? `${headerComment}
 ` : ""}${AGGREGATOR_START}
-${aggregatorContent}
+${lines.join("\n")}
 ${AGGREGATOR_END}
 `;
-    let finalText;
-    if (overrideFile) {
-      finalText = aggregatorBlock;
-      if (verbose) {
-        relinka("log", "Override mode: rewriting entire file.");
-      }
+    if (separateTypesFile && typesOutFile) {
+      const typeBlock = buildAggregatorBlock(typeLines);
+      await fs.ensureFile(typesOutFile);
+      await fs.writeFile(typesOutFile, typeBlock, "utf8");
+      const valueBlock = buildAggregatorBlock([
+        ...valueLines,
+        `export * from "${path.relative(path.dirname(outFile), typesOutFile).replace(/\\/g, "/")}";`
+      ]);
+      await fs.ensureFile(outFile);
+      await fs.writeFile(outFile, valueBlock, "utf8");
+      relinka(
+        "success",
+        `Aggregator done: processed ${typeLines.length} type lines in: ${typesOutFile} and ${valueLines.length} value lines in: ${outFile}`
+      );
     } else {
-      let existingContent = "";
-      try {
-        existingContent = await fs.readFile(outFile, "utf8");
-      } catch {
-        if (verbose)
-          relinka("log", "Aggregator file does not exist. Creating new one.");
-      }
-      if (existingContent?.includes(AGGREGATOR_START) && existingContent.includes(AGGREGATOR_END)) {
-        if (verbose) {
-          relinka(
-            "log",
-            "Existing aggregator block found. Updating auto-generated section."
-          );
-        }
-        const s = new MagicString(existingContent);
-        const startIdx = existingContent.indexOf(AGGREGATOR_START);
-        const endIdx = existingContent.indexOf(AGGREGATOR_END) + AGGREGATOR_END.length;
-        s.update(startIdx, endIdx, aggregatorBlock.trim());
-        finalText = s.toString();
-      } else {
-        if (existingContent) {
-          if (verbose)
-            relinka(
-              "log",
-              "No aggregator block found. Appending auto-generated section."
-            );
-          finalText = `${existingContent.trim()}
-${aggregatorBlock}`;
-        } else {
-          finalText = aggregatorBlock;
-        }
-      }
+      const aggregatorBlock = buildAggregatorBlock(allLines);
+      await fs.ensureFile(outFile);
+      await fs.writeFile(outFile, aggregatorBlock, "utf8");
+      relinka(
+        "success",
+        `Aggregator done: processed ${allLines.length} lines in: ${outFile}`
+      );
     }
-    await fs.ensureFile(outFile);
-    await fs.writeFile(outFile, finalText, "utf8");
-    relinka(
-      "success",
-      `Aggregator done: processed ${allLines.length} lines in: ${outFile}`
-    );
   } catch (error) {
     relinka("error", `Aggregator failed: ${error}`);
     process.exit(1);

package/bin/app/agg/run.js

@@ -33,6 +33,8 @@ export async function promptAggCommand() {
   let out = "";
   let recursive = true;
   let strip = "";
+  let separateTypesFile = false;
+  let typesOut = "";
   if (selectedLibName && selectedLibName !== "") {
     const libConfig = config?.libsList?.[selectedLibName];
     if (config && libConfig) {
@@ -72,12 +74,24 @@ export async function promptAggCommand() {
       defaultValue: strip
     });
   }
+  separateTypesFile = await confirmPrompt({
+    title: "Do you want to create a separate file for type exports?",
+    defaultValue: separateTypesFile
+  });
+  if (separateTypesFile) {
+    typesOut = await inputPrompt({
+      title: "Enter the output file for types",
+      defaultValue: out.replace(/\.(ts|js)$/, ".types.$1")
+    });
+  }
   await runCmd(await cmdAgg(), [
     `--imports=${imports}`,
     `--input=${input}`,
     `--named=${named}`,
     `--out=${out}`,
     `--recursive=${recursive}`,
-    `--strip=${strip}`
+    `--strip=${strip}`,
+    `--separateTypesFile=${separateTypesFile}`,
+    ...separateTypesFile ? [`--typesOut=${typesOut}`] : []
   ]);
 }

package/bin/app/cmds.d.ts

@@ -134,6 +134,16 @@ export declare function cmdAgg(): Promise<import("@reliverse/rempts").Command<{
         type: "string";
         default: string;
     };
+    separateTypesFile: {
+        description: string;
+        type: "boolean";
+        default: false;
+    };
+    typesOut: {
+        description: string;
+        type: "string";
+        required: false;
+    };
 }>>;
 export declare function cmdBuild(): Promise<import("@reliverse/rempts").Command<{
     dev: {
@@ -172,4 +182,16 @@ export declare function cmdRelifsoRename(): Promise<import("@reliverse/rempts").
         description: string;
         required: false;
     };
+    recursive: {
+        type: "boolean";
+        description: string;
+        required: false;
+        default: true;
+    };
+    useDtsTxtForPrepareMyCLI: {
+        type: "boolean";
+        description: string;
+        required: false;
+        default: false;
+    };
 }>>;

package/bin/app/relifso/cmd.js

@@ -29,11 +29,11 @@ export default defineCommand({
         },
         {
           value: "rename-prepare",
-          label: "Rename files (prepare CLI)"
+          label: "My project is a bootstrapper CLI (apply rename optimizations)"
         },
         {
           value: "rename-prepare-revert",
-          label: "Rename files (prepare CLI)"
+          label: "Revert rename CLI files optimizations"
         }
       ]
     });

package/bin/app/relifso/rename/cmd.d.ts

@@ -23,5 +23,17 @@ declare const _default: import("@reliverse/rempts").Command<{
         description: string;
         required: false;
     };
+    recursive: {
+        type: "boolean";
+        description: string;
+        required: false;
+        default: true;
+    };
+    useDtsTxtForPrepareMyCLI: {
+        type: "boolean";
+        description: string;
+        required: false;
+        default: false;
+    };
 }>;
 export default _default;

package/bin/app/relifso/rename/cmd.js

@@ -1,8 +1,8 @@
 import { relinka } from "@reliverse/relinka";
 import { defineCommand } from "@reliverse/rempts";
-import { existsSync, readdirSync } from "node:fs";
+import { existsSync } from "node:fs";
 import { readFileSync } from "node:fs";
-import { rename, access } from "node:fs/promises";
+import { rename, access, readdir } from "node:fs/promises";
 import { join, dirname, basename, extname } from "node:path";
 async function fileExists(path) {
   try {
@@ -21,7 +21,26 @@ async function safeRename(source, destination) {
 function isCommonJSFile(content) {
   return content.includes("module.exports") || content.includes("require(");
 }
-async function prepareCLIFiles(revert = false) {
+async function getAllFilesAsync(dir, baseDir = dir, recursive = true) {
+  let fileList = [];
+  const entries = await readdir(dir, {
+    encoding: "utf-8",
+    withFileTypes: true
+  });
+  for (const entry of entries) {
+    const fullPath = join(dir, entry.name);
+    if (entry.isDirectory()) {
+      if (recursive) {
+        const subFiles = await getAllFilesAsync(fullPath, baseDir, recursive);
+        fileList = fileList.concat(subFiles);
+      }
+    } else if (entry.isFile()) {
+      fileList.push(fullPath.slice(baseDir.length + 1));
+    }
+  }
+  return fileList;
+}
+async function prepareCLIFiles(revert = false, recursive = true, useDtsTxtForPrepareMyCLI = false) {
   const configPath = ".config/dler.ts";
   let srcDir = "src";
   if (existsSync(configPath)) {
@@ -34,17 +53,17 @@ async function prepareCLIFiles(revert = false) {
   if (!existsSync(srcDir)) {
     throw new Error(`Source directory not found: ${srcDir}`);
   }
-  const files = readdirSync(srcDir, { recursive: true, encoding: "utf-8" });
+  const files = await getAllFilesAsync(srcDir, srcDir, recursive);
   for (const file of files) {
     const fullPath = join(srcDir, file);
-    if (!existsSync(fullPath)) continue;
+    if (!await fileExists(fullPath)) continue;
     const ext = extname(file);
     const baseName = basename(file, ext);
     const dir = dirname(fullPath);
     if (revert) {
       if (file.endsWith(".json.json")) {
         await safeRename(fullPath, join(dir, baseName));
-      } else if (file.endsWith(".d.ts.txt")) {
+      } else if (file.endsWith(".d.ts.txt") && useDtsTxtForPrepareMyCLI) {
         await safeRename(fullPath, join(dir, `${baseName}.d.ts`));
       } else if (file.endsWith(".cjs")) {
         await safeRename(fullPath, join(dir, `${baseName}.js`));
@@ -54,8 +73,9 @@ async function prepareCLIFiles(revert = false) {
         await safeRename(fullPath, join(dir, "tsconfig.json.json"));
       } else if (file === "package.json" && !file.endsWith(".json.json")) {
         await safeRename(fullPath, join(dir, "package.json.json"));
-      } else if (file.endsWith(".d.ts") && !file.endsWith(".d.ts.txt")) {
-        await safeRename(fullPath, join(dir, `${baseName}.d.ts.txt`));
+      } else if (file.endsWith(".d.ts") && !file.endsWith(".d.ts.txt") && useDtsTxtForPrepareMyCLI) {
+        const baseWithoutD = baseName.slice(0, -2);
+        await safeRename(fullPath, join(dir, `${baseWithoutD}.d.ts.txt`));
       } else if (file.endsWith(".js") && !file.endsWith(".cjs")) {
         const content = readFileSync(fullPath, "utf-8");
         if (isCommonJSFile(content)) {
@@ -95,13 +115,36 @@ export default defineCommand({
       type: "string",
       description: "Destination name for the rename operation",
       required: false
+    },
+    recursive: {
+      type: "boolean",
+      description: "Recursively process all files in subdirectories (default: true)",
+      required: false,
+      default: true
+    },
+    useDtsTxtForPrepareMyCLI: {
+      type: "boolean",
+      description: "Use .d.ts.txt extension for .d.ts files in prepareMyCLI mode (default: false)",
+      required: false,
+      default: false
     }
   },
   async run({ args }) {
-    const { prepareMyCLI, revert, source, destination } = args;
+    const {
+      prepareMyCLI,
+      revert,
+      source,
+      destination,
+      recursive = true,
+      useDtsTxtForPrepareMyCLI = false
+    } = args;
     if (prepareMyCLI === true) {
       try {
-        await prepareCLIFiles(revert === true);
+        await prepareCLIFiles(
+          revert === true,
+          recursive,
+          useDtsTxtForPrepareMyCLI
+        );
         relinka("log", "Successfully prepared CLI files");
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);

package/bin/init/info.js

@@ -1,4 +1,5 @@
 import { endPrompt, startPrompt } from "@reliverse/rempts";
+const version = "1.5.3";
 export async function showStartPrompt(isDev) {
   await startPrompt({
     titleColor: "inverse",
@@ -6,7 +7,7 @@ export async function showStartPrompt(isDev) {
     // packageName: getPkgName(),
     // packageVersion: getPkgVersion(),
     packageName: "dler",
-    packageVersion: "1.3.5",
+    packageVersion: version,
     isDev
   });
 }

package/package.json

@@ -41,7 +41,7 @@
   "license": "MIT",
   "name": "@reliverse/dler",
   "type": "module",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "keywords": [
     "reliverse",
     "cli",