Skip to content

Support separated types and protocol generation for TS and JS #115

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
khitrind merged 8 commits into from
Dec 12, 2024
Merged

Support separated types and protocol generation for TS and JS #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a223924
feat: support separated types generation for ts
Dec 11, 2024
8ff1c0c
feat: support separated protocols generation for ts
Dec 11, 2024
d9a9419
fix: fix mypy error
Dec 12, 2024
0795bb9
feat: combine protocols and types
Dec 12, 2024
1159e46
fix: fix node generate types scripts
Dec 12, 2024
79f1dc2
feat: support separated types for codec
Dec 12, 2024
319086e
test: fix js pipeline test
Dec 12, 2024
0df41a1
refactor: refactor js protocol a bit
Dec 12, 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
1 change: 0 additions & 1 deletion .github/workflows/js.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ on:

jobs:
build:
if: false # disable the entire workflow
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
32 changes: 20 additions & 12 deletions messgen/json_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import json
import os

from dataclasses import asdict
from pathlib import Path

from .common import write_file_if_diff
from .protocol_version import version_hash

from .validation import validate_protocol
Expand All @@ -31,17 +29,27 @@ def validate(self, types: dict[str, MessgenType], protocols: dict[str, Protocol]
validate_protocol(proto_def, types)

def generate_types(self, out_dir: Path, types: dict[str, MessgenType]) -> None:
for type_name, type_def in types.items():
if type_def.type_class not in [TypeClass.struct, TypeClass.enum]:
continue
file_name = out_dir / (type_name + self._FILE_EXT)
file_name.parent.mkdir(parents=True, exist_ok=True)
write_file_if_diff(file_name, json.dumps(asdict(type_def), indent=2).splitlines())
combined: list = []

for type_def in types.values():
if type_def.type_class in [TypeClass.struct, TypeClass.enum]:
combined.append(asdict(type_def))

self._write_file(out_dir, "types", combined)

def generate_protocols(self, out_dir: Path, protocols: dict[str, Protocol]) -> None:
for proto_name, proto_def in protocols.items():
file_name = out_dir / (proto_name + self._FILE_EXT)
file_name.parent.mkdir(parents=True, exist_ok=True)
combined: list = []

for proto_def in protocols.values():
proto_dict = asdict(proto_def)
proto_dict["version"] = version_hash(proto_dict)
write_file_if_diff(file_name, json.dumps(asdict(proto_def), indent=2).splitlines())
combined.append(proto_dict)

self._write_file(out_dir, "protocols", combined)

def _write_file(self, out_dir: Path, name: str, data: list) -> None:
file_name = out_dir / (name + self._FILE_EXT)
file_name.parent.mkdir(parents=True, exist_ok=True)

with open(file_name, "w", encoding="utf-8") as f: json.dump(data, f, indent=2)

Loading
Loading