Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/next-steps-animation-order.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": patch
---

Print the "Next steps" list before sweeping the highlight across its header, so the animation no longer leaves a lone "Next steps" line that looks hung while the steps are hidden.
4 changes: 2 additions & 2 deletions packages/cli-core/src/commands/deploy/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { Program } from "../../cli-program.ts";
import { deployStatus } from "./status-command.ts";
import { isAgent } from "../../mode.ts";
import { isInsideGutter, log } from "../../lib/log.ts";
import { applyPrefix, isInsideGutter, log } from "../../lib/log.ts";
import { bold, dim } from "../../lib/color.ts";
import { animateHeader } from "../../lib/gradient.ts";
import { bar, intro, outro, pausedOutro, withSpinner } from "../../lib/spinner.ts";
Expand DownExpand Up@@ -633,8 +633,8 @@ async function finishDeploy(
prefix: isInsideGutter() ? `${dim("│")} ` : "",
label: "Next steps",
fallback: bold,
body: `${applyPrefix(nextStepsBody(ctx.appId, productionInstanceId))}\n`,
});
log.info(nextStepsBody(ctx.appId, productionInstanceId));
outro("Success");
}

Expand Down
51 changes: 51 additions & 0 deletions packages/cli-core/src/lib/gradient.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -112,6 +112,17 @@ describe("animateHeader (non-interactive)", () => {
await animateHeader({ prefix: "│ ", label: "Next steps", fallback: bold });
expect(captured.stderr[0]).toBe(`│ ${bold("Next steps")}\n`);
});

test("prints the header and body together in one write", async () => {
await animateHeader({
prefix: "",
label: "Next steps",
fallback: bold,
body: " → a\n → b\n",
});
expect(captured.stderr).toHaveLength(1);
expect(captured.stderr[0]).toBe(`${bold("Next steps")}\n → a\n → b\n`);
});
});

