@mostajs/orm-cli 0.5.11 → 0.5.13

package/bin/mostajs.sh

@@ -268,6 +268,16 @@ detect_project() {
 
   [[ ${#JSON_SCHEMAS[@]} -gt 0 ]] && DETECTED_TYPES+=("jsonschema")
 
+  # Native .mjs/.js schemas (schemas.mjs, schemas.js at root)
+  NATIVE_SCHEMA=""
+  for candidate in schemas.mjs schemas.js schemas.ts src/schemas.mjs src/schemas.js src/schemas.ts; do
+    if [[ -f "$PROJECT_ROOT/$candidate" ]]; then
+      NATIVE_SCHEMA="$PROJECT_ROOT/$candidate"
+      DETECTED_TYPES+=("native")
+      break
+    fi
+  done
+
   # Package manager
   if   [[ -f "$PROJECT_ROOT/pnpm-lock.yaml" ]]; then PKG_MANAGER="pnpm"
   elif [[ -f "$PROJECT_ROOT/yarn.lock"      ]]; then PKG_MANAGER="yarn"
@@ -281,6 +291,71 @@ detect_project() {
 # npm / npx wrapper — finds the installed adapter or uses npx
 # ============================================================
 
+# Convert a native .mjs/.js/.ts file that exports EntitySchema objects.
+# No adapter needed — just import and collect every export that looks like
+# an EntitySchema (has .name + .collection).
+run_native_convert() {
+  local input_file="$1"
+  local output_file="$2"
+  local abs_input
+  abs_input="$(cd "$(dirname "$input_file")" && pwd)/$(basename "$input_file")"
+
+  cat > "$CONFIG_DIR/convert-native.mjs" << NEOF
+import { writeFileSync } from 'fs';
+import { resolve } from 'path';
+
+const mod = await import('$abs_input');
+const entities = Object.values(mod).filter(
+  v => v && typeof v === 'object' && typeof v.name === 'string' && typeof v.collection === 'string'
+);
+
+if (entities.length === 0) {
+  console.error('No EntitySchema exports found in $input_file');
+  console.error('Expected exports with { name, collection, fields, ... }');
+  process.exit(1);
+}
+
+console.log('entities : ' + entities.length);
+for (const e of entities) console.log('  • ' + e.name + ' → ' + e.collection);
+
+const header = '// Auto-generated by @mostajs/orm-cli v$VERSION at ' + new Date().toISOString() + '\\n';
+const code = header +
+  '// Source : $input_file (native import)\\n' +
+  '// DO NOT EDIT BY HAND — regenerate with: mostajs convert\\n\\n' +
+  'import type { EntitySchema } from "@mostajs/orm";\\n\\n' +
+  'export const entities: EntitySchema[] = ' + JSON.stringify(entities, null, 2) + ';\\n\\n' +
+  'export const entityByName: Record<string, EntitySchema> = Object.fromEntries(\\n' +
+  '  entities.map(e => [e.name, e])\\n' +
+  ');\\n';
+
+const outTs = '$output_file';
+const outJson = outTs.replace(/\\.ts\$/, '.json');
+writeFileSync(outTs, code);
+writeFileSync(outJson, JSON.stringify(entities, null, 2));
+console.log('✓ Saved : ' + outTs);
+console.log('✓ Saved : ' + outJson);
+NEOF
+
+  local rc=0
+  # .ts input needs tsx/ts-node ; .mjs/.js runs with plain node
+  local runner="node"
+  if [[ "$input_file" =~ \.ts$ ]]; then
+    if command -v tsx >/dev/null 2>&1; then
+      runner="tsx"
+    elif npx --no-install tsx --version >/dev/null 2>&1; then
+      runner="npx tsx"
+    else
+      warn ".ts file detected but tsx not found — trying node (may fail)"
+    fi
+  fi
+  $runner "$CONFIG_DIR/convert-native.mjs" 2>&1 | tee "$LOG_DIR/convert.log"
+  rc=${PIPESTATUS[0]}
+  if [[ $rc -ne 0 ]]; then
+    err "Conversion exited with code $rc"
+    info "See $LOG_DIR/convert.log for details"
+  fi
+}
+
 run_adapter_convert() {
   local input_type="$1"  # prisma | jsonschema | openapi
   local input_file="$2"
@@ -572,6 +647,8 @@ action_convert() {
         PRISMA_SCHEMA="$f"; DETECTED_TYPES=("prisma")
       elif [[ "$f" =~ \.ya?ml$ ]] || grep -q "^openapi:" "$f" 2>/dev/null; then
         OPENAPI_FILE="$f"; DETECTED_TYPES=("openapi")
+      elif [[ "$f" =~ \.(mjs|js|ts)$ ]]; then
+        NATIVE_SCHEMA="$f"; DETECTED_TYPES=("native")
       else
         JSON_SCHEMAS=("$f"); DETECTED_TYPES=("jsonschema")
       fi
@@ -596,12 +673,19 @@ action_convert() {
     prisma)     input="$PRISMA_SCHEMA" ;;
     openapi)    input="$OPENAPI_FILE" ;;
     jsonschema) input="${JSON_SCHEMAS[0]}" ;;
+    native)     input="$NATIVE_SCHEMA" ;;
   esac
 
   info "Input : $input"
   info "Output: $GENERATED_DIR/entities.ts"
   echo
-  run_adapter_convert "$type" "$input" "$GENERATED_DIR/entities.ts"
+
+  if [[ "$type" == "native" ]]; then
+    # Native .mjs/.js/.ts — dynamic import, extract EntitySchema exports
+    run_native_convert "$input" "$GENERATED_DIR/entities.ts"
+  else
+    run_adapter_convert "$type" "$input" "$GENERATED_DIR/entities.ts"
+  fi
   pause
 }
 
@@ -2120,19 +2204,19 @@ action_rep_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');
+    if (!reps) { console.log('  ✗ project \"$project\" not found'); }
+    else if (!reps['$name']) { console.log('  ✗ replica \"$name\" not found in $project'); }
+    else if (reps['$name'].role === 'master') { console.log('  • $name is already master'); }
+    else {
+      for (const [n, cfg] of Object.entries(reps)) {
+        if (cfg.role === 'master') {
+          cfg.role = 'slave';
+          console.log('  ↓ ' + n + ' demoted to slave');
+        }
       }
+      reps['$name'].role = 'master';
+      console.log('  ★ $name promoted to master');
     }
-    // Promote target to master
-    reps['$name'].role = 'master';
-    console.log('  ★ $name promoted to master');
   "
   pause
 }

package/package.json

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