@jsenv/package-publish 1.8.0 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/package-publish",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "Publish package to one or many registry.",
   "license": "MIT",
   "author": {
@@ -31,14 +31,12 @@
     "/src/"
   ],
   "scripts": {
-    "test": "node --experimental-json-modules ./scripts/test.mjs",
-    "test-with-coverage": "npm run test -- --coverage",
-    "prettier": "prettier --write ."
+    "test": "node --experimental-json-modules ./scripts/test.mjs"
   },
   "dependencies": {
-    "@jsenv/fetch": "1.1.2",
+    "@jsenv/fetch": "1.1.3",
     "@jsenv/filesystem": "4.1.0",
-    "@jsenv/log": "2.0.1",
+    "@jsenv/log": "3.0.0",
     "semver": "7.3.7"
   }
 }

package/src/internal/publish.js

@@ -1,6 +1,7 @@
 import { fileURLToPath } from "node:url"
+import { readFileSync, writeFileSync } from "node:fs"
 import { exec } from "node:child_process"
-import { readFile, writeFile, removeEntry } from "@jsenv/filesystem"
+import { removeEntry } from "@jsenv/filesystem"
 import { UNICODE } from "@jsenv/log"
 
 import { setNpmConfig } from "./setNpmConfig.js"
@@ -15,51 +16,54 @@ export const publish = async ({
 }) => {
   const getResult = async () => {
     try {
-      const promises = []
+      // process.env.NODE_AUTH_TOKEN
       const previousValue = process.env.NODE_AUTH_TOKEN
       const restoreProcessEnv = () => {
         process.env.NODE_AUTH_TOKEN = previousValue
       }
       process.env.NODE_AUTH_TOKEN = token
+      // updating package.json to publish on the correct registry
+      let restorePackageFile = () => {}
       const rootPackageFileUrl = new URL("./package.json", rootDirectoryUrl)
-        .href
-      const rootPackageString = await readFile(rootPackageFileUrl)
-      const restorePackageFile = () =>
-        writeFile(rootPackageFileUrl, rootPackageString)
-      const packageObject = JSON.parse(rootPackageString)
-      packageObject.publishConfig = packageObject.publishConfig || {}
-      packageObject.publishConfig.registry = registryUrl
-      promises.push(
-        writeFile(
+      const rootPackageFileContent = readFileSync(rootPackageFileUrl)
+      const packageObject = JSON.parse(String(rootPackageFileContent))
+      const { publishConfig } = packageObject
+      const registerUrlFromPackage = publishConfig
+        ? publishConfig.registry || "https://registry.npmjs.org"
+        : "https://registry.npmjs.org"
+      if (registryUrl !== registerUrlFromPackage) {
+        restorePackageFile = () =>
+          writeFileSync(rootPackageFileUrl, rootPackageFileContent)
+        packageObject.publishConfig = packageObject.publishConfig || {}
+        packageObject.publishConfig.registry = registryUrl
+        writeFileSync(
           rootPackageFileUrl,
           JSON.stringify(packageObject, null, "  "),
-        ),
-      )
-      const npmConfigFileUrl = new URL("./.npmrc", rootDirectoryUrl).href
+        )
+      }
+      // updating .npmrc to add the token
+      const npmConfigFileUrl = new URL("./.npmrc", rootDirectoryUrl)
       let restoreNpmConfigFile
-      let projectNpmConfigString
+      let npmConfigFileContent
       try {
-        projectNpmConfigString = await readFile(npmConfigFileUrl)
+        npmConfigFileContent = String(readFileSync(npmConfigFileUrl))
         restoreNpmConfigFile = () =>
-          writeFile(npmConfigFileUrl, projectNpmConfigString)
+          writeFileSync(npmConfigFileUrl, npmConfigFileContent)
       } catch (e) {
         if (e.code === "ENOENT") {
           restoreNpmConfigFile = () => removeEntry(npmConfigFileUrl)
-          projectNpmConfigString = ""
+          npmConfigFileContent = ""
         } else {
           throw e
         }
       }
-      promises.push(
-        writeFile(
-          npmConfigFileUrl,
-          setNpmConfig(projectNpmConfigString, {
-            [computeRegistryTokenKey(registryUrl)]: token,
-            [computeRegistryKey(packageObject.name)]: registryUrl,
-          }),
-        ),
+      writeFileSync(
+        npmConfigFileUrl,
+        setNpmConfig(npmConfigFileContent, {
+          [computeRegistryTokenKey(registryUrl)]: token,
+          [computeRegistryKey(packageObject.name)]: registryUrl,
+        }),
       )
-      await Promise.all(promises)
       try {
         return await new Promise((resolve, reject) => {
           const command = exec(
@@ -136,11 +140,9 @@ export const publish = async ({
           }
         })
       } finally {
-        await Promise.all([
-          restoreProcessEnv(),
-          restorePackageFile(),
-          restoreNpmConfigFile(),
-        ])
+        restoreProcessEnv()
+        restorePackageFile()
+        restoreNpmConfigFile()
       }
     } catch (e) {
       return {

package/src/internal/readProjectPackage.js

@@ -1,20 +1,20 @@
 import { fileURLToPath } from "node:url"
-import { readFile } from "@jsenv/filesystem"
+import { readFileSync } from "node:fs"
 
-export const readProjectPackage = async ({ rootDirectoryUrl }) => {
-  const packageFileUrl = new URL("./package.json", rootDirectoryUrl).href
-  let packageObject
+export const readProjectPackage = ({ rootDirectoryUrl }) => {
+  const packageFileUrlObject = new URL("./package.json", rootDirectoryUrl)
+  let packageInProject
   try {
-    const packageString = await readFile(packageFileUrl, { as: "string" })
+    const packageString = String(readFileSync(packageFileUrlObject))
     try {
-      packageObject = JSON.parse(packageString)
+      packageInProject = JSON.parse(packageString)
     } catch (e) {
       if (e.name === "SyntaxError") {
         throw new Error(`syntax error while parsing project package.json
 --- syntax error stack ---
 ${e.stack}
 --- package.json path ---
-${fileURLToPath(packageFileUrl)}`)
+${fileURLToPath(packageFileUrlObject)}`)
       }
       throw e
     }
@@ -23,10 +23,10 @@ ${fileURLToPath(packageFileUrl)}`)
       throw new Error(
         `cannot find project package.json
 --- package.json path ---
-${fileURLToPath(packageFileUrl)}`,
+${fileURLToPath(packageFileUrlObject)}`,
       )
     }
     throw e
   }
-  return packageObject
+  return packageInProject
 }

package/src/publishPackage.js

@@ -32,9 +32,7 @@ export const publishPackage = async ({
   assertRegistriesConfig(registriesConfig)
 
   logger.debug(`reading project package.json`)
-  const packageInProject = await readProjectPackage({
-    rootDirectoryUrl,
-  })
+  const packageInProject = readProjectPackage({ rootDirectoryUrl })
 
   const { name: packageName, version: packageVersion } = packageInProject
   logger.info(`${packageName}@${packageVersion} found in package.json`)