feat(cli/sdk): set prefix when the typegraph is loaded

Author: michael-0acf4

meta-cli/src/cli/serialize.rs

@@ -67,7 +67,8 @@ impl Action for Serialize {
         };
 
         // Minimum setup
-        ServerStore::with(Some(Command::Serialize), Some(config.clone()));
+        ServerStore::with(Some(Command::Serialize), Some(config.to_owned()));
+        ServerStore::set_prefix(self.prefix.to_owned());
 
         let config = Arc::new(config);
 
@@ -105,14 +106,7 @@ impl Action for Serialize {
             }
         }
 
-        if let Some(prefix) = self.prefix.as_ref() {
-            for tg in loaded.iter_mut() {
-                tg.meta.prefix = Some(prefix.clone());
-            }
-        }
-
         let tgs = loaded;
-
         if let Some(tg_name) = self.typegraph.as_ref() {
             if let Some(tg) = tgs.iter().find(|tg| &tg.name().unwrap() == tg_name) {
                 self.write(&self.to_string(&tg)?).await?;

meta-cli/src/com/server.rs

@@ -41,6 +41,7 @@ async fn config(req: HttpRequest) -> impl Responder {
     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) => {
@@ -50,7 +51,7 @@ async fn config(req: HttpRequest) -> impl Responder {
                     "auth": endpoint.auth
                 },
                 "secrets": secrets,
-                // "prefix": config.prefix,
+                "prefix": prefix,
                 "artifactsConfig": json!({
                     "dir": config.base_dir.display().to_string(),
                     "prismaMigration": {
@@ -67,7 +68,7 @@ async fn config(req: HttpRequest) -> impl Responder {
         None => HttpResponse::Ok()
             .status(StatusCode::INTERNAL_SERVER_ERROR)
             .json(CLIResponseError {
-                error: "Could not get config".to_string(),
+                error: "Could not get config from meta-cli".to_string(),
             }),
     }
 }
@@ -83,7 +84,7 @@ async fn command() -> impl Responder {
         None => HttpResponse::Ok()
             .status(StatusCode::INTERNAL_SERVER_ERROR)
             .json(CLIResponseError {
-                error: "Could not get command".to_string(),
+                error: "Could not get command from meta-cli".to_string(),
             }),
     }
 }

meta-cli/src/com/store.rs

@@ -58,6 +58,7 @@ pub struct ServerStore {
     migration_action: MigrationAction,
     secrets: HashMap<String, String>,
     endpoint: Endpoint,
+    prefix: Option<String>,
     sdk_responses: HashMap<PathBuf, Arc<SDKResponse>>,
 }
 
@@ -126,4 +127,12 @@ impl ServerStore {
     pub fn get_migration_action() -> MigrationAction {
         with_store(|s| s.migration_action.to_owned())
     }
+
+    pub fn set_prefix(prefix: Option<String>) {
+        with_store_mut(|s| s.prefix = prefix)
+    }
+
+    pub fn get_prefix() -> Option<String> {
+        with_store(|s| s.prefix.to_owned())
+    }
 }

typegraph/core/src/typegraph.rs

@@ -216,6 +216,11 @@ pub fn finalize(res_config: Option<ArtifactResolutionConfig>) -> Result<String>
     };
 
     if let Some(config) = res_config {
+        // Typically happens when the cli is used
+        if let Some(prefix) = config.prefix.clone() {
+            tg.meta.prefix = Some(prefix);
+        }
+
         TypegraphPostProcessor::new(config).postprocess(&mut tg)?;
     }
 

typegraph/core/wit/typegraph.wit

@@ -47,6 +47,7 @@ interface core {
 
     record artifact-resolution-config {
         dir: option<string>, // cwd() if none
+        prefix: option<string>, // overrides tg.meta.prefix field if defined
         prisma-migration: migration-config
     }
 

typegraph/node/sdk/src/tg_manage.ts

@@ -26,6 +26,7 @@ type CLIConfigRequest = {
       password: string;
     };
   };
+  prefix?: string;
   secrets: Record<string, string>;
   artifactsConfig: ArtifactResolutionConfig;
 };
@@ -109,14 +110,17 @@ export class Manager {
     await this.#relayResultToCLI(
       "serialize",
       async () => {
-        const json = this.#typegraph.serialize(config.artifactsConfig);
+        const json = this.#typegraph.serialize({
+          ...config.artifactsConfig,
+          prefix: config.prefix,
+        });
         return JSON.parse(json);
       },
     );
   }
 
   async #deploy(
-    { typegate, artifactsConfig, secrets }: CLIConfigRequest,
+    { typegate, artifactsConfig, secrets, prefix }: CLIConfigRequest,
   ): Promise<void> {
     const { endpoint, auth } = typegate;
     if (!auth) {
@@ -129,7 +133,10 @@ export class Manager {
       async () => {
         const { typegate } = await tgDeploy(this.#typegraph, {
           baseUrl: endpoint,
-          artifactsConfig,
+          artifactsConfig: {
+            ...artifactsConfig,
+            prefix,
+          },
           cliVersion: VERSION,
           secrets,
           auth: new BasicAuth(auth.username, auth.password),