chore (Snapshot test): Added additional operators to snapshot tests.

- RQBuilder: Changed Entity Service to REST API in JSDoc

Author: Refrezsh

src/rq-builder.ts

@@ -1806,7 +1806,7 @@ export class RQBuilder<
   //<editor-fold desc="Service specific">
   /**
    * @description Set locale code
-   * @description Entity Service Specific
+   * @description REST API Specific
    * @param {string} code Locale code
    * @example
    * new RQBuilder<TestModel>().locale("ua")
@@ -1836,7 +1836,7 @@ export class RQBuilder<
 
   /**
    * @description Set publication state for draft & publish
-   * @description Entity Service Specific
+   * @description REST API Specific
    * @param {PublicationStates} state Publication state
    * @example
    * new RQBuilder<TestModel>().publicationState("live")
@@ -1867,7 +1867,7 @@ export class RQBuilder<
 
   //<editor-fold desc="Build process">
   /**
-   * @description Build the current query into the final Strapi Entity Service format
+   * @description Build the current query into the final Strapi REST Api format
    * @return Query with dynamically generated query type
    */
   public build() {

tests/entity-service-query-builder/types-tests/type-snapshot.test.ts

@@ -20,6 +20,9 @@ describe("type snapshot", () => {
               .eq("nested.name", "value")
           )
       )
+      .filterRelation("nestedList", () =>
+        new SQBuilder<NestedModel>().contains("deepNestedList.deepProp", "test")
+      )
       .populateDynamic("nested", "component.1", () =>
         new SQBuilder<NestedModel>().eq("id", "value")
       )
@@ -29,6 +32,11 @@ describe("type snapshot", () => {
       .populateRelation("nestedList", () =>
         new SQBuilder<NestedModel>().eq("name", "value2").field("name")
       )
+      .populate("nestedListOptionalNullableUndefined")
+      .publicationState("preview")
+      .locale("en")
+      .page(1)
+      .pageSize(30)
       .build();
 
     const assignedQuery: {
@@ -48,6 +56,11 @@ describe("type snapshot", () => {
                 ];
               }
             ];
+          },
+          {
+            nestedList: {
+              $and: [{ deepNestedList: { deepProp: { $contains: "test" } } }];
+            };
           }
         ];
       };
@@ -64,7 +77,12 @@ describe("type snapshot", () => {
           fields: ["name"];
           filters: { $and: [{ name: { $eq: "value2" } }] };
         };
+        nestedListOptionalNullableUndefined: true;
       };
+      publicationState: "preview";
+      locale: "en";
+      page: 1;
+      pageSize: 30;
     } = query;
 
     expect(assignedQuery).toBeDefined();
@@ -87,6 +105,10 @@ describe("type snapshot", () => {
     expect(assignedQuery.filters.$and[1].$and[2].$and[1].nested.name.$eq).toBe(
       "value"
     );
+    expect(
+      assignedQuery.filters.$and[2].nestedList.$and[0].deepNestedList.deepProp
+        .$contains
+    ).toEqual("test");
 
     expect(
       assignedQuery.populate.nested.on["component.1"].filters.$and[0].id.$eq
@@ -99,5 +121,12 @@ describe("type snapshot", () => {
     expect(assignedQuery.populate.nestedList.filters.$and[0].name.$eq).toBe(
       "value2"
     );
+    expect(assignedQuery.populate.nestedListOptionalNullableUndefined).toBe(
+      true
+    );
+    expect(assignedQuery.publicationState).toEqual("preview");
+    expect(assignedQuery.locale).toEqual("en");
+    expect(assignedQuery.page).toEqual(1);
+    expect(assignedQuery.pageSize).toEqual(30);
   });
 });

tests/query-engine-query-builder/query-engine-type-snapshot.test.ts

@@ -23,6 +23,9 @@ describe("Query engine type snapshot", () => {
               .eq("nested.name", "value")
           )
       )
+      .filterRelation("nestedList", () =>
+        new QQBuilder<NestedModel>().contains("deepNestedList.deepProp", "test")
+      )
       .populateDynamic("nested", "component.1", () =>
         new QQBuilder<NestedModel>().eq("id", "value")
       )
@@ -32,6 +35,9 @@ describe("Query engine type snapshot", () => {
       .populateRelation("nestedList", () =>
         new QQBuilder<NestedModel>().eq("name", "value2").field("name")
       )
+      .populate("nestedListOptionalNullableUndefined")
+      .start(1)
+      .limit(30)
       .build();
 
     const assignedQuery: {
@@ -51,6 +57,11 @@ describe("Query engine type snapshot", () => {
                 ];
               }
             ];
+          },
+          {
+            nestedList: {
+              $and: [{ deepNestedList: { deepProp: { $contains: "test" } } }];
+            };
           }
         ];
       };
