@yaonyan/jsr2npm 0.1.7 → 0.1.9

package/bin/jsr2npm.mjs

@@ -21,12 +21,13 @@ import $ from "dax-sh";
 import { chmod, mkdir as mkdir2, readFile as readFile3, rename, rm, stat as stat3, writeFile as writeFile2 } from "node:fs/promises";
 import { join as join3 } from "node:path";
 import { mkdirSync } from "node:fs";
+import process3 from "node:process";
 
 // __yao__jsr2npm_latest/node_modules/@yao/jsr2npm/bundler.js
 import { copyFile, mkdir, readdir, stat } from "node:fs/promises";
 import { join } from "node:path";
 import { build } from "esbuild";
-async function bundleWithEsbuild(packageDir, inputFile, outputFile, externalPackages = []) {
+async function bundleWithEsbuild(packageDir, inputFile, outputFile, externalPackages = [], useBrowserPlatform = false) {
   const entryPath = join(process.cwd(), packageDir, inputFile);
   const outputPath = join(process.cwd(), packageDir, "dist", outputFile);
   const outputDir = outputPath.split("/").slice(0, -1).join("/");
@@ -35,21 +36,24 @@ async function bundleWithEsbuild(packageDir, inputFile, outputFile, externalPack
   });
   const externalList = externalPackages.length > 0 ? externalPackages.join(", ") : "none";
   console.log(`  \u{1F4E6} External packages: ${externalList}`);
+  const platform = useBrowserPlatform ? "neutral" : "node";
+  const banner = useBrowserPlatform ? {} : {
+    js: `#!/usr/bin/env node
+import { createRequire } from 'node:module';
+const require = createRequire(import.meta.url);`
+  };
+  console.log(`  \u{1F527} Platform: ${platform}${useBrowserPlatform ? " (browser)" : ""}`);
   await build({
     entryPoints: [
       entryPath
     ],
     bundle: true,
-    platform: "node",
+    platform,
     format: "esm",
     outfile: outputPath,
     external: externalPackages,
     packages: "bundle",
-    banner: {
-      js: `#!/usr/bin/env node
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);`
-    },
+    banner,
     write: true
   });
 }
@@ -287,24 +291,27 @@ async function copyExtraFiles(sourceDir, targetDir) {
 }
 
 // __yao__jsr2npm_latest/node_modules/@yao/jsr2npm/converter.js
