fix(cli): dir => root typegraph, migration paths => relative to dir

Author: michael-0acf4

meta-cli/src/com/server.rs

@@ -13,6 +13,7 @@ use serde_json::json;
 use std::{
     io::{Error, ErrorKind},
     net::{Ipv4Addr, SocketAddrV4, TcpListener},
+    path::PathBuf,
     sync::Arc,
 };
 
@@ -40,20 +41,20 @@ pub fn get_instance_port() -> u16 {
 #[derive(Debug, Deserialize)]
 struct QueryConfigParams {
     typegraph: String,
+    typegraph_path: PathBuf,
 }
 
 #[get("/config")]
 async fn config(req: HttpRequest) -> impl Responder {
-    let parsed = Query::<QueryConfigParams>::from_query(req.query_string());
-    let folder = match parsed {
-        Ok(p) => p.typegraph.to_owned(),
-        Err(_) => "".to_string(),
-    };
+    let mut parsed = Query::<QueryConfigParams>::from_query(req.query_string()).unwrap();
+
+    parsed.typegraph_path.pop(); // pop file.ext
+    let artefact_base_dir = parsed.typegraph_path.clone();
+
     let endpoint = ServerStore::get_endpoint();
     let secrets = ServerStore::get_secrets();
     let migration_action = ServerStore::get_migration_action();
     let prefix = ServerStore::get_prefix();
-
     match ServerStore::get_config() {
         Some(config) => {
             let data = json!({
@@ -64,9 +65,9 @@ async fn config(req: HttpRequest) -> impl Responder {
                 "secrets": secrets,
                 "prefix": prefix,
                 "artifactsConfig": json!({
-                    "dir": config.base_dir.display().to_string(),
+                    "dir": artefact_base_dir,
                     "prismaMigration": {
-                        "migrationDir": config.prisma_migrations_dir(&folder),
+                        "migrationDir": config.prisma_migrations_dir_rel(&parsed.typegraph),
                         "action": serde_json::to_value(migration_action).unwrap()
                     },
                 }),

meta-cli/src/config.rs

@@ -244,15 +244,15 @@ impl Config {
             .unwrap_or(&DEFAULT_LOADER_CONFIG)
     }
 
-    pub fn prisma_migrations_dir(&self, typegraph: &str) -> PathBuf {
-        let mut path = self.base_dir.join(
-            self.typegraphs
-                .materializers
-                .prisma
-                .migrations_path
-                .as_deref()
-                .unwrap_or_else(|| Path::new("prisma/migrations")),
-        );
+    pub fn prisma_migrations_dir_rel(&self, typegraph: &str) -> PathBuf {
+        let mut path = self
+            .typegraphs
+            .materializers
+            .prisma
+            .migrations_path
+            .as_deref()
+            .unwrap_or_else(|| Path::new("prisma/migrations"))
+            .to_path_buf();
         path.push(typegraph);
         path
     }

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

@@ -129,7 +129,7 @@ impl PushResult {
 
         let migdir = ServerStore::get_config()
             .unwrap()
-            .prisma_migrations_dir(&self.original_name);
+            .prisma_migrations_dir_rel(&self.original_name);
 
         for migrations in self.migrations.iter() {
             let dest = migdir.join(&migrations.runtime);

typegraph/node/sdk/src/tg_manage.ts

@@ -100,6 +100,7 @@ export class Manager {
   async #requestConfig(): Promise<CLISuccess<CLIConfigRequest>> {
     const params = new URLSearchParams({
       typegraph: this.#typegraph.name,
+      typegraph_path: this.#typegraphPath,
     });
     const response = await fetch(new URL("config?" + params, this.#endpoint));
     return (await response.json()) as CLISuccess<CLIConfigRequest>;

typegraph/python/typegraph/graph/tg_manage.py

@@ -13,7 +13,7 @@
 )
 
 from typegraph.graph.tg_deploy import TypegraphDeployParams, tg_deploy
-from urllib import request
+from urllib import request, parse
 
 from typegraph.graph.shared_types import BasicAuth, TypegraphOutput
 
@@ -125,7 +125,10 @@ def request_command(self) -> CLIServerResponse:
 
     def request_config(self) -> CLIConfigRequest:
         tg_name = self.typegraph.name
-        req = request.Request(f"{self.endpoint}/config?typegraph={tg_name}")
+        tg_path = parse.quote(self.typegraph_path)
+        req = request.Request(
+            f"{self.endpoint}/config?typegraph={tg_name}&typegraph_path={tg_path}"
+        )
         raw = request.urlopen(req).read().decode()
         cli_res = json.loads(raw)["data"]