remove dependency on node

PowerShell · Oct 11, 2024 · 6f46a0f · 6f46a0f
1 parent 63ca0a2
commit 6f46a0f
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 1,615 deletions.
diff --git a/dsc/Cargo.lock b/dsc/Cargo.lock
diff --git a/dsc/src/subcommand.rs b/dsc/src/subcommand.rs
@@ -498,7 +498,7 @@ pub fn resource(subcommand: &ResourceSubCommand, stdin: &Option<String>) {
 fn list_resources(dsc: &mut DscManager, resource_name: &Option<String>, adapter_name: &Option<String>, description: &Option<String>, tags: &Option<Vec<String>>, format: &Option<OutputFormat>) {
     let mut write_table = false;
     let mut table = Table::new(&["Type", "Kind", "Version", "Caps", "RequireAdapter", "Description"]);
-    if format.is_none() && io::stdin().is_terminal() {
+    if format.is_none() && io::stdout().is_terminal() {
         // write as table if format is not specified and interactive
         write_table = true;
     }
@@ -580,7 +580,7 @@ fn list_resources(dsc: &mut DscManager, resource_name: &Option<String>, adapter_
             };
             write_output(&json, format);
             // insert newline separating instances if writing to console
-            if io::stdin().is_terminal() { println!(); }
+            if io::stdout().is_terminal() { println!(); }
         }
     }
 

diff --git a/dsc/src/util.rs b/dsc/src/util.rs
@@ -194,7 +194,7 @@ pub fn write_output(json: &str, format: &Option<OutputFormat>) {
     let mut is_json = true;
     let mut output_format = format.clone();
     let mut syntax_color = false;
-    if std::io::stdin().is_terminal() {
+    if std::io::stdout().is_terminal() {
         syntax_color = true;
         if output_format.is_none() {
             output_format = Some(OutputFormat::Yaml);

diff --git a/dsc_lib/Cargo.lock b/dsc_lib/Cargo.lock
diff --git a/dsc_lib/src/parser/mod.rs b/dsc_lib/src/parser/mod.rs
@@ -26,7 +26,7 @@ impl Statement {
     /// This function will return an error if the underlying parser fails to initialize.
     pub fn new() -> Result<Self, DscError> {
         let mut parser = Parser::new();
-        parser.set_language(&tree_sitter_dscexpression::language())?;
+        parser.set_language(&tree_sitter_dscexpression::LANGUAGE.into())?;
         let function_dispatcher = FunctionDispatcher::new();
         Ok(Self {
             parser,

diff --git a/tools/test_group_resource/Cargo.lock b/tools/test_group_resource/Cargo.lock
diff --git a/tree-sitter-dscexpression/.npmrc b/tree-sitter-dscexpression/.npmrc
diff --git a/tree-sitter-dscexpression/Cargo.lock b/tree-sitter-dscexpression/Cargo.lock
diff --git a/tree-sitter-dscexpression/Cargo.toml b/tree-sitter-dscexpression/Cargo.toml
@@ -21,6 +21,7 @@ path = "bindings/rust/lib.rs"
 
 [dependencies]
 tree-sitter = "0.24.3"
+tree-sitter-language = "0.1.2"
 
 [build-dependencies]
-cc = "1.1"
+cc = "1.1.29"
diff --git a/tree-sitter-dscexpression/binding.gyp b/tree-sitter-dscexpression/binding.gyp
diff --git a/tree-sitter-dscexpression/build.ps1 b/tree-sitter-dscexpression/build.ps1
@@ -14,48 +14,10 @@ function Invoke-NativeCommand($cmd) {
 
 $env:TREE_SITTER_VERBOSE=1
 
-if ($null -eq (Get-Command npm -ErrorAction Ignore)) {
-    Write-Host 'Installing Node'
-
-    if ($IsWindows) {
-        winget install OpenJS.NodeJS.LTS
-    }
-    elseif ($IsMacOS) {
-        brew install node
-    }
-    else {
-        sudo apt-get install nodejs
-        sudo apt-get install npm
-    }
-}
-
-if ($null -ne $env:TF_BUILD) {
-    npm ci --omit:optional --registry https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/npm/registry/
-}
-else {
-    npm install --omit:optional --registry https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/npm/registry/
-}
-
-#npm list tree-sitter-cli
-#if ($LASTEXITCODE -ne 0) {
-#    npm ci tree-sitter-cli --omit=optional
-#}
-
-#npm install -g node-gyp
-
-if ($UpdatePackages) {
-    if (!$IsWindows) {
-        throw "This switch only works on Windows"
-    }
-
-    rm ./package-lock.json
-    rm -r ./node_modules
-    npm cache clean --force
-    npm logout
-    vsts-npm-auth -config .npmrc -F -V
-    npm install --omit:optional --force --verbose --registry https://registry.npmjs.org/ #--registry https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/npm/registry/
+if ($null -eq (Get-Command tree-sitter)) {
+    cargo install tree-sitter-cli
 }
 
-Invoke-NativeCommand 'npx node-gyp configure'
-Invoke-NativeCommand 'npx tree-sitter generate --build'
-Invoke-NativeCommand 'npx tree-sitter test'
+Invoke-NativeCommand 'tree-sitter init --update'
+Invoke-NativeCommand 'tree-sitter generate --build'
+Invoke-NativeCommand 'tree-sitter test'