@weclapp/sdk 1.8.0-dev.19 → 2.0.0-dev.3

package/dist/cli.js

@@ -144,9 +144,9 @@ const generateStatements = (...statements) => statements
     .join('\n\n');
 const generateBlockStatements = (...statements) => `{\n${indent(generateStatements(...statements))}\n}`;
 
-var root = "export type RequestPayloadMethod = 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'CONNECT' | 'OPTIONS' | 'TRACE' | 'PATCH';\n\nexport interface RequestPayload {\n    method?: RequestPayloadMethod;\n    query?: Record<string, any>;\n    body?: any;\n    unwrap?: boolean;\n    forceBlob?: boolean;\n}\n\nexport interface ServiceConfig {\n\n    // Your API-Key, this is optional in the sense of if you omit this, and you're in a browser, the\n    // cookie-authentication (include-credentials) will be used.\n    key?: string;\n\n    // Your domain, if omitted location.host will be used.\n    host?: string;\n\n    // If you want to use https, defaults to true.\n    secure?: boolean;\n\n    // Optional request/response interceptors.\n    interceptors?: {\n\n        // Takes the generated request, you can either return a new request,\n        // a response (which will be taken as \"the\" response) or nothing.\n        // The payload contains the raw input generated by the SDK.\n        request?: (request: Request, payload: RequestPayload) => Request | Response | void | Promise<Request | Response | void>;\n\n        // Takes the response. This can either be the one from the server or an\n        // artificially-crafted one by the request interceptor.\n        response?: (response: Response) => Response | void | Promise<Response | void>;\n    };\n}\n\nlet globalConfig: ServiceConfig | undefined;\nexport const getGlobalConfig = (): ServiceConfig | undefined => globalConfig;\nexport const setGlobalConfig = (cfg?: ServiceConfig) => globalConfig = cfg;\n\nexport const raw = async (\n    cfg: ServiceConfig | undefined = globalConfig,\n    endpoint: string,\n    payload: RequestPayload = {}\n): Promise<any> => {\n    if (!cfg) {\n        throw new Error(`ServiceConfig missing.`);\n    }\n\n    cfg = {\n        ...globalConfig, ...cfg,\n        interceptors: {...globalConfig?.interceptors, ...cfg?.interceptors}\n    };\n\n    const isBinaryData = payload.body instanceof resolveBinaryObject();\n    const params = new URLSearchParams(Object.entries(payload.query ?? {}).filter(v => v[1] !== undefined));\n    const protocol = (cfg.secure ?? true) ? 'https' : 'http';\n\n    const interceptRequest = cfg.interceptors?.request ?? (v => v);\n    const interceptResponse = cfg.interceptors?.response ?? (v => v);\n\n    let host = cfg.host?.replace(/^https?:\\/\\//, '');\n    if (!host && typeof location !== 'undefined') {\n        host = location.host;\n    }\n\n    if (!host) {\n        throw new Error('Please specify a domain');\n    }\n\n    const request = new Request(`${protocol}://${host}/webapp/api/v1${endpoint}?${params}`, {\n        ...(payload.body && {\n            body: isBinaryData\n                ? payload.body\n                : JSON.stringify(payload.body, (key, value) => value === undefined ? null : value)\n        }),\n        ...(!cfg.key && {credentials: 'same-origin'}),\n        method: payload.method ?? 'get',\n        headers: {\n            'Accept': 'application/json',\n            ...(cfg.key && {'AuthenticationToken': cfg.key}),\n            ...(!isBinaryData && {'Content-Type': 'application/json'})\n        }\n    });\n\n    let res = await interceptRequest(request, payload) ?? request;\n    if (!(res instanceof Response)) {\n        res = await fetch(res);\n    }\n\n    res = await interceptResponse(res) ?? res;\n    const data = (!payload.forceBlob || !res.ok) && res.headers?.get('content-type')?.includes('application/json') ?\n        await res.json() : await res.blob();\n\n    // Check if response was successful\n    if (!res.ok) {\n        return Promise.reject(data);\n    }\n\n    return payload.unwrap ? data.result : data;\n};\n\nconst _count = (\n    cfg: ServiceConfig | undefined,\n    endpoint: string,\n    query?: CountQuery<any> & {params?: Record<any, any>}\n) => wrapResponse(() => raw(cfg, endpoint, {\n    unwrap: true,\n    query: {\n        ...flattenFilter(query?.filter),\n        ...flattenOrFilter(query?.or),\n        ...query?.params\n    }\n}));\n\nconst _some = (\n    cfg: ServiceConfig | undefined,\n    endpoint: string,\n    query?: SomeQuery<any, any, any, any> & {params?: Record<any, any>}\n) => wrapResponse(() => raw(cfg, endpoint, {\n        query: {\n            serializeNulls: query?.serializeNulls,\n            properties: query?.select ? flattenSelect(query.select).join(',') : undefined,\n            includeReferencedEntities: query?.include ? Object.keys(query.include).join(',') : undefined,\n            ...flattenOrFilter(query?.or),\n            ...flattenFilter(query?.filter),\n            ...flattenSort(query?.sort),\n            ...query?.params,\n            ...query?.pagination\n        }\n    }).then(data => ({entities: data.result, references: data.referencedEntities ?? {}}))\n);\n\nconst _remove = (\n    cfg: ServiceConfig | undefined,\n    endpoint: string\n) => wrapResponse(() => raw(cfg, endpoint, {\n    method: 'DELETE'\n}).then(() => undefined));\n\nconst _create = (\n    cfg: ServiceConfig | undefined,\n    endpoint: string,\n    data: any\n) => wrapResponse(() => raw(cfg, endpoint, {\n    method: 'POST',\n    body: data\n}));\n\nconst _update = (\n    cfg: ServiceConfig | undefined,\n    endpoint: string,\n    data: any,\n    {ignoreMissingProperties = true}: UpdateQuery = {}\n) => wrapResponse(() => raw(cfg, endpoint, {\n    method: 'PUT',\n    body: data,\n    query: {ignoreMissingProperties}\n}));\n\nconst _unique = (\n    cfg: ServiceConfig | undefined,\n    endpoint: string,\n    query?: UniqueQuery\n) => wrapResponse(() => raw(cfg, endpoint, {query}));\n\nconst _generic = (\n    cfg: ServiceConfig | undefined,\n    method: RequestPayloadMethod,\n    endpoint: string,\n    payload?: GenericQuery<any, any>,\n    forceBlob?: boolean\n) => wrapResponse(() => raw(cfg, endpoint, {\n    method,\n    forceBlob,\n    body: payload?.body,\n    query: payload?.params\n}));\n";
+var root = "export type RequestPayloadMethod = 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'CONNECT' | 'OPTIONS' | 'TRACE' | 'PATCH';\n\nexport interface RequestPayload {\n    method?: RequestPayloadMethod;\n    query?: Record<string, any>;\n    body?: any;\n    unwrap?: boolean;\n    forceBlob?: boolean;\n}\n\nexport interface ServiceConfig {\n\n    // Your API-Key, this is optional in the sense of if you omit this, and you're in a browser, the\n    // cookie-authentication (include-credentials) will be used.\n    key?: string;\n\n    // Your domain, if omitted location.host will be used.\n    host?: string;\n\n    // If you want to use https, defaults to true.\n    secure?: boolean;\n\n    // Optional request/response interceptors.\n    interceptors?: {\n\n        // Takes the generated request, you can either return a new request,\n        // a response (which will be taken as \"the\" response) or nothing.\n        // The payload contains the raw input generated by the SDK.\n        request?: (request: Request, payload: RequestPayload) => Request | Response | void | Promise<Request | Response | void>;\n\n        // Takes the response. This can either be the one from the server or an\n        // artificially-crafted one by the request interceptor.\n        response?: (response: Response) => Response | void | Promise<Response | void>;\n    };\n}\n\nlet globalConfig: ServiceConfig | undefined;\nexport const getGlobalConfig = (): ServiceConfig | undefined => globalConfig;\nexport const setGlobalConfig = (cfg?: ServiceConfig) => globalConfig = cfg;\n\nexport const raw = async (\n    cfg: ServiceConfig | undefined = globalConfig,\n    endpoint: string,\n    payload: RequestPayload = {}\n): Promise<any> => {\n    if (!cfg) {\n        throw new Error(`ServiceConfig missing.`);\n    }\n\n    cfg = {\n        ...globalConfig, ...cfg,\n        interceptors: {...globalConfig?.interceptors, ...cfg?.interceptors}\n    };\n\n    const isBinaryData = payload.body instanceof resolveBinaryObject();\n    const params = new URLSearchParams(Object.entries(payload.query ?? {}).filter(v => v[1] !== undefined));\n    const protocol = (cfg.secure ?? true) ? 'https' : 'http';\n\n    const interceptRequest = cfg.interceptors?.request ?? (v => v);\n    const interceptResponse = cfg.interceptors?.response ?? (v => v);\n\n    let host = cfg.host?.replace(/^https?:\\/\\//, '');\n    if (!host && typeof location !== 'undefined') {\n        host = location.host;\n    }\n\n    if (!host) {\n        throw new Error('Please specify a domain');\n    }\n\n    const request = new Request(`${protocol}://${host}/webapp/api/v1${endpoint}?${params}`, {\n        ...(payload.body && {\n            body: isBinaryData\n                ? payload.body\n                : JSON.stringify(payload.body, (key, value) => value === undefined ? null : value)\n        }),\n        ...(!cfg.key && {credentials: 'same-origin'}),\n        method: payload.method ?? 'get',\n        headers: {\n            'Accept': 'application/json',\n            ...(cfg.key && {'AuthenticationToken': cfg.key}),\n            ...(!isBinaryData && {'Content-Type': 'application/json'})\n        }\n    });\n\n    let res = await interceptRequest(request, payload) ?? request;\n    if (!(res instanceof Response)) {\n        res = await fetch(res);\n    }\n\n    res = await interceptResponse(res) ?? res;\n    const data = (!payload.forceBlob || !res.ok) && res.headers?.get('content-type')?.includes('application/json') ?\n        await res.json() : await res.blob();\n\n    // Check if response was successful\n    if (!res.ok) {\n        return Promise.reject(data);\n    }\n\n    return payload.unwrap ? data.result : data;\n};\n\nconst _count = (\n    cfg: ServiceConfig | undefined,\n    endpoint: string,\n    query?: CountQuery<any> & {params?: Record<any, any>}\n) => wrapResponse(() => raw(cfg, endpoint, {\n    unwrap: true,\n    query: {\n        ...flattenFilter(query?.filter),\n        ...flattenOrFilter(query?.or),\n        ...query?.params\n    }\n}));\n\nconst _some = (\n    cfg: ServiceConfig | undefined,\n    endpoint: string,\n    query?: SomeQuery<any, any, any, any, any> & {params?: Record<any, any>}\n) => wrapResponse(() => raw(cfg, endpoint, {\n        query: {\n            serializeNulls: query?.serializeNulls,\n            additionalProperties: query?.properties?.join(','),\n            properties: query?.select ? flattenSelect(query.select).join(',') : undefined,\n            includeReferencedEntities: query?.include ? Object.keys(query.include).join(',') : undefined,\n            ...flattenOrFilter(query?.or),\n            ...flattenFilter(query?.filter),\n            ...flattenSort(query?.sort),\n            ...query?.params,\n            ...query?.pagination\n        }\n    }).then(data => ({\n        entities: data.result,\n        references: data.referencedEntities ?? {},\n        properties: data.additionalProperties ?? {}\n    }))\n);\n\nconst _remove = (\n    cfg: ServiceConfig | undefined,\n    endpoint: string\n) => wrapResponse(() => raw(cfg, endpoint, {\n    method: 'DELETE'\n}).then(() => undefined));\n\nconst _create = (\n    cfg: ServiceConfig | undefined,\n    endpoint: string,\n    data: any\n) => wrapResponse(() => raw(cfg, endpoint, {\n    method: 'POST',\n    body: data\n}));\n\nconst _update = (\n    cfg: ServiceConfig | undefined,\n    endpoint: string,\n    data: any,\n    {ignoreMissingProperties = true}: UpdateQuery = {}\n) => wrapResponse(() => raw(cfg, endpoint, {\n    method: 'PUT',\n    body: data,\n    query: {ignoreMissingProperties}\n}));\n\nconst _unique = (\n    cfg: ServiceConfig | undefined,\n    endpoint: string,\n    query?: UniqueQuery\n) => wrapResponse(() => raw(cfg, endpoint, {query}));\n\nconst _generic = (\n    cfg: ServiceConfig | undefined,\n    method: RequestPayloadMethod,\n    endpoint: string,\n    payload?: GenericQuery<any, any>,\n    forceBlob?: boolean\n) => wrapResponse(() => raw(cfg, endpoint, {\n    method,\n    forceBlob,\n    body: payload?.body,\n    query: payload?.params\n}));\n";
 
