From 8e142ead278f7aa0403e29ebc0a0767e4aa9ff88 Mon Sep 17 00:00:00 2001 From: gilgardosh Date: Wed, 26 Jul 2023 14:13:48 +0300 Subject: [PATCH 1/3] Full fix for paymentTerms --- .../json-schemas/greenInvoice.json | 3 +- packages/green-invoice-graphql/package.json | 6 +- yarn.lock | 184 +++++++++++++++++- 3 files changed, 188 insertions(+), 5 deletions(-) diff --git a/packages/green-invoice-graphql/json-schemas/greenInvoice.json b/packages/green-invoice-graphql/json-schemas/greenInvoice.json index 730f67d1..d70a9ef3 100644 --- a/packages/green-invoice-graphql/json-schemas/greenInvoice.json +++ b/packages/green-invoice-graphql/json-schemas/greenInvoice.json @@ -1486,7 +1486,8 @@ }, "paymentTerms": { "type": "number", - "description": "The supplier payment term, default is 0" + "description": "The supplier payment term, default is 0", + "enum": [-1, 0, 10, 15, 30, 45, 60, 75, 90, 120] }, "bankName": { "type": "string", diff --git a/packages/green-invoice-graphql/package.json b/packages/green-invoice-graphql/package.json index 7b098217..890bbe03 100644 --- a/packages/green-invoice-graphql/package.json +++ b/packages/green-invoice-graphql/package.json @@ -56,9 +56,9 @@ "test": "ts-node ./dist/esm/dev-tests/e2e.js" }, "dependencies": { - "@graphql-mesh/cli": "0.85.5", - "@graphql-mesh/json-schema": "0.94.8", - "@graphql-mesh/transform-resolvers-composition": "0.94.5", + "@graphql-mesh/cli": "0.85.6-alpha-20230726100518-2fdb88ed0", + "@graphql-mesh/json-schema": "0.94.9-alpha-20230726100518-2fdb88ed0", + "@graphql-mesh/transform-resolvers-composition": "0.94.6-alpha-20230726100518-2fdb88ed0", "graphql": "16.7.1", "path": "0.12.7" }, diff --git a/yarn.lock b/yarn.lock index 823f7aca..7cb1fec2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -921,6 +921,13 @@ object-inspect "1.12.3" tslib "2.6.0" +"@graphql-mesh/cache-localforage@0.94.6-alpha-20230726100518-2fdb88ed0": + version "0.94.6-alpha-20230726100518-2fdb88ed0" + resolved "https://registry.yarnpkg.com/@graphql-mesh/cache-localforage/-/cache-localforage-0.94.6-alpha-20230726100518-2fdb88ed0.tgz#0334abcf1d1b77b2abea8666f0d51deb1e46bd27" + integrity sha512-Rlphgl+6oaKmwk4p66PcDToHI1Ja/tyOLu7eboRjHxq4TwR1lz//X9q06RcTe1ccqC50CfNr/vXqEKoCOSzVXA== + dependencies: + localforage "1.10.0" + "@graphql-mesh/cache-localforage@^0.94.5": version "0.94.5" resolved "https://registry.yarnpkg.com/@graphql-mesh/cache-localforage/-/cache-localforage-0.94.5.tgz#049f2b2ff4b92d195e6677155fff8d5ba39739b6" @@ -967,6 +974,63 @@ uWebSockets.js uNetworking/uWebSockets.js#v20.30.0 yargs "^17.7.1" +"@graphql-mesh/cli@0.85.6-alpha-20230726100518-2fdb88ed0": + version "0.85.6-alpha-20230726100518-2fdb88ed0" + resolved "https://registry.yarnpkg.com/@graphql-mesh/cli/-/cli-0.85.6-alpha-20230726100518-2fdb88ed0.tgz#fd982c0f05a07225d9c6348dfba6af23d763dcc5" + integrity sha512-KhIJfTuaJdJPZNLnHIU3fBSU0Agj+zx8NVhxhBkGw/ftnP6plORhfrWuvef2gf0LmFdlrRgZfoVRNwH3r2SB4g== + dependencies: + "@graphql-codegen/core" "^4.0.0" + "@graphql-codegen/typed-document-node" "^5.0.0" + "@graphql-codegen/typescript" "^4.0.0" + "@graphql-codegen/typescript-generic-sdk" "^3.1.0" + "@graphql-codegen/typescript-operations" "^4.0.0" + "@graphql-codegen/typescript-resolvers" "^4.0.0" + "@graphql-mesh/config" "0.96.5-alpha-20230726100518-2fdb88ed0" + "@graphql-mesh/cross-helpers" "^0.4.0" + "@graphql-mesh/http" "0.95.4-alpha-20230726100518-2fdb88ed0" + "@graphql-mesh/runtime" "0.95.4-alpha-20230726100518-2fdb88ed0" + "@graphql-mesh/store" "0.94.6-alpha-20230726100518-2fdb88ed0" + "@graphql-mesh/types" "0.94.6-alpha-20230726100518-2fdb88ed0" + "@graphql-mesh/utils" "0.94.6-alpha-20230726100518-2fdb88ed0" + "@graphql-tools/utils" "^10.0.1" + ajv "^8.12.0" + change-case "^4.1.2" + cosmiconfig "^8.1.3" + dnscache "^1.0.2" + dotenv "^16.0.3" + graphql-import-node "^0.0.5" + graphql-ws "^5.12.1" + json-bigint-patch "^0.0.8" + json5 "^2.2.3" + mkdirp "^3.0.0" + open "^7.4.2" + pascal-case "^3.1.2" + rimraf "^5.0.0" + ts-node "^10.9.1" + tsconfig-paths "^4.2.0" + tslib "^2.4.0" + typescript "^5.0.4" + uWebSockets.js uNetworking/uWebSockets.js#v20.30.0 + yargs "^17.7.1" + +"@graphql-mesh/config@0.96.5-alpha-20230726100518-2fdb88ed0": + version "0.96.5-alpha-20230726100518-2fdb88ed0" + resolved "https://registry.yarnpkg.com/@graphql-mesh/config/-/config-0.96.5-alpha-20230726100518-2fdb88ed0.tgz#6b3d225d09dab1ed7d4292ed9a97d7df48d317fc" + integrity sha512-xTsOyqa1Y+MLs83XaMcHNr1udxNc+ytlOvrDnIOzVzxGQhwWaaoVDcyeks4JToOftqJxH3EWMnOAuuq025DgqA== + dependencies: + "@envelop/core" "^4.0.0" + "@graphql-mesh/cache-localforage" "0.94.6-alpha-20230726100518-2fdb88ed0" + "@graphql-mesh/merger-bare" "0.94.6-alpha-20230726100518-2fdb88ed0" + "@graphql-mesh/merger-stitching" "0.94.6-alpha-20230726100518-2fdb88ed0" + "@graphql-tools/code-file-loader" "^8.0.0" + "@graphql-tools/graphql-file-loader" "^8.0.0" + "@graphql-tools/load" "^8.0.0" + "@graphql-yoga/plugin-persisted-operations" "^2.0.3" + "@whatwg-node/fetch" "^0.9.0" + camel-case "^4.1.2" + param-case "^3.0.4" + pascal-case "^3.1.2" + "@graphql-mesh/config@^0.96.4": version "0.96.4" resolved "https://registry.yarnpkg.com/@graphql-mesh/config/-/config-0.96.4.tgz#3beab15a00d12c7cf57c3e4b1e50955051ecfd0e" @@ -994,6 +1058,14 @@ react-native-fs "2.20.0" react-native-path "0.0.5" +"@graphql-mesh/http@0.95.4-alpha-20230726100518-2fdb88ed0": + version "0.95.4-alpha-20230726100518-2fdb88ed0" + resolved "https://registry.yarnpkg.com/@graphql-mesh/http/-/http-0.95.4-alpha-20230726100518-2fdb88ed0.tgz#b571b8e6d2a797627d02600e53eba2ad173a013d" + integrity sha512-WlcFZLdg1YKEJIMS5yykznelgeP2yvjo4ZPjOpEaOPGn518nY9whWShLcYYh7RR3XBrMCZsxE0yCO55qTrnybQ== + dependencies: + "@whatwg-node/server" "^0.9.0" + graphql-yoga "^4.0.0" + "@graphql-mesh/http@^0.95.3": version "0.95.3" resolved "https://registry.yarnpkg.com/@graphql-mesh/http/-/http-0.95.3.tgz#59b1e332049f2cf6f1052396f910f9aa12aca4a1" @@ -1013,6 +1085,25 @@ graphql-compose "9.0.10" json-machete "0.94.5" +"@graphql-mesh/json-schema@0.94.9-alpha-20230726100518-2fdb88ed0": + version "0.94.9-alpha-20230726100518-2fdb88ed0" + resolved "https://registry.yarnpkg.com/@graphql-mesh/json-schema/-/json-schema-0.94.9-alpha-20230726100518-2fdb88ed0.tgz#45d0de65b07ded90457743149244b151a1c09487" + integrity sha512-tDHuU8KTBzsdZmmF+iA8L8Ckj5gZnHgpxC1bZmsepg85PzQwzNtlqD+UcbWcAQ6G45TmbfDIxvd9AuT6HcmINg== + dependencies: + "@graphql-mesh/string-interpolation" "0.5.1" + "@json-schema-tools/meta-schema" "1.7.0" + "@omnigraph/json-schema" "0.94.9-alpha-20230726100518-2fdb88ed0" + graphql-compose "9.0.10" + json-machete "0.94.6-alpha-20230726100518-2fdb88ed0" + +"@graphql-mesh/merger-bare@0.94.6-alpha-20230726100518-2fdb88ed0": + version "0.94.6-alpha-20230726100518-2fdb88ed0" + resolved "https://registry.yarnpkg.com/@graphql-mesh/merger-bare/-/merger-bare-0.94.6-alpha-20230726100518-2fdb88ed0.tgz#65c6756c7e5b5a71a8822da63aae931c03ecfc79" + integrity sha512-L8S99iRvabVtXr3e/+j7qEbkhEluXA35LqBpkyiG9bFQmdF7mltoB6sVgtuFgw94aKSeRTBI8lnT7kr/61JYKw== + dependencies: + "@graphql-mesh/merger-stitching" "0.94.6-alpha-20230726100518-2fdb88ed0" + "@graphql-tools/schema" "10.0.0" + "@graphql-mesh/merger-bare@^0.94.5": version "0.94.5" resolved "https://registry.yarnpkg.com/@graphql-mesh/merger-bare/-/merger-bare-0.94.5.tgz#3567b1c272baed5ed9a5a0fd110a6f39e18c37e2" @@ -1031,6 +1122,30 @@ "@graphql-tools/stitch" "^9.0.0" "@graphql-tools/stitching-directives" "^3.0.0" +"@graphql-mesh/merger-stitching@0.94.6-alpha-20230726100518-2fdb88ed0": + version "0.94.6-alpha-20230726100518-2fdb88ed0" + resolved "https://registry.yarnpkg.com/@graphql-mesh/merger-stitching/-/merger-stitching-0.94.6-alpha-20230726100518-2fdb88ed0.tgz#f97f805d31cd2f6604add1435467a9856a6d3253" + integrity sha512-+Vchs8JiIj4ADIPpuLC+Lp2o+JJuXc5D5WS3t9XUe9eGLip+8qqDp0WGgX6I+IKcZrFBYAdpzQKy6hbG3PPgMw== + dependencies: + "@graphql-tools/delegate" "^10.0.0" + "@graphql-tools/schema" "^10.0.0" + "@graphql-tools/stitch" "^9.0.0" + "@graphql-tools/stitching-directives" "^3.0.0" + +"@graphql-mesh/runtime@0.95.4-alpha-20230726100518-2fdb88ed0": + version "0.95.4-alpha-20230726100518-2fdb88ed0" + resolved "https://registry.yarnpkg.com/@graphql-mesh/runtime/-/runtime-0.95.4-alpha-20230726100518-2fdb88ed0.tgz#9ee6e16dd3b4fa0bd4b966cd302ac2ad4d963bad" + integrity sha512-U249V4hV29pyUZG8SslMCxN/6xs00I25zIirZBXNi6NpJQASR2yex93HoYQr+N3gg7002D8ZEpcYkmpOprw9jw== + dependencies: + "@envelop/core" "^4.0.0" + "@envelop/extended-validation" "^3.0.0" + "@graphql-mesh/string-interpolation" "^0.5.1" + "@graphql-tools/batch-delegate" "^9.0.0" + "@graphql-tools/batch-execute" "^9.0.0" + "@graphql-tools/delegate" "^10.0.0" + "@graphql-tools/wrap" "^10.0.0" + "@whatwg-node/fetch" "^0.9.0" + "@graphql-mesh/runtime@^0.95.3": version "0.95.3" resolved "https://registry.yarnpkg.com/@graphql-mesh/runtime/-/runtime-0.95.3.tgz#9a509cd2c631be982cbd90b3516c884010a0d722" @@ -1045,6 +1160,13 @@ "@graphql-tools/wrap" "^10.0.0" "@whatwg-node/fetch" "^0.9.0" +"@graphql-mesh/store@0.94.6-alpha-20230726100518-2fdb88ed0": + version "0.94.6-alpha-20230726100518-2fdb88ed0" + resolved "https://registry.yarnpkg.com/@graphql-mesh/store/-/store-0.94.6-alpha-20230726100518-2fdb88ed0.tgz#61055fc254b9eec3903ea6f39fb9196a04b8bbec" + integrity sha512-KtxE6b5bByx5muJOdVAj/OuDuaNSV4C3RAmzRJoV18q61Lty+JRYQNhRByZUm8yBs/UTYR8UnezMyf0VrAY3TQ== + dependencies: + "@graphql-inspector/core" "5.0.1" + "@graphql-mesh/store@^0.94.5": version "0.94.5" resolved "https://registry.yarnpkg.com/@graphql-mesh/store/-/store-0.94.5.tgz#95fb0dec938302f9604893fff3721b3392d38909" @@ -1069,6 +1191,23 @@ "@graphql-tools/resolvers-composition" "^7.0.0" "@graphql-tools/schema" "^10.0.0" +"@graphql-mesh/transform-resolvers-composition@0.94.6-alpha-20230726100518-2fdb88ed0": + version "0.94.6-alpha-20230726100518-2fdb88ed0" + resolved "https://registry.yarnpkg.com/@graphql-mesh/transform-resolvers-composition/-/transform-resolvers-composition-0.94.6-alpha-20230726100518-2fdb88ed0.tgz#be46ffec12dcc65314ae8de90f6ed5605a7bcfb5" + integrity sha512-nx+FsX8MLHDQ/ttuJhXTWfEbwOTigvVSmcenTkiWCwbj6K0vTkpIVTJ8GhmMB9qHTZ9Irb88Up7/vOQNvFAgkA== + dependencies: + "@graphql-tools/resolvers-composition" "^7.0.0" + "@graphql-tools/schema" "^10.0.0" + +"@graphql-mesh/types@0.94.6-alpha-20230726100518-2fdb88ed0": + version "0.94.6-alpha-20230726100518-2fdb88ed0" + resolved "https://registry.yarnpkg.com/@graphql-mesh/types/-/types-0.94.6-alpha-20230726100518-2fdb88ed0.tgz#63d21bfec35e5c86058a06476321e4959cbff7cb" + integrity sha512-eTlATOI3TAQOijcc45pSFlZhKezr8kRjsPyi2Ri7nZOHaO7ceb7M62jrRTci7OJ8Nih4vBQiY8lPgvUUbWWd4A== + dependencies: + "@graphql-tools/batch-delegate" "^9.0.0" + "@graphql-tools/delegate" "^10.0.0" + "@graphql-typed-document-node/core" "^3.2.0" + "@graphql-mesh/types@^0.94.5": version "0.94.5" resolved "https://registry.yarnpkg.com/@graphql-mesh/types/-/types-0.94.5.tgz#43b9742a14dacc472ff7958c63b489723a93cc22" @@ -1078,6 +1217,19 @@ "@graphql-tools/delegate" "^10.0.0" "@graphql-typed-document-node/core" "^3.2.0" +"@graphql-mesh/utils@0.94.6-alpha-20230726100518-2fdb88ed0": + version "0.94.6-alpha-20230726100518-2fdb88ed0" + resolved "https://registry.yarnpkg.com/@graphql-mesh/utils/-/utils-0.94.6-alpha-20230726100518-2fdb88ed0.tgz#9a6d01802273b5d9a99475b54dd1092934f4ed1c" + integrity sha512-TbCz98RyhXUA97SHoCiFTvHZtWeCFx1tAUUKEjPCe9Lp0cn6A9jdCS/bXpDAZLzuNZYQgICdfFDH/URMz4z4xA== + dependencies: + "@graphql-mesh/string-interpolation" "^0.5.1" + "@graphql-tools/delegate" "^10.0.0" + dset "^3.1.2" + js-yaml "^4.1.0" + lodash.get "^4.4.2" + lodash.topath "^4.5.2" + tiny-lru "^11.0.0" + "@graphql-mesh/utils@^0.94.5": version "0.94.5" resolved "https://registry.yarnpkg.com/@graphql-mesh/utils/-/utils-0.94.5.tgz#a291549c33ba4d632847eed4e7b0c8be21649193" @@ -1522,6 +1674,25 @@ to-json-schema "0.2.5" url-join "4.0.1" +"@omnigraph/json-schema@0.94.9-alpha-20230726100518-2fdb88ed0": + version "0.94.9-alpha-20230726100518-2fdb88ed0" + resolved "https://registry.yarnpkg.com/@omnigraph/json-schema/-/json-schema-0.94.9-alpha-20230726100518-2fdb88ed0.tgz#aa4826694d6269efaad3140856a311160e2b49ec" + integrity sha512-nAlOhqIql6ybMZqXEOQyyfy/KHUjrfOh/iVnvAdlVl+EXSd6tHOFtyxUXInYDdN1pxJzSaImQh5P3nOVDn5qqg== + dependencies: + "@graphql-mesh/string-interpolation" "0.5.1" + "@json-schema-tools/meta-schema" "1.7.0" + "@whatwg-node/fetch" "^0.9.0" + ajv "8.12.0" + ajv-formats "2.1.1" + dset "3.1.2" + graphql-compose "9.0.10" + graphql-scalars "^1.22.2" + json-machete "0.94.6-alpha-20230726100518-2fdb88ed0" + pascal-case "3.1.2" + qs "6.11.2" + to-json-schema "0.2.5" + url-join "4.0.1" + "@pkgjs/parseargs@^0.11.0": version "0.11.0" resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" @@ -4475,6 +4646,17 @@ json-machete@0.94.5: to-json-schema "0.2.5" url-join "4.0.1" +json-machete@0.94.6-alpha-20230726100518-2fdb88ed0: + version "0.94.6-alpha-20230726100518-2fdb88ed0" + resolved "https://registry.yarnpkg.com/json-machete/-/json-machete-0.94.6-alpha-20230726100518-2fdb88ed0.tgz#bb49dde99ca65d6d2b0bab8d731f137b068ac106" + integrity sha512-CrlXh7fe7U1R+3Q8+C3cv2DWZSkuokLija/Zd1ojyVWmQ4b/V2SEUG08CZvpOUP7EKdf4oOr9Tvc4vqrd4yzAw== + dependencies: + "@json-schema-tools/meta-schema" "1.7.0" + "@whatwg-node/fetch" "^0.9.0" + json-pointer "0.6.2" + to-json-schema "0.2.5" + url-join "4.0.1" + json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" @@ -7024,7 +7206,7 @@ typescript@5.1.6, typescript@^5.0.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.6.tgz#02f8ac202b6dad2c0dd5e0913745b47a37998274" integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA== -uWebSockets.js@uNetworking/uWebSockets.js#v20.30.0: +"uWebSockets.js@github:uNetworking/uWebSockets.js#v20.30.0", uWebSockets.js@uNetworking/uWebSockets.js#v20.30.0: version "20.30.0" resolved "https://codeload.github.com/uNetworking/uWebSockets.js/tar.gz/d39d4181daf5b670d44cbc1b18f8c28c85fd4142" From d1f3c0f20d177169b5ca4579cf81387437e89b51 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 26 Jul 2023 11:14:24 +0000 Subject: [PATCH 2/3] chore(dependencies): updated changesets for modified dependencies --- ...unter-toolkit_green-invoice-graphql-159-dependencies.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changeset/@accounter-toolkit_green-invoice-graphql-159-dependencies.md diff --git a/.changeset/@accounter-toolkit_green-invoice-graphql-159-dependencies.md b/.changeset/@accounter-toolkit_green-invoice-graphql-159-dependencies.md new file mode 100644 index 00000000..2232d9d3 --- /dev/null +++ b/.changeset/@accounter-toolkit_green-invoice-graphql-159-dependencies.md @@ -0,0 +1,7 @@ +--- +"@accounter-toolkit/green-invoice-graphql": patch +--- +dependencies updates: + - Updated dependency [`@graphql-mesh/cli@0.85.6-alpha-20230726100518-2fdb88ed0` ↗︎](https://www.npmjs.com/package/@graphql-mesh/cli/v/0.85.6) (from `0.85.5`, in `dependencies`) + - Updated dependency [`@graphql-mesh/json-schema@0.94.9-alpha-20230726100518-2fdb88ed0` ↗︎](https://www.npmjs.com/package/@graphql-mesh/json-schema/v/0.94.9) (from `0.94.8`, in `dependencies`) + - Updated dependency [`@graphql-mesh/transform-resolvers-composition@0.94.6-alpha-20230726100518-2fdb88ed0` ↗︎](https://www.npmjs.com/package/@graphql-mesh/transform-resolvers-composition/v/0.94.6) (from `0.94.5`, in `dependencies`) From 56e0ba8417bf7efa51dff619135ab05f85b93d9c Mon Sep 17 00:00:00 2001 From: gilgardosh Date: Wed, 26 Jul 2023 14:15:48 +0300 Subject: [PATCH 3/3] changeset --- .changeset/tiny-tomatoes-prove.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/tiny-tomatoes-prove.md diff --git a/.changeset/tiny-tomatoes-prove.md b/.changeset/tiny-tomatoes-prove.md new file mode 100644 index 00000000..a7b0f2b8 --- /dev/null +++ b/.changeset/tiny-tomatoes-prove.md @@ -0,0 +1,5 @@ +--- +'@accounter-toolkit/green-invoice-graphql': patch +--- + +Fix Mesh enums 0-value bug