Merge branch 'rel-3.3' into rel-4.0

npm/ng-packs/packages/schematics/src/utils/type.ts

@@ -9,16 +9,15 @@ import { parseGenerics } from './tree';
 
 export function createTypeSimplifier() {
   const parseType = createTypeParser(type => {
-    const regexp = new RegExp(/.*(?<=\.)(?<generic>.+)<.*(?<=[\.<])(?<genericType>.+)>/gm);
-    const { generic, genericType } = regexp.exec(type)?.groups ?? {};
-
-    if (generic) return `${generic}<${genericType}>`;
-
     type = type.replace(
       /System\.([0-9A-Za-z.]+)/g,
       (_, match) => SYSTEM_TYPES.get(match) ?? strings.camelize(match),
     );
-    return type.split('.').pop()!;
+
+    const regexp = new RegExp(/.*(?<=\.)(?<generic>.+)<.*(?<=[\.<])(?<genericType>.+)>/gm);
+    const { generic, genericType } = regexp.exec(type)?.groups ?? {};
+
+    return generic ? `${generic}<${genericType}>` : type.split('.').pop()!;
   });
 
   return (type: string) => {