@weclapp/sdk 2.0.0-dev.48 → 2.0.0-dev.49

package/dist/cli.js

@@ -256,14 +256,15 @@ const createObjectType = (value, required = []) => ({
                 .filter((v) => v?.type === 'object')
                 .every((v) => v.isFullyOptional()));
     },
-    toString: (propagateOptionalProperties = false) => {
+    toString: (propertyPropagationOption = 'ignore') => {
         const properties = Object.entries(value)
             .filter((v) => v[1])
             .map((v) => {
             const name = v[0];
             const value = v[1];
             const isRequired = required.includes(name) ||
-                (value.type === 'object' && !value.isFullyOptional() && propagateOptionalProperties);
+                propertyPropagationOption === 'force' ||
+                (value.type === 'object' && !value.isFullyOptional() && propertyPropagationOption === 'propagate');
             return `${name + (isRequired ? '' : '?')}: ${value.toString()};`;
         });
         return properties.length ? `{\n${indent(properties.join('\n'))}\n}` : '{}';
@@ -360,7 +361,7 @@ const generateInterfaceProperties = (entries) => {
         .join('\n');
     return properties.length ? `{\n${indent(properties)}\n}` : `{}`;
 };
-const generateInterfaceFromObject = (name, obj, propagateOptionalProperties) => `export interface ${name} ${obj.toString(propagateOptionalProperties)}`;
+const generateInterfaceFromObject = (name, obj, propertyPropagationOption) => `export interface ${name} ${obj.toString(propertyPropagationOption)}`;
 const generateInterface = (name, entries, extend) => {
     const signature = `${name} ${extend ? `extends ${arrayify(extend).join(', ')}` : ''}`.trim();
     const body = generateInterfaceProperties(entries);
@@ -637,7 +638,7 @@ const generateCountEndpoint = ({ aliases, path, target, endpoint }) => {
     const parametersType = createObjectType({
         params: convertToTypeScriptType(convertParametersToSchema(path.parameters))
     });
-    const parametersTypeSource = generateInterfaceFromObject(parametersTypeName, parametersType, true);
+    const parametersTypeSource = generateInterfaceFromObject(parametersTypeName, parametersType, 'propagate');
     const filterTypeName = `${functionTypeName}_Filter`;
     const filterTypeSource = generateInterfaceType(filterTypeName, [], [`${entity}_${FILTER_PROPS_SUFFIX}`]);
     const functionTypeSource = generateArrowFunctionType({
@@ -676,7 +677,7 @@ const generateBodyType = (body) => {
             types.push(convertToTypeScriptType(schema));
         }
     }
-    return types.length ? createTupleType(types) : undefined;
+    return types.length ? (types.length === 1 ? types[0] : createTupleType(types)) : undefined;
 };
 
 const generateRequestBodyType = ({ requestBody }) => {
@@ -736,7 +737,7 @@ const generateGenericEndpoint = (suffix) => ({ target, method, path, endpoint })
             `query${params.isFullyOptional() ? '?' : ''}: ${entityQuery}`,
             'requestOptions?: RequestOptions'
         ],
-        returns: `${resolveResponseType(target)}<${wrapBody(responseBody, target).toString()}>`
+        returns: `${resolveResponseType(target)}<${wrapBody(responseBody, target).toString('force')}>`
     });
     const functionSource = generateArrowFunction({
         name: functionName,
@@ -752,7 +753,7 @@ const generateGenericEndpoint = (suffix) => ({ target, method, path, endpoint })
         interfaces: [
             {
                 name: entityQuery,
-                source: generateInterfaceFromObject(entityQuery, params, true)
+                source: generateInterfaceFromObject(entityQuery, params, 'propagate')
             }
         ]
     };
@@ -849,7 +850,7 @@ const generateSomeEndpoint = ({ endpoint, target, path, entities, aliases }) =>
     const parametersType = createObjectType({
         params: convertToTypeScriptType(convertParametersToSchema(parameters))
     });
-    const parametersTypeSource = generateInterfaceFromObject(parametersTypeName, parametersType, true);
+    const parametersTypeSource = generateInterfaceFromObject(parametersTypeName, parametersType, 'propagate');
     const filterTypeName = `${functionTypeName}_Filter`;
     const filterTypeSource = generateInterfaceType(filterTypeName, [], [`${entity}_${FILTER_PROPS_SUFFIX}`]);
     const referencesTypeName = `${functionTypeName}_References`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weclapp/sdk",
-  "version": "2.0.0-dev.48",
+  "version": "2.0.0-dev.49",
   "description": "weclapp SDK Generator",
   "author": "weclapp",
   "sideEffects": false,