chore: prepare 0.4.6

Cargo.toml

@@ -15,13 +15,13 @@ exclude = [
   "libs/pyrt_wit_wire",
 ]
 [workspace.package] 
-version = "0.4.5"
+version = "0.4.6-0"
 edition = "2021"
 
 [workspace.dependencies]
 # deno = { path =  "../deno/cli"}
-deno = { git = "https://github.com/metatypedev/deno", branch = "v1.43.6-embeddable" }
-deno_core = { version = "=0.280.0" }
+deno = { git = "https://github.com/metatypedev/deno", branch = "v1.45.2-embeddable" }
+deno_core = { version = "=0.293.0" }
 
 # internal crates
 mt_deno = { path = "libs/deno/" }

dev/Dockerfile

@@ -1,6 +1,6 @@
 # disable SHELL cmd down below if switching to non-debug
-ARG RUST_VERSION=1.77.1
-ARG DENO_VERSION=1.43.6
+ARG RUST_VERSION=1.79.0
+ARG DENO_VERSION=1.45.2
 ARG DISTROLESS_TAG=debug-nonroot
 
 #

dev/consts.ts

@@ -1,17 +1,18 @@
 // Copyright Metatype OÜ, licensed under the Elastic License 2.0.
 // SPDX-License-Identifier: Elastic-2.0
 
-export const METATYPE_VERSION = "0.4.5";
-export const PUBLISHED_VERSION = "0.4.4";
+export const METATYPE_VERSION = "0.4.6-0";
+export const PUBLISHED_VERSION = "0.4.5";
 export const GHJK_VERSION = "8d50518";
 export const GHJK_ACTION_VERSION = "318209a9d215f70716a4ac89dbeb9653a2deb8bc";
-export const RUST_VERSION = "1.77.1";
-export const DENO_VERSION = "1.43.6";
+export const RUST_VERSION = "1.79.0";
+export const DENO_VERSION = "1.45.2";
 export const WASMTIME_VERSION = "21.0.0";
 export const WASMTIME_PY_VERSION = "21.0.0";
 export const TYPEGRAPH_VERSION = "0.0.3";
 export const PRISMA_VERSION = "5.6.0";
 export const SDK_PACKAGE_NAME_TS = "@typegraph/sdk";
+export const PYTHON_VERSION = "3.8.18";
 export const TAGLINE =
   `Declarative API development platform. Build backend components with WASM, Typescript and Python, no matter where and how your (legacy) systems are.`;
 
@@ -33,9 +34,6 @@ export const sedLockLines: Record<string, [string | RegExp, string][]> = {
   "typegate/tests/**/*.snap": [
     [/(\s*static\s*MT_VERSION:\s*&str\s*=\s*").+(";)/, METATYPE_VERSION],
   ],
-  "typegate/tests/e2e/upgrade/upgrade_test.ts": [
-    [/(const\s+PUBLISHED_VERSION\s*=\s*").+(";)/, PUBLISHED_VERSION],
-  ],
   "typegraph/python/typegraph/__init__.py": [
     ['(version = ").+(")', METATYPE_VERSION],
   ],
@@ -57,9 +55,7 @@ export const sedLockLines: Record<string, [string | RegExp, string][]> = {
     ['(wasmtime = ").+(")', WASMTIME_VERSION],
     ['(wasmtime-wasi = ").+(")', WASMTIME_VERSION],
   ],
-  "dev/deps.ts": [
-    [/(.*\/metatypedev\/ghjk\/)[^\/]*(\/.*)/, GHJK_VERSION],
-  ],
+  "dev/deps.ts": [[/(.*\/metatypedev\/ghjk\/)[^\/]*(\/.*)/, GHJK_VERSION]],
   "dev/cross.Dockerfile": [["(ARG GHJK_VERSION=).*()", GHJK_VERSION]],
   "dev/Dockerfile": [
     ["(ARG DENO_VERSION=).*()", DENO_VERSION],

dev/deps.ts

@@ -1,17 +1,18 @@
 // Copyright Metatype OÜ, licensed under the Elastic License 2.0.
 // SPDX-License-Identifier: Elastic-2.0
 
-export { file } from "https://raw.github.com/metatypedev/ghjk/8d50518/mod.ts";
-export * from "https://raw.github.com/metatypedev/ghjk/8d50518/mod.ts";
-export * as ports from "https://raw.github.com/metatypedev/ghjk/8d50518/ports/mod.ts";
+export { file } from "https://raw.githubusercontent.com/metatypedev/ghjk/8d50518/mod.ts";
+export * from "https://raw.githubusercontent.com/metatypedev/ghjk/8d50518/mod.ts";
+export * as ports from "https://raw.githubusercontent.com/metatypedev/ghjk/8d50518/ports/mod.ts";
 export {
   std_url,
   zod,
-} from "https://raw.github.com/metatypedev/ghjk/8d50518/deps/common.ts";
+} from "https://raw.githubusercontent.com/metatypedev/ghjk/8d50518/deps/common.ts";
 export {
   copyLock,
   sedLock,
-} from "https://raw.github.com/metatypedev/ghjk/8d50518/std.ts";
+} from "https://raw.githubusercontent.com/metatypedev/ghjk/8d50518/std.ts";
+export { downloadFile } from "https://raw.githubusercontent.com/metatypedev/ghjk/8d50518/utils/mod.ts";
 // export * from "../../ghjk/mod.ts";
 // export * as ports from "../../ghjk/ports/mod.ts";
 // export * as utils from "../../ghjk/utils/mod.ts";

