@anvil-works/anvil-cli 0.5.4 → 0.5.6

package/dist/cli.js

@@ -48023,6 +48023,16 @@ var __webpack_exports__ = {};
     function normalizeClientCodePath(relativePath) {
         return relativePath.replace(/\\/g, "/");
     }
+    function isServerRequirementsPath(relativePath) {
+        return "server_code/requirements.txt" === relativePath.replace(/\\/g, "/");
+    }
+    async function readServerRequirements(repoPath) {
+        try {
+            return await external_fs_.promises.readFile(external_path_default().join(repoPath, "server_code", "requirements.txt"), "utf8");
+        } catch (error) {
+            return;
+        }
+    }
     function detectFormTemplate(relativePath) {
         const normalized = normalizeClientCodePath(relativePath);
         if (!normalized.startsWith("client_code/")) return null;
@@ -48486,6 +48496,44 @@ var __webpack_exports__ = {};
             type: "ignore",
             reason: "anvil.yaml handled specially (multiple save paths)"
         };
+        if (isServerRequirementsPath(relativePath)) {
+            if ("unlink" === changeType) {
+                const anvilYamlContent = await readFileContent(repoPath, "anvil.yaml", stagedOnly);
+                const anvilConfig = jsYaml.load(anvilYamlContent) ?? {};
+                const runtimeOptions = {
+                    ...anvilConfig.runtime_options ?? {}
+                };
+                const serverSpec = {
+                    ...runtimeOptions.server_spec ?? {}
+                };
+                delete serverSpec.requirements;
+                if (Object.keys(serverSpec).length > 0) return {
+                    type: "save",
+                    savePath: [
+                        "runtime_options",
+                        "server_spec"
+                    ],
+                    content: serverSpec
+                };
+                delete runtimeOptions.server_spec;
+                return {
+                    type: "save",
+                    savePath: [
+                        "runtime_options"
+                    ],
+                    content: runtimeOptions
+                };
+            }
+            return {
+                type: "save",
+                savePath: [
+                    "runtime_options",
+                    "server_spec",
+                    "requirements"
+                ],
+                content: await readFileContent(repoPath, relativePath, stagedOnly)
+            };
+        }
         if ("unlink" === changeType) return await handleFileDeletion(repoPath, relativePath, editorYaml);
         for (const route of ROUTES)if (route.matches(relativePath)) return await route.handle(repoPath, relativePath, changeType, editorYaml, stagedOnly);
         return {
@@ -48892,6 +48940,14 @@ var __webpack_exports__ = {};
             throw new Error(`Failed to parse anvil.yaml: ${error.message}. File may be in an invalid state.`);
         }
         if (!parsedYaml || "object" != typeof parsedYaml) throw new Error("anvil.yaml is not a valid YAML object");
