diff --git a/CHANGELOG.md b/CHANGELOG.md index cd5c86e..2a7aed8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # 🛠️ CHANGELOG +## v1.3.40 + +- Hotfix to type inference + ## v1.3.3 - Dynamic type inference for prisma type generators diff --git a/README.md b/README.md index 2dcde9f..825cbbc 100644 --- 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-1.3.2-blue.svg) +![version](https://img.shields.io/badge/version-1.3.40-blue.svg) [![CircleCI](https://circleci.com/gh/PrinterFramework/CLI.svg?style=svg)](https://circleci.com/gh/PrinterFramework/CLI) [![codecov](https://codecov.io/gh/PrinterFramework/CLI/branch/master/graph/badge.svg)](https://codecov.io/gh/PrinterFramework/CLI) diff --git a/dist/src/generators/api.js.map b/dist/src/generators/api.js.map index 049ecbb..2b4fdab 100644 --- a/dist/src/generators/api.js.map +++ b/dist/src/generators/api.js.map @@ -1 +1 @@ -{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/generators/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA6B;AAC7B,6BAA2B;AAC3B,yCAAgD;AAChD,sCAAoC;AACpC,wDAAoD;AAEpD,SAAsB,WAAW,CAAE,IAAY;;;;;;;oBACvC,OAAO,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,UAAG,IAAI,SAAM,CAAC,CAAA;yBAE9D,CAAA,IAAA,mBAAM,EAAC,OAAO,CAAC,KAAK,KAAK,CAAA,EAAzB,wBAAyB;oBACZ,qBAAM,IAAA,iBAAO,EAAC;4BAC3B,IAAI,EAAE,SAAS;4BACf,IAAI,EAAE,WAAW;4BACjB,OAAO,EAAE,wCAAwC;yBAClD,CAAC,EAAA;;oBAJI,MAAM,GAAG,SAIb;oBAEF,IAAI,MAAM,CAAC,SAAS,KAAK,KAAK,EAAE;wBAC9B,sBAAM;qBACP;;;oBAGG,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;oBAC3B,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;oBAC5C,IAAI,GAAG,IAAA,yBAAU,EAAC,QAAQ,CAAC,CAAA;oBAEzB,WAAW,GAAG,MAAA,IAAA,iBAAI,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC,0CAAE,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;oBAE1G,IAAA,kBAAK,EAAC,OAAO,EAAE,WAAW,IAAI,EAAE,CAAC,CAAA;oBACjC,IAAA,SAAG,EAAC,wCAA4B,IAAI,SAAM,CAAC,KAAK,CAAC,CAAA;;;;;CAClD;AAvBD,kCAuBC"} \ No newline at end of file +{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/generators/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA6B;AAC7B,6BAA2B;AAC3B,yCAAgD;AAChD,sCAAoC;AACpC,wDAAoD;AAEpD,SAAsB,WAAW,CAAE,IAAY;;;;;;;oBACvC,OAAO,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,UAAG,IAAI,SAAM,CAAC,CAAA;yBAE9D,CAAA,IAAA,mBAAM,EAAC,OAAO,CAAC,KAAK,KAAK,CAAA,EAAzB,wBAAyB;oBACZ,qBAAM,IAAA,iBAAO,EAAC;4BAC3B,IAAI,EAAE,SAAS;4BACf,IAAI,EAAE,WAAW;4BACjB,OAAO,EAAE,wCAAwC;yBAClD,CAAC,EAAA;;oBAJI,MAAM,GAAG,SAIb;oBAEF,IAAI,MAAM,CAAC,SAAS,KAAK,KAAK,EAAE;wBAC9B,sBAAM;qBACP;;;oBAGG,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;oBAC3B,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;oBAC1C,IAAI,GAAG,IAAA,yBAAU,EAAC,QAAQ,CAAC,CAAA;oBAE3B,WAAW,GAAG,MAAA,IAAA,iBAAI,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC,0CAAE,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;oBAE1G,IAAA,kBAAK,EAAC,OAAO,EAAE,WAAW,IAAI,EAAE,CAAC,CAAA;oBACjC,IAAA,SAAG,EAAC,wCAA4B,IAAI,SAAM,CAAC,KAAK,CAAC,CAAA;;;;;CAClD;AAvBD,kCAuBC"} \ No newline at end of file diff --git a/dist/src/generators/component.js.map b/dist/src/generators/component.js.map index 52b43a9..064dd2a 100644 --- a/dist/src/generators/component.js.map +++ b/dist/src/generators/component.js.map @@ -1 +1 @@ -{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../src/generators/component.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../src/generators/component.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/generators/page.js.map b/dist/src/generators/page.js.map index 3ad30dc..9409bae 100644 --- a/dist/src/generators/page.js.map +++ b/dist/src/generators/page.js.map @@ -1 +1 @@ -{"version":3,"file":"page.js","sourceRoot":"","sources":["../../../src/generators/page.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA6B;AAC7B,6BAA2B;AAC3B,yCAAgD;AAChD,sCAAoC;AACpC,wDAAoD;AAEpD,SAAsB,YAAY,CAAE,IAAY;;;;;;;oBACxC,QAAQ,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,UAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,SAAM,CAAC,CAAA;yBAE5E,CAAA,IAAA,mBAAM,EAAC,QAAQ,CAAC,KAAK,KAAK,CAAA,EAA1B,wBAA0B;oBACb,qBAAM,IAAA,iBAAO,EAAC;4BAC3B,IAAI,EAAE,SAAS;4BACf,IAAI,EAAE,WAAW;4BACjB,OAAO,EAAE,yCAAyC;yBACnD,CAAC,EAAA;;oBAJI,MAAM,GAAG,SAIb;oBAEF,IAAI,MAAM,CAAC,SAAS,KAAK,KAAK,EAAE;wBAC9B,sBAAM;qBACP;;;oBAGG,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;oBAC/C,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;oBAC5C,IAAI,GAAG,EAAE,CAAA;oBACT,IAAI,GAAG,IAAA,yBAAU,EAAC,QAAQ,CAAC,CAAA;oBAC3B,YAAY,GAAG,EAAE,CAAA;oBAErB,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;oBAEvB,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;wBAC5B,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAa,CAAA;wBAC3C,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,UAAA,GAAG,IAAI,OAAA,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAzC,CAAyC,CAAC,CAAA;wBACjE,YAAY,GAAG,CAAA,MAAA,IAAA,iBAAI,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,mBAAmB,CAAC,CAAC,0CAAE,UAAU,CAAC,UAAU,EAAE,IAAI,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAI,EAAE,CAAA;qBACxJ;yBAAM;wBACL,YAAY,GAAG,CAAA,MAAA,IAAA,iBAAI,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC,0CAAE,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,KAAI,EAAE,CAAA;qBAC7G;oBAED,IAAA,kBAAK,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;oBAC7B,IAAA,SAAG,EAAC,oCAAwB,IAAI,SAAM,CAAC,KAAK,CAAC,CAAA;;;;;CAC9C;AAjCD,oCAiCC"} \ No newline at end of file +{"version":3,"file":"page.js","sourceRoot":"","sources":["../../../src/generators/page.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA6B;AAC7B,6BAA2B;AAC3B,yCAAgD;AAChD,sCAAoC;AACpC,wDAAoD;AAEpD,SAAsB,YAAY,CAAE,IAAY;;;;;;;oBACxC,QAAQ,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,UAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,SAAM,CAAC,CAAA;yBAE5E,CAAA,IAAA,mBAAM,EAAC,QAAQ,CAAC,KAAK,KAAK,CAAA,EAA1B,wBAA0B;oBACb,qBAAM,IAAA,iBAAO,EAAC;4BAC3B,IAAI,EAAE,SAAS;4BACf,IAAI,EAAE,WAAW;4BACjB,OAAO,EAAE,yCAAyC;yBACnD,CAAC,EAAA;;oBAJI,MAAM,GAAG,SAIb;oBAEF,IAAI,MAAM,CAAC,SAAS,KAAK,KAAK,EAAE;wBAC9B,sBAAM;qBACP;;;oBAGG,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;oBAC/C,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;oBAC5C,IAAI,GAAG,EAAE,CAAA;oBACP,IAAI,GAAG,IAAA,yBAAU,EAAC,QAAQ,CAAC,CAAA;oBAC7B,YAAY,GAAG,EAAE,CAAA;oBAErB,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;oBAEvB,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;wBAC5B,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAa,CAAA;wBAC3C,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,UAAA,GAAG,IAAI,OAAA,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAzC,CAAyC,CAAC,CAAA;wBACjE,YAAY,GAAG,CAAA,MAAA,IAAA,iBAAI,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,mBAAmB,CAAC,CAAC,0CAAE,UAAU,CAAC,UAAU,EAAE,IAAI,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAI,EAAE,CAAA;qBACxJ;yBAAM;wBACL,YAAY,GAAG,CAAA,MAAA,IAAA,iBAAI,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC,0CAAE,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,KAAI,EAAE,CAAA;qBAC7G;oBAED,IAAA,kBAAK,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;oBAC7B,IAAA,SAAG,EAAC,oCAAwB,IAAI,SAAM,CAAC,KAAK,CAAC,CAAA;;;;;CAC9C;AAjCD,oCAiCC"} \ No newline at end of file diff --git a/dist/src/generators/prisma.d.ts b/dist/src/generators/prisma.d.ts index 854f145..68a6f6e 100644 --- a/dist/src/generators/prisma.d.ts +++ b/dist/src/generators/prisma.d.ts @@ -1,4 +1,5 @@ interface ModelType { + original: string; name: string; type: string; imported: boolean; diff --git a/dist/src/generators/prisma.js b/dist/src/generators/prisma.js index 51640ba..3112a5f 100644 --- a/dist/src/generators/prisma.js +++ b/dist/src/generators/prisma.js @@ -121,7 +121,7 @@ function formatModel(models) { for (var models_2 = (e_3 = void 0, __values(models)), models_2_1 = models_2.next(); !models_2_1.done; models_2_1 = models_2.next()) { var model_1 = models_2_1.value; if (type === model_1.type.toUpperCase().trim()) { - newType = model_1.name[0].toUpperCase() + model_1.name.substring(1) + 'Type'; + newType = (model_1.type[0].toUpperCase() + model_1.type.substring(1) + 'Type').replaceAll('[', '').replaceAll(']', ''); imported = true; } } @@ -139,6 +139,7 @@ function formatModel(models) { inputType += '[]'; } formattedModels.push({ + original: model.type, name: model.name, type: inputType, imported: imported @@ -162,7 +163,7 @@ function generateImports(models) { for (var models_3 = __values(models), models_3_1 = models_3.next(); !models_3_1.done; models_3_1 = models_3.next()) { var model = models_3_1.value; if (model.imported) { - var name = model.name[0].toUpperCase() + model.name.substring(1); + var name = (model.original[0].toUpperCase() + model.original.substring(1)).replaceAll('[', '').replaceAll(']', ''); output += "import ".concat(name, "Type from 'types/prisma/").concat(name, "'\n"); hasImports = true; } @@ -212,7 +213,7 @@ function generatePrismaTypes() { name_1 = (tokenFmt[0] || ''); type = (tokenFmt[1] || '').toLowerCase(); if (name_1 && type) { - models.push({ name: name_1, type: type, imported: false }); + models.push({ original: type, name: name_1, type: type, imported: false }); } } } @@ -226,7 +227,7 @@ function generatePrismaTypes() { } dataMap = formatModel(models); importMap = generateImports(dataMap); - typeFile = "{{imports}}" + "export interface ".concat(name, "Type {{{injection}}}") + '\n\n' + "export default ".concat(name, "Type") + '\n'; + typeFile = '{{imports}}' + "export interface ".concat(name, "Type {{{injection}}}") + '\n\n' + "export default ".concat(name, "Type") + '\n'; typeInject = ''; try { for (dataMap_1 = (e_7 = void 0, __values(dataMap)), dataMap_1_1 = dataMap_1.next(); !dataMap_1_1.done; dataMap_1_1 = dataMap_1.next()) { diff --git a/dist/src/generators/prisma.js.map b/dist/src/generators/prisma.js.map index c0bc276..6168400 100644 --- a/dist/src/generators/prisma.js.map +++ b/dist/src/generators/prisma.js.map @@ -1 +1 @@ -{"version":3,"file":"prisma.js","sourceRoot":"","sources":["../../../src/generators/prisma.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"prisma.js","sourceRoot":"","sources":["../../../src/generators/prisma.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/helpers/nomenclature.js.map b/dist/src/helpers/nomenclature.js.map index e63dd8f..0716900 100644 --- a/dist/src/helpers/nomenclature.js.map +++ b/dist/src/helpers/nomenclature.js.map @@ -1 +1 @@ -{"version":3,"file":"nomenclature.js","sourceRoot":"","sources":["../../../src/helpers/nomenclature.ts"],"names":[],"mappings":";;;AAAA,SAAgB,UAAU,CAAC,SAAiB;IAC1C,IAAI,QAAQ,GAAG,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IAC7G,IAAI,IAAI,GAAG,QAAQ,CAAA;IAEnB,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;QAChC,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAzC,CAAyC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;KAC3F;SAAM,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;QACvC,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAzC,CAAyC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;KAC3F;SAAM;QACL,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;KACjD;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAbD,gCAaC"} \ No newline at end of file +{"version":3,"file":"nomenclature.js","sourceRoot":"","sources":["../../../src/helpers/nomenclature.ts"],"names":[],"mappings":";;;AAAA,SAAgB,UAAU,CAAE,SAAiB;IAC3C,IAAM,QAAQ,GAAG,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IAC/G,IAAI,IAAI,GAAG,QAAQ,CAAA;IAEnB,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;QAChC,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAzC,CAAyC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;KAC3F;SAAM,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;QACvC,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAzC,CAAyC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;KAC3F;SAAM;QACL,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;KACjD;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAbD,gCAaC"} \ No newline at end of file diff --git a/dist/src/printer.js b/dist/src/printer.js index ea3c063..a67eb4b 100755 --- a/dist/src/printer.js +++ b/dist/src/printer.js @@ -56,7 +56,7 @@ var prisma_1 = require("./generators/prisma"); var superagent_1 = require("./generators/superagent"); exports.Printer = new commander_1.Command('🖨️ Printer'); exports.Printer - .version('1.3.3') + .version('1.3.4') .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); diff --git a/package.json b/package.json index 42f9024..e589e4c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@printerframework/cli", "description": "🖨️ Automation Tooling for Next, Redux and Prisma.", - "version": "1.3.3", + "version": "1.3.40", "private": false, "preferGlobal": true, "repository": "https://github.com/PrinterFramework/CLI.git", diff --git a/src/generators/prisma.ts b/src/generators/prisma.ts index 8a6530f..af187b0 100644 --- a/src/generators/prisma.ts +++ b/src/generators/prisma.ts @@ -3,6 +3,7 @@ import { read, write } from 'fs-jetpack' import { Log } from '../helpers/log' interface ModelType { + original: string name: string type: string imported: boolean @@ -47,7 +48,7 @@ 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.name[0].toUpperCase() + model.name.substring(1) + 'Type' + newType = (model.type[0].toUpperCase() + model.type.substring(1) + 'Type').replaceAll('[', '').replaceAll(']', '') imported = true } } @@ -58,6 +59,7 @@ function formatModel (models: ModelType[]): ModelType[] { inputType += '[]' } formattedModels.push({ + original: model.type, name: model.name, type: inputType, imported @@ -72,7 +74,7 @@ export function generateImports (models: ModelType[]): string { let hasImports = false for (const model of models) { if (model.imported) { - const name = model.name[0].toUpperCase() + model.name.substring(1) + const name = (model.original[0].toUpperCase() + model.original.substring(1)).replaceAll('[', '').replaceAll(']', '') output += `import ${name}Type from 'types/prisma/${name}'\n` hasImports = true } @@ -113,7 +115,7 @@ export async function generatePrismaTypes () { const type = (tokenFmt[1] || '').toLowerCase() if (name && type) { - models.push({ name, type, imported: false }) + models.push({ original: type, name, type, imported: false }) } } } diff --git a/src/printer.ts b/src/printer.ts index 8d52f78..0b6246f 100644 --- a/src/printer.ts +++ b/src/printer.ts @@ -17,7 +17,7 @@ import { SuperagentTypes, injectSupergent } from './generators/superagent' export const Printer = new Command('🖨️ Printer') Printer - .version('1.3.3') + .version('1.3.40') .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)