refactor: Remove runtime field from TypeNode

src/common/src/typegraph/types.rs

@@ -57,7 +57,6 @@ pub enum Injection {
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct TypeNodeBase {
     pub title: String,
-    pub runtime: u32,
     pub policies: Vec<PolicyIndices>,
     #[serde(default)]
     pub description: Option<String>,

src/meta-cli/src/cli/deploy.rs

@@ -109,7 +109,7 @@ impl Deploy {
         let dir: Arc<Path> = args.dir()?.into();
 
         let config_path = args.config.clone();
-        let config = Arc::new(Config::load_or_find(config_path, &dir)?);
+        let config = Arc::new(Config::load_or_find(config_path.as_deref(), &dir)?);
 
         let options = deploy.options.clone();
 

src/meta-cli/src/cli/doctor.rs

@@ -78,7 +78,7 @@ impl Action for Doctor {
         }
         println!();
 
-        let config = Config::load_or_find(args.config.clone(), dir);
+        let config = Config::load_or_find(args.config.as_deref(), dir);
 
         ui::title("Project", w);
         match config {

src/meta-cli/src/cli/gen.rs

@@ -39,7 +39,7 @@ impl Action for Gen {
     #[tracing::instrument]
     async fn run(&self, args: ConfigArgs) -> Result<()> {
         let dir = args.dir()?;
-        let config = Config::load_or_find(args.config, &dir)?;
+        let config = Config::load_or_find(args.config.as_deref(), &dir)?;
         let config = Arc::new(config);
 
         let Some(mgen_conf) = &config.metagen else {

src/meta-cli/src/cli/list.rs

@@ -34,7 +34,7 @@ impl Action for List {
     async fn run(&self, args: ConfigArgs) -> Result<()> {
         let dir = args.dir()?;
         let config_path = args.config.clone();
-        let config = Arc::new(Config::load_or_find(config_path, &dir)?);
+        let config = Arc::new(Config::load_or_find(config_path.as_deref(), &dir)?);
 
         let mut node_config = config.node(&self.node, &self.target);
         if self.target == "dev" {

src/meta-cli/src/cli/serialize.rs

@@ -54,8 +54,11 @@ impl Action for Serialize {
         let dir = args.dir()?;
         let config_path = args.config.clone();
 
-        let config = Config::load_or_find(config_path, &dir)?;
-
+        let config =
+            Config::load_or_find(config_path.as_deref(), &dir).or_else(|e| match config_path {
+                Some(_) => Err(e),
+                _ => Ok(Config::default_in(&dir)),
+            })?;
         let config = Arc::new(config);
 
         let console = ConsoleActor::new(Arc::clone(&config)).start();

src/meta-cli/src/cli/undeploy.rs

@@ -27,7 +27,7 @@ impl Action for Undeploy {
     async fn run(&self, args: super::ConfigArgs) -> Result<()> {
         let dir = args.dir()?;
         let config_path = args.config.clone();
-        let config = Config::load_or_find(config_path, &dir)?;
+        let config = Config::load_or_find(config_path.as_deref(), &dir)?;
         let node_config = config.node(&self.node, &self.target);
         let node = node_config.build(&dir).await?;
 

src/meta-cli/src/config.rs

@@ -269,12 +269,12 @@ impl Config {
 
     /// Load config file:
     /// if the config_path is None, search the config file recursively on parent directories.
-    pub fn load_or_find<P: AsRef<Path>>(
-        config_path: Option<PathBuf>,
-        search_start_dir: P,
+    pub fn load_or_find(
+        config_path: Option<&Path>,
+        search_start_dir: impl AsRef<Path>,
     ) -> Result<Config> {
         if let Some(path) = config_path {
-            Config::from_file(&path).with_context(|| format!("config file not found at {path:?}"))
+            Config::from_file(path).with_context(|| format!("config file not found at {path:?}"))
         } else {
             Ok(Config::find(search_start_dir)?
                 .ok_or_else(|| ferr!("could not find config file"))?)
@@ -334,6 +334,7 @@ impl Config {
     pub fn dir(&self) -> Result<&Path> {
         self.path
             .as_deref()
+            .or(Some(self.base_dir.as_path()))
             .ok_or_else(|| ferr!("config path required"))?
             .parent()
             .ok_or_else(|| ferr!("config path has no parent"))
@@ -351,7 +352,7 @@ mod tests {
     fn load_missing_config_file() -> Result<()> {
         let project_root = get_project_root()?;
         let path = project_root.join("path/to/metatype.yml");
-        let load_res = Config::load_or_find(Some(path), project_root);
+        let load_res = Config::load_or_find(Some(&path), project_root);
         assert_err_contains(load_res, "config file not found at");
         Ok(())
     }

src/metagen/src/tests/fixtures.rs

@@ -98,7 +98,6 @@ pub fn default_type_node_base() -> TypeNodeBase {
         title: String::new(),
         as_id: false,
         config: Default::default(),
-        runtime: 0,
         policies: vec![],
         injection: None,
         description: None,

src/typegate/src/engine/planner/mod.ts

@@ -392,7 +392,11 @@ export class Planner {
       );
     }
 
-    const runtime = this.tg.runtimeReferences[schema.runtime];
+    const runtime = (schema.type === Type.FUNCTION)
+      ? this.tg
+        .runtimeReferences[(this.tg.materializer(schema.materializer)).runtime]
+      : node.parentStage?.props.runtime ??
+        this.tg.runtimeReferences[this.tg.denoRuntimeIdx];
 
     const stage = this.createComputeStage(node, {
       dependencies: node.parentStage ? [node.parentStage.id()] : [],

src/typegate/src/engine/typecheck/result.ts

@@ -106,7 +106,6 @@ export class ResultValidationCompiler {
         cg.generateStringValidator({
           type: "string",
           title: "__TypeName",
-          runtime: -1,
           policies: [],
           as_id: false,
         });

src/typegate/src/runtimes/typegate.ts

@@ -24,7 +24,6 @@ interface TypeInfo {
   as_id: boolean;
   title: string;
   type: string;
-  runtime: string;
   /** list of json string */
   enum: string[] | null;
   /** json string */
@@ -562,7 +561,6 @@ function walkPath(
     title: node.title,
     type: node.type,
     enum: node.enum ?? null,
-    runtime: tg.runtime(node.runtime).name,
     config: node.config ? JSON.stringify(node.config) : null,
     default: defaultValue ? JSON.stringify(defaultValue) : null,
     format: format ?? null,

src/typegate/src/typegraph/mod.ts

@@ -43,7 +43,14 @@ import randomizeRecursively from "../runtimes/random.ts";
 import type { Typegate } from "../typegate/mod.ts";
 import { TypeUtils } from "./utils.ts";
 
-export type { Cors, Rate, TypeGraphDS, TypeMaterializer, TypePolicy, TypeRuntime };
+export type {
+  Cors,
+  Rate,
+  TypeGraphDS,
+  TypeMaterializer,
+  TypePolicy,
+  TypeRuntime,
+};
 
 export type RuntimeResolver = Record<string, Runtime>;
 
@@ -89,7 +96,6 @@ export class TypeGraph implements AsyncDisposable {
     title: "string",
     type: "string",
     policies: [],
-    runtime: -1,
     as_id: false,
   };
 

src/typegate/src/typegraph/types.ts

@@ -6,7 +6,6 @@
 export type OptionalNode = {
   type: "optional";
   title: string;
-  runtime: number;
   policies: PolicyIndices[];
   description?: string | null;
   injection?: Injection | null;
@@ -21,7 +20,6 @@ export type OptionalNode = {
 export type BooleanNode = {
   type: "boolean";
   title: string;
-  runtime: number;
   policies: PolicyIndices[];
   description?: string | null;
   injection?: Injection | null;
@@ -34,7 +32,6 @@ export type BooleanNode = {
 export type FloatNode = {
   type: "float";
   title: string;
-  runtime: number;
   policies: PolicyIndices[];
   description?: string | null;
   injection?: Injection | null;
@@ -52,7 +49,6 @@ export type FloatNode = {
 export type IntegerNode = {
   type: "integer";
   title: string;
-  runtime: number;
   policies: PolicyIndices[];
   description?: string | null;
   injection?: Injection | null;
@@ -70,7 +66,6 @@ export type IntegerNode = {
 export type StringNode = {
   type: "string";
   title: string;
-  runtime: number;
   policies: PolicyIndices[];
   description?: string | null;
   injection?: Injection | null;
@@ -87,7 +82,6 @@ export type StringNode = {
 export type FileNode = {
   type: "file";
   title: string;
-  runtime: number;
   policies: PolicyIndices[];
   description?: string | null;
   injection?: Injection | null;
@@ -103,7 +97,6 @@ export type FileNode = {
 export type ObjectNode = {
   type: "object";
   title: string;
-  runtime: number;
   policies: PolicyIndices[];
   description?: string | null;
   injection?: Injection | null;
@@ -120,7 +113,6 @@ export type ObjectNode = {
 export type ListNode = {
   type: "list";
   title: string;
-  runtime: number;
   policies: PolicyIndices[];
   description?: string | null;
   injection?: Injection | null;
@@ -137,7 +129,6 @@ export type ListNode = {
 export type FunctionNode = {
   type: "function";
   title: string;
-  runtime: number;
   policies: PolicyIndices[];
   description?: string | null;
   injection?: Injection | null;
@@ -156,7 +147,6 @@ export type FunctionNode = {
 export type UnionNode = {
   type: "union";
   title: string;
-  runtime: number;
   policies: PolicyIndices[];
   description?: string | null;
   injection?: Injection | null;
@@ -170,7 +160,6 @@ export type UnionNode = {
 export type EitherNode = {
   type: "either";
   title: string;
-  runtime: number;
   policies: PolicyIndices[];
   description?: string | null;
   injection?: Injection | null;
@@ -184,7 +173,6 @@ export type EitherNode = {
 export type AnyNode = {
   type: "any";
   title: string;
-  runtime: number;
   policies: PolicyIndices[];
   description?: string | null;
   injection?: Injection | null;