From f70b6f30522c95b73dcd67539061c7bc2b768017 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Fri, 20 Jun 2025 18:24:12 +0200 Subject: [PATCH] update python paser --- backend/parsers/windmill-parser-py/src/lib.rs | 9 ++++++++- backend/parsers/windmill-parser/src/lib.rs | 6 ++++++ frontend/package-lock.json | 8 ++++---- frontend/package.json | 2 +- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/backend/parsers/windmill-parser-py/src/lib.rs b/backend/parsers/windmill-parser-py/src/lib.rs index dbac8498ec..fd2e478046 100644 --- a/backend/parsers/windmill-parser-py/src/lib.rs +++ b/backend/parsers/windmill-parser-py/src/lib.rs @@ -232,7 +232,14 @@ fn parse_typ(id: &str) -> Typ { x @ _ if x.starts_with("DynSelect_") => { Typ::DynSelect(x.strip_prefix("DynSelect_").unwrap().to_string()) } - _ => Typ::Resource(id.to_string()), + _ => Typ::Resource(map_resource_name(id)), + } +} + +fn map_resource_name(x: &str) -> String { + match x { + "S3Object" => "s3_object".to_string(), + _ => x.to_string(), } } diff --git a/backend/parsers/windmill-parser/src/lib.rs b/backend/parsers/windmill-parser/src/lib.rs index 617b906154..0cb662c91b 100644 --- a/backend/parsers/windmill-parser/src/lib.rs +++ b/backend/parsers/windmill-parser/src/lib.rs @@ -92,6 +92,12 @@ mod test { fn test_snake_case() { assert_eq!("s3", to_snake_case("S3")); assert_eq!("s3", to_snake_case("s3")); + assert_eq!("s3_object", to_snake_case("S3Object")); + assert_eq!("s3_object", to_snake_case("S3object")); + assert_eq!("s3_object", to_snake_case("s3object")); + assert_eq!("abc", to_snake_case("ABC")); + assert_eq!("aa_bc", to_snake_case("AaBC")); + assert_eq!("a_b_c", to_snake_case("A_B_C")); assert_eq!("s_3", to_snake_case("S_3")); assert_eq!("type_name_here", to_snake_case("typeNameHere")); } diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 6e6bf96e91..c9cc78b021 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -77,7 +77,7 @@ "windmill-parser-wasm-java": "^1.478.1", "windmill-parser-wasm-nu": "^1.474.1", "windmill-parser-wasm-php": "^1.429.0", - "windmill-parser-wasm-py": "^1.477.1", + "windmill-parser-wasm-py": "^1.499.0", "windmill-parser-wasm-regex": "^1.492.1", "windmill-parser-wasm-rust": "^1.429.0", "windmill-parser-wasm-ts": "^1.486.1", @@ -12952,9 +12952,9 @@ "integrity": "sha512-SGJAtNpfdRZftkGboxWsm/yQDnJBJodwPQUbX2cWk/aoNook6ULesZwsYtBC9WN1VH6TIskLiVPohMmu6jtXmw==" }, "node_modules/windmill-parser-wasm-py": { - "version": "1.477.1", - "resolved": "https://registry.npmjs.org/windmill-parser-wasm-py/-/windmill-parser-wasm-py-1.477.1.tgz", - "integrity": "sha512-EY3mSMWpqFPzd7fsLg2/hSfQFU8HpW9nplFwm4JHHCDbcTpBzlvzjPJoHAAGO5kMzowAxjqi5ai/mXjeUWuiSg==" + "version": "1.499.0", + "resolved": "https://registry.npmjs.org/windmill-parser-wasm-py/-/windmill-parser-wasm-py-1.499.0.tgz", + "integrity": "sha512-ur5SU+YTuYm1Hgo+SWohYRsmkVxIZPME7GzzRivPhkK5XBQcc7PsxlMjYkIvFJwufz+jX2t6p0aYNIdDXpMNbA==" }, "node_modules/windmill-parser-wasm-regex": { "version": "1.492.1", diff --git a/frontend/package.json b/frontend/package.json index fa6ff2fd46..0e38e02836 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -144,7 +144,7 @@ "windmill-parser-wasm-java": "^1.478.1", "windmill-parser-wasm-nu": "^1.474.1", "windmill-parser-wasm-php": "^1.429.0", - "windmill-parser-wasm-py": "^1.477.1", + "windmill-parser-wasm-py": "^1.499.0", "windmill-parser-wasm-regex": "^1.492.1", "windmill-parser-wasm-rust": "^1.429.0", "windmill-parser-wasm-ts": "^1.486.1",