tig-spy lix compatibility

2023-05-05 15:11:13 -06:00
parent 0621df5d9c
commit 882ae706c3
18 changed files with 80 additions and 17 deletions
--- a/projects/_standalone/tig-spy/.gitignore
+++ b/projects/_standalone/tig-spy/.gitignore
@@ -1,4 +1,5 @@
 bin/
 libs/
 node_modules/
-*.zip
+*.zip
+externs/
--- a/projects/_standalone/tig-spy/.haxerc
+++ b/projects/_standalone/tig-spy/.haxerc
@@ -0,0 +1,4 @@
+{
+  "version": "4.3.1",
+  "resolveLibs": "scoped"
+}
--- a/projects/_standalone/tig-spy/build.hxml
+++ b/projects/_standalone/tig-spy/build.hxml
@@ -1,6 +1,6 @@
 -lib kiss
 -lib kiss-firefox
-lib webextension-polyfill
+-cp externs
 -cp src
 -dce full
 --each
--- a/projects/_standalone/tig-spy/haxe_libraries/haxe-strings.hxml
+++ b/projects/_standalone/tig-spy/haxe_libraries/haxe-strings.hxml
@@ -0,0 +1,5 @@
+# @install: lix --silent download "haxelib:/haxe-strings#7.0.2" into haxe-strings/7.0.2/haxelib
+-cp ${HAXE_LIBCACHE}/haxe-strings/7.0.2/haxelib/src/
+-D haxe-strings=7.0.2
+--macro hx.strings.internal.Macros.addDefines()
+--macro hx.strings.internal.Macros.configureNullSafety()
--- a/projects/_standalone/tig-spy/haxe_libraries/hscript.hxml
+++ b/projects/_standalone/tig-spy/haxe_libraries/hscript.hxml
@@ -0,0 +1,5 @@
+# @install: lix --silent download "haxelib:/hscript#2.5.0" into hscript/2.5.0/haxelib
+# @run: haxelib run-dir hscript "${HAXE_LIBCACHE}/hscript/2.5.0/haxelib"
+-cp ${HAXE_LIBCACHE}/hscript/2.5.0/haxelib/
+-D hscript=2.5.0
+--macro keep('IntIterator')
--- a/projects/_standalone/tig-spy/haxe_libraries/kiss-firefox.hxml
+++ b/projects/_standalone/tig-spy/haxe_libraries/kiss-firefox.hxml
@@ -0,0 +1,4 @@
+# @install: lix --silent download "gh://github.com/kiss-lang/kiss-firefox#2281518805873d8ebafe938f7b7641d87ea20571" into kiss-firefox/0.0.0/github/2281518805873d8ebafe938f7b7641d87ea20571
+-lib kiss
+-cp ${HAXE_LIBCACHE}/kiss-firefox/0.0.0/github/2281518805873d8ebafe938f7b7641d87ea20571/src/
+-D kiss-firefox=0.0.0
--- a/projects/_standalone/tig-spy/haxe_libraries/kiss.hxml
+++ b/projects/_standalone/tig-spy/haxe_libraries/kiss.hxml
@@ -0,0 +1,12 @@
+# @install: lix --silent download "gh://github.com/kiss-lang/kiss#a6c0cf88c6a02aa7845dca7c5c5025b915b78fbc" into kiss/0.0.1/github/a6c0cf88c6a02aa7845dca7c5c5025b915b78fbc
+# @run: haxelib run-dir kiss "${HAXE_LIBCACHE}/kiss/0.0.1/github/a6c0cf88c6a02aa7845dca7c5c5025b915b78fbc"
+-lib haxe-strings
+-lib hscript
+-lib tink_json
+-lib tink_macro
+-lib tink_syntaxhub
+-lib uuid
+-cp ${HAXE_LIBCACHE}/kiss/0.0.1/github/a6c0cf88c6a02aa7845dca7c5c5025b915b78fbc/src/
+-D kiss=0.0.1
+-w -WUnusedPattern
+--macro kiss.KissFrontend.use()
--- a/projects/_standalone/tig-spy/haxe_libraries/tink_core.hxml
+++ b/projects/_standalone/tig-spy/haxe_libraries/tink_core.hxml
@@ -0,0 +1,3 @@
+# @install: lix --silent download "haxelib:/tink_core#2.1.0" into tink_core/2.1.0/haxelib
+-cp ${HAXE_LIBCACHE}/tink_core/2.1.0/haxelib/src
+-D tink_core=2.1.0
--- a/projects/_standalone/tig-spy/haxe_libraries/tink_json.hxml
+++ b/projects/_standalone/tig-spy/haxe_libraries/tink_json.hxml
@@ -0,0 +1,4 @@
+# @install: lix --silent download "haxelib:/tink_json#0.11.0" into tink_json/0.11.0/haxelib
+-lib tink_typecrawler
+-cp ${HAXE_LIBCACHE}/tink_json/0.11.0/haxelib/src
+-D tink_json=0.11.0
--- a/projects/_standalone/tig-spy/haxe_libraries/tink_macro.hxml
+++ b/projects/_standalone/tig-spy/haxe_libraries/tink_macro.hxml
@@ -0,0 +1,4 @@
+# @install: lix --silent download "haxelib:/tink_macro#1.0.1" into tink_macro/1.0.1/haxelib
+-lib tink_core
+-cp ${HAXE_LIBCACHE}/tink_macro/1.0.1/haxelib/src
+-D tink_macro=1.0.1
--- a/projects/_standalone/tig-spy/haxe_libraries/tink_priority.hxml
+++ b/projects/_standalone/tig-spy/haxe_libraries/tink_priority.hxml
@@ -0,0 +1,3 @@
+-D tink_priority=0.1.3
+# @install: lix --silent download "gh://github.com/haxetink/tink_priority#ea736d31dc788aae703a2aa415c25d5b80d0e7d1" into tink_priority/0.1.3/github/ea736d31dc788aae703a2aa415c25d5b80d0e7d1
+-cp ${HAXE_LIBCACHE}/tink_priority/0.1.3/github/ea736d31dc788aae703a2aa415c25d5b80d0e7d1/src
--- a/projects/_standalone/tig-spy/haxe_libraries/tink_syntaxhub.hxml
+++ b/projects/_standalone/tig-spy/haxe_libraries/tink_syntaxhub.hxml
@@ -0,0 +1,6 @@
+# @install: lix --silent download "gh://github.com/haxetink/tink_syntaxhub#b6ea4966bbdee4d176ac8dd5d2d8ae3b362b2f86" into tink_syntaxhub/0.6.0/github/b6ea4966bbdee4d176ac8dd5d2d8ae3b362b2f86
+-lib tink_macro
+-lib tink_priority
+-cp ${HAXE_LIBCACHE}/tink_syntaxhub/0.6.0/github/b6ea4966bbdee4d176ac8dd5d2d8ae3b362b2f86/src
+-D tink_syntaxhub=0.6.0
+--macro tink.SyntaxHub.use()
--- a/projects/_standalone/tig-spy/haxe_libraries/tink_typecrawler.hxml
+++ b/projects/_standalone/tig-spy/haxe_libraries/tink_typecrawler.hxml
@@ -0,0 +1,4 @@
+# @install: lix --silent download "haxelib:/tink_typecrawler#0.7.0" into tink_typecrawler/0.7.0/haxelib
+-lib tink_macro
+-cp ${HAXE_LIBCACHE}/tink_typecrawler/0.7.0/haxelib/src
+-D tink_typecrawler=0.7.0
--- a/projects/_standalone/tig-spy/haxe_libraries/uuid.hxml
+++ b/projects/_standalone/tig-spy/haxe_libraries/uuid.hxml
@@ -0,0 +1,3 @@
+# @install: lix --silent download "haxelib:/uuid#2.4.1" into uuid/2.4.1/haxelib
+-cp ${HAXE_LIBCACHE}/uuid/2.4.1/haxelib/src
+-D uuid=2.4.1
--- a/projects/_standalone/tig-spy/package.json
+++ b/projects/_standalone/tig-spy/package.json
@@ -11,6 +11,6 @@
 	},
 	"version": "0.0.0",
 	"scripts": {
-		"postinstall": "dts2hx --all"
+		"postinstall": "dts2hx --all --noLibWrap"
 	}
 }
