fix(template/node): update sdk version to 0.3.2 + add deno.static

dev/lock.yml

@@ -91,7 +91,7 @@ dev:
     TYPEGRAPH_VERSION: 0.0.3
     PRISMA_VERSION: 5.5.2
     METATYPE_VERSION: 0.3.2
-    PUBLISHED_VERSION: 0.2.4
+    PUBLISHED_VERSION: 0.3.2
     WASM_OPT_VERSION: 0.116.0
     MOLD_VERSION: v2.4.0
     CMAKE_VERSION: 3.28.0-rc6

examples/templates/deno/api/example.ts

@@ -1,6 +1,6 @@
-import { Policy, t, typegraph } from "npm:@typegraph/sdk@0.2.4";
-import { PythonRuntime } from "npm:@typegraph/sdk@0.2.4/runtimes/python";
-import { DenoRuntime } from "npm:@typegraph/sdk@0.2.4/runtimes/deno";
+import { Policy, t, typegraph } from "npm:@typegraph/sdk@0.3.2/index.js";
+import { PythonRuntime } from "npm:@typegraph/sdk@0.3.2/runtimes/python.js";
+import { DenoRuntime } from "npm:@typegraph/sdk@0.3.2/runtimes/deno.js";
 
 typegraph("example", (g) => {
   const pub = Policy.public();

examples/templates/node/api/example.ts

@@ -1,6 +1,6 @@
-import { Policy, t, typegraph } from "@typegraph/sdk";
-import { DenoRuntime } from "@typegraph/sdk/runtimes/deno";
-import { PythonRuntime } from "@typegraph/sdk/runtimes/python";
+import { Policy, t, typegraph } from "@typegraph/sdk/index.js";
+import { DenoRuntime } from "@typegraph/sdk/runtimes/deno.js";
+import { PythonRuntime } from "@typegraph/sdk/runtimes/python.js";
 
 typegraph("example", (g) => {
   const pub = Policy.public();

examples/templates/node/package.json

@@ -7,7 +7,7 @@
     "dev": "MCLI_LOADER_CMD='npm run load-tgraph --silent' meta dev"
   },
   "dependencies": {
-    "@typegraph/sdk": "^0.2.4"
+    "@typegraph/sdk": "^0.3.2"
   },
   "devDependencies": {
     "tsx": "^3.13.0",

examples/templates/node/tsconfig.json

@@ -2,6 +2,7 @@
     "compilerOptions": {
         "strict": true,
         "moduleResolution": "node16",
+        "module": "NodeNext",
         "esModuleInterop": true        
     }
 }

typegate/tests/e2e/templates/templates_test.ts

@@ -16,12 +16,17 @@ const modifiers: Record<string, (dir: string) => Promise<void> | void> = {
     const version = await get_version();
     console.log(version);
     for await (const f of expandGlob("**/*.ts", { root: dir })) {
-      const data = await Deno.readTextFile(f.path);
-      const level = f.path.replace(projectDir, "").split("/").length - 1;
+      // FIXME: deno is unable to map the types from .d.ts files when used locally
+      const data = (await Deno.readTextFile(f.path)).replace(
+        /\(\s*g\s*\)/,
+        "(g: any)",
+      );
+      const level = f.path.replace(projectDir, "").split("/").length - 2;
       const newData = data.replaceAll(
         `npm:@typegraph/sdk@${version}`,
-        `${Array(level).fill("..").join("/")}/typegraph/deno/src`,
+        `${Array(level).fill("..").join("/")}/typegraph/node/sdk/dist`,
       );
+
       await Deno.writeTextFile(f.path, newData);
     }
   },

typegate/tests/runtimes/deno/deno_static.ts

@@ -0,0 +1,21 @@
+// Copyright Metatype OÜ, licensed under the Elastic License 2.0.
+// SPDX-License-Identifier: Elastic-2.0
+
+import { Policy, t, typegraph } from "@typegraph/sdk/index.js";
+import { DenoRuntime } from "@typegraph/sdk/runtimes/deno.js";
+
+typegraph("test-deno-static", (g: any) => {
+  const deno = new DenoRuntime();
+  const pub = Policy.public();
+
+  g.expose({
+    simpleStatic: deno.static(
+      t.either([t.string(), t.integer()]),
+      "One!",
+    ).withPolicy(pub),
+    structStatic: deno.static(t.struct({ "a": t.string() }), {
+      a: "Hello World",
+    })
+      .withPolicy(pub),
+  });
+});

typegate/tests/runtimes/deno/deno_test.ts

@@ -121,6 +121,25 @@ Meta.test("Deno runtime: use local imports", async (t) => {
   });
 });
 
+Meta.test("Deno runtime with typescript", async (t) => {
+  const e = await t.engine("runtimes/deno/deno_static.ts");
+  await t.should("work with static values", async () => {
+    await gql`
+      query {
+        simpleStatic
+        structStatic {
+          a
+        }
+      }
+    `.expectData({
+      simpleStatic: "One!",
+      structStatic: {
+        a: "Hello World",
+      },
+    }).on(e);
+  });
+});
+
 Meta.test("Deno runtime: file name reloading", async (t) => {
   const load = async (value: number) => {
     Deno.env.set("DYNAMIC", join("dynamic", `${value}.ts`));

typegraph/node/sdk/src/runtimes/deno.ts

@@ -101,6 +101,21 @@ export class DenoRuntime extends Runtime {
     );
   }
 
+  static<
+    P extends t.Typedef,
+  >(out: P, value: any) {
+    const mat = {
+      _id: runtimes.registerDenoStatic({
+        value: JSON.stringify(value),
+      }, out._id),
+    };
+    return t.func(
+      t.struct({}),
+      out,
+      mat,
+    );
+  }
+
   policy(name: string, _code: string): Policy;
   policy(name: string, data: Omit<DenoFunc, "effect">): Policy;
   policy(name: string, data: string | Omit<DenoFunc, "effect">): Policy {

typegraph/node/sdk/src/types.ts

@@ -544,6 +544,17 @@ export class Func<
     );
   }
 
+  rate(
+    inp: { calls: boolean; weight?: number },
+  ): Func<P, I, O, M> {
+    return func(
+      this.inp,
+      this.out,
+      this.mat,
+      { rateCalls: inp.calls ?? false, rateWeight: inp.weight },
+    );
+  }
+
   static fromTypeFunc(data: FuncParams) {
     return func(
       new Typedef(data.inp, {}) as Struct<{ [key: string]: Typedef }>,