fixup! deps: update merve to 1.2.0

Author: anonrig

deps/merve/BUILD.gn

@@ -0,0 +1,14 @@
+##############################################################################
+#                                                                            #
+#                       DO NOT EDIT THIS FILE!                               #
+#                                                                            #
+##############################################################################
+
+# This file is used by GN for building, which is NOT the build system used for
+# building official binaries.
+# Please modify the gyp files if you are making changes to build system.
+
+import("unofficial.gni")
+
+merve_gn_build("merve") {
+}

deps/merve/unofficial.gni

@@ -0,0 +1,20 @@
+# This file is used by GN for building, which is NOT the build system used for
+# building official binaries.
+# Please edit the gyp files if you are making changes to build system.
+
+# The actual configurations are put inside a template in unofficial.gni to
+# prevent accidental edits from contributors.
+template("merve_gn_build") {
+  config("merve_config") {
+    include_dirs = [ "." ]
+  }
+  gypi_values = exec_script("../../tools/gypi_to_gn.py",
+                            [ rebase_path("merve.gyp") ],
+                            "scope",
+                            [ "merve.gyp" ])
+  source_set(target_name) {
+    forward_variables_from(invoker, "*")
+    public_configs = [ ":merve_config" ]
+    sources = gypi_values.merve_sources
+  }
+}

src/node_cjs_lexer.cc

@@ -6,6 +6,12 @@
 
 #include "merve.h"
 
+#ifdef MERVE_ERROR_TODO
+#define DOT_NAME(exp) (exp.name)
+#else
+#define DOT_NAME(exp) (exp)
+#endif
+
 namespace node {
 namespace cjs_lexer {
 
@@ -71,14 +77,14 @@ void Parse(const FunctionCallbackInfo<Value>& args) {
   // Convert exports to JS Set
   Local<Set> exports_set = Set::New(isolate);
   for (const auto& exp : analysis.exports) {
-    exports_set->Add(context, CreateString(isolate, exp.name)).ToLocalChecked();
+    exports_set->Add(context, CreateString(isolate, DOT_NAME(exp))).ToLocalChecked();
   }
 
   // Convert reexports to JS array using batch creation
   LocalVector<Value> reexports_vec(isolate);
   reexports_vec.reserve(analysis.re_exports.size());
   for (const auto& reexp : analysis.re_exports) {
-    reexports_vec.push_back(CreateString(isolate, reexp.name));
+    reexports_vec.push_back(CreateString(isolate, DOT_NAME(reexp)));
   }
 
   // Create result array [exports (Set), reexports (Array)]