better spec structure and naming

Author: shortcuts

scripts/generate.ts

@@ -56,7 +56,7 @@ export async function generate(
     spinner.succeed();
   }
 
-  for (const lang of langs) {
-    await formatter(lang, getLanguageFolder(lang), verbose);
-  }
+  await Promise.all(
+    langs.map((lang) => formatter(lang, getLanguageFolder(lang), verbose))
+  );
 }

specs/common/schemas/SearchParams.yml

@@ -232,11 +232,6 @@ page:
   x-categories:
     - Pagination
 
-cursor:
-  type: string
-  description: Cursor indicating the location to resume browsing from. Must match the value returned by the previous call.
-  example: jMDY3M2MwM2QwMWUxMmQwYWI0ZTN
-
 aroundRadius:
   description: Define the maximum radius for a geo search (in meters).
   oneOf:

specs/search/common/schemas/BrowseParams.yml

@@ -0,0 +1,18 @@
+browseParams:
+  oneOf:
+    - $ref: '../../../common/schemas/SearchParams.yml#/searchParamsString'
+    - $ref: '#/browseParamsObject'
+
+browseParamsObject:
+  allOf:
+    - $ref: '../../../common/schemas/SearchParams.yml#/searchParamsObject'
+    - $ref: '#/cursor'
+
+cursor:
+  type: object
+  additionalProperties: false
+  properties:
+    cursor:
+      type: string
+      description: Cursor indicating the location to resume browsing from. Must match the value returned by the previous call.
+      example: jMDY3M2MwM2QwMWUxMmQwYWI0ZTN

specs/search/common/schemas/BrowseResponse.yml

@@ -0,0 +1,5 @@
+browseResponse:
+  allOf:
+    - $ref: './SearchResponse.yml#/baseSearchResponse'
+    - $ref: './SearchResponse.yml#/searchHits'
+    - $ref: './BrowseParams.yml#/cursor'

specs/search/common/schemas/SearchResponse.yml

@@ -1,21 +1,8 @@
-SearchResponse:
+searchResponse:
   allOf:
     - $ref: '#/baseSearchResponse'
     - $ref: '#/searchHits'
 
-browseResponse:
-  allOf:
-    - $ref: '#/baseSearchResponse'
-    - $ref: '#/searchHits'
-    - $ref: '#/baseBrowseResponse'
-
-baseBrowseResponse:
-  type: object
-  additionalProperties: false
-  properties:
-    cursor:
-      $ref: '../../../common/schemas/SearchParams.yml#/cursor'
-
 searchHits:
   type: object
   additionalProperties: false

specs/search/paths/search/browse.yml

@@ -15,14 +15,14 @@ post:
     content:
       application/json:
         schema:
-          $ref: '../../../common/schemas/SearchParams.yml#/searchParams'
+          $ref: '../../common/schemas/BrowseParams.yml#/browseParams'
   responses:
     '200':
       description: OK
       content:
         application/json:
           schema:
-            $ref: '../../common/schemas/SearchResponse.yml#/browseResponse'
+            $ref: '../../common/schemas/BrowseResponse.yml#/browseResponse'
     '400':
       $ref: '../../../common/responses/BadRequest.yml'
     '402':

specs/search/paths/search/search.yml

@@ -38,7 +38,7 @@ post:
               results:
                 type: array
                 items:
-                  $ref: '../../common/schemas/SearchResponse.yml#/SearchResponse'
+                  $ref: '../../common/schemas/SearchResponse.yml#/searchResponse'
             required:
               - results
     '400':

specs/search/paths/search/searchSingleIndex.yml

@@ -19,7 +19,7 @@ post:
       content:
         application/json:
           schema:
-            $ref: '../../common/schemas/SearchResponse.yml#/SearchResponse'
+            $ref: '../../common/schemas/SearchResponse.yml#/searchResponse'
     '400':
       $ref: '../../../common/responses/BadRequest.yml'
     '402':

templates/javascript/clients/client/api/helpers.mustache

@@ -113,15 +113,15 @@ waitForApiKey(
  * @summary Helper method that iterates on the `browse` method.
  * @param browseObjects - The browseObjects object.
  * @param browseObjects.indexName - The index in which to perform the request.
- * @param browseObjects.searchParams - The `browse` search parameters.
+ * @param browseObjects.browseParams - The `browse` parameters.
  * @param browseObjects.validate - The validator function. It receive the resolved return of the API call. By default, stops when there is no `cursor` in the response.
  * @param browseObjects.aggregator - The function that runs right after the API call has been resolved, allows you to do anything with the response before `validate`.
  * @param requestOptions - The requestOptions to send along with the query, they will be forwarded to the `browse` method and merged with the transporter requestOptions.
  */
 browseObjects<T>(
   {
     indexName,
-    searchParams,
+    browseParams,
     ...browseObjectsOptions
   }: BrowseOptions<BrowseResponse<T>> & BrowseProps,
   requestOptions?: RequestOptions
@@ -131,9 +131,9 @@ browseObjects<T>(
       return this.browse(
         {
           indexName,
-          searchParams: {
+          browseParams: {
             cursor: previousResponse ? previousResponse.cursor : undefined,
-            ...searchParams,
+            ...browseParams,
           },
         },
         requestOptions

tests/CTS/methods/requests/search/browse.json

@@ -13,7 +13,7 @@
     "testName": "browse with search parameters",
     "parameters": {
       "indexName": "indexName",
-      "searchParams": {
+      "browseParams": {
         "query": "myQuery",
         "facetFilters": [
           "tags:algolia"
@@ -30,5 +30,21 @@
         ]
       }
     }
+  },
+  {
+    "testName": "browse allow a cursor in parameters",
+    "parameters": {
+      "indexName": "indexName",
+      "browseParams": {
+        "cursor": "test"
+      }
+    },
+    "request": {
+      "path": "/1/indexes/indexName/browse",
+      "method": "POST",
+      "body": {
+        "cursor": "test"
+      }
+    }
   }
 ]