Merge pull request #20 from advanced-security/extractor-updates

Extractor - Remove JSON

Author: GeekMasher

Cargo.lock

@@ -11,7 +11,6 @@ flate2 = "1.0"
 
 tree-sitter = ">= 0.20, < 0.21"
 tree-sitter-hcl = { git = "https://github.com/GeekMasher/tree-sitter-hcl", rev = "5e045dd1ff7852511c249c4c5d919d9556751d98" }
-tree-sitter-json = { git = "https://github.com/tausbn/tree-sitter-json.git", rev = "745663ee997f1576fe1e7187e6347e0db36ec7a9" }
 tree-sitter-dockerfile = { git = "https://github.com/GeekMasher/tree-sitter-dockerfile", rev = "c0a9d694d9bf8ab79a919f5f9c7bc9c169caf321" }
 clap = { version = "4.2", features = ["derive"] }
 tracing = "0.1"

extractor/Cargo.toml

@@ -17,10 +17,7 @@ pub fn run(_: Options) -> std::io::Result<()> {
         .include_extensions(&[
             ".hcl",
             ".tf",
-            ".ftvars", // Terraform / HCL files
-            ".json",
-            ".jsonc",
-            ".jsonl",      // JSON files
+            ".ftvars",     // Terraform / HCL files
             ".Dockerfile", // Docker files
         ])
         .include_globs(&[

extractor/src/autobuilder.rs

@@ -36,12 +36,6 @@ pub fn run(options: Options) -> std::io::Result<()> {
                 node_types: tree_sitter_hcl::NODE_TYPES,
                 file_globs: vec!["*.hcl".into(), "*.tf".into(), "*.tfvar".into()],
             },
-            simple::LanguageSpec {
-                prefix: "json",
-                ts_language: tree_sitter_json::language(),
-                node_types: tree_sitter_json::NODE_TYPES,
-                file_globs: vec!["*.json".into(), "*.jsonl".into(), "*.jsonc".into()],
-            },
             simple::LanguageSpec {
                 prefix: "dockerfile",
                 ts_language: tree_sitter_dockerfile::language(),

extractor/src/extractor.rs

@@ -27,10 +27,6 @@ pub fn run(options: Options) -> std::io::Result<()> {
             name: "HCL".to_owned(),
             node_types: tree_sitter_hcl::NODE_TYPES,
         },
-        Language {
-            name: "JSON".to_owned(),
-            node_types: tree_sitter_json::NODE_TYPES,
-        },
         Language {
             name: "DOCKERFILE".to_owned(),
             node_types: tree_sitter_dockerfile::NODE_TYPES,

extractor/src/generator.rs

@@ -1,13 +1,11 @@
 private import TreeSitter
 import Hcl
 import Container
-import Json
 
 /**
  * AST Common Type
  */
 cached
 newtype TAstNode =
   THclAstNode(HCL::AstNode node) or
-  TContainerAstNode(DOCKERFILE::AstNode node) or
-  TJsonAstNode(JSON::AstNode node)
+  TContainerAstNode(DOCKERFILE::AstNode node)