fix: merge conflict

Author: michael-0acf4

CONTRIBUTING.md

@@ -73,7 +73,8 @@ steps in advance to help us fix any potential bug as fast as possible.
   you might want to check [this section](#i-have-a-question)).
 - To see if other users have experienced (and potentially already solved) the
   same issue you are having, check if there is not already a bug report existing
-  for your bug or error in the [bug tracker](https://github.com/metatypedev/metatype/issues?q=label%3Abug).
+  for your bug or error in the
+  [bug tracker](https://github.com/metatypedev/metatype/issues?q=label%3Abug).
 - Also make sure to search the internet (including Stack Overflow) to see if
   users outside the GitHub community have discussed the issue.
 - Collect information about the bug:
@@ -230,3 +231,16 @@ rustflags = [
     "-C", "link-arg=-fuse-ld=mold"
 ]
 ```
+
+#### Local typegraph with Nodejs
+
+Currently, the `typegraph/sdk/node/dist` project is generated dynamically.
+Depending on your package manager, the protocol used may differ.
+
+```bash
+# uses the `file:..` protocol
+npm install path/to/typegraph/sdk/node/dist
+
+# uses the `link:..` protocol (equivalent to `file:..` but for directories only)
+pnpm install path/to/typegraph/sdk/node/dist
+```

Cargo.lock

@@ -570,3 +570,7 @@ export function archive(a0: ArchiveInp): ArchiveResult {
     return { Err: { message: err.toString() } };
   }
 }
+
+export function transformTypescript(a0: string): string {
+  return Meta.deno.transformTypescript(a0);
+}

typegate/engine/bindings.ts

@@ -198,4 +198,8 @@ declare namespace Meta {
     function registerModule(inp: PythonRegisterInp): string;
     function unregisterModule(inp: PythonUnregisterInp): string;
   }
+
+  namespace deno {
+    function transformTypescript(inp: string): string;
+  }
 }

typegate/engine/runtime.d.ts

@@ -38,6 +38,9 @@ globalThis.Meta = {
     registerModule: ops.op_register_module,
     unregisterModule: ops.op_unregister_module,
   },
+  deno: {
+    transformTypescript: ops.op_deno_transform_typescript,
+  },
   version: ops.op_get_version,
   typescriptFormatCode: ops.op_typescript_format_code,
   typegraphValidate: ops.op_typegraph_validate,

typegate/engine/runtime.js

@@ -3,7 +3,7 @@
 
 use crate::interlude::*;
 use crate::{
-    runtimes::{prisma, python::python_bindings, temporal, wasmedge},
+    runtimes::{deno_rt, prisma, python::python_bindings, temporal, wasmedge},
     typegraph, typescript,
 };
 
@@ -49,6 +49,7 @@ deno_core::extension!(
         prisma::op_prisma_reset,
         prisma::op_unpack,
         prisma::op_archive,
+        deno_rt::op_deno_transform_typescript
     ],
     esm_entry_point = "ext:tg_metatype_ext/runtime.js",
     esm = ["runtime.js"],

typegate/engine/src/ext.rs

@@ -1,6 +1,7 @@
 // Copyright Metatype OÜ, licensed under the Elastic License 2.0.
 // SPDX-License-Identifier: Elastic-2.0
 
+pub mod deno_rt;
 pub mod prisma;
 pub mod python;
 pub mod temporal;

typegate/engine/src/runtimes.rs

@@ -0,0 +1,16 @@
+#![allow(clippy::not_unsafe_ptr_arg_deref)]
+
+// Copyright Metatype OÜ, licensed under the Elastic License 2.0.
+// SPDX-License-Identifier: Elastic-2.0
+
+use crate::interlude::*;
+
+#[rustfmt::skip]
+use deno_core as deno_core; // necessary for re-exported macros to work
+use typescript::parser::transform_script;
+
+#[deno_core::op2]
+#[string]
+pub fn op_deno_transform_typescript(#[string] script: String) -> Result<String> {
+    transform_script(script)
+}

typegate/engine/src/runtimes/deno_rt.rs

@@ -0,0 +1,34 @@
+// Copyright Metatype OÜ, licensed under the Elastic License 2.0.
+// SPDX-License-Identifier: Elastic-2.0
+
+import { transformTypescript, typescript_format_code } from "native";
+import { nativeResult } from "./utils.ts";
+import { TypeGraphDS } from "./typegraph/mod.ts";
+
+abstract class PostProcessor {
+  /** Postprocess the provided typegraph reference */
+  abstract postprocess(tg: TypeGraphDS): void;
+}
+
+class DenoPostProcess extends PostProcessor {
+  postprocess(tg: TypeGraphDS): void {
+    for (const mat of tg.materializers) {
+      if (mat.name == "function") {
+        const jsScript = transformTypescript(mat.data.script as string);
+        mat.data.script = nativeResult(
+          typescript_format_code({ source: jsScript }),
+        )
+          ?.formatted_code!;
+      }
+    }
+  }
+}
+
+export function applyPostProcessors(typegraphRefs: TypeGraphDS[]): void {
+  const postprocesses = [new DenoPostProcess()] as Array<PostProcessor>;
+  for (const postprocess of postprocesses) {
+    for (const tgJson of typegraphRefs) {
+      postprocess.postprocess(tgJson);
+    }
+  }
+}

typegate/src/postprocess.ts

@@ -83,7 +83,6 @@ export class DenoRuntime extends Runtime {
     for (const mat of materializers) {
       if (mat.name === "function") {
         const code = mat.data.script as string;
-
         ops.set(registryCount, {
           type: "register_func",
           fnCode: code,

typegate/src/runtimes/deno/deno.ts

@@ -14,6 +14,7 @@ import { closestWord } from "../utils.ts";
 import { Type, TypeNode } from "../typegraph/type_node.ts";
 import { StringFormat } from "../typegraph/types.ts";
 import { mapValues } from "std/collections/map_values.ts";
+import { applyPostProcessors } from "../postprocess.ts";
 
 const logger = getLogger(import.meta);
 
@@ -148,6 +149,8 @@ export class TypeGateRuntime extends Runtime {
     }
 
     const tgJson = await TypeGraph.parseJson(fromString);
+    applyPostProcessors([tgJson]);
+
     const { engine, response, name } = await this.typegate.pushTypegraph(
       tgJson,
       JSON.parse(secrets),

typegate/src/runtimes/typegate.ts

@@ -245,7 +245,8 @@ snapshot[`typegraphs creation 1`] = `
           "idempotent": true
         },
         "data": {
-          "script": "var _my_lambda=()=>true;"
+          "script": "var _my_lambda = () => true",
+          "secrets": []
         }
       },
       {
@@ -489,7 +490,8 @@ snapshot[`typegraphs creation 2`] = `
           "idempotent": true
         },
         "data": {
-          "script": "var _my_lambda=({first,second})=>first*second;"
+          "script": "var _my_lambda = ({ first, second }) => first * second",
+          "secrets": []
         }
       }
     ],
@@ -538,7 +540,7 @@ snapshot[`typegraphs creation 2`] = `
 `;
 
 snapshot[`typegraphs creation 3`] = `
-'[
+\`[
   {
     "\$id": "https://metatype.dev/specs/0.0.3.json",
     "types": [
@@ -697,7 +699,8 @@ snapshot[`typegraphs creation 3`] = `
           "idempotent": true
         },
         "data": {
-          "script": "var _my_lambda=()=>12;"
+          "script": "var _my_lambda = () => 12",
+          "secrets": []
         }
       },
       {
@@ -708,7 +711,8 @@ snapshot[`typegraphs creation 3`] = `
           "idempotent": true
         },
         "data": {
-          "script": "var _my_lambda=(_,{context})=>context.provider===\\\\"internal\\\\";"
+          "script": "var _my_lambda = (_, { context }) => context.provider === 'internal'",
+          "secrets": []
         }
       },
       {
@@ -719,7 +723,8 @@ snapshot[`typegraphs creation 3`] = `
           "idempotent": true
         },
         "data": {
-          "script": "var _my_lambda=user=>({id:12,user});"
+          "script": "var _my_lambda = (user) => ({ id: 12, user })",
+          "secrets": []
         }
       },
       {
@@ -730,7 +735,8 @@ snapshot[`typegraphs creation 3`] = `
           "idempotent": true
         },
         "data": {
-          "script": "var _my_lambda=()=>false;"
+          "script": "var _my_lambda = () => false",
+          "secrets": []
         }
       },
       {
@@ -812,7 +818,7 @@ snapshot[`typegraphs creation 3`] = `
       "version": "0.0.3"
     }
   }
