feat: more stable run by fixing little bugs + typegraph upgrade (#384)

metatypedev · Aug 3, 2023 · beebd51 · beebd51
1 parent 970a286
commit beebd51
Show file tree

Hide file tree

Showing 47 changed files with 230 additions and 257 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -158,7 +158,8 @@ jobs:
           shared-key: ${{ runner.os }}-rust-${{ hashFiles('**/rust-toolchain.toml') }}-${{ hashFiles('**/Cargo.lock') }}
       - run: |
           # test in native rust, not in wasm for a future rust SDK
-          # cargo test --locked --package typegraph_core
+          # without --tests, the --doc is causing a link error "syntax error in VERSION script"
+          cargo test --locked --package typegraph_core --tests
 
   test-meta-cli:
     needs: changes

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dev/lock.yml b/dev/lock.yml
@@ -33,8 +33,8 @@ dev:
       (ARG DENO_BINDGEN_URL=).*(): DENO_BINDGEN_URL
       (ARG RUST_VERSION=).*(): RUST_VERSION
       (ARG WASMEDGE_VERSION=).*(): WASMEDGE_VERSION
-    typegate/src/typegraph.ts:
-      (export const typegraphVersion = ").*(";): TYPEGRAPH_VERSION
+    typegate/src/typegraph/versions.ts:
+      (const typegraphVersion = ").*(";): TYPEGRAPH_VERSION
     typegraph/python/typegraph/graph/typegraph.py:
       (typegraph_version = ").*("): TYPEGRAPH_VERSION
     typegraph/core/src/typegraph.rs:
@@ -71,7 +71,7 @@ dev:
     WASMTIME_VERSION: 10.0.1
     WASMEDGE_VERSION: 0.12.1
     TYPEGRAPH_VERSION: 0.0.2
-    METATYPE_VERSION: 0.1.12-0+dev
+    METATYPE_VERSION: 0.1.12
     TAGLINE: >-
       Declarative API development platform. Build serverless backends with
       zero-trust and less code, no matter where and how your (legacy) systems

diff --git a/examples/metatype.yaml b/examples/metatype.yaml
diff --git a/examples/templates/new/compose.yml b/examples/templates/new/compose.yml
@@ -1,6 +1,6 @@
 services:
   typegate:
-    image: ghcr.io/metatypedev/typegate:v0.1.12-0+dev
+    image: ghcr.io/metatypedev/typegate:v0.1.12
     platform: linux/amd64
     restart: always
     ports:

diff --git a/examples/templates/new/pyproject.toml b/examples/templates/new/pyproject.toml
@@ -1,13 +1,13 @@
 [tool.poetry]
 name = "example"
-version = "0.1.12-0+dev"
+version = "0.1.12"
 description = ""
 authors = []
 readme = "README.md"
 
 [tool.poetry.dependencies]
 python = ">=3.8,<4.0"
-typegraph = "0.1.12-0+dev"
+typegraph = "0.1.12"
 
 [build-system]
 requires = ["poetry-core"]

diff --git a/libs/common/Cargo.toml b/libs/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "common"
-version = "0.1.12-0+dev"
+version = "0.1.12"
 edition = "2021"
 
 [dependencies]

diff --git a/libs/macros/Cargo.toml b/libs/macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "macros"
-version = "0.1.12-0+dev"
+version = "0.1.12"
 edition = "2021"
 
 [lib]

diff --git a/libs/typescript/Cargo.toml b/libs/typescript/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "typescript"
-version = "0.1.12-0+dev"
+version = "0.1.12"
 edition = "2021"
 
 [dependencies]

diff --git a/libs/xtask/Cargo.toml b/libs/xtask/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xtask"
-version = "0.1.12-0+dev"
+version = "0.1.12"
 edition = "2021"
 
 [dependencies]

diff --git a/meta-cli/Cargo.toml b/meta-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "meta-cli"
-version = "0.1.12-0+dev"
+version = "0.1.12"
 edition = "2021"
 
 description = "Declarative API development platform. Build serverless backends with zero-trust and less code, no matter where and how your (legacy) systems are."

diff --git a/meta-cli/src/cli/deploy.rs b/meta-cli/src/cli/deploy.rs
@@ -190,10 +190,8 @@ impl Deploy<DefaultModeData> {
 
         trace!("Loading typegraphs...");
         for path in paths.into_iter() {
-            info!(
-                "Loading typegraphs from {rel_path:?}.",
-                rel_path = diff_paths(&path, &self.base_dir).unwrap()
-            );
+            let rel_path = diff_paths(&path, &self.base_dir).unwrap();
+            info!("Loading typegraphs from {}.", rel_path.display());
             let tgs =
                 Self::load_typegraphs(&path, &self.base_dir, &self.loader, OnRewrite::Reload).await;
             let tgs = match tgs {
@@ -207,6 +205,11 @@ impl Deploy<DefaultModeData> {
 
             let mut tgs: VecDeque<_> = tgs.into_iter().collect();
 
+            if tgs.is_empty() {
+                warn!("No typegraph found in {}.", rel_path.display());
+                continue;
+            }
+
             while let Some(tg) = tgs.pop_front() {
                 let tg_name = tg.full_name().unwrap().cyan();
                 info!("Pushing typegraph {tg_name}...");

diff --git a/meta-cli/src/cli/serialize.rs b/meta-cli/src/cli/serialize.rs
@@ -81,7 +81,6 @@ impl Action for Serialize {
         };
 
         if paths.is_empty() {
-            warn!("No typegraph definition module found.");
             bail!("No typegraph definition module found.");
         }
 
@@ -90,7 +89,7 @@ impl Action for Serialize {
             match loader.load_file(&path).await {
                 LoaderResult::Loaded(tgs) => {
                     if tgs.is_empty() {
-                        log::warn!("no typegraph");
+                        log::warn!("no typegraph in {path:?}");
                     }
                     for tg in tgs.into_iter() {
                         loaded.push(tg);

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "metatype"
-version = "0.1.12-0+dev"
+version = "0.1.12"
 description = ""
 authors = []
 

diff --git a/typegate/native/Cargo.toml b/typegate/native/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "native"
-version = "0.1.12-0+dev"
+version = "0.1.12"
 edition = "2021"
 
 [lib]