diff --git a/lib/utils/request/queryBuilder.d.ts b/lib/utils/request/queryBuilder.d.ts index 0fcdd25..d4fbcb9 100644 --- a/lib/utils/request/queryBuilder.d.ts +++ b/lib/utils/request/queryBuilder.d.ts @@ -1,5 +1,5 @@ -declare const queryStringBuilder: ({ filters, columnFilterName }: { - filters: any; - columnFilterName?: string | undefined; -}) => string; -export default queryStringBuilder; +declare const queryStringBuilder: ({ filters, columnFilterName }: { + filters: any; + columnFilterName?: string | undefined; +}) => string; +export default queryStringBuilder; diff --git a/lib/utils/request/queryBuilder.js b/lib/utils/request/queryBuilder.js index c1c96e8..33c632a 100644 --- a/lib/utils/request/queryBuilder.js +++ b/lib/utils/request/queryBuilder.js @@ -112,10 +112,9 @@ var queryStringBuilder = function queryStringBuilder(_ref9) { data: filters, columnFilterName: columnFilterName }); - }), R.join("&") // R.trim - )(filters); + }), R.join("&"))(filters); }; var _default = queryStringBuilder; exports.default = _default; -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../../src/utils/request/queryBuilder.ts"],"names":["keyType","key","data","R","pipe","prop","type","columnFilterDataBuilder","columnFilterName","head","keys","map","path","join","objDataBuilder","encodeURIComponent","simpleDataBuilder","value","values","arrDataBuilder","equals","builder","queryStringBuilder","filters","filter","x"],"mappings":"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","sourcesContent":["import * as R from \"ramda\";\r\n\r\nconst keyType = ({ key, data }: { key: string; data: any }) =>\r\n  R.pipe(\r\n    R.prop<any, any>(key),\r\n    R.type\r\n  )(data);\r\n\r\nconst columnFilterDataBuilder = ({\r\n  data,\r\n  columnFilterName = \"ColumnFilter_\"\r\n}: {\r\n  data: any;\r\n  columnFilterName?: string;\r\n}) =>\r\n  R.pipe(\r\n    R.head,\r\n    R.keys,\r\n    R.map(\r\n      key =>\r\n        `${columnFilterName}${key}=${(\r\n          R.path([key, \"value\"], data[0])\r\n        )}`\r\n    ),\r\n    R.join(\"&\")\r\n  )(data);\r\n\r\nconst objDataBuilder = ({ data }: { data: any }) =>\r\n  R.pipe(\r\n    R.keys,\r\n    R.map((key: any) => `${key}=${encodeURIComponent(R.prop(key, data))}`),\r\n    R.join(\"&\")\r\n  )(data);\r\n\r\nconst simpleDataBuilder = ({ key, data }: { key: string; data: any }) => {\r\n  switch (R.type(data[0])) {\r\n    case \"Object\":\r\n      return R.pipe(\r\n        R.map(\r\n          ({ value }: { value: string }) =>\r\n            `${key}=${encodeURIComponent(value)}`\r\n        ),\r\n        R.values,\r\n        R.join(\"&\")\r\n      )(data);\r\n    case \"Number\":\r\n    case \"String\":\r\n      return R.pipe(\r\n        R.map((value: any) => `${key}=${encodeURIComponent(value)}`),\r\n        R.join(\"&\")\r\n      )(data);\r\n    default:\r\n      return \"\";\r\n  }\r\n  return R.pipe(\r\n    R.map(\r\n      ({ value }: { value: string }) => `${key}=${encodeURIComponent(value)}`\r\n    ),\r\n    R.values,\r\n    R.join(\"&\")\r\n  )(data);\r\n};\r\nconst arrDataBuilder = ({\r\n  key,\r\n  data,\r\n  columnFilterName\r\n}: {\r\n  key: string;\r\n  data: any;\r\n  columnFilterName?: string;\r\n}) =>\r\n  R.equals(key, \"columnFilters\")\r\n    ? columnFilterDataBuilder({ columnFilterName, data })\r\n    : simpleDataBuilder({ key, data });\r\n\r\nconst builder = ({\r\n  key,\r\n  data,\r\n  columnFilterName\r\n}: {\r\n  key: string;\r\n  data: any;\r\n  columnFilterName?: string;\r\n}) => {\r\n  switch (keyType({ key, data })) {\r\n    case \"Array\":\r\n      return arrDataBuilder({ key, columnFilterName, data: R.prop(key, data) });\r\n    case \"Object\":\r\n      return objDataBuilder({ data: R.prop(key, data) });\r\n    case \"Number\":\r\n    case \"String\":\r\n      return `${key}=${encodeURIComponent(R.prop(key, data))}`;\r\n    default:\r\n      return \"\";\r\n  }\r\n};\r\n\r\nconst queryStringBuilder = ({\r\n  filters,\r\n  columnFilterName\r\n}: {\r\n  filters: any;\r\n  columnFilterName?: string;\r\n}) =>\r\n  R.pipe(\r\n    R.filter((x: any) => x),\r\n    R.keys,\r\n    R.map((key: any) => builder({ key, data: filters, columnFilterName })),\r\n    R.join(\"&\")\r\n    // R.trim\r\n  )(filters);\r\n\r\nexport default queryStringBuilder;\r\n"]} \ No newline at end of file +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../../src/utils/request/queryBuilder.ts"],"names":["keyType","key","data","R","pipe","prop","type","columnFilterDataBuilder","columnFilterName","head","keys","map","path","join","objDataBuilder","encodeURIComponent","simpleDataBuilder","value","values","arrDataBuilder","equals","builder","queryStringBuilder","filters","filter","x"],"mappings":"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","sourcesContent":["import * as R from \"ramda\";\r\n\r\nconst keyType = ({ key, data }: { key: string; data: any }) =>\r\n  R.pipe(\r\n    R.prop<any, any>(key),\r\n    R.type\r\n  )(data);\r\n\r\nconst columnFilterDataBuilder = ({\r\n  data,\r\n  columnFilterName = \"ColumnFilter_\"\r\n}: {\r\n  data: any;\r\n  columnFilterName?: string;\r\n}) =>\r\n  R.pipe(\r\n    R.head,\r\n    R.keys,\r\n    R.map(\r\n      key => `${columnFilterName}${key}=${R.path([key, \"value\"], data[0])}`\r\n    ),\r\n    R.join(\"&\")\r\n  )(data);\r\n\r\nconst objDataBuilder = ({ data }: { data: any }) =>\r\n  R.pipe(\r\n    R.keys,\r\n    R.map((key: any) => `${key}=${encodeURIComponent(R.prop(key, data))}`),\r\n    R.join(\"&\")\r\n  )(data);\r\n\r\nconst simpleDataBuilder = ({ key, data }: { key: string; data: any }) => {\r\n  switch (R.type(data[0])) {\r\n    case \"Object\":\r\n      return R.pipe(\r\n        R.map(\r\n          ({ value }: { value: string }) =>\r\n            `${key}=${encodeURIComponent(value)}`\r\n        ),\r\n        R.values,\r\n        R.join(\"&\")\r\n      )(data);\r\n    case \"Number\":\r\n    case \"String\":\r\n      return R.pipe(\r\n        R.map((value: any) => `${key}=${encodeURIComponent(value)}`),\r\n        R.join(\"&\")\r\n      )(data);\r\n    default:\r\n      return \"\";\r\n  }\r\n  return R.pipe(\r\n    R.map(\r\n      ({ value }: { value: string }) => `${key}=${encodeURIComponent(value)}`\r\n    ),\r\n    R.values,\r\n    R.join(\"&\")\r\n  )(data);\r\n};\r\nconst arrDataBuilder = ({\r\n  key,\r\n  data,\r\n  columnFilterName\r\n}: {\r\n  key: string;\r\n  data: any;\r\n  columnFilterName?: string;\r\n}) =>\r\n  R.equals(key, \"columnFilters\")\r\n    ? columnFilterDataBuilder({ columnFilterName, data })\r\n    : simpleDataBuilder({ key, data });\r\n\r\nconst builder = ({\r\n  key,\r\n  data,\r\n  columnFilterName\r\n}: {\r\n  key: string;\r\n  data: any;\r\n  columnFilterName?: string;\r\n}) => {\r\n  switch (keyType({ key, data })) {\r\n    case \"Array\":\r\n      return arrDataBuilder({ key, columnFilterName, data: R.prop(key, data) });\r\n    case \"Object\":\r\n      return objDataBuilder({ data: R.prop(key, data) });\r\n    case \"Number\":\r\n    case \"String\":\r\n      return `${key}=${encodeURIComponent(R.prop(key, data))}`;\r\n    default:\r\n      return \"\";\r\n  }\r\n};\r\n\r\nconst queryStringBuilder = ({\r\n  filters,\r\n  columnFilterName\r\n}: {\r\n  filters: any;\r\n  columnFilterName?: string;\r\n}) =>\r\n  R.pipe(\r\n    R.filter((x: any) => x),\r\n    R.keys,\r\n    R.map((key: any) => builder({ key, data: filters, columnFilterName })),\r\n    R.join(\"&\")\r\n  )(filters);\r\n\r\nexport default queryStringBuilder;\r\n"]} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index f07a642..ab60b7d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ark_ui_tools", - "version": "0.1.18", + "version": "0.1.19", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index d79bbcd..0a768db 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ark_ui_tools", - "version": "0.1.18", + "version": "0.1.19", "description": "", "keywords": [], "author": "",