@studiometa/forge-cli 0.2.3 → 0.2.5

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { a as createContext, c as colors, d as deleteToken, i as runCommand, l as setColorEnabled, m as setToken, n as exitWithValidationError, p as getToken, s as OutputFormatter, u as createConfigStore, v as ValidationError } from "./error-handler-BahHMt6t.js";
-import { activateCertificate, createAuditLogger, createBackupConfig, createCommand, createDatabaseUser, createMonitor, createNginxTemplate, createRedirectRule, createScheduledJob, createSecurityRule, deleteBackupConfig, deleteDatabaseUser, deleteMonitor, deleteNginxTemplate, deleteRedirectRule, deleteScheduledJob, deleteSecurityRule, deploySiteAndWait, getBackupConfig, getCertificate, getCommand, getDaemon, getDatabase, getDatabaseUser, getEnv, getFirewallRule, getMonitor, getNginxConfig, getNginxTemplate, getRecipe, getRedirectRule, getScheduledJob, getSecurityRule, getServer, getSite, getSshKey, getUser, listBackupConfigs, listCertificates, listCommands, listDaemons, listDatabaseUsers, listDatabases, listDeployments, listFirewallRules, listMonitors, listNginxTemplates, listRecipes, listRedirectRules, listScheduledJobs, listSecurityRules, listServers, listSites, listSshKeys, rebootServer, restartDaemon, runRecipe, updateEnv, updateNginxConfig, updateNginxTemplate } from "@studiometa/forge-core";
+import { activateCertificate, createAuditLogger, createBackupConfig, createCommand, createDatabaseUser, createMonitor, createNginxTemplate, createRedirectRule, createScheduledJob, createSecurityRule, deleteBackupConfig, deleteDatabaseUser, deleteMonitor, deleteNginxTemplate, deleteRedirectRule, deleteScheduledJob, deleteSecurityRule, deploySiteAndWait, getBackupConfig, getCertificate, getCommand, getDaemon, getDatabase, getDatabaseUser, getEnv, getFirewallRule, getMonitor, getNginxConfig, getNginxTemplate, getRecipe, getRedirectRule, getScheduledJob, getSecurityRule, getServer, getSite, getSshKey, getUser, listBackupConfigs, listCertificates, listCommands, listDaemons, listDatabaseUsers, listDatabases, listDeployments, listFirewallRules, listMonitors, listNginxTemplates, listRecipes, listRedirectRules, listScheduledJobs, listSecurityRules, listServers, listSites, listSshKeys, matchByName, rebootServer, restartDaemon, runRecipe, updateEnv, updateNginxConfig, updateNginxTemplate } from "@studiometa/forge-core";
 import { mkdirSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
@@ -70,10 +70,8 @@ function createCommandRouter(config) {
 async function resolveServerId(value, execCtx) {
 	if (/^\d+$/.test(value)) return value;
 	const servers = (await listServers({}, execCtx)).data;
-	const lower = value.toLowerCase();
-	const exact = servers.filter((s) => s.name.toLowerCase() === lower);
+	const { exact, partial } = matchByName(servers, value, (s) => s.name);
 	if (exact.length === 1) return String(exact[0].id);
-	const partial = servers.filter((s) => s.name.toLowerCase().includes(lower));
 	if (partial.length === 0) {
 		const available = servers.map((s) => `  ${s.name} (${s.id})`).join("\n");
 		throw new ValidationError(`No server found matching "${value}"`, "server", [`Available servers:\n${available}`]);
@@ -95,10 +93,8 @@ async function resolveServerId(value, execCtx) {
 async function resolveSiteId(value, serverId, execCtx) {
 	if (/^\d+$/.test(value)) return value;
 	const sites = (await listSites({ server_id: serverId }, execCtx)).data;
-	const lower = value.toLowerCase();
-	const exact = sites.filter((s) => s.name.toLowerCase() === lower);
+	const { exact, partial } = matchByName(sites, value, (s) => s.name);
 	if (exact.length === 1) return String(exact[0].id);
-	const partial = sites.filter((s) => s.name.toLowerCase().includes(lower));
 	if (partial.length === 0) {
 		const available = sites.map((s) => `  ${s.name} (${s.id})`).join("\n");
 		throw new ValidationError(`No site found matching "${value}" on server ${serverId}`, "site", [`Available sites:\n${available}`]);
@@ -3214,7 +3210,7 @@ function parseArgs(argv = process.argv.slice(2)) {
 		positional
 	};
 }
-var VERSION = "0.2.3";
+var VERSION = "0.2.5";
 function showHelp() {
 	console.log(`
 ${colors.bold("forge-cli")} v${VERSION}