Introduce primitive type Bytes in ws language

examples/maven-spring-compile/src/main/java/community/flock/wirespec/example/maven/custom/app/user/LiveUserAdapter.java

@@ -7,6 +7,7 @@
 import community.flock.wirespec.generated.java.GetUserByNameEndpoint;
 import community.flock.wirespec.generated.java.GetUsersEndpoint;
 import community.flock.wirespec.generated.java.PostUserEndpoint;
+import community.flock.wirespec.generated.java.UploadImageEndpoint;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -59,6 +60,15 @@ public User deleteUserByName(final String name) {
         };
     }
 
+    @Override
+    public void uploadImage(String name, byte[] bytes) {
+        var res = complete(client.uploadImage(new UploadImageEndpoint.Request(name, bytes)));
+        switch (res) {
+            case UploadImageEndpoint.Response201 ignored -> {}
+            case UploadImageEndpoint.Response404 ignored -> throw new NotFound.User();
+        };
+    }
+
     private <T> T complete(final CompletableFuture<T> future) {
         try {
             return future.get(10L, SECONDS);

examples/maven-spring-compile/src/main/java/community/flock/wirespec/example/maven/custom/app/user/LiveUserClient.java

@@ -6,6 +6,7 @@
 import community.flock.wirespec.generated.java.GetUserByNameEndpoint;
 import community.flock.wirespec.generated.java.GetUsersEndpoint;
 import community.flock.wirespec.generated.java.PostUserEndpoint;
+import community.flock.wirespec.generated.java.UploadImageEndpoint;
 import community.flock.wirespec.java.Wirespec;
 import org.springframework.stereotype.Component;
 
@@ -19,13 +20,15 @@ public class LiveUserClient implements UserClient {
     private final Wirespec.ClientEdge<GetUserByNameEndpoint.Request, GetUserByNameEndpoint.Response<?>> getUserByName;
     private final Wirespec.ClientEdge<PostUserEndpoint.Request, PostUserEndpoint.Response<?>> postUser;
     private final Wirespec.ClientEdge<DeleteUserByNameEndpoint.Request, DeleteUserByNameEndpoint.Response<?>> deleteUserByName;
+    private final Wirespec.ClientEdge<UploadImageEndpoint.Request, UploadImageEndpoint.Response<?>> uploadImage;
 
     public LiveUserClient(final WirespecTransporter transporter,final  WirespecSerializer serializer) {
         this.transporter = transporter;
         this.getUsers = new GetUsersEndpoint.Handler.Handlers().getClient(serializer);
         this.getUserByName = new GetUserByNameEndpoint.Handler.Handlers().getClient(serializer);
         this.postUser = new PostUserEndpoint.Handler.Handlers().getClient(serializer);
         this.deleteUserByName = new DeleteUserByNameEndpoint.Handler.Handlers().getClient(serializer);
+        this.uploadImage = new UploadImageEndpoint.Handler.Handlers().getClient(serializer);
     }
 
     @Override
@@ -51,4 +54,10 @@ public CompletableFuture<DeleteUserByNameEndpoint.Response<?>> deleteUserByName(
         return transporter.transport(deleteUserByName.to(request))
                 .thenApplyAsync(deleteUserByName::from);
     }
+
+    @Override
+    public CompletableFuture<UploadImageEndpoint.Response<?>> uploadImage(UploadImageEndpoint.Request request) {
+        return transporter.transport(uploadImage.to(request))
+                .thenApplyAsync(uploadImage::from);
+    }
 }

examples/maven-spring-compile/src/main/java/community/flock/wirespec/example/maven/custom/app/user/UserAdapter.java

@@ -14,4 +14,6 @@ interface Module {
     User saveUser(final User user);
 
     User deleteUserByName(final String name);
+
+    void uploadImage(final String name, byte[] bytes);
 }

examples/maven-spring-compile/src/main/java/community/flock/wirespec/example/maven/custom/app/user/UserClient.java

@@ -4,11 +4,13 @@
 import community.flock.wirespec.generated.java.GetUserByNameEndpoint;
 import community.flock.wirespec.generated.java.GetUsersEndpoint;
 import community.flock.wirespec.generated.java.PostUserEndpoint;
+import community.flock.wirespec.generated.java.UploadImageEndpoint;
 
 public interface UserClient extends
         GetUsersEndpoint.Handler,
         GetUserByNameEndpoint.Handler,
         PostUserEndpoint.Handler,
-        DeleteUserByNameEndpoint.Handler {
+        DeleteUserByNameEndpoint.Handler,
+        UploadImageEndpoint.Handler {
     String version = "1.0.0";
 }

examples/maven-spring-compile/src/main/java/community/flock/wirespec/example/maven/custom/app/user/UserContext.java

@@ -22,5 +22,10 @@ public static User saveUser(final UserContext ctx, final User user) {
         public static User deleteUserByName(final UserContext ctx, final String name) {
             return ctx.userAdapter().deleteUserByName(name);
         }
+
+        public static void uploadImageByName(final UserContext ctx, final String name, final byte[] bytes) {
+            ctx.userAdapter().uploadImage(name, bytes);
+
+        }
     }
 }

examples/maven-spring-compile/src/main/wirespec/users.ws

@@ -22,3 +22,8 @@ endpoint DeleteUserByName DELETE /api/users/{name: String} -> {
     200 -> UserDto
     404 -> Unit
 }
+
+endpoint UploadImage POST Bytes /api/users/{name: String}/image -> {
+    201 -> Unit
+    404 -> Unit
+}

examples/maven-spring-compile/src/test/java/community/flock/wirespec/example/maven/custom/app/user/TestUserClient.java

@@ -4,9 +4,12 @@
 import community.flock.wirespec.generated.java.GetUserByNameEndpoint;
 import community.flock.wirespec.generated.java.GetUsersEndpoint;
 import community.flock.wirespec.generated.java.PostUserEndpoint;
+import community.flock.wirespec.generated.java.UploadImageEndpoint;
 import community.flock.wirespec.generated.java.UserDto;
 
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
@@ -15,11 +18,13 @@
 
 public class TestUserClient implements UserClient {
 
-    private final Set<UserDto> users = new HashSet<>(Set.of(
+    public static final Set<UserDto> users = new HashSet<>(Set.of(
             new UserDto("name"),
             new UserDto("other name")
     ));
 
+    public static final Map<String, byte[]> images = new HashMap<>();
+
     @Override
     public CompletableFuture<GetUsersEndpoint.Response<?>> getUsers(GetUsersEndpoint.Request request) {
         var filtered = users.stream().filter(it -> Objects.equals(it.name(), request.getQueries().name())).toList();
@@ -60,4 +65,10 @@ public CompletableFuture<DeleteUserByNameEndpoint.Response<?>> deleteUserByName(
 
         return completedFuture(res);
     }
+
+    @Override
+    public CompletableFuture<UploadImageEndpoint.Response<?>> uploadImage(UploadImageEndpoint.Request request) {
+        images.put(request.getPath().name(),  request.getBody());
+        return completedFuture(new UploadImageEndpoint.Response201());
+    }
 }

examples/maven-spring-compile/src/test/java/community/flock/wirespec/example/maven/custom/app/user/UserTest.java

@@ -8,6 +8,7 @@
 import static community.flock.wirespec.example.maven.custom.app.user.UserContext.Service.getAllUsers;
 import static community.flock.wirespec.example.maven.custom.app.user.UserContext.Service.getUserByName;
 import static community.flock.wirespec.example.maven.custom.app.user.UserContext.Service.saveUser;
+import static community.flock.wirespec.example.maven.custom.app.user.UserContext.Service.uploadImageByName;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class UserTest {
@@ -47,6 +48,15 @@ void testDeleteUser() {
         });
     }
 
+    @Test
+    void testUploadImage() {
+        testContext(it -> {
+            byte[] bytes = "Hello World".getBytes();
+            uploadImageByName(it, "newName", bytes);
+            assertEquals(bytes, TestUserClient.images.get("newName"));
+        });
+    }
+
     private void testContext(Consumer<Context> test) {
         // Adapter cannot be inlined. We need only 1 instance per test not multiple.
         var adapter = new LiveUserAdapter(new TestUserClient(), new UserConverter());

src/compiler/core/src/commonMain/kotlin/community/flock/wirespec/compiler/core/LanguageSpec.kt

@@ -21,6 +21,7 @@ import community.flock.wirespec.compiler.core.tokenize.types.StatusCode
 import community.flock.wirespec.compiler.core.tokenize.types.TokenType
 import community.flock.wirespec.compiler.core.tokenize.types.WhiteSpaceExceptNewLine
 import community.flock.wirespec.compiler.core.tokenize.types.WsBoolean
+import community.flock.wirespec.compiler.core.tokenize.types.WsBytes
 import community.flock.wirespec.compiler.core.tokenize.types.WsChannelDef
 import community.flock.wirespec.compiler.core.tokenize.types.WsComment
 import community.flock.wirespec.compiler.core.tokenize.types.WsEndpointDef
@@ -57,6 +58,7 @@ object WirespecSpec : LanguageSpec {
         Regex("^#") to Hash,
         Regex("^\\[\\]") to Brackets,
         Regex("^String") to WsString,
+        Regex("^Bytes") to WsBytes,
         Regex("^Integer32") to WsInteger,
         Regex("^Integer") to WsInteger,
         Regex("^Number32") to WsNumber,

src/compiler/core/src/commonMain/kotlin/community/flock/wirespec/compiler/core/emit/JavaEmitter.kt

@@ -109,6 +109,7 @@ open class JavaEmitter(
             Reference.Primitive.Type.Precision.P64 -> "Double"
         }
         is Reference.Primitive.Type.Boolean -> "Boolean"
+        is Reference.Primitive.Type.Bytes -> "byte[]"
     }
 
     override fun emit(identifier: Identifier) = when (identifier) {

src/compiler/core/src/commonMain/kotlin/community/flock/wirespec/compiler/core/emit/KotlinEmitter.kt

@@ -89,6 +89,7 @@ open class KotlinEmitter(
                 Reference.Primitive.Type.Precision.P64 -> "Double"
             }
             is Reference.Primitive.Type.Boolean -> "Boolean"
+            is Reference.Primitive.Type.Bytes -> "ByteArray"
         }
     }
         .let { if (isIterable) "List<$it>" else it }

src/compiler/core/src/commonMain/kotlin/community/flock/wirespec/compiler/core/emit/ScalaEmitter.kt

@@ -88,6 +88,7 @@ open class ScalaEmitter(
                 Reference.Primitive.Type.Precision.P64 -> "Double"
             }
             is Reference.Primitive.Type.Boolean -> "Boolean"
+            is Reference.Primitive.Type.Bytes -> "Array[Byte]"
         }
     }
         .let { if (isIterable) "List[$it]" else it }

src/compiler/core/src/commonMain/kotlin/community/flock/wirespec/compiler/core/emit/TypeScriptEmitter.kt

@@ -69,6 +69,7 @@ open class TypeScriptEmitter(logger: Logger = noLogger) : DefinitionModelEmitter
             is Reference.Primitive.Type.Integer -> "number"
             is Reference.Primitive.Type.Number -> "number"
             is Reference.Primitive.Type.Boolean -> "boolean"
+            is Reference.Primitive.Type.Bytes -> "ArrayBuffer"
         }
     }
         .let { if (isIterable) "$it[]" else it }

