more readable generic templates, fix generic propgation

Author: shortcuts

playground/javascript/node/search.ts

@@ -7,17 +7,27 @@ dotenv.config({ path: '../../.env' });
 const appId = process.env.ALGOLIA_APPLICATION_ID || '**** APP_ID *****';
 const apiKey = process.env.ALGOLIA_SEARCH_KEY || '**** SEARCH_API_KEY *****';
 
-const searchIndex = process.env.SEARCH_INDEX || 'test_index';
+const indexName = process.env.SEARCH_INDEX || 'test_index';
 const searchQuery = process.env.SEARCH_QUERY || 'test_query';
 
 // Init client with appId and apiKey
 const client = searchClient(appId, apiKey);
 
 client.addAlgoliaAgent('Node playground', '0.0.1');
 
+type TObject = {
+  name: string;
+};
+
 async function testSearch() {
   try {
-    const res = await client.search<{ name: string }>({ requests: [{ indexName: searchIndex, query: searchQuery }] });
+    const res = await client.search<TObject>({
+      requests: [{ indexName, query: searchQuery }],
+    });
+
+    await client.browse({ indexName });
+
+    await client.searchSingleIndex({ indexName, searchParams: {} });
 
     console.log(`[OK]`, res.results[0].hits![0].name);
   } catch (e: any) {

templates/javascript/clients/client/model/types/dataType.mustache

@@ -0,0 +1,20 @@
+{{! possible data types of a parameter }}
+{{#isEnum}}
+  {{classname}}{{{nameInCamelCase}}}{{#isArray}}[]{{/isArray}}
+{{/isEnum}}
+{{^isEnum}}
+  {{#x-propagated-generic}}
+    {{> client/model/types/dataTypeGeneric}}
+  {{/x-propagated-generic}}
+  {{^x-propagated-generic}}
+    {{#x-has-child-generic}}
+      {{> client/model/types/dataTypeGeneric}}
+    {{/x-has-child-generic}}
+    {{^x-has-child-generic}}
+      {{{dataType}}}
+    {{/x-has-child-generic}}
+  {{/x-propagated-generic}}
+  {{#isNullable}}
+    | null
+  {{/isNullable}}
+{{/isEnum}}

templates/javascript/clients/client/model/types/dataTypeGeneric.mustache

@@ -0,0 +1 @@
+{{#complexType}}{{{.}}}<T>{{/complexType}}{{^complexType}}T{{/complexType}}{{#isArray}}[]{{/isArray}}

templates/javascript/clients/client/model/types/isGeneric.mustache

@@ -0,0 +1,7 @@
+{{! parameter that is generic and have a default value }}
+{{#vendorExtensions.x-has-child-generic}}
+  <T = Record<string, any>>
+{{/vendorExtensions.x-has-child-generic}}
+{{#vendorExtensions.x-is-generic}}
+  <T = Record<string, any>>
+{{/vendorExtensions.x-is-generic}}

templates/javascript/clients/client/model/types/propagateGeneric.mustache

@@ -0,0 +1,2 @@
+{{! Parameter that is generic and propagates it to its child }}
+{{#vendorExtensions.x-has-child-generic}}<T>{{/vendorExtensions.x-has-child-generic}}

templates/javascript/clients/model.mustache

@@ -11,25 +11,20 @@ import { {{classname}} } from '{{filename}}';
 /**
 * {{{description}}}
 */{{/description}}
-export type {{classname}}{{#vendorExtensions.x-has-child-generic}}<T>{{/vendorExtensions.x-has-child-generic}} = {{#composedSchemas.oneOf}}{{{dataType}}}{{#vendorExtensions.x-has-child-generic}}<T>{{/vendorExtensions.x-has-child-generic}} {{^-last}}|{{/-last}} {{/composedSchemas.oneOf}}
-{{#composedSchemas.allOf}}{{{dataType}}}{{#vendorExtensions.x-has-child-generic}}<T>{{/vendorExtensions.x-has-child-generic}} {{^-last}}&{{/-last}} {{/composedSchemas.allOf}};
+export type {{classname}}{{> client/model/types/isGeneric}} = {{#composedSchemas.oneOf}}{{{dataType}}}{{> client/model/types/propagateGeneric}} {{^-last}}|{{/-last}} {{/composedSchemas.oneOf}}{{#composedSchemas.allOf}}{{{dataType}}}{{> client/model/types/propagateGeneric}} {{^-last}}&{{/-last}} {{/composedSchemas.allOf}};
 {{/interfaces.size}}{{^interfaces.size}}
 {{#description}}
 /**
 * {{{description}}}
 */{{/description}}{{^isEnum}}
-export type {{classname}}{{#vendorExtensions.x-is-generic}}<T>{{/vendorExtensions.x-is-generic}}{{#vendorExtensions.x-has-child-generic}}<T>{{/vendorExtensions.x-has-child-generic}} = {{^vendorExtensions.x-is-generic}}{{#parent}}{{{.}}} & {{/parent}}{{/vendorExtensions.x-is-generic}}{{#vendorExtensions.x-is-generic}}T & {{/vendorExtensions.x-is-generic}} {
+export type {{classname}}{{> client/model/types/isGeneric}} = {{^vendorExtensions.x-is-generic}}{{#parent}}{{{.}}} & {{/parent}}{{/vendorExtensions.x-is-generic}}{{#vendorExtensions.x-is-generic}}T & {{/vendorExtensions.x-is-generic}} {
 {{#vendorExtensions}}
 {{#vars}}{{#description}}
     /**
     * {{{description}}}
     */{{/description}}
-    {{name}}{{^required}}?{{/required}}: {{#isEnum}}{{classname}}{{{nameInCamelCase}}}{{#isArray}}[]{{/isArray}}{{/isEnum}}
-    {{^isEnum}}{{#x-propagated-generic}}{{{complexType}}}<T>{{#isArray}}[]{{/isArray}}{{/x-propagated-generic}}
-    {{^x-propagated-generic}}
-      {{#x-has-child-generic}}{{{complexType}}}<T>{{#isArray}}[]{{/isArray}}{{/x-has-child-generic}}
-      {{^x-has-child-generic}}{{{dataType}}}{{/x-has-child-generic}}
-    {{/x-propagated-generic}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}};{{/vars}}
+    {{name}}{{^required}}?{{/required}}: {{> client/model/types/dataType}} ;
+{{/vars}}
 } {{#x-is-SearchForHitsOptions}} & { facet?: never; maxFacetHits?: never; facetQuery?: never }; {{/x-is-SearchForHitsOptions}}
 {{/vendorExtensions}}
 {{/isEnum}}