@multiplatform.one/cli 7.10.0 → 7.15.0

package/lib/source.json

@@ -0,0 +1,5 @@
+{
+  "cliVersion": "7.15.0",
+  "url": "https://git.corp.bitspur.com/multiplatform.one/mpo.git",
+  "sha": "ea0fe3578a58e4c3d40cc1feb878f8cecce9cb3a"
+}

package/lib/source.mjs

@@ -0,0 +1,63 @@
+import { cliRoot, cliVersion } from "./commands/provenance.mjs";
+import { existsSync, readFileSync } from "node:fs";
+import { join, resolve } from "node:path";
+
+//#region src/source.ts
+const monorepoUrl = "https://git.corp.bitspur.com/multiplatform.one/mpo.git";
+function isGitUrl(source) {
+	return /^(https?|ssh|git|file):\/\//.test(source) || /^[\w.-]+@[\w.-]+:/.test(source);
+}
+/** The monorepo checkout this CLI runs from, if any (src via tsx, or the workspace link). */
+function monorepoCheckout() {
+	const root = resolve(cliRoot(), "../..");
+	if (existsSync(join(root, "apps/one/package.json")) && existsSync(join(root, "public/cli/package.json"))) return root;
+}
+function readSourceStamp() {
+	try {
+		return JSON.parse(readFileSync(join(cliRoot(), "lib/source.json"), "utf-8"));
+	} catch {
+		return;
+	}
+}
+/**
+* Where `mpo init` clones from. Flags win; a CLI running inside the monorepo
+* uses that checkout's HEAD; a published CLI uses the commit stamped at build
+* time; a build without a stamp falls back to the release tag of its own
+* version, and `init` retries `main` when that tag is missing.
+*/
+function resolveSource(flags = {}) {
+	if (flags.source) return {
+		source: flags.source,
+		ref: flags.checkout ?? (isGitUrl(flags.source) ? "main" : "HEAD"),
+		origin: "flag"
+	};
+	const checkout = monorepoCheckout();
+	if (checkout) return {
+		source: checkout,
+		ref: flags.checkout ?? "HEAD",
+		origin: "monorepo"
+	};
+	const stamp = readSourceStamp();
+	const url = stamp?.url ?? "https://git.corp.bitspur.com/multiplatform.one/mpo.git";
+	if (flags.checkout) return {
+		source: url,
+		ref: flags.checkout,
+		origin: "flag"
+	};
+	if (stamp?.sha) return {
+		source: url,
+		ref: stamp.sha,
+		origin: "stamp"
+	};
+	const version = cliVersion();
+	const ref = version ? `v${version}` : "main";
+	return {
+		source: url,
+		ref,
+		origin: "tag",
+		warning: `this build of @multiplatform.one/cli carries no source commit (lib/source.json); scaffolding from ${ref} instead`
+	};
+}
+
+//#endregion
+export { isGitUrl, monorepoCheckout, monorepoUrl, readSourceStamp, resolveSource };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@multiplatform.one/cli",
-  "version": "7.10.0",
-  "description": "multiplatform.one cli — mpo init / create-multiplatform-app",
+  "version": "7.15.0",
+  "description": "multiplatform.one cli — mpo init clones and prunes the monorepo, mpo update merges it back",
   "keywords": [
     "create-multiplatform-app",
     "mpo",
@@ -9,7 +9,7 @@
     "scaffold"
   ],
   "bugs": {
-    "url": "https://gitlab.com/bitspur/multiplatform.one/multiplatform.one/issues"
+    "url": "https://projects.corp.bitspur.com/tracker/MPO"
   },
   "license": "Apache-2.0",
   "author": "BitSpur <support@bitspur.com> (https://bitspur.com)",
@@ -21,7 +21,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://gitlab.com/bitspur/frappe/multiplatform.one.git",
+    "url": "git+https://git.corp.bitspur.com/multiplatform.one/mpo.git",
     "directory": "public/cli"
   },
   "bin": {
@@ -56,12 +56,12 @@
     "access": "public"
   },
   "dependencies": {
+    "@multiplatform.one/utils": "7.15.0",
     "commander": "^14.0.3",
     "inquirer": "^13.4.2",
     "nano-spawn": "^2.1.0",
     "yaml": "^2.8.3",
-    "yocto-spinner": "^1.1.0",
-    "@multiplatform.one/utils": "7.10.0"
+    "yocto-spinner": "^1.1.0"
   },
   "devDependencies": {
     "@types/inquirer": "^9.0.9",
@@ -73,7 +73,7 @@
     "node": ">= 16.0"
   },
   "scripts": {
-    "build": "rm -rf lib types 2>/dev/null && tsc -p tsconfig.build.json && tsdown",
+    "build": "rm -rf lib types 2>/dev/null && tsc -p tsconfig.build.json && tsdown && node scripts/stamp-source.mjs",
     "test": "vitest run",
     "typecheck": "tsgo --noEmit"
   }

package/scripts/frappe-bootstrap.sh

@@ -1,6 +1,28 @@
 #!/bin/sh
