v2.1.2 - improve import definition coverage

PrinterFramework · Jun 29, 2023 · 7f6b4ae · 7f6b4ae
1 parent 4852bc9
commit 7f6b4ae
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # 🛠️ CHANGELOG
 
+## 2.1.2
+
+- Fix `prisma` import definitions to cover all types
+
 ## 2.1.1
 
 - Fix for `prisma` circular import definitions

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 ## Automation Tooling for Next, Redux and Prisma
 
 ![license](https://img.shields.io/badge/license-AGPLv3-blue.svg)
-![version](https://img.shields.io/badge/version-2.1.1-blue.svg)
+![version](https://img.shields.io/badge/version-2.1.2-blue.svg)
 [![CircleCI](https://circleci.com/gh/PrinterFramework/CLI.svg?style=svg)](https://circleci.com/gh/PrinterFramework/CLI)
 
 **Printer v1.x.x** is compatible with the old Next patterns. You can review the documentation on the v1 website: [v1.prntr.click/docs](https://v1.prntr.click/docs)

diff --git a/dist/src/generators/prisma.js b/dist/src/generators/prisma.js
diff --git a/dist/src/generators/prisma.js.map b/dist/src/generators/prisma.js.map
diff --git a/dist/src/printer.js b/dist/src/printer.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@printerframework/cli",
   "description": "🖨️ Automation Tooling for Next, Redux and Prisma.",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "private": false,
   "preferGlobal": true,
   "repository": "https://github.com/PrinterFramework/CLI.git",

diff --git a/src/generators/prisma.ts b/src/generators/prisma.ts
@@ -47,8 +47,8 @@ function formatModel (models: ModelType[]): ModelType[] {
 
     if (newType === 'any' && names.includes(model.name.toUpperCase())) {
       for (const model of models) {
-        if (type === model.type.toUpperCase().trim()) {
-          newType = (model.type[0].toUpperCase() + model.type.substring(1) + 'Type').replaceAll('[', '').replaceAll(']', '')
+        if (type.replaceAll('[]', '').replaceAll('?', '') === model.type.replaceAll('[]', '').replaceAll('?', '').toUpperCase().trim()) {
+          newType = (model.type[0].toUpperCase() + model.type.substring(1) + 'Type').replaceAll('[', '').replaceAll(']', '').replaceAll('?', '')
           imported = true
         }
       }
@@ -75,7 +75,7 @@ export function generateImports (name: string, models: ModelType[]): string {
   for (const model of models) {
     const circularCheck = model.original.replaceAll('[]', '').replaceAll('?', '').toUpperCase()
     if (model.imported && circularCheck !== name.toUpperCase()) {
-      const name = (model.original[0].toUpperCase() + model.original.substring(1)).replaceAll('[', '').replaceAll(']', '')
+      const name = (model.original[0].toUpperCase() + model.original.substring(1)).replaceAll('[', '').replaceAll(']', '').replaceAll('?', '')
       output += `import ${name}Type from 'types/prisma/${name}'\n`
       hasImports = true
     }

diff --git a/src/printer.ts b/src/printer.ts
@@ -20,7 +20,7 @@ import { SuperagentTypes, injectSupergent } from './generators/superagent'
 export const Printer = new Command('🖨️ Printer')
 
 Printer
-  .version('2.1.1')
+  .version('2.1.2')
   .description('🖨️ Printer: Automation Tooling for Next, Redux and Prisma.')
   .option('-a, --no-action', 'do not inject actions', false)
   .option('-s, --no-state', 'do not inject state', false)