git » sdk » commit beaf0f0

diff --git a/Makefile b/Makefile
index ea10689..aa8c747 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ HAXE_PATH=$$HOME/Software/haxe-4.3.1/hxnodejs/12,1,0/src
 
 all: test.node.js
 
-test.node.js: xmpp/*.hx xmpp/queries/*.hx xmpp/streams/*.hx
+test.node.js: snikket/*.hx snikket/queries/*.hx snikket/streams/*.hx
 	haxe -D nodejs -D no-deprecation-warnings -m Main --js "$@" -cp "$(HAXE_PATH)"
 
 run-nodejs: test.node.js
@@ -13,6 +13,6 @@ run-nodejs: test.node.js
 browser.js:
 	haxe browser.hxml
 	echo "var exports = {};" > browser.js
-	sed -e 's/hxEnums\["xmpp.EventResult"\] = {/hxEnums["xmpp.EventResult"] = $$hx_exports.xmpp.EventResult = {/' < browser.haxe.js | sed -e 's/hxEnums\["xmpp.MessageDirection"\] = {/hxEnums["xmpp.MessageDirection"] = $$hx_exports.xmpp.MessageDirection = {/' | sed -e 's/hxEnums\["xmpp.UiState"\] = {/hxEnums["xmpp.UiState"] = $$hx_exports.xmpp.UiState = {/' | sed -e 's/hxEnums\["xmpp.MessageStatus"\] = {/hxEnums["xmpp.MessageStatus"] = $$hx_exports.xmpp.MessageStatus = {/' >> browser.js
-	cat xmpp/persistence/*.js >> browser.js
-	echo "export const { xmpp } = exports;" >> browser.js
+	sed -e 's/hxEnums\["snikket.EventResult"\] = {/hxEnums["snikket.EventResult"] = $$hx_exports.snikket.EventResult = {/' < browser.haxe.js | sed -e 's/hxEnums\["snikket.MessageDirection"\] = {/hxEnums["snikket.MessageDirection"] = $$hx_exports.snikket.MessageDirection = {/' | sed -e 's/hxEnums\["snikket.UiState"\] = {/hxEnums["snikket.UiState"] = $$hx_exports.snikket.UiState = {/' | sed -e 's/hxEnums\["snikket.MessageStatus"\] = {/hxEnums["snikket.MessageStatus"] = $$hx_exports.snikket.MessageStatus = {/' >> browser.js
+	cat snikket/persistence/*.js >> browser.js
+	echo "export const { snikket } = exports;" >> browser.js
diff --git a/snikket/Chat.hx b/snikket/Chat.hx
index 27df3b6..1276cdf 100644
--- a/snikket/Chat.hx
+++ b/snikket/Chat.hx
@@ -1,8 +1,5 @@
 package snikket;
 
-#if cpp
-import HaxeCBridge;
-#end
 import haxe.io.BytesData;
 import snikket.Chat;
 import snikket.ChatMessage;
@@ -22,7 +19,10 @@ enum UiState {
 	Closed; // Archived
 }
 
+#if cpp
+import HaxeCBridge;
 @:build(HaxeCBridge.expose())
+#end
 abstract class Chat {
 	private var client:Client;
 	private var stream:GenericStream;
@@ -262,7 +262,9 @@ abstract class Chat {
 }
 
 @:expose
+#if cpp
 @:build(HaxeCBridge.expose())
+#end
 class DirectChat extends Chat {
 	@HaxeCBridge.noemit // on superclass as abstract
 	public function getParticipants(): Array<String> {
diff --git a/snikket/ChatMessage.hx b/snikket/ChatMessage.hx
index 6a1c0db..ffed9fa 100644
--- a/snikket/ChatMessage.hx
+++ b/snikket/ChatMessage.hx
@@ -31,7 +31,10 @@ class ChatAttachment {
 
 @:expose
 @:nullSafety(Strict)
+#if cpp
+import HaxeCBridge;
 @:build(HaxeCBridge.expose())
+#end
 class ChatMessage {
 	public var localId (default, set) : Null<String> = null;
 	public var serverId (default, set) : Null<String> = null;
diff --git a/snikket/Client.hx b/snikket/Client.hx
index 80364e6..609096b 100644
--- a/snikket/Client.hx
+++ b/snikket/Client.hx
@@ -1,8 +1,5 @@
 package snikket;
 
-#if cpp
-import HaxeCBridge;
-#end
 import sha.SHA256;
 
 import haxe.crypto.Base64;
@@ -32,7 +29,10 @@ import snikket.queries.VcardTempGet;
 using Lambda;
 
 @:expose
+#if cpp
+import HaxeCBridge;
 @:build(HaxeCBridge.expose())
+#end
 class Client extends EventEmitter {
 	private var stream:GenericStream;
 	private var chatMessageHandlers: Array<(ChatMessage)->Void> = [];