doomain 0.1.11 → 0.1.12

package/dist/commands/providers/connect.js

@@ -3,7 +3,7 @@ import * as p from '@clack/prompts';
 import { getConfigPath, loadConfig, maskSecret, updateConfig } from '../../lib/config.js';
 import { accountFlag, jsonFlag } from '../../lib/flags.js';
 import { createOutput, outputError } from '../../lib/output.js';
-import { isDefaultProviderAccount, listConfiguredProviderAccounts, normalizeProviderAccount } from '../../lib/providers/core/config.js';
+import { DEFAULT_PROVIDER_ACCOUNT, isDefaultProviderAccount, listConfiguredProviderAccounts, normalizeProviderAccount, providerAccountHasCredentials, withProviderAccountCredentials, } from '../../lib/providers/core/config.js';
 import { getProviderDefinition, listProviderDefinitions } from '../../lib/providers/registry.js';
 function requireString(value, message) {
     if (typeof value === 'string' && value.trim())
@@ -58,6 +58,34 @@ async function promptCredential(credential, detectedPublicIp) {
     }
     return typeof value === 'string' && value.trim() ? value.trim() : null;
 }
+function validateProviderAccount(value) {
+    try {
+        normalizeProviderAccount(value);
+        return undefined;
+    }
+    catch (error) {
+        return error instanceof Error ? error.message : String(error);
+    }
+}
+async function promptProviderAccount() {
+    const value = await p.text({ message: 'Profile name', placeholder: DEFAULT_PROVIDER_ACCOUNT, validate: validateProviderAccount });
+    if (p.isCancel(value)) {
+        p.cancel('Cancelled');
+        return null;
+    }
+    return normalizeProviderAccount(value);
+}
+async function confirmProviderAccountOverwrite(definition, account) {
+    const value = await p.confirm({
+        initialValue: false,
+        message: `Profile "${account}" already exists for ${definition.displayName}. Overwrite it?`,
+    });
+    if (p.isCancel(value)) {
+        p.cancel('Cancelled');
+        return false;
+    }
+    return value;
+}
 async function promptProvider() {
     const config = await loadConfig();
     const selected = await p.select({
@@ -108,8 +136,16 @@ export default class ProvidersConnect extends Command {
             const definition = args.provider ? getProviderDefinition(args.provider) : await promptProvider();
             if (!definition)
                 return;
-            const account = normalizeProviderAccount(flags.account);
+            const account = flags.account ? normalizeProviderAccount(flags.account) : out.json ? DEFAULT_PROVIDER_ACCOUNT : await promptProviderAccount();
+            if (!account)
+                return;
             const isDefaultAccount = isDefaultProviderAccount(account);
+            const currentConfig = await loadConfig();
+            if (!out.json && providerAccountHasCredentials(currentConfig, definition.id, account)) {
+                const overwrite = await confirmProviderAccountOverwrite(definition, account);
+                if (!overwrite)
+                    return;
+            }
             const passedCredentials = parseCredentialFlags(flags.credential);
             const credentials = {};
             const detectedPublicIp = !out.json && usesClientIp(definition) ? await fetchPublicIp() : undefined;
@@ -148,7 +184,6 @@ export default class ProvidersConnect extends Command {
                 spinner = undefined;
             }
             let setDefault = true;
-            const currentConfig = await loadConfig();
             if (!out.json && currentConfig.defaults?.provider && currentConfig.defaults.provider !== definition.id) {
                 const value = await p.confirm({
                     initialValue: true,
@@ -165,15 +200,7 @@ export default class ProvidersConnect extends Command {
                 defaults: setDefault ? { ...config.defaults, provider: definition.id } : config.defaults,
                 providers: {
                     ...config.providers,
-                    [definition.id]: isDefaultAccount
-                        ? { ...config.providers?.[definition.id], credentials }
-                        : {
-                            ...config.providers?.[definition.id],
-                            accounts: {
-                                ...config.providers?.[definition.id]?.accounts,
-                                [account]: { credentials },
-                            },
-                        },
+                    [definition.id]: withProviderAccountCredentials(config.providers?.[definition.id], account, credentials),
                 },
             }));
             out.result({

package/dist/commands/wizard.js

@@ -6,7 +6,7 @@ import { jsonFlag } from '../lib/flags.js';
 import { createLinkPlan, linkDomain } from '../lib/link-domain.js';
 import { detectLocalVercelProject } from '../lib/local-vercel.js';
 import { createOutput, outputError } from '../lib/output.js';
-import { DEFAULT_PROVIDER_ACCOUNT, listConfiguredProviderAccounts } from '../lib/providers/core/config.js';
+import { DEFAULT_PROVIDER_ACCOUNT, isDefaultProviderAccount, listConfiguredProviderAccounts, normalizeProviderAccount, providerAccountHasCredentials, withProviderAccountCredentials, } from '../lib/providers/core/config.js';
 import { createProvider, getProviderDefinition, listProviderDefinitions } from '../lib/providers/registry.js';
 import { listGlobalVercelTokens } from '../lib/vercel-auth.js';
 import { createVercelClient } from '../lib/vercel.js';
@@ -26,6 +26,28 @@ async function promptRequired(message, opts = {}) {
     const resolved = cancelIfNeeded(value);
     return typeof resolved === 'string' ? resolved.trim() : null;
 }
+function validateProviderAccount(value) {
+    try {
+        normalizeProviderAccount(value);
+        return undefined;
+    }
+    catch (error) {
+        return error instanceof Error ? error.message : String(error);
+    }
+}
+async function promptProviderAccount() {
+    const value = await p.text({ message: 'Profile name', placeholder: DEFAULT_PROVIDER_ACCOUNT, validate: validateProviderAccount });
+    const resolved = cancelIfNeeded(value);
+    return typeof resolved === 'string' ? normalizeProviderAccount(resolved) : null;
+}
+async function confirmProviderAccountOverwrite(definition, account) {
+    const value = await p.confirm({
+        initialValue: false,
+        message: `Profile "${account}" already exists for ${definition.displayName}. Overwrite it?`,
+    });
+    const resolved = cancelIfNeeded(value);
+    return resolved === true;
+}
 async function fetchPublicIp() {
     const controller = new AbortController();
     const timeout = setTimeout(() => controller.abort(), 2000);
@@ -251,6 +273,15 @@ export default class Wizard extends Command {
                 if (!selectedDefinition)
                     return;
                 showProviderSetup(selectedDefinition);
+                const account = await promptProviderAccount();
+                if (!account)
+                    return;
+                if (providerAccountHasCredentials(config, selectedDefinition.id, account)) {
+                    const overwrite = await confirmProviderAccountOverwrite(selectedDefinition, account);
+                    if (!overwrite)
+                        return;
+                }
+                const providerAccount = { account, isDefaultAccount: isDefaultProviderAccount(account), providerId: selectedDefinition.id };
                 const credentials = await promptProviderCredentials(selectedDefinition);
                 if (!credentials)
                     return;
@@ -261,11 +292,14 @@ export default class Wizard extends Command {
                 const zones = await provider.listZones();
                 domainSpinner.stop(`Connected ${selectedDefinition.displayName} and loaded ${zones.length} domain${zones.length === 1 ? '' : 's'}`);
                 activeSpinner = undefined;
-                domainOptions.push(...zones.map((zone) => toProviderDomainOption(selectedDefinition, { account: DEFAULT_PROVIDER_ACCOUNT, isDefaultAccount: true, providerId: selectedDefinition.id }, zone)));
+                domainOptions.push(...zones.map((zone) => toProviderDomainOption(selectedDefinition, providerAccount, zone)));
                 await updateConfig((current) => ({
                     ...current,
                     defaults: { ...current.defaults, provider: selectedDefinition.id },
-                    providers: { ...current.providers, [selectedDefinition.id]: { credentials } },
+                    providers: {
+                        ...current.providers,
+                        [selectedDefinition.id]: withProviderAccountCredentials(current.providers?.[selectedDefinition.id], account, credentials),
+                    },
                     vercel: { token: vercelToken, teamId: vercelTeamId },
                 }));
             }

package/dist/lib/command-schema.js

@@ -26,7 +26,7 @@ export const commandSchemas = [
         flags: [
             { name: 'json', type: 'boolean', description: 'Output a single JSON object and never prompt.' },
             { name: 'provider', type: 'string', description: 'DNS provider id. Inferred from the target domain when omitted.' },
-            { name: 'account', type: 'string', description: 'DNS provider account alias. Defaults to the provider default account.' },
+            { name: 'account', type: 'string', description: 'DNS provider profile/account alias. Defaults to the provider default account.' },
             { name: 'domain', type: 'string', description: 'Target domain or base zone, for example app.example.com or example.com.' },
             { name: 'subdomain', type: 'string', description: 'Subdomain to add.' },
             { name: 'apex', type: 'boolean', description: 'Use the root/apex domain.' },
@@ -50,7 +50,7 @@ export const commandSchemas = [
         ],
         flags: [
             { name: 'json', type: 'boolean', description: 'Output a single JSON object and never prompt.' },
-            { name: 'account', type: 'string', description: 'DNS provider account alias. Defaults to the provider default account.' },
+            { name: 'account', type: 'string', description: 'DNS provider profile/account alias. Defaults to the provider default account.' },
             { name: 'credential', type: 'string', description: 'Provider credential as key=value. Can be repeated.' },
             { name: 'api-key', type: 'string', description: 'Spaceship API key.' },
             { name: 'api-secret', type: 'string', description: 'Spaceship API secret.' },
@@ -63,7 +63,7 @@ export const commandSchemas = [
         examples: ['doomain providers add', 'doomain providers add namecheap', 'doomain providers add spaceship --account work'],
         flags: [
             { name: 'json', type: 'boolean', description: 'Output a single JSON object and never prompt.' },
-            { name: 'account', type: 'string', description: 'DNS provider account alias. Defaults to the provider default account.' },
+            { name: 'account', type: 'string', description: 'DNS provider profile/account alias. Defaults to the provider default account.' },
             { name: 'credential', type: 'string', description: 'Provider credential as key=value. Can be repeated.' },
             { name: 'no-verify', type: 'boolean', description: 'Save credentials without verifying them first.' },
         ],
@@ -88,7 +88,7 @@ export const commandSchemas = [
         ],
         flags: [
             { name: 'json', type: 'boolean', description: 'Output a single JSON object and never prompt.' },
-            { name: 'account', type: 'string', description: 'DNS provider account alias. Omit to remove all accounts for the provider.' },
+            { name: 'account', type: 'string', description: 'DNS provider profile/account alias. Omit to remove all accounts for the provider.' },
         ],
     },
     {
@@ -102,7 +102,7 @@ export const commandSchemas = [
         ],
         flags: [
             { name: 'json', type: 'boolean', description: 'Output a single JSON object and never prompt.' },
-            { name: 'account', type: 'string', description: 'DNS provider account alias. Defaults to the provider default account.' },
+            { name: 'account', type: 'string', description: 'DNS provider profile/account alias. Defaults to the provider default account.' },
         ],
     },
     {

package/dist/lib/flags.js

@@ -1,7 +1,7 @@
 import { Flags } from '@oclif/core';
 export const jsonFlag = Flags.boolean({ description: 'Output a single JSON object and never prompt.' });
 export const providerFlag = Flags.string({ description: 'DNS provider id. Inferred from the target domain when omitted.' });
-export const accountFlag = Flags.string({ description: 'DNS provider account alias. Defaults to the provider default account.' });
+export const accountFlag = Flags.string({ description: 'DNS provider profile/account alias. Defaults to the provider default account.' });
 export const domainFlag = Flags.string({ description: 'Target domain or base zone, for example app.example.com or example.com.' });
 export const subdomainFlag = Flags.string({ description: 'Subdomain to add, for example app for app.example.com.' });
 export const apexFlag = Flags.boolean({ description: 'Use the root/apex domain instead of a subdomain.' });

package/dist/lib/providers/core/config.d.ts

@@ -1,4 +1,4 @@
-import { type DoomainConfig } from '../../config.js';
+import { type DoomainConfig, type ProviderConfig } from '../../config.js';
 import type { CredentialDefinition, DnsProviderDefinition, ProviderContext } from './types.js';
 export declare const DEFAULT_PROVIDER_ACCOUNT = "default";
 export interface ProviderAccountRef {
@@ -13,6 +13,8 @@ export declare function normalizeProviderAccount(account?: string): string;
 export declare function isDefaultProviderAccount(account?: string): boolean;
 export declare function getProviderCredentials(config: DoomainConfig, providerId: string, opts?: ProviderAccountOptions): Record<string, string>;
 export declare function getProviderCredential(config: DoomainConfig, providerId: string, credential: CredentialDefinition, opts?: ProviderAccountOptions): string | undefined;
+export declare function providerAccountHasCredentials(config: DoomainConfig, providerId: string, accountInput?: string): boolean;
+export declare function withProviderAccountCredentials(current: ProviderConfig | undefined, accountInput: string, credentials: Record<string, string>): ProviderConfig;
 export declare function isProviderAccountConfigured(definition: DnsProviderDefinition, config: DoomainConfig, opts?: ProviderAccountOptions): boolean;
 export declare function listConfiguredProviderAccounts(config: DoomainConfig, definition: DnsProviderDefinition): ProviderAccountRef[];
 export declare function createProviderContext(definition: DnsProviderDefinition, opts?: ProviderAccountOptions): Promise<ProviderContext>;

package/dist/lib/providers/core/config.js

@@ -30,6 +30,9 @@ function credentialFromSavedConfig(config, providerId, account, key) {
         return legacyCredential(config, providerId, key);
     return undefined;
 }
+function hasCredentials(credentials) {
+    return credentials !== undefined && Object.keys(credentials).length > 0;
+}
 export function getProviderCredentials(config, providerId, opts = {}) {
     const account = normalizeProviderAccount(opts.account);
     const current = providerConfig(config, providerId);
@@ -40,6 +43,27 @@ export function getProviderCredential(config, providerId, credential, opts = {})
     const account = normalizeProviderAccount(opts.account);
     return process.env[credential.env] || credentialFromSavedConfig(config, providerId, account, credential.key);
 }
+export function providerAccountHasCredentials(config, providerId, accountInput) {
+    const account = normalizeProviderAccount(accountInput);
+    const current = providerConfig(config, providerId);
+    if (!current)
+        return false;
+    if (account !== DEFAULT_PROVIDER_ACCOUNT)
+        return hasCredentials(current.accounts?.[account]?.credentials);
+    return hasCredentials(current.credentials) || Boolean(legacyCredential(config, providerId, 'apiKey') || legacyCredential(config, providerId, 'apiSecret'));
+}
+export function withProviderAccountCredentials(current, accountInput, credentials) {
+    const account = normalizeProviderAccount(accountInput);
+    if (account === DEFAULT_PROVIDER_ACCOUNT)
+        return { ...current, credentials };
+    return {
+        ...current,
+        accounts: {
+            ...current?.accounts,
+            [account]: { credentials },
+        },
+    };
+}
 export function isProviderAccountConfigured(definition, config, opts = {}) {
     return definition.credentials.every((credential) => credential.required === false || Boolean(getProviderCredential(config, definition.id, credential, opts)));
 }

package/oclif.manifest.json

@@ -20,7 +20,7 @@
       ],
       "flags": {
         "account": {
-          "description": "DNS provider account alias. Defaults to the provider default account.",
+          "description": "DNS provider profile/account alias. Defaults to the provider default account.",
           "name": "account",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -273,7 +273,7 @@
       "description": "List DNS zones and records for a provider.",
       "flags": {
         "account": {
-          "description": "DNS provider account alias. Defaults to the provider default account.",
+          "description": "DNS provider profile/account alias. Defaults to the provider default account.",
           "name": "account",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -363,7 +363,7 @@
       "description": "Save DNS provider credentials locally.",
       "flags": {
         "account": {
-          "description": "DNS provider account alias. Defaults to the provider default account.",
+          "description": "DNS provider profile/account alias. Defaults to the provider default account.",
           "name": "account",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -432,7 +432,7 @@
       "description": "Save DNS provider credentials locally.",
       "flags": {
         "account": {
-          "description": "DNS provider account alias. Defaults to the provider default account.",
+          "description": "DNS provider profile/account alias. Defaults to the provider default account.",
           "name": "account",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -507,7 +507,7 @@
       ],
       "flags": {
         "account": {
-          "description": "DNS provider account alias. Defaults to the provider default account.",
+          "description": "DNS provider profile/account alias. Defaults to the provider default account.",
           "name": "account",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -610,7 +610,7 @@
       "description": "Verify saved DNS provider credentials.",
       "flags": {
         "account": {
-          "description": "DNS provider account alias. Defaults to the provider default account.",
+          "description": "DNS provider profile/account alias. Defaults to the provider default account.",
           "name": "account",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -673,5 +673,5 @@
       ]
     }
   },
-  "version": "0.1.11"
+  "version": "0.1.12"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "doomain",
   "description": "Link your vercel project and domain in seconds",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "author": "Crafter Station",
   "packageManager": "bun@1.3.13",
   "bin": {