Merge branch 'main' of https://github.com/metatypedev/metatype into MET-430--Upload-protocol-poc--uploading-wasm-file-for-WasmEdgeRuntime-for-single-replica-mode-

Author: destifo

CHANGELOG.md

@@ -8,7 +8,7 @@ members = [
   "typegraph/core", ]
 
 [workspace.package]
-version = "0.3.6-0"
+version = "0.3.7-0"
 edition = "2021"
 
 [workspace.dependencies]

Cargo.lock

@@ -4,7 +4,7 @@
     "description": "VSCode extension for Metatype support",
     "icon": "logo.png",
     "author": "Metatype Team",
-    "version": "0.3.6-0",
+    "version": "0.3.7-0",
     "repository": {
         "type": "git",
         "url": "https://github.com/metatypedev/metatype"

Cargo.toml

@@ -2,7 +2,7 @@
     "name": "typegraph-ts-server",
     "description": "TypeScript language server for TypeGraph",
     "author": "Metatype Team",
-    "version": "0.3.6-0",
+    "version": "0.3.7-0",
     "repository": {
         "type": "git",
         "url": "https://github.com/metatypedev/metatype"

dev-tools/package.json

@@ -2,7 +2,7 @@
     "name": "vscode-metatype-support",
     "description": "VSCode extension for Metatype support",
     "author": "Metatype Team",
-    "version": "0.3.6-0",
+    "version": "0.3.7-0",
     "repository": {
         "type": "git",
         "url": "https://github.com/metatypedev/metatype"

dev-tools/ts-language-server/package.json

@@ -94,8 +94,8 @@ dev:
     WASMEDGE_VERSION: 0.13.5
     TYPEGRAPH_VERSION: 0.0.3
     PRISMA_VERSION: 5.5.2
-    METATYPE_VERSION: 0.3.6-0
-    PUBLISHED_VERSION: 0.3.5
+    METATYPE_VERSION: 0.3.7-0
+    PUBLISHED_VERSION: 0.3.6
     WASM_OPT_VERSION: 0.116.0
     MOLD_VERSION: v2.4.0
     CMAKE_VERSION: 3.28.0-rc6

dev-tools/vscode-metatype-support/package.json

@@ -1,22 +1,24 @@
-import { Policy, t, typegraph } from "npm:@typegraph/[email protected].5/index.js";
-import { PythonRuntime } from "npm:@typegraph/[email protected].5/runtimes/python.js";
-import { DenoRuntime } from "npm:@typegraph/[email protected].5/runtimes/deno.js";
+import { Policy, t, typegraph } from "npm:@typegraph/[email protected].6/index.js";
+import { PythonRuntime } from "npm:@typegraph/[email protected].6/runtimes/python.js";
+import { DenoRuntime } from "npm:@typegraph/[email protected].6/runtimes/deno.js";
 
 await typegraph("example", (g) => {
   const pub = Policy.public();
   const deno = new DenoRuntime();
   const python = new PythonRuntime();
 
   g.expose({
-    add: python.fromLambda(
-      t.struct({ "first": t.float(), "second": t.float() }),
-      t.float(),
-      { code: "lambda x: x['first'] + x['second']" },
-    ).withPolicy(pub),
-    multiply: deno.func(
-      t.struct({ "first": t.float(), "second": t.float() }),
-      t.float(),
-      { code: "({first, second}) => first * second" },
-    ).withPolicy(pub),
+    add: python
+      .fromLambda(
+        t.struct({ first: t.float(), second: t.float() }),
+        t.float(),
+        { code: "lambda x: x['first'] + x['second']" }
+      )
+      .withPolicy(pub),
+    multiply: deno
+      .func(t.struct({ first: t.float(), second: t.float() }), t.float(), {
+        code: "({first, second}) => first * second",
+      })
+      .withPolicy(pub),
   });
 });

dev/lock.yml

@@ -1,6 +1,6 @@
 services:
   typegate:
-    image: ghcr.io/metatypedev/typegate:v0.3.6-0
+    image: ghcr.io/metatypedev/typegate:v0.3.7-0
     restart: always
     ports:
       - "7890:7890"

examples/templates/deno/api/example.ts

@@ -1,6 +1,6 @@
 services:
   typegate:
-    image: ghcr.io/metatypedev/typegate:v0.3.6-0
+    image: ghcr.io/metatypedev/typegate:v0.3.7-0
     restart: always
     ports:
       - "7890:7890"

examples/templates/deno/compose.yml

@@ -6,7 +6,7 @@
     "dev": "MCLI_LOADER_CMD='npm x tsx' meta dev"
   },
   "dependencies": {
-    "@typegraph/sdk": "^0.3.5"
+    "@typegraph/sdk": "^0.3.6"
   },
   "devDependencies": {
     "tsx": "^3.13.0",

examples/templates/node/compose.yml

@@ -1,6 +1,6 @@
 services:
   typegate:
-    image: ghcr.io/metatypedev/typegate:v0.3.6-0
+    image: ghcr.io/metatypedev/typegate:v0.3.7-0
     restart: always
     ports:
       - "7890:7890"

examples/templates/node/package.json

@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "example"
-version = "0.3.6-0"
+version = "0.3.7-0"
 description = ""
 authors = []
 
 [tool.poetry.dependencies]
 python = ">=3.8,<4.0"
-typegraph = "0.3.6-0"
+typegraph = "0.3.7-0"
 
 [build-system]
 requires = ["poetry-core"]

examples/templates/python/compose.yml

@@ -1,6 +1,6 @@
 [package]
 name = "common"
-version = "0.3.6-0"
+version = "0.3.7-0"
 edition = "2021"
 
 [dependencies]

examples/templates/python/pyproject.toml

@@ -116,8 +116,17 @@ pub fn archive_entries_from_bytes(entries: IndexMap<String, Vec<u8>>) -> Result<
 
     tar.mode(tar::HeaderMode::Deterministic);
 
+    let mut entries = entries.clone();
+    entries.sort_keys();
+
     for (path, bytes) in entries.iter() {
+        // https://www.gnu.org/software/tar/manual/html_section/Formats.html
+        // ustar: filesize < 8GiB, filename <= 255
+        // let mut header = Header::new_ustar();
+
+        // gnu: filesize, filename unlimited
         let mut header = Header::new_gnu();
+
         header.set_size(bytes.len() as u64);
         header.set_entry_type(tar::EntryType::Regular);
         header.set_mode(0o666); // rw-rw-rw

libs/common/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "typescript"
-version = "0.3.6-0"
+version = "0.3.7-0"
 edition = "2021"
 
 [dependencies]

libs/common/src/archive.rs

@@ -1,6 +1,6 @@
 [package]
 name = "xtask"
-version = "0.3.6-0"
+version = "0.3.7-0"
 edition = "2021"
 
 [dependencies]

libs/typescript/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "meta-cli"
-version = "0.3.6-0"
+version = "0.3.7-0"
 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."

libs/xtask/Cargo.toml

@@ -4,6 +4,7 @@
 use std::path::PathBuf;
 
 use super::{Action, GenArgs};
+use actix_web::dev::ServerHandle;
 use anyhow::{bail, Result};
 use async_trait::async_trait;
 use clap::{Parser, Subcommand};
@@ -22,10 +23,10 @@ pub enum Commands {
 
 #[async_trait]
 impl Action for Codegen {
-    async fn run(&self, args: GenArgs) -> Result<()> {
+    async fn run(&self, args: GenArgs, server_handle: Option<ServerHandle>) -> Result<()> {
         match &self.command {
             Commands::Deno(deno) => {
-                deno.run(args).await?;
+                deno.run(args, server_handle).await?;
             }
         }
         Ok(())
@@ -44,7 +45,7 @@ pub struct Deno {
 
 #[async_trait]
 impl Action for Deno {
-    async fn run(&self, _args: GenArgs) -> Result<()> {
+    async fn run(&self, _args: GenArgs, _: Option<ServerHandle>) -> Result<()> {
         bail!("codegen is currently disabled")
 
         // let dir = args.dir()?;

meta-cli/Cargo.toml

@@ -1,6 +1,7 @@
 // Copyright Metatype OÜ, licensed under the Mozilla Public License Version 2.0.
 // SPDX-License-Identifier: MPL-2.0
 
+use actix_web::dev::ServerHandle;
 use anyhow::{anyhow, Result};
 use async_trait::async_trait;
 use clap::CommandFactory;
@@ -22,7 +23,7 @@ pub struct Completion {
 
 #[async_trait]
 impl Action for Completion {
-    async fn run(&self, _args: GenArgs) -> Result<()> {
+    async fn run(&self, _args: GenArgs, _: Option<ServerHandle>) -> Result<()> {
         let mut cmd = Args::command();
         let name = cmd.get_name().to_string();
         match self.shell.or_else(Shell::from_env) {

meta-cli/src/cli/codegen.rs

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 use std::path::{Path, PathBuf};
-use std::process::exit;
 use std::sync::{Arc, Mutex};
 
 use super::{Action, CommonArgs, GenArgs};
@@ -17,6 +16,7 @@ use crate::deploy::actors::loader::{
 use crate::deploy::actors::watcher::WatcherActor;
 use crate::deploy::push::pusher::PushResult;
 use actix::prelude::*;
+use actix_web::dev::ServerHandle;
 use anyhow::{bail, Context, Result};
 use async_trait::async_trait;
 use clap::Parser;
@@ -149,7 +149,7 @@ struct CtrlCHandlerData {
 
 #[async_trait]
 impl Action for DeploySubcommand {
-    async fn run(&self, args: GenArgs) -> Result<()> {
+    async fn run(&self, args: GenArgs, server_handle: Option<ServerHandle>) -> Result<()> {
         let deploy = Deploy::new(self, &args).await?;
 
         if !self.options.allow_dirty {
@@ -179,7 +179,8 @@ impl Action for DeploySubcommand {
             // deploy a single file
             let deploy = default_mode::DefaultMode::init(deploy).await?;
             deploy.run().await?;
-            exit(0); // kill the server (TODO: use a global handle maybe?)
+
+            server_handle.unwrap().stop(true).await;
         }
 
         Ok(())

meta-cli/src/cli/completion.rs

@@ -6,6 +6,7 @@ use super::deploy::DeploySubcommand;
 use super::Action;
 use super::CommonArgs;
 use super::GenArgs;
+use actix_web::dev::ServerHandle;
 use anyhow::Result;
 use async_trait::async_trait;
 use clap::Parser;
@@ -28,7 +29,7 @@ pub struct Dev {
 
 #[async_trait]
 impl Action for Dev {
-    async fn run(&self, args: GenArgs) -> Result<()> {
+    async fn run(&self, args: GenArgs, server_handle: Option<ServerHandle>) -> Result<()> {
         log::info!("'meta dev' subcommand is an alias to 'meta deploy --codegen --allow-dirty --watch --create-migration'");
         let options = DeployOptions {
             codegen: true,
@@ -46,6 +47,6 @@ impl Action for Dev {
             None,
             self.max_parallel_loads,
         );
-        deploy.run(args).await
+        deploy.run(args, server_handle).await
     }
 }