* feat: add powershell common parameters support (-Verbose, -Debug, -ErrorAction, -WhatIf) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: add powershell common params to script editor test panel Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: detect CmdletBinding from code instead of schema in script editor Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: ignore commented-out CmdletBinding in powershell detection Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: use preference variables for -Verbose/-Debug instead of CLI args Verbose/Debug output goes to PowerShell stream 4/5 which isn't captured by the 2>&1 redirect. Setting $VerbosePreference/$DebugPreference in the wrapper scope propagates to child scripts and output flows through the host to stderr, which Windmill captures as logs. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: use *>&1 to capture all powershell streams including verbose/debug The previous 2>&1 only captured error stream. Verbose (stream 4) and debug (stream 5) output was silently lost. Using *>&1 redirects all streams to success stream so they flow through Tee-Object into logs. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: use targeted stream redirects (4>&1 5>&1 2>&1) instead of *>&1 *>&1 breaks $PSCmdlet.ShouldProcess() by redirecting internal streams. Only redirect verbose (4), debug (5), and error (2) to success stream. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: revert to 2>&1 redirect — stream 4/5 redirects break powershell Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: use 4>&1 5>&1 for verbose/debug capture, remove WhatIf support Stream 4/5 redirects capture verbose/debug in the pipeline. WhatIf is removed because $PSCmdlet.ShouldProcess() doesn't work when scripts are invoked through Windmill's wrapper. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: redirect verbose/debug to files to keep result pipeline clean Verbose (4) and debug (5) streams are redirected to separate log files during script execution, then output via Write-Host after the script completes. This keeps them out of the Tee-Object pipeline (used for result extraction) while still showing them in the job logs. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: output verbose/debug to stderr via Console.Error for log capture Write-Host goes to stdout which gets mixed with result output and truncated by OSS log threshold. Using [Console]::Error.WriteLine() writes to stderr which Windmill captures separately as logs, with VERBOSE:/DEBUG: prefixes for clarity. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: redirect script output to file only, send verbose/debug to stdout The OSS log storage has a 9KB threshold. Previously, Tee-Object sent the full JSON result to both stdout (logs) and the pipe file, eating the log budget. Now script output goes only to the pipe file (> $pipe), and only verbose/debug messages go to stdout for the log viewer. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: preserve original Tee-Object behavior, append verbose/debug after Keep the original wrapper behavior (Tee-Object to stdout + pipe file). Only add 4>verbose.log 5>debug.log to capture those streams, and output them at the end of logs. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: inject preference vars into main.ps1 instead of CLI args Passing -Verbose/-Debug as CLI args causes PowerShell module loading to emit verbose noise. Instead, inject $VerbosePreference/$DebugPreference inside main.ps1's try block so they only affect user code. Stream 4/5 are still redirected to files in the wrapper for log output. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: restore common param toggles from previous job args on Run Again Extract _wm_ps_* keys from loaded args and initialize the toggle states in PowerShellCommonParams. Also strip them from main args so they don't appear as unknown schema form inputs. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: show active common param badges when section is collapsed Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: inject ErrorAction as preference variable instead of CLI arg -ErrorAction as a CLI arg only affects the caller, not the script's internal error handling. Setting $ErrorActionPreference inside main.ps1 correctly overrides the default 'Stop' behavior for the user's code. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: ensure full backward compatibility with existing powershell scripts - Only filter common param names when [CmdletBinding()] is present (without it, $Verbose etc. are regular user-defined parameters) - Only add 4>verbose.log 5>debug.log and log output lines when common params are actually enabled — original wrapper is unchanged otherwise Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: lighter styling for common params section Replaced heavy Section component with a subtle inline chevron toggle labeled "Common parameters". Smaller text, secondary color, indented options. Badges still show when collapsed. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: rename section to CmdletBinding parameters Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: add ..Default::default() to windmill-parser-r (new parser from main) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: missing comma in graphql parser test + merge main Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: add missing commas before ..Default::default() in parser tests Merge from main brought test constructors with formatting issues from the original automated script (missing comma between last field and ..Default::default()). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: restore comment markers in nu parser test that script broke Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address PR review — ignore commented CmdletBinding, clear stale params 1. Parser: strip comment lines before detecting [CmdletBinding()] to avoid false positives from commented-out attributes 2. RunForm: always assign psCommonParams (not just when non-empty) so stale settings from a previous run don't leak into later runs Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
138 lines
4.1 KiB
Rust
138 lines
4.1 KiB
Rust
#![allow(non_snake_case)] // TODO: switch to parse_* function naming
|
|
|
|
use anyhow::anyhow;
|
|
|
|
#[cfg(not(target_arch = "wasm32"))]
|
|
use regex::Regex;
|
|
#[cfg(target_arch = "wasm32")]
|
|
use regex_lite::Regex;
|
|
|
|
use serde_json::json;
|
|
|
|
use windmill_parser::{Arg, MainArgSignature, ObjectType, Typ};
|
|
|
|
pub fn parse_graphql_sig(code: &str) -> anyhow::Result<MainArgSignature> {
|
|
let parsed = parse_graphql_file(&code)?;
|
|
if let Some(x) = parsed {
|
|
let args = x;
|
|
Ok(MainArgSignature {
|
|
star_args: false,
|
|
star_kwargs: false,
|
|
args,
|
|
auto_kind: None,
|
|
has_preprocessor: None,
|
|
..Default::default()
|
|
})
|
|
} else {
|
|
Err(anyhow!("Error parsing sql".to_string()))
|
|
}
|
|
}
|
|
|
|
lazy_static::lazy_static! {
|
|
static ref RE_ARG_GRAPHQL: Regex = Regex::new(r#"\$(\w+)\s*:\s*(?:(\w+)(!)?|\[(\w+)!?\])(!)?\s*(?:=\s*"?(\w+)"?\s*)?"#).unwrap();
|
|
}
|
|
|
|
fn parse_graphql_file(code: &str) -> anyhow::Result<Option<Vec<Arg>>> {
|
|
let mut args: Vec<Arg> = vec![];
|
|
|
|
for cap in RE_ARG_GRAPHQL.captures_iter(code) {
|
|
let name = cap.get(1).map(|x| x.as_str().to_string()).unwrap();
|
|
let mut typ = cap.get(2).map(|x| x.as_str().to_string());
|
|
|
|
let parsed_typ = if typ.is_none() {
|
|
let inner_typ = cap.get(4).map(|x| x.as_str().to_string());
|
|
typ = inner_typ.clone().map(|x| format!("[{}]", x.to_string()));
|
|
Typ::List(Box::new(parse_graphql_typ(inner_typ.unwrap().as_str())))
|
|
} else {
|
|
parse_graphql_typ(typ.clone().unwrap().as_str())
|
|
};
|
|
|
|
let (has_default, default) = match cap.get(6).map(|x| x.as_str().to_string()) {
|
|
Some(x) => (true, Some(x)), // default value => optional
|
|
None => (cap.get(3).is_none() && cap.get(5).is_none(), None), // optional if no !
|
|
};
|
|
|
|
let parsed_default = default.and_then(|x| match parsed_typ {
|
|
Typ::Int => x.parse::<i64>().ok().map(|x| json!(x)),
|
|
Typ::Float => x.parse::<f64>().ok().map(|x| json!(x)),
|
|
_ => Some(json!(x)),
|
|
});
|
|
args.push(Arg {
|
|
name,
|
|
typ: parsed_typ,
|
|
default: parsed_default,
|
|
otyp: Some(typ.unwrap()),
|
|
has_default,
|
|
oidx: None,
|
|
});
|
|
}
|
|
|
|
Ok(Some(args))
|
|
}
|
|
|
|
pub fn parse_graphql_typ(typ: &str) -> Typ {
|
|
match typ {
|
|
"String" | "ID" => Typ::Str(None),
|
|
"Int" => Typ::Int,
|
|
"Boolean" => Typ::Bool,
|
|
"Float" => Typ::Float,
|
|
_ => Typ::Object(ObjectType::new(None, Some(vec![]))),
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_parse_graphql_sig() -> anyhow::Result<()> {
|
|
let code = r#"
|
|
query($i: Int, $arr: [String]!, $wahoo: String = "wahoo") {
|
|
books {
|
|
title
|
|
}
|
|
}
|
|
"#;
|
|
//println!("{}", serde_json::to_string()?);
|
|
assert_eq!(
|
|
parse_graphql_sig(code)?,
|
|
MainArgSignature {
|
|
star_args: false,
|
|
star_kwargs: false,
|
|
args: vec![
|
|
Arg {
|
|
otyp: Some("Int".to_string()),
|
|
name: "i".to_string(),
|
|
typ: Typ::Int,
|
|
default: None,
|
|
has_default: true,
|
|
oidx: None
|
|
},
|
|
Arg {
|
|
otyp: Some("[String]".to_string()),
|
|
name: "arr".to_string(),
|
|
typ: Typ::List(Box::new(Typ::Str(None))),
|
|
default: None,
|
|
has_default: false,
|
|
oidx: None
|
|
},
|
|
Arg {
|
|
otyp: Some("String".to_string()),
|
|
name: "wahoo".to_string(),
|
|
typ: Typ::Str(None),
|
|
default: Some(json!("wahoo")),
|
|
has_default: true,
|
|
oidx: None
|
|
}
|
|
],
|
|
auto_kind: None,
|
|
has_preprocessor: None,
|
|
..Default::default()
|
|
}
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
}
|