feat(sdk): Add the prisma runtime to the new SDK (#395)

metatypedev · Sep 20, 2023 · 04428d1 · 04428d1
1 parent 057b6fe
commit 04428d1
Show file tree

Hide file tree

Showing 136 changed files with 11,234 additions and 1,642 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dev/tree-view.ts b/dev/tree-view.ts
@@ -3,7 +3,7 @@
 
 /**
  * Usage:
- *   deno run -A dev/tree-view.ts --import-map typegate/deno-import.json [<options>] <file.py>
+ *   deno run -A dev/tree-view.ts --confg typegate/deno.json [<options>] <file.py>
  *
  * Options:
  *    --depth <N>   The depth of the tree

diff --git a/libs/common/src/typegraph/runtimes/mod.rs b/libs/common/src/typegraph/runtimes/mod.rs
@@ -39,7 +39,7 @@ pub enum KnownRuntime {
 }
 
 #[cfg_attr(feature = "codegen", derive(JsonSchema))]
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug, Default)]
 pub struct UnknownRuntime {
     pub name: String,
     pub data: IndexMap<String, serde_json::Value>,

diff --git a/libs/common/src/typegraph/runtimes/prisma.rs b/libs/common/src/typegraph/runtimes/prisma.rs
@@ -39,9 +39,9 @@ pub struct RelationshipModel {
 #[cfg_attr(feature = "codegen", derive(JsonSchema))]
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct Relationship {
-    name: String,
-    left: RelationshipModel,
-    right: RelationshipModel,
+    pub name: String,
+    pub left: RelationshipModel,
+    pub right: RelationshipModel,
 }
 
 #[cfg_attr(feature = "codegen", derive(JsonSchema))]

diff --git a/meta-cli/Cargo.toml b/meta-cli/Cargo.toml
@@ -31,7 +31,7 @@ self_update = { version = "0.37.0", features = [
   "compression-zip-deflate",
   "compression-zip-bzip2",
 ] }
-prisma-models = { git = "https://github.com/prisma/prisma-engines", tag = "5.0.0"  }
+prisma-models = { git = "https://github.com/prisma/prisma-engines", tag = "5.1.1"  }
 lazy_static = "1.4.0"
 tokio = { version = "1.32.0", features = ["full"] }
 futures = "0.3.28"

diff --git a/typegate/deno.lock b/typegate/deno.lock
diff --git a/typegate/native/src/runtimes/prisma/mod.rs b/typegate/native/src/runtimes/prisma/mod.rs
@@ -34,11 +34,28 @@ enum PrismaRegisterEngineOut {
 
 #[deno]
 fn prisma_register_engine(input: PrismaRegisterEngineInp) -> PrismaRegisterEngineOut {
-    match RT.block_on(engine::register_engine(input.datamodel, input.engine_name)) {
+    let datamodel = prisma_models::psl::reformat(&input.datamodel, 4);
+
+    let datamodel = match datamodel {
+        Some(dm) => dm,
+        None => {
+            log::error!("Error formatting datamodel:\n{}", input.datamodel);
+            return PrismaRegisterEngineOut::Err {
+                message: "Error formatting datamodel".to_string(),
+            };
+        }
+    };
+
+    log::info!("Reformatted datamodel:\n{}", datamodel);
+
+    match RT.block_on(engine::register_engine(datamodel, input.engine_name)) {
         Ok(()) => PrismaRegisterEngineOut::Ok,
-        Err(e) => PrismaRegisterEngineOut::Err {
-            message: e.to_string(),
-        },
+        Err(e) => {
+            log::error!("Error registering engine: {:?}", e);
+            PrismaRegisterEngineOut::Err {
+                message: e.to_string(),
+            }
+        }
     }
 }
 

diff --git a/typegate/src/planner/args.ts b/typegate/src/planner/args.ts
@@ -406,6 +406,7 @@ class ArgumentCollector {
   ): ComputeArg {
     const { value: valueNode } = astNode;
     const variantTypesIndexes: number[] = getVariantTypesIndexes(typeNode);
+    const errors: Error[] = [];
 
     // throw type mismatch error only if the argument node of the query
     // does not match any of the subschemes (variant nodes).
@@ -416,10 +417,14 @@ class ArgumentCollector {
           typeIdx: variantTypeIndex,
         });
       } catch (error) {
+        console.error("variant error:", error);
         if (
           error instanceof TypeMismatchError ||
-          error instanceof MandatoryArgumentError
+          error instanceof UnionTypeMismatchError ||
+          error instanceof MandatoryArgumentError ||
+          error instanceof UnexpectedPropertiesError
         ) {
+          errors.push(error);
           continue;
         }
 
@@ -434,9 +439,11 @@ class ArgumentCollector {
       .map((variantType) => variantType.type)
       .forEach((typeName) => expectedVariants.add(typeName.toUpperCase()));
 
-    throw new TypeMismatchError(
+    throw new UnionTypeMismatchError(
       valueNode.kind,
-      [...expectedVariants],
+      typeNode.type,
+      errors,
+      this.currentNode.path.length,
       this.currentNodeDetails,
     );
   }
@@ -510,11 +517,11 @@ class ArgumentCollector {
 
     const unexpectedProps = Object.keys(fieldByKeys);
     if (unexpectedProps.length > 0) {
-      const details = [
-        unexpectedProps.map((name) => `'${name}'`).join(", "),
-        `for argument ${this.currentNodeDetails}`,
-      ].join(" ");
-      throw new Error(`Unexpected props ${details}`);
+      throw new UnexpectedPropertiesError(
+        unexpectedProps,
+        this.currentNodeDetails,
+        Object.keys(props),
+      );
     }
 
     return (...params: Parameters<ComputeArg>) =>
@@ -742,9 +749,44 @@ class TypeMismatchError extends Error {
       .map((t) => `'${t}'`)
       .join(" or ");
     const errorMessage = [
-      `Type mismatch: got '${actual}' but expected ${exp}`,
+      `Type mismatch: got '${actual}' but expected '${exp}'`,
       `for argument ${argDetails}`,
     ].join(" ");
     super(errorMessage);
   }
 }
+
+class UnionTypeMismatchError extends Error {
+  constructor(
+    actual: string,
+    expected: string,
+    nestedErrors: Error[],
+    depth: number,
+    argDetails: string,
+  ) {
+    const indent = "    ".repeat(depth);
+    const causes = nestedErrors.map((e) => `${indent}- ${e.message}\n`);
+    const errorMessage = [
+      `Type mismatch: got '${actual}' but expected '${expected}'`,
+      `for argument ${argDetails}`,
+      `caused by:\n${causes.join("")}`,
+    ].join(" ");
+    super(errorMessage);
+  }
+}
+
+class UnexpectedPropertiesError extends Error {
+  constructor(
+    props: string[],
+    nodeDetails: string,
+    validProps: string[],
+  ) {
+    const name = props.length === 1 ? "property" : "properties";
+    const errorMessage = [
+      `Unexpected ${name} '${props.join(", ")}'`,
+      `for argument ${nodeDetails};`,
+      `valid properties are: ${validProps.join(", ")}`,
+    ].join(" ");
+    super(errorMessage);
+  }
+}
diff --git a/typegate/src/runtimes/prisma/hooks/generate_schema.ts b/typegate/src/runtimes/prisma/hooks/generate_schema.ts
@@ -203,7 +203,12 @@ class FieldBuilder {
     }
     const [rel, side] = found;
     switch (side) {
-      case "left": {
+      case "left":
+        return new ModelField(name, typeNode.title + quant, [
+          `@relation(name: ${toPrismaString(rel.name)})`,
+        ]);
+
+      case "right": {
         const [tag, fkeys] = this.#getRelationTagAndFkeys(
           name,
           typeNode,
@@ -217,11 +222,6 @@ class FieldBuilder {
         return modelField;
       }
 
-      case "right":
-        return new ModelField(name, typeNode.title + quant, [
-          `@relation(name: ${toPrismaString(rel.name)})`,
-        ]);
-
       default:
         throw new Error(`invalid side: ${side}`);
     }

diff --git a/typegate/src/services/graphql_service.ts b/typegate/src/services/graphql_service.ts
@@ -103,6 +103,7 @@ export async function handleGraphQL(
 
     return jsonOk(res, headers);
   } catch (e) {
+    // throw e;
     if (e instanceof ResolverError) {
       logger.error(`field err: ${e.message}`);
       return jsonError(e.message, headers, 502);

diff --git a/typegate/tests/e2e/typegraph/__snapshots__/typegraph_test.ts.snap b/typegate/tests/e2e/typegraph/__snapshots__/typegraph_test.ts.snap
@@ -36,7 +36,7 @@ snapshot[`typegraphs creation 1`] = `
       },
       {
         "type": "object",
-        "title": "object_18",
+        "title": "ComplexType",
         "runtime": 0,
         "policies": [],
         "config": {},
@@ -179,7 +179,7 @@ snapshot[`typegraphs creation 1`] = `
       },
       {
         "type": "object",
-        "title": "object_4",
+        "title": "SomeType",
         "runtime": 0,
         "policies": [],
         "config": {},
@@ -192,7 +192,7 @@ snapshot[`typegraphs creation 1`] = `
       },
       {
         "type": "array",
-        "title": "array_1",
+        "title": "Two",
         "runtime": 0,
         "policies": [],
         "config": {},
@@ -210,7 +210,7 @@ snapshot[`typegraphs creation 1`] = `
       },
       {
         "type": "optional",
-        "title": "optional_3",
+        "title": "_3_SomeType?",
         "runtime": 0,
         "policies": [],
         "config": {},
@@ -570,7 +570,7 @@ snapshot[`typegraphs creation 3`] = `
       },
       {
         "type": "function",
-        "title": "func_9",
+        "title": "func_10",
         "runtime": 0,
         "policies": [
           0
@@ -625,7 +625,7 @@ snapshot[`typegraphs creation 3`] = `
       },
       {
         "type": "function",
-        "title": "func_11",
+        "title": "func_12",
         "runtime": 0,
         "policies": [
           1
@@ -640,7 +640,7 @@ snapshot[`typegraphs creation 3`] = `
       },
       {
         "type": "object",
-        "title": "object_6",
+        "title": "User",
         "runtime": 0,
         "policies": [],
         "config": {},
@@ -661,7 +661,7 @@ snapshot[`typegraphs creation 3`] = `
       },
       {
         "type": "object",
-        "title": "object_8",
+        "title": "Post",
         "runtime": 0,
         "policies": [],
         "config": {},
@@ -682,7 +682,7 @@ snapshot[`typegraphs creation 3`] = `
       },
       {
         "type": "function",
-        "title": "func_13",
+        "title": "func_14",
         "runtime": 0,
         "policies": [
           2
@@ -859,7 +859,7 @@ snapshot[`typegraphs creation 4`] = `
       },
       {
         "type": "object",
-        "title": "object_18",
+        "title": "ComplexType",
         "runtime": 0,
         "policies": [],
         "config": {},
@@ -1002,7 +1002,7 @@ snapshot[`typegraphs creation 4`] = `
       },
       {
         "type": "object",
-        "title": "object_4",
+        "title": "SomeType",
         "runtime": 0,
         "policies": [],
         "config": {},
@@ -1015,7 +1015,7 @@ snapshot[`typegraphs creation 4`] = `
       },
       {
         "type": "array",
-        "title": "array_1",
+        "title": "Two",
         "runtime": 0,
         "policies": [],
         "config": {},
@@ -1033,7 +1033,7 @@ snapshot[`typegraphs creation 4`] = `
       },
       {
         "type": "optional",
-        "title": "optional_3",
+        "title": "_3_SomeType?",
         "runtime": 0,
         "policies": [],
         "config": {},
@@ -1463,7 +1463,7 @@ snapshot[`typegraphs creation 6`] = `
       },
       {
         "type": "object",
-        "title": "object_6",
+        "title": "User",
         "runtime": 0,
         "policies": [],
         "config": {},
@@ -1484,7 +1484,7 @@ snapshot[`typegraphs creation 6`] = `
       },
       {
         "type": "object",
-        "title": "object_8",
+        "title": "Post",
         "runtime": 0,
         "policies": [],
         "config": {},

diff --git a/typegate/tests/importers/importers_test.ts → typegate/tests/importers/importers_test_.ts b/typegate/tests/importers/importers_test.ts → typegate/tests/importers/importers_test_.ts