@anvil-works/anvil-cli 0.6.2 → 0.6.4

package/dist/api.d.ts

@@ -5,7 +5,7 @@ export { AppIdCandidate, AppIdWithContext, CheckoutAppListItem, detectAppIdsByCo
 export { getAccountsForUrl, getAvailableAnvilUrls, getTokensForUrl, getValidAuthToken, hasTokensForUrl, login, LoginResult, LogoutResult, logout, StoredTokens, TokenData, verifyAuth, } from "./services/auth";
 export { DeviceAuthorizationResponse, OAuthTokenResponse, pollDeviceAuthorization, requestDeviceAuthorization, runInteractiveLoginFlow, } from "./services/oauth-login";
 export { CheckoutCloneOptions, CheckoutExecutionDeps, CheckoutOptions, ensureCheckoutAuthToken, executeCheckout, getDefaultDestinationDirectory, isDirectoryNonEmpty, isPathInsideGitRepo, openPathInEditorOrDefault, parseCheckoutInput, ParsedCheckoutInput, resolveCheckoutUrl, resolveCheckoutUsername, sanitizeDirectoryName, validateCheckoutDestination, } from "./commands/checkout";
-export { deleteConfig, getAllConfig, getConfig, getInstalledPreferredEditors, getPreferredEditorCommand, getSettableConfigKeys, isCommandAvailable, normalizeAnvilUrl, parseConfigSetValue, preferredEditors, PreferredEditor, resetConfig, resolveAnvilUrl, setConfig, SettableConfigKey, } from "./config";
+export { deleteConfig, getAllConfig, getConfig, getInstalledPreferredEditors, getPreferredEditorCommand, getSettableConfigKeys, isCommandAvailable, normalizeAnvilUrl, parseConfigSetValue, preferredEditors, PreferredEditor, resetConfig, resolveAnvilUrl, setAuthTokensForAccount, setConfig, SettableConfigKey, } from "./config";
 export { BranchSyncStatus, validateAnvilApp, validateBranchSyncStatus } from "./services/validation";
 export { AnvilYamlValidationResult, FormTemplateValidationResult, ValidatePathResult, ValidationTarget, ValidationIssue, formatValidationPath, validatePath, validateAnvilYaml, validateFormTemplate, } from "./validators";
 export interface UncommittedChanges {

package/dist/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,SAAS,EAAkB,QAAQ,EAAgB,MAAM,UAAU,CAAC;AAG7E,OAAO,EAA4B,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAGzF,OAAO,EACH,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,0BAA0B,EAC1B,0BAA0B,EAC1B,gBAAgB,EAChB,oBAAoB,EACpB,cAAc,EACd,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,mBAAmB,EACnB,wBAAwB,EACxB,cAAc,EACd,WAAW,EACX,qBAAqB,EACrB,aAAa,GAChB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACH,iBAAiB,EACjB,qBAAqB,EACrB,eAAe,EACf,iBAAiB,EACjB,eAAe,EACf,KAAK,EACL,WAAW,EACX,YAAY,EACZ,MAAM,EACN,YAAY,EACZ,SAAS,EACT,UAAU,GACb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACH,2BAA2B,EAC3B,kBAAkB,EAClB,uBAAuB,EACvB,0BAA0B,EAC1B,uBAAuB,GAC1B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACH,oBAAoB,EACpB,qBAAqB,EACrB,eAAe,EACf,uBAAuB,EACvB,eAAe,EACf,8BAA8B,EAC9B,mBAAmB,EACnB,mBAAmB,EACnB,yBAAyB,EACzB,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,EAClB,uBAAuB,EACvB,qBAAqB,EACrB,2BAA2B,GAC9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACH,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,4BAA4B,EAC5B,yBAAyB,EACzB,qBAAqB,EACrB,kBAAkB,EAClB,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,EACf,WAAW,EACX,eAAe,EACf,SAAS,EACT,iBAAiB,GACpB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACrG,OAAO,EACH,yBAAyB,EACzB,4BAA4B,EAC5B,kBAAkB,EAClB,gBAAgB,EAChB,eAAe,EACf,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EACjB,oBAAoB,GACvB,MAAM,cAAc,CAAC;AAQtB,MAAM,WAAW,kBAAkB;IAC/B,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,QAAQ,GAAG,sBAAsB,CAAC;AAMvE;;;GAGG;AACH,wBAAsB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAsB3F;AAMD;;;;GAIG;AACH,wBAAsB,YAAY,CAC9B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,QAAQ,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAwBjB;AAMD;;;GAGG;AACH,wBAAsB,KAAK,CACvB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,QAAQ,SAAoB,EAC5B,UAAU,UAAQ,EAClB,QAAQ,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,YAAY,CAAC,CAmGvB"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,SAAS,EAAkB,QAAQ,EAAgB,MAAM,UAAU,CAAC;AAG7E,OAAO,EAA4B,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAGzF,OAAO,EACH,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,0BAA0B,EAC1B,0BAA0B,EAC1B,gBAAgB,EAChB,oBAAoB,EACpB,cAAc,EACd,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,mBAAmB,EACnB,wBAAwB,EACxB,cAAc,EACd,WAAW,EACX,qBAAqB,EACrB,aAAa,GAChB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACH,iBAAiB,EACjB,qBAAqB,EACrB,eAAe,EACf,iBAAiB,EACjB,eAAe,EACf,KAAK,EACL,WAAW,EACX,YAAY,EACZ,MAAM,EACN,YAAY,EACZ,SAAS,EACT,UAAU,GACb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACH,2BAA2B,EAC3B,kBAAkB,EAClB,uBAAuB,EACvB,0BAA0B,EAC1B,uBAAuB,GAC1B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACH,oBAAoB,EACpB,qBAAqB,EACrB,eAAe,EACf,uBAAuB,EACvB,eAAe,EACf,8BAA8B,EAC9B,mBAAmB,EACnB,mBAAmB,EACnB,yBAAyB,EACzB,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,EAClB,uBAAuB,EACvB,qBAAqB,EACrB,2BAA2B,GAC9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACH,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,4BAA4B,EAC5B,yBAAyB,EACzB,qBAAqB,EACrB,kBAAkB,EAClB,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,EACf,WAAW,EACX,eAAe,EACf,uBAAuB,EACvB,SAAS,EACT,iBAAiB,GACpB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACrG,OAAO,EACH,yBAAyB,EACzB,4BAA4B,EAC5B,kBAAkB,EAClB,gBAAgB,EAChB,eAAe,EACf,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EACjB,oBAAoB,GACvB,MAAM,cAAc,CAAC;AAQtB,MAAM,WAAW,kBAAkB;IAC/B,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,QAAQ,GAAG,sBAAsB,CAAC;AAMvE;;;GAGG;AACH,wBAAsB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAsB3F;AAMD;;;;GAIG;AACH,wBAAsB,YAAY,CAC9B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,QAAQ,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAwBjB;AAMD;;;GAGG;AACH,wBAAsB,KAAK,CACvB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,QAAQ,SAAoB,EAC5B,UAAU,UAAQ,EAClB,QAAQ,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,YAAY,CAAC,CAmGvB"}

package/dist/index.js

@@ -31355,6 +31355,7 @@ var __webpack_exports__ = {};
         requestDeviceAuthorization: ()=>requestDeviceAuthorization,
         validateAnvilApp: ()=>validation_validateAnvilApp,
         getGitPushUrl: ()=>anvil_api_getGitPushUrl,
+        setAuthTokensForAccount: ()=>setAccountTokens,
         ValidateAppIdResponse: ()=>anvil_api_namespaceObject.ValidateAppIdResponse,
         formatValidationPath: ()=>formatValidationPath,
         resolveAnvilUrl: ()=>resolveAnvilUrl,
@@ -31441,6 +31442,7 @@ var __webpack_exports__ = {};
         cx: ()=>preferredEditors,
         E6: ()=>resetConfig,
         mk: ()=>resolveAnvilUrl,
+        Px: ()=>setAccountTokens,
         Nk: ()=>setConfig
     });
     var auth_namespaceObject = {};
