fix: remove newline. it does nothing

ProjectXero · Nov 29, 2020 · 855b63f · 855b63f
1 parent 94b13f0
commit 855b63f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git a/src/cli/commands/generate.ts b/src/cli/commands/generate.ts
@@ -2,7 +2,7 @@ import { close, open, write } from 'fs'
 import { promisify } from 'util'
 import { Arguments, Argv, BuilderCallback } from 'yargs'
 
-import { Generator, GeneratorOptions } from '../..'
+import { Generator } from '../..'
 
 import { Params } from '../'
 import { createPool } from 'slonik'
@@ -22,7 +22,6 @@ export interface GenerateParams extends Params {
   genInsertTypes: boolean
   genTables: boolean
   genTypeObjects: boolean
-  newline: Required<GeneratorOptions>['newline']
 }
 
 export const builder: BuilderCallback<Params, GenerateParams> = (yargs: Argv) =>
@@ -62,14 +61,6 @@ export const builder: BuilderCallback<Params, GenerateParams> = (yargs: Argv) =>
         default: true,
         group: 'Generation options',
       },
-      newline: {
-        alias: 'N',
-        requiresArg: true,
-        choices: ['lf', 'crlf'] as ReadonlyArray<GeneratorOptions['newline']>,
-        description: "Type of newline to use",
-        default: 'lf' as GeneratorOptions['newline'],
-        group: 'Generation options',
-      },
     })
     .version(false)
 
@@ -89,7 +80,6 @@ export const handler = async (argv: Arguments<GenerateParams>) => {
 
     const generator = new Generator({
       schema: schemaInfo,
-      newline: argv.newline,
       genEnums: argv.genEnums,
       genTables: argv.genTables,
       genInsertTypes: argv.genInsertTypes,

diff --git a/src/cli/params.ts b/src/cli/params.ts
@@ -1,5 +1,4 @@
 export interface Params {
   database: string
-  newline: 'lf' | 'crlf'
   schema: string
 }
diff --git a/src/generator/Generator.ts b/src/generator/Generator.ts
@@ -9,7 +9,6 @@ import { SchemaInfo, TypeRegistry } from './database'
 
 export interface GeneratorOptions {
   schema: SchemaInfo
-  newline?: 'lf' | 'crlf'
   genEnums?: boolean
   genInsertTypes?: boolean
   genTables?: boolean
@@ -31,18 +30,13 @@ export default class Generator {
 
   constructor({
     schema,
-    newline = 'lf',
     genEnums = true,
     genInsertTypes = true,
     genTables = true,
     genTypeObjects = true,
   }: GeneratorOptions) {
-    if (newline !== 'lf' && newline !== 'crlf') {
-      console.warn(`Unknown newline type '${newline}' received. Acceptable values: lf, crlf. Defaulting to 'lf'.`)
-    }
-
     this.printer = createPrinter({
-      newLine: newline === 'crlf' ? NewLineKind.CarriageReturnLineFeed : NewLineKind.LineFeed,
+      newLine: NewLineKind.LineFeed,
       removeComments: false,
     })