Skip to content
Open
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
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/avm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ file(GLOB_RECURSE IPC_CODEGEN_SRC
)
add_custom_command(
OUTPUT ${AVM_GEN_OUTPUTS}
COMMAND node --experimental-strip-types --experimental-transform-types --no-warnings
COMMAND node --experimental-strip-types --no-warnings
${IPC_CODEGEN_DIR}/src/generate.ts
--schema ${AVM_SCHEMA}
--lang cpp
Expand Down
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/cdb/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ file(GLOB_RECURSE IPC_CODEGEN_SRC
)
add_custom_command(
OUTPUT ${CDB_GEN_OUTPUTS}
COMMAND node --experimental-strip-types --experimental-transform-types --no-warnings
COMMAND node --experimental-strip-types --no-warnings
${IPC_CODEGEN_DIR}/src/generate.ts
--schema ${CDB_SCHEMA}
--lang cpp
Expand Down
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/wsdb/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ file(GLOB_RECURSE IPC_CODEGEN_SRC
)
add_custom_command(
OUTPUT ${WSDB_GEN_OUTPUTS}
COMMAND node --experimental-strip-types --experimental-transform-types --no-warnings
COMMAND node --experimental-strip-types --no-warnings
${IPC_CODEGEN_DIR}/src/generate.ts
--schema ${WSDB_SCHEMA}
--lang cpp
Expand Down
4 changes: 2 additions & 2 deletions barretenberg/ts/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ hash=$(hash_str \
$(semver check $REF_NAME && echo 1 || echo 0))

function generate_bb_avm_sim_package {
node --experimental-strip-types --experimental-transform-types --no-warnings \
node --experimental-strip-types --no-warnings \
"$ROOT/ipc-codegen/src/generate.ts" \
--schema "$ROOT/barretenberg/cpp/src/barretenberg/avm/avm_schema.json" \
--lang ts \
Expand All @@ -33,7 +33,7 @@ function generate_bb_avm_sim_package {
# Server binding package for the AVM CDB protocol: generated wire types +
# Handler/dispatch + the schema itself. Pure TS — no binary, no arch packages.
function generate_cdb_package {
node --experimental-strip-types --experimental-transform-types --no-warnings \
node --experimental-strip-types --no-warnings \
"$ROOT/ipc-codegen/src/generate.ts" \
--schema "$ROOT/barretenberg/cpp/src/barretenberg/cdb/cdb_schema.json" \
--lang ts \
Expand Down
2 changes: 1 addition & 1 deletion ipc-codegen/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ Invoked once per (schema, language) pair. Run directly with
`node --experimental-strip-types`, or via `bootstrap.sh`.

```
node --experimental-strip-types --experimental-transform-types --no-warnings \
node --experimental-strip-types --no-warnings \
src/generate.ts --schema <file> --lang <ts|cpp|rust|zig> --out <dir> [flags]
```

Expand Down
3 changes: 3 additions & 0 deletions ipc-codegen/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ function test_cmds {
# Generator unit tests (schema validation).
echo "$prefix node --experimental-strip-types --no-warnings ipc-codegen/test/schema_visitor.test.ts"

# The generator itself must load under type stripping alone (no transform step).
echo "$prefix ipc-codegen/scripts/strip_only_test.sh"

# Golden tests (each language verifies it can deserialize the goldens
# baked by build(), and re-encode them byte-identically).
echo "$prefix $script golden rust"
Expand Down
2 changes: 1 addition & 1 deletion ipc-codegen/echo_example/cpp/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -euo pipefail

DIR="$(cd "$(dirname "$0")" && pwd)"
CODEGEN="$(cd "$DIR/../.." && pwd)"
NODE="node --experimental-strip-types --experimental-transform-types --no-warnings"
NODE="node --experimental-strip-types --no-warnings"

$NODE "$CODEGEN/src/generate.ts" \
--schema "$DIR/../schema/schema.jsonc" \
Expand Down
2 changes: 1 addition & 1 deletion ipc-codegen/echo_example/rust/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -euo pipefail

DIR="$(cd "$(dirname "$0")" && pwd)"
CODEGEN="$(cd "$DIR/../.." && pwd)"
NODE="node --experimental-strip-types --experimental-transform-types --no-warnings"
NODE="node --experimental-strip-types --no-warnings"

$NODE "$CODEGEN/src/generate.ts" \
--schema "$DIR/../schema/schema.jsonc" \
Expand Down
2 changes: 1 addition & 1 deletion ipc-codegen/echo_example/ts/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -euo pipefail
DIR="$(cd "$(dirname "$0")" && pwd)"
CODEGEN="$(cd "$DIR/../.." && pwd)"
REPO_ROOT="$(cd "$CODEGEN/.." && pwd)"
NODE="node --experimental-strip-types --experimental-transform-types --no-warnings"
NODE="node --experimental-strip-types --no-warnings"

$NODE "$CODEGEN/src/generate.ts" \
--schema "$DIR/../schema/schema.jsonc" \
Expand Down
2 changes: 1 addition & 1 deletion ipc-codegen/echo_example/ts_package/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -euo pipefail
DIR="$(cd "$(dirname "$0")" && pwd)"
CODEGEN="$(cd "$DIR/../.." && pwd)"
REPO_ROOT="$(cd "$CODEGEN/.." && pwd)"
NODE="node --experimental-strip-types --experimental-transform-types --no-warnings"
NODE="node --experimental-strip-types --no-warnings"

$NODE "$CODEGEN/src/generate.ts" \
--schema "$DIR/../schema/schema.jsonc" \
Expand Down
2 changes: 1 addition & 1 deletion ipc-codegen/echo_example/zig/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -euo pipefail

DIR="$(cd "$(dirname "$0")" && pwd)"
CODEGEN="$(cd "$DIR/../.." && pwd)"
NODE="node --experimental-strip-types --experimental-transform-types --no-warnings"
NODE="node --experimental-strip-types --no-warnings"

$NODE "$CODEGEN/src/generate.ts" \
--schema "$DIR/../schema/schema.jsonc" \
Expand Down
20 changes: 20 additions & 0 deletions ipc-codegen/scripts/strip_only_test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/usr/bin/env bash
#
# The generator must run under Node's type stripping alone, with no transform
# step: only erasable TypeScript, so no parameter properties, enums, namespaces
# or decorators in ipc-codegen/src. Node reports those as
# ERR_UNSUPPORTED_TYPESCRIPT_SYNTAX at module load, which takes out every
# --lang at once, so generate one of each here rather than trusting the callers
# to notice.
source $(git rev-parse --show-toplevel)/ci3/source

schema="$root/ipc-codegen/echo_example/schema/schema.jsonc"
out=$(mktemp -d)
trap "rm -rf $out" EXIT

for lang in rust ts zig cpp; do
node --experimental-strip-types --no-warnings "$root/ipc-codegen/src/generate.ts" \
--schema "$schema" --lang "$lang" --out "$out/$lang" --server --client >/dev/null
done

echo "generate.ts runs strip-only for rust, ts, zig and cpp."
6 changes: 5 additions & 1 deletion ipc-codegen/src/cpp_codegen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ export interface CppCodegenOptions {
}

export class CppCodegen {
constructor(private opts: CppCodegenOptions) {}
private opts: CppCodegenOptions;

constructor(opts: CppCodegenOptions) {
this.opts = opts;
}

private primitiveType(type: import("./schema_visitor.ts").Type): string {
switch (type.primitive) {
Expand Down
12 changes: 10 additions & 2 deletions ipc-codegen/src/typescript_package_codegen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,11 @@ export interface TypeScriptServerPackageOptions {
* from @aztec-foundation/ipc-runtime).
*/
export class TypeScriptServerPackageCodegen {
constructor(private opts: TypeScriptServerPackageOptions) {}
private opts: TypeScriptServerPackageOptions;

constructor(opts: TypeScriptServerPackageOptions) {
this.opts = opts;
}

generatePackageJson(): string {
const pkg = {
Expand Down Expand Up @@ -175,7 +179,11 @@ runs \`yarn build\`.
}

export class TypeScriptPackageCodegen {
constructor(private opts: TypeScriptPackageOptions) {}
private opts: TypeScriptPackageOptions;

constructor(opts: TypeScriptPackageOptions) {
this.opts = opts;
}

generatePackageJson(): string {
const archPackages = archPackageNames(this.opts.packageName);
Expand Down
2 changes: 1 addition & 1 deletion wsdb/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ hash=$(hash_str \
$(cache_content_hash .rebuild_patterns))

function generate_ts_package {
node --experimental-strip-types --experimental-transform-types --no-warnings \
node --experimental-strip-types --no-warnings \
"$ROOT/ipc-codegen/src/generate.ts" \
--schema "$ROOT/barretenberg/cpp/src/barretenberg/wsdb/wsdb_schema.jsonc" \
--lang ts \
Expand Down
Loading