From 6f10a83282b86465e4b9434fd98ba5024750c90f Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Wed, 19 Aug 2020 18:52:34 +0300 Subject: [PATCH] feat: import ObjectExtending namespace from core package --- npm/ng-packs/packages/schematics/src/utils/type.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npm/ng-packs/packages/schematics/src/utils/type.ts b/npm/ng-packs/packages/schematics/src/utils/type.ts index ebae7c802b..74e116c746 100644 --- a/npm/ng-packs/packages/schematics/src/utils/type.ts +++ b/npm/ng-packs/packages/schematics/src/utils/type.ts @@ -8,7 +8,7 @@ import { parseGenerics } from './tree'; export function createTypeSimplifier(solution: string) { const solutionRegex = new RegExp(solution.replace(/\./g, `\.`) + `\.`); - const voloRegex = /^Volo\.(Abp\.?)(Application\.?)/; + const voloRegex = /^Volo\.(Abp\.?)(Application|ObjectExtending\.?)/; return createTypeParser( type => @@ -82,7 +82,7 @@ export function createTypeToImportMapper(solution: string, namespace: string) { const modelNamespace = parseNamespace(solution, type); const refs = [type]; const specifiers = [adaptType(type.split('<')[0])]; - const path = type.startsWith('Volo.Abp.Application.Dtos') + const path = /^Volo\.Abp\.(Application\.Dtos|ObjectExtending)/.test(type) ? '@abp/ng.core' : isEnum ? relativePathToEnum(namespace, modelNamespace, specifiers[0])