From 6cfbae1e8df12f6a0f17e77446d8313dda3d290f Mon Sep 17 00:00:00 2001 From: Chau Tran Date: Mon, 18 Apr 2022 10:43:32 -0500 Subject: [PATCH] chore(repo): adjust helper generator to use NumberInput --- .../three/helpers/files/lib/__fileName__.ts__tmpl__ | 6 +++--- tools/generators/three/helpers/helpers.ts | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/generators/three/helpers/files/lib/__fileName__.ts__tmpl__ b/tools/generators/three/helpers/files/lib/__fileName__.ts__tmpl__ index 4e871aa95..0a7c1c7ce 100644 --- a/tools/generators/three/helpers/files/lib/__fileName__.ts__tmpl__ +++ b/tools/generators/three/helpers/files/lib/__fileName__.ts__tmpl__ @@ -36,7 +36,7 @@ export class Ngt<%= name %> extends NgtCommonObjectHelper> { import { AnyConstructor, NgtCommonHelper, - provideCommonHelperRef, + provideCommonHelperRef,<% if (hasBooleanInput) { %>coerceBooleanProperty, BooleanInput,<% } %><% if (hasNumberInput) { %> coerceNumberProperty, NumberInput,<% } %> } from '@angular-three/core'; import { ChangeDetectionStrategy, @@ -62,8 +62,8 @@ export class Ngt<%= name %> extends NgtCommonHelper> { } <% for (const input of inputs) { %> - @Input() <% if (input.shouldOverride) { %>override <% } %>set <%= input.name %>(<%= input.name %>: <%= input.type %>) { - this.set({ <%= input.name %> }); + @Input() <% if (input.shouldOverride) { %>override <% } %>set <%= input.name %>(<%= input.name %>: <% if (input.isBooleanInput) { %>BooleanInput<% } else if (input.isNumberInput) { %>NumberInput<% } else { %><%= input.type %><% } %>) { + this.set({ <% if (input.isBooleanInput || input.isNumberInput) { %><%= input.name %>: <% if (input.isNumberInput) { %>coerceNumberProperty<% } else { %>coerceBooleanProperty<% } %>(<%= input.name %>)<% } else { %><%= input.name %><% } %> }); } <% } %> diff --git a/tools/generators/three/helpers/helpers.ts b/tools/generators/three/helpers/helpers.ts index 3b5aceaa1..fe18a5c9f 100644 --- a/tools/generators/three/helpers/helpers.ts +++ b/tools/generators/three/helpers/helpers.ts @@ -90,6 +90,8 @@ export default async function helpersGenerator(tree: Tree): Promise { ([inputName, inputInfo]) => ({ name: inputName, ...inputInfo, + isNumberInput: inputInfo.type.includes('number'), + isBooleanInput: inputInfo.type.includes('boolean'), }) ); @@ -103,6 +105,8 @@ export default async function helpersGenerator(tree: Tree): Promise { tmpl: '', inputs, hasInput: inputs.length > 0, + hasBooleanInput: inputs.some((input) => input.isBooleanInput), + hasNumberInput: inputs.some((input) => input.isNumberInput), } );