Skip to content

Nicer ast view #693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 29, 2024
Merged

Nicer ast view #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ebe872
simplify
Rich-Harris Oct 28, 2024
58fc779
shuffle code around
Rich-Harris Oct 29, 2024
3c5c57d
nicer AST view
Rich-Harris Oct 29, 2024
23b773a
simplify
Rich-Harris Oct 29, 2024
497d8d7
check
Rich-Harris Oct 29, 2024
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
133 changes: 67 additions & 66 deletions packages/repl/src/lib/Output/AstNode.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,52 +9,34 @@
interface Props {
key?: string;
value: Ast;
collapsed?: boolean;
path_nodes?: Ast[];
autoscroll?: boolean;
depth?: number;
}

let {
key = '',
value,
collapsed = $bindable(true),
path_nodes = [],
autoscroll = true
}: Props = $props();
let { key = '', value, path_nodes = [], autoscroll = true, depth = 0 }: Props = $props();

const { toggleable } = get_repl_context();

let root = depth === 0;
let open = $state(root);

let list_item_el = $state() as HTMLLIElement;

let is_root = $derived(path_nodes[0] === value);
let is_leaf = $derived(path_nodes[path_nodes.length - 1] === value);
let is_ast_array = $derived(Array.isArray(value));
let is_collapsable = $derived(value && typeof value === 'object');
let is_array = $derived(Array.isArray(value));
let is_primitive = $derived(value === null || typeof value !== 'object');
let is_markable = $derived(
is_collapsable &&
!is_primitive &&
'start' in value &&
'end' in value &&
typeof value.start === 'number' &&
typeof value.end === 'number'
);
let key_text = $derived(key ? `${key}:` : '');

let preview_text = $state('');

$effect(() => {
if (!is_collapsable || !collapsed) return;

if (is_ast_array) {
if (!('length' in value)) return;

preview_text = `[ ${value.length} element${value.length === 1 ? '' : 's'} ]`;
} else {
preview_text = `{ ${Object.keys(value).join(', ')} }`;
}
});

$effect(() => {
collapsed = !path_nodes.includes(value);
open = path_nodes.includes(value);
});

$effect(() => {
Expand Down Expand Up @@ -95,36 +77,59 @@

<li
bind:this={list_item_el}
class:marked={!is_root && is_leaf}
class:marked={!root && is_leaf}
onmouseover={handle_mark_text}
onfocus={handle_mark_text}
onmouseleave={handle_unmark_text}
>
{#if !is_root && is_collapsable}
<button class="ast-toggle" class:open={!collapsed} onclick={() => (collapsed = !collapsed)}>
{key_text}
</button>
{:else if key_text}
<span>{key_text}</span>
{/if}
{#if is_collapsable}
{#if collapsed && !is_root}
<button class="preview" onclick={() => (collapsed = !collapsed)}>
{preview_text}
</button>
{:else}
<span>{is_ast_array ? '[' : '{'}</span>
{#if is_primitive || (is_array && value.length === 0)}
<span class="value">
{#if key_text}
<span>{key_text}</span>
{/if}

{#if value == undefined}
<span class="token comment">{String(value)}</span>
{:else}
<span class="token {typeof value}">
{JSON.stringify(value)}
</span>
{/if}
</span>
{:else}
<details bind:open>
<summary>
{#if key}
<span class="key">{key}</span>:
{/if}

{#if is_array}
[{#if !open}
<span class="token comment">...</span>]
<span class="token comment">({value.length})</span>
{/if}
{:else}
{#if value.type}
<span class="token comment">{value.type}</span>
{/if}
{'{'}{#if !open}<span class="token comment">...</span>}{/if}
{/if}
</summary>

<ul>
{#each Object.entries(value) as [k, v]}
<AstNode key={is_ast_array ? '' : k} value={v} {path_nodes} {autoscroll} />
<AstNode
key={is_array ? undefined : k}
value={v}
{path_nodes}
{autoscroll}
depth={depth + 1}
/>
{/each}
</ul>
<span>{is_ast_array ? ']' : '}'}</span>
{/if}
{:else}
<span class="token {typeof value}">
{JSON.stringify(value)}
</span>

<span>{is_array ? ']' : '}'}</span>
</details>
{/if}
</li>

Expand All @@ -143,26 +148,18 @@
background-color: var(--sk-highlight-color);
}

button {
&:hover {
text-decoration: underline;
}
}

.ast-toggle {
summary {
position: relative;
}
display: block;
cursor: pointer;

.ast-toggle::before {
content: '\25B6';
position: absolute;
bottom: 0;
left: -1.3rem;
opacity: 0.7;
}
.key {
text-decoration: underline;
}

.ast-toggle.open::before {
content: '\25BC';
&:hover .key {
text-decoration: underline;
}
}

.token {
Expand All @@ -176,4 +173,8 @@
.token.number {
color: var(--sk-code-number);
}

.token.comment {
color: var(--sk-code-comment);
}
</style>
2 changes: 1 addition & 1 deletion packages/repl/src/lib/Output/AstView.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<code>
{#if typeof ast === 'object'}
<ul>
<AstNode value={ast} {path_nodes} {autoscroll} collapsed={false} />
<AstNode value={ast} {path_nodes} {autoscroll} />
</ul>
{:else}
<p>No AST available</p>
Expand Down
Loading