diff --git a/examples/bun-mysql2/src/db/query_sql.ts b/examples/bun-mysql2/src/db/query_sql.ts index a566596..83d5837 100644 --- a/examples/bun-mysql2/src/db/query_sql.ts +++ b/examples/bun-mysql2/src/db/query_sql.ts @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. -import mysql, { RowDataPacket, ResultSetHeader } from "mysql2/promise"; +import mysql, { type RowDataPacket, type ResultSetHeader } from "mysql2/promise"; type Client = mysql.Connection | mysql.Pool; diff --git a/examples/bun-pg/src/db/query_sql.ts b/examples/bun-pg/src/db/query_sql.ts index 2e8db52..525d4a4 100644 --- a/examples/bun-pg/src/db/query_sql.ts +++ b/examples/bun-pg/src/db/query_sql.ts @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. -import { QueryArrayConfig, QueryArrayResult } from "pg"; +import type { QueryArrayConfig, QueryArrayResult } from "pg"; interface Client { query: (config: QueryArrayConfig) => Promise; diff --git a/examples/node-mysql2/src/db/query_sql.ts b/examples/node-mysql2/src/db/query_sql.ts index bbfcd2b..dcb1b79 100644 --- a/examples/node-mysql2/src/db/query_sql.ts +++ b/examples/node-mysql2/src/db/query_sql.ts @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. -import mysql, { RowDataPacket, ResultSetHeader } from "mysql2/promise"; +import mysql, { type RowDataPacket, type ResultSetHeader } from "mysql2/promise"; type Client = mysql.Connection | mysql.Pool; diff --git a/examples/node-pg/src/db/query_sql.ts b/examples/node-pg/src/db/query_sql.ts index 2e8db52..525d4a4 100644 --- a/examples/node-pg/src/db/query_sql.ts +++ b/examples/node-pg/src/db/query_sql.ts @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. -import { QueryArrayConfig, QueryArrayResult } from "pg"; +import type { QueryArrayConfig, QueryArrayResult } from "pg"; interface Client { query: (config: QueryArrayConfig) => Promise; diff --git a/package-lock.json b/package-lock.json index 9f6826d..5a90468 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "experiment", - "version": "1.0.0", + "version": "0.0.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "experiment", - "version": "1.0.0", + "version": "0.0.7", "license": "ISC", "dependencies": { "@bufbuild/protobuf": "^1.4.2", diff --git a/package.json b/package.json index 8c7294d..c780c32 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "experiment", - "version": "1.0.0", + "version": "0.0.7", "description": "", "main": "app.js", "scripts": { diff --git a/src/drivers/mysql2.ts b/src/drivers/mysql2.ts index 35902f6..0ca36cc 100644 --- a/src/drivers/mysql2.ts +++ b/src/drivers/mysql2.ts @@ -1,8 +1,8 @@ -import { SyntaxKind, NodeFlags, TypeNode, factory } from "typescript"; +import { NodeFlags, SyntaxKind, TypeNode, factory } from "typescript"; // import { writeFileSync, STDIO } from "javy/fs"; -import { Parameter, Column, Query } from "../gen/plugin/codegen_pb"; +import { Column, Parameter, Query } from "../gen/plugin/codegen_pb"; import { argName, colName } from "./utlis"; export interface Mysql2Options { @@ -235,14 +235,14 @@ export class Driver { factory.createIdentifier("mysql"), factory.createNamedImports([ factory.createImportSpecifier( - false, + true, undefined, factory.createIdentifier("RowDataPacket") ), ...(hasExecLastIdCmd ? [ factory.createImportSpecifier( - false, + true, undefined, factory.createIdentifier("ResultSetHeader") ), diff --git a/src/drivers/pg.ts b/src/drivers/pg.ts index 95828cf..a110a21 100644 --- a/src/drivers/pg.ts +++ b/src/drivers/pg.ts @@ -7,7 +7,7 @@ import { FunctionDeclaration, } from "typescript"; -import { Parameter, Column, Query } from "../gen/plugin/codegen_pb"; +import { Column, Parameter, Query } from "../gen/plugin/codegen_pb"; import { argName, colName } from "./utlis"; function funcParamsDecl(iface: string | undefined, params: Parameter[]) { @@ -340,7 +340,7 @@ export class Driver { factory.createImportDeclaration( undefined, factory.createImportClause( - false, + true, undefined, factory.createNamedImports([ factory.createImportSpecifier(