@mostajs/orm-cli 0.2.0 → 0.2.2

package/bin/mostajs.sh

@@ -260,30 +260,31 @@ run_adapter_convert() {
 
   # Ensure @mostajs/orm-adapter is available — auto-install if missing
   info "Checking @mostajs/orm-adapter..."
-  local adapter_path=""
+  local adapter_base=""
 
   # 1. Try local project install
-  if [[ -f "$PROJECT_ROOT/node_modules/@mostajs/orm-adapter/dist/index.js" ]]; then
-    adapter_path="$PROJECT_ROOT/node_modules/@mostajs/orm-adapter/dist/index.js"
+  if [[ -d "$PROJECT_ROOT/node_modules/@mostajs/orm-adapter/dist" ]]; then
+    adapter_base="$PROJECT_ROOT/node_modules/@mostajs/orm-adapter/dist"
     ok "Using local install"
   else
     # 2. Try sibling (dev setup)
     local cli_dir
     cli_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-    if [[ -f "$cli_dir/../mosta-orm-adapter/dist/index.js" ]]; then
-      adapter_path="$cli_dir/../mosta-orm-adapter/dist/index.js"
+    if [[ -d "$cli_dir/../mosta-orm-adapter/dist" ]]; then
+      adapter_base="$cli_dir/../mosta-orm-adapter/dist"
       info "Using sibling dev install"
     else
       # 3. Offer auto-install
       warn "Not installed locally"
       if ensure_pkg "@mostajs/orm-adapter" "@mostajs/orm"; then
-        adapter_path="$PROJECT_ROOT/node_modules/@mostajs/orm-adapter/dist/index.js"
-        if [[ ! -f "$adapter_path" ]]; then
-          # Try via require.resolve
-          adapter_path=$(resolve_pkg_path "@mostajs/orm-adapter") || {
+        adapter_base="$PROJECT_ROOT/node_modules/@mostajs/orm-adapter/dist"
+        if [[ ! -d "$adapter_base" ]]; then
+          local resolved
+          resolved=$(resolve_pkg_path "@mostajs/orm-adapter") || {
             err "Install reported success but module cannot be resolved."
             return 1
           }
+          adapter_base="$(dirname "$resolved")"
         fi
         ok "Installed"
       else
@@ -293,23 +294,39 @@ run_adapter_convert() {
     fi
   fi
 
+  # Use subpath-specific import to avoid loading ALL adapters (and their
+  # transitive deps : ajv, ref-parser, openapi-parser...). For example,
+  # importing only prisma.adapter.js avoids pulling in ajv-draft-04 issues
+  # when the project only needs Prisma conversion.
+  local adapter_file
   local adapter_class
   case "$input_type" in
-    prisma)     adapter_class="PrismaAdapter" ;;
-    openapi)    adapter_class="OpenApiAdapter" ;;
-    jsonschema) adapter_class="JsonSchemaAdapter" ;;
+    prisma)     adapter_file="$adapter_base/adapters/prisma.adapter.js"     ; adapter_class="PrismaAdapter" ;;
+    openapi)    adapter_file="$adapter_base/adapters/openapi.adapter.js"    ; adapter_class="OpenApiAdapter" ;;
+    jsonschema) adapter_file="$adapter_base/adapters/jsonschema.adapter.js" ; adapter_class="JsonSchemaAdapter" ;;
     *) err "Unknown input type: $input_type"; return 1 ;;
   esac
 
+  if [[ ! -f "$adapter_file" ]]; then
+    warn "Subpath import $adapter_file not found — falling back to root index.js"
+    adapter_file="$adapter_base/index.js"
+  fi
+
   cat > "$CONFIG_DIR/convert.mjs" << EOF
 import { readFileSync, writeFileSync } from 'fs';
 
 let adapterModule;
 try {
-  adapterModule = await import('$adapter_path');
+  adapterModule = await import('$adapter_file');
 } catch (e) {
-  console.error('Failed to import adapter from $adapter_path');
+  console.error('Failed to import adapter from $adapter_file');
   console.error('Reason :', e.message);
+  // Common issue : ajv/ref-parser/yaml resolution problems
+  if (e.message?.includes('ajv') || e.message?.includes('ref-parser') || e.message?.includes('yaml')) {
+    console.error();
+    console.error('Hint : this adapter requires peer deps that may be missing.');
+    console.error('Try : $PKG_MANAGER install ajv@^8 @apidevtools/json-schema-ref-parser@^11');
+  }
   process.exit(2);
 }
 const { $adapter_class } = adapterModule;
