diff --git a/CHANGELOG.md b/CHANGELOG.md index 41c8ebf..7cbef2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # 🛠️ CHANGELOG +## v1.1.2 + +- Array Typed injections were patched to use [...] instead of {...} for spread assignment. + ## v1.1.1 - Made sure type injections support array namespaces diff --git a/README.md b/README.md index 658ce54..76369ea 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.1.1-blue.svg) +![version](https://img.shields.io/badge/version-1.1.2-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/inject.js b/dist/src/generators/inject.js index 2012131..fb36677 100644 --- a/dist/src/generators/inject.js +++ b/dist/src/generators/inject.js @@ -43,7 +43,7 @@ var log_1 = require("../helpers/log"); var match_1 = require("../helpers/match"); function inject(slice, component) { return __awaiter(this, void 0, void 0, function () { - var filePath, pathArray, fileName, fileContents, fileComponentPath, slicePath, sliceContents, matches, splitFile, sliceMatch, newContents, stateInjections, actionInjections, i, index, match, decorator, typeMap, varKey, varKey, hasExistingImport, i, stateInjection, typeName, i, stateInjection, injectionLine, tempContents, typeMap, value, typeName, injectionLine, tempContents, tempContents, fileComponentPath; + var filePath, pathArray, fileName, fileContents, fileComponentPath, slicePath, sliceContents, matches, splitFile, sliceMatch, newContents, stateInjections, actionInjections, i, index, match, decorator, typeMap, varKey, varKey, hasExistingImport, i, stateInjection, typeName, i, stateInjection, injectionLine, tempContents, typeMap, value, spreadLeft, spreadRight, typeName, injectionLine, tempContents, tempContents, fileComponentPath; return __generator(this, function (_a) { filePath = (0, path_1.join)(process.cwd(), component); pathArray = component.split('/'); @@ -111,6 +111,8 @@ function inject(slice, component) { tempContents = newContents.split('\n'); typeMap = 'any'; value = stateInjection.value; + spreadLeft = '{'; + spreadRight = '}'; if (stateInjection.type) { typeName = stateInjection.type[0].toUpperCase() + stateInjection.type.substring(1) + 'Type'; if (typeName.indexOf('[]') !== -1) { @@ -118,8 +120,10 @@ function inject(slice, component) { value = value.replaceAll('[]', ''); } typeMap = "{ ".concat(stateInjection.type.replaceAll('[]', ''), ": { ").concat(value, ": ").concat(typeName, " } }"); + spreadLeft = '['; + spreadRight = ']'; } - tempContents[injectionLine] = tempContents[injectionLine] + "\n const ".concat(value, " = useSelector((state: ").concat(typeMap, ") => ({ ...state.").concat(slice, ".").concat(value, " }))"); + tempContents[injectionLine] = tempContents[injectionLine] + "\n const ".concat(value, " = useSelector((state: ").concat(typeMap, ") => (").concat(spreadLeft, " ...state.").concat(slice, ".").concat(value, " ").concat(spreadRight, "))"); if (i === stateInjections.length - 1) { tempContents[injectionLine] = tempContents[injectionLine] + '\n'; } diff --git a/dist/src/generators/inject.js.map b/dist/src/generators/inject.js.map index 3b0f96e..10a51fe 100644 --- a/dist/src/generators/inject.js.map +++ b/dist/src/generators/inject.js.map @@ -1 +1 @@ -{"version":3,"file":"inject.js","sourceRoot":"","sources":["../../../src/generators/inject.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"inject.js","sourceRoot":"","sources":["../../../src/generators/inject.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/printer.js b/dist/src/printer.js index 350237d..4f5df4c 100755 --- a/dist/src/printer.js +++ b/dist/src/printer.js @@ -53,7 +53,7 @@ var crud_1 = require("./generators/crud"); var inject_1 = require("./generators/inject"); exports.Printer = new commander_1.Command('🖨️ Printer'); exports.Printer - .version('1.1.1') + .version('1.1.2') .description('🖨️ Printer: Automation Tooling for Next, Redux and Prisma.'); exports.Printer .command('new [path]') diff --git a/package.json b/package.json index 5c6f0ec..24aed06 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@printerframework/cli", "description": "🖨️ Automation Tooling for Next, Redux and Prisma.", - "version": "1.1.1", + "version": "1.1.2", "private": false, "preferGlobal": true, "repository": "https://github.com/PrinterFramework/CLI.git", diff --git a/src/generators/inject.ts b/src/generators/inject.ts index 1a1a271..dbb7fff 100644 --- a/src/generators/inject.ts +++ b/src/generators/inject.ts @@ -83,6 +83,8 @@ export async function inject (slice: string, component: string) { let typeMap = 'any' let value = stateInjection.value + let spreadLeft = '{' + let spreadRight = '}' if (stateInjection.type) { let typeName = stateInjection.type[0].toUpperCase() + stateInjection.type.substring(1) + 'Type' @@ -91,9 +93,12 @@ export async function inject (slice: string, component: string) { value = value.replaceAll('[]', '') } typeMap = `{ ${stateInjection.type.replaceAll('[]', '')}: { ${value}: ${typeName} } }` + + spreadLeft = '[' + spreadRight = ']' } - tempContents[injectionLine] = tempContents[injectionLine] + `\n const ${value} = useSelector((state: ${typeMap}) => ({ ...state.${slice}.${value} }))` + tempContents[injectionLine] = tempContents[injectionLine] + `\n const ${value} = useSelector((state: ${typeMap}) => (${spreadLeft} ...state.${slice}.${value} ${spreadRight}))` if (i === stateInjections.length - 1) { tempContents[injectionLine] = tempContents[injectionLine] + '\n' diff --git a/src/printer.ts b/src/printer.ts index 2b88578..305d135 100644 --- a/src/printer.ts +++ b/src/printer.ts @@ -14,7 +14,7 @@ import { inject } from './generators/inject' export const Printer = new Command('🖨️ Printer') Printer - .version('1.1.1') + .version('1.1.2') .description('🖨️ Printer: Automation Tooling for Next, Redux and Prisma.') Printer