fix(typegraph): implement additional_props

Author: luckasRanarison

src/metagen/src/fdk_rs/stubs.rs

@@ -116,6 +116,7 @@ mod test {
                         policies: Default::default(),
                         id: vec![],
                         required: vec![],
+                        additional_props: false,
                     },
                     base: TypeNodeBase {
                         ..default_type_node_base()

src/metagen/src/fdk_rs/types.rs

@@ -442,6 +442,7 @@ mod test {
                             id: vec![],
                             // FIXME: remove required
                             required: vec![],
+                            additional_props: false,
                         },
                         base: TypeNodeBase {
                             title: "my_obj".into(),
@@ -617,6 +618,7 @@ pub enum MyUnion {
                             id: vec![],
                             required: ["obj_b"].into_iter().map(Into::into).collect(),
                             policies: Default::default(),
+                            additional_props: false,
                         },
                         base: TypeNodeBase {
                             title: "ObjA".into(),
@@ -629,6 +631,7 @@ pub enum MyUnion {
                             policies: Default::default(),
                             id: vec![],
                             required: ["obj_c"].into_iter().map(Into::into).collect(),
+                            additional_props: false,
                         },
                         base: TypeNodeBase {
                             title: "ObjB".into(),
@@ -641,6 +644,7 @@ pub enum MyUnion {
                             policies: Default::default(),
                             id: vec![],
                             required: ["obj_a"].into_iter().map(Into::into).collect(),
+                            additional_props: false,
                         },
                         base: TypeNodeBase {
                             title: "ObjC".into(),
@@ -672,6 +676,7 @@ pub struct ObjC {
                             policies: Default::default(),
                             id: vec![],
                             required: ["obj_b"].into_iter().map(Into::into).collect(),
+                            additional_props: false,
                         },
                         base: TypeNodeBase {
                             title: "ObjA".into(),
@@ -684,6 +689,7 @@ pub struct ObjC {
                             policies: Default::default(),
                             id: vec![],
                             required: ["union_c"].into_iter().map(Into::into).collect(),
+                            additional_props: false,
                         },
                         base: TypeNodeBase {
                             title: "ObjB".into(),
@@ -723,6 +729,7 @@ pub enum CUnion {
                             policies: Default::default(),
                             id: vec![],
                             required: ["obj_b"].into_iter().map(Into::into).collect(),
+                            additional_props: false,
                         },
                         base: TypeNodeBase {
                             title: "ObjA".into(),
@@ -735,6 +742,7 @@ pub enum CUnion {
                             policies: Default::default(),
                             id: vec![],
                             required: ["either_c"].into_iter().map(Into::into).collect(),
+                            additional_props: false,
                         },
                         base: TypeNodeBase {
                             title: "ObjB".into(),

src/metagen/src/tests/fixtures.rs

@@ -58,6 +58,7 @@ pub fn test_typegraph_2() -> Typegraph {
                     policies: Default::default(),
                     id: vec![],
                     required: vec![],
+                    additional_props: false,
                 },
                 base: TypeNodeBase {
                     ..default_type_node_base()

src/typegate/src/engine/planner/args.ts

@@ -675,7 +675,7 @@ class ArgumentCollector {
     }
 
     const unexpectedProps = Object.keys(fieldByKeys);
-    if (unexpectedProps.length > 0) {
+    if (!typ.additionalProps && unexpectedProps.length > 0) {
       throw new UnexpectedPropertiesError(
         unexpectedProps,
         this.currentNodeDetails,

src/typegate/src/engine/typecheck/inline_validators/object.ts

@@ -9,7 +9,7 @@ import {
 import { check } from "./common.ts";
 
 export function generateObjectValidator(
-  _typeNode: ObjectNode,
+  typeNode: ObjectNode,
   varName: string,
   path: string,
   keys: {
@@ -30,6 +30,7 @@ export function generateObjectValidator(
     `for (const key of ${varKeys}) {`,
     `  if (${varRequired}.has(key)) { ${varRequired}.delete(key); continue; }`,
     `  if (${varOptional}.has(key)) { ${varOptional}.delete(key); continue; }`,
+    `  if (${typeNode.additionalProps}) { continue; }`,
     `  throw new Error(\`At "${path}": unexpected key: \${key}\`);`,
     `}`,
     check(

src/typegate/src/typegraph/types.ts

@@ -67,6 +67,7 @@ export type ObjectNode = {
   properties: {
     [k: string]: number;
   };
+  additionalProps?: boolean;
   required?: string[];
   id?: string[];
 };

src/typegraph/core/src/typedef/struct_.rs

@@ -81,6 +81,7 @@ impl TypeConversion for Struct {
                 id: self.data.find_id_fields()?,
                 required: Vec::new(),
                 policies: self.data.collect_policies(ctx)?,
+                additional_props: self.data.additional_props,
             },
         })
     }

src/typegraph/core/src/typegraph.rs

@@ -137,6 +137,7 @@ pub fn init(params: TypegraphInitParams) -> Result<()> {
             policies: Default::default(),
             id: vec![],
             required: vec![],
+            additional_props: false,
         },
     }));
 

src/typegraph/schema/src/types.rs

@@ -152,6 +152,7 @@ pub struct FileTypeData {
 
 #[skip_serializing_none]
 #[derive(Serialize, Deserialize, Clone, Debug)]
+#[serde(rename_all = "camelCase")]
 pub struct ObjectTypeData<Id = TypeId> {
     pub properties: IndexMap<String, Id>,
     pub id: Vec<String>,
@@ -160,6 +161,9 @@ pub struct ObjectTypeData<Id = TypeId> {
     #[serde(skip_serializing_if = "IndexMap::is_empty")]
     #[serde(default)]
     pub policies: IndexMap<String, Vec<PolicyIndices>>,
+    #[serde(skip_serializing_if = "std::ops::Not::not")]
+    #[serde(default)]
+    pub additional_props: bool,
 }
 
 #[skip_serializing_none]

tests/typecheck/input_validator_test.ts

@@ -239,4 +239,17 @@ Meta.test("input validator compiler", async (t) => {
       })
       .on(e);
   });
+
+  await t.should("pass for any struct", async () => {
+    await gql`
+      query structs {
+        simple: stringifyStruct(params: { str: "value", int: 0 })
+        nested: stringifyStruct(params: { obj: { key: "value" } })
+      }
+    `
+      .expectBody((body) => {
+        assert(body.errors == null);
+      })
+      .on(e);
+  });
 });

tests/typecheck/typecheck.py

@@ -106,6 +106,12 @@ def typecheck(g: Graph):
 
     empty = t.struct({}).rename("WillNotHaveAnyEffectLikeOtherScalars")
 
+    stringify_struct = deno.func(
+        t.struct({"params": t.struct({}, additional_props=True, name="params")}),
+        t.string(),
+        code="({params}) => JSON.stringify(params)",
+    )
+
     g.expose(
         my_policy,
         createUser=create_user,
@@ -115,4 +121,5 @@ def typecheck(g: Graph):
         enums=deno.identity(enums),
         findProduct=deno.identity(product),
         emptyObjectOutput=deno.static(empty, {}),
+        stringifyStruct=stringify_struct,
     )