Fix JS build, hopefully for 32-bit as well, see #707

bindings/js/Makefile

@@ -22,19 +22,20 @@ compile:
 build:
 	node-gyp configure
 	prebuildify --napi --strip
+	rm -rf go.*
 
-publish:
+publish: build
 	sed -i.bak -e "s/{VERSION}/${VERSION}/" package.json
-	rm package.json.bak
 	npm publish --access=public
+	mv package.json.bak package.json
 
 clean:
 	rm -rf minify.a
 	rm -rf build
 	rm -rf prebuilds
 	rm -rf go.*
 
-test:
+test: build
 	npm test
 
 .PHONY: all compile build publish clean test

bindings/js/minify.go

@@ -24,6 +24,10 @@ func init() {
 	minifyConfig(nil, nil, 0)
 }
 
+func goBytes(str *C.char, length, capacity C.longlong) []byte {
+	return (*[1 << 28]byte)(unsafe.Pointer(str))[:length:capacity]
+}
+
 func goStringArray(carr **C.char, length C.longlong) []string {
 	if length == 0 {
 		return []string{}
@@ -119,9 +123,9 @@ func minifyConfig(ckeys **C.char, cvals **C.char, length C.longlong) *C.char {
 
 //export minifyString
 func minifyString(cmediatype, cinput *C.char, input_length C.longlong, coutput *C.char, output_length *C.longlong) *C.char {
-	mediatype := C.GoString(cmediatype) // copy
-	input := C.GoBytes(unsafe.Pointer(cinput), C.int(input_length))
-	output := C.GoBytes(unsafe.Pointer(coutput), C.int(input_length))
+	mediatype := C.GoString(cmediatype)                    // copy
+	input := goBytes(cinput, input_length, input_length+1) // +1 for NULL byte we will use in parser
+	output := goBytes(coutput, input_length, input_length)
 
 	out := buffer.NewStaticWriter(output[:0])
 	if err := m.Minify(mediatype, out, buffer.NewReader(input)); err != nil {