[style] Clean up semicolons after interface blocks (#209)

* Clean up semicolons after interface blocks

* refactor tests

* cleanup mysql

* cleanup tests

* fix  test

* regen sample.queries.ts

---------

Co-authored-by: Leo5878 <[email protected]>
Co-authored-by: JasonShin <[email protected]>

Author: 3 people

src/ts_generator/types/ts_query.rs

@@ -389,9 +389,9 @@ impl fmt::Display for TsQuery {
 
     let params = format!("export type {name}Params = [{params_str}];");
 
-    let result = format!("export interface I{name}Result {{\n\t{result_str}\n}};");
+    let result = format!("export interface I{name}Result {{\n\t{result_str}\n}}");
 
-    let query = format!("export interface I{name}Query {{\n\tparams: {name}Params;\n\tresult: I{name}Result;\n}};");
+    let query = format!("export interface I{name}Query {{\n\tparams: {name}Params;\n\tresult: I{name}Result;\n}}");
 
     let final_code = format!("{params}\n\n{result}\n\n{query}");
 

tests/column_naming_convention.rs

@@ -34,12 +34,13 @@ export type SomeQueryParams = [];
 export interface ISomeQueryResult {
     helloWorld: number;
     name: string;
-};
+}
 
 export interface ISomeQueryQuery {
     params: SomeQueryParams;
     result: ISomeQueryResult;
-};
+}
+
 "#
 );
 
@@ -65,12 +66,12 @@ export interface ISomeQueryResult {
     HelloWorld1: number;
     HelloWorld2: number;
     Name: string;
-};
+}
 
 export interface ISomeQueryQuery {
     params: SomeQueryParams;
     result: ISomeQueryResult;
-};
+}
 "#
 );
 
@@ -96,12 +97,12 @@ export interface ISomeQueryResult {
     HelloWorld1: number;
     HelloWorld2: number;
     Name: string;
-};
+}
 
 export interface ISomeQueryQuery {
     params: SomeQueryParams;
     result: ISomeQueryResult;
-};
+}
 "#
 );
 }

tests/covert_to_camelcase.rs

@@ -35,12 +35,12 @@ export interface ISomeQueryResult {
     HelloWorld: number;
     hello_world: number;
     inventory_id: number | null;
-};
+}
 
 export interface ISomeQueryQuery {
     params: SomeQueryParams;
     result: ISomeQueryResult;
-};
+}
 "#
 );
 
@@ -66,12 +66,12 @@ export interface ISomeQueryResult {
     helloWorld1: number;
     helloWorld2: number;
     inventoryId: number | null;
-};
+}
 
 export interface ISomeQueryQuery {
     params: SomeQueryParams;
     result: ISomeQueryResult;
-};
+}
 "#
 );
 
@@ -97,12 +97,12 @@ export interface ISomeQueryResult {
     HelloWorld1: number;
     hello_world2: number;
     inventory_id: number | null;
-};
+}
 
 export interface ISomeQueryQuery {
     params: SomeQueryParams;
     result: ISomeQueryResult;
-};
+}
 "#
 );
 }

tests/demo/alias/alias.queries.ts

@@ -2,75 +2,75 @@ export type Sql1Params = [];
 
 export interface ISql1Result {
 	id1: number;
-};
+}
 
 export interface ISql1Query {
 	params: Sql1Params;
 	result: ISql1Result;
-};
+}
 
 export type Sql2Params = [];
 
 export interface ISql2Result {
 	id2: number;
-};
+}
 
 export interface ISql2Query {
 	params: Sql2Params;
 	result: ISql2Result;
-};
+}
 
 export type Sql3Params = [];
 
 export interface ISql3Result {
 	itemsId: number;
-};
+}
 
 export interface ISql3Query {
 	params: Sql3Params;
 	result: ISql3Result;
-};
+}
 
 export type Sql4Params = [];
 
 export interface ISql4Result {
 	theCount: number;
-};
+}
 
 export interface ISql4Query {
 	params: Sql4Params;
 	result: ISql4Result;
-};
+}
 
 export type Sql5Params = [];
 
 export interface ISql5Result {
 	theAvg: number;
-};
+}
 
 export interface ISql5Query {
 	params: Sql5Params;
 	result: ISql5Result;
-};
+}
 
 export type Sql6Params = [];
 
 export interface ISql6Result {
 	lowerVarchar: string;
-};
+}
 
 export interface ISql6Query {
 	params: Sql6Params;
 	result: ISql6Result;
-};
+}
 
 export type Sql7Params = [];
 
 export interface ISql7Result {
 	currentTime: string;
-};
+}
 
 export interface ISql7Query {
 	params: Sql7Params;
 	result: ISql7Result;
-};
+}

