@herb-tools/node 0.1.1 → 0.2.0

package/extension/libherb/visitor.c

@@ -199,6 +199,31 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
 
     } break;
 
+    case AST_ERB_CASE_MATCH_NODE: {
+      const AST_ERB_CASE_MATCH_NODE_T* erb_case_match_node = ((const AST_ERB_CASE_MATCH_NODE_T *) node);
+
+      if (erb_case_match_node->children != NULL) {
+        for (size_t index = 0; index < array_size(erb_case_match_node->children); index++) {
+          herb_visit_node(array_get(erb_case_match_node->children, index), visitor, data);
+        }
+      }
+
+      if (erb_case_match_node->conditions != NULL) {
+        for (size_t index = 0; index < array_size(erb_case_match_node->conditions); index++) {
+          herb_visit_node(array_get(erb_case_match_node->conditions, index), visitor, data);
+        }
+      }
+
+      if (erb_case_match_node->else_clause != NULL) {
+        herb_visit_node((AST_NODE_T *) erb_case_match_node->else_clause, visitor, data);
+      }
+
+      if (erb_case_match_node->end_node != NULL) {
+        herb_visit_node((AST_NODE_T *) erb_case_match_node->end_node, visitor, data);
+      }
+
+    } break;
+
     case AST_ERB_WHILE_NODE: {
       const AST_ERB_WHILE_NODE_T* erb_while_node = ((const AST_ERB_WHILE_NODE_T *) node);
 
@@ -316,6 +341,17 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
 
     } break;
 
+    case AST_ERB_IN_NODE: {
+      const AST_ERB_IN_NODE_T* erb_in_node = ((const AST_ERB_IN_NODE_T *) node);
+
+      if (erb_in_node->statements != NULL) {
+        for (size_t index = 0; index < array_size(erb_in_node->statements); index++) {
+          herb_visit_node(array_get(erb_in_node->statements, index), visitor, data);
+        }
+      }
+
+    } break;
+
     default: break;
   }
 }

package/extension/libherb/visitor.h

@@ -0,0 +1,11 @@
+#ifndef HERB_VISITOR_H
+#define HERB_VISITOR_H
+
+#include "array.h"
+#include "ast_node.h"
+#include "ast_nodes.h"
+
+void herb_visit_node(const AST_NODE_T* node, bool (*visitor)(const AST_NODE_T*, void*), void* data);
+void herb_visit_child_nodes(const AST_NODE_T* node, bool (*visitor)(const AST_NODE_T* node, void* data), void* data);
+
+#endif

package/extension/nodes.cpp

