process object var declaration and var declarations without a name (#61)

* wip

* chore: skip adding sqls from var decl if we already found new sqls

* test: update snapshot test

* chore: snapshot

* chore: update versions to 0.3.0

* chore: remove unused comment

Author: JasonShin

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "sqlx-ts"
-version = "0.2.2"
+version = "0.3.0"
 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.2.2",
+  "version": "0.3.0",
   "description": "sqlx-ts ensures your raw SQLs are compile-time checked",
   "main": "dist/index.js",
   "maintainers": [

node/package.json

@@ -151,8 +151,21 @@ fn recurse_and_find_sql(mut sqls: &mut Vec<SQL>, stmt: &Stmt, import_alias: &Str
             Decl::Var(var) => {
                 for var_decl in &var.decls {
                     let span: MultiSpan = var.span.into();
-                    let new_sqls = get_sql_from_var_decl(var_decl, span, import_alias);
+                    let new_sqls = get_sql_from_var_decl(var_decl, &span, import_alias);
+                    let num_new_sqls = new_sqls.len();
                     sqls.extend(new_sqls);
+
+                    // We've already found the sqls based on the variable name, we should skip processing further
+                    if num_new_sqls > 0 {
+                        continue;
+                    }
+
+                    // this is when the variable name is not found due to syntax like
+                    // const [rows, i] = await connection.execute....
+                    if let Some(init) = &var_decl.init {
+                        let expr = *init.clone();
+                        get_sql_from_expr(&mut sqls, &None, &expr, &span, import_alias);
+                    }
                 }
             }
             Decl::TsInterface(_) => {}

src/parser/mod.rs

@@ -17,14 +17,12 @@ pub fn process_block_stmt_as_expr(
     if let Some(body) = block_stmt {
         for stmt in &body.stmts {
             let expr = stmt.as_expr();
-            let decl = stmt.as_decl();
             if let Some(expr) = expr {
                 let expr = &expr.expr;
                 get_sql_from_expr(sqls, var_decl_name, expr, span, import_alias);
             }
-            if let Some(decl) = decl {
-                recurse_and_find_sql(sqls, stmt, import_alias);
-            }
+
+            let _ = recurse_and_find_sql(sqls, stmt, import_alias);
         }
     }
 }
@@ -179,7 +177,6 @@ pub fn get_sql_from_expr<'a>(
         Expr::Arrow(arrow) => {
             let expr = &arrow.clone().body.expr();
             let block_stmt = &arrow.clone().body.block_stmt();
-
             process_block_stmt_as_expr(&block_stmt, sqls, var_decl_name, span, import_alias);
 
             if let Some(expr) = expr {
@@ -262,7 +259,7 @@ pub fn get_sql_from_expr<'a>(
 
 /// you would normally pass in any var declarator such as
 /// const sql = sql`SELECT * FROM xxx;`
-pub fn get_sql_from_var_decl(var_declarator: &VarDeclarator, span: MultiSpan, import_alias: &String) -> Vec<SQL> {
+pub fn get_sql_from_var_decl(var_declarator: &VarDeclarator, span: &MultiSpan, import_alias: &String) -> Vec<SQL> {
     let mut bag_of_sqls: Vec<SQL> = vec![];
     let var_decl_name = get_var_decl_name(var_declarator);
 

src/parser/tag.rs

@@ -44,7 +44,6 @@ pub fn get_query_name(sql: &SQL) -> Result<String> {
     }
 
     let var_decl_name = var_decl_name.clone();
-
     if let Some(var_decl_name) = var_decl_name {
         return Ok(var_decl_name.to_case(Case::Pascal));
     }

src/ts_generator/generator.rs

@@ -1,5 +1,25 @@
 
 
+export type TestQueryWithoutVariableDeclarationParams = [];
+
+
+export interface ITestQueryWithoutVariableDeclarationResult {
+    food_type: string;
+	id: number;
+	points: number;
+	table_id: number;
+	time_takes_to_cook: number;
+};
+
+
+export interface ITestQueryWithoutVariableDeclarationQuery {
+    params: TestQueryWithoutVariableDeclarationParams;
+    result: ITestQueryWithoutVariableDeclarationResult;
+};
+
+
+
+
 export type TestQuery1Params = [];
 
 
@@ -750,6 +770,46 @@ 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 = [];
 
 
@@ -787,3 +847,23 @@ export interface IAwaitClientQueryQuery {
     result: IAwaitClientQueryResult;
 };
 
+
+
+
+export type GetItemsWithRowsParams = [];
+
+
+export interface IGetItemsWithRowsResult {
+    food_type: string;
+	id: number;
+	points: number;
+	table_id: number;
+	time_takes_to_cook: number;
+};
+
+
+export interface IGetItemsWithRowsQuery {
+    params: GetItemsWithRowsParams;
+    result: IGetItemsWithRowsResult;
+};
+

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

@@ -1,5 +1,25 @@
 
 
+export type TestQueryWithoutVariableDeclarationParams = [];
+
+
+export interface ITestQueryWithoutVariableDeclarationResult {
+    food_type: string;
+	id: number;
+	points: number;
+	table_id: number;
+	time_takes_to_cook: number;
+};
+
+
+export interface ITestQueryWithoutVariableDeclarationQuery {
+    params: TestQueryWithoutVariableDeclarationParams;
+    result: ITestQueryWithoutVariableDeclarationResult;
+};
+
+
+
+
 export type TestQuery1Params = [];
 
 
@@ -750,6 +770,46 @@ 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 = [];
 
 
@@ -788,3 +848,23 @@ export interface IAwaitClientQueryQuery {
 };
 
 
+
+
+export type GetItemsWithRowsParams = [];
+
+
+export interface IGetItemsWithRowsResult {
+    food_type: string;
+	id: number;
+	points: number;
+	table_id: number;
+	time_takes_to_cook: number;
+};
+
+
+export interface IGetItemsWithRowsQuery {
+    params: GetItemsWithRowsParams;
+    result: IGetItemsWithRowsResult;
+};
+
+

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

@@ -2,7 +2,10 @@ import { sql } from 'sqlx-ts'
 import { QueryTypes, Sequelize } from 'sequelize'
 
 // Array expression with sql, it should skip generating the type as we cannot figure out the name to use
-const [] = sql`SELECT * FROM items`
+const [] = sql`
+-- @name: testQueryWithoutVariableDeclaration
+SELECT * FROM items
+`
 
 // Expression without variable declaration
 sql`
@@ -289,7 +292,14 @@ function *yieldMethod() {
     -- @name: testAwaitQuery2
     SELECT * FROM items
   `
+
   const awaitClientQuery = await client.query(sql`
       SELECT * FROM items;
   `)
+
+  const [rows, i] = await connection.execute<Rows<IGetItems2Result>>(sql`
+    -- @name: getItemsWithRows
+    SELECT * FROM items
+  `)
+
 })();