chore: release 0.1.10 (#347)

metatypedev · Jun 28, 2023 · 93a31c6 · 93a31c6
1 parent 43829b7
commit 93a31c6
Show file tree

Hide file tree

Showing 34 changed files with 129 additions and 62 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,7 +12,7 @@ env:
   PYTHON_VERSION: "3.8"
   PROTOC_VERSION: "3.x"
   POETRY_VERSION: "1.4.1"
-  DENO_BINDGEN_URL: https://github.com/metatypedev/deno_bindgen/raw/main/cli.ts
+  DENO_BINDGEN_URL: https://deno.land/x/deno_bindgen@0.8.1/cli.ts
   DENO_VERSION: "1.34.3"
   PNPM_VERSION: "8.6.0"
   NODE_VERSION: "19.8.1"

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dev/Dockerfile b/dev/Dockerfile
@@ -24,7 +24,7 @@ FROM denoland/deno:bin-${DENO_VERSION} AS deno-bin
 
 FROM base AS builder
 
-ARG DENO_BINDGEN_URL=https://github.com/metatypedev/deno_bindgen/raw/main/cli.ts
+ARG DENO_BINDGEN_URL=https://deno.land/x/deno_bindgen@0.8.1/cli.ts
 
 ENV DENO_DIR /deno-dir/
 ENV DENO_INSTALL /root/.deno

diff --git a/dev/lock.yml b/dev/lock.yml
@@ -23,7 +23,7 @@ dev:
       (description = ").+("): TAGLINE
     typegraph/python_next/pyproject.toml:
       (description = ").+("): TAGLINE
-    '**/*/Cargo.toml':
+    '**/Cargo.toml':
       (version = ").+("): METATYPE_VERSION
       (description = ").+("): TAGLINE
     dev/Dockerfile:
@@ -36,13 +36,14 @@ dev:
       (typegraph_version = ").*("): TYPEGRAPH_VERSION
     whiz.yaml:
       '(  TYPEGRAPH_VERSION: ").+(")': TYPEGRAPH_VERSION
+      '(    DENO_BINDGEN_URL: ").+(")': DENO_BINDGEN_URL
       '(    WASM_TOOLS_VERSION: ").+(")': WASM_TOOLS_VERSION
       '(    JCO_VERSION: ").+(")': JCO_VERSION
     website/docusaurus.config.js:
       '(  tagline: ").+(",)': TAGLINE
     examples/**/compose.yml:
       '(    image: ghcr.io/metatypedev/typegate:v).+()': METATYPE_VERSION
-    '**/*/pyproject.toml':
+    '**/pyproject.toml':
       (version = ").+("): METATYPE_VERSION
     examples/**/pyproject.toml:
       (typegraph = ").+("): METATYPE_VERSION
@@ -51,14 +52,14 @@ dev:
     POETRY_VERSION: 1.4.1
     PROTOC_VERSION: 3.x
     RUST_VERSION: 1.70.0
-    DENO_BINDGEN_URL: 'https://github.com/metatypedev/deno_bindgen/raw/main/cli.ts'
+    DENO_BINDGEN_URL: 'https://deno.land/x/deno_bindgen@0.8.1/cli.ts'
     DENO_VERSION: 1.34.3
     NODE_VERSION: 19.8.1
     PNPM_VERSION: 8.6.0
     WASM_TOOLS_VERSION: 1.0.33
     JCO_VERSION: 0.7.0
     TYPEGRAPH_VERSION: 0.0.1
-    METATYPE_VERSION: 0.1.10-dev.0
+    METATYPE_VERSION: 0.1.10
     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/dev/mod.ts b/dev/mod.ts
@@ -15,7 +15,7 @@ export {
 export { groupBy } from "https://deno.land/[email protected]/collections/group_by.ts";
 export type { WalkEntry } from "https://deno.land/[email protected]/fs/mod.ts";
 export * as yaml from "https://deno.land/[email protected]/yaml/mod.ts";
-export * as semver from "https://deno.land/x/[email protected]/mod.ts";
+export * as semver from "https://deno.land/[email protected]/semver/mod.ts";
 export { udd } from "https://deno.land/x/[email protected]/mod.ts";
 
 import {

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.10-dev.0
+    image: ghcr.io/metatypedev/typegate:v0.1.10
     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.10-dev.0"
+version = "0.1.10"
 description = ""
 authors = []
 readme = "README.md"
 
 [tool.poetry.dependencies]
 python = ">=3.8,<4.0"
-typegraph = "0.1.10-dev.0"
+typegraph = "0.1.10"
 
 [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.10-dev.0"
+version = "0.1.10"
 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.10-dev.0"
+version = "0.1.10"
 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.10-dev.0"
+version = "0.1.10"
 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.10-dev.0"
+version = "0.1.10"
 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.10-dev.0"
+version = "0.1.10"
 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/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,13 +1,14 @@
 [tool.poetry]
 name = "metatype"
-version = "0.1.10-dev.0"
+version = "0.1.10"
 description = ""
 authors = []
 
 [tool.poetry.dependencies]
 python = ">=3.8,<4.0"
 typegraph = { path = "typegraph/python", develop = true }
 typegraph-std = "^0.0.1"
+wasmtime = "^9.0.0"
 
 [tool.poetry.group.dev.dependencies]
 pydoc-markdown = { git = "https://github.com/metatypedev/pydoc-markdown", branch = "develop" }

diff --git a/typegate/deno.json b/typegate/deno.json
@@ -27,7 +27,7 @@
     "monads": "https://deno.land/x/[email protected]/mod.ts",
     "jwt": "https://deno.land/x/[email protected]/mod.ts",
     "redis": "https://deno.land/x/[email protected]/mod.ts",
-    "oauth2_client": "https://raw.githubusercontent.com/zifeo/deno-oauth2-client/master/mod.ts",
+    "oauth2_client": "https://deno.land/x/[email protected]/mod.ts",
     "test/mock_fetch": "https://deno.land/x/[email protected]/mod.ts",
     "json_schema_typed": "https://deno.land/x/[email protected]/draft_latest.ts",
     "url_join": "https://deno.land/x/[email protected]/mod.ts",

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

diff --git a/typegate/src/engine.ts b/typegate/src/engine.ts
@@ -437,8 +437,8 @@ export class Engine {
         } else {
           auth = this.tg.auths.get(provider as string);
         }
-      } catch {
-        logger.warning("no malformed jwt");
+      } catch (e) {
+        logger.warning(`malformed jwt: ${e}`);
       }
     }
 

diff --git a/typegate/src/runtimes/typegate.ts b/typegate/src/runtimes/typegate.ts
@@ -11,6 +11,7 @@ import { typegraph_validate } from "native";
 import { ensure } from "../utils.ts";
 import { getLogger } from "../log.ts";
 import config from "../config.ts";
+import * as semver from "std/semver/mod.ts";
 
 const logger = getLogger(import.meta);
 
@@ -102,9 +103,9 @@ export class TypeGateRuntime extends Runtime {
   };
 
   addTypegraph: Resolver = async ({ fromString, secrets, cliVersion }) => {
-    if (cliVersion !== config.version) {
+    if (!semver.gte(semver.parse(cliVersion), semver.parse(config.version))) {
       throw new Error(
-        `Meta CLI version ${cliVersion} must match typegate version ${config.version} (until the releases are stable)`,
+        `Meta CLI version ${cliVersion} must be greater than typegate version ${config.version} (until the releases are stable)`,
       );
     }
     const json = await typegraph_validate({ json: fromString }).then((res) => {

diff --git a/typegate/src/typegraph/versions.ts b/typegate/src/typegraph/versions.ts
@@ -20,7 +20,9 @@ export function upgradeTypegraph(typegraph: TypeGraphDS): TypeGraphDS {
   const { meta } = typegraph;
 
   let currentVersion = meta.version;
-  while (semver.neq(typegraphVersion, currentVersion)) {
+  while (
+    semver.neq(semver.parse(typegraphVersion), semver.parse(currentVersion))
+  ) {
     const migration = typegraphChangelog[currentVersion];
     if (!migration) {
       throw Error(

diff --git a/typegate/src/typegraphs/introspection.json b/typegate/src/typegraphs/introspection.json
@@ -972,5 +972,6 @@
     "auths": [],
     "rate": null,
     "version": "0.0.1"
-  }
+  },
+  "prefix": null
 }
diff --git a/typegate/src/typegraphs/prisma_migration.json b/typegate/src/typegraphs/prisma_migration.json
@@ -562,5 +562,6 @@
       "local_excess": 5
     },
     "version": "0.0.1"
-  }
+  },
+  "prefix": null
 }
diff --git a/typegate/src/typegraphs/typegate.json b/typegate/src/typegraphs/typegate.json
@@ -498,5 +498,6 @@
       "local_excess": 5
     },
     "version": "0.0.1"
-  }
+  },
+  "prefix": null
 }
diff --git a/typegate/tests/runtimes/prisma/mixed_runtime.py b/typegate/tests/runtimes/prisma/mixed_runtime.py
@@ -5,7 +5,7 @@
 
 with TypeGraph("prisma") as g:
     db = PrismaRuntime("prisma", "POSTGRES")
-    gql_1 = GraphQLRuntime("https://graphqlzero.almansi.me/api")
+    gql_1 = GraphQLRuntime("http://mocked/api")
     rand = RandomRuntime(seed=1)
 
     public = policies.public()
@@ -15,12 +15,14 @@
             "title": t.string(),
         },
     ).named("Post")
+
     user = t.struct(
         {
             "name": t.string().config(gen="name"),
             "age": t.integer().config(gen="age", type="adult"),
         }
     ).named("Album")
+
     record = t.struct(
         {
             "id": t.integer().as_id.config("auto"),