Revert "Revert "try to support Database as either interface or type alias""

Author: FroggyPanda

example/beforeSchema.ts

@@ -6,7 +6,7 @@ export type Json =
   | { [key: string]: Json | undefined }
   | Json[]
 
-export interface Database {
+export type Database = {
   public: {
     Tables: {
       todos: {

package.json

@@ -8,7 +8,7 @@
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "private": false,
-  "version": "2.7.1",
+  "version": "2.7.2",
   "license": "MIT",
   "scripts": {
     "build": "tsup ./src/index.ts --format cjs,esm --dts",
@@ -41,4 +41,4 @@
     "developer-tools",
     "automatic"
   ]
-}
+}

src/utils/getDatabaseType.ts

@@ -0,0 +1,17 @@
+import { SourceFile, Node } from 'ts-morph';
+
+export function getDatabaseType(sourceFile: SourceFile) {
+  const databaseInterface = sourceFile.getInterface('Database');
+  if (databaseInterface) {
+    return databaseInterface;
+  } else {
+    const node = sourceFile
+      .getTypeAliasOrThrow('Database')
+      .getTypeNodeOrThrow();
+    if (Node.isTypeLiteral(node)) {
+      return node;
+    } else {
+      throw Error('Expected database type to be an object literal.');
+    }
+  }
+}

src/utils/getEnumsProperties.ts

@@ -2,14 +2,15 @@ import { LiteralTypeNode, Project, SourceFile, ts } from 'ts-morph';
 import { toCamelCase } from './toCamelCase';
 import chalk from 'chalk';
 import { toPascalCase } from './toPascalCase';
+import { getDatabaseType } from './getDatabaseType';
 
 export function getEnumsProperties(
   project: Project,
   sourceFile: SourceFile,
   schema: string
 ) {
-  const databaseInterface = sourceFile.getInterfaceOrThrow('Database');
-  const publicProperty = databaseInterface.getPropertyOrThrow(schema);
+  const databaseType = getDatabaseType(sourceFile);
+  const publicProperty = databaseType.getPropertyOrThrow(schema);
   const publicType = publicProperty.getType();
 
   const enumsProperty = publicType

src/utils/getFunctionProperties.ts

@@ -1,13 +1,14 @@
 import chalk from 'chalk';
 import { Project, SourceFile } from 'ts-morph';
+import { getDatabaseType } from './getDatabaseType';
 
 export function getFunctionReturnTypes(
   project: Project,
   sourceFile: SourceFile,
   schema: string
 ) {
-  const databaseInterface = sourceFile.getInterfaceOrThrow('Database');
-  const publicProperty = databaseInterface.getPropertyOrThrow(schema);
+  const databaseType = getDatabaseType(sourceFile);
+  const publicProperty = databaseType.getPropertyOrThrow(schema);
   const publicType = publicProperty.getType();
 
   const functionProperty = publicType

src/utils/getSchemasProperties.ts

@@ -1,12 +1,13 @@
 import { Project, SourceFile } from 'ts-morph';
+import { getDatabaseType } from './getDatabaseType';
 
 export function getSchemasProperties(project: Project, sourceFile: SourceFile) {
-  const databaseInterface = sourceFile.getInterfaceOrThrow('Database');
+  const databaseType = getDatabaseType(sourceFile);
 
   const schemasType = project
     .getProgram()
     .getTypeChecker()
-    .getTypeAtLocation(databaseInterface);
+    .getTypeAtLocation(databaseType);
   const schemasProperties = schemasType.getProperties();
 
   if (schemasProperties.length < 1)

src/utils/getTablesProperties.ts

@@ -1,12 +1,13 @@
 import chalk from 'chalk';
 import { Project, SourceFile } from 'ts-morph';
+import { getDatabaseType } from './getDatabaseType';
 
 export function getTablesProperties(
   project: Project,
   sourceFile: SourceFile,
   schema: string
 ) {
-  const databaseInterface = sourceFile.getInterfaceOrThrow('Database');
+  const databaseInterface = getDatabaseType(sourceFile);
   const publicProperty = databaseInterface.getPropertyOrThrow(schema);
   const publicType = publicProperty.getType();
 

src/utils/getViewsProperties.ts

@@ -1,12 +1,13 @@
 import chalk from 'chalk';
 import { Project, SourceFile } from 'ts-morph';
+import { getDatabaseType } from './getDatabaseType';
 
 export function getViewsProperties(
   project: Project,
   sourceFile: SourceFile,
   schema: string
 ) {
-  const databaseInterface = sourceFile.getInterfaceOrThrow('Database');
+  const databaseInterface = getDatabaseType(sourceFile);
   const publicProperty = databaseInterface.getPropertyOrThrow(schema);
   const publicType = publicProperty.getType();