s0

backend/parsers/windmill-parser-ts/src/lib.rs

@@ -49,8 +49,12 @@ impl Visit for ImportsFinder {
 pub fn parse_expr_for_imports(code: &str) -> anyhow::Result<Vec<String>> {
     let cm: Lrc<SourceMap> = Default::default();
     let fm = cm.new_source_file(FileName::Custom("main.d.ts".into()).into(), code.into());
+    let mut tss = TsSyntax::default();
+    tss.disallow_ambiguous_jsx_like;
+    tss.tsx = true;
+    tss.no_early_errors = true;
     let lexer = Lexer::new(
-        Syntax::Typescript(TsSyntax::default()),
+        Syntax::Typescript(tss),
         // EsVersion defaults to es5
         Default::default(),
         StringInput::from(&*fm),

frontend/package.json

@@ -20,6 +20,7 @@
 		"@floating-ui/core": "^1.3.1",
 		"@hey-api/openapi-ts": "^0.43.0",
 		"@playwright/test": "^1.34.3",
+		"@codesandbox/sandpack-client": "^2.19.8",
 		"@rgossiaux/svelte-headlessui": "^2.0.0",
 		"@sveltejs/adapter-static": "^3.0.6",
 		"@sveltejs/kit": "^2.9.0",
@@ -148,7 +149,7 @@
 		"windmill-parser-wasm-py": "^1.429.0",
 		"windmill-parser-wasm-regex": "^1.435.2",
 		"windmill-parser-wasm-rust": "^1.429.0",
-		"windmill-parser-wasm-ts": "^1.429.0",
+		"windmill-parser-wasm-ts": "^1.438.2",
 		"windmill-parser-wasm-yaml": "^1.429.0",
 		"windmill-sql-datatype-parser-wasm": "^1.318.0",
 		"y-monaco": "^0.1.4",

frontend/src/lib/ata/index.ts

@@ -38,6 +38,30 @@ export interface ATABootstrapConfig {
 
 type ModuleMeta = { state: 'loading' }
 
+export type DepsToGet = {
+	raw: string
+	module: string
+	version: string | undefined
+}[]
+
+function getVersionFromRaw(d: string) {
+	if (d.lastIndexOf('@') > 0) {
+		const splitted = d.split('@')
+		let version = splitted.pop()
+		if (version?.startsWith('^') || version?.startsWith('~')) {
+			version = version.slice(1)
+		}
+		return version
+	}
+	return 'latest'
+}
+
+export function versionRangeToVersion(version: string) {
+	if (version.startsWith('^') || version.startsWith('~')) {
+		return version.slice(1)
+	}
+	return version
+}
 /**
  * The function which starts up type acquisition,
  * returns a function which you then pass the initial
@@ -57,11 +81,11 @@ export const setupTypeAcquisition = (config: ATABootstrapConfig) => {
 
 	let resLimit = { usage: 0 }
 
-	return async (initialSourceFile: string) => {
+	return async (initialSourceFile: string | DepsToGet) => {
 		estimatedToDownload = 0
 		estimatedDownloaded = 0
 
-		let todo: string[] = [initialSourceFile]
+		let todo: (string | DepsToGet)[] = [initialSourceFile]
 		let next: string[] = []
 		let i = 0
 		let nb = 0
@@ -84,34 +108,25 @@ export const setupTypeAcquisition = (config: ATABootstrapConfig) => {
 		}
 	}
 
-	function getVersion(d: string) {
-		if (d.lastIndexOf('@') > 0) {
-			const splitted = d.split('@')
-			let version = splitted.pop()
-			if (version?.startsWith('^') || version?.startsWith('~')) {
-				version = version.slice(1)
-			}
-			return version
-		}
-		return 'latest'
-	}
-
 	async function resolveDeps(
-		initialSourceFile: string,
+		depsSource: string | DepsToGet,
 		depth: number,
 		resLimit: ResLimit
 	): Promise<string[]> {
-		let depsToGet = config
-			.depsParser(initialSourceFile)
-			.map((d: string) => {
-				let raw = mapModuleNameToModule(d)
-				return {
-					raw,
-					module: raw.lastIndexOf('@') > 0 ? raw.split('@').slice(0, -1).join('@') : raw,
-					version: getVersion(d)
-				}
-			})
-			.filter((f) => !moduleMap.has(f.raw))
+		let depsToGet =
+			typeof depsSource == 'object'
+				? depsSource
+				: config
+						.depsParser(depsSource)
+						.map((d: string) => {
+							let raw = mapModuleNameToModule(d)
+							return {
+								raw,
+								module: raw.lastIndexOf('@') > 0 ? raw.split('@').slice(0, -1).join('@') : raw,
+								version: getVersionFromRaw(raw)
+							}
+						})
+						.filter((f) => !moduleMap.has(f.raw))
 
 		if (depth == 0) {
 			const relativeDeps = depsToGet.filter((f) => isTypescriptRelativePath(f.raw))