@narumitw/pi-sync 0.50.3 → 0.51.1

package/src/ui/setup/setup-wizard.ts

@@ -8,32 +8,32 @@ import { promptInitialSetupName } from "./setup-name-ui.js";
 import { showWebDavSetup } from "./webdav-ui.js";
 
 export async function showSetupWizard(ctx: ExtensionCommandContext, signal?: AbortSignal) {
-	if (ctx.mode !== "tui") {
-		ctx.ui.notify(
-			`Guided sync setup requires TUI mode for masked credential input. Create version 3 settings in ${safeTerminalText(localConfigPath())}.`,
-			"warning",
-		);
-		return false;
-	}
-	const preset = await ctx.ui.select(
-		"Set up sync\n\nWhere will Pi settings be stored?",
-		["Cloudflare R2", "Other S3-compatible storage", "WebDAV", "Git", "Cancel"],
-		{ signal },
-	);
-	if (signal?.aborted || !preset || preset === "Cancel") return false;
-	const targetName = await promptInitialSetupName(ctx, signal);
-	if (!targetName) return false;
-	if (preset === "WebDAV") {
-		const saved = await showWebDavSetup(ctx, targetName, signal);
-		if (signal?.aborted) return false;
-		if (saved) await refreshTargetCompletions();
-		return saved;
-	}
-	if (preset === "Git") {
-		const saved = await showGitSetup(ctx, targetName, signal);
-		if (signal?.aborted) return false;
-		if (saved) await refreshTargetCompletions();
-		return saved;
-	}
-	return showS3Setup(ctx, preset, targetName, signal);
+  if (ctx.mode !== "tui") {
+    ctx.ui.notify(
+      `Guided sync setup requires TUI mode for masked credential input. Create version 3 settings in ${safeTerminalText(localConfigPath())}.`,
+      "warning",
+    );
+    return false;
+  }
+  const preset = await ctx.ui.select(
+    "Set up sync\n\nWhere will Pi settings be stored?",
+    ["Cloudflare R2", "Other S3-compatible storage", "WebDAV", "Git", "Cancel"],
+    { signal },
+  );
+  if (signal?.aborted || !preset || preset === "Cancel") return false;
+  const targetName = await promptInitialSetupName(ctx, signal);
+  if (!targetName) return false;
+  if (preset === "WebDAV") {
+    const saved = await showWebDavSetup(ctx, targetName, signal);
+    if (signal?.aborted) return false;
+    if (saved) await refreshTargetCompletions();
+    return saved;
+  }
+  if (preset === "Git") {
+    const saved = await showGitSetup(ctx, targetName, signal);
+    if (signal?.aborted) return false;
+    if (saved) await refreshTargetCompletions();
+    return saved;
+  }
+  return showS3Setup(ctx, preset, targetName, signal);
 }

package/src/ui/setup/text-input.ts

@@ -5,74 +5,70 @@ import { safeTerminalText } from "../terminal-text.js";
 
 export type ValidateInput = (value: string) => string | Promise<string>;
 
