fix: rename files and fns

Author: jonoise

commands/create.ts

@@ -3,7 +3,8 @@ import {
   createFolder,
   checkFileExists,
   findApiDir,
-  findPagesDir
+  findPagesDir,
+  getConfigs
 } from '../lib'
 import { Options } from '../types'
 import colors from '@colors/colors/safe'
@@ -13,7 +14,10 @@ export const createAction = async (
   options: Options
 ): Promise<void> => {
   try {
-    const extension = options.ts ? 'ts' : 'js'
+    // CONFIG OPTIONS
+    const { typescript: tsConfig } = getConfigs()
+
+    const extension = tsConfig ? 'ts' : options.ts ? 'ts' : 'js'
     const pagesDir = await findPagesDir()
     const apiDir = await findApiDir(pagesDir)
 

defaultConfig.ts

@@ -1,5 +1,5 @@
 export default {
-  tsConfig: (name: string): string => `
+  tsContent: (name: string): string => `
     import type { NextApiRequest, NextApiResponse } from 'next'
     
     // @methods [GET,POST,PUT,DELETE]
@@ -44,5 +44,6 @@ export default {
         return res.status(405).end(\`Method \${req.method} Not Allowed\`)
       }
     }
-    `
+    `,
+  typescript: false
 }

lib/createFile.ts

@@ -1,20 +1,14 @@
-import { writeFile } from 'fs/promises'
 import colors from '@colors/colors/safe'
+import { writeFile } from 'fs/promises'
 import { toCamelCase } from './sanitizeRoutes'
-import _configs from '../defaultConfig'
-import { findConfigFile } from './findConfigFile'
-import { Configs } from '../types'
+import { getConfigs } from './getConfigs'
 
 export const createFile = async (
   filePath: string,
   language: string
 ): Promise<void> => {
   // CONFIG OPTIONS
-
-  const { tsContent, jsContent, typescript }: Configs = {
-    ..._configs,
-    ...findConfigFile()
-  }
+  const { jsContent, tsContent, typescript } = getConfigs()
 
   const file = filePath.split('/').pop() as string // filename.extension
   const filename = toCamelCase(file.split('.')[0] ?? '') // filename

lib/findConfigFile.ts renamed to lib/getConfigs.ts

@@ -3,8 +3,10 @@ import colors from '@colors/colors/safe'
 import { join } from 'path'
 import { isDirectory } from './isDirectory'
 import fs from 'fs'
+import { Configs } from '../types'
+import defaultConfig from '../defaultConfig'
 
-export const findConfigFile = (): any => {
+export const getConfigs = (): Configs => {
   const routePath = join(process.cwd())
   if (isDirectory(routePath)) {
     // check if file exists
@@ -13,18 +15,14 @@ export const findConfigFile = (): any => {
     const jsPath = fs.existsSync(jsConfig)
     const tsPath = fs.existsSync(tsConfig)
 
-    if (!jsPath && !tsPath) {
-      return {}
-    }
-
     if (jsPath) {
-      return require(jsConfig)
+      return { ...defaultConfig, ...require(jsConfig) }
     }
 
     if (tsPath) {
-      return require(tsConfig)
+      return { ...defaultConfig, ...require(tsConfig) }
     }
-    return {}
+    return { ...defaultConfig }
   }
 
   throw colors.red(

lib/index.ts

@@ -6,4 +6,4 @@ export * from './checkFileExists'
 export * from './createFile'
 export * from './createFolder'
 export * from './findDirectories'
-export * from './findConfigFile'
+export * from './getConfigs'