feat: injection on output types (outjection) (#935)

- [x] Solve [MET-140](https://linear.app/metatypedev/issue/MET-140/gate-computestage-processing-from-context-should-evaluate-in-all-cases) - Enable injection on output - [x] Solve [MET-47](https://linear.app/metatypedev/issue/MET-47/gate-from-parent-for-eitherunion) - test from parent injection for either/union types   #### Migration notes - _N/A_ --- - [x] The change comes with new or modified tests - [ ] Hard-to-understand functions have explanatory comments - [ ] End-user documentation is updated to reflect the change
metatypedev · Dec 9, 2024 · 3643286 · 3643286
1 parent 2ea7a48
commit 3643286
Show file tree

Hide file tree

Showing 44 changed files with 611 additions and 119 deletions.
diff --git a/.ghjk/lock.json b/.ghjk/lock.json
@@ -724,6 +724,12 @@
           "crateName": "cargo-udeps",
           "locked": true,
           "specifiedVersion": true
+        },
+        "bciqb53vnbgb6fcovjas7p4vhxkqbqicchrmz4g6cz2c2ffj2lqaog3i": {
+          "version": "v9.15.0",
+          "buildDepConfigs": {},
+          "portRef": "[email protected]",
+          "specifiedVersion": true
         }
       }
     },
@@ -772,7 +778,7 @@
                 "bciqkgncxbauys2qfguplxcz2auxrcyamj4b6htqk2fqvohfm3afd7sa",
                 "bciqihcmo6l5uwzih3e3ujc55curep4arfomo6rzkdsfim74unxexiqy",
                 "bciqezep4ufkgwesldlm5etyfkgdsiickfudx7cosydcz6xtgeorn2hy",
-                "bciqaixkkacuuligsvtjcfdfgjgl65owtyspiiljb3vmutlgymecsiwq",
+                "bciqlt3rqqcn2tgexcgf7ndjceavwycoddgtn63fkh6z6i6pgmz7jr6y",
                 "bciqlt27ioikxnpkqq37hma7ibn5e5wpzfarbvoh77zwdkarwghtvzxa",
                 "bciqojan3zglnfctnmqyxvnxaha46yrnlhj77j3kw4mxadvauqepqdba",
                 "bciqcnbruy2q6trpvia52n2yis4t27taoz4mxkeguqz5aif7ex6rp26y",
@@ -808,7 +814,7 @@
                 "bciqkgncxbauys2qfguplxcz2auxrcyamj4b6htqk2fqvohfm3afd7sa",
                 "bciqihcmo6l5uwzih3e3ujc55curep4arfomo6rzkdsfim74unxexiqy",
                 "bciqezep4ufkgwesldlm5etyfkgdsiickfudx7cosydcz6xtgeorn2hy",
-                "bciqaixkkacuuligsvtjcfdfgjgl65owtyspiiljb3vmutlgymecsiwq",
+                "bciqlt3rqqcn2tgexcgf7ndjceavwycoddgtn63fkh6z6i6pgmz7jr6y",
                 "bciqlt27ioikxnpkqq37hma7ibn5e5wpzfarbvoh77zwdkarwghtvzxa",
                 "bciqojan3zglnfctnmqyxvnxaha46yrnlhj77j3kw4mxadvauqepqdba",
                 "bciqcnbruy2q6trpvia52n2yis4t27taoz4mxkeguqz5aif7ex6rp26y",
