@yaonyan/jsr2npm 0.1.6 → 0.1.7

package/bin/jsr2npm.mjs

@@ -2,7 +2,7 @@
 import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);
 
-// node_modules/@yao/jsr2npm/config.js
+// __yao__jsr2npm_latest/node_modules/@yao/jsr2npm/config.js
 import { readFile } from "node:fs/promises";
 import { resolve } from "node:path";
 import process2 from "node:process";
@@ -16,17 +16,17 @@ async function loadConfig(configPath) {
   }
 }
 
-// node_modules/@yao/jsr2npm/converter.js
+// __yao__jsr2npm_latest/node_modules/@yao/jsr2npm/converter.js
 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";
 
-// node_modules/@yao/jsr2npm/bundler.js
+// __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 = []) {
-  const { build } = await import("esbuild");
   const entryPath = join(process.cwd(), packageDir, inputFile);
   const outputPath = join(process.cwd(), packageDir, "dist", outputFile);
   const outputDir = outputPath.split("/").slice(0, -1).join("/");
@@ -98,14 +98,14 @@ async function copyDirectory(source, target) {
   }
 }
 
-// node_modules/@yao/jsr2npm/package-generator.js
+// __yao__jsr2npm_latest/node_modules/@yao/jsr2npm/package-generator.js
 import { copyFile as copyFile2, readFile as readFile2, stat as stat2, writeFile } from "node:fs/promises";
 import { join as join2 } from "node:path";
-async function generatePackageJson(packageDir, bin, overrides) {
+async function generatePackageJson(packageDir, bin, overrides, allDependencies) {
   console.log("\n\u{1F4CB} Generating package.json...");
   const jsrPkg = await readPackageJson(`${packageDir}/package.json`);
   const denoJson = await readDenoJson(packageDir);
-  const dependencies = getNpmDependencies(jsrPkg.dependencies);
+  const dependencies = allDependencies || getNpmDependencies(jsrPkg.dependencies);
   const newPkg = buildPackageJson(jsrPkg, denoJson, dependencies, bin, overrides);
   await writeFile(join2(packageDir, "dist", "package.json"), JSON.stringify(newPkg, null, 2));
   console.log(`\u2705 Generated package.json with ${Object.keys(dependencies).length} dependencies`);
@@ -286,7 +286,7 @@ async function copyExtraFiles(sourceDir, targetDir) {
   }
 }
 
-// node_modules/@yao/jsr2npm/converter.js
+// __yao__jsr2npm_latest/node_modules/@yao/jsr2npm/converter.js
 async function convertPackage(packageName, version, bin, overrides) {
   console.log(`
 \u{1F4E6} Package: ${packageName}`);
@@ -303,11 +303,11 @@ async function convertPackage(packageName, version, bin, overrides) {
     await mkdir2(join3(packageDir, "dist"), {
       recursive: true
     });
-    const externalPackages = await getExternalPackages(packageDir);
-    await bundlePackage(packageDir, bin, externalPackages);
+    const { externals, allDependencies } = await getExternalPackages(packageDir);
+    await bundlePackage(packageDir, bin, externals);
     await copyTypeDeclarations(packageDir);
     await copyExtraFiles(packageDir, `${packageDir}/dist`);
-    await generatePackageJson(packageDir, bin, overrides);
+    await generatePackageJson(packageDir, bin, overrides, allDependencies);
     await moveDistToRoot(packageDir);
     console.log("\n\u2705 Conversion completed!");
     console.log(`\u{1F4C2} Output: ${workspaceDir}/dist`);
@@ -327,7 +327,10 @@ async function getExternalPackages(packageDir) {
   try {
     const content = await readFile3(join3(packageDir, "package.json"), "utf-8");
     const pkgJson = JSON.parse(content);
-    if (!pkgJson.dependencies) return [];
+    if (!pkgJson.dependencies) return {
+      externals: [],
+      allDependencies: {}
+    };
     const topLevelDeps = {};
     for (const [name, version] of Object.entries(pkgJson.dependencies)) {
       if (!name.startsWith("@jsr/")) {
@@ -344,16 +347,25 @@ async function getExternalPackages(packageDir) {
       const conflictList = Array.from(conflictingPackages).join(", ");
       console.log(`\u26A0\uFE0F  Version conflicts, will bundle: ${conflictList}`);
     }
-    return externals;
+    return {
+      externals,
+      allDependencies: topLevelDeps
+    };
   } catch {
-    return [];
+    return {
+      externals: [],
+      allDependencies: {}
+    };
   }
 }
 async function findConflictingPackages(packageDir, jsrPackages, topLevelDeps) {
   const conflicts = /* @__PURE__ */ new Set();
+  const parts = packageDir.split(/[\/\\]/);
+  const nodeModulesIndex = parts.indexOf("node_modules");
+  const rootNodeModules = parts.slice(0, nodeModulesIndex + 1).join("/");
   for (const jsrPkg of jsrPackages) {
     try {
-      const jsrPkgPath = join3(packageDir, "node_modules", jsrPkg, "package.json");
+      const jsrPkgPath = join3(rootNodeModules, jsrPkg, "package.json");
       const jsrContent = await readFile3(jsrPkgPath, "utf-8");
       const jsrPkgJson = JSON.parse(jsrContent);
       if (!jsrPkgJson.dependencies) continue;
@@ -366,6 +378,8 @@ async function findConflictingPackages(packageDir, jsrPackages, topLevelDeps) {
             console.log(`      Top-level: ${topLevelDeps[depName]}`);
             console.log(`      ${jsrPkg}: ${depVersion}`);
           }
+        } else {
+          topLevelDeps[depName] = String(depVersion);
         }
       }
     } catch {
@@ -453,7 +467,7 @@ async function moveDistToRoot(packageDir) {
   await copyExtraFiles(packageDir, targetDist);
 }
 
-// node_modules/@yao/jsr2npm/cli.ts
+// __yao__jsr2npm_latest/node_modules/@yao/jsr2npm/cli.ts
 async function main() {
   console.log("\u{1F680} JSR to NPM Package Converter\n");
   const configFile = process.argv[2] || "jsr2npm.config.json";

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@yaonyan/jsr2npm",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "homepage": "https://jsr.io/@yao/jsr2npm",
   "type": "module",
   "dependencies": {
     "dax-sh": "^0.43.2",
-    "esbuild": "0.25.5"
+    "esbuild": "^0.25.10"
   },
   "exports": {
     "./bin/jsr2npm": "./bin/jsr2npm.mjs",