- Ensure default output type is taken into account when generating fu…

…nctions for queries
Plattar · Feb 3, 2024 · e527da7 · e527da7
1 parent bc4ac60
commit e527da7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/sdk-core/src/generator/generators/schemas/dynamic-query-generator.ts b/sdk-core/src/generator/generators/schemas/dynamic-query-generator.ts
@@ -58,14 +58,16 @@ export class DynamicQueryGenerator {
                 const outputClassName: string = map.mount.meta.output ? Util.capitaliseClassName(map.mount.meta.output.type) : className;
                 const outputAttributesName: string = map.mount.meta.output ? Util.getClassAttributesName(map.mount.meta.output.type) : (isFile ? fileInterfaceName : interfaceName);
 
-                if (meta.outputType === 'single') {
+                const outputType: string = meta.outputType || 'single';
+
+                if (outputType === 'single') {
                     output += `\tpublic async ${meta.identifier}(${(isSet ? `params:${dataType}` : '')}): Promise<${outputClassName} | null> {\n`;
                     output += `\t\tconst url:string = \`${endpoint}${mountEndpoint}\`${isSet ? additionalQuery : ''};\n`;
                     output += `\t\tconst result:Array<${outputClassName}> = await this._Fetch<${outputClassName},${outputAttributesName}>(new ${outputClassName}(), url, '${map.mount.type}');\n`;
                     output += `\t\treturn result.length > 0 ? result[0] : null;\n`;
                     output += '\t}\n';
                 }
-                else if (meta.outputType === 'void') {
+                else if (outputType === 'void') {
                     output += `\tpublic async ${meta.identifier}(${(isSet ? `params:${dataType}` : '')}): Promise<void> {\n`;
                     output += `\t\tconst url:string = \`${endpoint}${mountEndpoint}\`${isSet ? additionalQuery : ''};\n`;
                     output += `\t\tawait this._Fetch<${outputClassName},${outputAttributesName}>(new ${outputClassName}(), url, '${map.mount.type}');\n`;

diff --git a/sdk-core/src/generator/generators/schemas/static-query-generator.ts b/sdk-core/src/generator/generators/schemas/static-query-generator.ts
@@ -58,20 +58,22 @@ export class StaticQueryGenerator {
                 const outputClassName: string = map.mount.meta.output ? Util.capitaliseClassName(map.mount.meta.output.type) : className;
                 const outputAttributesName: string = map.mount.meta.output ? Util.getClassAttributesName(map.mount.meta.output.type) : (isFile ? fileInterfaceName : interfaceName);
 
-                if (meta.outputType === 'single') {
+                const outputType: string = meta.outputType || 'single';
+
+                if (outputType === 'single') {
                     output += `\tpublic async ${meta.identifier}(${(isSet ? `params:${dataType}` : '')}): Promise<${outputClassName} | null> {\n`;
                     output += `\t\tconst url:string = \`${endpoint}${mountEndpoint}\`${isSet ? additionalQuery : ''};\n`;
                     output += `\t\tconst result:Array<${outputClassName}> = await this._Fetch<${outputClassName},${outputAttributesName}>(new ${outputClassName}(), url, '${map.mount.type}');\n`;
                     output += `\t\treturn result.length > 0 ? result[0] : null;\n`;
                     output += '\t}\n';
                 }
-                else if (meta.outputType === 'array') {
+                else if (outputType === 'array') {
                     output += `\tpublic async ${meta.identifier}(${(isSet ? `params:${dataType}` : '')}): Promise<Array<${outputClassName}>> {\n`;
                     output += `\t\tconst url:string = \`${endpoint}${mountEndpoint}\`${isSet ? additionalQuery : ''};\n`;
                     output += `\t\treturn await this._Fetch<${outputClassName},${outputAttributesName}>(new ${outputClassName}(), url, '${map.mount.type}');\n`;
                     output += '\t}\n';
                 }
-                else if (meta.outputType === 'void') {
+                else if (outputType === 'void') {
                     output += `\tpublic async ${meta.identifier}(${(isSet ? `params:${dataType}` : '')}): Promise<void> {\n`;
                     output += `\t\tconst url:string = \`${endpoint}${mountEndpoint}\`${isSet ? additionalQuery : ''};\n`;
                     output += `\t\tawait this._Fetch<${outputClassName},${outputAttributesName}>(new ${outputClassName}(), url, '${map.mount.type}');\n`;