@@ -820,7 +826,7 @@
             "ghjkEnvProvInstSet____ecma": {
               "installs": [
                 "bciqezep4ufkgwesldlm5etyfkgdsiickfudx7cosydcz6xtgeorn2hy",
-                "bciqaixkkacuuligsvtjcfdfgjgl65owtyspiiljb3vmutlgymecsiwq",
+                "bciqlt3rqqcn2tgexcgf7ndjceavwycoddgtn63fkh6z6i6pgmz7jr6y",
                 "bciqlt27ioikxnpkqq37hma7ibn5e5wpzfarbvoh77zwdkarwghtvzxa",
                 "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a"
               ],
@@ -865,7 +871,7 @@
             "ghjkEnvProvInstSet_______task_env_dev-website": {
               "installs": [
                 "bciqezep4ufkgwesldlm5etyfkgdsiickfudx7cosydcz6xtgeorn2hy",
-                "bciqaixkkacuuligsvtjcfdfgjgl65owtyspiiljb3vmutlgymecsiwq",
+                "bciqlt3rqqcn2tgexcgf7ndjceavwycoddgtn63fkh6z6i6pgmz7jr6y",
                 "bciqlt27ioikxnpkqq37hma7ibn5e5wpzfarbvoh77zwdkarwghtvzxa",
                 "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a",
                 "bciqfpjzi6gguk7dafyicfjpzpwtybgyc2dsnxg2zxkcmyinzy7abpla",
@@ -880,7 +886,7 @@
                 "bciqlubbahrp4pxohyffmn5yj52atjgmn5nxepmkdev6wtmvpbx7kr7y",
                 "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a",
                 "bciqezep4ufkgwesldlm5etyfkgdsiickfudx7cosydcz6xtgeorn2hy",
-                "bciqaixkkacuuligsvtjcfdfgjgl65owtyspiiljb3vmutlgymecsiwq",
+                "bciqlt3rqqcn2tgexcgf7ndjceavwycoddgtn63fkh6z6i6pgmz7jr6y",
                 "bciqlt27ioikxnpkqq37hma7ibn5e5wpzfarbvoh77zwdkarwghtvzxa",
                 "bciqfpjzi6gguk7dafyicfjpzpwtybgyc2dsnxg2zxkcmyinzy7abpla",
                 "bciqkgncxbauys2qfguplxcz2auxrcyamj4b6htqk2fqvohfm3afd7sa",
@@ -894,7 +900,7 @@
                 "bciqlubbahrp4pxohyffmn5yj52atjgmn5nxepmkdev6wtmvpbx7kr7y",
                 "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a",
                 "bciqezep4ufkgwesldlm5etyfkgdsiickfudx7cosydcz6xtgeorn2hy",
-                "bciqaixkkacuuligsvtjcfdfgjgl65owtyspiiljb3vmutlgymecsiwq",
+                "bciqlt3rqqcn2tgexcgf7ndjceavwycoddgtn63fkh6z6i6pgmz7jr6y",
                 "bciqlt27ioikxnpkqq37hma7ibn5e5wpzfarbvoh77zwdkarwghtvzxa",
                 "bciqfpjzi6gguk7dafyicfjpzpwtybgyc2dsnxg2zxkcmyinzy7abpla",
                 "bciqkgncxbauys2qfguplxcz2auxrcyamj4b6htqk2fqvohfm3afd7sa",
@@ -939,7 +945,7 @@
                 "bciqpu7gxs3zm7i4gwp3m3cfdxwz27ixvsykdnbxrl5m5mt3xbb3b4la",
                 "bciqjme7csfq43oenkrsakdhaha34hgy6vdwkfffki2ank3kf6mjcguq",
                 "bciqezep4ufkgwesldlm5etyfkgdsiickfudx7cosydcz6xtgeorn2hy",
-                "bciqaixkkacuuligsvtjcfdfgjgl65owtyspiiljb3vmutlgymecsiwq",
+                "bciqlt3rqqcn2tgexcgf7ndjceavwycoddgtn63fkh6z6i6pgmz7jr6y",
                 "bciqlt27ioikxnpkqq37hma7ibn5e5wpzfarbvoh77zwdkarwghtvzxa"
               ],
               "allowedBuildDeps": "bciqek3tmrhm4iohl6tvdzlhxwhv7b52makvvgehltxv52d3l7rbki3y"
@@ -2843,8 +2849,8 @@
           "moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/v0.2.1/ports/node.ts"
         }
       },