--- a/projects/_standalone/tig-spy/src/tig_spy/Background.hx
+++ b/projects/_standalone/tig-spy/src/tig_spy/Background.hx
@@ -6,4 +6,8 @@ import haxe.Constraints;
 import tig_spy.Message;

@:build(kiss.Kiss.build())
-class Background {}
+class Background {
+    static function main() {
+        _main();
+    }
+}
--- a/projects/_standalone/tig-spy/src/tig_spy/Background.kiss
+++ b/projects/_standalone/tig-spy/src/tig_spy/Background.kiss
@@ -8,15 +8,16 @@
                (API.browser.tabs.sendMessage id (object type "nextPage" data [(pages.shift)]))
            (API.browser.tabs.sendMessage id (object type "authorList" data collectedAuthors)))))

-(API.browser.runtime.onMessage.addListener ->[:Message message sender sendResponse] 
-    (let [:Function sendResponse sendResponse]
-        (case message
-            ((object type "authors" data authors)
-                (set collectedAuthors (collectedAuthors.concat authors))
-                (sendNextPage sendResponse))
-            ((object type "pages" data pageUrls)
-                (set collectedAuthors [])
-                (set pages pageUrls)
-                (sendResponse ""))
-            (never otherwise))
-        true))
+(function _main []
+    (API.browser.runtime.onMessage.addListener ->[:Message message sender sendResponse] 
+        (let [:Function sendResponse sendResponse]
+            (case message
+                ((object type "authors" data authors)
+                    (set collectedAuthors (collectedAuthors.concat authors))
+                    (sendNextPage sendResponse))
+                ((object type "pages" data pageUrls)
+                    (set collectedAuthors [])
+                    (set pages pageUrls)
+                    (sendResponse ""))
+                (never otherwise))
+            true)))
--- a/projects/_standalone/tig-spy/test.sh
+++ b/projects/_standalone/tig-spy/test.sh
@@ -1,7 +1,7 @@
 #! /bin/bash

 if [ ! -d node_modules ]; then
-    $(haxelib libpath kiss)/build-scripts/dts2hx-externs/regenerate.sh
+    npm install
 fi

 haxe -D test build.hxml