@gadmin2n/cli 0.0.109 → 0.0.111

package/actions/update.action.js

@@ -17,6 +17,7 @@ const path = require("path");
 const inquirer = require("inquirer");
 const child_process_1 = require("child_process");
 const abstract_action_1 = require("./abstract.action");
+const self_update_action_1 = require("./self-update.action");
 const version_check_1 = require("../lib/version-check");
 const merge3way_1 = require("../lib/template-merge/merge3way");
 const binary_detect_1 = require("../lib/template-merge/binary-detect");
@@ -48,11 +49,19 @@ function formatMaterializeError(schematicsVersion, err) {
 /* ------------------------------------------------------------------ *
  * Template config / path resolution
  * ------------------------------------------------------------------ */
-function resolveTemplatePath(templateName) {
-    let schematicsRoot;
+/**
+ * Locate the @gadmin2n/schematics install root, searching:
+ *   1. the instance project dir
+ *   2. the instance project's server/ subdir (where deps usually live)
+ *   3. the CLI's own node_modules (covers globally installed CLI where
+ *      schematics ships alongside @gadmin2n/cli but is NOT installed in
+ *      the user's project)
+ * Throws a helpful error if none of these resolve.
+ */
+function findSchematicsRoot(instanceDir = process.cwd()) {
     const searchPaths = [
-        process.cwd(),
-        path.join(process.cwd(), 'server'),
+        instanceDir,
+        path.join(instanceDir, 'server'),
         path.resolve(__dirname, '..'),
     ];
     for (const searchPath of searchPaths) {
@@ -60,17 +69,18 @@ function resolveTemplatePath(templateName) {
             const pkgPath = require.resolve('@gadmin2n/schematics/package.json', {
                 paths: [searchPath],
             });
-            schematicsRoot = path.dirname(pkgPath);
-            break;
+            return path.dirname(pkgPath);
         }
         catch (_a) {
             // continue
         }
     }
-    if (!schematicsRoot) {
-        throw new Error('Cannot resolve @gadmin2n/schematics package. ' +
-            'Make sure it is installed.');
-    }
+    throw new Error('Cannot resolve @gadmin2n/schematics package. ' +
+        'Make sure it is installed globally (alongside @gadmin2n/cli) ' +
+        'or as a dependency of the project.');
+}
+function resolveTemplatePath(templateName) {
+    const schematicsRoot = findSchematicsRoot();
     const nameVariants = [templateName];
     if (templateName.startsWith('gadmin2n-')) {
         nameVariants.push(templateName.replace('gadmin2n-', 'gadmin2-'));
@@ -664,7 +674,7 @@ function unifiedDiffSimple(a, b) {
  * ------------------------------------------------------------------ */
 class UpdateAction extends abstract_action_1.AbstractAction {
     handle(inputs, options) {
-        var _a, _b;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const subcommand = (_a = inputs.find((i) => i.name === 'subcommand')) === null || _a === void 0 ? void 0 : _a.value;
             if (subcommand && subcommand !== 'update' && subcommand !== 'diff' && subcommand !== 'status') {
@@ -687,14 +697,47 @@ class UpdateAction extends abstract_action_1.AbstractAction {
             // hard 1.5s timeout, never blocks. Prints a yellow banner if outdated.
             const versionCheckEnabled = ((_b = options.find((o) => o.name === 'version-check')) === null || _b === void 0 ? void 0 : _b.value) !==
                 false;
+            const autoYes = !!((_c = options.find((o) => o.name === 'yes')) === null || _c === void 0 ? void 0 : _c.value);
             if (versionCheckEnabled) {
                 try {
                     const info = yield (0, version_check_1.checkVersion)(1500);
                     if (info && (0, version_check_1.compareVersions)(info.installed, info.latest) < 0) {
                         (0, version_check_1.printOutdatedWarning)(info);
+                        // For the main `gadmin2 update` (no subcommand), prompt the user to
+                        // run `gadmin2 self-update` first. The current process is still on
+                        // the old CLI binary, so silently continuing risks running the old
+                        // pipeline against fresh templates. We therefore force a choice:
+                        //   - run self-update now → upgrade then exit, ask user to re-run.
+                        //   - cancel             → exit without doing anything.
+                        // In --yes / non-interactive mode, we keep the legacy behaviour:
+                        // the warning is printed and the update proceeds. `diff` and
+                        // `status` subcommands are read-only and skip this prompt entirely.
+                        const isMainUpdate = !subcommand || subcommand === 'update';
+                        if (isMainUpdate && !autoYes) {
+                            const { proceedSelfUpdate } = yield inquirer.prompt([
+                                {
+                                    type: 'confirm',
+                                    name: 'proceedSelfUpdate',
+                                    message: 'A newer gadmin2 CLI version is available. ' +
+                                        'Run `gadmin2 self-update` first before updating the project?',
+                                    default: true,
+                                },
+                            ]);
+                            if (proceedSelfUpdate) {
+                                const selfUpdate = new self_update_action_1.SelfUpdateAction();
+                                yield selfUpdate.handle([], []);
+                                console.info(chalk.cyan('\n→ Self-update finished. Please re-run `gadmin2 update` so the new CLI binary drives the merge.\n'));
+                                process.exit(0);
+                            }
+                            else {
+                                console.info(chalk.gray('\nCancelled — exiting without running update. ' +
+                                    'Re-run when you are ready (or pass `--no-version-check` / `--yes` to bypass this prompt).\n'));
+                                process.exit(0);
+                            }
+                        }
                     }
                 }
-                catch (_c) {
+                catch (_d) {
                     // never let the version check break update
                 }
             }
@@ -912,7 +955,8 @@ class UpdateAction extends abstract_action_1.AbstractAction {
                         snapshotPackageJson(path.join(instanceDir, 'web'), 'web'),
                         snapshotPackageJson(path.join(instanceDir, 'server'), 'server'),
                     ];
-                    const schematicsPkg = require(require.resolve('@gadmin2n/schematics/package.json', { paths: [instanceDir, path.join(instanceDir, 'server')] }));
+                    const schematicsRoot = findSchematicsRoot(instanceDir);
+                    const schematicsPkg = require(path.join(schematicsRoot, 'package.json'));
                     const schematicsVersion = schematicsPkg.version || '0.0.0';
                     // First-time bootstrap: meta absent → write meta + README, exit.
                     if (!fs.existsSync((0, base_store_1.metaPath)(instanceDir))) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gadmin2n/cli",
-  "version": "0.0.109",
+  "version": "0.0.111",
   "description": "Gadmin - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"