+# Every checkout of this repo shares one dev mariadb/postgres, so each checkout
+# gets its own database. FRAPPE_DB_NAME wins when set; otherwise the db_name the
+# site's site_config.json already holds (the main checkout keeps its frappe);
+# otherwise frappe_<dir>_<hash of the checkout path>. Bootstrap drops only a
+# database its own site_config.json names, or one with no tables, and refuses
+# otherwise.
 set -e
 
+_db_table_count() {
+    if [ "$FRAPPE_DB_TYPE" = "postgres" ]; then
+        _exists="$(PGPASSWORD="$FRAPPE_DB_PASSWORD" psql -h "$FRAPPE_DB_HOST" -p "$FRAPPE_DB_PORT" -U "$FRAPPE_DB_USER" -d postgres -tAc \
+            "SELECT 1 FROM pg_database WHERE datname = '$1'")" || return 1
+        if [ -z "$_exists" ]; then
+            echo 0
+            return 0
+        fi
+        PGPASSWORD="$FRAPPE_DB_PASSWORD" psql -h "$FRAPPE_DB_HOST" -p "$FRAPPE_DB_PORT" -U "$FRAPPE_DB_USER" -d "$1" -tAc \
+            "SELECT count(*) FROM information_schema.tables WHERE table_schema NOT IN ('pg_catalog', 'information_schema')"
+    else
+        _mysql -h "$FRAPPE_DB_HOST" -P "$FRAPPE_DB_PORT" -u "$FRAPPE_DB_USER" -p"$FRAPPE_DB_PASSWORD" -N -B -e \
+            "SELECT COUNT(*) FROM information_schema.TABLES WHERE TABLE_SCHEMA = '$1'"
+    fi
+}
+
 _mysql() {
     if command -v mysql >/dev/null 2>&1; then
         mysql "$@"
@@ -271,7 +293,6 @@ FRAPPE_DB_HOST="${FRAPPE_DB_HOST:-$([ "$FRAPPE_DB_TYPE" = "postgres" ] && echo "
 if [ "$FRAPPE_DB_HOST" = "localhost" ]; then
     FRAPPE_DB_HOST="127.0.0.1"
 fi
-FRAPPE_DB_NAME="${FRAPPE_DB_NAME:-frappe}"
 FRAPPE_DB_PASSWORD="${FRAPPE_DB_PASSWORD:-$([ "$FRAPPE_DB_TYPE" = "postgres" ] && echo "$POSTGRES_PASSWORD" || echo "${MARIADB_PASSWORD:-${MYSQL_PASSWORD:-root}}")}"
 FRAPPE_DB_PORT="${FRAPPE_DB_PORT:-$([ "$FRAPPE_DB_TYPE" = "postgres" ] && echo "$POSTGRES_PORT" || echo "${MARIADB_PORT:-${MYSQL_PORT:-3306}}")}"
 FRAPPE_DB_TYPE="${FRAPPE_DB_TYPE:-mariadb}"
@@ -281,6 +302,8 @@ FRAPPE_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/frappe"
 REDIS_CACHE_URI="${REDIS_CACHE_URI:-redis://localhost:6379}"
 REDIS_QUEUE_URI="${REDIS_QUEUE_URI:-redis://localhost:6380}"
 SITE_NAME="${SITE_NAME:-$(echo "$FRAPPE_BASE_URL" | sed 's|^https*://||' | sed 's|:[0-9]*.*||' | sed 's|/.*||')}"
+FRAPPE_DB_NAME="$(frappe_resolve_db_name "${FRAPPE_DB_NAME:-}" "$BENCH_DIR/sites/$SITE_NAME/site_config.json" "$ROOTDIR")"
+echo "dev database $FRAPPE_DB_NAME"
 bench() {
     uv tool run --from frappe-bench bench "$@"
 }
@@ -361,6 +384,8 @@ if [ -f "$BENCH_DIR/sites/$SITE_NAME/site_config.json" ]; then
     fi
 fi
 if [ ! -f "$BENCH_DIR/sites/$SITE_NAME/site_config.json" ] || [ "$_DB_INITIALIZED" = "0" ]; then
+    _TABLES="$(_db_table_count "$FRAPPE_DB_NAME")" || _TABLES=""
+    frappe_db_may_drop "$FRAPPE_DB_NAME" "$BENCH_DIR/sites/$SITE_NAME/site_config.json" "$_TABLES" || exit 1
     if [ "$FRAPPE_DB_TYPE" = "postgres" ]; then
         PGPASSWORD="$FRAPPE_DB_PASSWORD" psql -h "$FRAPPE_DB_HOST" -p "$FRAPPE_DB_PORT" -U "$FRAPPE_DB_USER" -c \
             "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = '$FRAPPE_DB_NAME';"
@@ -452,8 +477,9 @@ fi
 if [ -n "${ONE_PORT:-}" ] && [ "$(echo "$SITE_CONFIG" | jq -r '.one_dev_proxy_target // ""')" != "http://localhost:${ONE_PORT}" ]; then
     bench --site "$SITE_NAME" set-config one_dev_proxy_target "http://localhost:${ONE_PORT}"
 fi
-if [ -n "${KEYCLOAK_PORT:-}" ] && [ "$(echo "$SITE_CONFIG" | jq -r '.keycloak_dev_proxy_target // ""')" != "http://localhost:${KEYCLOAK_PORT}" ]; then
-    bench --site "$SITE_NAME" set-config keycloak_dev_proxy_target "http://localhost:${KEYCLOAK_PORT}"
+frappe_site_config_drop "$BENCH_DIR/sites/$SITE_NAME/site_config.json" keycloak_dev_proxy_target
+if [ -n "${KEYCLOAK_PORT:-}" ] && [ "$(echo "$SITE_CONFIG" | jq -r '.one_dev_proxy_keycloak_target // ""')" != "http://localhost:${KEYCLOAK_PORT}/auth" ]; then
+    bench --site "$SITE_NAME" set-config one_dev_proxy_keycloak_target "http://localhost:${KEYCLOAK_PORT}/auth"
 fi
 bench migrate
 # Mark the Frappe setup wizard complete so freshly bootstrapped sites skip it.

package/scripts/frappe-dev.sh

@@ -37,5 +37,4 @@ _sed "s|[^ ]*/node |$(command -v node) |g" "$BENCH_DIR/Procfile"
 _sed "s| bench | uv tool run --from frappe-bench bench |g" "$BENCH_DIR/Procfile"
 _sed "s|: *bench |: uv tool run --from frappe-bench bench |g" "$BENCH_DIR/Procfile"
 _sed "s|uv tool run --from frappe-bench bench serve.*--port [0-9][0-9]*|uv tool run --from frappe-bench bench serve --port ${FRAPPE_PORT:-8000}|g" "$BENCH_DIR/Procfile"
-command -v honcho >/dev/null 2>&1 || uv pip install honcho
-exec honcho start "$@"
+exec uv tool run honcho start "$@"

package/scripts/frappe-helpers.sh

@@ -87,8 +87,56 @@ frappe_remove_non_keep_apps() {
         [ -d "$_d" ] || continue
         _name="$(basename "$_d")"
         case "$FRAPPE_KEEP_APPS" in
-            *" $_name "*) ;;
-            *) rm -rf "$_d" ;;
+            *" $_name "*) continue ;;
         esac
