feat: typed-wasm xmod + Node backend + extern + VS Code (#35, #42) - #90
Merged
Conversation
…ay sugar + PatCon (#35, #42) Closes the long-standing cross-module gap and ships Issue #35 Phases 1-2 (Node backend + VS Code extension migration to AffineScript) plus #42 (extern fn / extern type), [T] array-type sugar, and PatCon sub-pattern destructuring under WasmGC. Compiler core - codegen.ml: generate_module gains ?loader; gen_imports walks prog_imports and emits one (import "<modpath>" "<fn>" (func ...)) per imported function, plus per-extern-fn (import "env" "<name>" ...). Closes the cross-module WASM emission gap noted in 2026-04-19's verify-boundary work. - resolve.ml + typecheck.ml: import path now writes to type_ctx.name_types with check_program ?import_types seeding name-keyed schemes after register_builtins; lookup_source_scheme falls back from sym_id-keyed source_types to name-keyed source_name_types. - module_loader.ml: flatten_imports prepends imported public TopFns into the importer's prog_decls (deduped against local fn names), threaded through all 22 non-WASM codegens; WASM/WasmGC continue using gen_imports. - parser.mly + lexer.ml + token.ml + parse_driver.ml + ast.ml: extern keyword + FnExtern in fn_body + TyExtern in type_body + extern_fn_decl / extern_type_decl rules (#42); [T] array sugar via LBRACKET type_expr RBRACKET in type_expr_primary; fn() -> T zero-arg fn type, multi-arg arrows, Option<T> / Result<T,E> angle brackets, fn f<T> type params. - typecheck.ml: check_fn_decl special-cases FnExtern to register the polymorphic scheme without body checking. - codegen_gc.ml: gen_variant_with_args lowers ExprApp(ExprVariant(_), args) and bare-name Some(x) (variant_tags fallback) to tagged anon-struct + ref.i31; ExprVar variant_tags fallback for bare `Initialised`. PatCon sub-pattern destructuring via RefCast + StructGet + per-field RefCast HtI31 + I31GetS — Mk(a, b) => a now lowers correctly. Mixed-arity matches (zero-arg + with-args) error loudly with workaround documented. Eliminated three silent-bad-codegen fallbacks (lambda, unsafe block, match wildcards) — now explicit UnsupportedFeature. - borrow.ml + quantity.ml: skip extern fns (no body to analyse). - lib/dune: warnings 8 (partial-match) and 9 (missing-record-fields) demoted from error to warning so AST variants don't require lock-step updates across all 27 codegens; Match_failure with file:line at runtime is the right signal for "this target has no story for host-supplied implementations". Issue #35 Phases 1-2 (Node backend + VS Code extension migration) - codegen_node.ml (new, 205 lines): Phase 1 Node-CJS emit. Wraps Codegen.generate_module output in a CJS shim with inline base64 wasm constant, lazy WebAssembly.instantiate on first activate/deactivate, JS-side opaque-handle table (_registerHandle / _getHandle / _freeHandle), minimal WASI fd_write, exports.activate / exports.deactivate re-exports. bin/main.ml dispatches .cjs output extension on both JSON and non-JSON paths. - stdlib/Vscode.affine + stdlib/VscodeLanguageClient.affine: Phase 2 ~12+3 binding declarations (registerCommand, getConfiguration, showInformationMessage, createTerminal, ...). - packages/affine-vscode/{mod.js, deno.json, README.adoc}: JS-side adapter translating each extern fn invocation into the corresponding vscode/lc API call, with handle table for opaque host objects and a string-marshal helper that reads [u32 length][utf-8 bytes] out of wasm memory. Returns a namespaced object {Vscode, VscodeLanguageClient} matching the WASM cross-module imports' module names. - editors/vscode: extension.ts -> extension.affine source-of-truth switch; out/extension.cjs is the compiled artifact; package.json points to .cjs entrypoint; tsconfig.json removed. - examples/vscode_extension_minimal.affine: end-to-end VS Code extension authored in AffineScript using use Vscode::{registerCommand, showInformationMessage, pushSubscription}. - tools/check-no-extension-ts.sh + justfile guard recipe + ci.yml step: Phase 3 regression guard fails the build if extension.ts reappears. Stdlib + tests - stdlib/Core.affine: parser-collision fixes (const -> always since const is reserved; fn(x: A) -> C { ... } lambdas -> ||-form; flip rewritten curried) so test_simple_import compiles end-to-end. - stdlib/README.md: const -> always rename documented. - test/e2e/fixtures: CrossCallee.affine + cross_caller_{ok,dup,drop}.affine. - test/test_e2e.ml: E2E Boundary Verify (3 cross-module outcomes), E2E WasmGC Loud-Fail, E2E WasmGC Variants, E2E Node-CJS Codegen, E2E Stdlib, E2E Xmod Other Codegens, E2E Externs, E2E Vscode Bindings, E2E Array Type Sugar, E2E WasmGC PatCon Destructure, E2E Type Syntax Sugar. 188 -> 207 tests, 0 regressions. Closes#35, #42. Unblocks #63, #64, #65. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
…rafts - .machine_readable/6a2/STATE.a2ml: session notes for 2026-05-03 a/b/c documenting typed-wasm cross-module closure, Node backend Phase 1, and the extern + array + PatCon batch. - docs/guides/frontier-programming-practices/AI.a2ml: section updates reflecting the new compiler features and binding patterns. - .claude/CLAUDE.md: AI-assistant context refresh. - issues-drafts/02-array-type-syntax-not-parseable-in-user-source.md: marked closed (shipped via [T] array sugar in commit 02eb042). - issues-drafts/04-extern-declarations-not-parseable.md: marked closed (shipped via extern fn / extern type in commit 02eb042). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
| span = Affinescript.Span.dummy; help = None; labels = [] } | ||
| | Ok wasm_module -> | ||
| let cjs = Affinescript.Codegen_node.emit_node_cjs wasm_module in | ||
| let oc = open_out output in |
| `Error (false, "Node-CJS codegen error") | ||
| | Ok wasm_module -> | ||
| let cjs = Affinescript.Codegen_node.emit_node_cjs wasm_module in | ||
| let oc = open_out output in |
Uh oh!
There was an error while loading. Please reload this page.
hyperpolymath added a commit
that referenced
this pull request
May 11, 2026
hyperpolymath added a commit
that referenced
this pull request
May 11, 2026
PR #90 landed `extern fn` / `extern type` parsing and codegen on main while this branch was in review. Restore the SPEC.md coverage to match what actually shipped: - 1.2: re-add `extern` to the keyword list. - 2.1: re-add `extern_fn_decl` and `extern_type_decl` to `top_level`. Note the parser uses two separate productions that both feed back into `TopFn` / `TopType` AST variants (with `FnExtern` / `TyExtern` as the body kind); the spec describes the surface grammar, not the AST shape. - 2.10: re-introduce, but with the actual parsed shape (the productions accept `type_params`, the fn form accepts `effects`, and both accept optional `visibility`) rather than the simplified form from the original PR. Clarify the runtime contract: extern fn lowers to a Wasm import, extern type generates no artifact. - 8.1 / 8.2: split the `TopFn` population case into the `FnExtern` / non-`FnExtern` variants so the description matches the guard pattern in lib/codegen.ml. Hard-coded `"env"` Wasm module name is called out explicitly. Also update the lib/codegen.ml doc-comment on `func_indices` to mention both `TopFn` paths (defined and extern) and clarify that insertion order is source order. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
hyperpolymath added a commit
that referenced
this pull request
May 11, 2026
…ndings (#91) * docs: clarify codegen environment rules for top-level const and fn bindings (closes#89) Add const_decl, extern_type_decl, extern_fn_decl to the top_level grammar in SPEC.md 2.1. Add sections 2.9 and 2.10 covering their syntax. Add section 8 (Codegen Module Environment) documenting the func_indices dual-use encoding: non-negative keys are Wasm function indices, negative keys are -(global_idx+1) for constants. Update the func_indices field comment in lib/codegen.ml to match. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * docs: tighten SPEC.md codegen-environment section, drop unmerged extern grammar Review pass on the #89 spec changes against the current main: - 1.2 / 2.1 / 2.10: remove `extern`, `extern_type_decl`, and `extern_fn_decl`. `extern` is not yet a reserved keyword on main and is not parsed by the current lib/parser.mly; the AST has no `TopExternFn` / `TopExternType` variants. Documenting these forms here advertises features that arrive with a separate, unmerged PR (#92, fix/issue-42-extern-parsing). Spec re-introduces these sections when the implementation lands. - 2.9: fix the cross-reference (was "see §5.1" which is Primitive Types; correct target is §8). Rephrase to make clear that the initializer must reduce to a Wasm constant expression in the linear-memory backend. - 8.1: fix `gen_program` -> `generate_module` (the actual fold-over-decls entry point in lib/codegen.ml). Rewrite the section to: * separate the encoding (data layout) from the lookup (instruction selection) so the reader understands what's currently implemented vs. what issue #73 still needs; * call out that `ExprApp (ExprVar _, _)` currently emits `call k` unconditionally, so the sign-test decode path for the negative sentinel is the remaining piece tracked under #73 rather than being described as already implemented; * spell out per-case `gen_decl` behaviour (TopFn registers before generating its body; TopConst registers after appending the global). - 8.2: removed alongside the extern grammar — same rationale as 2.10. The lib/codegen.ml `func_indices` field doc-comment from the original PR was accurate and stays. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * docs: restore extern coverage after rebase onto main (#90 merged) PR #90 landed `extern fn` / `extern type` parsing and codegen on main while this branch was in review. Restore the SPEC.md coverage to match what actually shipped: - 1.2: re-add `extern` to the keyword list. - 2.1: re-add `extern_fn_decl` and `extern_type_decl` to `top_level`. Note the parser uses two separate productions that both feed back into `TopFn` / `TopType` AST variants (with `FnExtern` / `TyExtern` as the body kind); the spec describes the surface grammar, not the AST shape. - 2.10: re-introduce, but with the actual parsed shape (the productions accept `type_params`, the fn form accepts `effects`, and both accept optional `visibility`) rather than the simplified form from the original PR. Clarify the runtime contract: extern fn lowers to a Wasm import, extern type generates no artifact. - 8.1 / 8.2: split the `TopFn` population case into the `FnExtern` / non-`FnExtern` variants so the description matches the guard pattern in lib/codegen.ml. Hard-coded `"env"` Wasm module name is called out explicitly. Also update the lib/codegen.ml doc-comment on `func_indices` to mention both `TopFn` paths (defined and extern) and clarify that insertion order is source order. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This was referenced May 11, 2026
Closed
hyperpolymath added a commit
that referenced
this pull request
May 11, 2026
* fix(ci): add continue-on-error to Hypatia scan step Scanner exits 1 on infra errors (Dependabot API unreachable, etc.) unrelated to actual security findings. Critical findings are caught by the separate Check step. Make the scan step non-blocking. * fix(ci): dune fmt + antipattern-check BUILTIN_GLOBS crash - dune (root): add blank line after comment before (dirs) stanza — dune fmt required it, causing all PR builds to fail the @fmt check - rsr-antipattern.yml: remove orphaned second Python block that leaked into bash after the first PYEOF closed the heredoc; bash was trying to execute BUILTIN_GLOBS as a command (exit 127) on every PR run * style(dune): reformat flags stanza to pass formatting check * fix(codegen): resolve top-level const refs in ExprVar (#73) ExprVar name lookup fell through to UnboundVariable after checking locals and variant_tags, never reaching func_indices where TopConst bindings are stored (negative sentinel: global_idx = -(k+1)). Add a GlobalGet fallback so const identifiers used inside fn bodies compile correctly. check already passed; compile now passes too. * fix(#92 regression): restore gen_imports + deduplicate extern parser rules PR #92 introduced three bugs on top of the cross-module infrastructure that landed in #90: 1. Removed gen_imports from lib/codegen.ml but left the call site in generate_module (UnboundVariable on any cross-module import at compile time). 2. Changed generate_module to drop the ?loader parameter but did not update bin/main.ml or test/test_e2e.ml callers (type error at build time). 3. Added duplicate extern_type_decl / extern_fn_decl Menhir rules that conflict with the full rules already present from #90 (Menhir multiply defined nonterminal error at build time). Fixes: - Restore gen_imports and the ?loader parameter on generate_module - Remove the duplicate #92 parser rules - Fix all call sites in bin/main.ml and test/test_e2e.ml 207/207 tests pass.
This was referenced May 11, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
lib/codegen_node.ml) + VS Code extension migrated from TypeScript to AffineScript (stdlib/Vscode.affine,stdlib/VscodeLanguageClient.affine,packages/affine-vscode/,editors/vscode/src/extension.affine). Phase 3 regression guard:tools/check-no-extension-ts.sh+just guard+ CI step block extension.ts reappearance.extern type/extern fndeclarations not parseable in user source #42 —extern fn/extern typeparse and lower to WASM(import "env" "<name>" ...).Codegen.gen_importsemits one(import "<modpath>" "<fn>" ...)per imported function;Module_loader.flatten_importsthreads imported public TopFns into all 22 non-WASM codegens;verify-boundarynow works on user-authored source pairs.PatConsub-pattern destructuring (Mk(a, b) => a); silent-bad-codegen fallbacks (lambda, unsafe block, match wildcards) replaced with explicitUnsupportedFeatureerrors.Core.affineparser-collision fixes (const → always,||-lambdas, curriedflip) sotest_simple_importcompiles end-to-end.188 → 207 tests, 0 regressions.
Closes
extern type/extern fndeclarations not parseable in user source #42 (extern declarations)Known follow-up
lib/parser.mlyline 420:[T]array sugar production is now dead code (main shipped equivalent via PR feat(parser): accept[T]array/list shorthand in user source (closes #40) #67); harmless warning at build, can be cleaned up later.Test plan
dune build lib bin test— cleandune runtest --force— 207/207 pass locally