-]'
+]\`
 `;
 
 snapshot[`typegraphs creation 4`] = `
@@ -1060,7 +1066,8 @@ snapshot[`typegraphs creation 4`] = `
           "idempotent": true
         },
         "data": {
-          "script": "var _my_lambda=()=>true;"
+          "script": "var _my_lambda = () => true",
+          "secrets": []
         }
       },
       {
@@ -1304,7 +1311,8 @@ snapshot[`typegraphs creation 5`] = `
           "idempotent": true
         },
         "data": {
-          "script": "var _my_lambda=({first,second})=>first*second;"
+          "script": "var _my_lambda = ({first, second}) => first * second",
+          "secrets": []
         }
       }
     ],
@@ -1353,7 +1361,7 @@ snapshot[`typegraphs creation 5`] = `
 `;
 
 snapshot[`typegraphs creation 6`] = `
-'[
+\`[
   {
     "\$id": "https://metatype.dev/specs/0.0.3.json",
     "types": [
@@ -1512,7 +1520,8 @@ snapshot[`typegraphs creation 6`] = `
           "idempotent": true
         },
         "data": {
-          "script": "var _my_lambda=()=>12;"
+          "script": "var _my_lambda = () => 12",
+          "secrets": []
         }
       },
       {
@@ -1523,7 +1532,8 @@ snapshot[`typegraphs creation 6`] = `
           "idempotent": true
         },
         "data": {
-          "script": "var _my_lambda=(_,{context})=>context.provider===\\\\"internal\\\\";"
+          "script": "var _my_lambda = (_, { context }) => context.provider === 'internal'",
+          "secrets": []
         }
       },
       {
@@ -1534,7 +1544,8 @@ snapshot[`typegraphs creation 6`] = `
           "idempotent": true
         },
         "data": {
-          "script": "var _my_lambda=user=>({id:12,user});"
+          "script": "var _my_lambda = (user) => ({ id: 12, user })",
+          "secrets": []
         }
       },
       {
@@ -1545,7 +1556,8 @@ snapshot[`typegraphs creation 6`] = `
           "idempotent": true
         },
         "data": {
-          "script": "var _my_lambda=()=>false;"
+          "script": "var _my_lambda = () => false",
+          "secrets": []
         }
       },
       {
@@ -1627,5 +1639,5 @@ snapshot[`typegraphs creation 6`] = `
       "version": "0.0.3"
     }
   }
