Merge branch 'main' into mog/showcase

Author: mogery

cloudflare/Cargo.lock

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "deploy": "npx wrangler deploy --minify",
-    "publish": "npx wrangler publish --minify",
+    "dev-debug": "npx wrangler dev --port 19194 --env debug",
     "dev": "npx wrangler dev --port 19194",
     "test": "cargo install -q worker-build && worker-build && vitest --run"
   },

cloudflare/package-lock.json

@@ -1,4 +1,3 @@
-
 name = "tc-worker"
 main = "build/worker/shim.mjs"
 compatibility_date = "2023-03-22"
@@ -16,3 +15,14 @@ BUCKET = "MY_R2"
 binding = 'MY_R2'               # this binding/name is to be used in code
 bucket_name = 'configs'
 preview_bucket_name = 'configs'
+
+[env.debug.build]
+command = "cargo install -q worker-build && worker-build"
+
+[env.debug.vars]
+BUCKET = "MY_R2"
+
+[[env.debug.r2_buckets]]
+binding = 'MY_R2'               # this binding/name is to be used in code
+bucket_name = 'configs'
+preview_bucket_name = 'configs'

cloudflare/package.json

@@ -11,7 +11,7 @@ use crate::config::{Config, Field, GraphQLOperationType, Union};
 use crate::directive::DirectiveCodec;
 use crate::lambda::{Expression, Lambda};
 use crate::try_fold::TryFold;
-use crate::valid::Valid;
+use crate::valid::{Valid, Validator};
 
 pub fn to_scalar_type_definition(name: &str) -> Valid<Definition, String> {
     Valid::succeed(Definition::ScalarTypeDefinition(ScalarTypeDefinition {

cloudflare/wrangler.toml

@@ -7,7 +7,7 @@ use crate::config::{Arg, Batch, Config, ConfigSet, Field};
 use crate::json::JsonSchema;
 use crate::lambda::{Expression, IO};
 use crate::try_fold::TryFold;
-use crate::valid::{Valid, ValidationError};
+use crate::valid::{Valid, ValidationError, Validator};
 
 pub fn config_blueprint<'a>() -> TryFold<'a, ConfigSet, Blueprint, String> {
     let server = TryFoldConfig::<Blueprint>::new(|config_set, blueprint| {

src/blueprint/definitions.rs

@@ -1,7 +1,7 @@
 use super::{is_scalar, to_type, FieldDefinition, Type};
 use crate::config::{self, Config};
 use crate::lambda::{Expression, IO};
-use crate::valid::Valid;
+use crate::valid::{Valid, Validator};
 
 struct MustachePartsValidator<'a> {
     type_of: &'a config::Type,

src/blueprint/from_config.rs

@@ -3,7 +3,7 @@ use std::fmt::Write;
 use async_graphql::dynamic::Schema;
 
 use super::{Blueprint, SchemaModifiers};
-use crate::valid::{Cause, Valid};
+use crate::valid::{Cause, Valid, Validator};
 
 #[derive(Debug)]
 pub struct OperationQuery {

src/blueprint/mustache.rs

@@ -6,7 +6,7 @@ use crate::config::Field;
 use crate::lambda::Expression;
 use crate::lambda::Expression::Literal;
 use crate::try_fold::TryFold;
-use crate::valid::Valid;
+use crate::valid::{Valid, Validator};
 
 fn validate_data_with_schema(
     config: &config::Config,

src/blueprint/operation.rs

@@ -3,7 +3,7 @@ use crate::config;
 use crate::config::{ExprBody, Field, If};
 use crate::lambda::{Expression, List, Logic, Math, Relation};
 use crate::try_fold::TryFold;
-use crate::valid::Valid;
+use crate::valid::{Valid, Validator};
 
 struct CompilationContext<'a> {
     config_field: &'a config::Field,
@@ -78,9 +78,9 @@ fn compile(ctx: &CompilationContext, expr: ExprBody) -> Valid<Expression, String
         ExprBody::If(If { ref cond, on_true: ref then, on_false: ref els }) => {
             compile(ctx, *cond.clone())
                 .map(Box::new)
-                .zip(compile(ctx, *then.clone()).map(Box::new))
-                .zip(compile(ctx, *els.clone()).map(Box::new))
-                .map(|((cond, then), els)| {
+                .fuse(compile(ctx, *then.clone()).map(Box::new))
+                .fuse(compile(ctx, *els.clone()).map(Box::new))
+                .map(|(cond, then, els)| {
                     Expression::Logic(Logic::If { cond, then, els }).parallel_when(expr.has_io())
                 })
         }
@@ -181,6 +181,7 @@ mod tests {
     use crate::config::{ConfigSet, Expr, Field, GraphQLOperationType};
     use crate::http::RequestContext;
     use crate::lambda::{Concurrent, Eval, EvaluationContext, ResolverContextLike};
+    use crate::valid::Validator;
 
     #[derive(Default)]
     struct Context<'a> {