dev/installs.ts

@@ -1,14 +1,15 @@
 // Copyright Metatype OÜ, licensed under the Elastic License 2.0.
 // SPDX-License-Identifier: Elastic-2.0
 
-import { DENO_VERSION } from "./consts.ts";
+import { DENO_VERSION, PYTHON_VERSION, RUST_VERSION } from "./consts.ts";
 import { ports } from "./deps.ts";
 
 export default {
-  python: ports.cpy_bs({ version: "3.8.18", releaseTag: "20240224" }),
+  python: ports.cpy_bs({ version: PYTHON_VERSION, releaseTag: "20240224" }),
   // for use by pipi based ports
   python_latest: ports.cpy_bs({ version: "3.12.2", releaseTag: "20240224" }),
   node: ports.node({ version: "20.8.0" }),
+  rust_stable: ports.rust({ version: RUST_VERSION }),
   rust_nightly: ports.rust({ version: "nightly-2024-05-26" }),
   deno: ports.deno_ghrel({ version: DENO_VERSION }),
 };

dev/tasks-dev.ts

@@ -63,7 +63,7 @@ const tasks: Record<string, DenoTaskDefArgs> = {
             "-f",
             file,
           ])
-        } down --remove-orphans`;
+        } down --remove-orphans --volumes`;
       }
     },
   },

dev/tasks-lock.ts

@@ -43,6 +43,7 @@ const tasks: Record<string, DenoTaskDefArgs> = {
         // we don't use the `generate-lockfile` command because
         // "If the lockfile already exists, it will be rebuilt with the
         // latest available version of every package."
+        // and this breaks stuff
         await $`cargo tree`.stdout("piped");
       }
     },

dev/tasks-test.ts

@@ -8,7 +8,11 @@ const tasks: Record<string, DenoTaskDefArgs> = {
   "test-e2e": {
     inherit: "ci",
     desc: "Shorthand for `dev/test.ts`",
-    fn: ($) => testE2eCli($.argv),
+    fn: async ($) => {
+      if (await testE2eCli($.argv) != 0) {
+        throw new Error("tests failed");
+      }
+    },
   },
   "test-website": {
     inherit: "_ecma",

dev/test.ts

@@ -22,6 +22,7 @@
  * with the -q flag.
  */
 
+import { CommandChild } from "jsr:@david/[email protected]";
 import {
   $,
   ctrlc,
@@ -96,6 +97,7 @@ interface Run {
   promise: Promise<Result>;
   output: ReadableStream<string> | null;
   done: boolean;
+  child: CommandChild;
 }
 
 function applyFilter(files: string[], filter: string | undefined): string[] {
@@ -197,6 +199,7 @@ export async function testE2e(args: {
       promise,
       output,
       done: false,
+      child,
     };
   }
 
@@ -238,8 +241,8 @@ export async function testE2e(args: {
       case 2: {
         console.log(`Killing ${testThreads.length} running tests...`);
         for (const t of testThreads) {
-          if (t.testProcess) {
-            t.testProcess.kill("SIGKILL");
+          if (t.currentRun) {
+            t.currentRun.child.kill("SIGKILL");
           }
         }
         break;
@@ -248,7 +251,6 @@ export async function testE2e(args: {
       case 3:
         console.log("Force exiting...");
         Deno.exit(1);
-        break;
     }
   });
 
@@ -531,7 +533,7 @@ class TestResultConsumer {
 }
 
 class TestThread {
-  currentRun: Run | null;
+  currentRun: Run | null = null;
 
   constructor(
     public threadId: number,

examples/deno.json

@@ -1,6 +1,5 @@
 {
   "imports": {
-    "@typegraph/sdk": "../typegraph/deno/sdk/src",
-    "@typegraph/sdk/": "../typegraph/deno/sdk/src/"
+    "@typegraph/sdk": "../typegraph/deno/sdk/src"
   }
 }