+        # An app the repo tracks is source, not a derived copy, whether or not
+        # frappe.yaml lists it yet.
+        if [ -n "$(git -C "$BENCH_DIR" ls-files -- "apps/$_name" 2>/dev/null | head -n 1)" ]; then
+            continue
+        fi
+        rm -rf "$_d"
     done
 }
+
+frappe_site_config_drop() {
+    _file="$1"
+    _key="$2"
+    [ -f "$_file" ] || return 0
+    _has="$(jq --arg k "$_key" 'has($k)' "$_file")" || return 1
+    [ "$_has" = "true" ] || return 0
+    jq --arg k "$_key" 'del(.[$k])' "$_file" > "$_file.tmp" && mv "$_file.tmp" "$_file"
+}
+
+frappe_checkout_db_name() {
+    _root="$(cd "$1" && pwd -P)" || return 1
+    _slug="$(printf '%s' "${_root##*/}" | tr '[:upper:]' '[:lower:]' | tr -c 'a-z0-9' '_' | cut -c1-16)"
+    _sum="$(printf '%s' "$_root" | sha256sum | cut -c1-8)"
+    printf 'frappe_%s_%s\n' "$_slug" "$_sum"
+}
+
+frappe_resolve_db_name() {
+    if [ -n "$1" ]; then
+        printf '%s\n' "$1"
+        return 0
+    fi
+    if [ -f "$2" ]; then
+        _name="$(jq -r '.db_name // ""' "$2")" || return 1
+        if [ -n "$_name" ]; then
+            printf '%s\n' "$_name"
+            return 0
+        fi
+    fi
+    frappe_checkout_db_name "$3"
+}
+
+frappe_db_may_drop() {
+    _db="$1"
+    _cfg="$2"
+    _tables="$3"
+    if [ -f "$_cfg" ] && [ "$(jq -r '.db_name // ""' "$_cfg")" = "$_db" ]; then
+        return 0
+    fi
+    [ "$_tables" = "0" ] && return 0
+    echo "refusing to drop database $_db: $_cfg does not name it and it is not empty (tables: ${_tables:-unknown}), so another checkout may own it. Set FRAPPE_DB_NAME in .env to a new name, or drop $_db yourself if it is yours." >&2
+    return 1
+}

package/scripts/frappe.sh

@@ -3,6 +3,11 @@ set -e
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 
+# bench build runs yarn 1 inside the bench, and yarn 1 reads this repo's .npmrc
+# and aborts on an unset ${NPM_AUTH_TOKEN} (pnpm only warns). The bench never
+# fetches from the private registry, so an empty value is enough.
+export NPM_AUTH_TOKEN="${NPM_AUTH_TOKEN-}"
+
 usage() {
     cat <<'EOF'
 Usage: frappe.sh <command> [options]