@reliverse/dler 1.7.45 → 1.7.46

package/bin/app/build/postbuild.js

@@ -5,7 +5,7 @@ import { runCmd } from "@reliverse/rempts";
 import { glob } from "tinyglobby";
 import { getCheckCmd } from "../cmds.js";
 import { getConfigDler } from "../../libs/sdk/sdk-impl/config/load.js";
-import { applyMagicSpells } from "../../libs/sdk/sdk-impl/magic/ms-apply.js";
+import { applyMagicSpells } from "../../libs/sdk/sdk-impl/magic/magic-apply.js";
 import { resolveAllCrossLibs } from "../../libs/sdk/sdk-impl/utils/resolve-cross-libs.js";
 import { PROJECT_ROOT } from "../../libs/sdk/sdk-impl/utils/utils-consts.js";
 import { directoryExists, executeDlerHooks } from "./ppb-utils.js";

package/bin/app/magic/cmd.js

@@ -1,5 +1,5 @@
 import { defineArgs, defineCommand } from "@reliverse/rempts";
-import { applyMagicSpells } from "../../libs/sdk/sdk-impl/magic/ms-apply.js";
+import { applyMagicSpells } from "../../libs/sdk/sdk-impl/magic/magic-apply.js";
 import { formatError } from "../../libs/sdk/sdk-impl/utils/utils-error-cwd.js";
 export default defineCommand({
   meta: {

package/bin/app/pack/cmd.js

@@ -296,7 +296,7 @@ export interface Templates extends Record<string, Template> {}
       "",
       `export const ${WL}_TEMPLATES = ${WL}_TEMPLATES_OBJ as const;`,
       "",
-      `export type ${WL}_TEMPLATE_NAMES = keyof typeof ${WL}_TEMPLATES;`,
+      `export interface ${WL}_TEMPLATE_NAMES extends keyof typeof ${WL}_TEMPLATES {}`,
       "",
       `export const dlerTemplatesMap: Record<string, ${WL}_TEMPLATE_NAMES> = {`,
       ...mapEntries,

package/bin/libs/cfg/cfg-impl/rse-config/rse-impl/rse-define.d.ts

@@ -11,7 +11,7 @@ export declare const defineConfigRse: (userConfig?: Partial<RseConfig>) => {
     projectGitService?: "none" | "github" | "gitlab" | "bitbucket" | undefined;
     projectDeployService?: "none" | "vercel" | "netlify" | "railway" | "deno" | undefined;
     projectPackageManager?: "npm" | "bun" | "yarn" | "pnpm" | undefined;
-    projectState?: "created" | "creating" | undefined;
+    projectState?: "creating" | "created" | undefined;
     projectCategory?: "browser" | "cli" | "unknown" | "website" | "vscode" | "library" | "mobile" | undefined;
     projectSubcategory?: "unknown" | "e-commerce" | "tool" | undefined;
     projectFramework?: "rempts" | "npm-jsr" | "unknown" | "vscode" | "nextjs" | "vite" | "svelte" | "remix" | "astro" | "nuxt" | "solid" | "qwik" | "vue" | "wxt" | "lynx" | "react-native" | "expo" | "capacitor" | "ionic" | "electron" | "tauri" | "neutralino" | "citty" | "commander" | "cac" | "meow" | "yargs" | "webextension" | "browser-extension" | undefined;

package/bin/libs/sdk/sdk-impl/config/info.js

@@ -1,5 +1,5 @@
 import { endPrompt, startPrompt } from "@reliverse/rempts";
-const version = "1.7.45";
+const version = "1.7.46";
 export async function showStartPrompt(isDev) {
   await startPrompt({
     titleColor: "inverse",

package/bin/libs/sdk/sdk-impl/magic/{ms-apply.d.ts → magic-apply.d.ts}

@@ -25,6 +25,8 @@ export interface ApplyMagicSpellsOptions {
 export interface ApplyMagicSpellsResult {
     /** All processed files */
     processedFiles: string[];
+    /** Total number of magic spells processed */
+    totalSpellsProcessed: number;
 }
 /**
  * Processes files in specified output directories by applying magic directives

package/bin/libs/sdk/sdk-impl/magic/{ms-apply.js → magic-apply.js}

@@ -6,7 +6,7 @@ import { isBinaryExt } from "../utils/binary.js";
 import { formatError } from "../utils/utils-error-cwd.js";
 import {
   evaluateMagicDirective
-} from "./ms-spells.js";
+} from "./magic-spells.js";
 const DEBUG_MODE = true;
 const PROCESS_DTS_FILES = true;
 const DEFAULT_OPTIONS = {
@@ -24,72 +24,60 @@ function validateTargets(targets, customOutputPaths) {
   const outputDirs = /* @__PURE__ */ new Set();
   const specificLibs = /* @__PURE__ */ new Set();
   const customTargets = /* @__PURE__ */ new Set();
-  const validTargets = [];
   const allOutputPaths = { ...DEFAULT_OUTPUT_PATHS, ...customOutputPaths };
   for (const target of targets) {
     const [outputDir, lib] = target.split("/");
     if (!outputDir) {
-      relinka("warn", `Skipping invalid output target: ${target}`);
-      continue;
-    }
-    const outputPath = allOutputPaths[outputDir] || outputDir;
-    const fullPath = path.isAbsolute(outputPath) ? outputPath : path.join(process.cwd(), outputPath);
-    if (!fs.existsSync(fullPath)) {
-      relinka("warn", `Skipping non-existent output directory: ${outputPath}`);
-      continue;
+      throw new Error(`Invalid output target: ${target}`);
     }
     const isCustomTarget = !["dist-npm", "dist-jsr", "dist-libs"].includes(outputDir);
     if (isCustomTarget) {
       if (customTargets.has(outputDir)) {
-        relinka("warn", `Skipping duplicate custom target: ${outputDir}`);
-        continue;
+        throw new Error(`Duplicate custom target: ${outputDir}`);
       }
       customTargets.add(outputDir);
-      validTargets.push(target);
+      const outputPath = allOutputPaths[outputDir] || outputDir;
+      const fullPath = path.isAbsolute(outputPath) ? outputPath : path.join(process.cwd(), outputPath);
+      if (!fs.existsSync(fullPath)) {
+        throw new Error(`Output directory does not exist: ${outputPath}`);
+      }
       continue;
     }
     if (outputDir === "dist-libs") {
       if (lib) {
         if (specificLibs.has(lib)) {
-          relinka("warn", `Skipping duplicate library target: ${target}`);
-          continue;
+          throw new Error(`Duplicate library target: ${target}`);
         }
         specificLibs.add(lib);
       } else {
         if (outputDirs.has("dist-libs") || specificLibs.size > 0) {
-          relinka("warn", "Skipping 'dist-libs' as it conflicts with specific library targets");
-          continue;
+          throw new Error("Cannot mix 'dist-libs' with specific library targets");
         }
         outputDirs.add("dist-libs");
       }
     } else {
       if (outputDirs.has(outputDir)) {
-        relinka("warn", `Skipping duplicate output target: ${outputDir}`);
-        continue;
+        throw new Error(`Duplicate output target: ${outputDir}`);
       }
       outputDirs.add(outputDir);
     }
-    validTargets.push(target);
   }
-  return validTargets;
 }
 export async function applyMagicSpells(targets, options = {}) {
   const result = {
-    processedFiles: []
+    processedFiles: [],
+    totalSpellsProcessed: 0
   };
   try {
-    const validTargets = validateTargets(targets, options.customOutputPaths);
-    if (validTargets.length === 0) {
-      relinka("warn", "No valid targets found to process");
-      return result;
-    }
+    validateTargets(targets, options.customOutputPaths);
     await pMap(
-      validTargets,
+      targets,
       async (target) => {
         const [outputDir, lib] = target.split("/");
         if (outputDir && !["dist-npm", "dist-jsr", "dist-libs"].includes(outputDir)) {
           const targetResult = await processCustomTarget(outputDir, options);
           result.processedFiles.push(...targetResult.processedFiles);
+          result.totalSpellsProcessed += targetResult.totalSpellsProcessed;
           return;
         }
         const srcRoot = path.resolve(process.cwd(), "src");
@@ -106,25 +94,36 @@ export async function applyMagicSpells(targets, options = {}) {
         if (outputDir === "dist-libs") {
           if (!lib) {
             const distLibsPath = DEFAULT_OUTPUT_PATHS["dist-libs"] ?? "dist-libs";
-            const libDirs = await readdir(distLibsPath, { withFileTypes: true });
-            await pMap(
-              libDirs,
-              async (libDir) => {
-                if (libDir.isDirectory()) {
-                  const targetResult = await processOutputTarget(
-                    sourceFilesWithDirectives,
-                    "dist-libs",
-                    libDir.name,
-                    options
-                  );
-                  result.processedFiles.push(...targetResult.processedFiles);
-                }
-              },
-              {
-                concurrency: options.concurrency ?? 4,
-                stopOnError: options.stopOnError ?? true
+            try {
+              if (await fs.pathExists(distLibsPath)) {
+                const libDirs = await readdir(distLibsPath, { withFileTypes: true });
+                await pMap(
+                  libDirs,
+                  async (libDir) => {
+                    if (libDir.isDirectory()) {
+                      const targetResult = await processOutputTarget(
+                        sourceFilesWithDirectives,
+                        "dist-libs",
+                        libDir.name,
+                        options
+                      );
+                      result.processedFiles.push(...targetResult.processedFiles);
+                      result.totalSpellsProcessed += targetResult.totalSpellsProcessed;
+                    }
+                  },
+                  {
+                    concurrency: options.concurrency ?? 4,
+                    stopOnError: options.stopOnError ?? true
+                  }
+                );
+              } else if (DEBUG_MODE) {
+                relinka("log", `[spells] \u2298 skipping non-existent target: ${distLibsPath}`);
               }
-            );
+            } catch (error) {
+              if (DEBUG_MODE) {
+                relinka("warn", `Failed to process dist-libs: ${formatError(error)}`);
+              }
+            }
           } else {
             const targetResult = await processOutputTarget(
               sourceFilesWithDirectives,
@@ -133,6 +132,7 @@ export async function applyMagicSpells(targets, options = {}) {
               options
             );
             result.processedFiles.push(...targetResult.processedFiles);
+            result.totalSpellsProcessed += targetResult.totalSpellsProcessed;
           }
         } else if (outputDir) {
           const targetResult = await processOutputTarget(
@@ -142,6 +142,7 @@ export async function applyMagicSpells(targets, options = {}) {
             options
           );
           result.processedFiles.push(...targetResult.processedFiles);
+          result.totalSpellsProcessed += targetResult.totalSpellsProcessed;
         }
       },
       {
@@ -149,6 +150,12 @@ export async function applyMagicSpells(targets, options = {}) {
         stopOnError: options.stopOnError ?? true
       }
     );
+    if (DEBUG_MODE) {
+      relinka(
+        "log",
+        `[spells] \u2713 Processed ${result.totalSpellsProcessed} magic spells in ${result.processedFiles.length} files`
+      );
+    }
     return result;
   } catch (error) {
     throw new Error(`Failed to process output files: ${formatError(error)}`);
@@ -157,7 +164,8 @@ export async function applyMagicSpells(targets, options = {}) {
 async function processCustomTarget(outputDir, options = {}) {
   const { concurrency = DEFAULT_OPTIONS.concurrency, batchSize = DEFAULT_OPTIONS.batchSize } = options;
   const result = {
-    processedFiles: []
+    processedFiles: [],
+    totalSpellsProcessed: 0
   };
   if (DEBUG_MODE) {
     relinka("log", `[spells] \u21D2 processing custom target: ${outputDir}`);
@@ -205,6 +213,9 @@ async function processCustomTarget(outputDir, options = {}) {
           const wasProcessed = await processSingleOutputFile(outputFilePath, options);
           if (wasProcessed) {
             result.processedFiles.push(outputFilePath);
+            const content = await fs.readFile(outputFilePath, "utf8");
+            const spellCount = (content.match(/\/\/\s*(?:@ts-expect-error\s+.*?)?<\s*(dler-[^>\s]+)(.*?)>/gi) || []).length;
+            result.totalSpellsProcessed += spellCount;
           }
         } catch (error) {
           const errorMessage = `Error processing ${outputFilePath}: ${formatError(error)}`;
@@ -259,8 +270,18 @@ async function scanSourceForMagicDirectives(srcRoot, options = {}) {
 async function processOutputTarget(sourceFilesWithDirectives, outputDir, libName, options = {}) {
   const { concurrency = DEFAULT_OPTIONS.concurrency, batchSize = DEFAULT_OPTIONS.batchSize } = options;
   const result = {
-    processedFiles: []
+    processedFiles: [],
+    totalSpellsProcessed: 0
   };
+  const outputPath = options.customOutputPaths?.[outputDir] || outputDir;
+  const fullOutputPath = path.isAbsolute(outputPath) ? outputPath : path.join(process.cwd(), outputPath);
+  if (!await fs.pathExists(fullOutputPath)) {
+    if (DEBUG_MODE) {
+      const targetName = outputDir === "dist-libs" && libName ? `${outputDir}/${libName}` : outputDir;
+      relinka("log", `[spells] \u2298 skipping non-existent target: ${targetName}`);
+    }
+    return result;
+  }
   if (DEBUG_MODE) {
     const targetName = outputDir === "dist-libs" && libName ? `${outputDir}/${libName}` : outputDir;
     relinka("log", `[spells] \u21D2 processing target: ${targetName}`);
@@ -291,6 +312,9 @@ async function processOutputTarget(sourceFilesWithDirectives, outputDir, libName
           const wasProcessed = await processSingleOutputFile(outputFilePath, options);
           if (wasProcessed) {
             result.processedFiles.push(outputFilePath);
+            const content = await fs.readFile(outputFilePath, "utf8");
+            const spellCount = (content.match(/\/\/\s*(?:@ts-expect-error\s+.*?)?<\s*(dler-[^>\s]+)(.*?)>/gi) || []).length;
+            result.totalSpellsProcessed += spellCount;
           }
         } catch (error) {
           const errorMessage = `Error processing ${outputFilePath}: ${formatError(error)}`;

package/bin/libs/sdk/sdk-impl/utils/utils-clean.js

@@ -5,10 +5,10 @@ import pMap from "p-map";
 import { CONCURRENCY_DEFAULT, PROJECT_ROOT } from "./utils-consts.js";
 export async function removeDistFolders(distNpmDirName, distJsrDirName, libsDirDist, libsList, distTmpDirName = "") {
   const foldersToRemove = [];
-  foldersToRemove.push(distTmpDirName);
   foldersToRemove.push(distNpmDirName);
-  if (distJsrDirName) {
-    foldersToRemove.push(distJsrDirName);
+  foldersToRemove.push(distJsrDirName);
+  if (distTmpDirName !== "") {
+    foldersToRemove.push(distTmpDirName);
   }
   if (libsList && Object.keys(libsList).length > 0) {
     foldersToRemove.push(libsDirDist);

package/bin/libs/sdk/sdk-mod.d.ts

@@ -43,10 +43,10 @@ export { getConfigDler } from "./sdk-impl/config/load.js";
 export type { DlerConfig, BumpMode, BundlerName, NpmOutExt, LibConfig, Esbuild, transpileFormat, Sourcemap, transpileTarget, } from "./sdk-impl/config/types.js";
 export { IGNORE_PATTERNS } from "./sdk-impl/constants.js";
 export { library_buildFlow, library_pubFlow, libraries_build, libraries_publish, } from "./sdk-impl/library-flow.js";
-export type { ApplyMagicSpellsOptions, ApplyMagicSpellsResult, FileWithSpells, } from "./sdk-impl/magic/ms-apply.js";
-export { applyMagicSpells, processSingleOutputFile, getAllAvailableRegistries, getFilesWithMagicSpells, } from "./sdk-impl/magic/ms-apply.js";
-export type { SpellEvaluationContext, SpellOutcome, SpellDirective, SpellInfo, } from "./sdk-impl/magic/ms-spells.js";
-export { getAvailableSpells, evaluateMagicDirective } from "./sdk-impl/magic/ms-spells.js";
+export type { ApplyMagicSpellsOptions, ApplyMagicSpellsResult, FileWithSpells, } from "./sdk-impl/magic/magic-apply.js";
+export { applyMagicSpells, processSingleOutputFile, getAllAvailableRegistries, getFilesWithMagicSpells, } from "./sdk-impl/magic/magic-apply.js";
+export type { SpellEvaluationContext, SpellOutcome, SpellDirective, SpellInfo, } from "./sdk-impl/magic/magic-spells.js";
+export { getAvailableSpells, evaluateMagicDirective } from "./sdk-impl/magic/magic-spells.js";
 export { library_publishLibrary } from "./sdk-impl/pub/pub-library.js";
 export { regular_pubToJsr, regular_pubToNpm } from "./sdk-impl/pub/pub-regular.js";
 export { regular_buildFlow, regular_pubFlow } from "./sdk-impl/regular-flow.js";

package/bin/libs/sdk/sdk-mod.js

@@ -118,8 +118,8 @@ export {
   processSingleOutputFile,
   getAllAvailableRegistries,
   getFilesWithMagicSpells
-} from "./sdk-impl/magic/ms-apply.js";
-export { getAvailableSpells, evaluateMagicDirective } from "./sdk-impl/magic/ms-spells.js";
+} from "./sdk-impl/magic/magic-apply.js";
+export { getAvailableSpells, evaluateMagicDirective } from "./sdk-impl/magic/magic-spells.js";
 export { library_publishLibrary } from "./sdk-impl/pub/pub-library.js";
 export { regular_pubToJsr, regular_pubToNpm } from "./sdk-impl/pub/pub-regular.js";
 export { regular_buildFlow, regular_pubFlow } from "./sdk-impl/regular-flow.js";

package/package.json

@@ -53,7 +53,7 @@
   "license": "MIT",
   "name": "@reliverse/dler",
   "type": "module",
-  "version": "1.7.45",
+  "version": "1.7.46",
   "keywords": [
     "reliverse",
     "cli",

package/bin/libs/sdk/sdk-impl/magic/ms-spells.js

@@ -1,143 +0,0 @@
-import { relinka } from "@reliverse/relinka";
-const SPELL_REGEX = /\/\/\s*(?:@ts-expect-error\s+.*?)?<\s*(dler-[^>\s]+)(.*?)>/i;
-const REPLACEMENT_REGEX = /`([^`]+)`/;
-const IF_CONDITION_REGEX = /\bif\s+['"`]([^'"`]+)['"`]/i;
-const ELSE_CONTENT_REGEX = /\belse\s+['"`]([^'"`]+)['"`]/i;
-const STARTS_WITH_REGEX = /current file path starts with\s+(.+)$/i;
-export function getAvailableSpells() {
-  return [
-    {
-      name: "dler-replace-line-to",
-      description: "Replaces the current line with new content, optionally based on a condition",
-      example: "// <dler-replace-line-to `export const version = \"1.0.0\";` if 'current file path starts with dist-npm'>",
-      notes: "If no condition is specified, replacement always applies. If condition is not met and else content is provided, uses else content. Otherwise keeps original line. Also supports @ts-expect-error prefix."
-    },
-    {
-      name: "dler-remove-line",
-      description: "Removes the current line from the output",
-      example: "// <dler-remove-line>",
-      notes: "Also supports @ts-expect-error prefix."
-    },
-    {
-      name: "dler-remove-file",
-      description: "Removes the entire file from the output",
-      example: "// <dler-remove-file>",
-      notes: "This directive should be placed at the top of the file for clarity. Also supports @ts-expect-error prefix."
-    },
-    {
-      name: "dler-remove-comment",
-      description: "Removes only the comment portion containing this directive from the line",
-      example: "console.log('debug info'); // <dler-remove-comment>",
-      notes: "Removes everything from '//' to the end of the line when the comment contains this directive. The code portion before the comment is preserved. Also supports @ts-expect-error prefix."
-    },
-    {
-      name: "dler-ignore-this-line",
-      description: "Prevents any magic directives on this line from being processed",
-      example: "// <dler-remove-line> // <dler-ignore-this-line>",
-      notes: "When present on a line, all magic directives on that line are ignored and the line is kept as-is. Useful for code that contains magic directive strings that shouldn't be executed."
-    }
-  ];
-}
-export function evaluateMagicDirective(line, ctx) {
-  if (line.includes("<dler-ignore-this-line>")) {
-    return NO_OP;
-  }
-  const match = line.match(SPELL_REGEX);
-  if (!match) return NO_OP;
-  const [, directive = "", body] = match;
-  if (!isValidMagicDirective(directive)) {
-    relinka("warn", `[spells] unknown directive: ${directive}`);
-    return NO_OP;
-  }
-  switch (directive) {
-    /* -------------------------------------------------------------- */
-    /* dler-remove-file                                               */
-    /* -------------------------------------------------------------- */
-    case "dler-remove-file": {
-      return { removeFile: true, removeLine: true };
-    }
-    /* -------------------------------------------------------------- */
-    /* dler-remove-line                                               */
-    /* -------------------------------------------------------------- */
-    case "dler-remove-line": {
-      return { removeLine: true, removeFile: false };
-    }
-    /* -------------------------------------------------------------- */
-    /* dler-remove-comment                                            */
-    /* -------------------------------------------------------------- */
-    case "dler-remove-comment": {
-      const commentIndex = line.indexOf("//");
-      if (commentIndex !== -1) {
-        const codeBeforeComment = line.substring(0, commentIndex).trimEnd();
-        return { replacement: codeBeforeComment, removeLine: false, removeFile: false };
-      }
-      return NO_OP;
-    }
-    /* -------------------------------------------------------------- */
-    /* dler-replace-line-to                                           */
-    /* -------------------------------------------------------------- */
-    case "dler-replace-line-to": {
-      const { replacement, elseContent, condition } = parseReplacementDirective(body ?? "");
-      if (!replacement) {
-        relinka("warn", "[spells] dler-replace-line-to missing replacement content");
-        return NO_OP;
-      }
-      const condMet = condition === void 0 ? true : evaluatePathCondition(condition, ctx);
-      if (condMet) {
-        return { replacement, removeLine: false, removeFile: false };
-      }
-      if (elseContent !== void 0) {
-        return { replacement: elseContent, removeLine: false, removeFile: false };
-      }
-      return NO_OP;
-    }
-    /* -------------------------------------------------------------- */
-    /* dler-ignore-this-line                                          */
-    /* -------------------------------------------------------------- */
-    case "dler-ignore-this-line": {
-      return NO_OP;
-    }
-    default:
-      return NO_OP;
-  }
-}
-const NO_OP = { removeLine: false, removeFile: false };
-function isValidMagicDirective(directive) {
-  return [
-    "dler-replace-line-to",
-    "dler-remove-line",
-    "dler-remove-file",
-    "dler-remove-comment",
-    "dler-ignore-this-line"
-  ].includes(directive);
-}
-function parseReplacementDirective(body) {
-  const parts = {
-    replacement: ""
-  };
-  const replacementMatch = body.match(REPLACEMENT_REGEX);
-  if (replacementMatch?.[1]) parts.replacement = replacementMatch[1].trim();
-  const ifMatch = body.match(IF_CONDITION_REGEX);
-  if (ifMatch?.[1]) {
-    parts.condition = ifMatch[1].trim();
-  }
-  const elseMatch = body.match(ELSE_CONTENT_REGEX);
-  if (elseMatch?.[1]) parts.elseContent = elseMatch[1].trim();
-  return parts;
-}
-function evaluatePathCondition(condition, ctx) {
-  const STARTS_WITH = STARTS_WITH_REGEX.exec(condition)?.[1];
-  if (STARTS_WITH) {
-    const prefixes = STARTS_WITH.split(/\s+or\s+/i).map(
-      (p) => p.replace(/['"`]/g, "").trim().replaceAll("\\", "/")
-    );
-    return prefixes.some((p) => ctx.filePath.startsWith(p));
-  }
-  if (condition.trim()) {
-    relinka(
-      "warn",
-      `[spells] unsupported condition "${condition}" - only "current file path starts with <prefix> [or <prefix> ...]" is supported`
-    );
-  }
-  return false;
-}