-      "bciqaixkkacuuligsvtjcfdfgjgl65owtyspiiljb3vmutlgymecsiwq": {
-        "version": "v9.4.0",
+      "bciqlt3rqqcn2tgexcgf7ndjceavwycoddgtn63fkh6z6i6pgmz7jr6y": {
+        "version": "v9.15.0",
         "port": {
           "ty": "denoWorker@v1",
           "name": "pnpm_ghrel",

diff --git a/deno.lock b/deno.lock
diff --git a/ghjk.ts b/ghjk.ts
@@ -50,7 +50,7 @@ if (Deno.build.os == "linux" && !Deno.env.has("NO_MOLD")) {
 
 env("_ecma").install(
   installs.node,
-  ports.pnpm({ version: "v9.4.0" }),
+  ports.pnpm({ version: "v9.15.0" }),
   ports.npmi({ packageName: "node-gyp", version: "10.0.1" })[0],
 );
 

diff --git a/import_map.json b/import_map.json
@@ -40,6 +40,7 @@
     "sentry": "npm:@sentry/[email protected]",
     "swc": "https://deno.land/x/[email protected]/mod.ts",
     "swc/types": "https://esm.sh/@swc/[email protected]/types.d.ts?pin=v135",
-    "validator": "npm:[email protected]"
+    "validator": "npm:[email protected]",
+    "@sinonjs/fake-timers": "npm:@sinonjs/[email protected]"
   }
 }
diff --git a/src/common/src/typegraph/mod.rs b/src/common/src/typegraph/mod.rs
@@ -87,6 +87,9 @@ pub struct Queries {
 pub struct TypeMeta {
     pub prefix: Option<String>,
     pub secrets: Vec<String>,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    #[serde(default)]
+    pub outjection_secrets: Vec<String>,
     pub queries: Queries,
     pub cors: Cors,
     pub auths: Vec<Auth>,

diff --git a/src/common/src/typegraph/types.rs b/src/common/src/typegraph/types.rs
@@ -181,14 +181,37 @@ pub enum InjectionNode {
     },
 }
 
+impl InjectionNode {
+    pub fn collect_secrets_into(&self, collector: &mut Vec<String>) -> Result<()> {
+        match self {
+            InjectionNode::Leaf { injection } => {
+                if let Injection::Secret(d) = injection {
+                    collector.extend(d.values::<String>()?);
+                }
+            }
+            InjectionNode::Parent { children } => {
+                for child in children.values() {
+                    child.collect_secrets_into(collector)?;
+                }
+            }
+        }
+        Ok(())
+    }
+}
+
 #[skip_serializing_none]
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct FunctionTypeData<Id = TypeId> {
     pub input: Id,
     #[serde(rename = "parameterTransform")]
     pub parameter_transform: Option<FunctionParameterTransform>,
     pub output: Id,
+    #[serde(skip_serializing_if = "IndexMap::is_empty")]
+    #[serde(default)]
     pub injections: IndexMap<String, InjectionNode>,
+    #[serde(skip_serializing_if = "IndexMap::is_empty")]
+    #[serde(default)]
+    pub outjections: IndexMap<String, InjectionNode>,
     #[serde(rename = "runtimeConfig")]
     pub runtime_config: serde_json::Value,
     pub materializer: u32,

diff --git a/src/common/src/typegraph/validator/mod.rs b/src/common/src/typegraph/validator/mod.rs
@@ -170,6 +170,26 @@ impl<'a> TypeVisitor<'a> for Validator {
                 );
                 path.pop();
             }
+            // TODO validate outjection
+            // if !data.outjections.is_empty() {
+            //     let outj_cx = InjectionValidationContext {
+            //         fn_path: current_node.path.to_vec(),
+            //         fn_idx: current_node.type_idx,
+            //         input_idx: data.output,
+            //         parent_object,
+            //         validator: context,
+            //     };
+            //     for (k, outj) in data.outjections.iter() {
+            //         path.push(k.clone());
+            //         self.validate_injection(
+            //             &mut path,
+            //             *parent_object.properties.get(k).unwrap(),
+            //             outj,
+            //             &outj_cx,
+            //         );
+            //         path.pop();
+            //     }
+            // }
         } else if let TypeNode::Either { data, .. } = type_node {
             let variants = data.one_of.clone();
             for i in 0..variants.len() {

diff --git a/src/metagen/src/client_rs/mod.rs b/src/metagen/src/client_rs/mod.rs
@@ -17,7 +17,6 @@ use crate::shared::client::*;
 use crate::shared::types::NameMemo;
 use crate::shared::types::TypeRenderer;
 use crate::utils::GenDestBuf;
-use normpath::PathExt;
 use utils::normalize_type_title;
 
 #[derive(Serialize, Deserialize, Debug, garde::Validate)]
@@ -436,6 +435,7 @@ pub fn gen_cargo_toml(crate_name: Option<&str>) -> String {
 
     #[cfg(debug_assertions)]
     let dependency = if is_test {
+        use normpath::PathExt;
         let client_path = Path::new(env!("CARGO_MANIFEST_DIR"))
             .join("../metagen-client-rs")
             .normalize()

diff --git a/src/metagen/src/fdk_rust/stubs.rs b/src/metagen/src/fdk_rust/stubs.rs
@@ -138,6 +138,7 @@ mod test {
                         input: 1,
                         output: 1,
                         injections: Default::default(),
+                        outjections: Default::default(),
                         runtime_config: Default::default(),
                         rate_calls: false,
                         rate_weight: None,

diff --git a/src/metagen/src/tests/fixtures.rs b/src/metagen/src/tests/fixtures.rs
@@ -80,6 +80,7 @@ pub fn test_typegraph_2() -> Typegraph {
                     input: 1,
                     output: 1,
                     injections: Default::default(),
+                    outjections: Default::default(),
                     runtime_config: Default::default(),
                     rate_calls: false,
                     rate_weight: None,

diff --git a/src/typegate/src/engine/injection/dynamic.ts b/src/typegate/src/engine/injection/dynamic.ts
@@ -0,0 +1,7 @@
+// Copyright Metatype OÜ, licensed under the Mozilla Public License Version 2.0.
+// SPDX-License-Identifier: MPL-2.0
+
+export default {
+  "now": () => new Date().toISOString(),
+  // "uuid": () =>
+} as const;
diff --git a/src/typegate/src/engine/planner/args.ts b/src/typegate/src/engine/planner/args.ts
@@ -43,6 +43,7 @@ import {
 import { QueryFunction as JsonPathQuery } from "../../libs/jsonpath.ts";
 import { getInjection } from "../../typegraph/utils.ts";
 import { GeneratorNode } from "../../runtimes/random.ts";
+import DynamicInjection from "../injection/dynamic.ts";
 
 class MandatoryArgumentError extends Error {
   constructor(argDetails: string) {
@@ -104,7 +105,7 @@ export function collectArgs(
     stageId,
     effect,
     parentProps,
-    injectionTree,
+    injectionTree ?? {},
   );
   const argTypeNode = typegraph.type(typeIdx, Type.OBJECT);
   for (const argName of Object.keys(astNodes)) {
@@ -169,11 +170,6 @@ export function collectArgs(
   };
 }
 
-const GENERATORS = {
-  "now": () => new Date().toISOString(),
-  // "uuid": () =>
-} as const;
-
 interface Dependencies {
   context: Set<string>;
   parent: Set<string>;
@@ -814,7 +810,8 @@ class ArgumentCollector {
         if (generatorName == null) {
           return null;
         }
-        const generator = GENERATORS[generatorName as keyof typeof GENERATORS];
+        const generator =
+          DynamicInjection[generatorName as keyof typeof DynamicInjection];
         if (generator == null) {
           throw new Error(
             `Unknown generator '${generatorName}' for dynamic injection`,

diff --git a/src/typegate/src/engine/planner/injection_utils.ts b/src/typegate/src/engine/planner/injection_utils.ts
@@ -16,3 +16,13 @@ export function selectInjection<T = string>(
   }
   return null;
 }
+
+export function getInjectionValues<T = string>(
+  data: InjectionData,
+): T[] {
+  if ("value" in data) {
+    return [data.value as T];
+  }
+
+  return Object.values(data).filter((v) => typeof v === "string") as T[];
+}