+        const currentRequirements = await readServerRequirements(repoPath);
+        if (void 0 !== currentRequirements) parsedYaml.runtime_options = {
+            ...parsedYaml.runtime_options ?? {},
+            server_spec: {
+                ...parsedYaml.runtime_options?.server_spec ?? {},
+                requirements: currentRequirements
+            }
+        };
         if (!validateAnvilYaml(yamlContent)) throw new Error("anvil.yaml validation failed - see errors above");
         const changes = [];
         for (const [key, value] of Object.entries(parsedYaml))if (!previousYaml || !deepEqual(previousYaml[key], value)) changes.push({
@@ -49135,7 +49191,19 @@ var __webpack_exports__ = {};
         async getHeadAnvilYaml() {
             try {
                 const content = await this.config.gitService.show("HEAD:anvil.yaml");
-                return js_yaml_load(content);
+                const parsedYaml = js_yaml_load(content);
+                if (!parsedYaml || "object" != typeof parsedYaml) return null;
+                try {
+                    const requirements = await this.config.gitService.show("HEAD:server_code/requirements.txt");
+                    parsedYaml.runtime_options = {
+                        ...parsedYaml.runtime_options ?? {},
+                        server_spec: {
+                            ...parsedYaml.runtime_options?.server_spec ?? {},
+                            requirements
+                        }
+                    };
+                } catch (e) {}
+                return parsedYaml;
             } catch (e) {
                 return null;
             }
@@ -50807,7 +50875,7 @@ var __webpack_exports__ = {};
     async function confirmReverseLookupWithResolvedUser(anvilUrl, username) {
         const resolvedUsername = await resolveUsernameForUrl(anvilUrl, username, `Multiple accounts found for ${anvilUrl}. Which account should be used for app lookup?`);
         if (null === resolvedUsername) return null;
-        const shouldContinue = await logger_logger.confirm(`Search ${anvilUrl} ${resolvedUsername ? `for ${resolvedUsername}` : ""} for matching app IDs? (slower)`, true);
+        const shouldContinue = await logger_logger.confirm(`Search ${anvilUrl} ${resolvedUsername ? `for ${resolvedUsername}` : ""} for matching app IDs? This is slower than detecting the app ID from local git remotes.`, true);
         return {
             username: resolvedUsername,
             shouldContinue
@@ -50864,6 +50932,11 @@ var __webpack_exports__ = {};
             };
             return null;
         }
+        if (1 === candidates.length) {
+            const [candidate] = candidates;
+            logger_logger.success("Auto-selected detected app ID: " + chalk_source.bold(candidate.appId));
+            return candidate;
+        }
         const choices = candidates.map((candidate, index)=>({
                 name: formatCandidateLabel(candidate),
                 value: index
@@ -50873,12 +50946,11 @@ var __webpack_exports__ = {};
             value: null
         });
         try {
-            const promptText = 1 === candidates.length ? "Confirm the detected app ID:" : "Select an app ID:";
             const answer = await logger_logger.prompt([
                 {
                     type: "list",
                     name: "appId",
-                    message: promptText,
+                    message: "Select an app ID:",
                     choices: choices,
                     pageSize: 10
                 }

package/dist/index.js

@@ -23536,6 +23536,16 @@ var __webpack_exports__ = {};
     function normalizeClientCodePath(relativePath) {
         return relativePath.replace(/\\/g, "/");
     }
+    function isServerRequirementsPath(relativePath) {
+        return "server_code/requirements.txt" === relativePath.replace(/\\/g, "/");
+    }
+    async function readServerRequirements(repoPath) {
+        try {
+            return await external_fs_.promises.readFile(external_path_default().join(repoPath, "server_code", "requirements.txt"), "utf8");
+        } catch (error) {
+            return;
+        }
+    }
     function detectFormTemplate(relativePath) {
         const normalized = normalizeClientCodePath(relativePath);
         if (!normalized.startsWith("client_code/")) return null;
@@ -23999,6 +24009,44 @@ var __webpack_exports__ = {};
             type: "ignore",
             reason: "anvil.yaml handled specially (multiple save paths)"
         };
+        if (isServerRequirementsPath(relativePath)) {
+            if ("unlink" === changeType) {
+                const anvilYamlContent = await readFileContent(repoPath, "anvil.yaml", stagedOnly);
+                const anvilConfig = jsYaml.load(anvilYamlContent) ?? {};
+                const runtimeOptions = {
+                    ...anvilConfig.runtime_options ?? {}
+                };
+                const serverSpec = {
+                    ...runtimeOptions.server_spec ?? {}
+                };
+                delete serverSpec.requirements;
+                if (Object.keys(serverSpec).length > 0) return {
+                    type: "save",
+                    savePath: [
+                        "runtime_options",
+                        "server_spec"
+                    ],
+                    content: serverSpec
+                };
+                delete runtimeOptions.server_spec;
+                return {
+                    type: "save",
+                    savePath: [
+                        "runtime_options"
+                    ],
+                    content: runtimeOptions
+                };
+            }
+            return {
+                type: "save",
+                savePath: [
+                    "runtime_options",
+                    "server_spec",
+                    "requirements"
+                ],
+                content: await readFileContent(repoPath, relativePath, stagedOnly)
+            };
+        }
         if ("unlink" === changeType) return await handleFileDeletion(repoPath, relativePath, editorYaml);
         for (const route of ROUTES)if (route.matches(relativePath)) return await route.handle(repoPath, relativePath, changeType, editorYaml, stagedOnly);
         return {
@@ -24405,6 +24453,14 @@ var __webpack_exports__ = {};
             throw new Error(`Failed to parse anvil.yaml: ${error.message}. File may be in an invalid state.`);
         }
         if (!parsedYaml || "object" != typeof parsedYaml) throw new Error("anvil.yaml is not a valid YAML object");
+        const currentRequirements = await readServerRequirements(repoPath);
+        if (void 0 !== currentRequirements) parsedYaml.runtime_options = {
+            ...parsedYaml.runtime_options ?? {},
+            server_spec: {
+                ...parsedYaml.runtime_options?.server_spec ?? {},
+                requirements: currentRequirements
+            }
+        };
         if (!validateAnvilYaml(yamlContent)) throw new Error("anvil.yaml validation failed - see errors above");
         const changes = [];
         for (const [key, value] of Object.entries(parsedYaml))if (!previousYaml || !deepEqual(previousYaml[key], value)) changes.push({
@@ -24648,7 +24704,19 @@ var __webpack_exports__ = {};
         async getHeadAnvilYaml() {
             try {
                 const content = await this.config.gitService.show("HEAD:anvil.yaml");
-                return load(content);
+                const parsedYaml = load(content);
+                if (!parsedYaml || "object" != typeof parsedYaml) return null;
+                try {
+                    const requirements = await this.config.gitService.show("HEAD:server_code/requirements.txt");
+                    parsedYaml.runtime_options = {
+                        ...parsedYaml.runtime_options ?? {},
+                        server_spec: {
+                            ...parsedYaml.runtime_options?.server_spec ?? {},
+                            requirements
+                        }
+                    };
+                } catch (e) {}
+                return parsedYaml;
             } catch (e) {
                 return null;
             }

package/package.json

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

package/scripts/install/install.cmd

@@ -30,4 +30,10 @@ powershell -NoProfile -ExecutionPolicy Bypass -File "%SCRIPT_PATH%"
 set "EXIT_CODE=%ERRORLEVEL%"
 
 del /q "%SCRIPT_PATH%" >nul 2>&1
+
+if "%EXIT_CODE%"=="0" (
+  echo.
+  echo Next steps: run 'anvil configure' or 'anvil checkout'
+)
+
 exit /b %EXIT_CODE%

package/scripts/install/install.ps1

@@ -183,7 +183,7 @@ function Main {
 
     Write-Info ''
     Write-Info "anvil-cli installed successfully (v$version)"
-    Write-Info "Next step: run 'anvil configure'"
+    Write-Info "Next steps: run 'anvil configure' or 'anvil checkout'"
     Write-Info "If your current terminal cannot find 'anvil', start a new terminal session."
 }
 

package/scripts/install/install.sh

@@ -153,7 +153,7 @@ main() {
 
     log ""
     log "anvil-cli installed successfully${version:+ (v$version)}"
-    log "Next step: run 'anvil configure'"
+    log "Next steps: run 'anvil configure' or 'anvil checkout'"
     log "If your current shell cannot find 'anvil', open a new terminal session."
 }