From 8b7d062432c78f2af368de756308016652a6f348 Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Mon, 5 Oct 2020 17:46:58 +0300 Subject: [PATCH] fix: use camel where property names are collected --- npm/ng-packs/packages/schematics/src/models/method.ts | 4 ++-- npm/ng-packs/packages/schematics/src/utils/model.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/npm/ng-packs/packages/schematics/src/models/method.ts b/npm/ng-packs/packages/schematics/src/models/method.ts index 036392e0a1..c2833a7bfd 100644 --- a/npm/ng-packs/packages/schematics/src/models/method.ts +++ b/npm/ng-packs/packages/schematics/src/models/method.ts @@ -1,5 +1,5 @@ -import { strings } from '@angular-devkit/core'; import { eBindingSourceId, eMethodModifier } from '../enums'; +import { camel } from '../utils'; import { ParameterInBody } from './api-definition'; import { Property } from './model'; import { Omissible } from './util'; @@ -42,7 +42,7 @@ export class Body { registerActionParameter = (param: ParameterInBody) => { const { bindingSourceId, descriptorName, name, nameOnMethod } = param; - const camelName = strings.camelize(name); + const camelName = camel(name); const value = descriptorName ? `${descriptorName}.${camelName}` : nameOnMethod; switch (bindingSourceId) { diff --git a/npm/ng-packs/packages/schematics/src/utils/model.ts b/npm/ng-packs/packages/schematics/src/utils/model.ts index 0e472e64d3..f68aa9b181 100644 --- a/npm/ng-packs/packages/schematics/src/utils/model.ts +++ b/npm/ng-packs/packages/schematics/src/utils/model.ts @@ -1,8 +1,8 @@ -import { strings } from '@angular-devkit/core'; import { VOLO_NAME_VALUE, VOLO_REGEX } from '../constants'; import { Interface, Model, Property, Type, TypeWithEnum } from '../models'; import { parseNamespace } from './namespace'; import { relativePathToModel } from './path'; +import { camel } from './text'; import { parseGenerics } from './tree'; import { createTypeParser, @@ -118,7 +118,7 @@ export function createImportRefToInterfaceReducerCreator(params: ModelGeneratorP const _interface = new Interface({ identifier, base, namespace, ref }); typeDef.properties?.forEach(prop => { - const name = strings.camelize(prop.name); + const name = camel(prop.name); const optional = prop.typeSimple.endsWith('?') ? '?' : ''; const type = simplifyType(prop.typeSimple); const refs = parseType(prop.type).reduce(