@reliverse/dler 1.7.37 → 1.7.39

package/README.md

@@ -631,7 +631,35 @@ bun dler rename ...
 
 ### 14. `magic`
 
-> Contributors: Please check the [docs/cmds/SPELLS.md](./docs/cmds/SPELLS.md) file for more technical details.
+**programmatic usage:**
+
+```ts
+function main() {
+  // may be useful when your cli is a project bootstrapper tool like @reliverse/rse
+  // so you can apply spells to each bootstrapped by you cli project's file
+  await applyMagicSpells(["my-target-dir"]);
+}
+await main();
+```
+
+**or, call it from dler config's hook**:
+
+```ts
+{
+  hooksAfterBuild: [
+    async () => {
+      // useful when you want to apply spells right after dler's build
+      await applyMagicSpells(["dist-jsr", "dist-npm", "dist-libs"]);
+    }
+  ],
+}
+```
+
+**or, use `dler magic`**:
+
+```bash
+dler magic --targets "my-target-dir"
+```
 
 **available spell types:**
 
@@ -700,6 +728,8 @@ files: [] // means all files
 
 p.s. [see how rse cli uses hooked=true](https://github.com/reliverse/rse/blob/main/src/postbuild.ts)
 
+> Contributors: Please check the [docs/cmds/SPELLS.md](./docs/cmds/SPELLS.md) file for more technical details.
+
 ### 15. `split`
 
 splits your code/text file into multiple files.
@@ -829,17 +859,6 @@ bun add @reliverse/dler-sdk
 
 **usage example**: [@reliverse/rse](https://github.com/reliverse/rse-website-builder) leverages this sdk to extend its functionality.
 
-## todo
-
-- [x] ~~implement stable `regular` build and publish~~
-- [ ] implement stable `library` build and publish
-- [ ] achieve full drop-in replacement for `unbuild`
-- [ ] support auto migration from `build.config.ts`
-- [ ] allow plugins to extend dler's `defineconfig`
-- [ ] support configuration via `.config/rse.{ts,jsonc}`
-- [ ] make config file optional with sensible defaults
-- [ ] use [@reliverse/remdn](https://github.com/reliverse/remdn) to generate npm/jsr readme
-
 ## related
 
 special thanks to the project that inspired `@reliverse/dler`:
@@ -858,6 +877,20 @@ special thanks to the project that inspired `@reliverse/dler`:
 
 - `<src | dist-npm | dist-jsr>/libs/<lib-name>/<files live here>` === `dist-libs/<lib-name>/<jsr | npm>/bin/<files live here>`
 
+### todo
+
+- [ ] `dist-*`-> `dist/dist-*`
+- [x] implement stable `regular` build and publish
+- [ ] implement stable `library` build and publish
+- [ ] achieve full drop-in replacement for `unbuild`
+- [ ] support auto migration from `build.config.ts`
+- [ ] support configuration via `.config/rse.{ts,jsonc}` 🤔
+- [ ] make config file fully optional with sensible defaults
+- [ ] use `dler remdn` ([@reliverse/remdn](https://github.com/reliverse/remdn)) to generate npm/jsr specific readme and a single `docs` dir for a whole project (only readmes will be published, docs are only stored in project's source cpde and can be deployed to user's website)
+- [x] allow plugins to extend dler's `defineconfig` (`hooksBeforeBuild` and `hooksAfterBuild` are now available, plugin's options can be passed directly to plugin's params, e.g. `hooksBeforeBuild: [ async () => { await myCoolPlugin({ /* plugin's options */ }); } ],`)
+- [ ] at the moment any bundler like `mkdist` can be called using `bun`, but bun's own bundler is not yet fully supported
+- [ ] support all well-known package managers (currently only bun is fully supported)
+
 ## support
 
 - if dler saves you time and effort, please consider supporting its development: [github sponsors](https://github.com/sponsors/blefnk);

package/bin/app/build/postbuild.js

@@ -43,15 +43,26 @@ async function processDistDirectories() {
 }
 async function copyNonBuildFiles(srcDir, distDir, preExtensions, templatesDir) {
   try {
-    const templatesSrcPath = path.join(srcDir, templatesDir);
-    if (await directoryExists(templatesSrcPath)) {
-      const templatesDestPath = path.join(distDir, "bin", templatesDir);
+    const templatesDirs = await glob(`**/${templatesDir}`, {
+      cwd: srcDir,
+      onlyDirectories: true,
+      absolute: true
+    });
+    const topLevelTemplatesDirs = templatesDirs.filter((dir) => {
+      const relativePath = path.relative(srcDir, dir);
+      const parts = relativePath.split(path.sep);
+      const templatesIndex = parts.indexOf(templatesDir);
+      return templatesIndex === parts.length - 1;
+    });
+    for (const templateDir of topLevelTemplatesDirs) {
+      const relativePath = path.relative(srcDir, templateDir);
+      const templatesDestPath = path.join(distDir, "bin", relativePath);
       await fs.ensureDir(path.dirname(templatesDestPath));
-      await fs.copy(templatesSrcPath, templatesDestPath);
+      await fs.copy(templateDir, templatesDestPath);
     }
     const files = await glob("**/*", {
       cwd: srcDir,
-      ignore: [`${templatesDir}/**`]
+      ignore: [`**/${templatesDir}/**`]
     });
     for (const file of files) {
       const ext = path.extname(file).slice(1);
@@ -114,7 +125,12 @@ async function compareFileStructures(srcDir, distDir) {
 export async function dlerPostBuild(isDev, debugDontCopyNonBuildFiles) {
   relinka("info", "\u2014 \u2014 \u2014 dlerPostBuild \u2014 \u2014 \u2014");
   const config = await getConfigDler();
-  await resolveAllCrossLibs();
+  await resolveAllCrossLibs(
+    ALIAS_TO_REPLACE,
+    ["npm", "jsr"],
+    config.buildPreExtensions,
+    config.buildTemplatesDir
+  );
   if (!debugDontCopyNonBuildFiles) {
     await wrapper_CopyNonBuildFiles(config);
   }

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

@@ -11,10 +11,10 @@ export declare const defineConfigRse: (userConfig?: Partial<RseConfig>) => {
     projectGitService?: "none" | "github" | "gitlab" | "bitbucket" | undefined;
     projectDeployService?: "none" | "vercel" | "netlify" | "railway" | "deno" | undefined;
     projectPackageManager?: "bun" | "npm" | "yarn" | "pnpm" | undefined;
-    projectState?: "creating" | "created" | undefined;
+    projectState?: "created" | "creating" | undefined;
     projectCategory?: "browser" | "cli" | "unknown" | "website" | "vscode" | "library" | "mobile" | undefined;
     projectSubcategory?: "unknown" | "e-commerce" | "tool" | undefined;
-    projectFramework?: "npm-jsr" | "rempts" | "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;
+    projectFramework?: "npm-jsr" | "unknown" | "vscode" | "nextjs" | "vite" | "svelte" | "remix" | "astro" | "nuxt" | "solid" | "qwik" | "vue" | "wxt" | "lynx" | "react-native" | "expo" | "capacitor" | "ionic" | "electron" | "tauri" | "neutralino" | "rempts" | "citty" | "commander" | "cac" | "meow" | "yargs" | "webextension" | "browser-extension" | undefined;
     projectTemplate?: "unknown" | "blefnk/relivator-nextjs-template" | "blefnk/relivator-docker-template" | "blefnk/next-react-ts-src-minimal" | "blefnk/all-in-one-nextjs-template" | "blefnk/create-t3-app" | "blefnk/create-next-app" | "blefnk/astro-starlight-template" | "blefnk/versator-nextjs-template" | "blefnk/relivator-lynxjs-template" | "blefnk/relivator-react-native-template" | "reliverse/template-browser-extension" | "microsoft/vscode-extension-samples" | "microsoft/vscode-extension-template" | "rsetarter-template" | "blefnk/deno-cli-tutorial" | undefined;
     projectTemplateDate?: string | undefined;
     features?: {
@@ -33,6 +33,7 @@ export declare const defineConfigRse: (userConfig?: Partial<RseConfig>) => {
         themes?: string[] | undefined;
     } | undefined;
     preferredLibraries?: {
+        search?: "unknown" | "algolia" | undefined;
         i18n?: "unknown" | "next-intl" | undefined;
         analytics?: "unknown" | "vercel" | undefined;
         authentication?: "unknown" | "better-auth" | "clerk" | "next-auth" | "supabase-auth" | "auth0" | undefined;
@@ -51,7 +52,6 @@ export declare const defineConfigRse: (userConfig?: Partial<RseConfig>) => {
         logging?: "unknown" | "axiom" | undefined;
         forms?: "unknown" | "react-hook-form" | undefined;
         notifications?: "unknown" | "sonner" | undefined;
-        search?: "unknown" | "algolia" | undefined;
         uploads?: "unknown" | "uploadthing" | undefined;
         validation?: "unknown" | "zod" | "typebox" | "valibot" | undefined;
         documentation?: "unknown" | "starlight" | "nextra" | undefined;
@@ -75,7 +75,7 @@ export declare const defineConfigRse: (userConfig?: Partial<RseConfig>) => {
         indentStyle?: "space" | "tab" | undefined;
         quoteMark?: "single" | "double" | undefined;
         semicolons?: boolean | undefined;
-        trailingComma?: "none" | "all" | "es5" | undefined;
+        trailingComma?: "all" | "none" | "es5" | undefined;
         bracketSpacing?: boolean | undefined;
         arrowParens?: "always" | "avoid" | undefined;
         tabWidth?: number | undefined;
@@ -96,7 +96,7 @@ export declare const defineConfigRse: (userConfig?: Partial<RseConfig>) => {
         importSymbol?: string | undefined;
     } | undefined;
     monorepo?: {
-        type?: "none" | "bun" | "pnpm" | "turborepo" | "nx" | undefined;
+        type?: "bun" | "pnpm" | "none" | "turborepo" | "nx" | undefined;
         packages?: string[] | undefined;
         sharedPackages?: string[] | undefined;
     } | undefined;

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

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

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

@@ -30,6 +30,28 @@ export interface ApplyMagicSpellsResult {
  * Processes files in specified output directories by applying magic directives
  * For dist targets, first scans src directory for files with magic directives, then processes corresponding output files
  * For custom targets, processes magic directives directly in the target files
+ *
+ * !! Users should call this function manually in their codebase (dler doesn't call it automatically) !!
+ * To call it:
+ * ```ts
+ * // may be useful when your cli is a project bootstrapper tool like @reliverse/rse
+ * // so you can apply spells to each bootstrapped by you cli project's file
+ * await applyMagicSpells(["my-target-dir"]);
+ * ```
+ * Or, in dler config's hook:
+ * ```ts
+ * hooksAfterBuild: [
+ *   async () => {
+ *     // useful when you want to apply spells right after dler's build
+ *     await applyMagicSpells(["dist-jsr", "dist-npm", "dist-libs"]);
+ *   }
+ * ]
+ * ```
+ * Or, use `dler magic` command:
+ * ```bash
+ * dler magic --targets "my-target-dir"
+ * ```
+ *
  * @param targets Array of output targets in format "dist-npm", "dist-jsr", "dist-libs" or "dist-libs/lib-name" or any custom path
  * @param options Configuration options for processing
  * @returns Object containing arrays of processed files and processed .d.ts files

package/bin/libs/sdk/sdk-impl/utils/resolve-cross-libs.d.ts

@@ -1,3 +1,3 @@
-declare function resolveCrossLibs(libBinDir: string, alias?: string, subFolders?: ("npm" | "jsr")[]): Promise<string[]>;
-declare function resolveAllCrossLibs(alias?: string, subFolders?: ("npm" | "jsr")[]): Promise<string[]>;
+declare function resolveCrossLibs(libBinDir: string, alias: string | undefined, subFolders: ("npm" | "jsr")[] | undefined, buildPreExtensions: string[], buildTemplatesDir: string): Promise<string[]>;
+declare function resolveAllCrossLibs(alias: string | undefined, subFolders: ("npm" | "jsr")[] | undefined, buildPreExtensions: string[], buildTemplatesDir: string): Promise<string[]>;
 export { resolveCrossLibs, resolveAllCrossLibs };

package/bin/libs/sdk/sdk-impl/utils/resolve-cross-libs.js

@@ -1,8 +1,7 @@
 import { relinka } from "@reliverse/relinka";
 import { promises as fs } from "node:fs";
 import path from "node:path";
-const PROCESS_DTS_FILES = true;
-async function resolveCrossLibs(libBinDir, alias = "~", subFolders = ["npm", "jsr"]) {
+async function resolveCrossLibs(libBinDir, alias = "~", subFolders = ["npm", "jsr"], buildPreExtensions, buildTemplatesDir) {
   const normalizedPath = libBinDir.replace(/\\/g, "/");
   if (!normalizedPath.startsWith("dist-libs") && !normalizedPath.startsWith("dist-jsr") && !normalizedPath.startsWith("dist-npm")) {
     throw new Error(
@@ -17,7 +16,7 @@ async function resolveCrossLibs(libBinDir, alias = "~", subFolders = ["npm", "js
       );
     }
     const currentLib = pathParts[1];
-    const files = await findSourceFiles(libBinDir);
+    const files = await findSourceFiles(libBinDir, buildPreExtensions, buildTemplatesDir);
     const modifiedFiles = [];
     await Promise.all(
       files.map(async (filePath) => {
@@ -34,19 +33,30 @@ async function resolveCrossLibs(libBinDir, alias = "~", subFolders = ["npm", "js
   }
   return [];
 }
-async function findSourceFiles(dir) {
+async function findSourceFiles(dir, buildPreExtensions, buildTemplatesDir) {
   const files = [];
   const entries = await fs.readdir(dir, { withFileTypes: true });
   await Promise.all(
     entries.map(async (entry) => {
       const fullPath = path.join(dir, entry.name);
       if (entry.isDirectory()) {
-        const subFiles = await findSourceFiles(fullPath);
+        const subFiles = await findSourceFiles(fullPath, buildPreExtensions, buildTemplatesDir);
         files.push(...subFiles);
       } else if (entry.isFile()) {
-        const ext = path.extname(entry.name);
+        const ext = path.extname(entry.name).slice(1);
         const isDts = entry.name.endsWith(".d.ts");
-        if (ext === ".js" || ext === ".ts" && !isDts || PROCESS_DTS_FILES && isDts) {
+        const isInTemplatesDir = fullPath.includes(`/${buildTemplatesDir}/`);
+        if (isInTemplatesDir) {
+          return;
+        }
+        if (isDts) {
+          files.push(fullPath);
+          return;
+        }
+        if (!buildPreExtensions.includes(ext)) {
+          return;
+        }
+        if (ext === "js" || ext === "ts") {
           files.push(fullPath);
         }
       }
@@ -157,7 +167,7 @@ async function directoryExists(dirPath) {
     throw error;
   }
 }
-async function resolveAllCrossLibs(alias = "~", subFolders = ["npm", "jsr"]) {
+async function resolveAllCrossLibs(alias = "~", subFolders = ["npm", "jsr"], buildPreExtensions, buildTemplatesDir) {
   const distLibsDir = "dist-libs";
   const allModifiedFiles = [];
   const distLibsExists = await directoryExists(distLibsDir);
@@ -171,7 +181,13 @@ async function resolveAllCrossLibs(alias = "~", subFolders = ["npm", "jsr"]) {
           const binDirExists = await directoryExists(binDir);
           if (binDirExists) {
             try {
-              const modifiedFiles = await resolveCrossLibs(binDir, alias, subFolders);
+              const modifiedFiles = await resolveCrossLibs(
+                binDir,
+                alias,
+                subFolders,
+                buildPreExtensions,
+                buildTemplatesDir
+              );
               allModifiedFiles.push(...modifiedFiles);
             } catch (error) {
               const errorMessage = error instanceof Error ? error.message : String(error);

package/package.json

@@ -36,7 +36,7 @@
     "p-all": "^5.0.0",
     "p-map": "^7.0.3",
     "pkg-types": "^2.1.0",
-    "postcss": "^8.5.5",
+    "postcss": "^8.5.6",
     "postcss-nested": "^7.0.2",
     "pretty-bytes": "^7.0.0",
     "pretty-ms": "^9.2.0",
@@ -53,7 +53,7 @@
   "license": "MIT",
   "name": "@reliverse/dler",
   "type": "module",
-  "version": "1.7.37",
+  "version": "1.7.39",
   "keywords": [
     "reliverse",
     "cli",