From 820df7e6d39c0c08bd98cef09070f55c8800faea Mon Sep 17 00:00:00 2001 From: Emanuele Saccomandi Date: Tue, 17 Oct 2023 15:08:53 +0200 Subject: [PATCH 1/3] fixed childMapping method --- .../src/main/resources/zapier/package.mustache | 2 +- .../openapi-generator/src/main/resources/zapier/utils.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/zapier/package.mustache b/modules/openapi-generator/src/main/resources/zapier/package.mustache index 9759b8520eed..2a713829da0e 100644 --- a/modules/openapi-generator/src/main/resources/zapier/package.mustache +++ b/modules/openapi-generator/src/main/resources/zapier/package.mustache @@ -13,7 +13,7 @@ }, "dependencies": { "lodash": "^4.17.21", - "zapier-platform-core": "15.0.1", + "zapier-platform-core": "^15.0.1", "form-data": "2.1.4" }, "devDependencies": { diff --git a/modules/openapi-generator/src/main/resources/zapier/utils.mustache b/modules/openapi-generator/src/main/resources/zapier/utils.mustache index a73f00e4778b..c924ab586c2c 100644 --- a/modules/openapi-generator/src/main/resources/zapier/utils.mustache +++ b/modules/openapi-generator/src/main/resources/zapier/utils.mustache @@ -1,7 +1,7 @@ const _ = require('lodash') const replacePathParameters = (url) => url.replace(/{([^{}]+)}/g, (keyExpr, key) => `{{bundle.inputData.${key}}}`) -const childMapping = (objectsArray, prefix, model) => objectsArray.map(object => model.mapping({inputData: object}, prefix)) +const childMapping = (objectsArray, prefix, model) => objectsArray ? objectsArray.map(object => model.mapping({inputData: object}, prefix)) : undefined const removeIfEmpty = (obj) => _.isEmpty(JSON.parse(JSON.stringify(obj))) ? undefined : obj const buildKeyAndLabel = (prefix, isInput = true, isArrayChild = false) => { const keyPrefix = !_.isEmpty(prefix) && (!isArrayChild || isInput) ? `${prefix}${isInput ? '.' : '__'}` : prefix From 569d0d31008bf4e5848d3450daffd5969b2ff34e Mon Sep 17 00:00:00 2001 From: Emanuele Saccomandi Date: Tue, 17 Oct 2023 15:18:14 +0200 Subject: [PATCH 2/3] updated samples --- .../src/main/resources/zapier/utils.mustache | 2 +- samples/client/petstore/zapier/package.json | 2 +- samples/client/petstore/zapier/utils/utils.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/zapier/utils.mustache b/modules/openapi-generator/src/main/resources/zapier/utils.mustache index c924ab586c2c..201a15fb582b 100644 --- a/modules/openapi-generator/src/main/resources/zapier/utils.mustache +++ b/modules/openapi-generator/src/main/resources/zapier/utils.mustache @@ -8,7 +8,7 @@ const buildKeyAndLabel = (prefix, isInput = true, isArrayChild = false) => { const labelPrefix = !_.isEmpty(keyPrefix) ? keyPrefix.replaceAll('__', '.') : '' return { keyPrefix: keyPrefix, - labelPrefix:labelPrefix, + labelPrefix: labelPrefix, } } const isSearchAction = (key) => { diff --git a/samples/client/petstore/zapier/package.json b/samples/client/petstore/zapier/package.json index 415649542cc2..12b4ca0e3acb 100644 --- a/samples/client/petstore/zapier/package.json +++ b/samples/client/petstore/zapier/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "lodash": "^4.17.21", - "zapier-platform-core": "15.0.1", + "zapier-platform-core": "^15.0.1", "form-data": "2.1.4" }, "devDependencies": { diff --git a/samples/client/petstore/zapier/utils/utils.js b/samples/client/petstore/zapier/utils/utils.js index a73f00e4778b..201a15fb582b 100644 --- a/samples/client/petstore/zapier/utils/utils.js +++ b/samples/client/petstore/zapier/utils/utils.js @@ -1,14 +1,14 @@ const _ = require('lodash') const replacePathParameters = (url) => url.replace(/{([^{}]+)}/g, (keyExpr, key) => `{{bundle.inputData.${key}}}`) -const childMapping = (objectsArray, prefix, model) => objectsArray.map(object => model.mapping({inputData: object}, prefix)) +const childMapping = (objectsArray, prefix, model) => objectsArray ? objectsArray.map(object => model.mapping({inputData: object}, prefix)) : undefined const removeIfEmpty = (obj) => _.isEmpty(JSON.parse(JSON.stringify(obj))) ? undefined : obj const buildKeyAndLabel = (prefix, isInput = true, isArrayChild = false) => { const keyPrefix = !_.isEmpty(prefix) && (!isArrayChild || isInput) ? `${prefix}${isInput ? '.' : '__'}` : prefix const labelPrefix = !_.isEmpty(keyPrefix) ? keyPrefix.replaceAll('__', '.') : '' return { keyPrefix: keyPrefix, - labelPrefix:labelPrefix, + labelPrefix: labelPrefix, } } const isSearchAction = (key) => { From bc79ce463957b4ff53c9063d01c455f43b3728d9 Mon Sep 17 00:00:00 2001 From: Emanuele Saccomandi Date: Tue, 17 Oct 2023 15:50:21 +0200 Subject: [PATCH 3/3] fixed deps --- .../src/main/resources/zapier/package.mustache | 4 ++-- samples/client/petstore/zapier/package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/zapier/package.mustache b/modules/openapi-generator/src/main/resources/zapier/package.mustache index 2a713829da0e..4d24a12a7a1a 100644 --- a/modules/openapi-generator/src/main/resources/zapier/package.mustache +++ b/modules/openapi-generator/src/main/resources/zapier/package.mustache @@ -13,7 +13,7 @@ }, "dependencies": { "lodash": "^4.17.21", - "zapier-platform-core": "^15.0.1", + "zapier-platform-core": "15.4.1", "form-data": "2.1.4" }, "devDependencies": { @@ -22,6 +22,6 @@ }, "private": true, "zapier": { - "convertedByCLIVersion": "14.1.1" + "convertedByCLIVersion": "15.4.1" } } \ No newline at end of file diff --git a/samples/client/petstore/zapier/package.json b/samples/client/petstore/zapier/package.json index 12b4ca0e3acb..961f5a6d84cf 100644 --- a/samples/client/petstore/zapier/package.json +++ b/samples/client/petstore/zapier/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "lodash": "^4.17.21", - "zapier-platform-core": "^15.0.1", + "zapier-platform-core": "15.4.1", "form-data": "2.1.4" }, "devDependencies": { @@ -22,6 +22,6 @@ }, "private": true, "zapier": { - "convertedByCLIVersion": "14.1.1" + "convertedByCLIVersion": "15.4.1" } } \ No newline at end of file