main api interface accept db as a string type

rapthead · Aug 14, 2017 · e5e0ef8 · e5e0ef8
1 parent c588419
commit e5e0ef8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/bin/schemats.ts b/bin/schemats.ts
@@ -50,8 +50,6 @@ let argv: SchematsConfig = yargs
 (async () => {
 
     try {
-        let db = getDatabase(argv.conn)
-
         if (!Array.isArray(argv.table)) {
             if (!argv.table) {
                 argv.table = []
@@ -61,7 +59,7 @@ let argv: SchematsConfig = yargs
         }
 
         let formattedOutput = await typescriptOfSchema(
-            db, argv.table, argv.schema, { camelCase: argv.camelCase })
+            argv.conn, argv.table, argv.schema, { camelCase: argv.camelCase })
         fs.writeFileSync(argv.output, formattedOutput)
 
     } catch (e) {

diff --git a/src/index.ts b/src/index.ts
@@ -4,7 +4,7 @@
  */
 
 import { generateEnumType, generateTableTypes, generateTableInterface } from './typescript'
-import { Database } from './schema'
+import { getDatabase, Database } from './schema'
 import Options, { OptionValues } from './options'
 import { processString } from 'typescript-formatter'
 const pkgVersion = require('../package.json').version
@@ -45,21 +45,29 @@ function buildHeader (db: Database, tables: string[], schema: string|null, optio
     `
 }
 
-export async function typescriptOfTable (db: Database, 
+export async function typescriptOfTable (db: Database|string, 
                                          table: string,
                                          schema: string,
                                          options = new Options()) {
+    if (typeof db === 'string') {
+        db = getDatabase(db)
+    }
+
     let interfaces = ''
     let tableTypes = await db.getTableTypes(table, schema, options)
     interfaces += generateTableTypes(table, tableTypes, options)
     interfaces += generateTableInterface(table, tableTypes, options)
     return interfaces
 }
 
-export async function typescriptOfSchema (db: Database,
-                                          tables: string[],
-                                          schema: string|null,
-                                          options: OptionValues): Promise<string> {
+export async function typescriptOfSchema (db: Database|string,
+                                          tables: string[] = [],
+                                          schema: string|null = null,
+                                          options: OptionValues = {}): Promise<string> {
+    if (typeof db === 'string') {
+        db = getDatabase(db)
+    }
+
     if (!schema) {
         schema = db.getDefaultSchema()
     }