@@ -50418,6 +50420,7 @@ exports.resolveCheckoutUsername = __webpack_exports__.resolveCheckoutUsername;
 exports.runInteractiveLoginFlow = __webpack_exports__.runInteractiveLoginFlow;
 exports.sanitizeDirectoryName = __webpack_exports__.sanitizeDirectoryName;
 exports.saveUpdates = __webpack_exports__.saveUpdates;
+exports.setAuthTokensForAccount = __webpack_exports__.setAuthTokensForAccount;
 exports.setConfig = __webpack_exports__.setConfig;
 exports.syncToLatest = __webpack_exports__.syncToLatest;
 exports.validateAnvilApp = __webpack_exports__.validateAnvilApp;
@@ -50498,6 +50501,7 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "runInteractiveLoginFlow",
     "sanitizeDirectoryName",
     "saveUpdates",
+    "setAuthTokensForAccount",
     "setConfig",
     "syncToLatest",
     "validateAnvilApp",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anvil-works/anvil-cli",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "CLI tool for developing Anvil apps locally",
   "main": "dist/index.js",
   "types": "dist/api.d.ts",

package/scripts/install/install.sh

@@ -21,6 +21,27 @@ need_cmd() {
     command -v "$1" >/dev/null 2>&1 || fail "Required command not found: $1"
 }
 
