@jsenv/monorepo 0.1.10 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/monorepo",
-  "version": "0.1.10",
+  "version": "0.2.1",
   "description": "Helpers to manage packages in a monorepo",
   "license": "MIT",
   "repository": {
@@ -26,9 +26,9 @@
     "/src/"
   ],
   "dependencies": {
-    "@jsenv/urls": "2.5.2",
-    "@jsenv/filesystem": "4.10.11",
-    "@jsenv/package-publish": "1.11.9",
+    "@jsenv/urls": "2.5.3",
+    "@jsenv/filesystem": "4.10.12",
+    "@jsenv/package-publish": "1.11.10",
     "@jsenv/humanize": "1.2.8",
     "semver": "7.6.3"
   }

package/src/internal/should_update_version.js

@@ -0,0 +1,21 @@
+export const shouldUpdateVersion = (version) => {
+  if (!version) {
+    return false;
+  }
+  if (
+    version.startsWith("./") ||
+    version.startsWith("../") ||
+    version.startsWith("file:")
+  ) {
+    return false;
+  }
+  if (version.startsWith("workspace:")) {
+    return false;
+  }
+  // "*" means package accept anything
+  // so there is no need to update it, it's always matching the latest version
+  if (version === "*") {
+    return false;
+  }
+  return true;
+};

package/src/sync_packages_versions.js

@@ -10,8 +10,10 @@ import {
 } from "./internal/dependency_graph.js";
 import { fetchWorkspaceLatests } from "./internal/fetch_workspace_latests.js";
 import { increaseVersion } from "./internal/increase_version.js";
+import { shouldUpdateVersion } from "./internal/should_update_version.js";
 
 export const syncPackagesVersions = async ({
+  logs = true,
   directoryUrl,
   packagesRelations = {},
 }) => {
@@ -88,13 +90,7 @@ Use a tool like "git diff" to see the new versions and ensure this is what you w
     const packageDeps =
       workspacePackages[packageName].packageObject[dependencyType];
     const version = packageDeps[dependencyName];
-    // ignore local deps
-    if (
-      version.startsWith("./") ||
-      version.startsWith("../") ||
-      version.startsWith("file:") ||
-      version.startsWith("workspace:")
-    ) {
+    if (!shouldUpdateVersion(version)) {
       return;
     }
     dependencyUpdates.push({
@@ -210,13 +206,17 @@ Use a tool like "git diff" to see the new versions and ensure this is what you w
     workspacePackage.updateFile(workspacePackage.packageObject);
   });
   const updateCount = versionUpdates.length + dependencyUpdates.length;
-  if (updateCount === 0) {
-    console.log(`${UNICODE.OK} all versions in package.json files are in sync`);
-  } else {
-    console.log(
-      `${UNICODE.INFO} ${updateCount} versions modified in package.json files
+  if (logs) {
+    if (updateCount === 0) {
+      console.log(
+        `${UNICODE.OK} all versions in package.json files are in sync`,
+      );
+    } else {
+      console.log(
+        `${UNICODE.INFO} ${updateCount} versions modified in package.json files
   Use a tool like "git diff" to review these changes`,
-    );
+      );
+    }
   }
 
   return {

package/src/upgrade_external_versions.js

@@ -16,8 +16,14 @@ import {
   compareTwoPackageVersions,
   VERSION_COMPARE_RESULTS,
 } from "./internal/compare_two_package_versions.js";
+import { increaseVersion } from "./internal/increase_version.js";
+import { shouldUpdateVersion } from "./internal/should_update_version.js";
+import { syncPackagesVersions } from "./sync_packages_versions.js";
 
-export const upgradeExternalVersions = async ({ directoryUrl }) => {
+export const upgradeExternalVersions = async ({
+  directoryUrl,
+  packagesRelations = {},
+}) => {
   const internalPackages = await collectWorkspacePackages({ directoryUrl });
   const internalPackageNames = Object.keys(internalPackages);
   let externalPackages = {};
@@ -28,20 +34,7 @@ export const upgradeExternalVersions = async ({ directoryUrl }) => {
       type,
       version,
     }) => {
-      // ignore local deps
-      if (
-        version.startsWith("./") ||
-        version.startsWith("../") ||
-        version.startsWith("file:")
-      ) {
-        return;
-      }
-      // "*" means package accept anything
-      // so there is no need to update it, it's always matching the latest version
-      if (version === "*") {
-        return;
-      }
-      if (version.startsWith("workspace:")) {
+      if (!shouldUpdateVersion(version)) {
         return;
       }
       const existing = externalPackages[name];
@@ -123,14 +116,15 @@ export const upgradeExternalVersions = async ({ directoryUrl }) => {
 
   const packageFilesToUpdate = {};
   const updates = [];
+  let someInternalUpdate = false;
   for (const externalPackageName of externalPackageNames) {
     const externalPackageRefs = externalPackages[externalPackageName];
     for (const externalPackageRef of externalPackageRefs) {
       const internalPackageName = externalPackageRef.internalPackageName;
+      const internalPackageObject =
+        internalPackages[internalPackageName].packageObject;
       const internalPackageDeps =
-        internalPackages[internalPackageName].packageObject[
-          externalPackageRef.type
-        ];
+        internalPackageObject[externalPackageRef.type];
       const versionDeclared = internalPackageDeps[externalPackageName];
       const registryLatestVersion = latestVersions[externalPackageName];
       if (registryLatestVersion === null) {
@@ -153,6 +147,15 @@ export const upgradeExternalVersions = async ({ directoryUrl }) => {
           from: versionDeclared,
           to: registryLatestVersion,
         });
+        if (
+          externalPackageRef.type === "dependencies" &&
+          shouldUpdateVersion(internalPackageObject.version)
+        ) {
+          someInternalUpdate = true;
+          internalPackageObject.version = increaseVersion(
+            internalPackageObject.version,
+          );
+        }
         internalPackageDeps[externalPackageName] = registryLatestVersion;
         packageFilesToUpdate[internalPackageName] = true;
       }
@@ -172,5 +175,13 @@ export const upgradeExternalVersions = async ({ directoryUrl }) => {
 Use a tool like "git diff" to review these changes then run "npm install"`,
     );
   }
+
+  if (someInternalUpdate) {
+    await syncPackagesVersions({
+      logs: false,
+      directoryUrl,
+      packagesRelations,
+    });
+  }
   return updates;
 };