-async function convertPackage(packageName, version, bin, overrides) {
+async function convertPackage(packageName, version, bin, overrides, browser) {
   console.log(`
 \u{1F4E6} Package: ${packageName}`);
   console.log(`\u{1F3F7}\uFE0F  Version: ${version}`);
   if (bin) {
     console.log(`\u{1F527} CLI Commands: ${Object.keys(bin).join(", ")}`);
   }
+  if (browser) {
+    console.log(`\u{1F310} Browser mode: enabled`);
+  }
   const workspaceDir = createWorkspace(packageName, version);
-  const originalCwd = process.cwd();
+  const originalCwd = process3.cwd();
   try {
-    process.chdir(workspaceDir);
+    process3.chdir(workspaceDir);
     await installJSRPackage(packageName, version);
     const packageDir = join3("node_modules", packageName);
     await mkdir2(join3(packageDir, "dist"), {
       recursive: true
     });
-    const { externals, allDependencies } = await getExternalPackages(packageDir);
-    await bundlePackage(packageDir, bin, externals);
+    const { externals, allDependencies } = await getExternalPackages(packageDir, overrides);
+    await bundlePackage(packageDir, bin, externals, browser);
     await copyTypeDeclarations(packageDir);
     await copyExtraFiles(packageDir, `${packageDir}/dist`);
     await generatePackageJson(packageDir, bin, overrides, allDependencies);
@@ -312,7 +319,7 @@ async function convertPackage(packageName, version, bin, overrides) {
     console.log("\n\u2705 Conversion completed!");
     console.log(`\u{1F4C2} Output: ${workspaceDir}/dist`);
   } finally {
-    process.chdir(originalCwd);
+    process3.chdir(originalCwd);
   }
 }
 function createWorkspace(packageName, version) {
@@ -323,26 +330,38 @@ function createWorkspace(packageName, version) {
   console.log(`\u{1F4C1} Created folder: ${folderName}`);
   return folderName;
 }
-async function getExternalPackages(packageDir) {
+async function getExternalPackages(packageDir, overrides) {
   try {
     const content = await readFile3(join3(packageDir, "package.json"), "utf-8");
     const pkgJson = JSON.parse(content);
-    if (!pkgJson.dependencies) return {
-      externals: [],
-      allDependencies: {}
-    };
+    const userDependencies = overrides?.dependencies || {};
+    if (!pkgJson.dependencies && Object.keys(userDependencies).length === 0) {
+      return {
+        externals: [],
+        allDependencies: {}
+      };
+    }
     const topLevelDeps = {};
-    for (const [name, version] of Object.entries(pkgJson.dependencies)) {
-      if (!name.startsWith("@jsr/")) {
-        topLevelDeps[name] = String(version);
+    if (pkgJson.dependencies) {
+      for (const [name, version] of Object.entries(pkgJson.dependencies)) {
+        if (!name.startsWith("@jsr/")) {
+          topLevelDeps[name] = String(version);
+        }
       }
     }
-    const jsrPackages = Object.keys(pkgJson.dependencies).filter((name) => name.startsWith("@jsr/"));
+    for (const [name, version] of Object.entries(userDependencies)) {
+      topLevelDeps[name] = version;
+    }
+    const jsrPackages = pkgJson.dependencies ? Object.keys(pkgJson.dependencies).filter((name) => name.startsWith("@jsr/")) : [];
     const conflictingPackages = await findConflictingPackages(packageDir, jsrPackages, topLevelDeps);
     const externals = Object.keys(topLevelDeps).filter((name) => !conflictingPackages.has(name));
     const externalList = externals.join(", ") || "none";
     console.log(`
 \u{1F4E6} External dependencies (${externals.length}): ${externalList}`);
+    if (Object.keys(userDependencies).length > 0) {
+      const userDepsList = Object.keys(userDependencies).join(", ");
+      console.log(`\u{1F4DD} User-configured dependencies: ${userDepsList}`);
+    }
     if (conflictingPackages.size > 0) {
       const conflictList = Array.from(conflictingPackages).join(", ");
       console.log(`\u26A0\uFE0F  Version conflicts, will bundle: ${conflictList}`);
@@ -388,32 +407,32 @@ async function findConflictingPackages(packageDir, jsrPackages, topLevelDeps) {
   }
   return conflicts;
 }
-async function bundlePackage(packageDir, bin, externalPackages) {
+async function bundlePackage(packageDir, bin, externalPackages, browser) {
   if (bin) {
-    await bundleBinCommands(packageDir, bin, externalPackages);
+    await bundleBinCommands(packageDir, bin, externalPackages, browser);
   } else {
-    await bundleLibraryExports(packageDir, externalPackages);
+    await bundleLibraryExports(packageDir, externalPackages, browser);
   }
 }
-async function bundleBinCommands(packageDir, bin, externalPackages) {
+async function bundleBinCommands(packageDir, bin, externalPackages, browser) {
   console.log("\n\u{1F528} Bundling CLI tools...");
   for (const [cmdName, inputFile] of Object.entries(bin)) {
     await verifyEntrypoint(packageDir, inputFile);
     const outputFile = `bin/${cmdName}.mjs`;
-    await bundleWithEsbuild(packageDir, inputFile, outputFile, externalPackages);
+    await bundleWithEsbuild(packageDir, inputFile, outputFile, externalPackages, browser || false);
     const outputPath = join3(packageDir, "dist", outputFile);
     await chmod(outputPath, 493);
     console.log(`  \u2705 Created ${cmdName}: ${outputFile}`);
   }
 }
-async function bundleLibraryExports(packageDir, externalPackages) {
+async function bundleLibraryExports(packageDir, externalPackages, browser) {
   const exports = await readDenoJsonExports(packageDir);
   if (!exports) return;
   console.log("\n\u{1F528} Bundling library exports...");
   for (const [exportKey, inputFile] of Object.entries(exports)) {
     await verifyEntrypoint(packageDir, inputFile);
     const outputFile = exportKey === "." ? "index.mjs" : `${exportKey.replace(/^\.\//, "")}.mjs`;
-    await bundleWithEsbuild(packageDir, inputFile, outputFile, externalPackages);
+    await bundleWithEsbuild(packageDir, inputFile, outputFile, externalPackages, browser || false);
     console.log(`  \u2705 Bundled ${exportKey}: ${outputFile}`);
   }
 }
@@ -421,7 +440,7 @@ async function installJSRPackage(packageName, version) {
   await writeFile2("package.json", "{}");
   const packageSpec = version === "latest" ? packageName : `${packageName}@${version}`;
   console.log(`\u{1F504} Installing: ${packageSpec}`);
-  await $`npx jsr add ${packageSpec}`.cwd(process.cwd());
+  await $`npx jsr add ${packageSpec}`.cwd(process3.cwd());
 }
 async function verifyEntrypoint(packageDir, entrypoint) {
   try {
@@ -456,7 +475,7 @@ async function readDenoJsonExports(packageDir) {
 }
 async function moveDistToRoot(packageDir) {
   const sourceDist = join3(packageDir, "dist");
-  const targetDist = join3(process.cwd(), "dist");
+  const targetDist = join3(process3.cwd(), "dist");
   try {
     await rm(targetDist, {
       recursive: true
@@ -506,7 +525,8 @@ ${"=".repeat(60)}`);
         pkg.name,
         pkg.version,
         pkg.bin,
-        pkg.packageJson
+        pkg.packageJson,
+        pkg.browser
       );
     } catch (error) {
       console.error(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yaonyan/jsr2npm",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "homepage": "https://jsr.io/@yao/jsr2npm",
   "type": "module",
   "dependencies": {