@@ -1127,9 +1144,79 @@ svc_start_dev() {
 }
 
 svc_start_mostanet() {
-  warn "mosta-net server not yet installed. Provision with :"
-  dim "  $PKG_MANAGER install @mostajs/net"
-  dim "  then run : npx mosta-net --entities .mostajs/generated/entities.ts"
+  load_env
+  cd "$PROJECT_ROOT" || return
+
+  if [[ ! -f "$GENERATED_DIR/entities.json" ]]; then
+    err "No entities.json — run menu 1 (Convert) first"
+    return
+  fi
+
+  # Ensure @mostajs/net AND its peer deps are installed
+  info "Checking @mostajs/net + peer dependencies..."
+  if ! ensure_pkg "@mostajs/net" "@mostajs/orm" "@mostajs/mproject" "@mostajs/replicator"; then
+    err "Cannot start mosta-net server without these packages."
+    return
+  fi
+
+  # Make our entities available to mostajs-net via schemas.json
+  # (mostajs-net's server.js looks for ./schemas.json in CWD)
+  if [[ ! -L schemas.json && ! -f schemas.json ]]; then
+    ln -sf "$GENERATED_DIR/entities.json" "$PROJECT_ROOT/schemas.json" 2>/dev/null \
+      || cp "$GENERATED_DIR/entities.json" "$PROJECT_ROOT/schemas.json"
+    ok "Linked schemas.json → $GENERATED_DIR/entities.json"
+  fi
+
+  # Derive port from MOSTA_NET_URL
+  local mosta_port=14488
+  if [[ "${MOSTA_NET_URL:-}" =~ :([0-9]+) ]]; then
+    mosta_port="${BASH_REMATCH[1]}"
+  fi
+
+  # Prepare env for the child process
+  # - DB vars : DB_DIALECT, SGBD_URI, DB_SCHEMA_STRATEGY, ...
+  # - MOSTA_NET_PORT : derived from MOSTA_NET_URL
+  # - MOSTA_NET_<transport>_ENABLED=true
+  local transport="${MOSTA_NET_TRANSPORT:-rest}"
+  local tr_upper="$(echo "$transport" | tr '[:lower:]' '[:upper:]')"
+
+  info "Launching mostajs-net serve (port $mosta_port, transport $transport)"
+  info "Logs → $LOG_DIR/mostanet.log"
+
+  local launcher
+  if [[ -x "$PROJECT_ROOT/node_modules/.bin/mostajs-net" ]]; then
+    launcher="$PROJECT_ROOT/node_modules/.bin/mostajs-net"
+  else
+    launcher="npx mostajs-net"
+  fi
+
+  # Launch detached with all env vars
+  (
+    export DB_DIALECT="${DB_DIALECT:-sqlite}"
+    export SGBD_URI="${SGBD_URI:-./data.sqlite}"
+    export DB_SCHEMA_STRATEGY="${DB_SCHEMA_STRATEGY:-update}"
+    export DB_POOL_SIZE="${DB_POOL_SIZE:-20}"
+    export DB_SHOW_SQL="${DB_SHOW_SQL:-false}"
+    export MOSTA_NET_PORT="$mosta_port"
+    export "MOSTA_NET_${tr_upper}_ENABLED"="true"
+    # Also enable MCP alongside — commonly wanted for AI integrations
+    [[ "$tr_upper" != "MCP" && "${MOSTA_NET_ALSO_MCP:-true}" == "true" ]] && export MOSTA_NET_MCP_ENABLED=true
+    nohup $launcher serve >> "$LOG_DIR/mostanet.log" 2>&1 &
+    echo "$!" > "$LOG_DIR/mostanet.pid"
+  )
+  local pid
+  pid=$(cat "$LOG_DIR/mostanet.pid" 2>/dev/null || echo "?")
+  ok "Started (PID $pid)"
+  echo
+  info "Endpoints (wait 2-3 seconds then hit them) :"
+  dim "  REST CRUD : http://localhost:${mosta_port}/api/v1/<collection>"
+  dim "              (collection = snake_case plural, e.g. /api/v1/users)"
+  dim "  MCP (AI)  : http://localhost:${mosta_port}/mcp"
+  dim "  Tail log  : tail -f $LOG_DIR/mostanet.log"
+  echo
+  info "Try it :"
+  dim "  curl http://localhost:${mosta_port}/api/v1/users"
+  dim "  curl http://localhost:${mosta_port}/api/v1/members"
 }
 
 svc_stop_all() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mostajs/orm-cli",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Universal CLI to integrate @mostajs/orm into any project — auto-detects Prisma, OpenAPI, JSON Schema. Interactive menu + subcommands. 13 databases.",
   "author": "Dr Hamid MADANI <drmdh@msn.com>",
   "license": "AGPL-3.0-or-later",
@@ -40,5 +40,9 @@
     "linux",
     "darwin",
     "win32"
-  ]
+  ],
+  "dependencies": {
+    "@mostajs/orm": "^1.9.2",
+    "better-sqlite3": "^12.9.0"
+  }
 }