src/compiler/core/src/commonMain/kotlin/community/flock/wirespec/compiler/core/emit/WirespecEmitter.kt

@@ -65,6 +65,7 @@ open class WirespecEmitter(logger: Logger = noLogger) : DefinitionModelEmitter,
                 else ->"Number"
             }
             is Reference.Primitive.Type.Boolean -> "Boolean"
+            is Reference.Primitive.Type.Bytes -> "Bytes"
         }
     }
         .let { if (isIterable) "$it[]" else it }

src/compiler/core/src/commonMain/kotlin/community/flock/wirespec/compiler/core/parse/EndpointParser.kt

@@ -19,6 +19,7 @@ import community.flock.wirespec.compiler.core.tokenize.types.RightCurly
 import community.flock.wirespec.compiler.core.tokenize.types.StatusCode
 import community.flock.wirespec.compiler.core.tokenize.types.WirespecType
 import community.flock.wirespec.compiler.core.tokenize.types.WsBoolean
+import community.flock.wirespec.compiler.core.tokenize.types.WsBytes
 import community.flock.wirespec.compiler.core.tokenize.types.WsInteger
 import community.flock.wirespec.compiler.core.tokenize.types.WsNumber
 import community.flock.wirespec.compiler.core.tokenize.types.WsString
@@ -246,6 +247,12 @@ class EndpointParser(logger: Logger) : AbstractParser(logger) {
                 isDictionary = isDict,
             )
 
