use precompiled cpp bindings

Author: iliabylich

.github/workflows/test.yml

@@ -51,7 +51,15 @@ jobs:
           which node-gyp
 
       - name: npm install
-        run: npm install
+        run: npm install --ignore-scripts
+
+      - name: configure
+        run: |
+          make update-cpp-bindings
+          make generate-bindings
+          make configure
 
       - name: Run tests
-        run: make test-debug
+        run: |
+          make build
+          make test

.gitignore

@@ -4,3 +4,6 @@ package-lock.json
 build-convert/target
 build-convert/Cargo.lock
 convert_gen.h
+
+lib-ruby-parser.a
+lib-ruby-parser.h

Makefile

@@ -1,31 +1,49 @@
-test-all: test-debug test-release
-
-test-debug: build-debug
-	./test.js ./build/Debug/ruby_parser.node
-
-test-release: build-release
-	./test.js ./build/Release/ruby_parser.node
-
-build-debug: build-deps configure
-	node-gyp build -d
-
-build-release: build-deps configure
-	node-gyp build
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Linux)
+	PLATFORM = linux-x86_64
+endif
+ifeq ($(UNAME_S),Darwin)
+	PLATFORM = darwin-x86_64
+endif
+
+VERSION = 3.0.0-3
+
+ifndef BUILD_ENV
+	BUILD_ENV = debug
+endif
+
+ifeq ($(BUILD_ENV), debug)
+	NODE_GYP_FLAGS = -d
+	GYP_ENV = Debug
+else
+	NODE_GYP_FLAGS =
+	GYP_ENV = Release
+endif
+
+ASSET_PREFIX = https://github.com/lib-ruby-parser/cpp-bindings/releases/download/v$(VERSION)
+LIB_RUBY_PARSER_H_URL = $(ASSET_PREFIX)/lib-ruby-parser.h
+LIB_RUBY_PARSER_A_URL = $(ASSET_PREFIX)/$(PLATFORM).a
 
 configure:
 	node-gyp configure
 
-build-deps: run-build-convert build-cpp-bindings-shared
-
-run-build-convert:
+generate-bindings:
 	cd build-convert && cargo build
 
-build-cpp-bindings-shared:
-	cd lib-ruby-parser-cpp-bindings && make cargo-build-release
+.PHONY: build
+build:
+	node-gyp build $(NODE_GYP_FLAGS)
+
+GYP_OUTPUT = ./build/$(GYP_ENV)/ruby_parser.node
+test:
+	./test.js $(GYP_OUTPUT)
 
 clean:
-	rm -rf build
-	rm -rf node_modules
+	rm -f $(GYP_OUTPUT)
 	rm -f convert_gen.h
-	rm -rf lib-ruby-parser-cpp-bindings/target
-	cd build-convert && cargo clean
+
+# // cpp bindings files
+
+update-cpp-bindings:
+	wget $(LIB_RUBY_PARSER_H_URL) -O lib-ruby-parser.h
+	wget $(LIB_RUBY_PARSER_A_URL) -O lib-ruby-parser.a

binding.gyp

@@ -2,12 +2,12 @@
     "targets": [
         {
             "target_name": "ruby_parser",
-            "sources": [ "lib-ruby-parser.cc" ],
+            "sources": [ "node_bindings.cc" ],
             "include_dirs": [
                 "<!@(node -p \"require('node-addon-api').include\")",
-                "lib-ruby-parser-cpp-bindings/includes"
+                "."
             ],
-            "libraries": [ "../lib-ruby-parser-cpp-bindings/target/lib-ruby-parser-static-release" ],
+            "libraries": [ "../lib-ruby-parser.a" ],
             "cflags_cc": [ "-std=c++17" ],
             "xcode_settings": {
                 "OTHER_CFLAGS": [ "-std=c++17"],

build-convert/Cargo.toml

@@ -7,4 +7,4 @@ version = "0.1.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-lib-ruby-parser-nodes = "0.5.0"
+lib-ruby-parser-nodes = "0.8.0"

convert.h

@@ -203,6 +203,9 @@ namespace lib_ruby_parser_node
         case MagicCommentKind::WARN_INDENT:
             kind = String::New(env, "warn-indent");
             break;
+        case MagicCommentKind::SHAREABLE_CONSTANT_VALUE:
+            kind = String::New(env, "shareable-constant-value");
+            break;
         }
         return MagicCommentCtor.New({
             kind,

lib-ruby-parser.cc node_bindings.cclib-ruby-parser.cc renamed to node_bindings.cc

@@ -28,7 +28,9 @@ namespace lib_ruby_parser_node
         }
 
         std::string source = arg.As<String>().Utf8Value();
-        auto result = ParserResult::from_source(source);
+        ParserOptions options;
+        options.record_tokens = true;
+        auto result = ParserResult::from_source(source, std::move(options));
         return convert(std::move(result), env);
     }
 

package.json

@@ -4,8 +4,5 @@
     "description": "bindings to lib-ruby-parser",
     "dependencies": {
         "node-addon-api": "^1.5.0"
-    },
-    "scripts": {
-        "preinstall": "make build-deps"
     }
 }