@gadmin2n/cli 0.0.116 → 0.0.118

package/actions/update.action.js

@@ -302,15 +302,43 @@ function detectInstallCommand(dir) {
     }
     return { cmd: 'npm install', manager: 'npm' };
 }
+/**
+ * Detect whether `package.json` content contains unresolved 3-way merge
+ * conflict markers. When present, the file is not valid JSON and we cannot
+ * meaningfully compare its deps — the user must resolve the conflicts before
+ * running an installer.
+ */
+function hasConflictMarkers(content) {
+    return content.includes('<<<<<<<') || content.includes('>>>>>>>');
+}
+/**
+ * Surface dependency changes to the user as a manual checklist. We
+ * intentionally do NOT run the installer ourselves anymore: after a 3-way
+ * merge, `package.json` may carry conflict markers and not be valid JSON,
+ * which would cause `yarn install` to fail mid-flight and leave the project
+ * in a half-broken state. Instead we print exactly which directories need
+ * attention and which command to run there.
+ *
+ * Three buckets per snapshot:
+ *   1. Conflict markers present  → resolve first, then install
+ *   2. Deps actually changed     → run install
+ *   3. Bytes changed but deps unchanged (e.g. scripts/formatting only)
+ *                                 → no install needed, just FYI
+ */
 function maybeInstallChangedDeps(snapshots, dryRun) {
     return __awaiter(this, void 0, void 0, function* () {
         const changed = [];
         const skippedNoDepChange = [];
+        const conflictMarkers = [];
         for (const snap of snapshots) {
             const pkgPath = path.join(snap.dir, 'package.json');
             if (!fs.existsSync(pkgPath))
                 continue;
             const after = fs.readFileSync(pkgPath, 'utf-8');
+            if (hasConflictMarkers(after)) {
+                conflictMarkers.push(snap);
+                continue;
+            }
             if (depsChanged(snap.before, after)) {
                 changed.push(snap);
             }
@@ -319,29 +347,34 @@ function maybeInstallChangedDeps(snapshots, dryRun) {
                 skippedNoDepChange.push(snap.label);
             }
         }
-        if (changed.length === 0 && skippedNoDepChange.length === 0)
+        if (changed.length === 0 &&
+            skippedNoDepChange.length === 0 &&
+            conflictMarkers.length === 0) {
             return;
+        }
         console.info(chalk.bold('\n═══════════════════════════════════════════════════'));
-        console.info(chalk.bold('  Install dependencies for changed package.json'));
+        console.info(chalk.bold('  Dependency changes — manual action required'));
         console.info(chalk.bold('═══════════════════════════════════════════════════\n'));
-        for (const label of skippedNoDepChange) {
-            console.info(`   ${chalk.cyan(label + '/')} package.json changed but deps unchanged — ${chalk.gray('skip install')}`);
+        if (dryRun) {
+            console.info(chalk.gray('(dry-run — nothing was actually written; the listing below is informational only)\n'));
         }
+        // 1. Files with unresolved conflict markers — highest priority.
+        for (const snap of conflictMarkers) {
+            const { cmd } = detectInstallCommand(snap.dir);
+            console.info(`   ${chalk.red(snap.label + '/')} package.json has unresolved 3-way merge markers (<<<<<<<). ` +
+                `Resolve them first, then run ${chalk.bold(cmd)} in this directory.`);
+        }
+        // 2. Deps actually changed — recommend install command.
         for (const snap of changed) {
             const { cmd, manager } = detectInstallCommand(snap.dir);
-            console.info(`   ${chalk.cyan(snap.label + '/')} deps changed — using ${chalk.bold(manager)}: ${chalk.gray(cmd)}`);
-            if (dryRun) {
-                console.info(chalk.gray(`   (dry-run: skip running)\n`));
-                continue;
-            }
-            try {
-                (0, child_process_1.execSync)(cmd, { cwd: snap.dir, stdio: 'inherit' });
-                console.info(chalk.green(`   ✓ ${snap.label}/ install done\n`));
-            }
-            catch (err) {
-                console.warn(chalk.yellow(`   ⚠️  ${snap.label}/ install failed: ${(err === null || err === void 0 ? void 0 : err.message) || err}\n`));
-            }
+            console.info(`   ${chalk.yellow(snap.label + '/')} dependencies changed → run ${chalk.bold(cmd)} ` +
+                chalk.gray(`(${manager} detected)`));
         }
+        // 3. Bytes changed but deps unchanged — purely informational.
+        for (const label of skippedNoDepChange) {
+            console.info(`   ${chalk.cyan(label + '/')} package.json changed but dependencies are identical — ${chalk.gray('no install needed')}`);
+        }
+        console.info();
     });
 }
 function assertGitAvailable() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gadmin2n/cli",
-  "version": "0.0.116",
+  "version": "0.0.118",
   "description": "Gadmin - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"
@@ -47,7 +47,7 @@
     "@angular-devkit/core": "13.3.2",
     "@angular-devkit/schematics": "13.3.2",
     "@angular-devkit/schematics-cli": "13.3.2",
-    "@gadmin2n/schematics": "^0.0.91",
+    "@gadmin2n/schematics": "^0.0.92",
     "abc": "^0.6.1",
     "chalk": "3.0.0",
     "chokidar": "3.5.3",