+            is WsBytes -> Reference.Primitive(
+                type = Reference.Primitive.Type.Bytes,
+                isIterable = isIterable,
+                isDictionary = isDict,
+            )
+
             is WsInteger -> Reference.Primitive(
                 type = Reference.Primitive.Type.Integer(when(value) {
                     "Integer32" -> Reference.Primitive.Type.Precision.P32

src/compiler/core/src/commonMain/kotlin/community/flock/wirespec/compiler/core/parse/Node.kt

@@ -71,6 +71,10 @@ sealed interface Reference : Value<String> {
                 override val name = "Boolean"
             }
 
+            data object Bytes : Type {
+                override val name = "Bytes"
+            }
+
         }
 
         override val value = type.name

src/compiler/core/src/commonMain/kotlin/community/flock/wirespec/compiler/core/parse/TypeParser.kt

@@ -20,6 +20,7 @@ import community.flock.wirespec.compiler.core.tokenize.types.TypeDefinitionStart
 import community.flock.wirespec.compiler.core.tokenize.types.WirespecDefinition
 import community.flock.wirespec.compiler.core.tokenize.types.WirespecType
 import community.flock.wirespec.compiler.core.tokenize.types.WsBoolean
+import community.flock.wirespec.compiler.core.tokenize.types.WsBytes
 import community.flock.wirespec.compiler.core.tokenize.types.WsInteger
 import community.flock.wirespec.compiler.core.tokenize.types.WsNumber
 import community.flock.wirespec.compiler.core.tokenize.types.WsString
@@ -83,20 +84,30 @@ class TypeParser(logger: Logger) : AbstractParser(logger) {
                 isDictionary = isDict
             )
 
+            is WsBytes -> Reference.Primitive(
+                type = Reference.Primitive.Type.Bytes,
+                isIterable = isIterable,
+                isDictionary = isDict
+            )
+
             is WsInteger -> Reference.Primitive(
-                type = Reference.Primitive.Type.Integer(when(value) {
-                    "Integer32" -> Reference.Primitive.Type.Precision.P32
-                    else -> Reference.Primitive.Type.Precision.P64
-                }),
+                type = Reference.Primitive.Type.Integer(
+                    when (value) {
+                        "Integer32" -> Reference.Primitive.Type.Precision.P32
+                        else -> Reference.Primitive.Type.Precision.P64
+                    }
+                ),
                 isIterable = isIterable,
                 isDictionary = isDict
             )
 
             is WsNumber -> Reference.Primitive(
-                type = Reference.Primitive.Type.Number(when(value) {
-                    "Number32" -> Reference.Primitive.Type.Precision.P32
-                    else -> Reference.Primitive.Type.Precision.P64
-                }),
+                type = Reference.Primitive.Type.Number(
+                    when (value) {
+                        "Number32" -> Reference.Primitive.Type.Precision.P32
+                        else -> Reference.Primitive.Type.Precision.P64
+                    }
+                ),
                 isIterable = isIterable,
                 isDictionary = isDict
             )

src/compiler/core/src/commonMain/kotlin/community/flock/wirespec/compiler/core/tokenize/types/TokenTypes.kt

@@ -40,6 +40,7 @@ data object WsString : WirespecType
 data object WsInteger : WirespecType
 data object WsNumber : WirespecType
 data object WsBoolean : WirespecType
+data object WsBytes : WirespecType
 data object CustomType : WirespecType
 data object WsUnit : WirespecType
 

src/compiler/lib/src/jsMain/kotlin/community/flock/wirespec/compiler/lib/Ast.kt

@@ -150,6 +150,7 @@ private fun WsPrimitiveType.consume() =
         WsPrimitiveType.Integer -> Reference.Primitive.Type.Integer()
         WsPrimitiveType.Number -> Reference.Primitive.Type.Number()
         WsPrimitiveType.Boolean -> Reference.Primitive.Type.Boolean
+        WsPrimitiveType.Bytes -> Reference.Primitive.Type.Bytes
     }
 
 
@@ -233,6 +234,7 @@ private fun Reference.Primitive.Type.produce() = when (this) {
     is Reference.Primitive.Type.Integer -> WsPrimitiveType.Integer
     is Reference.Primitive.Type.Number -> WsPrimitiveType.Number
     is Reference.Primitive.Type.Boolean -> WsPrimitiveType.Boolean
+    is Reference.Primitive.Type.Bytes -> WsPrimitiveType.Bytes
 }
 
 private fun Endpoint.Method.produce() = when (this) {
@@ -375,7 +377,7 @@ data class WsPrimitive(
 ) : WsReference
 
 @JsExport
-enum class WsPrimitiveType { String, Integer, Number, Boolean }
+enum class WsPrimitiveType { String, Integer, Number, Boolean, Bytes }
 
 @JsExport
 data class WsRequest(val content: WsContent?)

src/converter/openapi/src/commonMain/kotlin/community/flock/wirespec/openapi/v2/OpenApiV2Emitter.kt

@@ -195,6 +195,7 @@ object OpenApiV2Emitter: Emitter(noLogger) {
         is Reference.Primitive.Type.Integer -> OpenApiType.INTEGER
         is Reference.Primitive.Type.Number -> OpenApiType.NUMBER
         is Reference.Primitive.Type.Boolean -> OpenApiType.BOOLEAN
+        is Reference.Primitive.Type.Bytes -> OpenApiType.STRING
     }
 
     private fun Reference.emitType() =
@@ -218,6 +219,8 @@ object OpenApiV2Emitter: Emitter(noLogger) {
                     Reference.Primitive.Type.Precision.P64 -> "int64"
                 }
 
+                is Reference.Primitive.Type.Bytes -> "binary"
+
                 else -> null
             }
 

src/converter/openapi/src/commonMain/kotlin/community/flock/wirespec/openapi/v3/OpenApiV3Emitter.kt

@@ -226,6 +226,7 @@ object OpenApiV3Emitter : Emitter(noLogger) {
         is Reference.Primitive.Type.Integer -> OpenApiType.INTEGER
         is Reference.Primitive.Type.Number -> OpenApiType.NUMBER
         is Reference.Primitive.Type.Boolean -> OpenApiType.BOOLEAN
+        is Reference.Primitive.Type.Bytes -> OpenApiType.STRING
     }
 
     private fun Endpoint.Content.emit(): Pair<MediaType, MediaTypeObject> =
@@ -246,6 +247,8 @@ object OpenApiV3Emitter : Emitter(noLogger) {
                     Reference.Primitive.Type.Precision.P64 -> "int64"
                 }
 
+                is Reference.Primitive.Type.Bytes -> "binary"
+
                 else -> null
             }
 