describe("animateHeader (interactive gating)", () => {
Expand DownExpand Up@@ -145,6 +156,25 @@ describe("animateHeader (interactive gating)", () => {
expect(captured.err).toContain("\x1b[?25h");
});

test("prints the body before sweeping the header so it never looks hung", async () => {
await animateHeader({
prefix: "",
label: "Hi",
fallback: bold,
body: " → a\n → b\n",
frames: 2,
intervalMs: 1,
});
const out = captured.err;
expect(out).toContain("→ a");
expect(out).toContain("→ b");
// The body is written before the first in-place header redraw (\r).
expect(out.indexOf("→ a")).toBeLessThan(out.indexOf("\r"));
// The cursor steps up to the header (1 + 2 body newlines) and back down.
expect(out).toContain("\x1b[3A");
expect(out).toContain("\x1b[3B");
});

test("NO_COLOR disables the animation (plain fallback, no redraw)", async () => {
process.env.NO_COLOR = "1";
await run();
Expand All@@ -169,4 +199,25 @@ describe("animateHeader (interactive gating)", () => {
await run();
expect(captured.err).toContain("\r");
});

test("falls back to a plain write when the block is taller than the terminal", async () => {
const savedRows = process.stderr.rows;
try {
Object.defineProperty(process.stderr, "rows", { value: 5, configurable: true });
await animateHeader({
prefix: "",
label: "Hi",
fallback: bold,
// 5 newlines → rowsBelow = 6, which exceeds rows = 5
body: "a\nb\nc\nd\ne\n",
frames: 2,
intervalMs: 1,
});
expect(captured.err).not.toContain("\r");
expect(captured.err).not.toContain("\x1b[?25l");
expect(captured.err).toContain("a");
} finally {
Object.defineProperty(process.stderr, "rows", { value: savedRows, configurable: true });
}
});
});
40 changes: 37 additions & 3 deletions packages/cli-core/src/lib/gradient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,29 +114,63 @@ interface AnimateHeaderOptions {
prefix: string;
label: string;
fallback: (s: string) => string;
/**
* Text printed beneath the header (e.g. the next-steps list), including its
* own trailing newline(s). It is rendered up front so the whole block is on
* screen immediately; the highlight then sweeps across the header in place.
* Without it, only a lone header animates and looks hung until the caller
* prints the rest.
*/
body?: string;
frames?: number;
intervalMs?: number;
write?: (s: string) => void;
}

export async function animateHeader(options: AnimateHeaderOptions): Promise<void> {
const { prefix, label, fallback, frames = 18, intervalMs = 25, write = log.ui } = options;
const {
prefix,
label,
fallback,
body = "",
frames = 18,
intervalMs = 25,
write = log.ui,
} = options;

if (!isInteractive() || colorDisabled()) {
write(`${prefix}${fallback(label)}\n`);
write(`${prefix}${fallback(label)}\n${body}`);
return;
}

const truecolor = supportsTruecolor();
const span = Math.max(1, frames - 1);
// Rows the cursor ends below the header after the block is printed: the
// header's own newline plus every newline inside the body.
const rowsBelow = 1 + (body.match(/\n/g)?.length ?? 0);
Comment thread
rafa-thayto marked this conversation as resolved.

// The cursor-up escape only lands on the header when the block fits on screen
// without scrolling. Fall back to a plain write on short terminals where the
// scroll would push the header out of reach.
if (process.stderr.rows != null && rowsBelow >= process.stderr.rows) {
write(`${prefix}${fallback(label)}\n${body}`);
return;
}

hideCursor();
try {
// Print the whole block first so the body is visible immediately, then step
// back up to the header line and sweep the highlight across it. Only the
// header line is rewritten each frame, so the body stays put.
write(`${prefix}${shineText(label, { truecolor })}\n${body}`);
write(`\x1b[${rowsBelow}A`);
for (let frame = 0; frame < frames; frame++) {
const center = -0.3 + (frame / span) * 1.6;
write(`\r\x1b[K${prefix}${shineText(label, { center, truecolor })}`);
await sleep(intervalMs);
}
write(`\r\x1b[K${prefix}${shineText(label, { truecolor })}\n`);
write(`\r\x1b[K${prefix}${shineText(label, { truecolor })}`);
write(`\x1b[${rowsBelow}B\r`);
} finally {
showCursor();
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-core/src/lib/log.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ export function isInsideGutter(): boolean {
return prefixDepth > 0;
}

function applyPrefix(msg: string): string {
export function applyPrefix(msg: string): string {
if (prefixDepth === 0) return msg;
const bar = dim(S_BAR);
if (!msg) return bar;
Expand Down
6 changes: 2 additions & 4 deletions packages/cli-core/src/lib/spinner.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,16 +54,14 @@ export async function outro(messageOrSteps?: string | readonly string[]) {
popPrefix();

if (Array.isArray(messageOrSteps)) {
const body = `${messageOrSteps.map((step) => ` ${cyan("→")} ${step}`).join("\n")}\n\n`;
await animateHeader({
prefix: `${dim(S_BAR_END)} `,
label: "Next steps",
fallback: dim,
body,
write: writeUi,
});
for (const step of messageOrSteps) {
writeUi(` ${cyan("→")} ${step}\n`);
}
writeUi("\n");
return;
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/next-steps-animation-order.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": patch
---

Print the "Next steps" list before sweeping the highlight across its header, so the animation no longer leaves a lone "Next steps" line that looks hung while the steps are hidden.
4 changes: 2 additions & 2 deletions packages/cli-core/src/commands/deploy/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { Program } from "../../cli-program.ts";
import { deployStatus } from "./status-command.ts";
import { isAgent } from "../../mode.ts";
import { isInsideGutter, log } from "../../lib/log.ts";
import { applyPrefix, isInsideGutter, log } from "../../lib/log.ts";
import { bold, dim } from "../../lib/color.ts";
import { animateHeader } from "../../lib/gradient.ts";
import { bar, intro, outro, pausedOutro, withSpinner } from "../../lib/spinner.ts";
Expand DownExpand Up@@ -633,8 +633,8 @@ async function finishDeploy(
prefix: isInsideGutter() ? `${dim("│")} ` : "",
label: "Next steps",
fallback: bold,
body: `${applyPrefix(nextStepsBody(ctx.appId, productionInstanceId))}\n`,
});
log.info(nextStepsBody(ctx.appId, productionInstanceId));
outro("Success");
}

Expand Down
51 changes: 51 additions & 0 deletions packages/cli-core/src/lib/gradient.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -112,6 +112,17 @@ describe("animateHeader (non-interactive)", () => {
await animateHeader({ prefix: "│ ", label: "Next steps", fallback: bold });
expect(captured.stderr[0]).toBe(`│ ${bold("Next steps")}\n`);
});

test("prints the header and body together in one write", async () => {
await animateHeader({
prefix: "",
label: "Next steps",
fallback: bold,
body: " → a\n → b\n",
});
expect(captured.stderr).toHaveLength(1);
expect(captured.stderr[0]).toBe(`${bold("Next steps")}\n → a\n → b\n`);
});
});

describe("animateHeader (interactive gating)", () => {
Expand DownExpand Up@@ -145,6 +156,25 @@ describe("animateHeader (interactive gating)", () => {
expect(captured.err).toContain("\x1b[?25h");
});

test("prints the body before sweeping the header so it never looks hung", async () => {
await animateHeader({
prefix: "",
label: "Hi",
fallback: bold,
body: " → a\n → b\n",
frames: 2,
intervalMs: 1,
});
const out = captured.err;
expect(out).toContain("→ a");
expect(out).toContain("→ b");
// The body is written before the first in-place header redraw (\r).
expect(out.indexOf("→ a")).toBeLessThan(out.indexOf("\r"));
// The cursor steps up to the header (1 + 2 body newlines) and back down.
expect(out).toContain("\x1b[3A");
expect(out).toContain("\x1b[3B");
});

test("NO_COLOR disables the animation (plain fallback, no redraw)", async () => {
process.env.NO_COLOR = "1";
await run();
Expand All@@ -169,4 +199,25 @@ describe("animateHeader (interactive gating)", () => {
await run();
expect(captured.err).toContain("\r");
});

test("falls back to a plain write when the block is taller than the terminal", async () => {
const savedRows = process.stderr.rows;
try {
Object.defineProperty(process.stderr, "rows", { value: 5, configurable: true });
await animateHeader({
prefix: "",
label: "Hi",
fallback: bold,
// 5 newlines → rowsBelow = 6, which exceeds rows = 5
body: "a\nb\nc\nd\ne\n",
frames: 2,
intervalMs: 1,
});
expect(captured.err).not.toContain("\r");
expect(captured.err).not.toContain("\x1b[?25l");
expect(captured.err).toContain("a");
} finally {
Object.defineProperty(process.stderr, "rows", { value: savedRows, configurable: true });
}
});
});
40 changes: 37 additions & 3 deletions packages/cli-core/src/lib/gradient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,29 +114,63 @@ interface AnimateHeaderOptions {
prefix: string;
label: string;
fallback: (s: string) => string;
/**
* Text printed beneath the header (e.g. the next-steps list), including its
* own trailing newline(s). It is rendered up front so the whole block is on
* screen immediately; the highlight then sweeps across the header in place.
* Without it, only a lone header animates and looks hung until the caller
* prints the rest.
*/
body?: string;
frames?: number;
intervalMs?: number;
write?: (s: string) => void;
}

export async function animateHeader(options: AnimateHeaderOptions): Promise<void> {
const { prefix, label, fallback, frames = 18, intervalMs = 25, write = log.ui } = options;
const {
prefix,
label,
fallback,
body = "",
frames = 18,
intervalMs = 25,
write = log.ui,
} = options;

if (!isInteractive() || colorDisabled()) {
write(`${prefix}${fallback(label)}\n`);
write(`${prefix}${fallback(label)}\n${body}`);
return;
}

const truecolor = supportsTruecolor();
const span = Math.max(1, frames - 1);
// Rows the cursor ends below the header after the block is printed: the
// header's own newline plus every newline inside the body.
const rowsBelow = 1 + (body.match(/\n/g)?.length ?? 0);
Comment thread
rafa-thayto marked this conversation as resolved.

// The cursor-up escape only lands on the header when the block fits on screen
// without scrolling. Fall back to a plain write on short terminals where the
// scroll would push the header out of reach.
if (process.stderr.rows != null && rowsBelow >= process.stderr.rows) {
write(`${prefix}${fallback(label)}\n${body}`);
return;
}

hideCursor();
try {
// Print the whole block first so the body is visible immediately, then step
// back up to the header line and sweep the highlight across it. Only the
// header line is rewritten each frame, so the body stays put.
write(`${prefix}${shineText(label, { truecolor })}\n${body}`);
write(`\x1b[${rowsBelow}A`);
for (let frame = 0; frame < frames; frame++) {
const center = -0.3 + (frame / span) * 1.6;
write(`\r\x1b[K${prefix}${shineText(label, { center, truecolor })}`);
await sleep(intervalMs);
}
write(`\r\x1b[K${prefix}${shineText(label, { truecolor })}\n`);
write(`\r\x1b[K${prefix}${shineText(label, { truecolor })}`);
write(`\x1b[${rowsBelow}B\r`);
} finally {
showCursor();
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-core/src/lib/log.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ export function isInsideGutter(): boolean {
return prefixDepth > 0;
}

function applyPrefix(msg: string): string {
export function applyPrefix(msg: string): string {
if (prefixDepth === 0) return msg;
const bar = dim(S_BAR);
if (!msg) return bar;
Expand Down
6 changes: 2 additions & 4 deletions packages/cli-core/src/lib/spinner.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,16 +54,14 @@ export async function outro(messageOrSteps?: string | readonly string[]) {
popPrefix();

if (Array.isArray(messageOrSteps)) {
const body = `${messageOrSteps.map((step) => ` ${cyan("→")} ${step}`).join("\n")}\n\n`;
await animateHeader({
prefix: `${dim(S_BAR_END)} `,
label: "Next steps",
fallback: dim,
body,
write: writeUi,
});
for (const step of messageOrSteps) {
writeUi(` ${cyan("→")} ${step}\n`);
}
writeUi("\n");
return;
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/next-steps-animation-order.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": patch
---

Print the "Next steps" list before sweeping the highlight across its header, so the animation no longer leaves a lone "Next steps" line that looks hung while the steps are hidden.
4 changes: 2 additions & 2 deletions packages/cli-core/src/commands/deploy/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { Program } from "../../cli-program.ts";
import { deployStatus } from "./status-command.ts";
import { isAgent } from "../../mode.ts";
import { isInsideGutter, log } from "../../lib/log.ts";
import { applyPrefix, isInsideGutter, log } from "../../lib/log.ts";
import { bold, dim } from "../../lib/color.ts";
import { animateHeader } from "../../lib/gradient.ts";
import { bar, intro, outro, pausedOutro, withSpinner } from "../../lib/spinner.ts";
Expand DownExpand Up@@ -633,8 +633,8 @@ async function finishDeploy(
prefix: isInsideGutter() ? `${dim("│")} ` : "",
label: "Next steps",
fallback: bold,
body: `${applyPrefix(nextStepsBody(ctx.appId, productionInstanceId))}\n`,
});
log.info(nextStepsBody(ctx.appId, productionInstanceId));
outro("Success");
}

Expand Down
51 changes: 51 additions & 0 deletions packages/cli-core/src/lib/gradient.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -112,6 +112,17 @@ describe("animateHeader (non-interactive)", () => {
await animateHeader({ prefix: "│ ", label: "Next steps", fallback: bold });
expect(captured.stderr[0]).toBe(`│ ${bold("Next steps")}\n`);
});

test("prints the header and body together in one write", async () => {
await animateHeader({
prefix: "",
label: "Next steps",
fallback: bold,
body: " → a\n → b\n",
});
expect(captured.stderr).toHaveLength(1);
expect(captured.stderr[0]).toBe(`${bold("Next steps")}\n → a\n → b\n`);
});
});

describe("animateHeader (interactive gating)", () => {
Expand DownExpand Up@@ -145,6 +156,25 @@ describe("animateHeader (interactive gating)", () => {
expect(captured.err).toContain("\x1b[?25h");
});

test("prints the body before sweeping the header so it never looks hung", async () => {
await animateHeader({
prefix: "",
label: "Hi",
fallback: bold,
body: " → a\n → b\n",
frames: 2,
intervalMs: 1,
});
const out = captured.err;
expect(out).toContain("→ a");
expect(out).toContain("→ b");
// The body is written before the first in-place header redraw (\r).
expect(out.indexOf("→ a")).toBeLessThan(out.indexOf("\r"));
// The cursor steps up to the header (1 + 2 body newlines) and back down.
expect(out).toContain("\x1b[3A");
expect(out).toContain("\x1b[3B");
});

test("NO_COLOR disables the animation (plain fallback, no redraw)", async () => {
process.env.NO_COLOR = "1";
await run();
Expand All@@ -169,4 +199,25 @@ describe("animateHeader (interactive gating)", () => {
await run();
expect(captured.err).toContain("\r");
});

test("falls back to a plain write when the block is taller than the terminal", async () => {
const savedRows = process.stderr.rows;
try {
Object.defineProperty(process.stderr, "rows", { value: 5, configurable: true });
await animateHeader({
prefix: "",
label: "Hi",
fallback: bold,
// 5 newlines → rowsBelow = 6, which exceeds rows = 5
body: "a\nb\nc\nd\ne\n",
frames: 2,
intervalMs: 1,
});
expect(captured.err).not.toContain("\r");
expect(captured.err).not.toContain("\x1b[?25l");
expect(captured.err).toContain("a");
} finally {
Object.defineProperty(process.stderr, "rows", { value: savedRows, configurable: true });
}
});
});
40 changes: 37 additions & 3 deletions packages/cli-core/src/lib/gradient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,29 +114,63 @@ interface AnimateHeaderOptions {
prefix: string;
label: string;
fallback: (s: string) => string;
/**
* Text printed beneath the header (e.g. the next-steps list), including its
* own trailing newline(s). It is rendered up front so the whole block is on
* screen immediately; the highlight then sweeps across the header in place.
* Without it, only a lone header animates and looks hung until the caller
* prints the rest.
*/
body?: string;
frames?: number;
intervalMs?: number;
write?: (s: string) => void;
}

export async function animateHeader(options: AnimateHeaderOptions): Promise<void> {
const { prefix, label, fallback, frames = 18, intervalMs = 25, write = log.ui } = options;
const {
prefix,
label,
fallback,
body = "",
frames = 18,
intervalMs = 25,
write = log.ui,
} = options;

if (!isInteractive() || colorDisabled()) {
write(`${prefix}${fallback(label)}\n`);
write(`${prefix}${fallback(label)}\n${body}`);
return;
}

const truecolor = supportsTruecolor();
const span = Math.max(1, frames - 1);
// Rows the cursor ends below the header after the block is printed: the
// header's own newline plus every newline inside the body.
const rowsBelow = 1 + (body.match(/\n/g)?.length ?? 0);
Comment thread
rafa-thayto marked this conversation as resolved.

// The cursor-up escape only lands on the header when the block fits on screen
// without scrolling. Fall back to a plain write on short terminals where the
// scroll would push the header out of reach.
if (process.stderr.rows != null && rowsBelow >= process.stderr.rows) {
write(`${prefix}${fallback(label)}\n${body}`);
return;
}

hideCursor();
try {
// Print the whole block first so the body is visible immediately, then step
// back up to the header line and sweep the highlight across it. Only the
// header line is rewritten each frame, so the body stays put.
write(`${prefix}${shineText(label, { truecolor })}\n${body}`);
write(`\x1b[${rowsBelow}A`);
for (let frame = 0; frame < frames; frame++) {
const center = -0.3 + (frame / span) * 1.6;
write(`\r\x1b[K${prefix}${shineText(label, { center, truecolor })}`);
await sleep(intervalMs);
}
write(`\r\x1b[K${prefix}${shineText(label, { truecolor })}\n`);
write(`\r\x1b[K${prefix}${shineText(label, { truecolor })}`);
write(`\x1b[${rowsBelow}B\r`);
} finally {
showCursor();
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-core/src/lib/log.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ export function isInsideGutter(): boolean {
return prefixDepth > 0;
}

function applyPrefix(msg: string): string {
export function applyPrefix(msg: string): string {
if (prefixDepth === 0) return msg;
const bar = dim(S_BAR);
if (!msg) return bar;
Expand Down
6 changes: 2 additions & 4 deletions packages/cli-core/src/lib/spinner.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,16 +54,14 @@ export async function outro(messageOrSteps?: string | readonly string[]) {
popPrefix();

if (Array.isArray(messageOrSteps)) {
const body = `${messageOrSteps.map((step) => ` ${cyan("→")} ${step}`).join("\n")}\n\n`;
await animateHeader({
prefix: `${dim(S_BAR_END)} `,
label: "Next steps",
fallback: dim,
body,
write: writeUi,
});
for (const step of messageOrSteps) {
writeUi(` ${cyan("→")} ${step}\n`);
}
writeUi("\n");
return;
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/next-steps-animation-order.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": patch
---

Print the "Next steps" list before sweeping the highlight across its header, so the animation no longer leaves a lone "Next steps" line that looks hung while the steps are hidden.
4 changes: 2 additions & 2 deletions packages/cli-core/src/commands/deploy/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { Program } from "../../cli-program.ts";
import { deployStatus } from "./status-command.ts";
import { isAgent } from "../../mode.ts";
import { isInsideGutter, log } from "../../lib/log.ts";
import { applyPrefix, isInsideGutter, log } from "../../lib/log.ts";
import { bold, dim } from "../../lib/color.ts";
import { animateHeader } from "../../lib/gradient.ts";
import { bar, intro, outro, pausedOutro, withSpinner } from "../../lib/spinner.ts";
Expand DownExpand Up@@ -633,8 +633,8 @@ async function finishDeploy(
prefix: isInsideGutter() ? `${dim("│")} ` : "",
label: "Next steps",
fallback: bold,
body: `${applyPrefix(nextStepsBody(ctx.appId, productionInstanceId))}\n`,
});
log.info(nextStepsBody(ctx.appId, productionInstanceId));
outro("Success");
}

Expand Down
51 changes: 51 additions & 0 deletions packages/cli-core/src/lib/gradient.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -112,6 +112,17 @@ describe("animateHeader (non-interactive)", () => {
await animateHeader({ prefix: "│ ", label: "Next steps", fallback: bold });
expect(captured.stderr[0]).toBe(`│ ${bold("Next steps")}\n`);
});

test("prints the header and body together in one write", async () => {
await animateHeader({
prefix: "",
label: "Next steps",
fallback: bold,
body: " → a\n → b\n",
});
expect(captured.stderr).toHaveLength(1);
expect(captured.stderr[0]).toBe(`${bold("Next steps")}\n → a\n → b\n`);
});
});

describe("animateHeader (interactive gating)", () => {
Expand DownExpand Up@@ -145,6 +156,25 @@ describe("animateHeader (interactive gating)", () => {
expect(captured.err).toContain("\x1b[?25h");
});

test("prints the body before sweeping the header so it never looks hung", async () => {
await animateHeader({
prefix: "",
label: "Hi",
fallback: bold,
body: " → a\n → b\n",
frames: 2,
intervalMs: 1,
});
const out = captured.err;
expect(out).toContain("→ a");
expect(out).toContain("→ b");
// The body is written before the first in-place header redraw (\r).
expect(out.indexOf("→ a")).toBeLessThan(out.indexOf("\r"));
// The cursor steps up to the header (1 + 2 body newlines) and back down.
expect(out).toContain("\x1b[3A");
expect(out).toContain("\x1b[3B");
});

test("NO_COLOR disables the animation (plain fallback, no redraw)", async () => {
process.env.NO_COLOR = "1";
await run();
Expand All@@ -169,4 +199,25 @@ describe("animateHeader (interactive gating)", () => {
await run();
expect(captured.err).toContain("\r");
});

test("falls back to a plain write when the block is taller than the terminal", async () => {
const savedRows = process.stderr.rows;
try {
Object.defineProperty(process.stderr, "rows", { value: 5, configurable: true });
await animateHeader({
prefix: "",
label: "Hi",
fallback: bold,
// 5 newlines → rowsBelow = 6, which exceeds rows = 5
body: "a\nb\nc\nd\ne\n",
frames: 2,
intervalMs: 1,
});
expect(captured.err).not.toContain("\r");
expect(captured.err).not.toContain("\x1b[?25l");
expect(captured.err).toContain("a");
} finally {
Object.defineProperty(process.stderr, "rows", { value: savedRows, configurable: true });
}
});
});
40 changes: 37 additions & 3 deletions packages/cli-core/src/lib/gradient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,29 +114,63 @@ interface AnimateHeaderOptions {
prefix: string;
label: string;
fallback: (s: string) => string;
/**
* Text printed beneath the header (e.g. the next-steps list), including its
* own trailing newline(s). It is rendered up front so the whole block is on
* screen immediately; the highlight then sweeps across the header in place.
* Without it, only a lone header animates and looks hung until the caller
* prints the rest.
*/
body?: string;
frames?: number;
intervalMs?: number;
write?: (s: string) => void;
}

export async function animateHeader(options: AnimateHeaderOptions): Promise<void> {
const { prefix, label, fallback, frames = 18, intervalMs = 25, write = log.ui } = options;
const {
prefix,
label,
fallback,
body = "",
frames = 18,
intervalMs = 25,
write = log.ui,
} = options;

if (!isInteractive() || colorDisabled()) {
write(`${prefix}${fallback(label)}\n`);
write(`${prefix}${fallback(label)}\n${body}`);
return;
}

const truecolor = supportsTruecolor();
const span = Math.max(1, frames - 1);
// Rows the cursor ends below the header after the block is printed: the
// header's own newline plus every newline inside the body.
const rowsBelow = 1 + (body.match(/\n/g)?.length ?? 0);
Comment thread
rafa-thayto marked this conversation as resolved.

// The cursor-up escape only lands on the header when the block fits on screen
// without scrolling. Fall back to a plain write on short terminals where the
// scroll would push the header out of reach.
if (process.stderr.rows != null && rowsBelow >= process.stderr.rows) {
write(`${prefix}${fallback(label)}\n${body}`);
return;
}

hideCursor();
try {
// Print the whole block first so the body is visible immediately, then step
// back up to the header line and sweep the highlight across it. Only the
// header line is rewritten each frame, so the body stays put.
write(`${prefix}${shineText(label, { truecolor })}\n${body}`);
write(`\x1b[${rowsBelow}A`);
for (let frame = 0; frame < frames; frame++) {
const center = -0.3 + (frame / span) * 1.6;
write(`\r\x1b[K${prefix}${shineText(label, { center, truecolor })}`);
await sleep(intervalMs);
}
write(`\r\x1b[K${prefix}${shineText(label, { truecolor })}\n`);
write(`\r\x1b[K${prefix}${shineText(label, { truecolor })}`);
write(`\x1b[${rowsBelow}B\r`);
} finally {
showCursor();
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-core/src/lib/log.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ export function isInsideGutter(): boolean {
return prefixDepth > 0;
}

function applyPrefix(msg: string): string {
export function applyPrefix(msg: string): string {
if (prefixDepth === 0) return msg;
const bar = dim(S_BAR);
if (!msg) return bar;
Expand Down
6 changes: 2 additions & 4 deletions packages/cli-core/src/lib/spinner.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,16 +54,14 @@ export async function outro(messageOrSteps?: string | readonly string[]) {
popPrefix();

if (Array.isArray(messageOrSteps)) {
const body = `${messageOrSteps.map((step) => ` ${cyan("→")} ${step}`).join("\n")}\n\n`;
await animateHeader({
prefix: `${dim(S_BAR_END)} `,
label: "Next steps",
fallback: dim,
body,
write: writeUi,
});
for (const step of messageOrSteps) {
writeUi(` ${cyan("→")} ${step}\n`);
}
writeUi("\n");
return;
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/next-steps-animation-order.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": patch
---

Print the "Next steps" list before sweeping the highlight across its header, so the animation no longer leaves a lone "Next steps" line that looks hung while the steps are hidden.
4 changes: 2 additions & 2 deletions packages/cli-core/src/commands/deploy/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { Program } from "../../cli-program.ts";
import { deployStatus } from "./status-command.ts";
import { isAgent } from "../../mode.ts";
import { isInsideGutter, log } from "../../lib/log.ts";
import { applyPrefix, isInsideGutter, log } from "../../lib/log.ts";
import { bold, dim } from "../../lib/color.ts";
import { animateHeader } from "../../lib/gradient.ts";
import { bar, intro, outro, pausedOutro, withSpinner } from "../../lib/spinner.ts";
Expand DownExpand Up@@ -633,8 +633,8 @@ async function finishDeploy(
prefix: isInsideGutter() ? `${dim("│")} ` : "",
label: "Next steps",
fallback: bold,
body: `${applyPrefix(nextStepsBody(ctx.appId, productionInstanceId))}\n`,
});
log.info(nextStepsBody(ctx.appId, productionInstanceId));
outro("Success");
}

Expand Down
51 changes: 51 additions & 0 deletions packages/cli-core/src/lib/gradient.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -112,6 +112,17 @@ describe("animateHeader (non-interactive)", () => {
await animateHeader({ prefix: "│ ", label: "Next steps", fallback: bold });
expect(captured.stderr[0]).toBe(`│ ${bold("Next steps")}\n`);
});

test("prints the header and body together in one write", async () => {
await animateHeader({
prefix: "",
label: "Next steps",
fallback: bold,
body: " → a\n → b\n",
});
expect(captured.stderr).toHaveLength(1);
expect(captured.stderr[0]).toBe(`${bold("Next steps")}\n → a\n → b\n`);
});
});

describe("animateHeader (interactive gating)", () => {
Expand DownExpand Up@@ -145,6 +156,25 @@ describe("animateHeader (interactive gating)", () => {
expect(captured.err).toContain("\x1b[?25h");
});

test("prints the body before sweeping the header so it never looks hung", async () => {
await animateHeader({
prefix: "",
label: "Hi",
fallback: bold,
body: " → a\n → b\n",
frames: 2,
intervalMs: 1,
});
const out = captured.err;
expect(out).toContain("→ a");
expect(out).toContain("→ b");
// The body is written before the first in-place header redraw (\r).
expect(out.indexOf("→ a")).toBeLessThan(out.indexOf("\r"));
// The cursor steps up to the header (1 + 2 body newlines) and back down.
expect(out).toContain("\x1b[3A");
expect(out).toContain("\x1b[3B");
});

test("NO_COLOR disables the animation (plain fallback, no redraw)", async () => {
process.env.NO_COLOR = "1";
await run();
Expand All@@ -169,4 +199,25 @@ describe("animateHeader (interactive gating)", () => {
await run();
expect(captured.err).toContain("\r");
});

test("falls back to a plain write when the block is taller than the terminal", async () => {
const savedRows = process.stderr.rows;
try {
Object.defineProperty(process.stderr, "rows", { value: 5, configurable: true });
await animateHeader({
prefix: "",
label: "Hi",
fallback: bold,
// 5 newlines → rowsBelow = 6, which exceeds rows = 5
body: "a\nb\nc\nd\ne\n",
frames: 2,
intervalMs: 1,
});
expect(captured.err).not.toContain("\r");
expect(captured.err).not.toContain("\x1b[?25l");
expect(captured.err).toContain("a");
} finally {
Object.defineProperty(process.stderr, "rows", { value: savedRows, configurable: true });
}
});
});
40 changes: 37 additions & 3 deletions packages/cli-core/src/lib/gradient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,29 +114,63 @@ interface AnimateHeaderOptions {
prefix: string;
label: string;
fallback: (s: string) => string;
/**
* Text printed beneath the header (e.g. the next-steps list), including its
* own trailing newline(s). It is rendered up front so the whole block is on
* screen immediately; the highlight then sweeps across the header in place.
* Without it, only a lone header animates and looks hung until the caller
* prints the rest.
*/
body?: string;
frames?: number;
intervalMs?: number;
write?: (s: string) => void;
}

export async function animateHeader(options: AnimateHeaderOptions): Promise<void> {
const { prefix, label, fallback, frames = 18, intervalMs = 25, write = log.ui } = options;
const {
prefix,
label,
fallback,
body = "",
frames = 18,
intervalMs = 25,
write = log.ui,
} = options;

if (!isInteractive() || colorDisabled()) {
write(`${prefix}${fallback(label)}\n`);
write(`${prefix}${fallback(label)}\n${body}`);
return;
}

const truecolor = supportsTruecolor();
const span = Math.max(1, frames - 1);
// Rows the cursor ends below the header after the block is printed: the
// header's own newline plus every newline inside the body.
const rowsBelow = 1 + (body.match(/\n/g)?.length ?? 0);
Comment thread
rafa-thayto marked this conversation as resolved.

// The cursor-up escape only lands on the header when the block fits on screen
// without scrolling. Fall back to a plain write on short terminals where the
// scroll would push the header out of reach.
if (process.stderr.rows != null && rowsBelow >= process.stderr.rows) {
write(`${prefix}${fallback(label)}\n${body}`);
return;
}

hideCursor();
try {
// Print the whole block first so the body is visible immediately, then step
// back up to the header line and sweep the highlight across it. Only the
// header line is rewritten each frame, so the body stays put.
write(`${prefix}${shineText(label, { truecolor })}\n${body}`);
write(`\x1b[${rowsBelow}A`);
for (let frame = 0; frame < frames; frame++) {
const center = -0.3 + (frame / span) * 1.6;
write(`\r\x1b[K${prefix}${shineText(label, { center, truecolor })}`);
await sleep(intervalMs);
}
write(`\r\x1b[K${prefix}${shineText(label, { truecolor })}\n`);
write(`\r\x1b[K${prefix}${shineText(label, { truecolor })}`);
write(`\x1b[${rowsBelow}B\r`);
} finally {
showCursor();
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-core/src/lib/log.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ export function isInsideGutter(): boolean {
return prefixDepth > 0;
}

function applyPrefix(msg: string): string {
export function applyPrefix(msg: string): string {
if (prefixDepth === 0) return msg;
const bar = dim(S_BAR);
if (!msg) return bar;
Expand Down
6 changes: 2 additions & 4 deletions packages/cli-core/src/lib/spinner.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,16 +54,14 @@ export async function outro(messageOrSteps?: string | readonly string[]) {
popPrefix();

if (Array.isArray(messageOrSteps)) {
const body = `${messageOrSteps.map((step) => ` ${cyan("→")} ${step}`).join("\n")}\n\n`;
await animateHeader({
prefix: `${dim(S_BAR_END)} `,
label: "Next steps",
fallback: dim,
body,
write: writeUi,
});
for (const step of messageOrSteps) {
writeUi(` ${cyan("→")} ${step}\n`);
}
writeUi("\n");
return;
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/next-steps-animation-order.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": patch
---

Print the "Next steps" list before sweeping the highlight across its header, so the animation no longer leaves a lone "Next steps" line that looks hung while the steps are hidden.
4 changes: 2 additions & 2 deletions packages/cli-core/src/commands/deploy/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { Program } from "../../cli-program.ts";
import { deployStatus } from "./status-command.ts";
import { isAgent } from "../../mode.ts";
import { isInsideGutter, log } from "../../lib/log.ts";
import { applyPrefix, isInsideGutter, log } from "../../lib/log.ts";
import { bold, dim } from "../../lib/color.ts";
import { animateHeader } from "../../lib/gradient.ts";
import { bar, intro, outro, pausedOutro, withSpinner } from "../../lib/spinner.ts";
Expand DownExpand Up@@ -633,8 +633,8 @@ async function finishDeploy(
prefix: isInsideGutter() ? `${dim("│")} ` : "",
label: "Next steps",
fallback: bold,
body: `${applyPrefix(nextStepsBody(ctx.appId, productionInstanceId))}\n`,
});
log.info(nextStepsBody(ctx.appId, productionInstanceId));
outro("Success");
}

Expand Down
51 changes: 51 additions & 0 deletions packages/cli-core/src/lib/gradient.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -112,6 +112,17 @@ describe("animateHeader (non-interactive)", () => {
await animateHeader({ prefix: "│ ", label: "Next steps", fallback: bold });
expect(captured.stderr[0]).toBe(`│ ${bold("Next steps")}\n`);
});

test("prints the header and body together in one write", async () => {
await animateHeader({
prefix: "",
label: "Next steps",
fallback: bold,
body: " → a\n → b\n",
});
expect(captured.stderr).toHaveLength(1);
expect(captured.stderr[0]).toBe(`${bold("Next steps")}\n → a\n → b\n`);
});
});

describe("animateHeader (interactive gating)", () => {
Expand DownExpand Up@@ -145,6 +156,25 @@ describe("animateHeader (interactive gating)", () => {
expect(captured.err).toContain("\x1b[?25h");
});

test("prints the body before sweeping the header so it never looks hung", async () => {
await animateHeader({
prefix: "",
label: "Hi",
fallback: bold,
body: " → a\n → b\n",
frames: 2,
intervalMs: 1,
});
const out = captured.err;
expect(out).toContain("→ a");
expect(out).toContain("→ b");
// The body is written before the first in-place header redraw (\r).
expect(out.indexOf("→ a")).toBeLessThan(out.indexOf("\r"));
// The cursor steps up to the header (1 + 2 body newlines) and back down.
expect(out).toContain("\x1b[3A");
expect(out).toContain("\x1b[3B");
});

test("NO_COLOR disables the animation (plain fallback, no redraw)", async () => {
process.env.NO_COLOR = "1";
await run();
Expand All@@ -169,4 +199,25 @@ describe("animateHeader (interactive gating)", () => {
await run();
expect(captured.err).toContain("\r");
});

test("falls back to a plain write when the block is taller than the terminal", async () => {
const savedRows = process.stderr.rows;
try {
Object.defineProperty(process.stderr, "rows", { value: 5, configurable: true });
await animateHeader({
prefix: "",
label: "Hi",
fallback: bold,
// 5 newlines → rowsBelow = 6, which exceeds rows = 5
body: "a\nb\nc\nd\ne\n",
frames: 2,
intervalMs: 1,
});
expect(captured.err).not.toContain("\r");
expect(captured.err).not.toContain("\x1b[?25l");
expect(captured.err).toContain("a");
} finally {
Object.defineProperty(process.stderr, "rows", { value: savedRows, configurable: true });
}
});
});
40 changes: 37 additions & 3 deletions packages/cli-core/src/lib/gradient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,29 +114,63 @@ interface AnimateHeaderOptions {
prefix: string;
label: string;
fallback: (s: string) => string;
/**
* Text printed beneath the header (e.g. the next-steps list), including its
* own trailing newline(s). It is rendered up front so the whole block is on
* screen immediately; the highlight then sweeps across the header in place.
* Without it, only a lone header animates and looks hung until the caller
* prints the rest.
*/
body?: string;
frames?: number;
intervalMs?: number;
write?: (s: string) => void;
}

export async function animateHeader(options: AnimateHeaderOptions): Promise<void> {
const { prefix, label, fallback, frames = 18, intervalMs = 25, write = log.ui } = options;
const {
prefix,
label,
fallback,
body = "",
frames = 18,
intervalMs = 25,
write = log.ui,
} = options;

if (!isInteractive() || colorDisabled()) {
write(`${prefix}${fallback(label)}\n`);
write(`${prefix}${fallback(label)}\n${body}`);
return;
}

const truecolor = supportsTruecolor();
const span = Math.max(1, frames - 1);
// Rows the cursor ends below the header after the block is printed: the
// header's own newline plus every newline inside the body.
const rowsBelow = 1 + (body.match(/\n/g)?.length ?? 0);
Comment thread
rafa-thayto marked this conversation as resolved.

// The cursor-up escape only lands on the header when the block fits on screen
// without scrolling. Fall back to a plain write on short terminals where the
// scroll would push the header out of reach.
if (process.stderr.rows != null && rowsBelow >= process.stderr.rows) {
write(`${prefix}${fallback(label)}\n${body}`);
return;
}

hideCursor();
try {
// Print the whole block first so the body is visible immediately, then step
// back up to the header line and sweep the highlight across it. Only the
// header line is rewritten each frame, so the body stays put.
write(`${prefix}${shineText(label, { truecolor })}\n${body}`);
write(`\x1b[${rowsBelow}A`);
for (let frame = 0; frame < frames; frame++) {
const center = -0.3 + (frame / span) * 1.6;
write(`\r\x1b[K${prefix}${shineText(label, { center, truecolor })}`);
await sleep(intervalMs);
}
write(`\r\x1b[K${prefix}${shineText(label, { truecolor })}\n`);
write(`\r\x1b[K${prefix}${shineText(label, { truecolor })}`);
write(`\x1b[${rowsBelow}B\r`);
} finally {
showCursor();
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-core/src/lib/log.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ export function isInsideGutter(): boolean {
return prefixDepth > 0;
}

function applyPrefix(msg: string): string {
export function applyPrefix(msg: string): string {
if (prefixDepth === 0) return msg;
const bar = dim(S_BAR);
if (!msg) return bar;
Expand Down
6 changes: 2 additions & 4 deletions packages/cli-core/src/lib/spinner.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,16 +54,14 @@ export async function outro(messageOrSteps?: string | readonly string[]) {
popPrefix();

if (Array.isArray(messageOrSteps)) {
const body = `${messageOrSteps.map((step) => ` ${cyan("→")} ${step}`).join("\n")}\n\n`;
await animateHeader({
prefix: `${dim(S_BAR_END)} `,
label: "Next steps",
fallback: dim,
body,
write: writeUi,
});
for (const step of messageOrSteps) {
writeUi(` ${cyan("→")} ${step}\n`);
}
writeUi("\n");
return;
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/next-steps-animation-order.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": patch
---

Print the "Next steps" list before sweeping the highlight across its header, so the animation no longer leaves a lone "Next steps" line that looks hung while the steps are hidden.
4 changes: 2 additions & 2 deletions packages/cli-core/src/commands/deploy/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { Program } from "../../cli-program.ts";
import { deployStatus } from "./status-command.ts";
import { isAgent } from "../../mode.ts";
import { isInsideGutter, log } from "../../lib/log.ts";
import { applyPrefix, isInsideGutter, log } from "../../lib/log.ts";
import { bold, dim } from "../../lib/color.ts";
import { animateHeader } from "../../lib/gradient.ts";
import { bar, intro, outro, pausedOutro, withSpinner } from "../../lib/spinner.ts";
Expand DownExpand Up@@ -633,8 +633,8 @@ async function finishDeploy(
prefix: isInsideGutter() ? `${dim("│")} ` : "",
label: "Next steps",
fallback: bold,
body: `${applyPrefix(nextStepsBody(ctx.appId, productionInstanceId))}\n`,
});
log.info(nextStepsBody(ctx.appId, productionInstanceId));
outro("Success");
}

Expand Down
51 changes: 51 additions & 0 deletions packages/cli-core/src/lib/gradient.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -112,6 +112,17 @@ describe("animateHeader (non-interactive)", () => {
await animateHeader({ prefix: "│ ", label: "Next steps", fallback: bold });
expect(captured.stderr[0]).toBe(`│ ${bold("Next steps")}\n`);
});

test("prints the header and body together in one write", async () => {
await animateHeader({
prefix: "",
label: "Next steps",
fallback: bold,
body: " → a\n → b\n",
});
expect(captured.stderr).toHaveLength(1);
expect(captured.stderr[0]).toBe(`${bold("Next steps")}\n → a\n → b\n`);
});
});

describe("animateHeader (interactive gating)", () => {
Expand DownExpand Up@@ -145,6 +156,25 @@ describe("animateHeader (interactive gating)", () => {
expect(captured.err).toContain("\x1b[?25h");
});

test("prints the body before sweeping the header so it never looks hung", async () => {
await animateHeader({
prefix: "",
label: "Hi",
fallback: bold,
body: " → a\n → b\n",
frames: 2,
intervalMs: 1,
});
const out = captured.err;
expect(out).toContain("→ a");
expect(out).toContain("→ b");
// The body is written before the first in-place header redraw (\r).
expect(out.indexOf("→ a")).toBeLessThan(out.indexOf("\r"));
// The cursor steps up to the header (1 + 2 body newlines) and back down.
expect(out).toContain("\x1b[3A");
expect(out).toContain("\x1b[3B");
});

test("NO_COLOR disables the animation (plain fallback, no redraw)", async () => {
process.env.NO_COLOR = "1";
await run();
Expand All@@ -169,4 +199,25 @@ describe("animateHeader (interactive gating)", () => {
await run();
expect(captured.err).toContain("\r");
});

test("falls back to a plain write when the block is taller than the terminal", async () => {
const savedRows = process.stderr.rows;
try {
Object.defineProperty(process.stderr, "rows", { value: 5, configurable: true });
await animateHeader({
prefix: "",
label: "Hi",
fallback: bold,
// 5 newlines → rowsBelow = 6, which exceeds rows = 5
body: "a\nb\nc\nd\ne\n",
frames: 2,
intervalMs: 1,
});
expect(captured.err).not.toContain("\r");
expect(captured.err).not.toContain("\x1b[?25l");
expect(captured.err).toContain("a");
} finally {
Object.defineProperty(process.stderr, "rows", { value: savedRows, configurable: true });
}
});
});
40 changes: 37 additions & 3 deletions packages/cli-core/src/lib/gradient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,29 +114,63 @@ interface AnimateHeaderOptions {
prefix: string;
label: string;
fallback: (s: string) => string;
/**
* Text printed beneath the header (e.g. the next-steps list), including its
* own trailing newline(s). It is rendered up front so the whole block is on
* screen immediately; the highlight then sweeps across the header in place.
* Without it, only a lone header animates and looks hung until the caller
* prints the rest.
*/
body?: string;
frames?: number;
intervalMs?: number;
write?: (s: string) => void;
}

export async function animateHeader(options: AnimateHeaderOptions): Promise<void> {
const { prefix, label, fallback, frames = 18, intervalMs = 25, write = log.ui } = options;
const {
prefix,
label,
fallback,
body = "",
frames = 18,
intervalMs = 25,
write = log.ui,
} = options;

if (!isInteractive() || colorDisabled()) {
write(`${prefix}${fallback(label)}\n`);
write(`${prefix}${fallback(label)}\n${body}`);
return;
}

const truecolor = supportsTruecolor();
const span = Math.max(1, frames - 1);
// Rows the cursor ends below the header after the block is printed: the
// header's own newline plus every newline inside the body.
const rowsBelow = 1 + (body.match(/\n/g)?.length ?? 0);
Comment thread
rafa-thayto marked this conversation as resolved.

// The cursor-up escape only lands on the header when the block fits on screen
// without scrolling. Fall back to a plain write on short terminals where the
// scroll would push the header out of reach.
if (process.stderr.rows != null && rowsBelow >= process.stderr.rows) {
write(`${prefix}${fallback(label)}\n${body}`);
return;
}

hideCursor();
try {
// Print the whole block first so the body is visible immediately, then step
// back up to the header line and sweep the highlight across it. Only the
// header line is rewritten each frame, so the body stays put.
write(`${prefix}${shineText(label, { truecolor })}\n${body}`);
write(`\x1b[${rowsBelow}A`);
for (let frame = 0; frame < frames; frame++) {
const center = -0.3 + (frame / span) * 1.6;
write(`\r\x1b[K${prefix}${shineText(label, { center, truecolor })}`);
await sleep(intervalMs);
}
write(`\r\x1b[K${prefix}${shineText(label, { truecolor })}\n`);
write(`\r\x1b[K${prefix}${shineText(label, { truecolor })}`);
write(`\x1b[${rowsBelow}B\r`);
} finally {
showCursor();
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-core/src/lib/log.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ export function isInsideGutter(): boolean {
return prefixDepth > 0;
}

function applyPrefix(msg: string): string {
export function applyPrefix(msg: string): string {
if (prefixDepth === 0) return msg;
const bar = dim(S_BAR);
if (!msg) return bar;
Expand Down
6 changes: 2 additions & 4 deletions packages/cli-core/src/lib/spinner.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,16 +54,14 @@ export async function outro(messageOrSteps?: string | readonly string[]) {
popPrefix();

if (Array.isArray(messageOrSteps)) {
const body = `${messageOrSteps.map((step) => ` ${cyan("→")} ${step}`).join("\n")}\n\n`;
await animateHeader({
prefix: `${dim(S_BAR_END)} `,
label: "Next steps",
fallback: dim,
body,
write: writeUi,
});
for (const step of messageOrSteps) {
writeUi(` ${cyan("→")} ${step}\n`);
}
writeUi("\n");
return;
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/next-steps-animation-order.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": patch
---

Print the "Next steps" list before sweeping the highlight across its header, so the animation no longer leaves a lone "Next steps" line that looks hung while the steps are hidden.
4 changes: 2 additions & 2 deletions packages/cli-core/src/commands/deploy/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { Program } from "../../cli-program.ts";
import { deployStatus } from "./status-command.ts";
import { isAgent } from "../../mode.ts";
import { isInsideGutter, log } from "../../lib/log.ts";
import { applyPrefix, isInsideGutter, log } from "../../lib/log.ts";
import { bold, dim } from "../../lib/color.ts";
import { animateHeader } from "../../lib/gradient.ts";
import { bar, intro, outro, pausedOutro, withSpinner } from "../../lib/spinner.ts";
Expand DownExpand Up@@ -633,8 +633,8 @@ async function finishDeploy(
prefix: isInsideGutter() ? `${dim("│")} ` : "",
label: "Next steps",
fallback: bold,
body: `${applyPrefix(nextStepsBody(ctx.appId, productionInstanceId))}\n`,
});
log.info(nextStepsBody(ctx.appId, productionInstanceId));
outro("Success");
}

Expand Down
51 changes: 51 additions & 0 deletions packages/cli-core/src/lib/gradient.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -112,6 +112,17 @@ describe("animateHeader (non-interactive)", () => {
await animateHeader({ prefix: "│ ", label: "Next steps", fallback: bold });
expect(captured.stderr[0]).toBe(`│ ${bold("Next steps")}\n`);
});

test("prints the header and body together in one write", async () => {
await animateHeader({
prefix: "",
label: "Next steps",
fallback: bold,
body: " → a\n → b\n",
});
expect(captured.stderr).toHaveLength(1);
expect(captured.stderr[0]).toBe(`${bold("Next steps")}\n → a\n → b\n`);
});
});

describe("animateHeader (interactive gating)", () => {
Expand DownExpand Up@@ -145,6 +156,25 @@ describe("animateHeader (interactive gating)", () => {
expect(captured.err).toContain("\x1b[?25h");
});

test("prints the body before sweeping the header so it never looks hung", async () => {
await animateHeader({
prefix: "",
label: "Hi",
fallback: bold,
body: " → a\n → b\n",
frames: 2,
intervalMs: 1,
});
const out = captured.err;
expect(out).toContain("→ a");
expect(out).toContain("→ b");
// The body is written before the first in-place header redraw (\r).
expect(out.indexOf("→ a")).toBeLessThan(out.indexOf("\r"));
// The cursor steps up to the header (1 + 2 body newlines) and back down.
expect(out).toContain("\x1b[3A");
expect(out).toContain("\x1b[3B");
});

test("NO_COLOR disables the animation (plain fallback, no redraw)", async () => {
process.env.NO_COLOR = "1";
await run();
Expand All@@ -169,4 +199,25 @@ describe("animateHeader (interactive gating)", () => {
await run();
expect(captured.err).toContain("\r");
});

test("falls back to a plain write when the block is taller than the terminal", async () => {
const savedRows = process.stderr.rows;
try {
Object.defineProperty(process.stderr, "rows", { value: 5, configurable: true });
await animateHeader({
prefix: "",
label: "Hi",
fallback: bold,
// 5 newlines → rowsBelow = 6, which exceeds rows = 5
body: "a\nb\nc\nd\ne\n",
frames: 2,
intervalMs: 1,
});
expect(captured.err).not.toContain("\r");
expect(captured.err).not.toContain("\x1b[?25l");
expect(captured.err).toContain("a");
} finally {
Object.defineProperty(process.stderr, "rows", { value: savedRows, configurable: true });
}
});
});
40 changes: 37 additions & 3 deletions packages/cli-core/src/lib/gradient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,29 +114,63 @@ interface AnimateHeaderOptions {
prefix: string;
label: string;
fallback: (s: string) => string;
/**
* Text printed beneath the header (e.g. the next-steps list), including its
* own trailing newline(s). It is rendered up front so the whole block is on
* screen immediately; the highlight then sweeps across the header in place.
* Without it, only a lone header animates and looks hung until the caller
* prints the rest.
*/
body?: string;
frames?: number;
intervalMs?: number;
write?: (s: string) => void;
}

export async function animateHeader(options: AnimateHeaderOptions): Promise<void> {
const { prefix, label, fallback, frames = 18, intervalMs = 25, write = log.ui } = options;
const {
prefix,
label,
fallback,
body = "",
frames = 18,
intervalMs = 25,
write = log.ui,
} = options;

if (!isInteractive() || colorDisabled()) {
write(`${prefix}${fallback(label)}\n`);
write(`${prefix}${fallback(label)}\n${body}`);
return;
}

const truecolor = supportsTruecolor();
const span = Math.max(1, frames - 1);
// Rows the cursor ends below the header after the block is printed: the
// header's own newline plus every newline inside the body.
const rowsBelow = 1 + (body.match(/\n/g)?.length ?? 0);
Comment thread
rafa-thayto marked this conversation as resolved.

// The cursor-up escape only lands on the header when the block fits on screen
// without scrolling. Fall back to a plain write on short terminals where the
// scroll would push the header out of reach.
if (process.stderr.rows != null && rowsBelow >= process.stderr.rows) {
write(`${prefix}${fallback(label)}\n${body}`);
return;
}

hideCursor();
try {
// Print the whole block first so the body is visible immediately, then step
// back up to the header line and sweep the highlight across it. Only the
// header line is rewritten each frame, so the body stays put.
write(`${prefix}${shineText(label, { truecolor })}\n${body}`);
write(`\x1b[${rowsBelow}A`);
for (let frame = 0; frame < frames; frame++) {
const center = -0.3 + (frame / span) * 1.6;
write(`\r\x1b[K${prefix}${shineText(label, { center, truecolor })}`);
await sleep(intervalMs);
}
write(`\r\x1b[K${prefix}${shineText(label, { truecolor })}\n`);
write(`\r\x1b[K${prefix}${shineText(label, { truecolor })}`);
write(`\x1b[${rowsBelow}B\r`);
} finally {
showCursor();
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-core/src/lib/log.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ export function isInsideGutter(): boolean {
return prefixDepth > 0;
}

function applyPrefix(msg: string): string {
export function applyPrefix(msg: string): string {
if (prefixDepth === 0) return msg;
const bar = dim(S_BAR);
if (!msg) return bar;
Expand Down
6 changes: 2 additions & 4 deletions packages/cli-core/src/lib/spinner.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,16 +54,14 @@ export async function outro(messageOrSteps?: string | readonly string[]) {
popPrefix();

if (Array.isArray(messageOrSteps)) {
const body = `${messageOrSteps.map((step) => ` ${cyan("→")} ${step}`).join("\n")}\n\n`;
await animateHeader({
prefix: `${dim(S_BAR_END)} `,
label: "Next steps",
fallback: dim,
body,
write: writeUi,
});
for (const step of messageOrSteps) {
writeUi(` ${cyan("→")} ${step}\n`);
}
writeUi("\n");
return;
}

Expand Down
Loading