fix: change direction, drop socket server and byte stream protocol

envyhq · Aug 16, 2024 · bae644f · bae644f
1 parent 8b2d89d
commit bae644f
Show file tree

Hide file tree

Showing 100 changed files with 86 additions and 2,321 deletions.
diff --git a/lang/Cargo.lock b/lang/Cargo.lock
diff --git a/lang/Cargo.toml b/lang/Cargo.toml
@@ -2,33 +2,25 @@
 resolver = "2"
 
 members = [
-  "packages/parser",
-  "packages/parser/__examples",
+  "packages/parser/lib",
+  "packages/parser/examples",
+  "packages/lexer/lib",
+  "packages/lexer/examples",
 
-  "packages/lexer",
-  "packages/lexer/__examples",
+  "packages/resolvers/var/lib",
+  "packages/resolvers/var/examples",
+  "packages/resolvers/provider/lib",
 
-  "packages/resolvers/var",
-  "packages/resolvers/provider",
-  "packages/resolvers/__examples/var",
+  "packages/code-generation/javascript/lib",
+  "packages/code-generation/javascript/examples",
 
-  "packages/position_indexer",
+  "packages/providers/env/lib",
+  "packages/providers/env/examples",
+  "packages/providers/aws-secrets-manager/lib",
+  "packages/providers/aws-secrets-manager/examples",
 
   "packages/language-server",
-
-  "packages/code-generation/javascript",
-  "packages/code-generation/__examples/javascript",
-
-  "packages/providers/core/lib",
-  "packages/providers/core/load-testing",
-
-  "packages/providers/providers/env/lib",
-  "packages/providers/providers/env/server",
-  "packages/providers/providers/env/__examples",
-
-  "packages/providers/providers/aws-secrets-manager/lib",
-  "packages/providers/providers/aws-secrets-manager/server",
-  "packages/providers/providers/aws-secrets-manager/__examples",
+  "packages/position_indexer",
 
   "testing/nvx-parsing",
   "testing/unit",

diff --git a/lang/packages/code-generation/__examples/javascript/Cargo.toml b/lang/packages/code-generation/__examples/javascript/Cargo.toml
diff --git a/lang/packages/code-generation/javascript/examples/Cargo.toml b/lang/packages/code-generation/javascript/examples/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "nv-examples-codegen-javascript"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+env_logger = "0.11.2"
+log = "0.4.20"
+nv-codegen-javascript = { path = "../../javascript/lib" }
+nv-parser = { path = "../../../parser/lib" }
+nv-lexer = { path = "../../../lexer/lib" }
diff --git a/...eration/__examples/javascript/src/main.rs → ...eneration/javascript/examples/src/main.rs b/...eration/__examples/javascript/src/main.rs → ...eneration/javascript/examples/src/main.rs
diff --git a/...ges/code-generation/javascript/Cargo.toml → ...code-generation/javascript/lib/Cargo.toml b/...ges/code-generation/javascript/Cargo.toml → ...code-generation/javascript/lib/Cargo.toml
@@ -4,4 +4,5 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-nv-parser = { path = "../../parser" }
+nv-parser = { path = "../../../parser/lib" }
+
diff --git a/...ges/code-generation/javascript/src/lib.rs → ...code-generation/javascript/lib/src/lib.rs b/...ges/code-generation/javascript/src/lib.rs → ...code-generation/javascript/lib/src/lib.rs
diff --git a/lang/packages/language-server/Cargo.toml b/lang/packages/language-server/Cargo.toml
@@ -15,7 +15,7 @@ tokio = { version = "1.38.0", features = [
   "macros",
   "net",
 ] }
-nv-parser = { path = "../parser" }
-nv-lexer = { path = "../lexer" }
+nv-parser = { path = "../parser/lib" }
+nv-lexer = { path = "../lexer/lib" }
 nv-position-indexer = { path = "../position_indexer" }
-nv-var-resolver = { path = "../resolvers/var" }
+nv-var-resolver = { path = "../resolvers/var/lib" }
diff --git a/lang/packages/lexer/__examples/Cargo.toml → lang/packages/lexer/examples/Cargo.toml b/lang/packages/lexer/__examples/Cargo.toml → lang/packages/lexer/examples/Cargo.toml
@@ -6,4 +6,4 @@ edition = "2021"
 [dependencies]
 env_logger = "0.11.2"
 log = "0.4.20"
-nv-lexer = { path = "../" }
+nv-lexer = { path = "../lib" }
diff --git a/lang/packages/lexer/__examples/src/main.rs → lang/packages/lexer/examples/src/main.rs b/lang/packages/lexer/__examples/src/main.rs → lang/packages/lexer/examples/src/main.rs
diff --git a/lang/packages/lexer/Cargo.toml → lang/packages/lexer/lib/Cargo.toml b/lang/packages/lexer/Cargo.toml → lang/packages/lexer/lib/Cargo.toml
@@ -12,4 +12,4 @@ unicode-segmentation = "1.11.0"
 
 [dev-dependencies]
 insta = { version = "1.38.0", features = ["yaml"] }
-nv-unit-testing = { path = "../../testing/unit" }
+nv-unit-testing = { path = "../../../testing/unit" }
diff --git a/...packages/lexer/src/buffers/identifiers.rs → ...ages/lexer/lib/src/buffers/identifiers.rs b/...packages/lexer/src/buffers/identifiers.rs → ...ages/lexer/lib/src/buffers/identifiers.rs
diff --git a/lang/packages/lexer/src/buffers/mod.rs → lang/packages/lexer/lib/src/buffers/mod.rs b/lang/packages/lexer/src/buffers/mod.rs → lang/packages/lexer/lib/src/buffers/mod.rs
diff --git a/lang/packages/lexer/src/chars.rs → lang/packages/lexer/lib/src/chars.rs b/lang/packages/lexer/src/chars.rs → lang/packages/lexer/lib/src/chars.rs
diff --git a/lang/packages/lexer/src/lexer.rs → lang/packages/lexer/lib/src/lexer.rs b/lang/packages/lexer/src/lexer.rs → lang/packages/lexer/lib/src/lexer.rs
diff --git a/...lexer/src/lexers/attribute_block_lexer.rs → ...r/lib/src/lexers/attribute_block_lexer.rs b/...lexer/src/lexers/attribute_block_lexer.rs → ...r/lib/src/lexers/attribute_block_lexer.rs
diff --git a/lang/packages/lexer/src/lexers/mod.rs → lang/packages/lexer/lib/src/lexers/mod.rs b/lang/packages/lexer/src/lexers/mod.rs → lang/packages/lexer/lib/src/lexers/mod.rs
diff --git a/...er/src/lexers/module_declaration_lexer.rs → ...ib/src/lexers/module_declaration_lexer.rs b/...er/src/lexers/module_declaration_lexer.rs → ...ib/src/lexers/module_declaration_lexer.rs
diff --git a/.../src/lexers/provider_declaration_lexer.rs → .../src/lexers/provider_declaration_lexer.rs b/.../src/lexers/provider_declaration_lexer.rs → .../src/lexers/provider_declaration_lexer.rs
diff --git a/...lexer__tests__lexes_attribute_tokens.snap → ...lexer__tests__lexes_attribute_tokens.snap b/...lexer__tests__lexes_attribute_tokens.snap → ...lexer__tests__lexes_attribute_tokens.snap
diff --git a/...ests__lexes_builtin_attribute_tokens.snap → ...ests__lexes_builtin_attribute_tokens.snap b/...ests__lexes_builtin_attribute_tokens.snap → ...ests__lexes_builtin_attribute_tokens.snap
diff --git a/..._tests__lexes_float_attribute_tokens.snap → ..._tests__lexes_float_attribute_tokens.snap b/..._tests__lexes_float_attribute_tokens.snap → ..._tests__lexes_float_attribute_tokens.snap
diff --git a/...s__lexes_incomplete_attribute_tokens.snap → ...s__lexes_incomplete_attribute_tokens.snap b/...s__lexes_incomplete_attribute_tokens.snap → ...s__lexes_incomplete_attribute_tokens.snap
diff --git a/...tests__lexes_inline_attribute_tokens.snap → ...tests__lexes_inline_attribute_tokens.snap b/...tests__lexes_inline_attribute_tokens.snap → ...tests__lexes_inline_attribute_tokens.snap
diff --git a/...on_lexer__tests__lexes_module_tokens.snap → ...on_lexer__tests__lexes_module_tokens.snap b/...on_lexer__tests__lexes_module_tokens.snap → ...on_lexer__tests__lexes_module_tokens.snap
diff --git a/...tests__lexes_module_tokens_with_vars.snap → ...tests__lexes_module_tokens_with_vars.snap b/...tests__lexes_module_tokens_with_vars.snap → ...tests__lexes_module_tokens_with_vars.snap
diff --git a/..._lexer__tests__lexes_provider_tokens.snap → ..._lexer__tests__lexes_provider_tokens.snap b/..._lexer__tests__lexes_provider_tokens.snap → ..._lexer__tests__lexes_provider_tokens.snap
diff --git a/...xer__tests__lexes_source_file_tokens.snap → ...xer__tests__lexes_source_file_tokens.snap b/...xer__tests__lexes_source_file_tokens.snap → ...xer__tests__lexes_source_file_tokens.snap
diff --git a/...lexes_source_file_tokens_with_module.snap → ...lexes_source_file_tokens_with_module.snap b/...lexes_source_file_tokens_with_module.snap → ...lexes_source_file_tokens_with_module.snap
diff --git a/...xes_source_file_tokens_with_provider.snap → ...xes_source_file_tokens_with_provider.snap b/...xes_source_file_tokens_with_provider.snap → ...xes_source_file_tokens_with_provider.snap
diff --git a/...exes_source_file_tokens_with_pub_var.snap → ...exes_source_file_tokens_with_pub_var.snap b/...exes_source_file_tokens_with_pub_var.snap → ...exes_source_file_tokens_with_pub_var.snap
diff --git a/...urce_file_tokens_with_var_attributes.snap → ...urce_file_tokens_with_var_attributes.snap b/...urce_file_tokens_with_var_attributes.snap → ...urce_file_tokens_with_var_attributes.snap
diff --git a/...ation_lexer__tests__lexes_var_tokens.snap → ...ation_lexer__tests__lexes_var_tokens.snap b/...ation_lexer__tests__lexes_var_tokens.snap → ...ation_lexer__tests__lexes_var_tokens.snap
diff --git a/...ges/lexer/src/lexers/source_file_lexer.rs → ...lexer/lib/src/lexers/source_file_lexer.rs b/...ges/lexer/src/lexers/source_file_lexer.rs → ...lexer/lib/src/lexers/source_file_lexer.rs
diff --git a/lang/packages/lexer/src/lexers/utils.rs → lang/packages/lexer/lib/src/lexers/utils.rs b/lang/packages/lexer/src/lexers/utils.rs → lang/packages/lexer/lib/src/lexers/utils.rs
diff --git a/...lexer/src/lexers/var_declaration_lexer.rs → ...r/lib/src/lexers/var_declaration_lexer.rs b/...lexer/src/lexers/var_declaration_lexer.rs → ...r/lib/src/lexers/var_declaration_lexer.rs
diff --git a/lang/packages/lexer/src/lib.rs → lang/packages/lexer/lib/src/lib.rs b/lang/packages/lexer/src/lib.rs → lang/packages/lexer/lib/src/lib.rs
diff --git a/lang/packages/lexer/src/tokens.rs → lang/packages/lexer/lib/src/tokens.rs b/lang/packages/lexer/src/tokens.rs → lang/packages/lexer/lib/src/tokens.rs
diff --git a/lang/packages/parser/__examples/Cargo.toml → lang/packages/parser/examples/Cargo.toml b/lang/packages/parser/__examples/Cargo.toml → lang/packages/parser/examples/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2021"
 [dependencies]
 env_logger = "0.11.2"
 log = "0.4.20"
-nv-parser = { path = "../" }
-nv-lexer = { path = "../../lexer/" }
+nv-parser = { path = "../lib" }
+nv-lexer = { path = "../../lexer/lib" }
diff --git a/lang/packages/parser/__examples/src/main.rs → lang/packages/parser/examples/src/main.rs b/lang/packages/parser/__examples/src/main.rs → lang/packages/parser/examples/src/main.rs
diff --git a/lang/packages/parser/Cargo.toml → lang/packages/parser/lib/Cargo.toml b/lang/packages/parser/Cargo.toml → lang/packages/parser/lib/Cargo.toml
@@ -6,9 +6,9 @@ edition = "2021"
 [dependencies]
 env_logger = "0.11.2"
 log = "0.4.20"
-nv-lexer = { path = "../lexer" }
+nv-lexer = { path = "../../lexer/lib" }
 serde = { version = "1.0.199", features = ["derive", "rc"] }
 
 [dev-dependencies]
 insta = { version = "1.38.0", features = ["yaml"] }
-nv-unit-testing = { path = "../../testing/unit" }
+nv-unit-testing = { path = "../../../testing/unit" }
diff --git a/...ckages/parser/src/abstract_syntax_tree.rs → ...es/parser/lib/src/abstract_syntax_tree.rs b/...ckages/parser/src/abstract_syntax_tree.rs → ...es/parser/lib/src/abstract_syntax_tree.rs
diff --git a/lang/packages/parser/src/attributes.rs → lang/packages/parser/lib/src/attributes.rs b/lang/packages/parser/src/attributes.rs → lang/packages/parser/lib/src/attributes.rs
diff --git a/lang/packages/parser/src/lib.rs → lang/packages/parser/lib/src/lib.rs b/lang/packages/parser/src/lib.rs → lang/packages/parser/lib/src/lib.rs
diff --git a/lang/packages/parser/src/modules.rs → lang/packages/parser/lib/src/modules.rs b/lang/packages/parser/src/modules.rs → lang/packages/parser/lib/src/modules.rs
diff --git a/lang/packages/parser/src/parser.rs → lang/packages/parser/lib/src/parser.rs b/lang/packages/parser/src/parser.rs → lang/packages/parser/lib/src/parser.rs
diff --git a/...ser/src/parsers/attribute_block_parser.rs → ...lib/src/parsers/attribute_block_parser.rs b/...ser/src/parsers/attribute_block_parser.rs → ...lib/src/parsers/attribute_block_parser.rs
diff --git a/lang/packages/parser/src/parsers/mod.rs → lang/packages/parser/lib/src/parsers/mod.rs b/lang/packages/parser/src/parsers/mod.rs → lang/packages/parser/lib/src/parsers/mod.rs
diff --git a/.../src/parsers/module_declaration_parser.rs → .../src/parsers/module_declaration_parser.rs b/.../src/parsers/module_declaration_parser.rs → .../src/parsers/module_declaration_parser.rs
diff --git a/...rc/parsers/provider_declaration_parser.rs → ...rc/parsers/provider_declaration_parser.rs b/...rc/parsers/provider_declaration_parser.rs → ...rc/parsers/provider_declaration_parser.rs
diff --git a/...n_parser__tests__parses_module_nodes.snap → ...n_parser__tests__parses_module_nodes.snap b/...n_parser__tests__parses_module_nodes.snap → ...n_parser__tests__parses_module_nodes.snap
diff --git a/...parser__tests__parses_provider_nodes.snap → ...parser__tests__parses_provider_nodes.snap b/...parser__tests__parses_provider_nodes.snap → ...parser__tests__parses_provider_nodes.snap
diff --git a/...ser__tests__parses_source_file_nodes.snap → ...ser__tests__parses_source_file_nodes.snap b/...ser__tests__parses_source_file_nodes.snap → ...ser__tests__parses_source_file_nodes.snap
diff --git a/...arser__tests__parses_var_block_nodes.snap → ...arser__tests__parses_var_block_nodes.snap b/...arser__tests__parses_var_block_nodes.snap → ...arser__tests__parses_var_block_nodes.snap
diff --git a/...tion_parser__tests__parses_var_nodes.snap → ...tion_parser__tests__parses_var_nodes.snap b/...tion_parser__tests__parses_var_nodes.snap → ...tion_parser__tests__parses_var_nodes.snap
diff --git a/.../parser/src/parsers/source_file_parser.rs → ...ser/lib/src/parsers/source_file_parser.rs b/.../parser/src/parsers/source_file_parser.rs → ...ser/lib/src/parsers/source_file_parser.rs
diff --git a/...es/parser/src/parsers/var_block_parser.rs → ...arser/lib/src/parsers/var_block_parser.rs b/...es/parser/src/parsers/var_block_parser.rs → ...arser/lib/src/parsers/var_block_parser.rs
diff --git a/...ser/src/parsers/var_declaration_parser.rs → ...lib/src/parsers/var_declaration_parser.rs b/...ser/src/parsers/var_declaration_parser.rs → ...lib/src/parsers/var_declaration_parser.rs
diff --git a/lang/packages/parser/src/providers.rs → lang/packages/parser/lib/src/providers.rs b/lang/packages/parser/src/providers.rs → lang/packages/parser/lib/src/providers.rs
diff --git a/lang/packages/parser/src/vars.rs → lang/packages/parser/lib/src/vars.rs b/lang/packages/parser/src/vars.rs → lang/packages/parser/lib/src/vars.rs
diff --git a/lang/packages/position_indexer/Cargo.toml b/lang/packages/position_indexer/Cargo.toml
@@ -5,4 +5,5 @@ edition = "2021"
 
 [dependencies]
 log = "0.4.21"
-nv-parser = { path = "../parser" }
+nv-parser = { path = "../parser/lib" }
+
diff --git a/...aws-secrets-manager/__examples/Cargo.toml → ...s/aws-secrets-manager/examples/Cargo.toml b/...aws-secrets-manager/__examples/Cargo.toml → ...s/aws-secrets-manager/examples/Cargo.toml
diff --git a/...ws-secrets-manager/__examples/src/main.rs → .../aws-secrets-manager/examples/src/main.rs b/...ws-secrets-manager/__examples/src/main.rs → .../aws-secrets-manager/examples/src/main.rs
diff --git a/...viders/aws-secrets-manager/lib/Cargo.toml → ...viders/aws-secrets-manager/lib/Cargo.toml b/...viders/aws-secrets-manager/lib/Cargo.toml → ...viders/aws-secrets-manager/lib/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 log = "0.4.21"
-nv-provider-core = { path = "../../../core/lib" }
+nv-provider-core = { path = "../../core/lib" }
 aws-config = { version = "1.1.8", features = ["behavior-version-latest"] }
 aws-sdk-secretsmanager = "1.19.0"
 async-trait = "0.1.79"
diff --git a/...viders/aws-secrets-manager/lib/src/lib.rs → ...viders/aws-secrets-manager/lib/src/lib.rs b/...viders/aws-secrets-manager/lib/src/lib.rs → ...viders/aws-secrets-manager/lib/src/lib.rs
diff --git a/...s/aws-secrets-manager/lib/src/provider.rs → ...s/aws-secrets-manager/lib/src/provider.rs b/...s/aws-secrets-manager/lib/src/provider.rs → ...s/aws-secrets-manager/lib/src/provider.rs
@@ -1,4 +1,4 @@
-use nv_provider_core::{Provider, ProviderError, ProviderRetrievalError};
+use nv_provider_core::{Provider, ProviderError};
 
 #[derive(Debug)]
 pub struct AwsSecretsManagerProvider {}
@@ -24,12 +24,10 @@ impl Provider for AwsSecretsManagerProvider {
                 log::error!("Aws env provider error: {:?}", err);
 
                 if let Ok(source) = err.into_source() {
-                    return ProviderError::RetrievalError(ProviderRetrievalError {
-                        message: source.source().map(|error| error.to_string()),
-                    });
+                    return ProviderError::Unknown("explodey".to_owned());
                 }
 
-                ProviderError::ExplodeyProvider
+                ProviderError::Unknown("explodey".to_owned())
             })
             .map(|response| {
                 let res = response.secret_string.unwrap_or_default();

diff --git a/lang/packages/providers/core/lib/Cargo.toml b/lang/packages/providers/core/lib/Cargo.toml
@@ -5,17 +5,3 @@ edition = "2021"
 
 [dependencies]
 async-trait = "0.1.80"
-bytes = "1.6.0"
-ctrlc = "3.4.4"
-env_logger = "0.11.3"
-insta = "1.39.0"
-log = "0.4.21"
-tokio = { version = "1.38.0", features = [
-  "net",
-  "rt",
-  "sync",
-  "macros",
-  "io-util",
-  "time",
-] }
-tokio-util = "0.7.11"
diff --git a/lang/packages/providers/core/lib/README.md b/lang/packages/providers/core/lib/README.md
diff --git a/lang/packages/providers/core/lib/src/errors.rs b/lang/packages/providers/core/lib/src/errors.rs