Skip to content

Commit 146454f

Browse files
authored
Merge branch 'main' into feat/guides-for-push
2 parents ac72f95 + 100ded8 commit 146454f

File tree

13 files changed

+34
-28
lines changed

13 files changed

+34
-28
lines changed

clients/algoliasearch-client-javascript/packages/client-composition/builds/browser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export function compositionClient(appId: string, apiKey: string, options?: Clien
4040
logger: createNullLogger(),
4141
requester: createXhrRequester(),
4242
algoliaAgents: [{ segment: 'Browser' }],
43-
authMode: 'WithinQueryParameters',
43+
authMode: 'WithinHeaders',
4444
responsesCache: createMemoryCache(),
4545
requestsCache: createMemoryCache({ serializable: false }),
4646
hostsCache: createFallbackableCache({

clients/algoliasearch-client-javascript/packages/client-composition/src/compositionClient.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -590,8 +590,6 @@ export function createCompositionClient({
590590
queryParameters,
591591
headers,
592592
data: searchCompositionRulesParams ? searchCompositionRulesParams : {},
593-
useReadTransporter: true,
594-
cacheable: true,
595593
};
596594

597595
return transporter.request(request, requestOptions);

generators/src/main/java/com/algolia/codegen/AlgoliaJavascriptGenerator.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,9 @@ private void setDefaultGeneratorOptions() {
154154
additionalProperties.put("apiName", CLIENT);
155155
additionalProperties.put("clientName", clientName);
156156
additionalProperties.put("algoliaAgent", Helpers.capitalize(CLIENT));
157+
additionalProperties.put("is" + Helpers.capitalize(CLIENT) + "Client", true);
157158
additionalProperties.put("isSearchClient", CLIENT.equals("search") || isAlgoliasearchClient);
158-
additionalProperties.put("isIngestionClient", CLIENT.equals("ingestion"));
159159
additionalProperties.put("isAlgoliasearchClient", isAlgoliasearchClient);
160-
additionalProperties.put("isAlgoliaCompositionClient", isAlgoliaCompositionClient);
161160
additionalProperties.put("packageVersion", Helpers.getPackageJsonVersion(packageName));
162161
additionalProperties.put("packageName", packageName);
163162
additionalProperties.put("npmPackageName", isAlgoliasearchClient ? packageName : "@algolia/" + packageName);

specs/bundled/composition.doc.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -689,8 +689,6 @@ paths:
689689
tags:
690690
- Rules
691691
operationId: searchCompositionRules
692-
x-use-read-transporter: true
693-
x-cacheable: true
694692
x-acl:
695693
- settings
696694
summary: Search for composition rules

specs/bundled/composition.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,8 +434,6 @@ paths:
434434
tags:
435435
- composition
436436
operationId: searchCompositionRules
437-
x-use-read-transporter: true
438-
x-cacheable: true
439437
x-acl:
440438
- settings
441439
summary: Search for composition rules

specs/bundled/crawler.doc.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2881,8 +2881,8 @@ components:
28812881
beforeIndexPublishing:
28822882
type: object
28832883
description: >-
2884-
Checks triggered after the crawl finishes and before the records are
2885-
added to the Algolia index.
2884+
These checks are triggered after the crawl finishes but before the
2885+
records are added to the Algolia index.
28862886
properties:
28872887
maxLostRecordsPercentage:
28882888
type: number
@@ -2900,9 +2900,14 @@ components:
29002900
minimum: 1
29012901
maximum: 100
29022902
default: 10
2903+
maxFailedUrls:
2904+
type: number
2905+
description: |
2906+
Stops the crawler if a specified number of pages fail to crawl.
2907+
If undefined, the crawler won't stop if it encounters such errors.
29032908
safetyChecks:
29042909
type: object
2905-
description: Safety checks for ensuring data integrity between crawls.
2910+
description: Checks to ensure the crawl was successful.
29062911
properties:
29072912
beforeIndexPublishing:
29082913
$ref: '#/components/schemas/beforeIndexPublishing'

specs/bundled/crawler.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2881,8 +2881,8 @@ components:
28812881
beforeIndexPublishing:
28822882
type: object
28832883
description: >-
2884-
Checks triggered after the crawl finishes and before the records are
2885-
added to the Algolia index.
2884+
These checks are triggered after the crawl finishes but before the
2885+
records are added to the Algolia index.
28862886
properties:
28872887
maxLostRecordsPercentage:
28882888
type: number
@@ -2900,9 +2900,14 @@ components:
29002900
minimum: 1
29012901
maximum: 100
29022902
default: 10
2903+
maxFailedUrls:
2904+
type: number
2905+
description: |
2906+
Stops the crawler if a specified number of pages fail to crawl.
2907+
If undefined, the crawler won't stop if it encounters such errors.
29032908
safetyChecks:
29042909
type: object
2905-
description: Safety checks for ensuring data integrity between crawls.
2910+
description: Checks to ensure the crawl was successful.
29062911
properties:
29072912
beforeIndexPublishing:
29082913
$ref: '#/components/schemas/beforeIndexPublishing'

specs/composition/paths/rules/searchRules.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ post:
22
tags:
33
- Rules
44
operationId: searchCompositionRules
5-
x-use-read-transporter: true
6-
x-cacheable: true
75
x-acl:
86
- settings
97
summary: Search for composition rules

specs/crawler/common/schemas/configuration.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,14 +444,14 @@ extraParameters:
444444
445445
safetyChecks:
446446
type: object
447-
description: Safety checks for ensuring data integrity between crawls.
447+
description: Checks to ensure the crawl was successful.
448448
properties:
449449
beforeIndexPublishing:
450450
$ref: '#/beforeIndexPublishing'
451451

452452
beforeIndexPublishing:
453453
type: object
454-
description: Checks triggered after the crawl finishes and before the records are added to the Algolia index.
454+
description: These checks are triggered after the crawl finishes but before the records are added to the Algolia index.
455455
properties:
456456
maxLostRecordsPercentage:
457457
type: number
@@ -464,6 +464,11 @@ beforeIndexPublishing:
464464
minimum: 1
465465
maximum: 100
466466
default: 10
467+
maxFailedUrls:
468+
type: number
469+
description: |
470+
Stops the crawler if a specified number of pages fail to crawl.
471+
If undefined, the crawler won't stop if it encounters such errors.
467472
468473
schedule:
469474
type: string

templates/javascript/clients/api-single.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ export function create{{#lambda.titlecase}}{{clientName}}{{/lambda.titlecase}}({
9191
{{#isSearchClient}}
9292
{{> client/api/helpers}}
9393
{{/isSearchClient}}
94-
{{#isAlgoliaCompositionClient}}
94+
{{#isCompositionClient}}
9595
{{> client/api/compositionHelpers}}
96-
{{/isAlgoliaCompositionClient}}
96+
{{/isCompositionClient}}
9797
{{#operation}}
9898
{{> client/api/operation/jsdoc}}
9999
{{nickname}}{{#vendorExtensions.x-is-generic}}<T>{{/vendorExtensions.x-is-generic}}( {{> client/api/operation/parameters}} ) : Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}{{#vendorExtensions.x-is-generic}}<T>{{/vendorExtensions.x-is-generic}}> {

0 commit comments

Comments
 (0)