From dbeb3cd6893159bbe345f0582c3bdd000c610198 Mon Sep 17 00:00:00 2001 From: Martin Karkowski Date: Sat, 29 Oct 2022 07:52:32 +0200 Subject: [PATCH] Adding small fixes for the Code Transpiler. --- py-helpers/02-prepare-js.bat | 2 +- py-helpers/02-prepare-js.sh | 2 +- py-helpers/prepare_code/helpers.py | 2 +- py-helpers/prepare_code/js/transformer.py | 3 ++- py-helpers/prepare_code/post_processor.py | 4 +++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/py-helpers/02-prepare-js.bat b/py-helpers/02-prepare-js.bat index 3c6311f..9e9ca28 100644 --- a/py-helpers/02-prepare-js.bat +++ b/py-helpers/02-prepare-js.bat @@ -3,4 +3,4 @@ cd "%DIR%" cd .. rm -rf temp -nope-py-prepare-code --input dist-py --output temp --type js --convert_snake_case \ No newline at end of file +nope-py-prepare-code --input dist-py --output temp --type js \ No newline at end of file diff --git a/py-helpers/02-prepare-js.sh b/py-helpers/02-prepare-js.sh index 682c1f8..6f433d3 100755 --- a/py-helpers/02-prepare-js.sh +++ b/py-helpers/02-prepare-js.sh @@ -7,4 +7,4 @@ cd "$( dirname -- "$0"; )" cd .. rm -rf temp -nope-py-prepare-code --input dist-py --output temp --type js --convert_snake_case \ No newline at end of file +nope-py-prepare-code --input dist-py --output temp --type js \ No newline at end of file diff --git a/py-helpers/prepare_code/helpers.py b/py-helpers/prepare_code/helpers.py index 4fbfd51..b2d708d 100644 --- a/py-helpers/prepare_code/helpers.py +++ b/py-helpers/prepare_code/helpers.py @@ -31,6 +31,6 @@ def define_dotted_dict(type= "name"): """ if (type == "name"): - return _ast.Name(id= "dotted_dict") + return _ast.Name(id= "ensureDottedAccess") return ast.parse(CODE).body[0] \ No newline at end of file diff --git a/py-helpers/prepare_code/js/transformer.py b/py-helpers/prepare_code/js/transformer.py index 777d6c8..738408d 100644 --- a/py-helpers/prepare_code/js/transformer.py +++ b/py-helpers/prepare_code/js/transformer.py @@ -367,7 +367,8 @@ class CodeTransformeJs(Transformer): def start(self, items): self._log("start", items) body = self.body(items) - body.insert(0, define_dotted_dict("ast")) + # We dont want to add our custom class. + # body.insert(0, define_dotted_dict("ast")) return _ast.Module(body=body) def return_statement(self, items): diff --git a/py-helpers/prepare_code/post_processor.py b/py-helpers/prepare_code/post_processor.py index 8c72e47..b9bd70d 100644 --- a/py-helpers/prepare_code/post_processor.py +++ b/py-helpers/prepare_code/post_processor.py @@ -24,7 +24,9 @@ replacers = { 'undefined': "None", 'self = self': "", "__definition_of__": "", - "@property()": "@property", + "@property()": "@property", + ".entries()": ".items()", + "${": "{", } def post_process(code: str) -> str: