Add types overrides

docs-new/docs/cli.md

@@ -65,6 +65,9 @@ These variables will override values provided in `config.json`.
     "host": "127.0.0.1", // DB host (optional)
     "port": 5432, // DB port (optional)
     "ssl": false // Whether or not to connect to DB with SSL (optional)
+  },
+  "typesOverrides": {
+    "date": "string" // Override default Postgres => TypeScript mapping
   }
 }
 ```

packages/cli/src/config.ts

@@ -6,6 +6,7 @@ import * as t from 'io-ts';
 import { reporter } from 'io-ts-reporters';
 import tls from 'tls';
 import parseDatabaseUri, { DatabaseConfig } from 'ts-parse-database-url';
+import { TypeMapping } from './types';
 
 const transformCodecProps = {
   include: t.string,
@@ -46,6 +47,7 @@ const configParser = t.type({
     }),
     t.undefined,
   ]),
+  typesOverrides: t.union([t.record(t.string, t.string), t.undefined]),
 });
 
 export type IConfig = typeof configParser._O;
@@ -64,6 +66,7 @@ export interface ParsedConfig {
   hungarianNotation: boolean;
   transforms: IConfig['transforms'];
   srcDir: IConfig['srcDir'];
+  typesOverrides: Partial<TypeMapping>;
 }
 
 function merge<T>(base: T, ...overrides: Partial<T>[]): T {
@@ -131,6 +134,7 @@ export function parseConfig(
     failOnError,
     camelCaseColumnNames,
     hungarianNotation,
+    typesOverrides,
   } = configObject as IConfig;
 
   // CLI connectionUri flag takes precedence over the env and config one
@@ -149,12 +153,19 @@ export function parseConfig(
 
   const finalDBConfig = merge(defaultDBConfig, db, urlDBConfig, envDBConfig);
 
+  const parsedTypesOverrides: Partial<TypeMapping> = {};
+
+  for (const [builtIn, mappedTo] of Object.entries(typesOverrides ?? {})) {
+    parsedTypesOverrides[builtIn] = { name: mappedTo };
+  }
+
   return {
     db: finalDBConfig,
     transforms,
     srcDir,
     failOnError: failOnError ?? false,
     camelCaseColumnNames: camelCaseColumnNames ?? false,
     hungarianNotation: hungarianNotation ?? true,
+    typesOverrides: parsedTypesOverrides,
   };
 }

packages/cli/src/generator.ts

@@ -16,7 +16,7 @@ import { pascalCase } from 'pascal-case';
 import path from 'path';
 import { ParsedConfig } from './config';
 import { ProcessingMode } from './index';
-import { DefaultTypeMapping, TypeAllocator } from './types';
+import { TypeAllocator, TypeMapping } from './types';
 
 export interface IField {
   fieldName: string;
@@ -236,7 +236,7 @@ async function generateTypedecsFromFile(
   fileName: string,
   connection: any,
   mode: 'ts' | 'sql',
-  types: TypeAllocator = new TypeAllocator(DefaultTypeMapping),
+  types: TypeAllocator,
   config: ParsedConfig,
 ): Promise<ITypedQuery[]> {
   const results: ITypedQuery[] = [];
@@ -309,9 +309,10 @@ export async function generateDeclarationFile(
   fileName: string,
   connection: any,
   mode: 'ts' | 'sql',
-  types: TypeAllocator = new TypeAllocator(DefaultTypeMapping),
   config: ParsedConfig,
 ): Promise<{ typeDecs: ITypedQuery[]; declarationFileContents: string }> {
+  const types = new TypeAllocator(TypeMapping(config.typesOverrides));
+
   if (mode === 'sql') {
     types.use({ name: 'PreparedQuery', from: '@pgtyped/query' });
   }

packages/cli/src/worker.ts

@@ -39,7 +39,6 @@ export async function processFile(
     fileName,
     connection,
     transform.mode,
-    void 0,
     config,
   );
   const relativePath = path.relative(process.cwd(), decsFileName);