Revert "fix(root): Remove ViewChild from metadata"

This reverts commit 4421a1c.
help-me-mom · May 28, 2024 · 5c98e73 · 5c98e73
1 parent 4421a1c
commit 5c98e73
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 4 deletions.
diff --git a/libs/ng-mocks/src/lib/common/decorate.queries.ts b/libs/ng-mocks/src/lib/common/decorate.queries.ts
@@ -27,10 +27,7 @@ const generateFinalQueries = (queries: {
 
   for (const key of Object.keys(queries)) {
     const query: Query & { ngMetadataName?: string } = queries[key];
-
-    if (!query.isViewQuery || isInternalKey(key)) {
-      final.push([key, query]);
-    }
+    final.push([key, query]);
 
     if (!query.isViewQuery && !isInternalKey(key)) {
       scanKeys.push(key);

diff --git a/libs/ng-mocks/src/lib/mock-component/mock-component.spec.ts b/libs/ng-mocks/src/lib/mock-component/mock-component.spec.ts
@@ -393,6 +393,22 @@ describe('MockComponent', () => {
           ngMetadataName: 'ContentChildren',
         }),
       ],
+      o3: [
+        jasmine.objectContaining({
+          selector: 'i3',
+          isViewQuery: true,
+          read: TemplateRef,
+          ngMetadataName: 'ViewChild',
+        }),
+      ],
+      o4: [
+        jasmine.objectContaining({
+          selector: 'i4',
+          isViewQuery: true,
+          read: TemplateRef,
+          ngMetadataName: 'ViewChildren',
+        }),
+      ],
       o5: [
         jasmine.objectContaining({
           selector: 'i5',
@@ -409,6 +425,22 @@ describe('MockComponent', () => {
           ngMetadataName: 'ContentChildren',
         }),
       ],
+      o7: [
+        jasmine.objectContaining({
+          selector: 'i7',
+          isViewQuery: true,
+          read: ElementRef,
+          ngMetadataName: 'ViewChild',
+        }),
+      ],
+      o8: [
+        jasmine.objectContaining({
+          selector: 'i8',
+          isViewQuery: true,
+          read: ElementRef,
+          ngMetadataName: 'ViewChildren',
+        }),
+      ],
 
       __ngMocksVcr_o1: [
         jasmine.objectContaining({

diff --git a/libs/ng-mocks/src/lib/mock-directive/mock-directive.spec.ts b/libs/ng-mocks/src/lib/mock-directive/mock-directive.spec.ts
@@ -300,6 +300,22 @@ describe('MockDirective', () => {
           ngMetadataName: 'ContentChildren',
         }),
       ],
+      o3: [
+        jasmine.objectContaining({
+          selector: 'i3',
+          isViewQuery: true,
+          read: TemplateRef,
+          ngMetadataName: 'ViewChild',
+        }),
+      ],
+      o4: [
+        jasmine.objectContaining({
+          selector: 'i4',
+          isViewQuery: true,
+          read: TemplateRef,
+          ngMetadataName: 'ViewChildren',
+        }),
+      ],
       o5: [
         jasmine.objectContaining({
           selector: 'i5',
@@ -316,6 +332,22 @@ describe('MockDirective', () => {
           ngMetadataName: 'ContentChildren',
         }),
       ],
+      o7: [
+        jasmine.objectContaining({
+          selector: 'i7',
+          isViewQuery: true,
+          read: ElementRef,
+          ngMetadataName: 'ViewChild',
+        }),
+      ],
+      o8: [
+        jasmine.objectContaining({
+          selector: 'i8',
+          isViewQuery: true,
+          read: ElementRef,
+          ngMetadataName: 'ViewChildren',
+        }),
+      ],
 
       __ngMocksVcr_o1: [
         jasmine.objectContaining({