@takara-ai/miru-code 1.9.0 → 1.10.1

package/src/setup.ts

@@ -123,25 +123,27 @@ export function parseSetupCliArgs(rest: string[]): {
   return { args };
 }
 
-async function promptSageMakerArn(): Promise<string> {
-  while (true) {
-    const arn = await promptText("SageMaker endpoint ARN");
-    if (!arn) {
+async function promptSageMakerArn(promptTextImpl: typeof promptText = promptText): Promise<string> {
+  let arn = "";
+  while (!arn) {
+    const candidate = await promptTextImpl("SageMaker endpoint ARN");
+    if (!candidate) {
       fail("Endpoint ARN cannot be empty.");
       continue;
     }
     try {
-      parseSageMakerEndpointArn(arn);
-      return arn;
+      parseSageMakerEndpointArn(candidate);
+      arn = candidate;
     } catch (err) {
       fail(err instanceof Error ? err.message : String(err));
     }
   }
+  return arn;
 }
 
-async function promptAwsProfile(): Promise<string> {
+async function promptAwsProfile(promptTextImpl: typeof promptText = promptText): Promise<string> {
   while (true) {
-    const profile = await promptText(
+    const profile = await promptTextImpl(
       "AWS profile name (must already exist in ~/.aws)",
       process.env.AWS_PROFILE || "miru",
     );
@@ -152,11 +154,20 @@ async function promptAwsProfile(): Promise<string> {
   }
 }
 
+export interface SageMakerSetupDependencies {
+  promptText?: typeof promptText;
+  canPromptForCredentials?: typeof canPromptForCredentials;
+  validateConnection?: typeof validateSageMakerConnection;
+}
+
 /**
  * Miru only ever inherits AWS credentials — it never creates, writes, or rotates an
  * AWS profile. Set one up yourself first (e.g. `aws configure --profile miru`).
  */
-export async function runSageMakerSetup(options: RunSetupOptions = {}): Promise<RunSetupResult> {
+export async function runSageMakerSetup(
+  options: RunSetupOptions = {},
+  dependencies: SageMakerSetupDependencies = {},
+): Promise<RunSetupResult> {
   writeStdout("");
   printBrandBanner(process.stderr);
   divider("─", 48, process.stderr);
@@ -168,18 +179,19 @@ export async function runSageMakerSetup(options: RunSetupOptions = {}): Promise<
   );
   writeStdout("");
 
-  const arnInput = options.sagemakerArn ?? (await promptSageMakerArn());
+  const promptTextImpl = dependencies.promptText ?? promptText;
+  const arnInput = options.sagemakerArn ?? (await promptSageMakerArn(promptTextImpl));
   const parsed = parseSageMakerEndpointArn(arnInput);
 
   let profile = options.profile;
   if (!profile) {
-    if (!canPromptForCredentials()) {
+    if (!(dependencies.canPromptForCredentials ?? canPromptForCredentials)()) {
       throw new Error(
         "An AWS profile name is required. Pass --profile <name>, or run " +
           "`miru setup --sagemaker` interactively.",
       );
     }
-    profile = await promptAwsProfile();
+    profile = await promptAwsProfile(promptTextImpl);
   }
 
   await beginModeSwitch("sagemaker");
@@ -197,7 +209,7 @@ export async function runSageMakerSetup(options: RunSetupOptions = {}): Promise<
       truncate: true,
       truncationDirection: "Right",
     };
-    const result = await validateSageMakerConnection(config);
+    const result = await (dependencies.validateConnection ?? validateSageMakerConnection)(config);
     if (!result.valid) {
       spinner.stop();
       throw new Error(result.message);

package/src/snippet.ts

@@ -79,7 +79,7 @@ const RUBY_OR_ELIXIR_BODY_RE = /^\s*def\w*\b|^\s*defmodule\b/;
 const MAX_DECLARATION_LOOKBACK = 40;
 const INDENTED_BLOCK_LANGUAGES = new Set(["python", "haskell", "ocaml"]);
 const END_BLOCK_LANGUAGES = new Set(["ruby", "elixir"]);
-const TAG_LANGUAGES = new Set(["html", "embeddedtemplate", "xml", "vue", "svelte"]);
+const TAG_LANGUAGES = new Set(["html", "embeddedtemplate", "xml", "vue", "svelte", "astro"]);
 const BRACE_BLOCK_LANGUAGES = new Set([
   "bash",
   "c",
@@ -192,16 +192,14 @@ function completeHtmlTag(
   for (let i = Math.max(0, start - MAX_DECLARATION_LOOKBACK); i <= anchor; i++) {
     const line = lines[i] ?? "";
     for (const match of line.matchAll(HTML_TAG_RE)) {
-      const name = match[1]?.toLowerCase();
-      if (!name) {
-        continue;
-      }
+      const name = (match[1] as string).toLowerCase();
       if (match[0].startsWith("</")) {
-        for (let j = openTags.length - 1; j >= 0; j--) {
-          if (openTags[j]?.name === name) {
-            openTags.splice(j, 1);
-            break;
-          }
+        const matchingIndex = openTags.reduce(
+          (last, tag, index) => (tag.name === name ? index : last),
+          -1,
+        );
+        if (matchingIndex >= 0) {
+          openTags.splice(matchingIndex, 1);
         }
       } else if (!match[0].endsWith("/>") && !HTML_VOID_TAGS.has(name)) {
         openTags.push({ name, start: i });
@@ -374,10 +372,6 @@ function compactSupportingSnippet(snippet: SnippetResult, maxLines: number): Sni
 /** Pick the 0-based line index inside `content` that best matches the query. */
 export function anchorLineOffset(content: string, query: string): number {
   const lines = content.split("\n");
-  if (lines.length === 0) {
-    return 0;
-  }
-
   const terms = queryMatchTerms(query);
   let bestIndex = Math.floor(lines.length / 2);
   let bestScore = -1;
@@ -401,18 +395,6 @@ export function trimChunkToSnippet(
   anchorLine?: number,
 ): SnippetResult {
   const lines = chunk.content.split("\n");
-  if (lines.length === 0) {
-    return {
-      chunk,
-      meta: {
-        truncated: false,
-        anchor_line: chunk.start_line,
-        full_start_line: chunk.start_line,
-        full_end_line: chunk.end_line,
-      },
-    };
-  }
-
   const queryAnchorOffset = anchorLineOffset(chunk.content, query);
   const anchorOffset =
     anchorLine == null

package/src/spinner.ts

@@ -8,11 +8,14 @@ export class Spinner {
   private frame = 0;
   private belowLines = 0;
 
-  constructor(private readonly message: string) {}
+  constructor(
+    private readonly message: string,
+    private readonly stderr: SpinnerOutput = process.stderr,
+  ) {}
 
   start(): void {
-    if (!process.stderr.isTTY) {
-      process.stderr.write(`${this.message}...\n`);
+    if (!this.stderr.isTTY) {
+      this.stderr.write(`${this.message}...\n`);
       return;
     }
     this.draw();
@@ -20,17 +23,17 @@ export class Spinner {
   }
 
   follow(line: string): void {
-    if (!process.stderr.isTTY) {
-      process.stderr.write(`${line}\n`);
+    if (!this.stderr.isTTY) {
+      this.stderr.write(`${line}\n`);
       return;
     }
-    const cols = process.stderr.columns || 80;
+    const cols = this.stderr.columns || 80;
     const rows = line.split("\n").reduce((count, part) => {
       return count + Math.max(1, Math.ceil(displayWidth(part) / cols));
     }, 0);
-    process.stderr.write(`\n${line}`);
+    this.stderr.write(`\n${line}`);
     this.belowLines += rows;
-    process.stderr.write(`\x1b[${this.belowLines}A`);
+    this.stderr.write(`\x1b[${this.belowLines}A`);
   }
 
   stop(finalMessage?: string): void {
@@ -38,19 +41,19 @@ export class Spinner {
       clearInterval(this.timer);
       this.timer = null;
     }
-    if (process.stderr.isTTY) {
-      process.stderr.write("\r\x1b[K");
+    if (this.stderr.isTTY) {
+      this.stderr.write("\r\x1b[K");
       if (finalMessage) {
-        process.stderr.write(finalMessage);
+        this.stderr.write(finalMessage);
       }
       if (this.belowLines > 0) {
-        process.stderr.write(`\x1b[${this.belowLines}B`);
+        this.stderr.write(`\x1b[${this.belowLines}B`);
       }
       if (finalMessage || this.belowLines > 0) {
-        process.stderr.write("\n");
+        this.stderr.write("\n");
       }
     } else if (finalMessage) {
-      process.stderr.write(`${finalMessage}\n`);
+      this.stderr.write(`${finalMessage}\n`);
     }
   }
 
@@ -68,16 +71,23 @@ export class Spinner {
 
   private draw(): void {
     const glyph = FRAMES[this.frame++ % FRAMES.length];
-    process.stderr.write(`\r${dim(glyph)} ${this.message}`);
+    this.stderr.write(`\r${dim(glyph)} ${this.message}`);
   }
 }
 
+interface SpinnerOutput {
+  isTTY?: boolean;
+  columns?: number;
+  write(text: string): unknown;
+}
+
 export async function withSpinner<T>(
   message: string,
   fn: () => Promise<T>,
   options?: { successMessage?: string; failMessage?: string },
+  output: SpinnerOutput = process.stderr,
 ): Promise<T> {
-  const spinner = new Spinner(message);
+  const spinner = new Spinner(message, output);
   spinner.start();
   try {
     const result = await fn();

package/src/tokenizer/bert-wordpiece.ts

@@ -99,9 +99,6 @@ function whitespaceTokenize(text: string): string[] {
 
 function splitOnPunctuation(text: string): string[] {
   const chars = [...text];
-  if (chars.length === 0) {
-    return [];
-  }
 
   const output: string[][] = [];
   let startNewWord = true;
@@ -138,9 +135,6 @@ function wordpieceTokenize(
   prefix: string,
   maxInputCharsPerWord: number,
 ): string[] {
-  if (token.length === 0) {
-    return [];
-  }
   if (token.length > maxInputCharsPerWord) {
     return [unkToken];
   }

package/src/utils.ts

@@ -165,10 +165,6 @@ export function expandChunksAtLine(
   const anchorIndex = fileChunks.findIndex(
     (chunk) => chunk.start_line === anchor.start_line && chunk.end_line === anchor.end_line,
   );
-  if (anchorIndex < 0) {
-    return { anchor, chunks: [anchor] };
-  }
-
   const start = Math.max(0, anchorIndex - before);
   const end = Math.min(fileChunks.length, anchorIndex + after + 1);
   return { anchor, chunks: fileChunks.slice(start, end) };

package/src/version.ts

@@ -26,8 +26,8 @@ export function miruVersion(): string {
  * - 0.x releases: `0.{minor}` (chunking may break on minor bumps pre-1.0).
  * - 1.x+: major version only.
  */
-export function indexCacheEpoch(): string {
-  const parts = packageJson.version.split(".");
+export function indexCacheEpoch(version: string = packageJson.version): string {
+  const parts = version.split(".");
   const major = parts[0] ?? "0";
   const minor = parts[1] ?? "0";
   if (major === "0") {
@@ -118,7 +118,7 @@ export async function fetchLatestPublishedVersion(fetchImpl: Fetcher = fetch): P
 }
 
 /** Print update hint to stderr when a newer package is on npm (at most once per day). */
-export async function maybeNotifyUpdate(): Promise<void> {
+export async function maybeNotifyUpdate(fetchImpl: Fetcher = fetch): Promise<void> {
   if (process.env.MIRU_NO_UPDATE_CHECK === "1") {
     return;
   }
@@ -133,7 +133,7 @@ export async function maybeNotifyUpdate(): Promise<void> {
   }
 
   try {
-    const latest = await fetchLatestPublishedVersion();
+    const latest = await fetchLatestPublishedVersion(fetchImpl);
     await writeUpdateCheckCache(latest);
     if (isVersionNewer(latest, current)) {
       writeUpdateNotice(latest, current);