Skip to content

Commit c695dff

Browse files
Dale-Blackclaude
Dale-Black
and
claude
committed
Switch ND arrays from flat+_size to nested JS arrays
Nested arrays ([[row1],[row2]]) are the native format for JS libraries (Plotly, D3, TensorFlow.js). This means heatmap(z=matrix) just works without any conversion layer. - jl_ndarray: recursive nested array construction - A[i,j] → A[i-1][j-1] (simpler than column-major stride) - size(A,d) → dimension walk via A[0].length - Updated all getindex/setindex paths (3 each), both size paths - All 851 tests pass Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 377701a commit c695dff

6 files changed

Lines changed: 50 additions & 46 deletions

File tree

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ Includes a self-hosted [browser playground](https://grouptherapyorg.github.io/Ja
4444
| | `deleteat!` | `.splice(i-1, 1)` |
4545
| | `sort` (with `by=`, `rev=`) | `.slice().sort(compareFn)` |
4646
| | `in` / `∈` | `.includes()` |
47-
| **ND Arrays** | `zeros(m,n)`, `ones(m,n)`, `fill(v,m,n)` | Flat `Array` + `_size` metadata (column-major) |
48-
| | `A[i,j]`, `A[i,j,k]` | Column-major stride: `A[(j-1)*m+(i-1)]` |
49-
| | `A[i,j] = val` | Same stride for write |
50-
| | `size(A)`, `size(A,d)` | `A._size`, `A._size[d-1]` |
51-
| | `length(A)` (total elements) | `A.length` |
47+
| **ND Arrays** | `zeros(m,n)`, `ones(m,n)`, `fill(v,m,n)` | Nested `Array` of `Array`: `[[0,0],[0,0]]` |
48+
| | `A[i,j]`, `A[i,j,k]` | `A[i-1][j-1]`, `A[i-1][j-1][k-1]` |
49+
| | `A[i,j] = val` | `A[i-1][j-1] = val` |
50+
| | `size(A)`, `size(A,d)` | `[A.length, A[0].length]`, dimension walk |
51+
| | `length(A)` | `A.length` (outer dimension) |
5252
| **Higher-Order** | `map(f, arr)` | `arr.map(f)` |
5353
| | `filter(f, arr)` | `arr.filter(f)` |
5454
| | `any(f, arr)`, `all(f, arr)` | `arr.some(f)`, `arr.every(f)` |
@@ -94,7 +94,7 @@ Includes a self-hosted [browser playground](https://grouptherapyorg.github.io/Ja
9494
| **Parsing** | `parse(Int, s)` | `parseInt(s, 10)` |
9595
| | `parse(Float64, s)` | `parseFloat(s)` |
9696
| **Construction** | `zeros(n)`, `ones(n)`, `fill(v,n)` | `new Array(n).fill(...)` |
97-
| | `zeros(m,n)`, `ones(m,n)`, `fill(v,m,n)` | `jl_ndarray(val, [m,n])` |
97+
| | `zeros(m,n)`, `ones(m,n)`, `fill(v,m,n)` | `jl_ndarray(val, [m,n])` → nested arrays |
9898
| **Other** | `isempty(x)` | `x.length === 0` |
9999
| | `convert(T, x)` | `x` (identity) |
100100
| | `Float64(x)`, `Int(x)` | `+(x)`, `(x)\|0` |

‎docs/src/routes/api/index.jl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,16 +120,16 @@ end
120120

121121
# ── ND Arrays ──
122122
H3(:class => "text-lg font-semibold text-warm-800 dark:text-warm-200 mt-6", "ND Arrays"),
123-
P(:class => "text-sm text-warm-600 dark:text-warm-400", "Multi-dimensional arrays use flat JavaScript Arrays with ", Code(:class => "text-accent-500", "_size"), " metadata, stored in column-major order (matching Julia's memory layout)."),
123+
P(:class => "text-sm text-warm-600 dark:text-warm-400", "Multi-dimensional arrays transpile to nested JavaScript arrays — the native format for JS libraries like Plotly, D3, and TensorFlow.js."),
124124
Div(:class => "overflow-x-auto",
125125
Table(:class => "w-full text-sm",
126126
Thead(Tr(Th(:class => th_cls, "Julia"), Th(:class => th_cls, "JavaScript"))),
127127
Tbody(
128-
Tr(:class => row, Td(:class => jl, "zeros(m,n), ones(m,n), fill(v,m,n)"), Td(:class => js_col, "jl_ndarray(val, [m,n])")),
129-
Tr(:class => row, Td(:class => jl, "A[i,j], A[i,j,k]"), Td(:class => js_col, "Column-major stride: A[(j-1)*m+(i-1)]")),
130-
Tr(:class => row, Td(:class => jl, "A[i,j] = val"), Td(:class => js_col, "Same stride for write")),
131-
Tr(:class => row, Td(:class => jl, "size(A), size(A,d)"), Td(:class => js_col, "A._size, A._size[d-1]")),
132-
Tr(:class => row, Td(:class => jl, "length(A)"), Td(:class => js_col, "A.length (total elements)"))
128+
Tr(:class => row, Td(:class => jl, "zeros(m,n), ones(m,n), fill(v,m,n)"), Td(:class => js_col, "Nested arrays: [[0,0],[0,0]]")),
129+
Tr(:class => row, Td(:class => jl, "A[i,j], A[i,j,k]"), Td(:class => js_col, "A[i-1][j-1], A[i-1][j-1][k-1]")),
130+
Tr(:class => row, Td(:class => jl, "A[i,j] = val"), Td(:class => js_col, "A[i-1][j-1] = val")),
131+
Tr(:class => row, Td(:class => jl, "size(A), size(A,d)"), Td(:class => js_col, "[A.length, A[0].length]")),
132+
Tr(:class => row, Td(:class => jl, "length(A)"), Td(:class => js_col, "A.length"))
133133
)
134134
)
135135
),
@@ -142,7 +142,7 @@ end
142142
end
143143
return A
144144
end
145-
# → jl_ndarray(0, [m,n]) with column-major indexing""")),
145+
# → [[2,3,4,...],[3,4,5,...],...] (nested JS arrays)""")),
146146

147147
# ── Higher-Order ──
148148
H3(:class => "text-lg font-semibold text-warm-800 dark:text-warm-200 mt-6", "Higher-Order Functions"),
@@ -274,7 +274,7 @@ js(\"console.log('value:', \\\$1)\", my_value) # \$1 substituted with compiled
274274
Thead(Tr(Th(:class => th_cls, "Julia"), Th(:class => th_cls, "JavaScript"))),
275275
Tbody(
276276
Tr(:class => row, Td(:class => jl, "zeros(n), ones(n), fill(v,n)"), Td(:class => js_col, "new Array(n).fill(...)")),
277-
Tr(:class => row, Td(:class => jl, "zeros(m,n), ones(m,n), fill(v,m,n)"), Td(:class => js_col, "jl_ndarray(val, [m,n])"))
277+
Tr(:class => row, Td(:class => jl, "zeros(m,n), ones(m,n), fill(v,m,n)"), Td(:class => js_col, "jl_ndarray(val, [m,n]) → nested arrays"))
278278
)
279279
)
280280
),

‎docs/src/routes/getting-started.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ println(result.js)
3434
Tr(:class => row, Td(:class => jl, "String"), Td(:class => js_col, "string")),
3535
Tr(:class => row, Td(:class => jl, "Bool"), Td(:class => js_col, "boolean")),
3636
Tr(:class => row, Td(:class => jl, "Vector{T}"), Td(:class => js_col, "Array")),
37-
Tr(:class => row, Td(:class => jl, "Matrix{T} (ND arrays)"), Td(:class => js_col, "Flat Array + _size (column-major)")),
37+
Tr(:class => row, Td(:class => jl, "Matrix{T} (ND arrays)"), Td(:class => js_col, "Nested Array: [[row1], [row2]]")),
3838
Tr(:class => row, Td(:class => jl, "Dict{K,V}"), Td(:class => js_col, "Map")),
3939
Tr(:class => row, Td(:class => jl, "Set{T}"), Td(:class => js_col, "Set")),
4040
Tr(:class => row, Td(:class => jl, "struct"), Td(:class => js_col, "ES6 class")),

‎src/compiler/codegen.jl‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -938,11 +938,11 @@ function compile_call(ctx::JSCompilationContext, expr::Expr)
938938
end
939939
return "$(call_args[1])[($(call_args[2])) - 1]"
940940
elseif length(call_args) == 3
941-
# A[i,j] → column-major flat index: (j-1)*nrows + (i-1)
942-
return "$(call_args[1])[(($(call_args[3]))-1)*$(call_args[1])._size[0]+(($(call_args[2]))-1)]"
941+
# A[i,j] → nested: A[i-1][j-1]
942+
return "$(call_args[1])[($(call_args[2]))-1][($(call_args[3]))-1]"
943943
elseif length(call_args) == 4
944-
# A[i,j,k] → column-major: (k-1)*m*n + (j-1)*m + (i-1)
945-
return "$(call_args[1])[(($(call_args[4]))-1)*$(call_args[1])._size[0]*$(call_args[1])._size[1]+(($(call_args[3]))-1)*$(call_args[1])._size[0]+(($(call_args[2]))-1)]"
944+
# A[i,j,k] → nested: A[i-1][j-1][k-1]
945+
return "$(call_args[1])[($(call_args[2]))-1][($(call_args[3]))-1][($(call_args[4]))-1]"
946946
end
947947
return "[]"
948948
end
@@ -1108,15 +1108,15 @@ function compile_call(ctx::JSCompilationContext, expr::Expr)
11081108
end
11091109
if fn_name == "setindex!" && length(call_args) >= 3
11101110
if length(call_args) == 4
1111-
# A[i,j] = val → column-major
1112-
return "($(call_args[1])[(($(call_args[4]))-1)*$(call_args[1])._size[0]+(($(call_args[3]))-1)] = $(call_args[2]))"
1111+
# A[i,j] = val → nested: A[i-1][j-1] = val
1112+
return "($(call_args[1])[($(call_args[3]))-1][($(call_args[4]))-1] = $(call_args[2]))"
11131113
else
11141114
return "($(call_args[1])[($(call_args[3]))-1] = $(call_args[2]))"
11151115
end
11161116
end
11171117
if fn_name == "getindex" && length(call_args) == 3
1118-
# A[i,j] → column-major
1119-
return "$(call_args[1])[(($(call_args[3]))-1)*$(call_args[1])._size[0]+(($(call_args[2]))-1)]"
1118+
# A[i,j] → nested: A[i-1][j-1]
1119+
return "$(call_args[1])[($(call_args[2]))-1][($(call_args[3]))-1]"
11201120
end
11211121
if fn_name == "copy" && length(call_args) >= 1
11221122
return "$(call_args[1]).slice()"
@@ -1174,9 +1174,11 @@ function compile_call(ctx::JSCompilationContext, expr::Expr)
11741174
# ─── Size (by name) ───
11751175
if fn_name == "size"
11761176
if length(call_args) == 1
1177-
return "($(call_args[1])._size||[$(call_args[1]).length]).slice()"
1177+
# size(A) → [A.length, A[0].length, ...] for nested arrays
1178+
return "(Array.isArray($(call_args[1])[0])?[$(call_args[1]).length,$(call_args[1])[0].length]:[$(call_args[1]).length])"
11781179
elseif length(call_args) == 2
1179-
return "($(call_args[1])._size?$(call_args[1])._size[($(call_args[2]))-1]:$(call_args[1]).length)"
1180+
# size(A, d) → walk d-1 levels of [0] then .length
1181+
return "(($(call_args[2]))===1?$(call_args[1]).length:$(call_args[1])[0].length)"
11801182
end
11811183
end
11821184

@@ -1388,17 +1390,17 @@ function compile_call(ctx::JSCompilationContext, expr::Expr)
13881390
if length(call_args_gr) == 2
13891391
return "$(call_args_gr[1])[($(call_args_gr[2])) - 1]"
13901392
elseif length(call_args_gr) == 3
1391-
# A[i,j] → column-major
1392-
return "$(call_args_gr[1])[(($(call_args_gr[3]))-1)*$(call_args_gr[1])._size[0]+(($(call_args_gr[2]))-1)]"
1393+
# A[i,j] → nested: A[i-1][j-1]
1394+
return "$(call_args_gr[1])[($(call_args_gr[2]))-1][($(call_args_gr[3]))-1]"
13931395
end
13941396
end
13951397

13961398
# Base.setindex! — array assignment (1D and ND)
13971399
if bname === :setindex! && callee.mod === Base
13981400
call_args_gr = [compile_value(ctx, a) for a in args[2:end]]
13991401
if length(call_args_gr) == 4
1400-
# A[i,j] = val → column-major
1401-
return "($(call_args_gr[1])[(($(call_args_gr[4]))-1)*$(call_args_gr[1])._size[0]+(($(call_args_gr[3]))-1)] = $(call_args_gr[2]))"
1402+
# A[i,j] = val → nested: A[i-1][j-1] = val
1403+
return "($(call_args_gr[1])[($(call_args_gr[3]))-1][($(call_args_gr[4]))-1] = $(call_args_gr[2]))"
14021404
elseif length(call_args_gr) == 3
14031405
return "($(call_args_gr[1])[($(call_args_gr[3]))-1] = $(call_args_gr[2]))"
14041406
end
@@ -1865,10 +1867,10 @@ function compile_invoke(ctx::JSCompilationContext, expr::Expr)
18651867
arr_val = compile_value(ctx, expr.args[3])
18661868
val_val = compile_value(ctx, expr.args[4])
18671869
if length(expr.args) == 6
1868-
# A[i,j] = val → column-major
1870+
# A[i,j] = val → nested: A[i-1][j-1] = val
18691871
i_val = compile_value(ctx, expr.args[5])
18701872
j_val = compile_value(ctx, expr.args[6])
1871-
return "($(arr_val)[(($(j_val))-1)*$(arr_val)._size[0]+(($(i_val))-1)] = $(val_val))"
1873+
return "($(arr_val)[($(i_val))-1][($(j_val))-1] = $(val_val))"
18721874
else
18731875
idx_val = compile_value(ctx, expr.args[5])
18741876
return "($(arr_val)[($(idx_val))-1] = $(val_val))"
@@ -2019,12 +2021,12 @@ function compile_invoke(ctx::JSCompilationContext, expr::Expr)
20192021
return "$(call_args[1]).length === 0"
20202022
end
20212023

2022-
# size(A) → shape tuple, size(A, d) → dimension size
2024+
# size(A) → shape tuple, size(A, d) → dimension size (nested arrays)
20232025
if func_name == "size"
20242026
if length(call_args) == 1
2025-
return "($(call_args[1])._size||[$(call_args[1]).length]).slice()"
2027+
return "(Array.isArray($(call_args[1])[0])?[$(call_args[1]).length,$(call_args[1])[0].length]:[$(call_args[1]).length])"
20262028
elseif length(call_args) == 2
2027-
return "($(call_args[1])._size?$(call_args[1])._size[($(call_args[2]))-1]:$(call_args[1]).length)"
2029+
return "(($(call_args[2]))===1?$(call_args[1]).length:$(call_args[1])[0].length)"
20282030
end
20292031
end
20302032

‎src/compiler/runtime.jl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,10 @@ function jl_objectid(x) {
221221

222222
:jl_ndarray => """
223223
function jl_ndarray(fill_val, dims) {
224-
var n = 1;
225-
for (var i = 0; i < dims.length; i++) n *= dims[i];
226-
var a = new Array(n).fill(fill_val);
227-
a._size = dims.slice();
224+
if (dims.length === 1) return new Array(dims[0]).fill(fill_val);
225+
var a = new Array(dims[0]);
226+
var rest = dims.slice(1);
227+
for (var i = 0; i < dims[0]; i++) a[i] = jl_ndarray(fill_val, rest);
228228
return a;
229229
}""",
230230
)

‎test/runtests.jl‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3517,14 +3517,16 @@ process.stdout.write(JSON.stringify(r));
35173517
end
35183518

35193519
# ─── ND Array tests (e2e via Node.js) ───
3520+
# ND arrays use nested JS arrays: zeros(3,4) → [[0,0,0,0],[0,0,0,0],[0,0,0,0]]
35203521
@testset "ND: zeros(3,4)" begin
3521-
@test compile_unopt_and_run(() -> zeros(3, 4), "") == "[0,0,0,0,0,0,0,0,0,0,0,0]"
3522+
@test compile_unopt_and_run(() -> zeros(3, 4), "") == "[[0,0,0,0],[0,0,0,0],[0,0,0,0]]"
35223523
end
35233524
@testset "ND: ones(2,3)" begin
3524-
@test compile_unopt_and_run(() -> ones(2, 3), "") == "[1,1,1,1,1,1]"
3525+
@test compile_unopt_and_run(() -> ones(2, 3), "") == "[[1,1,1],[1,1,1]]"
35253526
end
35263527
@testset "ND: length(zeros(3,4))" begin
3527-
@test compile_unopt_and_run(() -> length(zeros(3, 4)), "") == "12"
3528+
# length = outer dimension (nrows) — use size for full shape
3529+
@test compile_unopt_and_run(() -> length(zeros(3, 4)), "") == "3"
35283530
end
35293531
@testset "ND: size(A,1)" begin
35303532
@test compile_unopt_and_run(() -> size(zeros(3, 4), 1), "") == "3"
@@ -3535,8 +3537,8 @@ process.stdout.write(JSON.stringify(r));
35353537
@testset "ND: A[i,j] set+get" begin
35363538
@test compile_unopt_and_run(() -> begin A=zeros(2,3); A[1,2]=42.0; A[1,2] end, "") == "42"
35373539
end
3538-
@testset "ND: column-major indexing" begin
3539-
@test compile_unopt_and_run(() -> begin A=zeros(2,3); A[2,1]=10.0; A[1,2]=20.0; A[2,2]=30.0; A end, "") == "[0,10,20,30,0,0]"
3540+
@testset "ND: nested array indexing" begin
3541+
@test compile_unopt_and_run(() -> begin A=zeros(2,3); A[2,1]=10.0; A[1,2]=20.0; A[2,2]=30.0; A end, "") == "[[0,20,0],[10,30,0]]"
35403542
end
35413543
@testset "ND: unrolled matmul" begin
35423544
fn = () -> begin
@@ -3549,7 +3551,7 @@ process.stdout.write(JSON.stringify(r));
35493551
C[2,2] = A[2,1]*B[1,2] + A[2,2]*B[2,2]
35503552
return C
35513553
end
3552-
@test compile_unopt_and_run(fn, "") == "[19,43,22,50]"
3554+
@test compile_unopt_and_run(fn, "") == "[[19,22],[43,50]]"
35533555
end
35543556
@testset "ND: nested loop sum" begin
35553557
fn = () -> begin
@@ -3578,7 +3580,7 @@ process.stdout.write(JSON.stringify(r));
35783580
end; end
35793581
C
35803582
end
3581-
# A*B = [[19,22],[43,50]], column-major flat = [19,43,22,50]
3582-
@test compile_unopt_and_run(fn, "") == "[19,43,22,50]"
3583+
# A*B = [[19,22],[43,50]]
3584+
@test compile_unopt_and_run(fn, "") == "[[19,22],[43,50]]"
35833585
end
35843586
end

0 commit comments

Comments
 (0)