Realse 0.3.1 - fix double processing stmts when processing expr callees

Author: JasonShin

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "sqlx-ts"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 homepage = "https://github.com/JasonShin/sqlx-ts"
 authors = ['Jason Shin <[email protected]>']

Cargo.toml

@@ -1,6 +1,6 @@
 {
   "name": "sqlx-ts",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "sqlx-ts ensures your raw SQLs are compile-time checked",
   "main": "dist/index.js",
   "maintainers": [

node/package.json

@@ -20,9 +20,9 @@ pub fn process_block_stmt_as_expr(
             if let Some(expr) = expr {
                 let expr = &expr.expr;
                 get_sql_from_expr(sqls, var_decl_name, expr, span, import_alias);
+            } else {
+                recurse_and_find_sql(sqls, stmt, import_alias);
             }
-
-            let _ = recurse_and_find_sql(sqls, stmt, import_alias);
         }
     }
 }
@@ -67,7 +67,6 @@ pub fn get_sql_from_expr<'a>(
                             span: span.clone(),
                         })
                         .collect();
-
                     sqls.extend(new_sqls.clone());
                 }
             }
@@ -76,8 +75,12 @@ pub fn get_sql_from_expr<'a>(
             get_sql_from_expr(sqls, var_decl_name, &expr.expr, span, import_alias);
         }
         Expr::Call(call_expr) => {
+            let num_args = &call_expr.args.len();
+
             if let Some(callee_expr) = &call_expr.callee.as_expr() {
-                get_sql_from_expr(sqls, var_decl_name, callee_expr, span, import_alias);
+                if num_args == &0 {
+                    get_sql_from_expr(sqls, var_decl_name, callee_expr, span, import_alias);
+                }
             }
             for arg in &call_expr.args {
                 get_sql_from_expr(sqls, var_decl_name, &arg.expr, span, import_alias)

src/parser/tag.rs

@@ -770,46 +770,6 @@ export interface ITestAwaitQueryQuery {
 
 
 
-export type TestAwaitQueryParams = [];
-
-
-export interface ITestAwaitQueryResult {
-    food_type: string;
-	id: number;
-	points: number;
-	table_id: number;
-	time_takes_to_cook: number;
-};
-
-
-export interface ITestAwaitQueryQuery {
-    params: TestAwaitQueryParams;
-    result: ITestAwaitQueryResult;
-};
-
-
-
-
-export type TestAwaitQuery2Params = [];
-
-
-export interface ITestAwaitQuery2Result {
-    food_type: string;
-	id: number;
-	points: number;
-	table_id: number;
-	time_takes_to_cook: number;
-};
-
-
-export interface ITestAwaitQuery2Query {
-    params: TestAwaitQuery2Params;
-    result: ITestAwaitQuery2Result;
-};
-
-
-
-
 export type TestAwaitQuery2Params = [];
 
 
@@ -867,3 +827,19 @@ export interface IGetItemsWithRowsQuery {
     result: IGetItemsWithRowsResult;
 };
 
+
+
+
+export type TestInsertParams = [[string, number]];
+
+
+export interface ITestInsertResult {
+    
+};
+
+
+export interface ITestInsertQuery {
+    params: TestInsertParams;
+    result: ITestInsertResult;
+};
+

tests/demo/ts-syntax/ts-syntax.queries.ts

@@ -770,46 +770,6 @@ export interface ITestAwaitQueryQuery {
 
 
 
-export type TestAwaitQueryParams = [];
-
-
-export interface ITestAwaitQueryResult {
-    food_type: string;
-	id: number;
-	points: number;
-	table_id: number;
-	time_takes_to_cook: number;
-};
-
-
-export interface ITestAwaitQueryQuery {
-    params: TestAwaitQueryParams;
-    result: ITestAwaitQueryResult;
-};
-
-
-
-
-export type TestAwaitQuery2Params = [];
-
-
-export interface ITestAwaitQuery2Result {
-    food_type: string;
-	id: number;
-	points: number;
-	table_id: number;
-	time_takes_to_cook: number;
-};
-
-
-export interface ITestAwaitQuery2Query {
-    params: TestAwaitQuery2Params;
-    result: ITestAwaitQuery2Result;
-};
-
-
-
-
 export type TestAwaitQuery2Params = [];
 
 
@@ -868,3 +828,19 @@ export interface IGetItemsWithRowsQuery {
 };
 
 
+
+
+export type TestInsertParams = [[string, number]];
+
+
+export interface ITestInsertResult {
+    
+};
+
+
+export interface ITestInsertQuery {
+    params: TestInsertParams;
+    result: ITestInsertResult;
+};
+
+

tests/demo/ts-syntax/ts-syntax.snapshot.ts

@@ -302,4 +302,12 @@ function *yieldMethod() {
     SELECT * FROM items
   `)
 
+  await connection.execute(sql`
+  -- @name: testInsert
+  -- @db: db_mysql
+  INSERT INTO items (food_type, points, time_takes_to_cook, table_id) VALUES (?, ?, 1, 1);
+  `)
+
+  connection.destroy()
+
 })();