unignore tests, fix mapping of adt

wkarwacki · Aug 21, 2024 · 03db4b1 · 03db4b1
1 parent c19bd4c
commit 03db4b1
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 12 deletions.
diff --git a/src/lib/gen/python/client/templates/stubImpl.hbs b/src/lib/gen/python/client/templates/stubImpl.hbs
@@ -1,4 +1,4 @@
-{{#if (and val.path (not (eq val.type "alias")))}}{{#with (resolve val)}}{{#if (eq this.type "obj")}}{{#if this.adt}}{{>dtoName val=(fmtClass (fmtName ../val.path))}}Base{{else}}{{>dtoName val=(fmtClass ../val.path)}}{{/if}}.get(){{else}}{{>stubImpl val=this indent=indent}}{{/if}}{{/with}}{{else if (or (eq val.type "obj") (or val.vars val.mix))}}{{key}}({{#each val.vars}}
+{{#if (not val.type)}}{{key}}(){{else}}{{#if (and val.path (not (eq val.type "alias")))}}{{#with (resolve val)}}{{#if (eq this.type "obj")}}{{#if this.adt}}{{>dtoName val=(fmtClass (fmtName ../val.path))}}Base{{else}}{{>dtoName val=(fmtClass ../val.path)}}{{/if}}.get(){{else}}{{>stubImpl val=this indent=indent}}{{/if}}{{/with}}{{else if (or (eq val.type "obj") (or val.vars val.mix))}}{{key}}({{#each val.vars}}
     {{../indent}}    {{fmtName @key}}={{>stubImpl val=this key=(fmtClass @key) indent=(add ../indent "    ") prefix=../key}}{{#if (or (not @last) ../val.mix)}},{{/if}}{{/each}}{{#each val.mix}}
     {{../indent}}    **{{#if ../adtVar}}{ k:v for k, v in {{/if}}{{>dtoName val=(fmtClass this.path)}}.get().dict(){{#if ../adtVar}}.items() if k != {{json (fmtName ../adtVar)}} }{{/if}}{{#unless @last}},{{/unless}}{{/each}}
-{{indent}}){{else if (eq val.type "map")}}{ {{#if val.key}}{{#if (eq val.key.type "obj")}}{{#if prefix}}{{prefix}}.{{/if}}{{add key "Key"}}.get(){{else}}{{>stubImpl val=val.item indent=indent prefix=null}}{{/if}}{{else}}{{>stubImpl val="str" key=(add key "Key") indent=indent}}{{/if}}: {{#if val.val}}{{#if (eq val.val.type "obj")}}{{#if prefix}}{{prefix}}.{{/if}}{{add key "Val"}}.get(){{else}}{{>stubImpl val=val.val indent=indent prefix=null}}{{/if}}{{else}}{{>stubImpl val="str" key=(add key "Val") indent=indent}}{{/if}} }{{else if (eq val.type "seq")}}[{{#if (eq val.item.type "obj")}}{{#if prefix}}{{prefix}}.{{/if}}{{#if origin}}{{>dtoName val=(fmtClass origin.path)}}{{/if}}{{add key "Item"}}.get(){{else}}{{>stubImpl val=val.item indent=indent prefix=prefix}}{{/if}}]{{else}}{{stubImpl val indent=indent}}{{/if}}
+{{indent}}){{else if (eq val.type "map")}}{ {{#if val.key}}{{#if (eq val.key.type "obj")}}{{#if prefix}}{{prefix}}.{{/if}}{{add key "Key"}}.get(){{else}}{{>stubImpl val=val.item indent=indent prefix=null}}{{/if}}{{else}}{{>stubImpl val="str" key=(add key "Key") indent=indent}}{{/if}}: {{#if val.val}}{{#if (eq val.val.type "obj")}}{{#if prefix}}{{prefix}}.{{/if}}{{add key "Val"}}.get(){{else}}{{>stubImpl val=val.val indent=indent prefix=null}}{{/if}}{{else}}{{>stubImpl val="str" key=(add key "Val") indent=indent}}{{/if}} }{{else if (eq val.type "seq")}}[{{#if (eq val.item.type "obj")}}{{#if prefix}}{{prefix}}.{{/if}}{{#if origin}}{{>dtoName val=(fmtClass origin.path)}}{{/if}}{{add key "Item"}}.get(){{else}}{{>stubImpl val=val.item indent=indent prefix=prefix}}{{/if}}]{{else}}{{stubImpl val}}{{/if}}{{/if}}
diff --git a/src/lib/gen/python/server/templates/stubImpl.hbs b/src/lib/gen/python/server/templates/stubImpl.hbs
@@ -1,4 +1,4 @@
-{{#if (and val.path (not (eq val.type "alias")))}}{{#with (resolve val)}}{{#if (eq this.type "obj")}}{{#if this.adt}}{{>dtoName val=(fmtClass (fmtName ../val.path))}}Base{{else}}{{>dtoName val=(fmtClass ../val.path)}}{{/if}}.get(){{else}}{{>stubImpl val=this indent=indent}}{{/if}}{{/with}}{{else if (or (eq val.type "obj") (or val.vars val.mix))}}{{key}}({{#each val.vars}}
+{{#if (not val.type)}}{{key}}(){{else}}{{#if (and val.path (not (eq val.type "alias")))}}{{#with (resolve val)}}{{#if (eq this.type "obj")}}{{#if this.adt}}{{>dtoName val=(fmtClass (fmtName ../val.path))}}Base{{else}}{{>dtoName val=(fmtClass ../val.path)}}{{/if}}.get(){{else}}{{>stubImpl val=this indent=indent}}{{/if}}{{/with}}{{else if (or (eq val.type "obj") (or val.vars val.mix))}}{{key}}({{#each val.vars}}
     {{../indent}}    {{fmtName @key}}={{>stubImpl val=this key=(fmtClass @key) indent=(add ../indent "    ") prefix=../key}}{{#if (or (not @last) ../val.mix)}},{{/if}}{{/each}}{{#each val.mix}}
     {{../indent}}    **{{#if ../adtVar}}{ k:v for k, v in {{/if}}{{>dtoName val=(fmtClass this.path)}}.get().dict(){{#if ../adtVar}}.items() if k != {{json (fmtName ../adtVar)}} }{{/if}}{{#unless @last}},{{/unless}}{{/each}}
-{{indent}}){{else if (eq val.type "map")}}{ {{#if val.key}}{{#if (eq val.key.type "obj")}}{{#if prefix}}{{prefix}}.{{/if}}{{add key "Key"}}.get(){{else}}{{>stubImpl val=val.item indent=indent prefix=null}}{{/if}}{{else}}{{>stubImpl val="str" key=(add key "Key") indent=indent}}{{/if}}: {{#if val.val}}{{#if (eq val.val.type "obj")}}{{#if prefix}}{{prefix}}.{{/if}}{{add key "Val"}}.get(){{else}}{{>stubImpl val=val.val indent=indent prefix=null}}{{/if}}{{else}}{{>stubImpl val="str" key=(add key "Val") indent=indent}}{{/if}} }{{else if (eq val.type "seq")}}[{{#if (eq val.item.type "obj")}}{{#if prefix}}{{prefix}}.{{/if}}{{#if origin}}{{>dtoName val=(fmtClass origin.path)}}{{/if}}{{add key "Item"}}.get(){{else}}{{>stubImpl val=val.item indent=indent prefix=prefix}}{{/if}}]{{else}}{{stubImpl val indent=indent}}{{/if}}
+{{indent}}){{else if (eq val.type "map")}}{ {{#if val.key}}{{#if (eq val.key.type "obj")}}{{#if prefix}}{{prefix}}.{{/if}}{{add key "Key"}}.get(){{else}}{{>stubImpl val=val.item indent=indent prefix=null}}{{/if}}{{else}}{{>stubImpl val="str" key=(add key "Key") indent=indent}}{{/if}}: {{#if val.val}}{{#if (eq val.val.type "obj")}}{{#if prefix}}{{prefix}}.{{/if}}{{add key "Val"}}.get(){{else}}{{>stubImpl val=val.val indent=indent prefix=null}}{{/if}}{{else}}{{>stubImpl val="str" key=(add key "Val") indent=indent}}{{/if}} }{{else if (eq val.type "seq")}}[{{#if (eq val.item.type "obj")}}{{#if prefix}}{{prefix}}.{{/if}}{{#if origin}}{{>dtoName val=(fmtClass origin.path)}}{{/if}}{{add key "Item"}}.get(){{else}}{{>stubImpl val=val.item indent=indent prefix=prefix}}{{/if}}]{{else}}{{stubImpl val}}{{/if}}{{/if}}
diff --git a/src/lib/open_api/schema.rs b/src/lib/open_api/schema.rs
@@ -302,7 +302,7 @@ impl Schema {
                                 }))
                             })
                             .unwrap_or({
-                                let vars: HashMap<_, _> = self
+                                let mut vars: HashMap<_, _> = self
                                     .properties
                                     .iter()
                                     .map(|(n, schema)| {
@@ -315,6 +315,17 @@ impl Schema {
                                         )
                                     })
                                     .collect();
+                                self.discriminator.iter().for_each(|discriminator| {
+                                    vars.insert(
+                                        discriminator.property_name.clone(),
+                                        Box::new(Var {
+                                            desc: Desc::Def(Def::Str(Str {
+                                                null: self.nullable,
+                                            })),
+                                            opt: false,
+                                        }),
+                                    );
+                                });
                                 Def::Obj(Obj {
                                     ext: None,
                                     mix: Vec::new(),

diff --git a/src/lib/test/adt-from-open-api-open-api.yml b/src/lib/test/adt-from-open-api-open-api.yml
@@ -33,7 +33,7 @@ components:
     AnotherAdt:
       type: object
       discriminator:
-        propertyName: type
+        propertyName: anotherType
         mapping:
           typeToken0: '#/components/schemas/AnotherAdtTypeToken0'
           typeToken1: '#/components/schemas/AnotherAdtTypeToken1'

diff --git a/src/lib/test/adt-from-open-api-trust.yml b/src/lib/test/adt-from-open-api-trust.yml
@@ -1,6 +1,9 @@
 defs:
   Adt:
     type: obj
+    vars:
+      type:
+        type: str
     adt:
       var: type
       map:
@@ -40,8 +43,11 @@ defs:
       - path: "defs.Adt"
   AnotherAdt:
     type: obj
+    vars:
+      anotherType:
+        type: str
     adt:
-      var: type
+      var: anotherType
       map:
         typeToken0:
           mix:

diff --git a/src/lib/test/adt-to-open-api-open-api.yml b/src/lib/test/adt-to-open-api-open-api.yml
@@ -10,7 +10,6 @@ components:
         type:
           type: string
       required:
-        - bool
         - type
       discriminator:
         propertyName: type

diff --git a/src/lib/test/adt-to-open-api-trust.yml b/src/lib/test/adt-to-open-api-trust.yml
@@ -4,6 +4,7 @@ defs:
     vars:
       bool:
         type: bool
+        opt: true
       dec:
         type: dec
         opt: true

diff --git a/src/lib/test/adt.rs b/src/lib/test/adt.rs
@@ -21,14 +21,12 @@ mod adt {
         gen_test(Lang::Kotlin, Role::Server, "adt-to-open-api-trust.yml");
     }
 
-    #[ignore]
     #[test]
     fn gen_python_client_test() {
         gen_test(Lang::Python, Role::Client, "adt-from-open-api-trust.yml");
         gen_test(Lang::Python, Role::Client, "adt-to-open-api-trust.yml");
     }
 
-    #[ignore]
     #[test]
     fn gen_python_server_test() {
         gen_test(Lang::Python, Role::Server, "adt-from-open-api-trust.yml");

diff --git a/src/lib/test/type_params.rs b/src/lib/test/type_params.rs
@@ -15,13 +15,11 @@ mod type_params {
         gen_test(Lang::Kotlin, Role::Server, "type-params-trust.yml");
     }
 
-    #[ignore]
     #[test]
     fn gen_python_client_test() {
         gen_test(Lang::Python, Role::Client, "type-params-trust.yml");
     }
 
-    #[ignore]
     #[test]
     fn gen_python_server_test() {
         gen_test(Lang::Python, Role::Server, "type-params-trust.yml");