feat: add prefix to deploy target (#298)

* feat: add prefix to deploy target * chore: prepare release 0.1.7 * chore: update pre-commit
metatypedev · May 2, 2023 · 852feba · 852feba
1 parent 2a9ad28
commit 852feba
Show file tree

Hide file tree

Showing 31 changed files with 125 additions and 68 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,7 +6,7 @@ on:
 env:
   PYTHON_VERSION: "3.8"
   POETRY_VERSION: "1.4.1"
-  DENO_VERSION: "1.32.5"
+  DENO_VERSION: "1.33.1"
 
 jobs:
   check-bump:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ env:
   PROTOC_VERSION: "3.x"
   POETRY_VERSION: "1.4.1"
   DENO_BINDGEN_URL: https://github.com/metatypedev/deno_bindgen/raw/main/cli.ts
-  DENO_VERSION: "1.32.5"
+  DENO_VERSION: "1.33.1"
   PNPM_VERSION: "8.1.0"
   NODE_VERSION: "19.8.1"
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -11,19 +11,18 @@ repos:
       - id: check-case-conflict
       - id: check-executables-have-shebangs
       - id: check-merge-conflict
-      - id: check-symlinks
       - id: end-of-file-fixer
         exclude: (typegate/deno.lock|.*\.snap$)
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: "v0.0.261"
+    rev: "v0.0.263"
     hooks:
       - id: ruff
   - repo: https://github.com/psf/black
     rev: 23.3.0
     hooks:
       - id: black
   - repo: https://github.com/commitizen-tools/commitizen
-    rev: v2.42.1
+    rev: 3.2.0
     hooks:
       - id: commitizen
         stages: [commit-msg]

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dev/Dockerfile b/dev/Dockerfile
@@ -1,5 +1,5 @@
 ARG RUST_VERSION=1.69.0
-ARG DENO_VERSION=1.32.5
+ARG DENO_VERSION=1.33.1
 ARG DISTROLESS_TAG=nonroot
 
 FROM rust:${RUST_VERSION} AS base

diff --git a/dev/lock.yml b/dev/lock.yml
@@ -45,11 +45,11 @@ dev:
     PROTOC_VERSION: 3.x
     RUST_VERSION: 1.69.0
     DENO_BINDGEN_URL: 'https://github.com/metatypedev/deno_bindgen/raw/main/cli.ts'
-    DENO_VERSION: 1.32.5
+    DENO_VERSION: 1.33.1
     NODE_VERSION: 19.8.1
     PNPM_VERSION: 8.1.0
     TYPEGRAPH_VERSION: 0.0.1
-    METATYPE_VERSION: 0.1.6
+    METATYPE_VERSION: 0.1.7
     TAGLINE: >-
       Compose your data, anywhere, and build iterative API blocks with
       zero-trust and serverless deployment, no matter where and how your

diff --git a/dev/mod.ts b/dev/mod.ts
@@ -29,6 +29,7 @@ export async function run(
   cwd: string = Deno.cwd(),
   env: Record<string, string> = Deno.env.toObject(),
 ) {
+  // deno-lint-ignore no-deprecated-deno-api
   const p = Deno.run({
     cmd,
     cwd: cwd,
@@ -43,6 +44,7 @@ export async function runOrExit(
   cwd: string = Deno.cwd(),
   env: Record<string, string> = Deno.env.toObject(),
 ) {
+  // deno-lint-ignore no-deprecated-deno-api
   const p = Deno.run({
     cmd,
     cwd: cwd,

diff --git a/dev/tree-view.ts b/dev/tree-view.ts
@@ -29,7 +29,7 @@ if (files.length === 0) {
 if (files.length > 1) {
   throw new Error("Cannot accept more than one file");
 }
-
+// deno-lint-ignore no-deprecated-deno-api
 const process = Deno.run({
   cmd: ["cargo", "run", "-p", "meta-cli", "--", "serialize", "-f", files[0]],
   stdout: "piped",

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.6
+    image: ghcr.io/metatypedev/typegate:v0.1.7
     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.6"
+version = "0.1.7"
 description = ""
 authors = []
 readme = "README.md"
 
 [tool.poetry.dependencies]
 python = ">=3.8,<4.0"
-typegraph = "0.1.6"
+typegraph = "0.1.7"
 
 [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.6"
+version = "0.1.7"
 edition = "2021"
 
 [dependencies]

diff --git a/libs/common/src/typegraph/mod.rs b/libs/common/src/typegraph/mod.rs
@@ -17,7 +17,7 @@ use serde_json::Value;
 use serde_with::skip_serializing_none;
 
 #[cfg_attr(feature = "codegen", derive(JsonSchema))]
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct Typegraph {
     #[serde(rename = "$id")]
     pub id: String,
@@ -33,7 +33,7 @@ pub struct Typegraph {
 }
 
 #[cfg_attr(feature = "codegen", derive(JsonSchema))]
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct Cors {
     pub allow_origin: Vec<String>,
     pub allow_headers: Vec<String>,
@@ -45,7 +45,7 @@ pub struct Cors {
 }
 
 #[cfg_attr(feature = "codegen", derive(JsonSchema))]
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 #[serde(rename_all = "lowercase")]
 pub enum AuthProtocol {
     OAuth2,
@@ -54,15 +54,15 @@ pub enum AuthProtocol {
 }
 
 #[cfg_attr(feature = "codegen", derive(JsonSchema))]
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct Auth {
     pub name: String,
     pub protocol: AuthProtocol,
     pub auth_data: IndexMap<String, Value>,
 }
 
 #[cfg_attr(feature = "codegen", derive(JsonSchema))]
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct Rate {
     pub window_limit: u32,
     pub window_sec: u32,
@@ -72,7 +72,7 @@ pub struct Rate {
 }
 
 #[cfg_attr(feature = "codegen", derive(JsonSchema))]
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct TypeMeta {
     pub secrets: Vec<String>,
     pub cors: Cors,
@@ -109,22 +109,22 @@ pub struct Materializer {
 }
 
 #[cfg_attr(feature = "codegen", derive(JsonSchema))]
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct TGRuntime {
     pub name: String,
     pub data: IndexMap<String, Value>,
 }
 
 #[cfg_attr(feature = "codegen", derive(JsonSchema))]
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct Policy {
     pub name: String,
     pub materializer: u32,
 }
 
 #[cfg_attr(feature = "codegen", derive(JsonSchema))]
 #[skip_serializing_none]
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct PolicyIndicesByEffect {
     pub none: Option<u32>,
     pub create: Option<u32>,
@@ -135,7 +135,7 @@ pub struct PolicyIndicesByEffect {
 
 #[cfg_attr(feature = "codegen", derive(JsonSchema))]
 #[skip_serializing_none]
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 #[serde(untagged)]
 pub enum PolicyIndices {
     Policy(u32),
@@ -144,12 +144,31 @@ pub enum PolicyIndices {
 
 impl Typegraph {
     pub fn name(&self) -> Result<String> {
-        let root_type = &self.types[0];
-        match root_type {
+        match &self.types[0] {
             TypeNode::Object { base, .. } => Ok(base.title.clone()),
             _ => bail!("invalid variant for root type"),
         }
     }
+
+    pub fn with_prefix(&self, prefix: &String) -> Result<Self> {
+        match &self.types[0] {
+            TypeNode::Object { base, data } => {
+                let new_type = TypeNode::Object {
+                    base: TypeNodeBase {
+                        title: format!("{}{}", prefix, base.title),
+                        ..base.clone()
+                    },
+                    data: data.clone(),
+                };
+                let tg = Typegraph {
+                    types: vec![new_type],
+                    ..self.clone()
+                };
+                Ok(tg)
+            }
+            _ => bail!("invalid variant for root type"),
+        }
+    }
 }
 
 impl TypeNode {
@@ -163,19 +182,19 @@ impl TypeNode {
 }
 
 #[cfg_attr(feature = "codegen", derive(JsonSchema))]
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct FunctionMatData {
     pub script: String,
 }
 
 #[cfg_attr(feature = "codegen", derive(JsonSchema))]
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct ModuleMatData {
     pub code: String,
 }
 
 #[cfg_attr(feature = "codegen", derive(JsonSchema))]
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct MigrationOptions {
     pub migration_files: Option<String>,
     // enable migration creation
@@ -187,7 +206,7 @@ pub struct MigrationOptions {
 
 #[cfg_attr(feature = "codegen", derive(JsonSchema))]
 #[skip_serializing_none]
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct PrismaRuntimeData {
     pub name: String,
     pub datamodel: String,