tests/demo/alias/alias.snapshot.ts

@@ -2,76 +2,76 @@ export type Sql1Params = [];
 
 export interface ISql1Result {
 	id1: number;
-};
+}
 
 export interface ISql1Query {
 	params: Sql1Params;
 	result: ISql1Result;
-};
+}
 
 export type Sql2Params = [];
 
 export interface ISql2Result {
 	id2: number;
-};
+}
 
 export interface ISql2Query {
 	params: Sql2Params;
 	result: ISql2Result;
-};
+}
 
 export type Sql3Params = [];
 
 export interface ISql3Result {
 	itemsId: number;
-};
+}
 
 export interface ISql3Query {
 	params: Sql3Params;
 	result: ISql3Result;
-};
+}
 
 export type Sql4Params = [];
 
 export interface ISql4Result {
 	theCount: number;
-};
+}
 
 export interface ISql4Query {
 	params: Sql4Params;
 	result: ISql4Result;
-};
+}
 
 export type Sql5Params = [];
 
 export interface ISql5Result {
 	theAvg: number;
-};
+}
 
 export interface ISql5Query {
 	params: Sql5Params;
 	result: ISql5Result;
-};
+}
 
 export type Sql6Params = [];
 
 export interface ISql6Result {
 	lowerVarchar: string;
-};
+}
 
 export interface ISql6Query {
 	params: Sql6Params;
 	result: ISql6Result;
-};
+}
 
 export type Sql7Params = [];
 
 export interface ISql7Result {
 	currentTime: string;
-};
+}
 
 export interface ISql7Query {
 	params: Sql7Params;
 	result: ISql7Result;
-};
+}
 

tests/demo/annotations/annotations.queries.ts

@@ -6,12 +6,12 @@ export interface ITestMysqlQueryResult {
 	inventory_id: number | null;
 	name: string;
 	rarity: string | null;
-};
+}
 
 export interface ITestMysqlQueryQuery {
 	params: TestMysqlQueryParams;
 	result: ITestMysqlQueryResult;
-};
+}
 
 export type TestPostgresQueryParams = [];
 
@@ -21,55 +21,55 @@ export interface ITestPostgresQueryResult {
 	inventory_id: number | null;
 	name: string;
 	rarity: string | null;
-};
+}
 
 export interface ITestPostgresQueryQuery {
 	params: TestPostgresQueryParams;
 	result: ITestPostgresQueryResult;
-};
+}
 
 export type AnnotationSql3Params = [];
 
 export interface IAnnotationSql3Result {
 	id: string;
-};
+}
 
 export interface IAnnotationSql3Query {
 	params: AnnotationSql3Params;
 	result: IAnnotationSql3Result;
-};
+}
 
 export type AnnotationSql4Params = [string | null];
 
 export interface IAnnotationSql4Result {
 	character_id: number | null;
 	id: number;
 	quantity: number | null;
-};
+}
 
 export interface IAnnotationSql4Query {
 	params: AnnotationSql4Params;
 	result: IAnnotationSql4Result;
-};
+}
 
 export type AnnotationSql5Params = [string];
 
 export interface IAnnotationSql5Result {
 	inventoryId: boolean;
-};
+}
 
 export interface IAnnotationSql5Query {
 	params: AnnotationSql5Params;
 	result: IAnnotationSql5Result;
-};
+}
 
 export type TestMysqlQueryWithParamOverridesParams = [string];
 
 export interface ITestMysqlQueryWithParamOverridesResult {
 	inventoryId: number;
-};
+}
 
 export interface ITestMysqlQueryWithParamOverridesQuery {
 	params: TestMysqlQueryWithParamOverridesParams;
 	result: ITestMysqlQueryWithParamOverridesResult;
-};
+}