@reliverse/dler 1.3.4 → 1.3.5

package/bin/libs/sdk/sdk-impl/build/build-library.d.ts

@@ -38,7 +38,7 @@ type JsrBuildOptions = {
 };
 /** Consolidated options for the main library build function */
 export type LibraryBuildOptions = {
-    commonPubRegistry: "npm" | "jsr" | "npm-jsr" | string | undefined;
+    effectivePubRegistry: "npm" | "jsr" | "npm-jsr" | undefined;
     npm?: NpmBuildOptions;
     jsr?: JsrBuildOptions;
 } & BaseLibBuildOptions & TranspileOptions;

package/bin/libs/sdk/sdk-impl/build/build-library.js

@@ -86,46 +86,37 @@ export async function library_buildLibrary(options) {
   }
 }
 async function executeBuildTasks(options) {
-  const { commonPubRegistry, libName } = options;
+  const { libName, npm, jsr, effectivePubRegistry } = options;
+  relinka(
+    "log",
+    `Executing build tasks for ${libName} (Registry: ${effectivePubRegistry})...`
+  );
   const buildTasks = [];
-  if (commonPubRegistry === "jsr" || commonPubRegistry === "npm-jsr") {
-    if (!options.jsr) {
+  if (effectivePubRegistry === "jsr" || effectivePubRegistry === "npm-jsr") {
+    if (!jsr) {
       throw new Error(
-        `JSR build requested for ${libName} but 'options.jsr' is missing.`
+        `Build Error (executeBuildTasks): JSR config missing for ${libName} when registry includes JSR.`
       );
     }
-    relinka("log", `Queueing JSR build for lib ${libName}...`);
     buildTasks.push(() => library_buildJsrDist(options));
   }
-  if (commonPubRegistry === "npm" || commonPubRegistry === "npm-jsr") {
-    if (!options.npm) {
+  if (effectivePubRegistry === "npm" || effectivePubRegistry === "npm-jsr") {
+    if (!npm) {
       throw new Error(
-        `NPM build requested for ${libName} but 'options.npm' is missing.`
+        `Build Error (executeBuildTasks): NPM config missing for ${libName} when registry includes NPM.`
       );
     }
-    relinka("log", `Queueing NPM build for lib ${libName}...`);
     buildTasks.push(() => library_buildNpmDist(options));
   }
   if (buildTasks.length === 0) {
     relinka(
       "warn",
-      `No valid build targets specified by 'commonPubRegistry' ("${commonPubRegistry}") for lib ${libName}. Skipping build.`
+      `No build tasks for ${libName} based on registry: ${effectivePubRegistry}`
     );
     return;
   }
-  if (buildTasks.length > 1) {
-    relinka("log", `Building lib ${libName} for NPM and JSR concurrently...`);
-    await pAll(buildTasks, { concurrency: CONCURRENCY_DEFAULT });
-  } else {
-    relinka(
-      "log",
-      `Building lib ${libName} for ${options.commonPubRegistry || "single target"}...`
-    );
-    const task = buildTasks[0];
-    if (task) {
-      await task();
-    }
-  }
+  await pAll(buildTasks, { concurrency: CONCURRENCY_DEFAULT });
+  relinka("success", `All build tasks completed for ${libName}.`);
 }
 async function library_buildJsrDist(options) {
   const { libName, libMainFile, libsList } = options;
@@ -268,7 +259,9 @@ async function library_buildDistributionTarget(params) {
     libDeclarations,
     distJsrOutFilesExt,
     options,
-    libDirName
+    libDirName,
+    npmOutDir,
+    jsrOutDir
   } = params;
   const {
     libName,
@@ -316,7 +309,7 @@ async function library_buildDistributionTarget(params) {
   await library_bundleWithBuilder(bundleRequest);
   const commonStepsParams = {
     coreEntryFileName: path.basename(libMainFile),
-    outDirRoot: outputDirRoot,
+    outputDirRoot,
     outDirBin: outputDirBin,
     isJsr,
     libName,
@@ -326,7 +319,10 @@ async function library_buildDistributionTarget(params) {
     unifiedBundlerOutExt,
     distJsrOutFilesExt,
     deleteFiles: isJsr,
-    libDirName
+    libDirName,
+    npmOutputDirRoot: npmOutDir || (options.npm ? options.npm.npmOutDir : void 0),
+    jsrOutputDirRoot: jsrOutDir || (options.jsr ? options.jsr.jsrOutDir : void 0),
+    effectivePubRegistry: options.effectivePubRegistry
   };
   await library_performCommonBuildSteps(commonStepsParams);
   relinka("log", `${logPrefix} Completed build target processing.`);
@@ -551,7 +547,7 @@ async function library_bundleUsingUnified(entryPoint, outDirBin, builder, source
 async function library_performCommonBuildSteps(params) {
   const {
     coreEntryFileName,
-    outDirRoot,
+    outputDirRoot,
     outDirBin,
     isJsr,
     libName,
@@ -561,20 +557,29 @@ async function library_performCommonBuildSteps(params) {
     unifiedBundlerOutExt,
     distJsrOutFilesExt,
     deleteFiles = false,
-    libDirName
+    libDirName,
+    npmOutputDirRoot,
+    jsrOutputDirRoot,
+    effectivePubRegistry
   } = params;
   const targetType = isJsr ? "JSR" : "NPM";
   const logPrefix = `[Common:${targetType}:${libName}]`;
-  relinka("verbose", `${logPrefix} Performing common steps in ${outDirRoot}`);
-  await library_createPackageJSON(
-    libName,
-    outDirRoot,
-    isJsr,
-    libsList,
-    rmDepsMode,
-    rmDepsPatterns,
-    unifiedBundlerOutExt
+  relinka(
+    "verbose",
+    `${logPrefix} Performing common steps in ${outputDirRoot}`
   );
+  if (npmOutputDirRoot || jsrOutputDirRoot) {
+    await library_createPackageJSON(
+      libName,
+      npmOutputDirRoot || outputDirRoot,
+      jsrOutputDirRoot || outputDirRoot,
+      effectivePubRegistry,
+      libsList,
+      rmDepsMode,
+      rmDepsPatterns,
+      unifiedBundlerOutExt
+    );
+  }
   relinka("verbose", `${logPrefix} Created package.json.`);
   if (deleteFiles) {
     await deleteSpecificFiles(outDirBin);
@@ -583,10 +588,10 @@ async function library_performCommonBuildSteps(params) {
       `${logPrefix} Deleted specific files from ${outDirBin}.`
     );
   }
-  await copyRootFile(outDirRoot, FILES_TO_COPY_ROOT);
+  await copyRootFile(outputDirRoot, FILES_TO_COPY_ROOT);
   relinka(
     "verbose",
-    `${logPrefix} Copied root files (${FILES_TO_COPY_ROOT.join(", ")}) to ${outDirRoot}`
+    `${logPrefix} Copied root files (${FILES_TO_COPY_ROOT.join(", ")}) to ${outputDirRoot}`
   );
   const stripSegments = libDirName ? [`libs/${libDirName}`] : [];
   relinka(

package/bin/libs/sdk/sdk-impl/library-flow.d.ts

@@ -3,9 +3,9 @@ import type { PerfTimer } from "./utils/utils-perf.js";
 /**
  * Processes libraries based on build mode.
  */
-export declare function processLibraryFlow(timer: PerfTimer, isDev: boolean, libsActMode: string, libsList: Record<string, LibConfig>, distJsrDryRun: boolean, distJsrFailOnWarn: boolean, libsDirDist: string, libsDirSrc: string, commonPubPause: boolean, commonPubRegistry: string, unifiedBundlerOutExt: NpmOutExt, distNpmBuilder: BundlerName, coreEntrySrcDir: string, rmDepsMode: ExcludeMode, rmDepsPatterns: string[], transpileEsbuild: Esbuild, transpileTarget: transpileTarget, transpileFormat: transpileFormat, transpileSplitting: boolean, transpileSourcemap: Sourcemap, transpilePublicPath: string, distJsrBuilder: BundlerName, transpileStub: boolean, transpileWatch: boolean, distJsrOutFilesExt: NpmOutExt): Promise<void>;
+export declare function processLibraryFlow(timer: PerfTimer, isDev: boolean, libsActMode: string, libsList: Record<string, LibConfig>, distJsrDryRun: boolean, distJsrFailOnWarn: boolean, libsDirDist: string, libsDirSrc: string, commonPubPause: boolean, commonPubRegistry: "jsr" | "npm" | "npm-jsr", unifiedBundlerOutExt: NpmOutExt, distNpmBuilder: BundlerName, coreEntrySrcDir: string, rmDepsMode: ExcludeMode, rmDepsPatterns: string[], transpileEsbuild: Esbuild, transpileTarget: transpileTarget, transpileFormat: transpileFormat, transpileSplitting: boolean, transpileSourcemap: Sourcemap, transpilePublicPath: string, distJsrBuilder: BundlerName, transpileStub: boolean, transpileWatch: boolean, distJsrOutFilesExt: NpmOutExt): Promise<void>;
 /**
  * Processes all libs defined in config.libsList.
  * Builds and optionally publishes each library based on configuration.
  */
-export declare function libraries_buildPublish(isDev: boolean, timer: PerfTimer, libsList: Record<string, LibConfig>, distJsrDryRun: boolean, distJsrFailOnWarn: boolean, libsDirDist: string, libsDirSrc: string, commonPubPause: boolean, commonPubRegistry: string, unifiedBundlerOutExt: NpmOutExt, distNpmBuilder: BundlerName, coreEntrySrcDir: string, rmDepsMode: ExcludeMode, rmDepsPatterns: string[], transpileEsbuild: Esbuild, transpileTarget: transpileTarget, transpileFormat: transpileFormat, transpileSplitting: boolean, transpileSourcemap: Sourcemap, transpilePublicPath: string, distJsrBuilder: BundlerName, transpileStub: boolean, transpileWatch: boolean, distJsrOutFilesExt: NpmOutExt): Promise<void>;
+export declare function libraries_buildPublish(isDev: boolean, timer: PerfTimer, libsList: Record<string, LibConfig>, distJsrDryRun: boolean, distJsrFailOnWarn: boolean, libsDirDist: string, libsDirSrc: string, commonPubPause: boolean, commonPubRegistry: "jsr" | "npm" | "npm-jsr", unifiedBundlerOutExt: NpmOutExt, distNpmBuilder: BundlerName, coreEntrySrcDir: string, rmDepsMode: ExcludeMode, rmDepsPatterns: string[], transpileEsbuild: Esbuild, transpileTarget: transpileTarget, transpileFormat: transpileFormat, transpileSplitting: boolean, transpileSourcemap: Sourcemap, transpilePublicPath: string, distJsrBuilder: BundlerName, transpileStub: boolean, transpileWatch: boolean, distJsrOutFilesExt: NpmOutExt): Promise<void>;

package/bin/libs/sdk/sdk-impl/library-flow.js

@@ -89,7 +89,7 @@ export async function libraries_buildPublish(isDev, timer, libsList, distJsrDryR
         );
         const libTranspileMinify = libConfig?.libTranspileMinify === true;
         await library_buildLibrary({
-          commonPubRegistry,
+          effectivePubRegistry: libConfig.libPubRegistry || commonPubRegistry,
           libName,
           mainDir: libMainDir,
           npm: {
@@ -120,8 +120,9 @@ export async function libraries_buildPublish(isDev, timer, libsList, distJsrDryR
           transpileWatch
         });
         if (!commonPubPause && !libConfig.libPubPause) {
+          const effectivePubRegistry = libConfig.libPubRegistry || commonPubRegistry;
           await library_publishLibrary(
-            commonPubRegistry,
+            effectivePubRegistry,
             libName,
             npmOutDir,
             jsrOutDir,

package/bin/libs/sdk/sdk-impl/pub/pub-library.d.ts

@@ -2,4 +2,4 @@ import { type PerfTimer } from "../utils/utils-perf.js";
 /**
  * Publishes a library to the specified commonPubRegistry.
  */
-export declare function library_publishLibrary(commonPubRegistry: string | undefined, libName: string, npmOutDir: string, jsrOutDir: string, distJsrDryRun: boolean, distJsrFailOnWarn: boolean, distJsrAllowDirty: boolean, distJsrSlowTypes: boolean, isDev: boolean, timer: PerfTimer): Promise<void>;
+export declare function library_publishLibrary(effectivePubRegistry: "jsr" | "npm" | "npm-jsr" | undefined, libName: string, npmOutDir: string, jsrOutDir: string, distJsrDryRun: boolean, distJsrFailOnWarn: boolean, distJsrAllowDirty: boolean, distJsrSlowTypes: boolean, isDev: boolean, timer: PerfTimer): Promise<void>;

package/bin/libs/sdk/sdk-impl/pub/pub-library.js

@@ -7,8 +7,8 @@ import {
   pausePerfTimer,
   resumePerfTimer
 } from "../utils/utils-perf.js";
-export async function library_publishLibrary(commonPubRegistry, libName, npmOutDir, jsrOutDir, distJsrDryRun, distJsrFailOnWarn, distJsrAllowDirty, distJsrSlowTypes, isDev, timer) {
-  switch (commonPubRegistry) {
+export async function library_publishLibrary(effectivePubRegistry, libName, npmOutDir, jsrOutDir, distJsrDryRun, distJsrFailOnWarn, distJsrAllowDirty, distJsrSlowTypes, isDev, timer) {
+  switch (effectivePubRegistry) {
     case "jsr":
       relinka("log", `Publishing lib ${libName} to JSR only...`);
       await library_pubToJsr(
@@ -61,7 +61,7 @@ export async function library_publishLibrary(commonPubRegistry, libName, npmOutD
     default:
       relinka(
         "log",
-        `Registry "${commonPubRegistry}" not recognized for lib ${libName}. Skipping publishing for this lib.`
+        `Registry "${effectivePubRegistry}" not recognized for lib ${libName}. Skipping publishing for this lib.`
       );
   }
 }

package/bin/libs/sdk/sdk-impl/utils/utils-pkg-json-libs.d.ts

@@ -2,4 +2,4 @@ import type { ExcludeMode, LibConfig, NpmOutExt } from "../../sdk-types.js";
 /**
  * Creates a package.json for a lib distribution.
  */
-export declare function library_createPackageJSON(libName: string, outDirRoot: string, isJsr: boolean, libsList: Record<string, LibConfig>, rmDepsMode: ExcludeMode, rmDepsPatterns: string[], unifiedBundlerOutExt: NpmOutExt): Promise<void>;
+export declare function library_createPackageJSON(libName: string, npmOutDirRoot: string, jsrOutDirRoot: string, effectivePubRegistry: "jsr" | "npm" | "npm-jsr" | undefined, libsList: Record<string, LibConfig>, rmDepsMode: ExcludeMode, rmDepsPatterns: string[], unifiedBundlerOutExt: NpmOutExt): Promise<void>;

package/bin/libs/sdk/sdk-impl/utils/utils-pkg-json-libs.js

@@ -6,10 +6,10 @@ import {
   readPackageJSON
 } from "pkg-types";
 import { filterDeps } from "./utils-deps.js";
-export async function library_createPackageJSON(libName, outDirRoot, isJsr, libsList, rmDepsMode, rmDepsPatterns, unifiedBundlerOutExt) {
+export async function library_createPackageJSON(libName, npmOutDirRoot, jsrOutDirRoot, effectivePubRegistry, libsList, rmDepsMode, rmDepsPatterns, unifiedBundlerOutExt) {
   relinka(
     "verbose",
-    `Generating package.json for lib ${libName} (isJsr=${isJsr})...`
+    `Generating package.json for lib ${libName} (registry: ${effectivePubRegistry})...`
   );
   if (!libsList) {
     throw new Error("libsList is empty or not provided");
@@ -55,32 +55,64 @@ export async function library_createPackageJSON(libName, outDirRoot, isJsr, libs
   } else if (keywords && keywords.length > 0 && !commonPkg.keywords) {
     commonPkg.keywords = keywords;
   }
-  const outDirBin = path.join(outDirRoot, "bin");
-  if (isJsr) {
-    relinka("verbose", `Creating JSR package.json for lib ${libName}...`);
-    await library_writeJsrPackageJSON(
-      libName,
-      outDirBin,
-      outDirRoot,
-      originalPkg,
-      commonPkg,
-      libsList,
-      rmDepsMode,
-      rmDepsPatterns
-    );
-  } else {
-    relinka("verbose", `Creating NPM package.json for lib ${libName}...`);
-    await library_writeNpmLibPackageJSON(
-      libName,
-      outDirBin,
-      outDirRoot,
-      originalPkg,
-      commonPkg,
-      libsList,
-      rmDepsMode,
-      rmDepsPatterns,
-      unifiedBundlerOutExt
-    );
+  switch (effectivePubRegistry) {
+    case "jsr":
+      relinka("verbose", `Creating JSR package.json for lib ${libName}...`);
+      await library_writeJsrPackageJSON(
+        libName,
+        jsrOutDirRoot,
+        jsrOutDirRoot,
+        originalPkg,
+        commonPkg,
+        libsList,
+        rmDepsMode,
+        rmDepsPatterns
+      );
+      break;
+    case "npm":
+      relinka("verbose", `Creating NPM package.json for lib ${libName}...`);
+      await library_writeNpmLibPackageJSON(
+        libName,
+        npmOutDirRoot,
+        npmOutDirRoot,
+        originalPkg,
+        commonPkg,
+        libsList,
+        rmDepsMode,
+        rmDepsPatterns,
+        unifiedBundlerOutExt
+      );
+      break;
+    case "npm-jsr":
+      relinka("verbose", `Creating JSR package.json for lib ${libName}...`);
+      await library_writeJsrPackageJSON(
+        libName,
+        jsrOutDirRoot,
+        jsrOutDirRoot,
+        originalPkg,
+        commonPkg,
+        libsList,
+        rmDepsMode,
+        rmDepsPatterns
+      );
+      relinka("verbose", `Creating NPM package.json for lib ${libName}...`);
+      await library_writeNpmLibPackageJSON(
+        libName,
+        npmOutDirRoot,
+        npmOutDirRoot,
+        originalPkg,
+        commonPkg,
+        libsList,
+        rmDepsMode,
+        rmDepsPatterns,
+        unifiedBundlerOutExt
+      );
+      break;
+    default:
+      relinka(
+        "warn",
+        `Unknown registry "${effectivePubRegistry}" for lib ${libName}. Skipping package.json generation.`
+      );
   }
   relinka("verbose", `Completed creation of package.json for lib: ${libName}`);
 }
@@ -157,7 +189,7 @@ async function library_getlibPkgKeepDeps(libName, originalDeps, outDirBin, isJsr
   );
   return result;
 }
-async function library_writeJsrPackageJSON(libName, outDirBin, outDirRoot, originalPkg, commonPkg, libsList, rmDepsMode, rmDepsPatterns) {
+async function library_writeJsrPackageJSON(libName, outDirBin, pkgJsonDir, originalPkg, commonPkg, libsList, rmDepsMode, rmDepsPatterns) {
   relinka("verbose", `Writing package.json for JSR lib: ${libName}`);
   if (!libsList) {
     throw new Error("libsList is empty or not provided");
@@ -208,12 +240,12 @@ async function library_writeJsrPackageJSON(libName, outDirBin, outDirRoot, origi
       ".": "./bin/mod.ts"
     }
   });
-  await fs.writeJSON(path.join(outDirRoot, "package.json"), jsrPkg, {
-    spaces: 2
-  });
+  const pkgPath = path.join(pkgJsonDir, "package.json");
+  await fs.ensureDir(path.dirname(pkgPath));
+  await fs.writeJson(pkgPath, jsrPkg, { spaces: 2 });
   relinka("verbose", `Completed writing package.json for JSR lib: ${libName}`);
 }
-async function library_writeNpmLibPackageJSON(libName, outDirBin, outDirRoot, originalPkg, commonPkg, libsList, rmDepsMode, rmDepsPatterns, unifiedBundlerOutExt) {
+async function library_writeNpmLibPackageJSON(libName, outDirBin, pkgJsonDir, originalPkg, commonPkg, libsList, rmDepsMode, rmDepsPatterns, unifiedBundlerOutExt) {
   relinka("verbose", `Writing package.json for NPM lib: ${libName}`);
   if (!libsList) {
     throw new Error("libsList is empty or not provided");
@@ -252,8 +284,8 @@ async function library_writeNpmLibPackageJSON(libName, outDirBin, outDirRoot, or
     module: `./bin/mod.${unifiedBundlerOutExt}`,
     publishConfig: { access: "public" }
   });
-  await fs.writeJSON(path.join(outDirRoot, "package.json"), npmPkg, {
-    spaces: 2
-  });
+  const pkgPath = path.join(pkgJsonDir, "package.json");
+  await fs.ensureDir(path.dirname(pkgPath));
+  await fs.writeJson(pkgPath, npmPkg, { spaces: 2 });
   relinka("verbose", `Completed writing package.json for NPM lib: ${libName}`);
 }

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

@@ -442,6 +442,12 @@ export type LibConfig = {
      * @default false
      */
     libPubPause?: boolean;
+    /**
+     * The registry to publish the library to.
+     *
+     * @default "npm"
+     */
+    libPubRegistry?: "jsr" | "npm" | "npm-jsr";
 };
 export type NpmOutExt = "cjs" | "cts" | "js" | "mjs" | "mts" | "ts";
 /**

package/bin/types.d.ts

@@ -442,6 +442,12 @@ export type LibConfig = {
      * @default false
      */
     libPubPause?: boolean;
+    /**
+     * The registry to publish the library to.
+     *
+     * @default "npm"
+     */
+    libPubRegistry?: "jsr" | "npm" | "npm-jsr";
 };
 export type NpmOutExt = "cjs" | "cts" | "js" | "mjs" | "mts" | "ts";
 /**

package/package.json

@@ -42,7 +42,7 @@
   "license": "MIT",
   "name": "@reliverse/dler",
   "type": "module",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "keywords": [
     "reliverse",
     "cli",