refactor monorepo structure

merlinfuchs · Feb 4, 2024 · 0f90d41 · 0f90d41
1 parent 52fd470
commit 0f90d41
Show file tree

Hide file tree

Showing 113 changed files with 1,876 additions and 144 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,9 +5,9 @@ opt-level = 's'
 [workspace]
 resolver = "2"
 members = [
-    "js-sdk/crates/kitejs-compiler",
+    "kite-sdk-js/crates/kitejs-compiler",
 ]
 exclude = [
     # TODO: resolve depdency conflicts so this can be a workspace memebr
-    "js-sdk/crates/kitejs-engine",
+    "kite-sdk-js/crates/kitejs-engine",
 ]
diff --git a/README.md b/README.md
@@ -97,10 +97,10 @@ Create a `plugin.go` file with your Go code for the plugin. It must contain a `m
 package main
 
 import (
-    kite "github.com/merlinfuchs/kite/go-sdk"
-    "github.com/merlinfuchs/kite/go-sdk/log"
-    "github.com/merlinfuchs/kite/go-types/discord"
-    "github.com/merlinfuchs/kite/go-types/event"
+    kite "github.com/merlinfuchs/kite/kite-sdk-go"
+    "github.com/merlinfuchs/kite/kite-sdk-go/log"
+    "github.com/merlinfuchs/kite/kite-types/discord"
+    "github.com/merlinfuchs/kite/kite-types/event"
 )
 
 func main() {
@@ -142,7 +142,7 @@ kite plugin deploy --guild_id 1234567890
 
 ### JavaScript
 
-To write plugins in JS you need to first install the custom compiler by following the instructions in the [js-sdk](js-sdk).
+To write plugins in JS you need to first install the custom compiler by following the instructions in the [kite-sdk-js](kite-sdk-js).
 
 #### 1. Create a new plugin
 

diff --git a/examples/automod/package-lock.json b/examples/automod/package-lock.json
diff --git a/examples/automod/package.json b/examples/automod/package.json
@@ -8,7 +8,7 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@merlingg/kite-sdk": "file:../../js-sdk",
+    "@merlingg/kite-sdk": "file:../../kite-sdk-js",
     "obscenity": "^0.2.0"
   }
 }
diff --git a/examples/backup/go.mod b/examples/backup/go.mod
@@ -1,3 +1,6 @@
 module github.com/merlinfuchs/kite/examples/backup
 
 go 1.21.5
+
+require github.com/merlinfuchs/kite/kite-sdk-go v0.0.0
+require github.com/merlinfuchs/kite/kite-types v0.0.0
diff --git a/examples/backup/plugin.go b/examples/backup/plugin.go
@@ -4,13 +4,13 @@ import (
 	"encoding/json"
 	"math/rand"
 
-	kite "github.com/merlinfuchs/kite/go-sdk"
-	"github.com/merlinfuchs/kite/go-sdk/discord"
-	"github.com/merlinfuchs/kite/go-sdk/kv"
-	"github.com/merlinfuchs/kite/go-sdk/log"
-	"github.com/merlinfuchs/kite/go-types/dismodel"
-	"github.com/merlinfuchs/kite/go-types/fail"
-	"github.com/merlinfuchs/kite/go-types/kvmodel"
+	kite "github.com/merlinfuchs/kite/kite-sdk-go"
+	"github.com/merlinfuchs/kite/kite-sdk-go/discord"
+	"github.com/merlinfuchs/kite/kite-sdk-go/kv"
+	"github.com/merlinfuchs/kite/kite-sdk-go/log"
+	"github.com/merlinfuchs/kite/kite-types/dismodel"
+	"github.com/merlinfuchs/kite/kite-types/fail"
+	"github.com/merlinfuchs/kite/kite-types/kvmodel"
 )
 
 type Backup struct {

diff --git a/examples/counter/go.mod b/examples/counter/go.mod
@@ -1,3 +1,6 @@
 module github.com/merlinfuchs/kite/examples/counter
 
 go 1.21.5
+
+require github.com/merlinfuchs/kite/kite-sdk-go v0.0.0
+require github.com/merlinfuchs/kite/kite-types v0.0.0
diff --git a/examples/counter/plugin.go b/examples/counter/plugin.go
@@ -3,11 +3,11 @@ package main
 import (
 	"strconv"
 
-	kite "github.com/merlinfuchs/kite/go-sdk"
-	"github.com/merlinfuchs/kite/go-sdk/discord"
-	"github.com/merlinfuchs/kite/go-sdk/kv"
-	"github.com/merlinfuchs/kite/go-types/dismodel"
-	"github.com/merlinfuchs/kite/go-types/event"
+	kite "github.com/merlinfuchs/kite/kite-sdk-go"
+	"github.com/merlinfuchs/kite/kite-sdk-go/discord"
+	"github.com/merlinfuchs/kite/kite-sdk-go/kv"
+	"github.com/merlinfuchs/kite/kite-types/dismodel"
+	"github.com/merlinfuchs/kite/kite-types/event"
 )
 
 const resetMessage = "Wrong counter value! The counter has been reset."

diff --git a/examples/ping/go.mod b/examples/ping/go.mod
@@ -2,8 +2,6 @@ module github.com/merlinfuchs/kite/examples/ping
 
 go 1.21.5
 
-require github.com/merlinfuchs/kite/go-sdk v0.0.0
+require github.com/merlinfuchs/kite/kite-sdk-go v0.0.0
+require github.com/merlinfuchs/kite/kite-types v0.0.0
 
-require github.com/merlinfuchs/kite/go-types v0.0.0
-
-replace github.com/merlinfuchs/kite/go-sdk => ../../go-sdk
diff --git a/examples/ping/plugin.go b/examples/ping/plugin.go
@@ -1,13 +1,13 @@
 package main
 
 import (
-	kite "github.com/merlinfuchs/kite/go-sdk"
-	"github.com/merlinfuchs/kite/go-sdk/config"
-	"github.com/merlinfuchs/kite/go-sdk/discord"
-	"github.com/merlinfuchs/kite/go-sdk/log"
-	"github.com/merlinfuchs/kite/go-types/dismodel"
-	"github.com/merlinfuchs/kite/go-types/event"
-	"github.com/merlinfuchs/kite/go-types/manifest"
+	kite "github.com/merlinfuchs/kite/kite-sdk-go"
+	"github.com/merlinfuchs/kite/kite-sdk-go/config"
+	"github.com/merlinfuchs/kite/kite-sdk-go/discord"
+	"github.com/merlinfuchs/kite/kite-sdk-go/log"
+	"github.com/merlinfuchs/kite/kite-types/dismodel"
+	"github.com/merlinfuchs/kite/kite-types/event"
+	"github.com/merlinfuchs/kite/kite-types/manifest"
 )
 
 func main() {

diff --git a/go-sdk/go.mod b/go-sdk/go.mod
diff --git a/go-types/go.mod b/go-types/go.mod
diff --git a/go.work b/go.work
@@ -1,10 +1,14 @@
 go 1.21.5
 
 use (
-	./examples/ping
-	./examples/counter
 	./examples/backup
-	./go-sdk
-	./go-types
+	./examples/counter
+	./examples/ping
+	./kite-sdk-go
 	./kite-service
+	./kite-types
 )
+
+replace github.com/merlinfuchs/kite/kite-sdk-go v0.0.0 => ./kite-sdk-go
+
+replace github.com/merlinfuchs/kite/kite-types v0.0.0 => ./kite-types
diff --git a/js-sdk/src/index.ts b/js-sdk/src/index.ts
diff --git a/go-sdk/config/config.go → kite-sdk-go/config/config.go b/go-sdk/config/config.go → kite-sdk-go/config/config.go
@@ -1,8 +1,8 @@
 package config
 
 import (
-	"github.com/merlinfuchs/kite/go-sdk/internal"
-	"github.com/merlinfuchs/kite/go-types/manifest"
+	"github.com/merlinfuchs/kite/kite-sdk-go/internal"
+	"github.com/merlinfuchs/kite/kite-types/manifest"
 )
 
 var cfg map[string]interface{}

diff --git a/go-sdk/discord/call.go → kite-sdk-go/discord/call.go b/go-sdk/discord/call.go → kite-sdk-go/discord/call.go
@@ -1,9 +1,9 @@
 package discord
 
 import (
-	"github.com/merlinfuchs/kite/go-sdk/internal"
-	"github.com/merlinfuchs/kite/go-types/call"
-	"github.com/merlinfuchs/kite/go-types/dismodel"
+	"github.com/merlinfuchs/kite/kite-sdk-go/internal"
+	"github.com/merlinfuchs/kite/kite-types/call"
+	"github.com/merlinfuchs/kite/kite-types/dismodel"
 )
 
 func BanList(opts ...call.CallOption) (dismodel.BanListResponse, error) {

diff --git a/kite-sdk-go/go.mod b/kite-sdk-go/go.mod
@@ -0,0 +1,5 @@
+module github.com/merlinfuchs/kite/kite-sdk-go
+
+go 1.21.5
+
+require github.com/merlinfuchs/kite/kite-types v0.0.0
diff --git a/go-sdk/go.sum → kite-sdk-go/go.sum b/go-sdk/go.sum → kite-sdk-go/go.sum
diff --git a/go-sdk/handle.go → kite-sdk-go/handle.go b/go-sdk/handle.go → kite-sdk-go/handle.go
@@ -3,9 +3,9 @@ package kite
 import (
 	"slices"
 
-	"github.com/merlinfuchs/kite/go-sdk/internal"
-	"github.com/merlinfuchs/kite/go-types/dismodel"
-	"github.com/merlinfuchs/kite/go-types/event"
+	"github.com/merlinfuchs/kite/kite-sdk-go/internal"
+	"github.com/merlinfuchs/kite/kite-types/dismodel"
+	"github.com/merlinfuchs/kite/kite-types/event"
 )
 
 func addEventHandler(eventType event.EventType, handler event.EventHandler) {

diff --git a/go-sdk/internal/call.go → kite-sdk-go/internal/call.go b/go-sdk/internal/call.go → kite-sdk-go/internal/call.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"unsafe"
 
-	"github.com/merlinfuchs/kite/go-sdk/internal/util"
-	"github.com/merlinfuchs/kite/go-types/call"
+	"github.com/merlinfuchs/kite/kite-sdk-go/internal/util"
+	"github.com/merlinfuchs/kite/kite-types/call"
 )
 
 func MakeCall(c call.Call) (*call.CallResponse, error) {

diff --git a/go-sdk/internal/config.go → kite-sdk-go/internal/config.go b/go-sdk/internal/config.go → kite-sdk-go/internal/config.go
diff --git a/go-sdk/internal/log.go → kite-sdk-go/internal/log.go b/go-sdk/internal/log.go → kite-sdk-go/internal/log.go
diff --git a/go-sdk/internal/sys.go → kite-sdk-go/internal/sys.go b/go-sdk/internal/sys.go → kite-sdk-go/internal/sys.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"unsafe"
 
-	"github.com/merlinfuchs/kite/go-types/event"
-	"github.com/merlinfuchs/kite/go-types/manifest"
+	"github.com/merlinfuchs/kite/kite-types/event"
+	"github.com/merlinfuchs/kite/kite-types/manifest"
 )
 
 //export kite_set_manifest

diff --git a/go-sdk/internal/util/util.go → kite-sdk-go/internal/util/util.go b/go-sdk/internal/util/util.go → kite-sdk-go/internal/util/util.go
diff --git a/go-sdk/kv/kv.go → kite-sdk-go/kv/kv.go b/go-sdk/kv/kv.go → kite-sdk-go/kv/kv.go
@@ -3,10 +3,10 @@ package kv
 import (
 	"encoding/json"
 
-	"github.com/merlinfuchs/kite/go-sdk/internal"
-	"github.com/merlinfuchs/kite/go-sdk/internal/util"
-	"github.com/merlinfuchs/kite/go-types/call"
-	"github.com/merlinfuchs/kite/go-types/kvmodel"
+	"github.com/merlinfuchs/kite/kite-sdk-go/internal"
+	"github.com/merlinfuchs/kite/kite-sdk-go/internal/util"
+	"github.com/merlinfuchs/kite/kite-types/call"
+	"github.com/merlinfuchs/kite/kite-types/kvmodel"
 )
 
 type KVNamespace struct {

diff --git a/go-sdk/log/log.go → kite-sdk-go/log/log.go b/go-sdk/log/log.go → kite-sdk-go/log/log.go
@@ -1,8 +1,8 @@
 package log
 
 import (
-	"github.com/merlinfuchs/kite/go-sdk/internal"
-	"github.com/merlinfuchs/kite/go-types/logmodel"
+	"github.com/merlinfuchs/kite/kite-sdk-go/internal"
+	"github.com/merlinfuchs/kite/kite-types/logmodel"
 )
 
 func Log(level logmodel.LogLevel, msg string) {

diff --git a/go-sdk/sdk.go → kite-sdk-go/sdk.go b/go-sdk/sdk.go → kite-sdk-go/sdk.go
@@ -3,8 +3,8 @@ package kite
 import (
 	"time"
 
-	"github.com/merlinfuchs/kite/go-sdk/internal"
-	"github.com/merlinfuchs/kite/go-types/call"
+	"github.com/merlinfuchs/kite/kite-sdk-go/internal"
+	"github.com/merlinfuchs/kite/kite-types/call"
 )
 
 func Sleep(duration time.Duration) error {

diff --git a/js-sdk/.gitignore → kite-sdk-js/.gitignore b/js-sdk/.gitignore → kite-sdk-js/.gitignore
diff --git a/js-sdk/README.md → kite-sdk-js/README.md b/js-sdk/README.md → kite-sdk-js/README.md
diff --git a/js-sdk/api-extractor.json → kite-sdk-js/api-extractor.json b/js-sdk/api-extractor.json → kite-sdk-js/api-extractor.json
diff --git a/js-sdk/crates/kitejs-compiler/Cargo.lock → ...-sdk-js/crates/kitejs-compiler/Cargo.lock b/js-sdk/crates/kitejs-compiler/Cargo.lock → ...-sdk-js/crates/kitejs-compiler/Cargo.lock
diff --git a/js-sdk/crates/kitejs-compiler/Cargo.toml → ...-sdk-js/crates/kitejs-compiler/Cargo.toml b/js-sdk/crates/kitejs-compiler/Cargo.toml → ...-sdk-js/crates/kitejs-compiler/Cargo.toml
diff --git a/js-sdk/crates/kitejs-compiler/build.rs → kite-sdk-js/crates/kitejs-compiler/build.rs b/js-sdk/crates/kitejs-compiler/build.rs → kite-sdk-js/crates/kitejs-compiler/build.rs
diff --git a/js-sdk/crates/kitejs-compiler/src/main.rs → ...sdk-js/crates/kitejs-compiler/src/main.rs b/js-sdk/crates/kitejs-compiler/src/main.rs → ...sdk-js/crates/kitejs-compiler/src/main.rs
diff --git a/js-sdk/crates/kitejs-engine/Cargo.lock → kite-sdk-js/crates/kitejs-engine/Cargo.lock b/js-sdk/crates/kitejs-engine/Cargo.lock → kite-sdk-js/crates/kitejs-engine/Cargo.lock
diff --git a/js-sdk/crates/kitejs-engine/Cargo.toml → kite-sdk-js/crates/kitejs-engine/Cargo.toml b/js-sdk/crates/kitejs-engine/Cargo.toml → kite-sdk-js/crates/kitejs-engine/Cargo.toml
diff --git a/js-sdk/crates/kitejs-engine/src/context.rs → ...dk-js/crates/kitejs-engine/src/context.rs b/js-sdk/crates/kitejs-engine/src/context.rs → ...dk-js/crates/kitejs-engine/src/context.rs
diff --git a/js-sdk/crates/kitejs-engine/src/main.rs → kite-sdk-js/crates/kitejs-engine/src/main.rs b/js-sdk/crates/kitejs-engine/src/main.rs → kite-sdk-js/crates/kitejs-engine/src/main.rs
diff --git a/js-sdk/crates/kitejs-engine/src/sys.rs → kite-sdk-js/crates/kitejs-engine/src/sys.rs b/js-sdk/crates/kitejs-engine/src/sys.rs → kite-sdk-js/crates/kitejs-engine/src/sys.rs
diff --git a/js-sdk/package-lock.json → kite-sdk-js/package-lock.json b/js-sdk/package-lock.json → kite-sdk-js/package-lock.json
diff --git a/js-sdk/package.json → kite-sdk-js/package.json b/js-sdk/package.json → kite-sdk-js/package.json