@herb-tools/node 0.7.5 → 0.8.1

package/binding.gyp

@@ -11,25 +11,24 @@
 
         # Herb main source files
         "./extension/libherb/analyze_helpers.c",
+        "./extension/libherb/analyze_missing_end.c",
+        "./extension/libherb/analyze_transform.c",
         "./extension/libherb/analyze.c",
         "./extension/libherb/analyzed_ruby.c",
-        "./extension/libherb/array.c",
         "./extension/libherb/ast_node.c",
         "./extension/libherb/ast_nodes.c",
         "./extension/libherb/ast_pretty_print.c",
-        "./extension/libherb/buffer.c",
         "./extension/libherb/element_source.c",
         "./extension/libherb/errors.c",
         "./extension/libherb/extract.c",
         "./extension/libherb/herb.c",
         "./extension/libherb/html_util.c",
         "./extension/libherb/io.c",
-        "./extension/libherb/json.c",
         "./extension/libherb/lexer_peek_helpers.c",
         "./extension/libherb/lexer.c",
         "./extension/libherb/location.c",
-        "./extension/libherb/memory.c",
         "./extension/libherb/parser_helpers.c",
+        "./extension/libherb/parser_match_tags.c",
         "./extension/libherb/parser.c",
         "./extension/libherb/pretty_print.c",
         "./extension/libherb/prism_helpers.c",
@@ -38,6 +37,11 @@
         "./extension/libherb/token.c",
         "./extension/libherb/utf8.c",
         "./extension/libherb/util.c",
+        "./extension/libherb/util/hb_arena.c",
+        "./extension/libherb/util/hb_array.c",
+        "./extension/libherb/util/hb_buffer.c",
+        "./extension/libherb/util/hb_string.c",
+        "./extension/libherb/util/hb_system.c",
         "./extension/libherb/visitor.c",
 
         # Prism main source files

package/dist/herb-node.esm.js

@@ -6,7 +6,7 @@ import { createRequire } from 'module';
 import { fileURLToPath } from 'url';
 
 var name = "@herb-tools/node";
-var version = "0.7.5";
+var version = "0.8.1";
 var packageJSON = {
 	name: name,
 	version: version};
@@ -17,12 +17,12 @@ class HerbBackendNode extends HerbBackend {
     }
 }
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-const require = createRequire(import.meta.url);
-const packagePath = path.resolve(__dirname, "../package.json");
+const __filename$1 = fileURLToPath(import.meta.url);
+const __dirname$1 = path.dirname(__filename$1);
+const require$1 = createRequire(import.meta.url);
+const packagePath = path.resolve(__dirname$1, "../package.json");
 const libherbPath = binary.find(packagePath);
