@weclapp/sdk 2.0.0-dev.44 → 2.0.0-dev.45

package/dist/cli.js

@@ -272,7 +272,7 @@ const createObjectType = (value, required = []) => ({
 const getRefName = (obj) => {
     return obj.$ref.replace(/.*\//, '');
 };
-const convertToTypeScriptType = (schema, property) => {
+const convertToTypeScriptType = (schema) => {
     if (isReferenceObject(schema)) {
         return createReferenceType(getRefName(schema));
     }
@@ -283,7 +283,7 @@ const convertToTypeScriptType = (schema, property) => {
                 return createRawType('number');
             case 'string':
                 if (schema.enum) {
-                    return property ? createReferenceType(property) : createTupleType(schema.enum);
+                    return createTupleType(schema.enum);
                 }
                 else {
                     return schema.format === 'binary' ? createRawType('binary') : createRawType('string');
@@ -295,7 +295,7 @@ const convertToTypeScriptType = (schema, property) => {
                 return createObjectType(Object.fromEntries(Object.entries(properties).map((v) => [v[0], convertToTypeScriptType(v[1])])), required);
             }
             case 'array':
-                return createArrayType(convertToTypeScriptType(schema.items, property));
+                return createArrayType(convertToTypeScriptType(schema.items));
             default:
                 return createRawType('unknown');
         }
@@ -398,7 +398,7 @@ const generateEntities = (schemas, enums) => {
         const processProperties = (props = {}, isXweclappFilterProp) => {
             for (const [name, property] of Object.entries(props)) {
                 const meta = isRelatedEntitySchema(property) ? property['x-weclapp'] : {};
-                const type = convertToTypeScriptType(property, name).toString();
+                const type = convertToTypeScriptType(property).toString();
                 const comment = isNonArraySchemaObject(property)
                     ? property.deprecated
                         ? '@deprecated will be removed.'
@@ -463,8 +463,9 @@ const generateEntityFilterProps = (entities, enums) => {
                 prop.type === 'string' ||
                 prop.type === 'number' ||
                 prop.type === 'boolean' ||
+                prop.type === '{}' ||
                 prop.type.endsWith('[]') ||
-                prop.type === '{}') {
+                prop.type.includes("'")) {
                 return prop;
             }
             return { ...prop, type: `${pascalCase(prop.type)}_${FILTER_PROPS_SUFFIX}` };

package/package.json

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