fix: update parsers to prevent assets var bug (#6246)

* fix: update parsers to prevent assets var bug

* fix wrong parse function in cli for duckdb

---------

Co-authored-by: Diego Imbert <diego@windmill.dev>
This commit is contained in:
hugocasa
2025-07-21 10:58:09 +02:00
committed by GitHub
parent 4d3af1a321
commit 61622476c7
14 changed files with 94 additions and 12 deletions

View File

@@ -592,8 +592,8 @@ export async function inferSchema(
...inferedSchema.args,
];
} else if (language === "duckdb") {
const { parse_sql } = await import("./wasm/regex/windmill_parser_wasm.js");
inferedSchema = JSON.parse(parse_sql(content));
const { parse_duckdb } = await import("./wasm/regex/windmill_parser_wasm.js");
inferedSchema = JSON.parse(parse_duckdb(content));
} else if (language === "graphql") {
const { parse_graphql } = await import(
"./wasm/regex/windmill_parser_wasm.js"

View File

@@ -1,3 +1,4 @@
/* tslint:disable */
/* eslint-disable */
export function parse_python(code: string, main_override?: string | null): string;
export function parse_assets_py(code: string): string;

View File

@@ -90,6 +90,25 @@ export function parse_python(code, main_override) {
}
}
/**
* @param {string} code
* @returns {string}
*/
export function parse_assets_py(code) {
let deferred2_0;
let deferred2_1;
try {
const ptr0 = passStringToWasm0(code, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len0 = WASM_VECTOR_LEN;
const ret = wasm.parse_assets_py(ptr0, len0);
deferred2_0 = ret[0];
deferred2_1 = ret[1];
return getStringFromWasm0(ret[0], ret[1]);
} finally {
wasm.__wbindgen_free(deferred2_0, deferred2_1, 1);
}
}
const imports = {
__wbindgen_placeholder__: {
__wbindgen_init_externref_table: function() {

View File

@@ -2,6 +2,7 @@
/* eslint-disable */
export const memory: WebAssembly.Memory;
export const parse_python: (a: number, b: number, c: number, d: number) => [number, number];
export const parse_assets_py: (a: number, b: number) => [number, number];
export const __wbindgen_export_0: WebAssembly.Table;
export const __wbindgen_malloc: (a: number, b: number) => number;
export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;

View File

@@ -5,8 +5,10 @@ export function parse_powershell(code: string): string;
export function parse_sql(code: string): string;
export function parse_mysql(code: string): string;
export function parse_oracledb(code: string): string;
export function parse_duckdb(code: string): string;
export function parse_bigquery(code: string): string;
export function parse_snowflake(code: string): string;
export function parse_mssql(code: string): string;
export function parse_db_resource(code: string): string | undefined;
export function parse_graphql(code: string): string;
export function parse_assets_sql(code: string): string;

View File

@@ -1,6 +1,5 @@
let WASM_VECTOR_LEN = 0;
let cachedUint8ArrayMemory0 = null;
@@ -160,6 +159,25 @@ export function parse_oracledb(code) {
}
}
/**
* @param {string} code
* @returns {string}
*/
export function parse_duckdb(code) {
let deferred2_0;
let deferred2_1;
try {
const ptr0 = passStringToWasm0(code, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len0 = WASM_VECTOR_LEN;
const ret = wasm.parse_duckdb(ptr0, len0);
deferred2_0 = ret[0];
deferred2_1 = ret[1];
return getStringFromWasm0(ret[0], ret[1]);
} finally {
wasm.__wbindgen_free(deferred2_0, deferred2_1, 1);
}
}
/**
* @param {string} code
* @returns {string}
@@ -252,6 +270,25 @@ export function parse_graphql(code) {
}
}
/**
* @param {string} code
* @returns {string}
*/
export function parse_assets_sql(code) {
let deferred2_0;
let deferred2_1;
try {
const ptr0 = passStringToWasm0(code, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len0 = WASM_VECTOR_LEN;
const ret = wasm.parse_assets_sql(ptr0, len0);
deferred2_0 = ret[0];
deferred2_1 = ret[1];
return getStringFromWasm0(ret[0], ret[1]);
} finally {
wasm.__wbindgen_free(deferred2_0, deferred2_1, 1);
}
}
const imports = {
__wbindgen_placeholder__: {
__wbindgen_init_externref_table: function() {

View File

@@ -6,11 +6,13 @@ export const parse_powershell: (a: number, b: number) => [number, number];
export const parse_sql: (a: number, b: number) => [number, number];
export const parse_mysql: (a: number, b: number) => [number, number];
export const parse_oracledb: (a: number, b: number) => [number, number];
export const parse_duckdb: (a: number, b: number) => [number, number];
export const parse_bigquery: (a: number, b: number) => [number, number];
export const parse_snowflake: (a: number, b: number) => [number, number];
export const parse_mssql: (a: number, b: number) => [number, number];
export const parse_db_resource: (a: number, b: number) => [number, number];
export const parse_graphql: (a: number, b: number) => [number, number];
export const parse_assets_sql: (a: number, b: number) => [number, number];
export const __wbindgen_export_0: WebAssembly.Table;
export const __wbindgen_malloc: (a: number, b: number) => number;
export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;

View File

@@ -1,5 +1,6 @@
/* tslint:disable */
/* eslint-disable */
export function parse_deno(code: string, main_override?: string | null, skip_params?: boolean | null): string;
export function parse_deno(code: string, main_override?: string | null): string;
export function parse_outputs(code: string): string;
export function parse_ts_imports(code: string): string;
export function parse_assets_ts(code: string): string;

View File

@@ -160,10 +160,9 @@ function passStringToWasm0(arg, malloc, realloc) {
/**
* @param {string} code
* @param {string | null} [main_override]
* @param {boolean | null} [skip_params]
* @returns {string}
*/
export function parse_deno(code, main_override, skip_params) {
export function parse_deno(code, main_override) {
let deferred3_0;
let deferred3_1;
try {
@@ -171,7 +170,7 @@ export function parse_deno(code, main_override, skip_params) {
const len0 = WASM_VECTOR_LEN;
var ptr1 = isLikeNone(main_override) ? 0 : passStringToWasm0(main_override, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len1 = WASM_VECTOR_LEN;
const ret = wasm.parse_deno(ptr0, len0, ptr1, len1, isLikeNone(skip_params) ? 0xFFFFFF : skip_params ? 1 : 0);
const ret = wasm.parse_deno(ptr0, len0, ptr1, len1);
deferred3_0 = ret[0];
deferred3_1 = ret[1];
return getStringFromWasm0(ret[0], ret[1]);
@@ -218,6 +217,25 @@ export function parse_ts_imports(code) {
}
}
/**
* @param {string} code
* @returns {string}
*/
export function parse_assets_ts(code) {
let deferred2_0;
let deferred2_1;
try {
const ptr0 = passStringToWasm0(code, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len0 = WASM_VECTOR_LEN;
const ret = wasm.parse_assets_ts(ptr0, len0);
deferred2_0 = ret[0];
deferred2_1 = ret[1];
return getStringFromWasm0(ret[0], ret[1]);
} finally {
wasm.__wbindgen_free(deferred2_0, deferred2_1, 1);
}
}
const imports = {
__wbindgen_placeholder__: {
__wbg_buffer_609cc3eee51ed158: function(arg0) {
@@ -236,7 +254,7 @@ const imports = {
const ret = Object.entries(arg0);
return ret;
},
__wbg_eval_58d0b9f11db87ad1: function(arg0, arg1) {
__wbg_eval_b297c6e75720318e: function(arg0, arg1) {
const ret = eval(getStringFromWasm0(arg0, arg1));
return ret;
},

View File

@@ -1,9 +1,10 @@
/* tslint:disable */
/* eslint-disable */
export const memory: WebAssembly.Memory;
export const parse_deno: (a: number, b: number, c: number, d: number, e: number) => [number, number];
export const parse_deno: (a: number, b: number, c: number, d: number) => [number, number];
export const parse_outputs: (a: number, b: number) => [number, number];
export const parse_ts_imports: (a: number, b: number) => [number, number];
export const parse_assets_ts: (a: number, b: number) => [number, number];
export const __wbindgen_exn_store: (a: number) => void;
export const __externref_table_alloc: () => number;
export const __wbindgen_export_2: WebAssembly.Table;

View File

@@ -146,10 +146,10 @@
"windmill-parser-wasm-java": "^1.478.1",
"windmill-parser-wasm-nu": "^1.474.1",
"windmill-parser-wasm-php": "^1.429.0",
"windmill-parser-wasm-py": "^1.504.0",
"windmill-parser-wasm-regex": "^1.504.0",
"windmill-parser-wasm-py": "^1.510.0",
"windmill-parser-wasm-regex": "^1.510.0",
"windmill-parser-wasm-rust": "^1.429.0",
"windmill-parser-wasm-ts": "^1.504.0",
"windmill-parser-wasm-ts": "^1.510.0",
"windmill-parser-wasm-yaml": "^1.429.0",
"windmill-sql-datatype-parser-wasm": "^1.318.0",
"xterm": "^5.3.0",