+is_windows_posix() {
+    case "$(uname -s 2>/dev/null || true)" in
+        MINGW*|MSYS*|CYGWIN*) return 0 ;;
+        *) return 1 ;;
+    esac
+}
+
+windows_posix_node_error() {
+    fail "Windows Git Bash installs require existing Node.js v20+ and npm. Use PowerShell instead: irm https://anvil.works/install-cli.ps1 | iex"
+}
+
+normalize_npm_prefix() {
+    prefix="$1"
+    if is_windows_posix && command -v cygpath >/dev/null 2>&1; then
+        cygpath -u "$prefix" 2>/dev/null || printf '%s\n' "$prefix"
+        return
+    fi
+
+    printf '%s\n' "$prefix"
+}
+
 warn_if_missing_git() {
     if ! command -v git >/dev/null 2>&1; then
         log "Warning: git was not found on PATH."
@@ -30,11 +51,13 @@ warn_if_missing_git() {
 }
 
 cleanup_legacy_npm_prefix() {
-    current_prefix="$(npm config get prefix 2>/dev/null || true)"
+    current_prefix="$(npm config get prefix 2>/dev/null | tr -d '\r' || true)"
     [ -n "$current_prefix" ] || return 0
 
     legacy_prefix="$NPM_PREFIX"
-    if [ "$current_prefix" = "$legacy_prefix" ]; then
+    normalized_current_prefix="$(normalize_npm_prefix "$current_prefix")"
+    normalized_legacy_prefix="$(normalize_npm_prefix "$legacy_prefix")"
+    if [ "$current_prefix" = "$legacy_prefix" ] || [ "$normalized_current_prefix" = "$normalized_legacy_prefix" ]; then
         log "Detected legacy anvil npm prefix in user config; restoring npm default prefix behavior."
         npm config delete prefix --location=user >/dev/null 2>&1 || true
     fi
@@ -42,7 +65,11 @@ cleanup_legacy_npm_prefix() {
 
 append_path_export() {
     profile_file="$1"
-    line='export PATH="$HOME/.anvil-cli/npm-global/bin:$HOME/.anvil-cli/node-v20/bin:$PATH"'
+    if is_windows_posix; then
+        line='export PATH="$HOME/.anvil-cli/npm-global:$HOME/.anvil-cli/npm-global/bin:$HOME/.anvil-cli/node-v20/bin:$PATH"'
+    else
+        line='export PATH="$HOME/.anvil-cli/npm-global/bin:$HOME/.anvil-cli/node-v20/bin:$PATH"'
+    fi
 
     [ -f "$profile_file" ] || touch "$profile_file"
     grep -F "$line" "$profile_file" >/dev/null 2>&1 || {
@@ -131,23 +158,54 @@ ensure_node() {
             log "Using existing Node.js $(node -v)"
             return
         fi
+        if is_windows_posix; then
+            windows_posix_node_error
+        fi
         log "Existing Node.js $(node -v) is too old; installing Node.js v20 user-local"
         install_node_v20
         return
     fi
 
+    if is_windows_posix; then
+        windows_posix_node_error
+    fi
     install_node_v20
 }
 
-main() {
-    need_cmd curl
-    need_cmd tar
+configure_current_path() {
+    if is_windows_posix; then
+        export PATH="$NPM_PREFIX:$NPM_PREFIX/bin:$NODE_DIR/bin:$PATH"
+    else
+        export PATH="$NPM_PREFIX/bin:$NODE_DIR/bin:$PATH"
+    fi
+}
+
+anvil_version() {
+    if command -v anvil >/dev/null 2>&1 && anvil --version 2>/dev/null; then
+        return 0
+    fi
+
+    if [ -f "$NPM_PREFIX/anvil" ] && "$NPM_PREFIX/anvil" --version 2>/dev/null; then
+        return 0
+    fi
 
+    if [ -f "$NPM_PREFIX/anvil.cmd" ] && "$NPM_PREFIX/anvil.cmd" --version 2>/dev/null; then
+        return 0
+    fi
+
+    if [ -x "$NPM_PREFIX/bin/anvil" ] && "$NPM_PREFIX/bin/anvil" --version 2>/dev/null; then
+        return 0
+    fi
+
+    return 1
+}
+
+main() {
     mkdir -p "$ANVIL_HOME" "$NPM_PREFIX"
 
     ensure_node
 
-    export PATH="$NPM_PREFIX/bin:$NODE_DIR/bin:$PATH"
+    configure_current_path
     persist_path_hint
 
     need_cmd npm
@@ -157,11 +215,7 @@ main() {
     log "Installing anvil-cli..."
     NPM_CONFIG_PREFIX="$NPM_PREFIX" npm install -g @anvil-works/anvil-cli@latest
 
-    if command -v anvil >/dev/null 2>&1; then
-        version="$(anvil --version 2>/dev/null || true)"
-    elif [ -x "$NPM_PREFIX/bin/anvil" ]; then
-        version="$($NPM_PREFIX/bin/anvil --version 2>/dev/null || true)"
-    else
+    if ! version="$(anvil_version)"; then
         fail "anvil installed but command not found on PATH"
     fi