fix: remove duplicate registered message

YassinEldeeb · Jan 8, 2022 · 3c4e4ed · 3c4e4ed
1 parent e683517
commit 3c4e4ed
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 22 deletions.
diff --git a/packages/cpg-template-typescript/template/src/__tests__/__fixtures__/getSampleDMMF.ts b/packages/cpg-template-typescript/template/src/__tests__/__fixtures__/getSampleDMMF.ts
@@ -1,11 +1,7 @@
-import { getDMMF } from '@prisma/sdk'
-import fs from 'fs'
+import { getDMMF, getSchemaSync } from '@prisma/sdk'
 import path from 'path'
 
-const samplePrismaSchema = fs.readFileSync(
-  path.join(__dirname, './sample.prisma'),
-  'utf-8',
-)
+const samplePrismaSchema = getSchemaSync(path.join(__dirname, './sample.prisma'))
 
 export const getSampleDMMF = async () => {
   return getDMMF({

diff --git a/packages/cpg-template-typescript/template/src/__tests__/genEnum.test.ts b/packages/cpg-template-typescript/template/src/__tests__/genEnum.test.ts
@@ -1,13 +1,9 @@
-import { DMMF } from '@prisma/generator-helper'
 import { genEnum } from '../helpers/genEnum'
 import { getSampleDMMF } from './__fixtures__/getSampleDMMF'
 
-let sampleDMMF: DMMF.Document
-beforeAll(async () => {
-  sampleDMMF = await getSampleDMMF()
-})
+test('enum generation', async () => {
+  const sampleDMMF = await getSampleDMMF()
 
-test('enum generation', () => {
   sampleDMMF.datamodel.enums.forEach((enumInfo) => {
     expect(genEnum(enumInfo)).toMatchSnapshot(enumInfo.name)
   })

diff --git a/packages/cpg-template-typescript/template/src/generator.ts b/packages/cpg-template-typescript/template/src/generator.ts
@@ -6,6 +6,7 @@ import { genEnum } from './helpers/genEnum'
 import { writeFileSafely } from './utils/writeFileSafely'
 
 const { version } = require('../package.json')
+
 generatorHandler({
   onManifest() {
     logger.info(`${GENERATOR_NAME}:Registered`)
@@ -16,7 +17,7 @@ generatorHandler({
     }
   },
   onGenerate: async (options: GeneratorOptions) => {
-     options.dmmf.datamodel.enums.forEach(async (enumInfo) => {
+    options.dmmf.datamodel.enums.forEach(async (enumInfo) => {
       const tsEnum = genEnum(enumInfo)
 
       const writeLocation = path.join(

diff --git a/packages/cpg-template-typescript/template/src/utils/formatFile.ts b/packages/cpg-template-typescript/template/src/utils/formatFile.ts
@@ -15,7 +15,6 @@ export const formatFile = (content: string): Promise<string> => {
 
         res(formatted)
       } catch (error) {
-        console.error(error)
         rej(error)
       }
     })

diff --git a/packages/cpg-template/template/src/__tests__/__fixtures__/getSampleDMMF.js b/packages/cpg-template/template/src/__tests__/__fixtures__/getSampleDMMF.js
@@ -1,11 +1,7 @@
-import { getDMMF } from '@prisma/sdk'
-import fs from 'fs'
+import { getDMMF, getSchemaSync } from '@prisma/sdk'
 import path from 'path'
 
-const samplePrismaSchema = fs.readFileSync(
-  path.join(__dirname, './sample.prisma'),
-  'utf-8',
-)
+const samplePrismaSchema = getSchemaSync(path.join(__dirname, './sample.prisma'))
 
 export const getSampleDMMF = async () => {
   return getDMMF({

diff --git a/packages/cpg-template/template/src/generator.js b/packages/cpg-template/template/src/generator.js
@@ -5,7 +5,7 @@ import { GENERATOR_NAME } from './constants'
 import { genEnum } from './helpers/genEnum'
 import { writeFileSafely } from './utils/writeFileSafely'
 
-logger.info(`${GENERATOR_NAME}:Registered`)
+const { version } = require('../package.json')
 
 generatorHandler({
   onManifest() {

diff --git a/packages/cpg-template/template/src/utils/formatFile.js b/packages/cpg-template/template/src/utils/formatFile.js
@@ -15,7 +15,6 @@ export const formatFile = (content) => {
 
         res(formatted)
       } catch (error) {
-        console.error(error)
         rej(error)
       }
     }),