-const libHerbBinary = require(libherbPath);
+const libHerbBinary = require$1(libherbPath);
 /**
  * An instance of the `Herb` class using a Node.js backend.
  * This loads `libherb` in a Node.js C++ native extension.

package/dist/herb-node.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"herb-node.esm.js","sources":["../src/node-backend.ts","../src/index-esm.mts"],"sourcesContent":["import packageJSON from \"../package.json\" with { type: \"json\" }\n\nimport { HerbBackend } from \"@herb-tools/core\"\n\nexport class HerbBackendNode extends HerbBackend {\n  backendVersion(): string {\n    return `${packageJSON.name}@${packageJSON.version}`\n  }\n}\n","export * from \"@herb-tools/core\"\n\nimport path from \"path\"\nimport binary from \"@mapbox/node-pre-gyp\"\n\nimport { createRequire } from \"module\"\nimport { fileURLToPath } from \"url\"\n\nconst __filename = fileURLToPath(import.meta.url)\nconst __dirname = path.dirname(__filename)\nconst require = createRequire(import.meta.url)\n\nconst packagePath = path.resolve(__dirname, \"../package.json\")\nconst libherbPath = binary.find(packagePath)\n\nconst libHerbBinary = require(libherbPath)\n\nimport { HerbBackendNode } from \"./node-backend.js\"\n\n/**\n * An instance of the `Herb` class using a Node.js backend.\n * This loads `libherb` in a Node.js C++ native extension.\n */\nconst Herb = new HerbBackendNode(\n  () => new Promise((resolve, _reject) => resolve(libHerbBinary)),\n)\n\nexport { Herb, HerbBackendNode }\n"],"names":[],"mappings":";;;;;;;;;;;;;AAIM,MAAO,eAAgB,SAAQ,WAAW,CAAA;IAC9C,cAAc,GAAA;QACZ,OAAO,CAAA,EAAG,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,OAAO,CAAA,CAAE;IACrD;AACD;;ACAD,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;AACjD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;AAC1C,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;AAE9C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC;AAC9D,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;AAE5C,MAAM,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC;AAI1C;;;AAGG;AACH,MAAM,IAAI,GAAG,IAAI,eAAe,CAC9B,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;;;;"}
+{"version":3,"file":"herb-node.esm.js","sources":["../src/node-backend.ts","../src/index-esm.mts"],"sourcesContent":["import packageJSON from \"../package.json\" with { type: \"json\" }\n\nimport { HerbBackend } from \"@herb-tools/core\"\n\nexport class HerbBackendNode extends HerbBackend {\n  backendVersion(): string {\n    return `${packageJSON.name}@${packageJSON.version}`\n  }\n}\n","export * from \"@herb-tools/core\"\n\nimport path from \"path\"\nimport binary from \"@mapbox/node-pre-gyp\"\n\nimport { createRequire } from \"module\"\nimport { fileURLToPath } from \"url\"\n\nconst __filename = fileURLToPath(import.meta.url)\nconst __dirname = path.dirname(__filename)\nconst require = createRequire(import.meta.url)\n\nconst packagePath = path.resolve(__dirname, \"../package.json\")\nconst libherbPath = binary.find(packagePath)\n\nconst libHerbBinary = require(libherbPath)\n\nimport { HerbBackendNode } from \"./node-backend.js\"\n\n/**\n * An instance of the `Herb` class using a Node.js backend.\n * This loads `libherb` in a Node.js C++ native extension.\n */\nconst Herb = new HerbBackendNode(\n  () => new Promise((resolve, _reject) => resolve(libHerbBinary)),\n)\n\nexport { Herb, HerbBackendNode }\n"],"names":["__filename","__dirname","require"],"mappings":";;;;;;;;;;;;;AAIM,MAAO,eAAgB,SAAQ,WAAW,CAAA;IAC9C,cAAc,GAAA;QACZ,OAAO,CAAA,EAAG,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,OAAO,CAAA,CAAE;IACrD;AACD;;ACAD,MAAMA,YAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;AACjD,MAAMC,WAAS,GAAG,IAAI,CAAC,OAAO,CAACD,YAAU,CAAC;AAC1C,MAAME,SAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;AAE9C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAACD,WAAS,EAAE,iBAAiB,CAAC;AAC9D,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;AAE5C,MAAM,aAAa,GAAGC,SAAO,CAAC,WAAW,CAAC;AAI1C;;;AAGG;AACH,MAAM,IAAI,GAAG,IAAI,eAAe,CAC9B,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;;;;"}

package/extension/error_helpers.cpp

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.7.5/templates/javascript/packages/node/extension/error_helpers.cpp.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.1/templates/javascript/packages/node/extension/error_helpers.cpp.erb
 
 #include <node_api.h>
 #include "error_helpers.h"
@@ -7,16 +7,16 @@
 #include "nodes.h"
 
 extern "C" {
-#include "../extension/libherb/include/herb.h"
-#include "../extension/libherb/include/token.h"
-#include "../extension/libherb/include/array.h"
-#include "../extension/libherb/include/errors.h"
 #include "../extension/libherb/include/ast_node.h"
 #include "../extension/libherb/include/ast_nodes.h"
+#include "../extension/libherb/include/errors.h"
+#include "../extension/libherb/include/herb.h"
+#include "../extension/libherb/include/token.h"
+#include "../extension/libherb/include/util/hb_array.h"
 }
 
 napi_value ErrorFromCStruct(napi_env env, ERROR_T* error);
