starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-08-18 08:01:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

nit: replace KJQXZ with more meaningful notation (#5547)

Browse Source 
* nit: replace `KJQXZ` with more meaningful notation

Originally this string is located in all places, where modification is needed in order to add new language support

* relative -> related

* revert shebang in substitue.sh

* remove '}'
This commit is contained in:
pyranota
2025-04-02 23:03:04 +02:00
committed by GitHub
parent dcb307861e
commit f3ed108e43
28 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/parsers/windmill-parser-wasm/src/lib.rs
+1 -1
View File
@@ -162,4 +162,4 @@ pub fn parse_java(code: &str) -> String {
wrap_sig(windmill_parser_java::parse_java_signature(code))
}
// KJQXZ
// for related places search: ADD_NEW_LANG
backend/src/main.rs
+1 -1
View File
@@ -1112,7 +1112,7 @@ pub async fn run_workers(
HUB_CACHE_DIR,
POWERSHELL_CACHE_DIR,
JAVA_CACHE_DIR,
TAR_JAVA_CACHE_DIR, // KJQXZ
TAR_JAVA_CACHE_DIR, // for related places search: ADD_NEW_LANG
] {
DirBuilder::new()
.recursive(true)
backend/windmill-api/openapi.yaml
+1 -1
View File
@@ -13531,7 +13531,7 @@ components:
csharp,
nu,
java
# KJQXZ
# for related places search: ADD_NEW_LANG
]
Preview:
backend/windmill-api/src/scripts.rs
+1 -1
View File
@@ -636,7 +636,7 @@ async fn create_script_internal<'c>(
|| ns.language == ScriptLang::Nu
|| ns.language == ScriptLang::Php
|| ns.language == ScriptLang::Java
// KJQXZ
// for related places search: ADD_NEW_LANG
) {
Some(String::new())
} else {
backend/windmill-api/src/workspaces_export.rs
+1 -1
View File
@@ -376,7 +376,7 @@ pub(crate) async fn tarball_workspace(
ScriptLang::Nu => "nu",
ScriptLang::OracleDB => "odb.sql",
ScriptLang::Java => "java",
// KJQXZ
// for related places search: ADD_NEW_LANG
};
archive
.write_to_archive(&script.content, &format!("{}.{}", script.path, ext))
backend/windmill-common/src/global_settings.rs
+1 -1
View File
@@ -64,7 +64,7 @@ pub const ENV_SETTINGS: &[&str] = &[
"DENO_PATH",
"GO_PATH",
"JAVA_PATH",
// KJQXZ
// for related places search: ADD_NEW_LANG
"GOPRIVATE",
"GOPROXY",
"NETRC",
backend/windmill-common/src/schema.rs
+1 -1
View File
@@ -351,7 +351,7 @@ pub fn should_validate_schema(code: &str, lang: &ScriptLang) -> bool {
Python3 | Go | Bash | Powershell | Graphql | Ansible | Nu => "#",
Postgresql | Mysql | Bigquery | Snowflake | Mssql | OracleDB => "--",
Rust => "//!",
// KJQXZ
// for related places search: ADD_NEW_LANG
};
find_annotation(comment, annotation, code)
}
backend/windmill-common/src/scripts.rs
+2 -2
View File
@@ -52,7 +52,7 @@ pub enum ScriptLang {
CSharp,
Nu,
Java,
// KJQXZ
// for related places search: ADD_NEW_LANG
}
impl ScriptLang {
@@ -79,7 +79,7 @@ impl ScriptLang {
ScriptLang::CSharp => "csharp",
ScriptLang::Nu => "nu",
ScriptLang::Java => "java",
// KJQXZ
// for related places search: ADD_NEW_LANG
}
}
}
backend/windmill-common/src/worker.rs
+1 -1
View File
@@ -52,7 +52,7 @@ lazy_static::lazy_static! {
"csharp".to_string(),
"nu".to_string(),
"java".to_string(),
// KJQXZ
// for related places search: ADD_NEW_LANG
"dependency".to_string(),
"flow".to_string(),
"other".to_string()
backend/windmill-worker/src/worker.rs
+2 -2
View File
@@ -285,7 +285,7 @@ pub const CSHARP_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "csharp");
pub const JAVA_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "java");
pub const COURSIER_CACHE_DIR: &str = concatcp!(JAVA_CACHE_DIR, "/coursier-cache");
pub const JAVA_REPOSITORY_DIR: &str = concatcp!(JAVA_CACHE_DIR, "/repository");
// KJQXZ
// for related places search: ADD_NEW_LANG
pub const BUN_CACHE_DIR: &str = concatcp!(ROOT_CACHE_NOMOUNT_DIR, "bun");
pub const BUN_BUNDLE_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "bun");
pub const BUN_CODEBASE_BUNDLE_CACHE_DIR: &str = concatcp!(ROOT_CACHE_NOMOUNT_DIR, "script_bundle");
@@ -3210,7 +3210,7 @@ fn parse_sig_of_lang(
ScriptLang::Java => Some(windmill_parser_java::parse_java_signature(code)?),
#[cfg(not(feature = "java"))]
ScriptLang::Java => None,
// KJQXZ
// for related places search: ADD_NEW_LANG
}
} else {
None
backend/windmill-worker/src/worker_lockfiles.rs
+1 -1
View File
@@ -2089,7 +2089,7 @@ async fn capture_dependency_job(
resolve(job_id, job_raw_code, job_dir, db, w_id).await
}
// KJQXZ
// for related places search: ADD_NEW_LANG
_ => Ok("".to_owned()),
}
}
cli/bootstrap/script_bootstrap.ts
+1 -1
View File
@@ -126,5 +126,5 @@ public class Main {
}
}
`,
// KJQXZ
// for related places search: ADD_NEW_LANG
};
cli/metadata.ts
+1 -1
View File
@@ -551,7 +551,7 @@ export async function inferSchema(
} else if (language === "java") {
const { parse_java } = await import("./wasm/java/windmill_parser_wasm.js");
inferedSchema = JSON.parse(parse_java(content));
// KJQXZ
// for related places search: ADD_NEW_LANG
} else {
throw new Error("Invalid language: " + language);
}
cli/script.ts
+2 -2
View File
@@ -573,7 +573,7 @@ export function filePathExtensionFromContentType(
return ".nu";
} else if (language === "java") {
return ".java";
// KJQXZ
// for related places search: ADD_NEW_LANG
} else {
throw new Error("Invalid language: " + language);
}
@@ -602,7 +602,7 @@ export const exts = [
".nu",
".playbook.yml",
".java"
// KJQXZ
// for related places search: ADD_NEW_LANG
];
cli/script_common.ts
+2 -2
View File
@@ -19,7 +19,7 @@ export type ScriptLanguage =
| "nu"
| "ansible"
| "java";
// KJQXZ
// for related places search: ADD_NEW_LANG
export function inferContentTypeFromFilePath(
contentPath: string,
@@ -67,7 +67,7 @@ export function inferContentTypeFromFilePath(
return "nu";
} else if (contentPath.endsWith(".java")) {
return "java";
// KJQXZ
// for related places search: ADD_NEW_LANG
} else {
throw new Error(
"Invalid language: " + contentPath.substring(contentPath.lastIndexOf("."))
cli/sync.ts
+2 -2
View File
@@ -343,7 +343,7 @@ export function newPathAssigner(defaultTs: "bun" | "deno"): PathAssigner {
else if (language == "nu") ext = "nu";
else if (language == "ansible") ext = "playbook.yml";
else if (language == "java") ext = "java";
// KJQXZ
// for related places search: ADD_NEW_LANG
else ext = "no_ext";
return [`${name}.inline_script.`, ext];
@@ -693,7 +693,7 @@ export async function elementsToMap(
"yml",
"nu",
"java",
// KJQXZ
// for related places search: ADD_NEW_LANG
].includes(path.split(".").pop() ?? "") &&
!isFileResource(path)
)
cli/types.ts
+1 -1
View File
@@ -228,7 +228,7 @@ export function getTypeStrFromPath(
parsed.ext == ".cs" ||
parsed.ext == ".nu" ||
parsed.ext == ".java" ||
// KJQXZ
// for related places search: ADD_NEW_LANG
(parsed.ext == ".yml" && parsed.name.split(".").pop() == "playbook")
) {
return "script";
flake.nix
+1 -1
View File
@@ -172,7 +172,7 @@
JAVA_PATH = "${pkgs.jdk21}/bin/java";
JAVAC_PATH = "${pkgs.jdk21}/bin/javac";
COURSIER_PATH = "${coursier}/coursier";
# KJQXZ
# for related places search: ADD_NEW_LANG
FLOCK_PATH = "${pkgs.flock}/bin/flock";
CARGO_PATH = "${rust}/bin/cargo";
DOTNET_PATH = "${pkgs.dotnet-sdk_9}/bin/dotnet";
frontend/src/lib/components/Editor.svelte
+1 -1
View File
@@ -196,7 +196,7 @@
| 'csharp'
| 'nu'
| 'java'
// KJQXZ
// for related places search: ADD_NEW_LANG
export let code: string = ''
export let cmdEnterAction: (() => void) | undefined = undefined
export let formatAction: (() => void) | undefined = undefined
frontend/src/lib/components/EditorBar.svelte
+6 -6
View File
@@ -95,7 +95,7 @@
'csharp',
'nu',
'java',
// KJQXZ
// for related places search: ADD_NEW_LANG
].includes(lang ?? '')
$: showVarPicker = [
'python3',
@@ -111,7 +111,7 @@
'csharp',
'nu',
'java',
// KJQXZ
// for related places search: ADD_NEW_LANG
].includes(lang ?? '')
$: showResourcePicker = [
'python3',
@@ -127,7 +127,7 @@
'csharp',
'nu',
'java',
// KJQXZ
// for related places search: ADD_NEW_LANG
].includes(lang ?? '')
$: showResourceTypePicker =
['typescript', 'javascript'].includes(scriptLangToEditorLang(lang)) ||
@@ -381,7 +381,7 @@
editor.insertAtCursor(`$env.${name}`)
} else if (lang == 'java') {
editor.insertAtCursor(`System.getenv("${name}");`)
// KJQXZ
// for related places search: ADD_NEW_LANG
}
sendUserToast(`${name} inserted at cursor`)
}}
@@ -451,7 +451,7 @@ string ${windmillPathToCamelCaseName(path)} = await client.GetStringAsync(uri);
editor.insertAtCursor(`get_variable ${path}`)
} else if (lang == 'java') {
editor.insertAtCursor(`(Wmill.getVariable("${path}"))`)
// KJQXZ
// for related places search: ADD_NEW_LANG
}
sendUserToast(`${name} inserted at cursor`)
}}
@@ -538,7 +538,7 @@ JsonNode ${windmillPathToCamelCaseName(path)} = JsonNode.Parse(await client.GetS
editor.insertAtCursor(`get_resource ${path}`)
} else if (lang == 'java') {
editor.insertAtCursor(`(Wmill.getResource("${path}"))`)
// KJQXZ
// for related places search: ADD_NEW_LANG
}
sendUserToast(`${path} inserted at cursor`)
frontend/src/lib/components/HighlightCode.svelte
+1 -1
View File
@@ -69,7 +69,7 @@
return yaml;
case 'java':
return java;
// KJQXZ
// for related places search: ADD_NEW_LANG
default:
return typescript
}
frontend/src/lib/components/WorkerGroup.svelte
+1 -1
View File
@@ -125,7 +125,7 @@
'csharp',
'nu',
'java'
// KJQXZ
// for related places search: ADD_NEW_LANG
]
const nativeTags = [
'nativets',
frontend/src/lib/components/common/languageIcons/LanguageIcon.svelte
+2 -2
View File
@@ -59,7 +59,7 @@
csharp: 'C#',
nu: 'Nu',
java: 'Java'
// KJQXZ
// for related places search: ADD_NEW_LANG
}
const langToComponent: Record<
@@ -92,7 +92,7 @@
csharp: CSharpIcon,
nu: NuIcon,
java: JavaIcon
// KJQXZ
// for related places search: ADD_NEW_LANG
}
let subIconScale = width === 30 ? 0.6 : 0.8
frontend/src/lib/editorUtils.ts
+1 -1
View File
@@ -90,7 +90,7 @@ export function langToExt(lang: string): string {
return 'nu'
case 'java':
return 'java'
// KJQXZ
// for related places search: ADD_NEW_LANG
default:
return 'unknown'
}
frontend/src/lib/infer.ts
+1 -1
View File
@@ -194,7 +194,7 @@ export async function inferArgs(
} else if (language == 'java') {
await initWasmJava()
inferedSchema = JSON.parse(parse_java(code))
// KJQXZ
// for related places search: ADD_NEW_LANG
} else {
return null
}
frontend/src/lib/script_helpers.ts
+4 -4
View File
@@ -999,7 +999,7 @@ public class Main {
}
}
`
// KJQXZ
// for related places search: ADD_NEW_LANG
export const INITIAL_CODE = {
bun: {
scriptInitCodeBlock: BUN_INIT_BLOCK,
@@ -1086,8 +1086,8 @@ export const INITIAL_CODE = {
},
java: {
script: JAVA_INIT_CODE
}
// KJQXZ
},
// for related places search: ADD_NEW_LANG
}
export function isInitialCode(content: string): boolean {
@@ -1193,7 +1193,7 @@ export function initialCode(
return INITIAL_CODE.nu.script
} else if (language == 'java') {
return INITIAL_CODE.java.script
// KJQXZ
// for related places search: ADD_NEW_LANG
} else if (language == 'bun' || language == 'bunnative') {
if (kind == 'trigger') {
return INITIAL_CODE.bun.trigger
frontend/src/lib/scripts.ts
+3 -3
View File
@@ -47,7 +47,7 @@ export function scriptLangToEditorLang(
return 'nu'
} else if (lang == 'java') {
return 'java'
// KJQXZ
// for related places search: ADD_NEW_LANG
} else if (lang == undefined) {
return 'typescript'
} else {
@@ -130,7 +130,7 @@ const scriptLanguagesArray: [SupportedLanguage | 'docker' | 'bunnative', string]
['docker', 'Docker'],
['nu', 'Nu'],
['java', 'Java']
// KJQXZ
// for related places search: ADD_NEW_LANG
]
export function processLangs(selected: string | undefined, langs: string[]): string[] {
if (selected === 'nativets') {
@@ -140,7 +140,7 @@ export function processLangs(selected: string | undefined, langs: string[]): str
//those languages are newer and may not be in the saved list
let nl = ['bunnative', 'rust', 'ansible', 'csharp', 'nu', 'java']
// KJQXZ
// for related places search: ADD_NEW_LANG
nl.forEach((lang) => {
if (!ls.includes(lang)) {
ls.push(lang)
frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
+1 -1
View File
@@ -756,7 +756,7 @@
</div>
{/if}
{#if job.tag && !['deno', 'python3', 'flow', 'other', 'go', 'postgresql', 'mysql', 'bigquery', 'snowflake', 'mssql', 'graphql', 'oracledb', 'nativets', 'bash', 'powershell', 'php', 'rust', 'other', 'ansible', 'csharp', 'nu', 'java', 'dependency'].includes(job.tag)}
<!-- KJQXZ -->
<!-- for related places search: ADD_NEW_LANG -->
<div>
<Badge color="indigo">Tag: {job.tag}</Badge>
</div>