src/ide/intellij-plugin/src/main/kotlin/community/flock/wirespec/ide/intellij/Lexer.kt

@@ -23,6 +23,7 @@ import community.flock.wirespec.compiler.core.tokenize.types.RightCurly
 import community.flock.wirespec.compiler.core.tokenize.types.StatusCode
 import community.flock.wirespec.compiler.core.tokenize.types.WhiteSpace
 import community.flock.wirespec.compiler.core.tokenize.types.WsBoolean
+import community.flock.wirespec.compiler.core.tokenize.types.WsBytes
 import community.flock.wirespec.compiler.core.tokenize.types.WsChannelDef
 import community.flock.wirespec.compiler.core.tokenize.types.WsComment
 import community.flock.wirespec.compiler.core.tokenize.types.WsEndpointDef
@@ -75,6 +76,7 @@ class Lexer : IntellijLexer() {
         is WsInteger -> Types.INTEGER
         is WsNumber -> Types.NUMBER
         is WsBoolean -> Types.BOOLEAN
+        is WsBytes -> Types.BYTES
         is CustomType -> Types.CUSTOM_TYPE
         is WsUnit -> Types.UNIT
         is Method -> Types.METHOD

src/ide/intellij-plugin/src/main/kotlin/community/flock/wirespec/ide/intellij/SyntaxHighlighter.kt

@@ -1,6 +1,12 @@
 package community.flock.wirespec.ide.intellij
 
-import com.intellij.openapi.editor.DefaultLanguageHighlighterColors.*
+import com.intellij.openapi.editor.DefaultLanguageHighlighterColors.BRACKETS
+import com.intellij.openapi.editor.DefaultLanguageHighlighterColors.COMMA
+import com.intellij.openapi.editor.DefaultLanguageHighlighterColors.DOC_COMMENT_MARKUP
+import com.intellij.openapi.editor.DefaultLanguageHighlighterColors.IDENTIFIER
+import com.intellij.openapi.editor.DefaultLanguageHighlighterColors.KEYWORD
+import com.intellij.openapi.editor.DefaultLanguageHighlighterColors.PARAMETER
+import com.intellij.openapi.editor.DefaultLanguageHighlighterColors.SEMICOLON
 import com.intellij.openapi.fileTypes.SyntaxHighlighterBase
 import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory
 import com.intellij.openapi.project.Project