-]'
+]\`
 `;

typegate/tests/e2e/typegraph/__snapshots__/typegraph_test.ts.snap

@@ -9,13 +9,21 @@ import { Meta } from "../../utils/mod.ts";
 import { MetaTest } from "../../utils/test.ts";
 import { assertEquals } from "std/assert/assert_equals.ts";
 import config from "../../../src/config.ts";
+import { applyPostProcessors } from "../../../src/postprocess.ts";
+import { TypeGraphDS } from "../../../src/typegraph/mod.ts";
 
 export const thisDir = dirname(fromFileUrl(import.meta.url));
 
 function stripIncomparable(json: string) {
   return [
     // FIXME: python and deno does not produce the same tarball
     (source: string) => source.replace(/"file:scripts(.)+?"/g, '""'),
+    (source: string) => {
+      const tg: TypeGraphDS = JSON.parse(source)?.[0];
+      // Required since the typescript format/js convesion Postprocessors are now removed from the cli and sdk
+      applyPostProcessors([tg]);
+      return JSON.stringify(tg, null, 2);
+    },
   ].reduce((prev, op) => op(prev), json);
 }
 

typegate/tests/e2e/website/website_test.ts

@@ -15,7 +15,6 @@ wit-bindgen = "0.12.0"
 regex = "1.10.2"
 indexmap = { version = "2.1.0", features = ["serde"] }
 common = { path = "../../libs/common" }
-typescript = { path = "../../libs/typescript" }
 indoc = "2.0.4"
 graphql-parser = "0.4.0"
 sha2 = "0.10.8"