test(e2e): make sure test does not depend on the version + debug collected files on ci

Author: michael-0acf4

meta-cli/src/com/server.rs

@@ -90,7 +90,7 @@ async fn config(req: HttpRequest) -> impl Responder {
                     // thus `dir` must be explicitly set to the canonical typegraph's `workdir`
                     "dir": artefact_base_dir,
                     "prismaMigration": {
-                        // only the cli is aware of the convention migrationDir := tg_workdir + config_folder + tg_name
+                        // only the cli is aware of the convention migrationDir := tg_workdir + folder from config + tg_name
                         "migrationDir": config.prisma_migrations_dir_rel(&parsed.typegraph),
                         "globalAction": migration_action_glob,
                         "runtimeAction": migration_action_per_rt
@@ -153,7 +153,7 @@ pub async fn spawn_server() -> std::io::Result<()> {
             .service(config)
             .service(command)
             .service(response)
-            .app_data(PayloadConfig::new(1000000 * 100))
+            .app_data(PayloadConfig::new(1000000 * 100)) // 100 mb
     })
     .listen(tcp_listener)?
     .run()

meta-cli/src/com/store.rs

@@ -140,9 +140,9 @@ impl ServerStore {
         with_store_mut(|s| {
             let mut items = vec![];
             if let Some(actions) = s.migration_action.get(&tg_path) {
-                // remove previous rt action if any
                 items = actions.as_ref().clone();
             }
+            // remove previous rt action if any
             items.retain(|v| v.runtime_name.ne(&rt_migration.runtime_name));
             items.push(rt_migration);
             s.migration_action.insert(tg_path, items.into());

typegate/tests/e2e/templates/templates_test.ts

@@ -6,15 +6,12 @@ import { newTempDir, workspaceDir } from "test-utils/dir.ts";
 import { exists, expandGlob } from "std/fs/mod.ts";
 import { join } from "std/path/mod.ts";
 import { assert } from "std/assert/mod.ts";
-import { get_version } from "native";
 import { projectDir } from "../../../../dev/utils.ts";
 // import { shell } from "test-utils/shell.ts";
 
 const modifiers: Record<string, (dir: string) => Promise<void> | void> = {
   "python": () => {},
   "deno": async (dir: string) => {
-    const version = await get_version();
-    console.log(version);
     for await (const f of expandGlob("**/*.ts", { root: dir })) {
       // FIXME: deno is unable to map the types from .d.ts files when used locally
       const data = (await Deno.readTextFile(f.path)).replace(
@@ -23,7 +20,7 @@ const modifiers: Record<string, (dir: string) => Promise<void> | void> = {
       );
       const level = f.path.replace(projectDir, "").split("/").length - 2;
       const newData = data.replaceAll(
-        `npm:@typegraph/sdk@${version}`,
+        /npm:@typegraph\/sdk@[0-9]+\.[0-9]+\.[0-9]+/g,
         `${Array(level).fill("..").join("/")}/typegraph/node/sdk/dist`,
       );
 

typegraph/core/src/utils/fs_host.rs

@@ -10,7 +10,7 @@ use indexmap::IndexMap;
 
 use crate::{
     global_store::Store,
-    wit::metatype::typegraph::host::{expand_glob, get_cwd, read_file, write_file},
+    wit::metatype::typegraph::host::{eprint, expand_glob, get_cwd, read_file, write_file},
 };
 
 pub fn read_text_file<P: Into<String>>(path: P) -> Result<String, String> {
@@ -50,6 +50,10 @@ pub fn common_prefix_paths(paths: &[PathBuf]) -> Option<PathBuf> {
 }
 
 pub fn relativize_paths(paths: &[PathBuf]) -> Result<Vec<PathBuf>, String> {
+    if paths.is_empty() {
+        return Ok(vec![]);
+    }
+
     if let Some(common_dir) = common_prefix_paths(paths) {
         let ret = paths
             .iter()
@@ -62,10 +66,6 @@ pub fn relativize_paths(paths: &[PathBuf]) -> Result<Vec<PathBuf>, String> {
         return Ok(ret);
     }
 
-    if paths.is_empty() {
-        return Ok(vec![]);
-    }
-
     Err("Cannot relativize path list if one item is already relative".to_string())
 }
 
@@ -74,14 +74,14 @@ pub fn compress<P: Into<String>>(path: P, exclude: Option<Vec<String>>) -> Resul
     let exclude = exclude.unwrap_or_default();
     let paths = expand_glob(&path.into(), &exclude)?;
     let mut entries = IndexMap::new();
-    // eprint("Preparing tarball");
+    eprint("Preparing tarball");
 
     let abs_paths = paths.iter().map(PathBuf::from).collect::<Vec<PathBuf>>();
     let rel_paths = relativize_paths(&abs_paths)?;
 
     for (i, abs_path) in abs_paths.iter().enumerate() {
         let rel_path_str = rel_paths[i].to_string_lossy();
-        // eprint(&format!(" ++ {}", rel_path_str.clone()));
+        eprint(&format!(" ++ {}", rel_path_str.clone()));
         // Note: tarball path should be relative
         // Note: Strip against workdir does not work when the sdk is spawn from another process
         entries.insert(rel_path_str.into(), read_file(&abs_path.to_string_lossy())?);

typegraph/core/src/utils/postprocess/prisma_rt.rs

@@ -64,8 +64,8 @@ impl PrismaProcessor {
         Ok(path)
     }
 
-    /// Get migration action from runtime_name (usually set from the cli)
-    /// If nothing is found, find the global action config (set initially)
+    /// Find the appropriate migration action (usually set from the cli)
+    /// If nothing is found, use the global action config (set initially)
     pub fn get_action_by_rt_name(&self, name: &str) -> MigrationAction {
         if let Some(actions) = self.config.runtime_actions.clone() {
             if let Some(action) = actions.iter().find(|(rt, _)| rt.eq(name)) {