@@ -675,6 +675,49 @@ napi_value erb_case_nodeNodeFromCStruct(napi_env env, AST_ERB_CASE_NODE_T* erb_c
   napi_set_named_property(env, result, "end_node", end_node);
 
 
+  return result;
+}
+napi_value erb_case_match_nodeNodeFromCStruct(napi_env env, AST_ERB_CASE_MATCH_NODE_T* erb_case_match_node) {
+  if (!erb_case_match_node) {
+    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, ast_node_type_to_string(&erb_case_match_node->base));
+  napi_set_named_property(env, result, "type", type);
+
+  napi_value location = CreateLocation(env, erb_case_match_node->base.location);
+  napi_set_named_property(env, result, "location", location);
+
+  napi_value errors = ErrorsArrayFromCArray(env, erb_case_match_node->base.errors);
+  napi_set_named_property(env, result, "errors", errors);
+
+  napi_value tag_opening = CreateToken(env, erb_case_match_node->tag_opening);
+  napi_set_named_property(env, result, "tag_opening", tag_opening);
+
+  napi_value content = CreateToken(env, erb_case_match_node->content);
+  napi_set_named_property(env, result, "content", content);
+
+  napi_value tag_closing = CreateToken(env, erb_case_match_node->tag_closing);
+  napi_set_named_property(env, result, "tag_closing", tag_closing);
+
+  napi_value children = NodesArrayFromCArray(env, erb_case_match_node->children);
+  napi_set_named_property(env, result, "children", children);
+
+  napi_value conditions = NodesArrayFromCArray(env, erb_case_match_node->conditions);
+  napi_set_named_property(env, result, "conditions", conditions);
+
+  napi_value else_clause = NodeFromCStruct(env, (AST_NODE_T*) erb_case_match_node->else_clause);
+  napi_set_named_property(env, result, "else_clause", else_clause);
+
+  napi_value end_node = NodeFromCStruct(env, (AST_NODE_T*) erb_case_match_node->end_node);
+  napi_set_named_property(env, result, "end_node", end_node);
+
+
   return result;
 }
 napi_value erb_while_nodeNodeFromCStruct(napi_env env, AST_ERB_WHILE_NODE_T* erb_while_node) {
@@ -943,6 +986,71 @@ napi_value erb_unless_nodeNodeFromCStruct(napi_env env, AST_ERB_UNLESS_NODE_T* e
   napi_set_named_property(env, result, "end_node", end_node);
 
 
+  return result;
+}
+napi_value erb_yield_nodeNodeFromCStruct(napi_env env, AST_ERB_YIELD_NODE_T* erb_yield_node) {
+  if (!erb_yield_node) {
+    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, ast_node_type_to_string(&erb_yield_node->base));
+  napi_set_named_property(env, result, "type", type);
+
+  napi_value location = CreateLocation(env, erb_yield_node->base.location);
+  napi_set_named_property(env, result, "location", location);
+
+  napi_value errors = ErrorsArrayFromCArray(env, erb_yield_node->base.errors);
+  napi_set_named_property(env, result, "errors", errors);
+
+  napi_value tag_opening = CreateToken(env, erb_yield_node->tag_opening);
+  napi_set_named_property(env, result, "tag_opening", tag_opening);
+
+  napi_value content = CreateToken(env, erb_yield_node->content);
+  napi_set_named_property(env, result, "content", content);
+
+  napi_value tag_closing = CreateToken(env, erb_yield_node->tag_closing);
+  napi_set_named_property(env, result, "tag_closing", tag_closing);
+
+
+  return result;
+}
+napi_value erb_in_nodeNodeFromCStruct(napi_env env, AST_ERB_IN_NODE_T* erb_in_node) {
+  if (!erb_in_node) {
+    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, ast_node_type_to_string(&erb_in_node->base));
+  napi_set_named_property(env, result, "type", type);
+
+  napi_value location = CreateLocation(env, erb_in_node->base.location);
+  napi_set_named_property(env, result, "location", location);
+
+  napi_value errors = ErrorsArrayFromCArray(env, erb_in_node->base.errors);
+  napi_set_named_property(env, result, "errors", errors);
+
+  napi_value tag_opening = CreateToken(env, erb_in_node->tag_opening);
+  napi_set_named_property(env, result, "tag_opening", tag_opening);
+
+  napi_value content = CreateToken(env, erb_in_node->content);
+  napi_set_named_property(env, result, "content", content);
+
+  napi_value tag_closing = CreateToken(env, erb_in_node->tag_closing);
+  napi_set_named_property(env, result, "tag_closing", tag_closing);
+
+  napi_value statements = NodesArrayFromCArray(env, erb_in_node->statements);
+  napi_set_named_property(env, result, "statements", statements);
+
+
   return result;
 }
 
@@ -1031,6 +1139,9 @@ napi_value NodeFromCStruct(napi_env env, AST_NODE_T* node) {
     case AST_ERB_CASE_NODE:
       return erb_case_nodeNodeFromCStruct(env, (AST_ERB_CASE_NODE_T*) node);
       break;
+    case AST_ERB_CASE_MATCH_NODE:
+      return erb_case_match_nodeNodeFromCStruct(env, (AST_ERB_CASE_MATCH_NODE_T*) node);
+      break;
     case AST_ERB_WHILE_NODE:
       return erb_while_nodeNodeFromCStruct(env, (AST_ERB_WHILE_NODE_T*) node);
       break;
@@ -1052,6 +1163,12 @@ napi_value NodeFromCStruct(napi_env env, AST_NODE_T* node) {
     case AST_ERB_UNLESS_NODE:
       return erb_unless_nodeNodeFromCStruct(env, (AST_ERB_UNLESS_NODE_T*) node);
       break;
+    case AST_ERB_YIELD_NODE:
+      return erb_yield_nodeNodeFromCStruct(env, (AST_ERB_YIELD_NODE_T*) node);
+      break;
+    case AST_ERB_IN_NODE:
+      return erb_in_nodeNodeFromCStruct(env, (AST_ERB_IN_NODE_T*) node);
+      break;
     default:
       napi_value null_value;
       napi_get_null(env, &null_value);

package/extension/nodes.h

@@ -33,6 +33,7 @@ napi_value erb_if_nodeNodeFromCStruct(napi_env env, AST_ERB_IF_NODE_T* erb_if_no
 napi_value erb_block_nodeNodeFromCStruct(napi_env env, AST_ERB_BLOCK_NODE_T* erb_block_node);
 napi_value erb_when_nodeNodeFromCStruct(napi_env env, AST_ERB_WHEN_NODE_T* erb_when_node);
 napi_value erb_case_nodeNodeFromCStruct(napi_env env, AST_ERB_CASE_NODE_T* erb_case_node);
+napi_value erb_case_match_nodeNodeFromCStruct(napi_env env, AST_ERB_CASE_MATCH_NODE_T* erb_case_match_node);
 napi_value erb_while_nodeNodeFromCStruct(napi_env env, AST_ERB_WHILE_NODE_T* erb_while_node);
 napi_value erb_until_nodeNodeFromCStruct(napi_env env, AST_ERB_UNTIL_NODE_T* erb_until_node);
 napi_value erb_for_nodeNodeFromCStruct(napi_env env, AST_ERB_FOR_NODE_T* erb_for_node);
@@ -40,5 +41,7 @@ napi_value erb_rescue_nodeNodeFromCStruct(napi_env env, AST_ERB_RESCUE_NODE_T* e
 napi_value erb_ensure_nodeNodeFromCStruct(napi_env env, AST_ERB_ENSURE_NODE_T* erb_ensure_node);
 napi_value erb_begin_nodeNodeFromCStruct(napi_env env, AST_ERB_BEGIN_NODE_T* erb_begin_node);
 napi_value erb_unless_nodeNodeFromCStruct(napi_env env, AST_ERB_UNLESS_NODE_T* erb_unless_node);
+napi_value erb_yield_nodeNodeFromCStruct(napi_env env, AST_ERB_YIELD_NODE_T* erb_yield_node);
+napi_value erb_in_nodeNodeFromCStruct(napi_env env, AST_ERB_IN_NODE_T* erb_in_node);
 
 #endif

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herb-tools/node",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "type": "module",
   "license": "MIT",
   "homepage": "https://herb-tools.dev",
@@ -24,16 +24,17 @@
     }
   },
   "scripts": {
-    "install": "yarn vendor:libherb && yarn vendor:prism && node-pre-gyp install --fallback-to-build",
+    "install": "yarn vendor && node-pre-gyp install --fallback-to-build",
     "dev": "rollup -c -w",
-    "build": "yarn rebuild",
+    "build": "yarn templates && yarn vendor && yarn rebuild",
     "build:javascript": "rollup -c",
-    "vendor:libherb": "yarn clean && rake templates && cp -r ../../../src ./extension/libherb",
-    "vendor:prism": "node ./bin/vendor-prism.cjs",
-    "rebuild": "yarn clean && yarn vendor:libherb && yarn vendor:prism && node-pre-gyp rebuild && yarn build:javascript",
+    "templates": "rake templates",
+    "revendor": "yarn clean && yarn templates && yarn vendor",
+    "vendor": "node ./bin/vendor.cjs",
+    "rebuild": "node-pre-gyp rebuild && yarn build:javascript",
     "configure": "node-pre-gyp configure",
     "package": "node-pre-gyp package",
-    "clean": "node-pre-gyp clean && rimraf dist/ && rimraf extension/libherb/ && rimraf build/",
+    "clean": "node-pre-gyp clean && rimraf dist/ && rimraf build/ && rimraf extension/libherb/ && rimraf extension/prism/",
     "test": "vitest run",
     "test:watch": "vitest --watch",
     "prepublishOnly": "yarn clean && yarn build && yarn test"
@@ -46,20 +47,10 @@
     "host": "https://github.com/marcoroth/herb/releases/download/"
   },
   "dependencies": {
-    "@herb-tools/core": "0.1.1",
-    "@mapbox/node-pre-gyp": "^2.0.0"
-  },
-  "devDependencies": {
-    "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^16.0.1",
-    "@rollup/plugin-typescript": "^12.1.2",
+    "@herb-tools/core": "0.2.0",
+    "@mapbox/node-pre-gyp": "^2.0.0",
     "node-addon-api": "^5.1.0",
-    "node-pre-gyp-github": "^2.0.0",
-    "rimraf": "^6.0.1",
-    "rollup": "^4.35.0",
-    "tslib": "^2.8.1",
-    "typescript": "^5.8.2",
-    "vitest": "^3.0.0"
+    "node-pre-gyp-github": "^2.0.0"
   },
   "files": [
     "package.json",