@mostajs/orm-cli 0.4.0 → 0.4.1

package/bin/mostajs.sh

@@ -2460,22 +2460,42 @@ run_subcommand() {
       ;;
     bootstrap|b)
       # mostajs bootstrap : the full zero-touch migration for a Prisma project.
-      #   1. Run the codemod on the whole tree  (install-bridge --apply)
-      #   2. npm install @mostajs/orm @mostajs/orm-bridge server-only
+      #   1. Rewrite every `new PrismaClient(...)` site (install-bridge --apply)
+      #   2. npm install @mostajs/orm @mostajs/orm-bridge @mostajs/orm-adapter server-only
       #   3. Convert prisma/schema.prisma → entities.json
       #   4. Write .mostajs/config.env + init SQLite DDL
-      #   5. Tell the user what remains (.env, seeds, run dev).
+      #
+      # Hard stop-on-error : no step proceeds if the previous one failed.
       local cli_dir
       cli_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
       detect_project
       [[ ${#DETECTED_TYPES[@]} -eq 0 ]] && { err "No schema found. Bootstrap needs a prisma/schema.prisma (or OpenAPI/JSONSchema)."; exit 1; }
 
+      local BS_OK_CODEMOD=0 BS_OK_DEPS=0 BS_OK_CONVERT=0 BS_OK_DDL=0
+
+      # ─── Step 1 ───
       echo -e "\n\e[1m▶ Step 1/4 : rewrite PrismaClient sites\e[0m"
-      node "$cli_dir/bin/install-bridge.mjs" --apply || { err "Codemod failed"; exit 1; }
+      if node "$cli_dir/bin/install-bridge.mjs" --apply; then
+        BS_OK_CODEMOD=1
+      else
+        err "Step 1 failed — codemod returned non-zero. Aborting."; exit 1
+      fi
 
-      echo -e "\n\e[1m▶ Step 2/4 : install runtime deps\e[0m"
-      ( cd "$PROJECT_ROOT" && $PKG_MANAGER install @mostajs/orm @mostajs/orm-bridge server-only --legacy-peer-deps 2>&1 | tail -3 )
+      # ─── Step 2 ───
+      echo -e "\n\e[1m▶ Step 2/4 : install runtime deps (this can take 1-2 min)\e[0m"
+      info "  installing : @mostajs/orm @mostajs/orm-bridge @mostajs/orm-adapter server-only"
+      if ( cd "$PROJECT_ROOT" && $PKG_MANAGER install \
+             @mostajs/orm @mostajs/orm-bridge @mostajs/orm-adapter server-only \
+             --legacy-peer-deps ); then
+        BS_OK_DEPS=1
+        ok "  deps installed"
+      else
+        err "Step 2 failed — \`$PKG_MANAGER install\` returned non-zero."
+        err "Fix your package manager / registry access and re-run \`mostajs bootstrap\`."
+        exit 1
+      fi
 
+      # ─── Step 3 ───
       echo -e "\n\e[1m▶ Step 3/4 : convert schema + init DDL\e[0m"
       local type="${DETECTED_TYPES[0]}" input
       case "$type" in
@@ -2483,7 +2503,16 @@ run_subcommand() {
         openapi)    input="$OPENAPI_FILE" ;;
         jsonschema) input="${JSON_SCHEMAS[0]}" ;;
       esac
-      run_adapter_convert "$type" "$input" "$GENERATED_DIR/entities.ts"
+
+      if run_adapter_convert "$type" "$input" "$GENERATED_DIR/entities.ts" && \
+         [[ -s "$GENERATED_DIR/entities.json" || -s "$GENERATED_DIR/entities.ts" ]]; then
+        BS_OK_CONVERT=1
+        ok "  schema converted → $GENERATED_DIR/entities.json"
+      else
+        err "Step 3.1 failed — schema conversion did not produce entities.json."
+        err "Re-run manually : $CLI_NAME convert   (or menu 1)"
+        exit 1
+      fi
 
       mkdir -p "$CONFIG_DIR"
       if [[ ! -f "$CONFIG_DIR/config.env" ]]; then
@@ -2493,25 +2522,42 @@ SGBD_URI=./data.sqlite
 DB_SCHEMA_STRATEGY=update
 CFG
         ok "  wrote $CONFIG_DIR/config.env (defaults: sqlite ./data.sqlite)"
+        # Reload config so action_init_dialects picks up the new values
+        load_env
       fi
-      action_init_dialects || warn "DDL init returned non-zero — inspect and retry with menu 3"
 
+      if action_init_dialects; then
+        BS_OK_DDL=1
+        ok "  DDL applied"
+      else
+        err "Step 3.2 failed — DDL init returned non-zero."
+        err "Re-run manually : $CLI_NAME   (menu 3)"
+        exit 1
+      fi
+
+      # ─── Step 4 ───
       echo -e "\n\e[1m▶ Step 4/4 : done\e[0m"
-      cat <<DONE
+      if (( BS_OK_CODEMOD && BS_OK_DEPS && BS_OK_CONVERT && BS_OK_DDL )); then
+        cat <<DONE
 
   ✓ Bridge installed in-place.  Original files backed up as *.prisma.bak
   ✓ Schema converted :   $GENERATED_DIR/entities.json
-  ✓ SQLite DDL applied : $PROJECT_ROOT/data.sqlite
+  ✓ DDL applied        (DB_DIALECT=\$(grep ^DB_DIALECT $CONFIG_DIR/config.env | cut -d= -f2))
 
   Next :
     - Add seeds to $CONFIG_DIR/seeds/*.json   (one file per entity)
     - $CLI_NAME             # menu S → h (hash) → 4 (apply)
     - npm run dev
+    - Open http://localhost:3000/login
 
   To undo the codemod :
     $CLI_NAME install-bridge --restore --apply
 
 DONE
+      else
+        err "Bootstrap finished with partial success — see messages above."
+        exit 1
+      fi
       ;;
     version|-v|--version)
       echo "$CLI_NAME $VERSION"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mostajs/orm-cli",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "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",