-napi_value ErrorsArrayFromCArray(napi_env env, array_T* array);
+napi_value ErrorsArrayFromCArray(napi_env env, hb_array_T* array);
 
 napi_value UnexpectedErrorFromCStruct(napi_env env, UNEXPECTED_ERROR_T* unexpected_error) {
   if (!unexpected_error) {
@@ -279,14 +279,66 @@ napi_value RubyParseErrorFromCStruct(napi_env env, RUBY_PARSE_ERROR_T* ruby_pars
   return result;
 }
 
+napi_value ERBControlFlowScopeErrorFromCStruct(napi_env env, ERB_CONTROL_FLOW_SCOPE_ERROR_T* erb_control_flow_scope_error) {
+  if (!erb_control_flow_scope_error) {
+    napi_value null_value;
+    napi_get_null(env, &null_value);
+    return null_value;
+  }
+
+  napi_value result;
+  napi_create_object(env, &result);
+
+  napi_value type = CreateString(env, error_type_to_string(&erb_control_flow_scope_error->base));
+  napi_set_named_property(env, result, "type", type);
+
+  napi_value message = CreateString(env, erb_control_flow_scope_error->base.message);
+  napi_set_named_property(env, result, "message", message);
+
+  napi_value location = CreateLocation(env, erb_control_flow_scope_error->base.location);
+  napi_set_named_property(env, result, "location", location);
+
+  napi_value keyword = CreateString(env, erb_control_flow_scope_error->keyword);
+  napi_set_named_property(env, result, "keyword", keyword);
+
+
+  return result;
+}
+
+napi_value MissingERBEndTagErrorFromCStruct(napi_env env, MISSINGERB_END_TAG_ERROR_T* missingerb_end_tag_error) {
+  if (!missingerb_end_tag_error) {
+    napi_value null_value;
+    napi_get_null(env, &null_value);
+    return null_value;
+  }
 
-napi_value ErrorsArrayFromCArray(napi_env env, array_T* array) {
+  napi_value result;
+  napi_create_object(env, &result);
+
+  napi_value type = CreateString(env, error_type_to_string(&missingerb_end_tag_error->base));
+  napi_set_named_property(env, result, "type", type);
+
+  napi_value message = CreateString(env, missingerb_end_tag_error->base.message);
+  napi_set_named_property(env, result, "message", message);
+
+  napi_value location = CreateLocation(env, missingerb_end_tag_error->base.location);
+  napi_set_named_property(env, result, "location", location);
+
+  napi_value keyword = CreateString(env, missingerb_end_tag_error->keyword);
+  napi_set_named_property(env, result, "keyword", keyword);
+
+
+  return result;
+}
+
+
+napi_value ErrorsArrayFromCArray(napi_env env, hb_array_T* array) {
   napi_value result;
   napi_create_array(env, &result);
 
   if (array) {
-    for (size_t i = 0; i < array_size(array); i++) {
-      ERROR_T* error = (ERROR_T*) array_get(array, i);
+    for (size_t i = 0; i < hb_array_size(array); i++) {
+      ERROR_T* error = (ERROR_T*) hb_array_get(array, i);
       if (error) {
         napi_value js_error = ErrorFromCStruct(env, error);
         napi_set_element(env, result, i, js_error);
@@ -332,6 +384,12 @@ napi_value ErrorFromCStruct(napi_env env, ERROR_T* error) {
     case RUBY_PARSE_ERROR:
       return RubyParseErrorFromCStruct(env, (RUBY_PARSE_ERROR_T*) error);
       break;
+    case ERB_CONTROL_FLOW_SCOPE_ERROR:
+      return ERBControlFlowScopeErrorFromCStruct(env, (ERB_CONTROL_FLOW_SCOPE_ERROR_T*) error);
+      break;
+    case MISSINGERB_END_TAG_ERROR:
+      return MissingERBEndTagErrorFromCStruct(env, (MISSINGERB_END_TAG_ERROR_T*) error);
+      break;
     default:
       napi_value null_value;
       napi_get_null(env, &null_value);

package/extension/error_helpers.h

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.7.5/templates/javascript/packages/node/extension/error_helpers.h.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.1/templates/javascript/packages/node/extension/error_helpers.h.erb
 
 #ifndef HERB_EXTENSION_ERRORS_H
 #define HERB_EXTENSION_ERRORS_H
@@ -11,7 +11,7 @@ extern "C" {
 }
 
 napi_value ErrorFromCStruct(napi_env env, ERROR_T* error);
-napi_value ErrorsArrayFromCArray(napi_env env, array_T* array);
+napi_value ErrorsArrayFromCArray(napi_env env, hb_array_T* array);
 
 napi_value UnexpectedErrorFromCStruct(napi_env env, UNEXPECTED_ERROR_T* unexpected_error);
 napi_value UnexpectedTokenErrorFromCStruct(napi_env env, UNEXPECTED_TOKEN_ERROR_T* unexpected_token_error);
@@ -22,5 +22,7 @@ napi_value QuotesMismatchErrorFromCStruct(napi_env env, QUOTES_MISMATCH_ERROR_T*
 napi_value VoidElementClosingTagErrorFromCStruct(napi_env env, VOID_ELEMENT_CLOSING_TAG_ERROR_T* void_element_closing_tag_error);
 napi_value UnclosedElementErrorFromCStruct(napi_env env, UNCLOSED_ELEMENT_ERROR_T* unclosed_element_error);
 napi_value RubyParseErrorFromCStruct(napi_env env, RUBY_PARSE_ERROR_T* ruby_parse_error);
+napi_value ERBControlFlowScopeErrorFromCStruct(napi_env env, ERB_CONTROL_FLOW_SCOPE_ERROR_T* erb_control_flow_scope_error);
+napi_value MissingERBEndTagErrorFromCStruct(napi_env env, MISSINGERB_END_TAG_ERROR_T* missingerb_end_tag_error);
 
 #endif

package/extension/extension_helpers.cpp

@@ -4,15 +4,15 @@
 #include <string.h>
 
 extern "C" {
-#include "../extension/libherb/include/array.h"
 #include "../extension/libherb/include/ast_nodes.h"
-#include "../extension/libherb/include/buffer.h"
 #include "../extension/libherb/include/herb.h"
 #include "../extension/libherb/include/io.h"
 #include "../extension/libherb/include/location.h"
 #include "../extension/libherb/include/position.h"
 #include "../extension/libherb/include/range.h"
 #include "../extension/libherb/include/token.h"
+#include "../extension/libherb/include/util/hb_array.h"
+#include "../extension/libherb/include/util/hb_buffer.h"
 }
 
 #include "error_helpers.h"
@@ -46,6 +46,13 @@ napi_value CreateString(napi_env env, const char* str) {
   return result;
 }
 
+napi_value CreateStringFromHbString(napi_env env, hb_string_T string) {
+  napi_value result;
+  napi_create_string_utf8(env, string.data, string.length, &result);
+  return result;
+}
+
+
 napi_value CreatePosition(napi_env env, position_T position) {
   napi_value result;
   napi_create_object(env, &result);
@@ -136,7 +143,7 @@ napi_value ReadFileToString(napi_env env, const char* file_path) {
   return result;
 }
 
-napi_value CreateLexResult(napi_env env, array_T* tokens, napi_value source) {
+napi_value CreateLexResult(napi_env env, hb_array_T* tokens, napi_value source) {
   napi_value result, tokens_array, errors_array, warnings_array;
 
   napi_create_object(env, &result);
@@ -146,8 +153,8 @@ napi_value CreateLexResult(napi_env env, array_T* tokens, napi_value source) {
 
   // Add tokens to array
   if (tokens) {
-    for (size_t i = 0; i < array_size(tokens); i++) {
-      token_T* token = (token_T*)array_get(tokens, i);
+    for (size_t i = 0; i < hb_array_size(tokens); i++) {
+      token_T* token = (token_T*)hb_array_get(tokens, i);
       if (token) {
         napi_value token_obj = CreateToken(env, token);
         napi_set_element(env, tokens_array, i, token_obj);

package/extension/extension_helpers.h

@@ -4,14 +4,16 @@
 #include <node_api.h>
 
 extern "C" {
-#include "../extension/libherb/include/array.h"
 #include "../extension/libherb/include/ast_nodes.h"
+#include "../extension/libherb/include/util/hb_array.h"
+#include "../extension/libherb/include/util/hb_string.h"
 }
 
 char* CheckString(napi_env env, napi_value value);
 napi_value CreateString(napi_env env, const char* str);
+napi_value CreateStringFromHbString(napi_env env, hb_string_T string);
 napi_value ReadFileToString(napi_env env, const char* file_path);
-napi_value CreateLexResult(napi_env env, array_T* tokens, napi_value source);
+napi_value CreateLexResult(napi_env env, hb_array_T* tokens, napi_value source);
 napi_value CreateParseResult(napi_env env, AST_DOCUMENT_NODE_T* root, napi_value source);
 
 napi_value CreateLocation(napi_env env, location_T location);

package/extension/herb.cpp

@@ -1,12 +1,12 @@
 extern "C" {
 #include "../extension/libherb/include/analyze.h"
-#include "../extension/libherb/include/array.h"
 #include "../extension/libherb/include/ast_nodes.h"
-#include "../extension/libherb/include/buffer.h"
 #include "../extension/libherb/include/herb.h"
 #include "../extension/libherb/include/location.h"
 #include "../extension/libherb/include/range.h"
 #include "../extension/libherb/include/token.h"
+#include "../extension/libherb/include/util/hb_array.h"
+#include "../extension/libherb/include/util/hb_buffer.h"
 }
 
 #include "error_helpers.h"
@@ -31,7 +31,7 @@ napi_value Herb_lex(napi_env env, napi_callback_info info) {
   char* string = CheckString(env, args[0]);
   if (!string) { return nullptr; }
 
-  array_T* tokens = herb_lex(string);
+  hb_array_T* tokens = herb_lex(string);
   napi_value result = CreateLexResult(env, tokens, args[0]);
 
   herb_free_tokens(&tokens);
@@ -53,7 +53,7 @@ napi_value Herb_lex_file(napi_env env, napi_callback_info info) {
   char* file_path = CheckString(env, args[0]);
   if (!file_path) { return nullptr; }
 
-  array_T* tokens = herb_lex_file(file_path);
+  hb_array_T* tokens = herb_lex_file(file_path);
   napi_value source_value = ReadFileToString(env, file_path);
   napi_value result = CreateLexResult(env, tokens, source_value);
 
@@ -142,37 +142,6 @@ napi_value Herb_parse_file(napi_env env, napi_callback_info info) {
   return result;
 }
 
-napi_value Herb_lex_to_json(napi_env env, napi_callback_info info) {
-  size_t argc = 1;
-  napi_value args[1];
-  napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
-
-  if (argc < 1) {
-    napi_throw_error(env, nullptr, "Wrong number of arguments");
-    return nullptr;
-  }
-
-  char* string = CheckString(env, args[0]);
-  if (!string) { return nullptr; }
-
-  buffer_T output;
-  if (!buffer_init(&output)) {
-    free(string);
-    napi_throw_error(env, nullptr, "Failed to initialize buffer");
-    return nullptr;
-  }
-
-  herb_lex_json_to_buffer(string, &output);
-
-  napi_value result;
-  napi_create_string_utf8(env, output.value, output.length, &result);
-
-  buffer_free(&output);
-  free(string);
-
-  return result;
-}
-
 napi_value Herb_extract_ruby(napi_env env, napi_callback_info info) {
   size_t argc = 1;
   napi_value args[1];
@@ -186,8 +155,8 @@ napi_value Herb_extract_ruby(napi_env env, napi_callback_info info) {
   char* string = CheckString(env, args[0]);
   if (!string) { return nullptr; }
 
-  buffer_T output;
-  if (!buffer_init(&output)) {
+  hb_buffer_T output;
+  if (!hb_buffer_init(&output, strlen(string))) {
     free(string);
     napi_throw_error(env, nullptr, "Failed to initialize buffer");
     return nullptr;
@@ -198,7 +167,7 @@ napi_value Herb_extract_ruby(napi_env env, napi_callback_info info) {
   napi_value result;
   napi_create_string_utf8(env, output.value, NAPI_AUTO_LENGTH, &result);
 
-  buffer_free(&output);
+  free(output.value);
   free(string);
   return result;
 }
@@ -216,8 +185,8 @@ napi_value Herb_extract_html(napi_env env, napi_callback_info info) {
   char* string = CheckString(env, args[0]);
   if (!string) { return nullptr; }
 
-  buffer_T output;
-  if (!buffer_init(&output)) {
+  hb_buffer_T output;
+  if (!hb_buffer_init(&output, strlen(string))) {
     free(string);
     napi_throw_error(env, nullptr, "Failed to initialize buffer");
     return nullptr;
@@ -228,7 +197,7 @@ napi_value Herb_extract_html(napi_env env, napi_callback_info info) {
   napi_value result;
   napi_create_string_utf8(env, output.value, NAPI_AUTO_LENGTH, &result);
 
-  buffer_free(&output);
+  free(output.value);
   free(string);
   return result;
 }
@@ -252,7 +221,6 @@ napi_value Init(napi_env env, napi_value exports) {
     { "lex", nullptr, Herb_lex, nullptr, nullptr, nullptr, napi_default, nullptr },
     { "parseFile", nullptr, Herb_parse_file, nullptr, nullptr, nullptr, napi_default, nullptr },
     { "lexFile", nullptr, Herb_lex_file, nullptr, nullptr, nullptr, napi_default, nullptr },
-    { "lexToJson", nullptr, Herb_lex_to_json, nullptr, nullptr, nullptr, napi_default, nullptr },
     { "extractRuby", nullptr, Herb_extract_ruby, nullptr, nullptr, nullptr, napi_default, nullptr },
     { "extractHTML", nullptr, Herb_extract_html, nullptr, nullptr, nullptr, napi_default, nullptr },
     { "version", nullptr, Herb_version, nullptr, nullptr, nullptr, napi_default, nullptr },