-var types = "export type DeepPartial<T> = T extends object ? {\n    [P in keyof T]?: DeepPartial<T[P]>;\n} : T;\n\n// Filter properties\nexport type EqualityOperators = 'EQ' | 'NE';\nexport type ComparisonOperators = 'LT' | 'GT' | 'LE' | 'GE' | 'LIKE' | 'ILIKE' | 'NOT_LIKE' | 'NOT_ILIKE';\nexport type ArrayOperators = 'IN' | 'NOT_IN';\nexport type Operator = EqualityOperators | ComparisonOperators | ArrayOperators;\n\nexport type MapOperators<T> = { [K in EqualityOperators]?: T | null; } &\n    { [K in ComparisonOperators]?: T; } &\n    { [K in ArrayOperators]?: T[]; };\n\nexport type QueryFilter<T> = {\n    [P in keyof T]?:\n        T[P] extends Array<infer U> | undefined ?\n            U extends Record<any, any> ? QueryFilter<U> : MapOperators<U> :\n                T[P] extends Record<any, any> | undefined ? QueryFilter<T[P]> : MapOperators<T[P]>;\n};\n\nexport type Sort<T> = {\n    [K in keyof T]?: {\n        [V in keyof T]?:\n            V extends K ?\n                T[V] extends Array<infer U> | undefined ?\n                    U extends object ?\n                        Sort<U> : never :\n                            T[V] extends object | undefined ?\n                                Sort<T[V]> : 'asc' | 'desc' : never;\n    };\n}[keyof T];\n\n// Select properties\nexport type CustomAttributeFilter = {\n    [K in number]: string | number | boolean |\n    {id: string;} |\n    {entityName: string; entityId: string;};\n}\n\nexport type QuerySelect<T> = {\n    [P in keyof T]?:\n        T[P] extends Array<infer U> | undefined ? (QuerySelect<U> | boolean) :\n            T[P] extends Record<any, any> | undefined ? (QuerySelect<T[P]> | boolean) : boolean;\n}\n\nexport type Select<T, Q extends (QuerySelect<T> | undefined)> = Q extends QuerySelect<T> ? {\n\n    // Filter out excluded properties beforehand\n    [P in keyof T as Q[P] extends boolean ? P : Q[P] extends object ? P : never]:\n\n    // Property\n    Q[P] extends true ? T[P] :\n\n        // Array\n        T[P] extends Array<infer U> ? Select<U, Q[P] & QuerySelect<any>>[] :\n\n            // Object\n            T[P] extends Record<any, any> ? Select<T[P], Q[P] & QuerySelect<any>> : never\n} : undefined;\n\nexport type MapKeys<T, S extends Record<keyof T, string>> = {\n    [K in keyof T as S[K]]: T[K];\n};\n\n// Endpoint configurations\nexport type CountQuery<F> = {\n    filter?: QueryFilter<F>;\n    or?: (QueryFilter<F> & CustomAttributeFilter)[];\n};\n\nexport type Pagination = {\n    page: number;\n    pageSize: number;\n};\n\nexport type SomeQuery<\n    E, // Entity\n    F, // Entity filter\n    I extends (QuerySelect<any> | undefined), // Select for referenced entities\n    S extends (QuerySelect<any> | undefined) // Select for entity properties\n> = {\n    serializeNulls?: boolean;\n    include?: I;\n    filter?: QueryFilter<F> & CustomAttributeFilter;\n    select?: S;\n    or?: (QueryFilter<F> & CustomAttributeFilter)[];\n    sort?: Sort<E>[];\n    pagination?: Pagination;\n};\n\nexport type UniqueQuery = {\n    serializeNulls?: boolean;\n}\n\nexport type SomeQueryReturn<\n    E, // Entity\n    R, // Map of referenced-entity names to the type\n    M, // Map of referenced-entity-id names to their entity name\n    I extends (QuerySelect<any> | undefined), // Select for referenced entities\n    S extends (QuerySelect<any> | undefined) // Select for entity properties\n> = {\n    entities: (S extends QuerySelect<E> ? Select<E, S> : E)[];\n    references: I extends QuerySelect<R> ? Partial<MapKeys<Select<R, I>, M & Record<any, any>>> : {};\n};\n\nexport type GenericQuery<P, B> = {\n    params?: P;\n    body?: B;\n};\n\nexport type UpdateQuery = {\n    ignoreMissingProperties?: boolean;\n}\n\n// Entity meta types\nexport type WEntityPropertyMeta = (\n    { type: 'string'; format?: 'decimal' | 'html'; entity?: WEntity; service?: WService; } |\n    { type: 'integer'; format: 'int32' | 'int64' | 'duration' | 'date' | 'timestamp'; } |\n    { type: 'array'; format: 'reference'; entity: WEntity; service?: WService; } |\n    { type: 'array'; format: 'reference'; enum: WEnum; } |\n    { type: 'array'; format: 'string'; } |\n    { type: 'number'; format: 'double'; } |\n    { type: 'reference'; entity: WEntity; } |\n    { type: 'reference'; enum: WEnum; } |\n    { type: 'boolean'; } |\n    { type: 'object'; }\n);\n\n// Utils\nconst equality: string[] = ['EQ', 'NE'];\nconst simple: string[] = [...equality, 'LT', 'GT', 'LE', 'GE', 'LIKE', 'NOT_LIKE', 'ILIKE', 'NOT_ILIKE'];\nconst array: string[] = ['IN', 'NOT_IN'];\nconst filterMap: Record<Operator, string> = {\n    EQ: 'eq',\n    NE: 'ne',\n    LT: 'lt',\n    GT: 'gt',\n    LE: 'le',\n    GE: 'ge',\n    LIKE: 'like',\n    NOT_LIKE: 'notlike',\n    ILIKE: 'ilike',\n    NOT_ILIKE: 'notilike',\n    IN: 'in',\n    NOT_IN: 'notin'\n};\n\nconst flattenCustomAttributes = (obj: CustomAttributeFilter = {}): [string, string][] => {\n    const entries: [string, string][] = [];\n\n    for (const [id, filter] of Object.entries(obj)) {\n        const key = `customAttribute${id}`;\n\n        if (typeof filter === 'object') {\n            for (const [prop, value] of Object.entries(filter)) {\n                entries.push([`${key}.${prop}-eq`, String(value)]);\n            }\n        } else if (filter !== undefined) {\n            entries.push([`${key}-eq`, String(filter)]);\n        }\n    }\n\n    return entries;\n};\n\nconst flatten = (obj: QueryFilter<any> = {}): [string, string][] => {\n    const entries: [string, string][] = [];\n\n    for (const [prop, propValue] of Object.entries(obj)) {\n        for (const [filter, value] of Object.entries(propValue as object)) {\n            if (value === undefined) continue;\n\n            if (simple.includes(filter)) {\n                if (value === null && equality.includes(filter)) {\n                    entries.push([`${prop}-${filter === 'EQ' ? 'null' : 'notnull'}`, '']);\n                } else {\n                    entries.push([`${prop}-${filterMap[filter as Operator]}`, value]);\n                }\n            } else if (array.includes(filter)) {\n                entries.push([\n                    `${prop}-${filterMap[filter as Operator]}`,\n                    `[${value.map((v: string | number) => typeof v === 'string' ? `\"${v}\"` : v)}]`\n                ]);\n            } else {\n                entries.push(\n                    ...flatten(propValue as QueryFilter<any>)\n                        .map(v => [`${prop}.${v[0]}`, v[1]]) as [string, string][]\n                );\n                break;\n            }\n        }\n    }\n\n    return entries;\n};\n\nconst flattenFilter = (obj: QueryFilter<any> = {}): Record<string, string> => {\n    const filter: [string, any][] = [], customAttributes: [string, any][] = [];\n\n    Object.entries(obj).forEach(value => {\n        (value[0].match(/^\\d+$/) ? customAttributes : filter).push(value);\n    });\n\n    return Object.fromEntries([\n        ...flatten(Object.fromEntries(filter)),\n        ...flattenCustomAttributes(Object.fromEntries(customAttributes) as CustomAttributeFilter)\n    ]);\n};\n\nconst flattenOrFilter = (obj: QueryFilter<any>[] = []): Record<string, string> => {\n    const entries: [string, any][] = [];\n\n    for (let i = 0; i < obj.length; i++) {\n        entries.push(\n            ...flatten(obj[i])\n                .map(v => [`or${i || ''}-${v[0]}`, v[1]]) as [string, string][]\n        );\n    }\n\n    return Object.fromEntries(entries);\n};\n\nconst flattenSelect = (obj: Select<any, any> = {}): string[] => {\n    const entries: string[] = [];\n\n    for (const [prop, value] of Object.entries(obj)) {\n        if (typeof value === 'object' && value) {\n            entries.push(...flattenSelect(value).map(v => `${prop}.${v}`));\n        } else if (value) {\n            entries.push(prop);\n        }\n    }\n\n    return entries;\n};\n\nexport const flattenSort = (obj: Sort<any>[] = []): {sort?: string} => {\n    const flatten = (obj: Sort<any>, base = ''): string | undefined => {\n        const [key, value] = Object.entries(obj ?? {})[0] ?? [];\n\n        if (key && value) {\n            const path = base + key;\n\n            if (typeof value === 'object') {\n                return flatten(value, path ? `${path}.` : '');\n            } else if (['asc', 'desc'].includes(value)) {\n                return `${value === 'desc' ? '-' : ''}${path}`;\n            }\n        }\n\n        return undefined;\n    };\n\n    const sorts = obj.map(v => flatten(v)).filter(Boolean);\n    return sorts.length ? {sort: sorts.join(',')} : {};\n};\n";
+var types = "export type DeepPartial<T> = T extends object ? {\n    [P in keyof T]?: DeepPartial<T[P]>;\n} : T;\n\n// Filter properties\nexport type EqualityOperators = 'EQ' | 'NE';\nexport type ComparisonOperators = 'LT' | 'GT' | 'LE' | 'GE' | 'LIKE' | 'ILIKE' | 'NOT_LIKE' | 'NOT_ILIKE';\nexport type ArrayOperators = 'IN' | 'NOT_IN';\nexport type Operator = EqualityOperators | ComparisonOperators | ArrayOperators;\n\nexport type MapOperators<T> = { [K in EqualityOperators]?: T | null; } &\n    { [K in ComparisonOperators]?: T; } &\n    { [K in ArrayOperators]?: T[]; };\n\nexport type QueryFilter<T> = {\n    [P in keyof T]?:\n        T[P] extends Array<infer U> | undefined ?\n            U extends Record<any, any> ? QueryFilter<U> : MapOperators<U> :\n                T[P] extends Record<any, any> | undefined ? QueryFilter<T[P]> : MapOperators<T[P]>;\n};\n\nexport type Sort<T> = {\n    [K in keyof T]?: {\n        [V in keyof T]?:\n            V extends K ?\n                T[V] extends Array<infer U> | undefined ?\n                    U extends object ?\n                        Sort<U> : never :\n                            T[V] extends object | undefined ?\n                                Sort<T[V]> : 'asc' | 'desc' : never;\n    };\n}[keyof T];\n\n// Select properties\nexport type CustomAttributeFilter = {\n    [K in number]: string | number | boolean |\n    {id: string;} |\n    {entityName: string; entityId: string;};\n}\n\nexport type QuerySelect<T> = {\n    [P in keyof T]?:\n        T[P] extends Array<infer U> | undefined ? (QuerySelect<U> | boolean) :\n            T[P] extends Record<any, any> | undefined ? (QuerySelect<T[P]> | boolean) : boolean;\n}\n\nexport type Select<T, Q extends (QuerySelect<T> | undefined)> = Q extends QuerySelect<T> ? {\n\n    // Filter out excluded properties beforehand\n    [P in keyof T as Q[P] extends boolean ? P : Q[P] extends object ? P : never]:\n\n    // Property\n    Q[P] extends true ? T[P] :\n\n        // Array\n        T[P] extends Array<infer U> ? Select<U, Q[P] & QuerySelect<any>>[] :\n\n            // Object\n            T[P] extends Record<any, any> ? Select<T[P], Q[P] & QuerySelect<any>> : never\n} : undefined;\n\nexport type MapKeys<T, S extends Record<keyof T, string>> = {\n    [K in keyof T as S[K]]: T[K];\n};\n\n// Endpoint configurations\nexport type CountQuery<F> = {\n    filter?: QueryFilter<F>;\n    or?: (QueryFilter<F> & CustomAttributeFilter)[];\n};\n\nexport type Pagination = {\n    page: number;\n    pageSize: number;\n};\n\nexport type SomeQuery<\n    E, // Entity\n    F, // Entity filter\n    I extends (QuerySelect<any> | undefined), // Select for referenced entities\n    S extends (QuerySelect<any> | undefined), // Select for entity properties\n    P extends string[] // Select for additional properties\n> = {\n    serializeNulls?: boolean;\n    include?: I;\n    properties?: P\n    filter?: QueryFilter<F> & CustomAttributeFilter;\n    select?: S;\n    or?: (QueryFilter<F> & CustomAttributeFilter)[];\n    sort?: Sort<E>[];\n    pagination?: Pagination;\n};\n\nexport type UniqueQuery = {\n    serializeNulls?: boolean;\n}\n\nexport type SomeQueryReturn<\n    E, // Entity\n    R, // Map of referenced-entity names to the type\n    M, // Map of referenced-entity-id names to their entity name\n    I extends (QuerySelect<any> | undefined), // Select for referenced entities\n    S extends (QuerySelect<any> | undefined), // Select for entity properties\n    P // Additional properties\n> = {\n    entities: (S extends QuerySelect<E> ? Select<E, S> : E)[];\n    references: I extends QuerySelect<R> ? Partial<MapKeys<Select<R, I>, M & Record<any, any>>> : {};\n    properties: P\n};\n\nexport type GenericQuery<P, B> = {\n    params?: P;\n    body?: B;\n};\n\nexport type UpdateQuery = {\n    ignoreMissingProperties?: boolean;\n}\n\n// Entity meta types\nexport type WEntityPropertyMeta = (\n    { type: 'string'; format?: 'decimal' | 'html'; entity?: WEntity; service?: WService; } |\n    { type: 'integer'; format: 'int32' | 'int64' | 'duration' | 'date' | 'timestamp'; } |\n    { type: 'array'; format: 'reference'; entity: WEntity; service?: WService; } |\n    { type: 'array'; format: 'reference'; enum: WEnum; } |\n    { type: 'array'; format: 'string'; } |\n    { type: 'number'; format: 'double'; } |\n    { type: 'reference'; entity: WEntity; } |\n    { type: 'reference'; enum: WEnum; } |\n    { type: 'boolean'; } |\n    { type: 'object'; }\n);\n\n// Utils\nconst equality: string[] = ['EQ', 'NE'];\nconst simple: string[] = [...equality, 'LT', 'GT', 'LE', 'GE', 'LIKE', 'NOT_LIKE', 'ILIKE', 'NOT_ILIKE'];\nconst array: string[] = ['IN', 'NOT_IN'];\nconst filterMap: Record<Operator, string> = {\n    EQ: 'eq',\n    NE: 'ne',\n    LT: 'lt',\n    GT: 'gt',\n    LE: 'le',\n    GE: 'ge',\n    LIKE: 'like',\n    NOT_LIKE: 'notlike',\n    ILIKE: 'ilike',\n    NOT_ILIKE: 'notilike',\n    IN: 'in',\n    NOT_IN: 'notin'\n};\n\nconst flattenCustomAttributes = (obj: CustomAttributeFilter = {}): [string, string][] => {\n    const entries: [string, string][] = [];\n\n    for (const [id, filter] of Object.entries(obj)) {\n        const key = `customAttribute${id}`;\n\n        if (typeof filter === 'object') {\n            for (const [prop, value] of Object.entries(filter)) {\n                entries.push([`${key}.${prop}-eq`, String(value)]);\n            }\n        } else if (filter !== undefined) {\n            entries.push([`${key}-eq`, String(filter)]);\n        }\n    }\n\n    return entries;\n};\n\nconst flatten = (obj: QueryFilter<any> = {}): [string, string][] => {\n    const entries: [string, string][] = [];\n\n    for (const [prop, propValue] of Object.entries(obj)) {\n        for (const [filter, value] of Object.entries(propValue as object)) {\n            if (value === undefined) continue;\n\n            if (simple.includes(filter)) {\n                if (value === null && equality.includes(filter)) {\n                    entries.push([`${prop}-${filter === 'EQ' ? 'null' : 'notnull'}`, '']);\n                } else {\n                    entries.push([`${prop}-${filterMap[filter as Operator]}`, value]);\n                }\n            } else if (array.includes(filter)) {\n                entries.push([\n                    `${prop}-${filterMap[filter as Operator]}`,\n                    `[${value.map((v: string | number) => typeof v === 'string' ? `\"${v}\"` : v)}]`\n                ]);\n            } else {\n                entries.push(\n                    ...flatten(propValue as QueryFilter<any>)\n                        .map(v => [`${prop}.${v[0]}`, v[1]]) as [string, string][]\n                );\n                break;\n            }\n        }\n    }\n\n    return entries;\n};\n\nconst flattenFilter = (obj: QueryFilter<any> = {}): Record<string, string> => {\n    const filter: [string, any][] = [], customAttributes: [string, any][] = [];\n\n    Object.entries(obj).forEach(value => {\n        (value[0].match(/^\\d+$/) ? customAttributes : filter).push(value);\n    });\n\n    return Object.fromEntries([\n        ...flatten(Object.fromEntries(filter)),\n        ...flattenCustomAttributes(Object.fromEntries(customAttributes) as CustomAttributeFilter)\n    ]);\n};\n\nconst flattenOrFilter = (obj: QueryFilter<any>[] = []): Record<string, string> => {\n    const entries: [string, any][] = [];\n\n    for (let i = 0; i < obj.length; i++) {\n        entries.push(\n            ...flatten(obj[i])\n                .map(v => [`or${i || ''}-${v[0]}`, v[1]]) as [string, string][]\n        );\n    }\n\n    return Object.fromEntries(entries);\n};\n\nconst flattenSelect = (obj: Select<any, any> = {}): string[] => {\n    const entries: string[] = [];\n\n    for (const [prop, value] of Object.entries(obj)) {\n        if (typeof value === 'object' && value) {\n            entries.push(...flattenSelect(value).map(v => `${prop}.${v}`));\n        } else if (value) {\n            entries.push(prop);\n        }\n    }\n\n    return entries;\n};\n\nexport const flattenSort = (obj: Sort<any>[] = []): {sort?: string} => {\n    const flatten = (obj: Sort<any>, base = ''): string | undefined => {\n        const [key, value] = Object.entries(obj ?? {})[0] ?? [];\n\n        if (key && value) {\n            const path = base + key;\n\n            if (typeof value === 'object') {\n                return flatten(value, path ? `${path}.` : '');\n            } else if (['asc', 'desc'].includes(value)) {\n                return `${value === 'desc' ? '-' : ''}${path}`;\n            }\n        }\n\n        return undefined;\n    };\n\n    const sorts = obj.map(v => flatten(v)).filter(Boolean);\n    return sorts.length ? {sort: sorts.join(',')} : {};\n};\n";
 
 const resolveImports = (target) => {
     const imports = [];
@@ -610,10 +610,9 @@ const generateRequestBodyType = ({ requestBody }) => {
     return generateBodyType(requestBody) ?? createRawType('unknown');
 };
 
-const generateResponseBodyType = ({ responses }) => {
-    return generateBodyType(Object.entries(responses)
-        .filter(v => v[0].startsWith('2'))[0]?.[1]) ?? createRawType('void');
-};
+const resolveBodyType = ({ responses }) => Object.entries(responses)
+    .filter(v => v[0].startsWith('2'))[0]?.[1];
+const generateResponseBodyType = (object) => generateBodyType(resolveBodyType(object)) ?? createRawType('void');
 
 const functionName$4 = 'create';
 const generateCreateEndpoint = ({ target, path, endpoint }) => {
@@ -720,6 +719,19 @@ const excludedParameters = [
     'page', 'pageSize', 'sort',
     'serializeNulls', 'properties', 'includeReferencedEntities'
 ];
+const resolveAdditionalProperties = (path) => {
+    const body = resolveBodyType(path);
+    if (isResponseObject(body)) {
+        const schema = body?.content?.['application/json']?.schema;
+        if (isObjectSchemaObject(schema)) {
+            const obj = schema?.properties?.additionalProperties;
+            if (isObjectSchemaObject(obj)) {
+                return obj;
+            }
+        }
+    }
+    return undefined;
+};
 const generateSomeEndpoint = ({ aliases, target, path, endpoint }) => {
     // Required interface names
     const service = pascalCase(endpoint.entity);
@@ -730,20 +742,24 @@ const generateSomeEndpoint = ({ aliases, target, path, endpoint }) => {
     const entityReferences = `${entity}_References`;
     const entityParameters = `${service}_Parameters`;
     const parameterSchema = convertParametersToSchema(path.parameters);
-    // We already cover page, pageSize and sort
+    const additionalProperties = resolveAdditionalProperties(path);
+    const additionalPropertyNames = generateStrings(Object.keys(additionalProperties?.properties ?? {}));
+    const additionalPropertyNamesType = additionalPropertyNames.length ? `(${concat(additionalPropertyNames, ' | ')})[]` : '[]';
+    // We already cover some properties
     parameterSchema.properties = Object.fromEntries(Object.entries(parameterSchema.properties ?? {})
         .filter(v => !excludedParameters.includes(v[0])));
     const parameters = createObjectType({
         params: convertToTypeScriptType(parameterSchema)
     });
+    const properties = additionalProperties ? convertToTypeScriptType(additionalProperties).toString() : '{}';
     const interfaceSource = generateArrowFunctionType({
         type: interfaceName,
         generics: [
             `S extends (QuerySelect<${entity}> | undefined) = undefined`,
             `I extends (QuerySelect<${entityMappings}> | undefined) = undefined`
         ],
-        params: [`query${parameters.isFullyOptional() ? '?' : ''}: SomeQuery<${entity}, ${entityFilter}, I, S> & ${entityParameters}`],
-        returns: `${resolveResponseType(target)}<SomeQueryReturn<${entity}, ${entityReferences}, ${entityMappings}, I, S>>`
+        params: [`query${parameters.isFullyOptional() ? '?' : ''}: SomeQuery<${entity}, ${entityFilter}, I, S, ${additionalPropertyNamesType}> & ${entityParameters}`],
+        returns: `${resolveResponseType(target)}<SomeQueryReturn<${entity}, ${entityReferences}, ${entityMappings}, I, S, ${properties}>>`
     });
     const functionSource = generateArrowFunction({
         name: functionName$2,

package/package.json

@@ -1,12 +1,17 @@
 {
   "name": "@weclapp/sdk",
-  "version": "1.8.0-dev.19",
+  "version": "2.0.0-dev.3",
   "description": "SDK generator based on a weclapp api swagger file",
   "author": "weclapp",
   "sideEffects": false,
   "bugs": "https://github.com/weclapp/sdk/issues",
   "homepage": "https://github.com/weclapp/sdk#readme",
   "repository": "git+https://github.com/weclapp/sdk.git",
+  "keywords": [
+    "sdk",
+    "generator",
+    "weclapp"
+  ],
   "bin": {
     "build-weclapp-sdk": "./bin/cli.js"
   },
@@ -40,9 +45,9 @@
     "release": "standard-version"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.59.11",
-    "@typescript-eslint/parser": "^5.59.11",
-    "eslint": "^8.42.0",
+    "@typescript-eslint/eslint-plugin": "^6.2.1",
+    "@typescript-eslint/parser": "^6.2.1",
+    "eslint": "^8.46.0",
     "rollup-plugin-string": "^3.0.0",
     "standard-version": "^9.5.0"
   },
@@ -51,19 +56,19 @@
     "@rollup/plugin-terser": "^0.4.3",
     "@types/fs-extra": "^11.0.1",
     "@types/yargs": "^17.0.24",
-    "chalk": "^5.2.0",
+    "chalk": "^5.3.0",
     "change-case": "^4.1.2",
     "cross-env": "^7.0.3",
-    "dotenv": "^16.1.4",
+    "dotenv": "^16.3.1",
     "indent-string": "^5.0.0",
     "openapi-types": "^12.1.3",
     "pretty-ms": "^8.0.0",
-    "rollup": "^3.25.1",
-    "rollup-plugin-ts": "^3.2.0",
-    "typescript": "^5.1.3",
+    "rollup": "^3.27.2",
+    "rollup-plugin-ts": "^3.4.3",
+    "typescript": "^5.1.6",
     "yargs": "^17.7.2"
   },
   "peerDependencies": {
-    "rxjs": "^7.5.5"
+    "rxjs": "^7.8.0"
   }
 }