Merge branch 'main' into fix/review-common-specs

clients/algoliasearch-client-dart/packages/algoliasearch/lib/src/api/search_client.dart

@@ -64,8 +64,7 @@ final class SearchClient implements ApiClient {
     );
     final request = ApiRequest(
       method: RequestMethod.post,
-      path: r'/1{path}'
-          .replaceAll('{' r'path' '}', Uri.encodeComponent(path.toString())),
+      path: r'/1{path}'.replaceAll('{' r'path' '}', path),
       queryParams: {
         ...?parameters,
       },

clients/algoliasearch-client-dart/packages/algoliasearch/lib/src/deserialize.dart

@@ -312,6 +312,9 @@ ReturnType deserialize<ReturnType, BaseType>(dynamic value, String targetType,
               growable: growable)),
         ) as ReturnType;
       }
+      if (targetType == 'Object') {
+        return value;
+      }
       break;
   }
   throw Exception('Cannot deserialize');

clients/algoliasearch-client-dart/packages/client_core/lib/src/transport/dio/dio_requester.dart

@@ -81,6 +81,7 @@ class DioRequester implements Requester {
       options: Options(
         method: request.method,
         headers: request.headers,
+        contentType: request.body != null ? Headers.jsonContentType : null,
         sendTimeout: request.timeout,
         receiveTimeout: request.timeout,
       ),

clients/algoliasearch-client-dart/packages/client_insights/lib/src/api/insights_client.dart

@@ -65,8 +65,7 @@ final class InsightsClient implements ApiClient {
     );
     final request = ApiRequest(
       method: RequestMethod.delete,
-      path: r'/1{path}'
-          .replaceAll('{' r'path' '}', Uri.encodeComponent(path.toString())),
+      path: r'/1{path}'.replaceAll('{' r'path' '}', path),
       queryParams: {
         ...?parameters,
       },
@@ -100,8 +99,7 @@ final class InsightsClient implements ApiClient {
     );
     final request = ApiRequest(
       method: RequestMethod.get,
-      path: r'/1{path}'
-          .replaceAll('{' r'path' '}', Uri.encodeComponent(path.toString())),
+      path: r'/1{path}'.replaceAll('{' r'path' '}', path),
       queryParams: {
         ...?parameters,
       },
@@ -137,8 +135,7 @@ final class InsightsClient implements ApiClient {
     );
     final request = ApiRequest(
       method: RequestMethod.post,
-      path: r'/1{path}'
-          .replaceAll('{' r'path' '}', Uri.encodeComponent(path.toString())),
+      path: r'/1{path}'.replaceAll('{' r'path' '}', path),
       queryParams: {
         ...?parameters,
       },
@@ -201,8 +198,7 @@ final class InsightsClient implements ApiClient {
     );
     final request = ApiRequest(
       method: RequestMethod.put,
-      path: r'/1{path}'
-          .replaceAll('{' r'path' '}', Uri.encodeComponent(path.toString())),
+      path: r'/1{path}'.replaceAll('{' r'path' '}', path),
       queryParams: {
         ...?parameters,
       },

clients/algoliasearch-client-dart/packages/client_insights/lib/src/deserialize.dart

@@ -92,6 +92,9 @@ ReturnType deserialize<ReturnType, BaseType>(dynamic value, String targetType,
               growable: growable)),
         ) as ReturnType;
       }
+      if (targetType == 'Object') {
+        return value;
+      }
       break;
   }
   throw Exception('Cannot deserialize');

clients/algoliasearch-client-dart/packages/client_search/lib/src/api/search_client.dart

@@ -490,8 +490,7 @@ final class SearchClient implements ApiClient {
     );
     final request = ApiRequest(
       method: RequestMethod.delete,
-      path: r'/1{path}'
-          .replaceAll('{' r'path' '}', Uri.encodeComponent(path.toString())),
+      path: r'/1{path}'.replaceAll('{' r'path' '}', path),
       queryParams: {
         ...?parameters,
       },
@@ -775,8 +774,7 @@ final class SearchClient implements ApiClient {
     );
     final request = ApiRequest(
       method: RequestMethod.get,
-      path: r'/1{path}'
-          .replaceAll('{' r'path' '}', Uri.encodeComponent(path.toString())),
+      path: r'/1{path}'.replaceAll('{' r'path' '}', path),
       queryParams: {
         ...?parameters,
       },
@@ -1457,8 +1455,7 @@ final class SearchClient implements ApiClient {
     );
     final request = ApiRequest(
       method: RequestMethod.post,
-      path: r'/1{path}'
-          .replaceAll('{' r'path' '}', Uri.encodeComponent(path.toString())),
+      path: r'/1{path}'.replaceAll('{' r'path' '}', path),
       queryParams: {
         ...?parameters,
       },
@@ -1495,8 +1492,7 @@ final class SearchClient implements ApiClient {
     );
     final request = ApiRequest(
       method: RequestMethod.put,
-      path: r'/1{path}'
-          .replaceAll('{' r'path' '}', Uri.encodeComponent(path.toString())),
+      path: r'/1{path}'.replaceAll('{' r'path' '}', path),
       queryParams: {
         ...?parameters,
       },

clients/algoliasearch-client-dart/packages/client_search/lib/src/deserialize.dart

@@ -494,6 +494,9 @@ ReturnType deserialize<ReturnType, BaseType>(dynamic value, String targetType,
               growable: growable)),
         ) as ReturnType;
       }
+      if (targetType == 'Object') {
+        return value;
+      }
       break;
   }
   throw Exception('Cannot deserialize');

config/generation.config.mjs

@@ -20,6 +20,7 @@ export const patterns = [
   '!clients/algoliasearch-client-javascript/.yarn/**',
   '!clients/algoliasearch-client-javascript/scripts/**',
   '!clients/algoliasearch-client-javascript/tests/**',
+  '!clients/algoliasearch-client-javascript/packages/**/package.json',
   '!clients/algoliasearch-client-javascript/packages/requester-*/**',
   '!clients/algoliasearch-client-javascript/packages/client-common/**',
   '!clients/algoliasearch-client-javascript/packages/algoliasearch/__tests__/**',

scripts/__tests__/common.test.ts

@@ -5,13 +5,14 @@ import { getClientsConfigField } from '../config.js';
 jest.unstable_mockModule('execa', () => {
   return {
     execaCommand: jest.fn(),
+    execa: jest.fn(),
   };
 });
 
 const { capitalize, createClientName, gitCommit } = await import(
   '../common.js'
 );
-const { execaCommand } = await import('execa');
+const { execa } = await import('execa');
 
 describe('gitCommit', () => {
   afterEach(() => {
@@ -20,9 +21,9 @@ describe('gitCommit', () => {
 
   it('commits with message', () => {
     gitCommit({ message: 'chore: does something' });
-    expect(execaCommand).toHaveBeenCalledTimes(1);
-    expect(execaCommand).toHaveBeenCalledWith(
-      'git commit -m "chore: does something"',
+    expect(execa).toHaveBeenCalledTimes(1);
+    expect(execa).toHaveBeenCalledWith(
+      'git', ["commit", "-m", "chore: does something"],
       { cwd: expect.any(String) }
     );
   });
@@ -47,9 +48,9 @@ describe('gitCommit', () => {
       message: 'chore: does something',
       coAuthors: [author, ...coAuthors],
     });
-    expect(execaCommand).toHaveBeenCalledTimes(1);
-    expect(execaCommand).toHaveBeenCalledWith(
-      'git commit -m "chore: does something\n\n\nCo-authored-by: them <them@algolia.com>\nCo-authored-by: me <me@algolia.com>\nCo-authored-by: you <you@algolia.com>"',
+    expect(execa).toHaveBeenCalledTimes(1);
+    expect(execa).toHaveBeenCalledWith(
+      'git', ["commit", "-m", "chore: does something\n\n\nCo-authored-by: them <them@algolia.com>\nCo-authored-by: me <me@algolia.com>\nCo-authored-by: you <you@algolia.com>"],
       { cwd: expect.any(String) }
     );
   });

scripts/common.ts

@@ -2,7 +2,7 @@ import fsp from 'fs/promises';
 import path from 'path';
 
 import { Octokit } from '@octokit/rest';
-import { execaCommand } from 'execa';
+import { execaCommand, execa } from 'execa';
 import type { ExecaError } from 'execa';
 import { hashElement } from 'folder-hash';
 import { remove } from 'fs-extra';
@@ -154,7 +154,7 @@ export async function gitCommit({
     ? `${message}\n\n\n${coAuthors.join('\n')}`
     : message;
 
-  await execaCommand(`git commit -m "${messageWithCoAuthors}"`, { cwd });
+  await execa('git', ['commit', '-m', messageWithCoAuthors], { cwd });
 }
 
 export async function checkForCache({

templates/dart/api.mustache

@@ -100,8 +100,13 @@ final class {{classname}} implements ApiClient {
     {{/isFreeFormObject}}
     {{/requiredParams}}
     final request = ApiRequest(
-        method: RequestMethod.{{#lambda.snakecase}}{{httpMethod}}{{/lambda.snakecase}}, 
+        method: RequestMethod.{{#lambda.snakecase}}{{httpMethod}}{{/lambda.snakecase}},
+        {{^vendorExtensions.x-is-custom-request}}
         path: r'{{{path}}}'{{#pathParams}}.replaceAll('{' r'{{{baseName}}}' '}', Uri.encodeComponent({{{paramName}}}.toString())){{/pathParams}},
+        {{/vendorExtensions.x-is-custom-request}}
+        {{#vendorExtensions.x-is-custom-request}}
+        path: r'{{{path}}}'{{#pathParams}}.replaceAll('{' r'{{{baseName}}}' '}', {{{paramName}}}){{/pathParams}},
+        {{/vendorExtensions.x-is-custom-request}}
         {{#vendorExtensions.x-use-read-transporter}}
         isRead : {{{vendorExtensions.x-use-read-transporter}}},
         {{/vendorExtensions.x-use-read-transporter}}

templates/dart/serialization/json_serializable/deserialize.mustache

@@ -58,6 +58,9 @@ final _regMap = RegExp(r'^Map<String,(.*)>$');
               value.values.map((dynamic v) => deserialize<BaseType, BaseType>(v, targetType, growable: growable)),
             ) as ReturnType;
           }
+          if (targetType == 'Object') {
+            return value;
+          }
           break;
     } 
     throw Exception('Cannot deserialize');