@mostajs/orm-cli 0.5.9 → 0.5.11

package/bin/mostajs.sh

@@ -1921,13 +1921,57 @@ action_rep_scaffold_services() {
     fi
   fi
 
+  # Write env vars to .mostajs/config.env (monitor port, replicator interval)
+  echo
+  echo -e "${CYAN}▶ writing config to .mostajs/config.env${RESET}"
+  local config_env="$PROJECT_ROOT/.mostajs/config.env"
+  mkdir -p "$PROJECT_ROOT/.mostajs"
+
+  # Ask for monitor port
+  local mon_port
+  mon_port=$(ask "Monitor dashboard port" "4477")
+
+  # Ask for replicator sync interval
+  local rep_interval
+  rep_interval=$(ask "Replicator sync interval (ms)" "30000")
+
+  # Write/update config.env — preserve existing values, update only ours
+  touch "$config_env"
+  PROJECT="$PROJECT_ROOT" MON_PORT="$mon_port" REP_INT="$rep_interval" node --input-type=module -e "
+    const fs = await import('node:fs');
+    const path = process.env.PROJECT + '/.mostajs/config.env';
+    let content = '';
+    try { content = fs.readFileSync(path, 'utf8'); } catch {}
+
+    const set = (key, val) => {
+      const re = new RegExp('^' + key + '=.*$', 'm');
+      if (re.test(content)) {
+        content = content.replace(re, key + '=' + val);
+        console.log('  • updated ' + key + '=' + val);
+      } else {
+        content += (content && !content.endsWith('\n') ? '\n' : '') + key + '=' + val + '\n';
+        console.log('  ✓ added ' + key + '=' + val);
+      }
+    };
+
+    set('MONITOR_PORT', process.env.MON_PORT);
+    set('MONITOR_HOST', '127.0.0.1');
+    set('REPLICATOR_INTERVAL_MS', process.env.REP_INT);
+
+    fs.writeFileSync(path, content);
+  " 2>&1 | sed 's/^/  /'
+
   echo
   echo -e "${BOLD}${GREEN}✓ Scaffold complete.${RESET}"
   echo
+  echo -e "  ${BOLD}Config written to :${RESET} .mostajs/config.env"
+  echo -e "    MONITOR_PORT=${mon_port}  REPLICATOR_INTERVAL_MS=${rep_interval}"
+  echo
   echo -e "  ${BOLD}Next steps :${RESET}"
   echo -e "    1. ${CYAN}mostajs${RESET} → menu r → add replicas + CDC rules (writes replicator-tree.json)"
   echo -e "    2. ${CYAN}npm run dev:all${RESET}   — starts Next + replicator + monitor in parallel"
   echo -e "       or individually : ${CYAN}npm run replicator${RESET} / ${CYAN}npm run monitor${RESET}"
+  echo -e "    3. Open ${CYAN}http://localhost:${mon_port}${RESET} for the live dashboard"
   echo -e "    3. Open ${CYAN}http://localhost:14499${RESET} for the live dashboard"
   pause
 }
@@ -2071,10 +2115,24 @@ action_rep_promote() {
   project=$(_pick_project)
   name=$(ask    "Slave to promote" "slave-1")
   if ! confirm "Promote '$name' to master on project '$project'?"; then return; fi
-  _replicator_run "
-    await rm.promoteToMaster('$project', '$name');
-    await save();
-    console.log('  ✓ $name is now the master of $project');
+  # Direct tree patch — loadFromFile doesn't reconnect replicas, so the
+  # ReplicationManager in-memory approach fails with "no replicas". Promote
+  # is just a role swap in the JSON — no DB connection needed.
+  _tree_patch "
+    const reps = tree.replicas['$project'];
+    if (!reps) { console.log('  ✗ project \"$project\" not found'); return; }
+    if (!reps['$name']) { console.log('  ✗ replica \"$name\" not found in $project'); return; }
+    if (reps['$name'].role === 'master') { console.log('  • $name is already master'); return; }
+    // Demote current master(s) to slave
+    for (const [n, cfg] of Object.entries(reps)) {
+      if (cfg.role === 'master') {
+        cfg.role = 'slave';
+        console.log('  ↓ ' + n + ' demoted to slave');
+      }
+    }
+    // Promote target to master
+    reps['$name'].role = 'master';
+    console.log('  ★ $name promoted to master');
   "
   pause
 }
@@ -2115,29 +2173,14 @@ action_rep_add_rule() {
   target=$(ask   "Target project" "$src_default")
   mode=$(ask     "Mode (snapshot | cdc | bidirectional)" "cdc")
   echo
-  dim "  Collections : '*' = all tables in entities.json (full-DB replication)"
-  dim "                or explicit comma-separated list (User,Member,Payment)"
+  dim "  Collections : '*' = all tables of the master DB — resolved LIVE at"
+  dim "                each sync tick from the master's table catalogue"
+  dim "                (so new tables added later are picked up automatically)."
+  dim "                Or : explicit comma-separated list (User,Member,Payment)"
   colls=$(ask "Collections" "*")
   conflict=$(ask "Conflict resolution (source-wins | target-wins | timestamp)" "source-wins")
-
-  # Expand '*' into the full list of entity NAMES from entities.json. Keeps
-  # the tree self-contained — no special-case needed in replicator.mjs.
   if [[ "$colls" == "*" ]]; then
-    local ents_json="$GENERATED_DIR/entities.json"
-    if [[ -f "$ents_json" ]]; then
-      colls=$(node -e "try{const e=JSON.parse(require('fs').readFileSync('$ents_json','utf8'));console.log(e.map(x=>x.name).join(','))}catch{console.log('')}" 2>/dev/null)
-      if [[ -z "$colls" ]]; then
-        warn "  entities.json empty or unreadable — keeping '*' as wildcard placeholder"
-        colls="*"
-      else
-        local count; count=$(echo "$colls" | tr ',' '\n' | wc -l)
-        ok "  expanded '*' → ${count} tables from entities.json"
-        dim "     ${colls}"
-      fi
-    else
-      warn "  no entities.json found at $ents_json — keeping '*' as wildcard placeholder"
-      warn "     (run menu 1 'Convert' first, then re-add the rule to expand)"
-    fi
+    dim "  → '*' stored as-is ; replicator.mjs will introspect the master DB at run-time."
   fi
 
   _tree_patch "

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mostajs/orm-cli",
-  "version": "0.5.9",
+  "version": "0.5.11",
   "description": "Universal CLI to integrate @mostajs/orm into any project — one-shot `mostajs bootstrap` migrates a Prisma project (codemod + deps + schema convert + DDL) to 13 databases with zero code change.",
   "author": "Dr Hamid MADANI <drmdh@msn.com>",
   "license": "AGPL-3.0-or-later",