Merge remote-tracking branch 'origin' into miroman/checksum

.gitignore

@@ -6,3 +6,7 @@ bin/
 # Node.js generated files for tree-sitter
 build/
 node_modules/
+tree-sitter-dscexpression/bindings/
+tree-sitter-dscexpression/src/
+tree-sitter-dscexpression/parser.*
+tree-sitter-dscexpression/binding.gyp

.vscode/settings.json

@@ -6,10 +6,10 @@
         "./ntstatuserror/Cargo.toml",
         "./ntuserinfo/Cargo.toml",
         "./osinfo/Cargo.toml",
-        "./pal/Cargo.toml",
         "./registry/Cargo.toml",
         "./tools/test_group_resource/Cargo.toml",
         "./tools/dsctest/Cargo.toml",
+        "./tree-sitter-dscexpression/Cargo.toml",
         "./y2j/Cargo.toml"
     ],
     "rust-analyzer.showUnlinkedFileNotification": true,

build.ps1

@@ -92,8 +92,10 @@ New-Item -ItemType Directory $target > $null
 
 # make sure dependencies are built first so clippy runs correctly
 $windows_projects = @("pal", "ntreg", "ntstatuserror", "ntuserinfo", "registry")
-$projects = @("dsc_lib", "dsc", "osinfo", "process", "tools/test_group_resource", "y2j", "powershellgroup", "tools/dsctest")
-$pedantic_unclean_projects = @("tree-sitter-dscexpression", "ntreg")
+$projects = @("tree-sitter-dscexpression", "dsc_lib", "dsc", "osinfo", "process", "tools/test_group_resource", "y2j", "powershellgroup", "tools/dsctest")
+$pedantic_unclean_projects = @("ntreg")
+$clippy_unclean_projects = @("tree-sitter-dscexpression")
+$skip_test_projects_on_windows = @("tree-sitter-dscexpression")
 
 if ($IsWindows) {
     $projects += $windows_projects
@@ -106,10 +108,17 @@ foreach ($project in $projects) {
     try {
         Push-Location "$PSScriptRoot/$project" -ErrorAction Stop
 
+        if ($project -eq 'tree-sitter-dscexpression') {
+            ./build.ps1
+        }
+
         if (Test-Path "./Cargo.toml")
         {
             if ($Clippy) {
-                if ($pedantic_unclean_projects -contains $project) {
+                if ($clippy_unclean_projects -contains $project) {
+                    Write-Verbose -Verbose "Skipping clippy for $project"
+                }
+                elseif ($pedantic_unclean_projects -contains $project) {
                     Write-Verbose -Verbose "Running clippy for $project"
                     cargo clippy @flags -- -Dwarnings
                 }
@@ -198,23 +207,21 @@ if ($Test) {
         Install-Module Pester -WarningAction Ignore
     }
 
-    "For debug - env:PATH is:"
-    $env:PATH
-
     foreach ($project in $projects) {
-        ## Build format_json
+        if ($IsWindows -and $skip_test_projects_on_windows -contains $project) {
+            Write-Verbose -Verbose "Skipping test for $project on Windows"
+            continue
+        }
+
         Write-Host -ForegroundColor Cyan "Testing $project ..."
         try {
             Push-Location "$PSScriptRoot/$project"
             if (Test-Path "./Cargo.toml")
             {
-                if (Test-Path "./Cargo.toml")
-                {
-                    cargo test
+                cargo test
 
-                    if ($LASTEXITCODE -ne 0) {
-                        $failed = $true
-                    }
+                if ($LASTEXITCODE -ne 0) {
+                    $failed = $true
                 }
             }
         } finally {

package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "tree-sitter-cli": "^0.20.8"
+  }
+}

tree-sitter-dscexpression/build.ps1

@@ -1,14 +1,34 @@
-#requires -version 7.4
-
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
 # check if tools are installed
 
-$PSNativeCommandUseErrorActionPreference = $true
-$ErrorActionPreference = 'Stop'
+function Invoke-NativeCommand($cmd) {
+    Invoke-Expression $cmd
+    if ($LASTEXITCODE -ne 0) {
+        throw "Command $cmd failed with exit code $LASTEXITCODE"
+    }
+}
+
+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
+    }
+}
+
+npm list tree-sitter-cli
+if ($LASTEXITCODE -ne 0) {
+    npm install tree-sitter-cli
+}
 
-npx tree-sitter generate
-node-gyp configure
-node-gyp build
-npx tree-sitter test
+Invoke-NativeCommand 'npx tree-sitter generate'
+Invoke-NativeCommand 'npx tree-sitter test'