-export async function requiredExistingBucket(
-	ctx: ExtensionCommandContext,
-	example: string,
-	signal?: AbortSignal,
-) {
-	return requiredValueInput(
-		ctx,
-		"Existing bucket\n\nThe bucket must already exist; pi-sync will not create it.",
-		example,
-		signal,
-		normalizeS3Bucket,
-	);
+export async function requiredExistingBucket(ctx: ExtensionCommandContext, example: string, signal?: AbortSignal) {
+  return requiredValueInput(
+    ctx,
+    "Existing bucket\n\nThe bucket must already exist; pi-sync will not create it.",
+    example,
+    signal,
+    normalizeS3Bucket,
+  );
 }
 
 export async function requiredInput(
-	ctx: ExtensionCommandContext,
-	title: string,
-	defaultValue: string,
-	signal?: AbortSignal,
-	validate?: ValidateInput,
+  ctx: ExtensionCommandContext,
+  title: string,
+  defaultValue: string,
+  signal?: AbortSignal,
+  validate?: ValidateInput,
 ) {
-	return promptTextInput(ctx, title, { defaultValue, validate, rejectPlaceholders: true }, signal);
+  return promptTextInput(ctx, title, { defaultValue, validate, rejectPlaceholders: true }, signal);
 }
 
 export async function requiredValueInput(
-	ctx: ExtensionCommandContext,
-	title: string,
-	example: string,
-	signal?: AbortSignal,
-	validate?: ValidateInput,
+  ctx: ExtensionCommandContext,
+  title: string,
+  example: string,
+  signal?: AbortSignal,
+  validate?: ValidateInput,
 ) {
-	return promptTextInput(ctx, title, { example, validate, rejectPlaceholders: true }, signal);
+  return promptTextInput(ctx, title, { example, validate, rejectPlaceholders: true }, signal);
 }
 
 export async function promptTextInput(
-	ctx: ExtensionCommandContext,
-	title: string,
-	options: {
-		defaultValue?: string;
-		example?: string;
-		validate?: ValidateInput;
-		rejectPlaceholders?: boolean;
-	},
-	signal?: AbortSignal,
+  ctx: ExtensionCommandContext,
+  title: string,
+  options: {
+    defaultValue?: string;
+    example?: string;
+    validate?: ValidateInput;
+    rejectPlaceholders?: boolean;
+  },
+  signal?: AbortSignal,
 ) {
-	// Pi ignores placeholders. Keep defaults/examples visible; only an explicit blank accepts a default.
-	const hint =
-		options.defaultValue !== undefined
-			? `Default: ${safeTerminalText(options.defaultValue)} (leave blank to keep)`
-			: `Example: ${safeTerminalText(options.example ?? "")}\nEnter your own value; this example is not a default.`;
-	while (true) {
-		signal?.throwIfAborted();
-		const value = await ctx.ui.input(`${title}\n\n${hint}`, undefined, { signal });
-		signal?.throwIfAborted();
-		if (value === undefined) return undefined;
-		try {
-			const normalized = value.trim() || options.defaultValue;
-			if (!normalized) throw new Error(`${title.split("\n")[0]} is required.`);
-			if (options.rejectPlaceholders && /[<>]/u.test(normalized)) {
-				throw new Error("Replace example placeholders such as <account-id> with your own value.");
-			}
-			const checked = requiredString(normalized, title.split("\n")[0] ?? "value");
-			const result = options.validate ? await options.validate(checked) : checked;
-			signal?.throwIfAborted();
-			return result;
-		} catch (error) {
-			signal?.throwIfAborted();
-			ctx.ui.notify(`${errorMessage(error)} Enter a corrected value, or cancel.`, "warning");
-		}
-	}
+  // Pi ignores placeholders. Keep defaults/examples visible; only an explicit blank accepts a default.
+  const hint =
+    options.defaultValue !== undefined
+      ? `Default: ${safeTerminalText(options.defaultValue)} (leave blank to keep)`
+      : `Example: ${safeTerminalText(options.example ?? "")}\nEnter your own value; this example is not a default.`;
+  while (true) {
+    signal?.throwIfAborted();
+    const value = await ctx.ui.input(`${title}\n\n${hint}`, undefined, { signal });
+    signal?.throwIfAborted();
+    if (value === undefined) return undefined;
+    try {
+      const normalized = value.trim() || options.defaultValue;
+      if (!normalized) throw new Error(`${title.split("\n")[0]} is required.`);
+      if (options.rejectPlaceholders && /[<>]/u.test(normalized)) {
+        throw new Error("Replace example placeholders such as <account-id> with your own value.");
+      }
+      const checked = requiredString(normalized, title.split("\n")[0] ?? "value");
+      const result = options.validate ? await options.validate(checked) : checked;
+      signal?.throwIfAborted();
+      return result;
+    } catch (error) {
+      signal?.throwIfAborted();
+      ctx.ui.notify(`${errorMessage(error)} Enter a corrected value, or cancel.`, "warning");
+    }
+  }
 }