@@ -67,7 +78,10 @@ describe("Query engine type snapshot", () => {
           select: ["name"];
           where: { $and: [{ name: { $eq: "value2" } }] };
         };
+        nestedListOptionalNullableUndefined: true;
       };
+      offset: 1;
+      limit: 30;
     } = query;
 
     expect(assignedQuery).toBeDefined();
@@ -91,6 +105,11 @@ describe("Query engine type snapshot", () => {
       "value"
     );
 
+    expect(
+      assignedQuery.where.$and[2].nestedList.$and[0].deepNestedList.deepProp
+        .$contains
+    ).toEqual("test");
+
     expect(
       assignedQuery.populate.nested.on["component.1"].where.$and[0].id.$eq
     ).toBe("value");
@@ -101,5 +120,11 @@ describe("Query engine type snapshot", () => {
     expect(assignedQuery.populate.nestedList.where.$and[0].name.$eq).toBe(
       "value2"
     );
+    expect(assignedQuery.populate.nestedListOptionalNullableUndefined).toBe(
+      true
+    );
+
+    expect(assignedQuery.offset).toBe(1);
+    expect(assignedQuery.limit).toBe(30);
   });
 });

tests/rest-api-query-builder/rest-api-type-snapshot.test.ts

@@ -23,6 +23,9 @@ describe("type snapshot", () => {
               .eq("nested.name", "value")
           )
       )
+      .filterRelation("nestedList", () =>
+        new RQBuilder<NestedModel>().contains("deepNestedList.deepProp", "test")
+      )
       .populateDynamic("nested", "component.1", () =>
         new RQBuilder<NestedModel>().eq("id", "value")
       )
@@ -32,6 +35,11 @@ describe("type snapshot", () => {
       .populateRelation("nestedList", () =>
         new RQBuilder<NestedModel>().eq("name", "value2").field("name")
       )
+      .populate("nestedListOptionalNullableUndefined")
+      .publicationState("preview")
+      .locale("en")
+      .page(1)
+      .pageSize(30)
       .build();
 
     const assignedQuery: {
@@ -51,6 +59,11 @@ describe("type snapshot", () => {
                 ];
               }
             ];
+          },
+          {
+            nestedList: {
+              $and: [{ deepNestedList: { deepProp: { $contains: "test" } } }];
+            };
           }
         ];
       };
@@ -67,7 +80,11 @@ describe("type snapshot", () => {
           fields: ["name"];
           filters: { $and: [{ name: { $eq: "value2" } }] };
         };
+        nestedListOptionalNullableUndefined: { populate: "*" };
       };
+      publicationState: "preview";
+      locale: "en";
+      pagination: { page: 1; pageSize: 30 };
     } = query;
 
     expect(assignedQuery).toBeDefined();
@@ -90,6 +107,10 @@ describe("type snapshot", () => {
     expect(assignedQuery.filters.$and[1].$and[2].$and[1].nested.name.$eq).toBe(
       "value"
     );
+    expect(
+      assignedQuery.filters.$and[2].nestedList.$and[0].deepNestedList.deepProp
+        .$contains
+    ).toEqual("test");
 
     expect(
       assignedQuery.populate.nested.on["component.1"].filters.$and[0].id.$eq
@@ -102,5 +123,13 @@ describe("type snapshot", () => {
     expect(assignedQuery.populate.nestedList.filters.$and[0].name.$eq).toBe(
       "value2"
     );
+    expect(
+      assignedQuery.populate.nestedListOptionalNullableUndefined.populate
+    ).toBe("*");
+
+    expect(assignedQuery.publicationState).toEqual("preview");
+    expect(assignedQuery.locale).toEqual("en");
+    expect(assignedQuery.pagination.page).toEqual(1);
+    expect(assignedQuery.pagination.pageSize).toEqual(30);
   });
 });