feat(sdk): change rest queries interface (#444)

dev/lock.yml

@@ -70,7 +70,7 @@ dev:
     WASMEDGE_VERSION: 0.12.1
     TYPEGRAPH_VERSION: 0.0.2
     PRISMA_VERSION: 5.4.0-dev.31
-    METATYPE_VERSION: 0.2.1
+    METATYPE_VERSION: 0.2.2
     WASM_OPT_VERSION: 0.114.1
     TAGLINE: >-
       Declarative API development platform. Build serverless backends with

examples/templates/deno/api.ts

@@ -22,10 +22,10 @@ typegraph("test-multiple-runtimes", (g) => {
   const python = new PythonRuntime();
 
   g.expose({
-    add: t.func(
+    add: python.fromLambda(
       t.struct({ "first": t.float(), "second": t.float() }),
       t.float(),
-      python.fromLambda("lambda x: x['first'] + x['second']"),
+      { code: "lambda x: x['first'] + x['second']" },
     ).withPolicy(pub),
     multiply: deno.func(
       t.struct({ "first": t.float(), "second": t.float() }),

examples/templates/python/compose.yml

@@ -1,6 +1,6 @@
 services:
   typegate:
-    image: ghcr.io/metatypedev/typegate:v0.2.1
+    image: ghcr.io/metatypedev/typegate:v0.2.2
     restart: always
     ports:
       - "7890:7890"

examples/templates/python/pyproject.toml

@@ -1,13 +1,13 @@
 [tool.poetry]
 name = "example"
-version = "0.2.1"
+version = "0.2.2"
 description = ""
 authors = []
 readme = "README.md"
 
 [tool.poetry.dependencies]
 python = ">=3.8,<4.0"
-typegraph = "0.2.1"
+typegraph = "0.2.2"
 
 [build-system]
 requires = ["poetry-core"]

libs/common/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "common"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 
 [dependencies]

libs/macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "macros"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 
 [lib]

libs/typescript/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "typescript"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 
 [dependencies]

libs/xtask/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "xtask"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 
 [dependencies]

meta-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "meta-cli"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 
 description = "Declarative API development platform. Build serverless backends with zero-trust and less code, no matter where and how your (legacy) systems are."

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "metatype"
-version = "0.2.1"
+version = "0.2.2"
 description = ""
 authors = []
 

typegate/native/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "native"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 
 [lib]

typegate/tests/rest/custom/custom_loader.ts

@@ -0,0 +1,18 @@
+// Copyright Metatype OÜ, licensed under the Elastic License 2.0.
+// SPDX-License-Identifier: Elastic-2.0
+
+import { dirname } from "std/path/dirname.ts";
+import { resolve } from "std/path/resolve.ts";
+import { join } from "std/path/join.ts";
+import { fromFileUrl } from "std/path/from_file_url.ts";
+
+const customDir = resolve(dirname(fromFileUrl(import.meta.url)));
+
+export const endpoints = {
+  mutation: Deno.readTextFileSync(
+    join(customDir, "m.gql"),
+  ),
+  query: Deno.readTextFileSync(
+    join(customDir, "q.graphql"),
+  ),
+};

typegate/tests/rest/rest.ts → typegate/tests/rest/rest_custom_loader.ts

@@ -3,6 +3,7 @@
 
 import { Policy, t, typegraph } from "@typegraph/deno/src/mod.ts";
 import { DenoRuntime } from "@typegraph/deno/src/runtimes/deno.ts";
+import { endpoints } from "./custom/custom_loader.ts";
 
 const user = t.struct({
   id: t.integer(),
@@ -49,6 +50,9 @@ typegraph("rest", (g) => {
     },
   ).withPolicy(pub);
 
+  g.rest(endpoints.mutation);
+  g.rest(endpoints.query);
+
   g.expose({
     postFromUser,
     readPost,

typegate/tests/rest/custom.py → typegate/tests/rest/rest_simple.py

@@ -1,12 +1,20 @@
-from typegraph import t, typegraph, Graph, Policy
+from typegraph import Graph, Policy, t, typegraph
 from typegraph.runtimes.deno import DenoRuntime
 
 
-@typegraph(dynamic=False, folder="custom_dir")
+@typegraph(dynamic=False)
 def custom(g: Graph):
     deno = DenoRuntime()
     pub = Policy.public()
 
+    g.rest(
+        """
+        query ping {
+            ping
+        }
+        """
+    )
+
     ping = deno.func(
         t.struct({}),
         t.integer(),

typegate/tests/rest/rest_test.ts

@@ -6,7 +6,7 @@ import { gql, Meta, rest } from "../utils/mod.ts";
 import { RestSchemaGenerator } from "../../src/transports/rest/rest_schema_generator.ts";
 
 Meta.test("Rest queries in Python", async (t) => {
-  const e = await t.engine("rest/custom.py");
+  const e = await t.engine("rest/rest_simple.py");
 
   await t.should("work with simple rest requests", async () => {
     await rest.get("ping")
@@ -29,7 +29,7 @@ Meta.test("Rest queries in Python", async (t) => {
 });
 
 Meta.test("Rest queries in Deno", async (t) => {
-  const e = await t.engine("rest/rest.ts");
+  const e = await t.engine("rest/rest_custom_loader.ts");
 
   await t.should("work with simple rest requests", async () => {
     await rest.get("get_post_id?id=1")

typegate/tests/runtimes/wasmedge/rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rust"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 
 [lib]

typegraph/core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "typegraph_core"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 
 [lib]

typegraph/core/src/global_store.rs

@@ -6,6 +6,7 @@ use crate::runtimes::{DenoMaterializer, Materializer, MaterializerDenoModule, Ru
 use crate::types::{Struct, Type, TypeFun, TypeId, WrapperTypeData};
 use crate::wit::core::{Policy as CorePolicy, PolicyId, RuntimeId};
 use crate::wit::runtimes::{Effect, MaterializerDenoPredefined, MaterializerId};
+use graphql_parser::parse_query;
 use indexmap::IndexMap;
 use std::rc::Rc;
 use std::{cell::RefCell, collections::HashMap};
@@ -46,6 +47,7 @@ pub struct Store {
     prisma_migration_runtime: RuntimeId,
     typegate_runtime: RuntimeId,
     typegraph_runtime: RuntimeId,
+    graphql_endpoints: Vec<String>,
 }
 
 impl Store {
@@ -281,6 +283,29 @@ impl Store {
             mat
         }
     }
+
+    pub fn add_graphql_endpoint(graphql: String) -> Result<()> {
+        with_store_mut(|s| {
+            let ast = parse_query::<&str>(&graphql).map_err(|e| e.to_string())?;
+            let endpoints = ast
+                .definitions
+                .into_iter()
+                .map(|op| {
+                    format!("{}", op)
+                        .split_whitespace()
+                        .collect::<Vec<_>>()
+                        .join(" ")
+                })
+                .collect::<Vec<_>>();
+
+            s.graphql_endpoints.extend(endpoints);
+            Ok(())
+        })
+    }
+
+    pub fn get_graphql_endpoints() -> Vec<String> {
+        with_store(|s| s.graphql_endpoints.clone())
+    }
 }
 
 impl TypeId {

typegraph/core/src/lib.rs

@@ -50,25 +50,6 @@ pub mod host {
     pub use metatype::typegraph::abi;
 }
 
-// native stubs to make the test compilation work
-#[cfg(not(feature = "wasm"))]
-pub mod host {
-    pub mod abi {
-        pub fn log(message: &str) {
-            println!("{}", message);
-        }
-        pub fn glob(_pattern: &str, _exts: &[String]) -> Result<Vec<String>, String> {
-            Ok(vec![])
-        }
-        pub fn read_file(path: &str) -> Result<String, String> {
-            Ok(path.to_string())
-        }
-        pub fn write_file(_path: &str, _data: &str) -> Result<(), String> {
-            Ok(())
-        }
-    }
-}
-
 pub struct Lib {}
 
 impl TypeBase {
@@ -366,7 +347,6 @@ mod tests {
             Self {
                 name: "".to_string(),
                 dynamic: None,
-                folder: None,
                 path: ".".to_string(),
                 prefix: None,
                 cors: Cors {