rainbo 0.1.6 → 0.1.8

package/README.md

@@ -2,10 +2,15 @@
 
 Rainbo command line tools for data migration workflows.
 
+The published `rainbo` npm package is a lightweight meta package. It installs
+the matching platform binary package for the current machine at install time.
+Those platform packages are published under the `@singdata` scope.
+
 ## Requirements
 
 - Node.js 16+
 - Rust toolchain for source development. End users installing from npm get a prebuilt binary.
+- Supported CI release platforms: macOS x64/arm64 and Windows x64/arm64.
 
 ## Install
 
@@ -89,8 +94,9 @@ rainbo auth logout
 
 Generate the connection URL from the logged-in Rainbo web UI user menu. `auth
 connect` exchanges the one-time connection code for a revocable CLI bearer token
-and stores it under `~/.config/rainbo/auth.json` with `0600` permissions on
-Unix-like systems.
+and stores it under `~/.config/rainbo/auth.json` on Unix-like systems or
+`%APPDATA%\rainbo\auth.json` on Windows. Unix-like systems use `0600`
+permissions for this file.
 
 ## API Commands
 
@@ -141,6 +147,8 @@ npm run publish:npm:local
 The publish script refuses to continue if `package.json` and `rust/Cargo.toml`
 versions differ. After building the current-platform binary, it also runs the
 bundled binary and verifies `rainbo version` matches `package.json`.
+The publish script is cross-platform and can be run from macOS shells,
+Windows PowerShell, or Windows CMD.
 
 If npm returns `EOTP`, use an automation-capable publish token or pass the
 current OTP:
@@ -150,16 +158,22 @@ npm run publish:npm:local -- --otp=<code>
 ```
 
 By default the local script builds the current platform binary into
-`packaging/npm/bin/<platform>/`. To publish multiple bundled platforms from a
-machine with the required Rust targets/toolchains installed, set:
+`packaging/npm/bin/<platform>/`. CI then uses those binaries to generate
+temporary platform packages such as `rainbo-cli-darwin-arm64` and
+`rainbo-cli-win32-x64`, followed by the top-level `rainbo` meta package.
+
+To build multiple platforms from a machine with the required Rust
+targets/toolchains installed, set:
 
 ```bash
-RAINBO_NPM_BUILD_TARGETS=darwin-arm64,darwin-x64 npm run publish:npm:local
+RAINBO_NPM_BUILD_TARGETS=darwin-arm64,darwin-x64,win32-x64,win32-arm64 npm run publish:npm:local
 ```
 
 The package source lives under the Rainbo GitLab repository as
-`packages/rainbo`; npm publishing is intentionally local and does not depend
-on a separate repository or CI workflow.
+`packages/rainbo`. Releases can be published locally or from the GitLab tag
+pipeline after the required platform artifacts are built. The GitLab pipeline
+generates platform npm packages dynamically in CI and then publishes the
+top-level `rainbo` meta package that depends on those platform packages.
 
 ## Skills
 

package/package.json

@@ -1,32 +1,21 @@
 {
   "name": "rainbo",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Rainbo command line tools for data migration workflows",
   "bin": {
     "rainbo": "packaging/npm/run.js"
   },
-  "scripts": {
-    "build:release": "cargo build --release --workspace",
-    "build:npm:local": "node scripts/build-npm-local.js",
-    "check:skills": "node scripts/skill-format-check/index.js",
-    "pack:npm:local": "npm run build:npm:local && npm pack --dry-run",
-    "publish:npm:local": "bash scripts/publish-npm-local.sh",
-    "test": "cargo test --workspace && node packaging/npm/run.js version && node packaging/npm/run.js help"
-  },
-  "os": [
-    "darwin",
-    "win32"
-  ],
-  "cpu": [
-    "x64",
-    "arm64"
-  ],
   "engines": {
     "node": ">=16"
   },
+  "optionalDependencies": {
+    "@singdata/rainbo-cli-darwin-x64": "0.1.8",
+    "@singdata/rainbo-cli-darwin-arm64": "0.1.8",
+    "@singdata/rainbo-cli-win32-x64": "0.1.8",
+    "@singdata/rainbo-cli-win32-arm64": "0.1.8"
+  },
   "license": "MIT",
   "files": [
-    "packaging/npm/bin",
     "packaging/npm/platform.js",
     "packaging/npm/run.js",
     "README.md",

package/packaging/npm/platform.js

@@ -1,5 +1,6 @@
 const PLATFORM_PACKAGES = {
   "darwin-x64": {
+    packageName: "@singdata/rainbo-cli-darwin-x64",
     target: "x86_64-apple-darwin",
     binary: "rainbo",
     os: "darwin",
@@ -7,6 +8,7 @@ const PLATFORM_PACKAGES = {
     archiveExt: ".tar.xz",
   },
   "darwin-arm64": {
+    packageName: "@singdata/rainbo-cli-darwin-arm64",
     target: "aarch64-apple-darwin",
     binary: "rainbo",
     os: "darwin",
@@ -14,12 +16,21 @@ const PLATFORM_PACKAGES = {
     archiveExt: ".tar.xz",
   },
   "win32-x64": {
+    packageName: "@singdata/rainbo-cli-win32-x64",
     target: "x86_64-pc-windows-msvc",
     binary: "rainbo.exe",
     os: "win32",
     cpu: "x64",
     archiveExt: ".zip",
   },
+  "win32-arm64": {
+    packageName: "@singdata/rainbo-cli-win32-arm64",
+    target: "aarch64-pc-windows-msvc",
+    binary: "rainbo.exe",
+    os: "win32",
+    cpu: "arm64",
+    archiveExt: ".zip",
+  },
 };
 
 function currentPlatformKey() {

package/packaging/npm/run.js

@@ -12,8 +12,16 @@ const sourceManifest = path.join(repoRoot, "rust", "Cargo.toml");
 function resolveBundledLauncher() {
   const platformPackage = currentPlatformPackage();
   if (!platformPackage) return null;
-  const launcher = path.join(__dirname, "bin", currentPlatformKey(), platformPackage.binary);
-  return fs.existsSync(launcher) ? launcher : null;
+  const localBundledLauncher = path.join(__dirname, "bin", currentPlatformKey(), platformPackage.binary);
+  if (fs.existsSync(localBundledLauncher)) return localBundledLauncher;
+
+  try {
+    const platformManifest = require.resolve(`${platformPackage.packageName}/package.json`);
+    const launcher = path.join(path.dirname(platformManifest), "bin", platformPackage.binary);
+    return fs.existsSync(launcher) ? launcher : null;
+  } catch (_err) {
+    return null;
+  }
 }
 
 function resolveLauncher() {
@@ -27,11 +35,11 @@ function installIfMissing() {
   if (resolveLauncher() || fs.existsSync(sourceManifest)) return;
   const platformPackage = currentPlatformPackage();
   const packageHint = platformPackage
-    ? `${currentPlatformKey()} binary`
+    ? `${platformPackage.packageName} (${currentPlatformKey()})`
     : `unsupported platform ${currentPlatformKey()}`;
   console.error(`rainbo binary package is missing for ${currentPlatformKey()}.`);
-  console.error(`Expected bundled npm binary: ${packageHint}`);
-  console.error("Rebuild and reinstall the npm package from packages/rainbo.");
+  console.error(`Expected installed npm binary package: ${packageHint}`);
+  console.error("Reinstall the rainbo npm package so the matching optional dependency is installed.");
   process.exit(1);
 }