chore: merge publish.sh and publish-all.sh (#237)

- Topological sort from publish-all.sh replaces hardcoded order
- bun publish directly (no manual workspace:* replacement/restoration)
- bun run build + bun test (not npm run)
- --dry-run support (skips git commit/push)
- Delete publish-all.sh
- Update package.json scripts

Closes #237

Signed-off-by: 星月 <xingyue@shazhou.work>

package.json

@@ -13,8 +13,8 @@
     "link": "./scripts/link-all.sh",
     "link:consume": "./scripts/link-all.sh --consume",
     "link:unlink": "./scripts/link-all.sh --unlink",
-    "publish:gitea": "./scripts/publish-all.sh",
+    "publish:gitea": "./scripts/publish.sh patch",
-    "publish:gitea:dry": "./scripts/publish-all.sh --dry-run"
+    "publish:gitea:dry": "./scripts/publish.sh --dry-run patch"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.4.14",

scripts/publish.sh

@@ -1,32 +1,31 @@
 #!/usr/bin/env bash
-# publish.sh — Bump version, build, test & publish all @uncaged/workflow-* packages
+# publish.sh — Bump version, build, test, topologically publish @uncaged/* to Gitea npm
 #
 # Usage:
+#   ./scripts/publish.sh 0.4.0             # explicit version
 #   ./scripts/publish.sh patch             # 0.3.1 → 0.3.2
 #   ./scripts/publish.sh minor             # 0.3.1 → 0.4.0
 #   ./scripts/publish.sh major             # 0.3.1 → 1.0.0
-#   ./scripts/publish.sh 0.5.0        # explicit version
+#   ./scripts/publish.sh --dry-run patch   # dry-run bun publish only (no git commit/push)
-#   ./scripts/publish.sh patch --dry-run  # preview without publishing
 #
 # Env (via `cfg` or export):
-#   GITEA_TOKEN  — Gitea npm registry auth (used by .npmrc)
+#   GITEA_TOKEN — Gitea npm registry auth (see root .npmrc)
 set -euo pipefail
 
 REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
 cd "$REPO_ROOT"
 
 GITEA_TOKEN="${GITEA_TOKEN:?GITEA_TOKEN is required}"
-REGISTRY="https://git.shazhou.work/api/packages/uncaged/npm/"
 
+REGISTRY="https://git.shazhou.work/api/packages/uncaged/npm/"
 DRY_RUN=""
-VERSION_ARG=""
+
-for arg in "$@"; do
+if [[ "${1:-}" == "--dry-run" ]]; then
-  case "$arg" in
+  DRY_RUN="--dry-run"
-    --dry-run) DRY_RUN="--dry-run" ;;
+  shift
-    *)         VERSION_ARG="$arg" ;;
+  echo "🔍 Dry run — bun publish will not upload; git commit/push skipped"
-  esac
+  echo
-done
+fi
-[[ -z "$VERSION_ARG" ]] && { echo "Usage: publish.sh <version|patch|minor|major> [--dry-run]"; exit 1; }
 
 # ─── Version ─────────────────────────────────────────────────────────────────
 current_version() {
@@ -45,11 +44,10 @@ bump_version() {
 }
 
 CURRENT=$(current_version)
-VERSION=$(bump_version "$CURRENT" "$VERSION_ARG")
+VERSION=$(bump_version "$CURRENT" "${1:?Usage: publish.sh [--dry-run] <version|patch|minor|major>}")
 echo "📦 Publish: $CURRENT → $VERSION"
-[[ -n "$DRY_RUN" ]] && echo "🔍 Dry run mode — no packages will be published"
 
-# ─── Bump version in all public packages ─────────────────────────────────────
+# ─── Bump version ─────────────────────────────────────────────────────────────
 echo "🔢 Bumping versions..."
 for dir in packages/*/; do
   pkg="$dir/package.json"
@@ -64,48 +62,39 @@ for dir in packages/*/; do
   "
 done
 
-# ─── Build ───────────────────────────────────────────────────────────────────
+# ─── Topological publish order (workspace:* deps first) ───────────────────────
-echo "🔨 Building..."
-npm run build
-
-# ─── Self-test ───────────────────────────────────────────────────────────────
-echo "🧪 Running tests..."
-if ! bun test; then
-  echo "❌ Tests failed — aborting publish"
-  exit 1
-fi
-
-# ─── Topological sort of public packages ─────────────────────────────────────
-echo "📐 Resolving publish order..."
 ORDERED=$(python3 -c "
-import json, os
+import json, sys
 from pathlib import Path
 
 pkgs_dir = Path('$REPO_ROOT/packages')
 name_to_dir = {}
-deps_graph = {}
-
 for d in sorted(pkgs_dir.iterdir()):
     pj = d / 'package.json'
     if not pj.exists():
         continue
     data = json.loads(pj.read_text())
     name = data.get('name', '')
-    if not name.startswith('@uncaged/'):
+    if not name.startswith('@uncaged/') or data.get('private'):
-        continue
-    if data.get('private'):
         continue
     name_to_dir[name] = d.name
+
+deps_graph = {}
+for name, dirname in name_to_dir.items():
+    pj = pkgs_dir / dirname / 'package.json'
+    data = json.loads(pj.read_text())
     local_deps = set()
     for section in ('dependencies', 'devDependencies', 'peerDependencies'):
         for dep, ver in data.get(section, {}).items():
-            if dep.startswith('@uncaged/') and ver == 'workspace:*':
+            if dep.startswith('@uncaged/') and dep in name_to_dir and ver == 'workspace:*':
                 local_deps.add(dep)
     deps_graph[name] = local_deps
 
-# Kahn's algorithm — deps-first order
+in_degree = {n: 0 for n in deps_graph}
-in_degree = {n: len([d for d in ds if d in deps_graph]) for n, ds in deps_graph.items()}
+for n, ds in deps_graph.items():
-queue = sorted(n for n, deg in in_degree.items() if deg == 0)
+    in_degree[n] = len(ds)
+
+queue = sorted([n for n, deg in in_degree.items() if deg == 0])
 result = []
 while queue:
     node = queue.pop(0)
@@ -117,60 +106,60 @@ while queue:
                 queue.append(n)
     queue.sort()
 
+if len(result) != len(deps_graph):
+    missing = set(deps_graph) - set(result)
+    sys.stderr.write('publish: cyclic @uncaged/ workspace:* dependencies among: ' + ', '.join(sorted(missing)) + '\n')
+    sys.exit(1)
+
 for name in result:
     print(name_to_dir[name])
 ")
 
-# ─── Regenerate lockfile for correct workspace:* resolution ──────────────────
+# ─── Build ────────────────────────────────────────────────────────────────────
-rm -f bun.lock
+echo "🔨 Building..."
-bun install
+bun run build
 
-# ─── Publish via bun pm pack + npm publish ───────────────────────────────────
+# ─── Self-test ────────────────────────────────────────────────────────────────
-echo "🚀 Publishing..."
+echo "🧪 Running tests..."
+if ! bun test; then
+  echo "❌ Tests failed — aborting publish"
+  exit 1
+fi
+
+# ─── Publish (bun resolves workspace:* for publish) ──────────────────────────
+echo "🚀 Publishing to $REGISTRY ..."
 ok=0
 fail=0
 
 while IFS= read -r pkg; do
+  [[ -n "$pkg" ]] || continue
   dir="$REPO_ROOT/packages/$pkg"
-  name=$(node -e "console.log(require('./$dir/package.json').name)")
+  name=$(node -e "console.log(require('$dir/package.json').name)")
 
-  cd "$dir"
+  if ( cd "$dir" && bun publish --registry="$REGISTRY" ${DRY_RUN:+"$DRY_RUN"} ); then
-
+    echo "✅ $name"
-  # bun pm pack resolves workspace:* → actual versions in the tarball
+    ok=$((ok + 1))
-  tgz=$(bun pm pack 2>&1 | grep '\.tgz' | grep -v packed | head -1 | tr -d ' ')
-
-  if [[ -z "$tgz" || ! -f "$tgz" ]]; then
-    echo "❌ $name — pack failed"
-    ((fail++)) || true
-    continue
-  fi
-
-  if npm publish "$tgz" --registry="$REGISTRY" $DRY_RUN 2>&1 | tail -1 | grep -q '+'; then
-    echo "✅ $name@$VERSION"
-    ((ok++)) || true
   else
-    echo "⚠️  $name (may already exist at this version)"
+    echo "⚠️  $name (publish failed or version may already exist)"
+    fail=$((fail + 1))
   fi
 
-  rm -f "$tgz"
 done <<< "$ORDERED"
 
-cd "$REPO_ROOT"
-
 echo
 echo "Published: $ok  Skipped/Failed: $fail"
 
-# ─── Restore workspace:* (bun pack doesn't modify source, but version bump did) ─
+# ─── Commit ───────────────────────────────────────────────────────────────────
-echo "🔄 Restoring lockfile..."
+if [[ -n "$DRY_RUN" ]]; then
-rm -f bun.lock
+  echo "⏭️  Skipping git commit/push (dry run). Revert bumps with: git checkout -- packages/*/package.json"
-bun install
+  exit 0
-
-# ─── Commit ──────────────────────────────────────────────────────────────────
-if [[ -z "$DRY_RUN" ]]; then
-  echo "📝 Committing..."
-  git add -A
-  git commit -m "chore: publish v${VERSION}"
-  git push
 fi
 
+echo "📝 Committing..."
+git add -A
+git commit -m "chore: publish v${VERSION}
+
+小橘 <xiaoju@shazhou.work>"
+git push
+
 echo "✅ v${VERSION} published"