diff --git a/package.json b/package.json index 97d5a3a..3637d5c 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@babel/plugin-transform-runtime": "^7.23.3", "@babel/preset-env": "^7.22.14", "@babel/preset-typescript": "^7.22.11", - "@dataplan/pg": "^0.0.1-beta.14", + "@dataplan/pg": "^0.0.1-beta.22", "@tsconfig/node16": "^1.0.3", "@types/jest": "29.5.0", "@typescript-eslint/eslint-plugin": "^6.5.0", @@ -49,18 +49,18 @@ "eslint-plugin-simple-import-sort": "^10.0.0", "eslint-plugin-tsdoc": "^0.2.17", "eslint_d": "^12.2.1", - "grafast": "^0.1.1-beta.3", - "grafserv": "^0.1.1-beta.5", - "graphile-build": "^5.0.0-beta.1", - "graphile-build-pg": "^5.0.0-beta.17", - "graphile-export": "^0.0.2-beta.8", + "grafast": "^0.1.1-beta.11", + "grafserv": "^0.1.1-beta.13", + "graphile-build": "^5.0.0-beta.21", + "graphile-build-pg": "^5.0.0-beta.25", + "graphile-export": "^0.0.2-beta.16", "graphql": "16.1.0-experimental-stream-defer.6", "jest": "29.7.0", "module-from-string": "^3.3.0", "pg": "8.11.3", "pg-introspection": "^0.0.1-beta.5", - "pg-sql2": "^5.0.0-beta.4", - "postgraphile": "^5.0.0-beta.18", + "pg-sql2": "^5.0.0-beta.6", + "postgraphile": "^5.0.0-beta.26", "prettier": "2.8.7", "ts-jest": "29.1.0", "typescript": "^5.0.4" diff --git a/src/PgConnectionArgFilterAttributesPlugin.ts b/src/PgConnectionArgFilterAttributesPlugin.ts index 510d396..fc43cfb 100644 --- a/src/PgConnectionArgFilterAttributesPlugin.ts +++ b/src/PgConnectionArgFilterAttributesPlugin.ts @@ -107,7 +107,12 @@ export const PgConnectionArgFilterAttributesPlugin: GraphileConfig.Plugin = { } const $col = new PgConditionStep($where); $col.extensions.pgFilterAttribute = colSpec; - fieldArgs.apply($col); + const value = $raw.eval(); + for (const key in value) { + if (value[key] !== undefined) { + fieldArgs.apply($col, [key]); + } + } }, [ PgConditionStep, diff --git a/src/PgConnectionArgFilterLogicalOperatorsPlugin.ts b/src/PgConnectionArgFilterLogicalOperatorsPlugin.ts index a303dcb..3d9bda6 100644 --- a/src/PgConnectionArgFilterLogicalOperatorsPlugin.ts +++ b/src/PgConnectionArgFilterLogicalOperatorsPlugin.ts @@ -47,7 +47,14 @@ export const PgConnectionArgFilterLogicalOperatorsPlugin: GraphileConfig.Plugin const $and = $where.andPlan(); // No need for this more correct form, easier to read if it's flatter. // fieldArgs.apply(() => $and.andPlan()); - fieldArgs.apply($and); + const value = fieldArgs.getRaw().eval(); + for (let i = 0; i < value.length; i++) { + for (const key in value[i]) { + if (value[i][key] !== undefined) { + fieldArgs.apply($and, [i, key]); + } + } + } }, [assertAllowed] ), @@ -65,9 +72,16 @@ export const PgConnectionArgFilterLogicalOperatorsPlugin: GraphileConfig.Plugin (assertAllowed) => function ($where: PgConditionStep, fieldArgs) { assertAllowed(fieldArgs, "list"); + const value = fieldArgs.getRaw().eval(); const $or = $where.orPlan(); - // Every entry is added to the `$or`, but the entries themselves should use an `and`. - fieldArgs.apply(() => $or.andPlan()); + for (let i = 0; i < value.length; i++) { + for (const key in value[i]) { + if (value[i][key] !== undefined) { + // Every entry is added to the `$or`, but the entries themselves should use an `and`. + fieldArgs.apply(() => $or.andPlan(), [i, key]); + } + } + } }, [assertAllowed] ), @@ -87,7 +101,12 @@ export const PgConnectionArgFilterLogicalOperatorsPlugin: GraphileConfig.Plugin assertAllowed(fieldArgs, "object"); const $not = $where.notPlan(); const $and = $not.andPlan(); - fieldArgs.apply($and); + const value = fieldArgs.getRaw().eval(); + for (const key in value) { + if (value[key] !== undefined) { + fieldArgs.apply($and, [key]); + } + } }, [assertAllowed] ), diff --git a/src/PgConnectionArgFilterPlugin.ts b/src/PgConnectionArgFilterPlugin.ts index cc25f45..5a5bf9e 100644 --- a/src/PgConnectionArgFilterPlugin.ts +++ b/src/PgConnectionArgFilterPlugin.ts @@ -488,7 +488,12 @@ export const PgConnectionArgFilterPlugin: GraphileConfig.Plugin = { codec: attributeCodec, }; } - fieldArgs.apply($where); + const value = fieldArgs.getRaw().eval(); + for (const key in value) { + if (value[key] !== undefined) { + fieldArgs.apply($where, [key]); + } + } }, [assertAllowed, attributeCodec] ), @@ -508,7 +513,12 @@ export const PgConnectionArgFilterPlugin: GraphileConfig.Plugin = { codec: attributeCodec, }; } - fieldArgs.apply($where); + const value = fieldArgs.getRaw().eval(); + for (const key in value) { + if (value[key] !== undefined) { + fieldArgs.apply($where, [key]); + } + } }, [assertAllowed, attributeCodec] ), diff --git a/yarn.lock b/yarn.lock index ec99bd7..f3430f8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1015,25 +1015,25 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@dataplan/json@0.0.1-beta.14": - version "0.0.1-beta.14" - resolved "https://registry.yarnpkg.com/@dataplan/json/-/json-0.0.1-beta.14.tgz#85407de18884de98759cdbb153b185854cf0403b" - integrity sha512-dX6MbCbm8MGTVGBnLyEAJGwSjsTIt1qrI0rPB1fnrnzbAQUSPHE8yQ5Lx8qY3fPVtITBrFvbnHUY9nadGDHzVg== +"@dataplan/json@0.0.1-beta.20": + version "0.0.1-beta.20" + resolved "https://registry.yarnpkg.com/@dataplan/json/-/json-0.0.1-beta.20.tgz#ee6c49d6d639c21897280fa9e4a169b92a504226" + integrity sha512-iz8MM0mOF2gBlLOY8ZUV16VRRdO7HNJdsLAAiz+YDGJFPCObV9uYWDSKJ+IOgkm9K4S8oQuTa1AU+exJ/BK4nQ== dependencies: chalk "^4.1.2" tslib "^2.6.2" -"@dataplan/pg@0.0.1-beta.16", "@dataplan/pg@^0.0.1-beta.14": - version "0.0.1-beta.16" - resolved "https://registry.yarnpkg.com/@dataplan/pg/-/pg-0.0.1-beta.16.tgz#29edee03e942ccccf6f325daa90e31b4b3b68299" - integrity sha512-st+BtgDmvnGgOFW85EcULeKzkWm07jjka4yuHAker4sOfCOCmHfuTcTzwOO6jCRZyr783NXV6pb4yuJZ7TTN5g== +"@dataplan/pg@0.0.1-beta.22", "@dataplan/pg@^0.0.1-beta.22": + version "0.0.1-beta.22" + resolved "https://registry.yarnpkg.com/@dataplan/pg/-/pg-0.0.1-beta.22.tgz#8a998e708b8200f4c252c4b9ecc52dce614dd663" + integrity sha512-xEUnwXcIkwMF1Ck+bruNlnyTq141PwZSBvacCiXXa6g1GyUpSxIHnoclCwdVBFH8CN/pAkrJP+eOJJVb+TsubQ== dependencies: "@graphile/lru" "^5.0.0-beta.3" "@types/node" "^20.5.7" chalk "^4.1.2" debug "^4.3.4" eventemitter3 "^5.0.1" - pg-sql2 "^5.0.0-beta.5" + pg-sql2 "^5.0.0-beta.6" postgres-array "~3.0.2" postgres-range "^1.1.3" tslib "^2.6.2" @@ -2940,10 +2940,10 @@ graceful-fs@^4.2.9: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== -grafast@^0.1.1-beta.3, grafast@^0.1.1-beta.5: - version "0.1.1-beta.5" - resolved "https://registry.yarnpkg.com/grafast/-/grafast-0.1.1-beta.5.tgz#59c262811f709d690ce3fccb6f6f928ebd17d0dc" - integrity sha512-1WQPyphKg1CMKJ0t+MYoYO99VmWTDjd/SCEFTr//h5pWMeF408WDFhutdA78U5WYWojlkap8PMqGLH7aHCllzg== +grafast@^0.1.1-beta.11: + version "0.1.1-beta.11" + resolved "https://registry.yarnpkg.com/grafast/-/grafast-0.1.1-beta.11.tgz#eecadbff8864817d411f36a8323b0170b50906d0" + integrity sha512-u0kC6q6qlUPWD8FR3wDar3819noJXudi0nY5mN/D8xc5U6KgXUsAyFfgHggXuc/yf4QW4Yc7XAWlo93b4auZ2g== dependencies: "@graphile/lru" "^5.0.0-beta.3" chalk "^4.1.2" @@ -2951,20 +2951,20 @@ grafast@^0.1.1-beta.3, grafast@^0.1.1-beta.5: eventemitter3 "^5.0.1" graphql "^16.1.0-experimental-stream-defer.6" iterall "^1.3.0" - tamedevil "^0.0.0-beta.5" + tamedevil "^0.0.0-beta.7" tslib "^2.6.2" -grafserv@^0.1.1-beta.5, grafserv@^0.1.1-beta.7: - version "0.1.1-beta.7" - resolved "https://registry.yarnpkg.com/grafserv/-/grafserv-0.1.1-beta.7.tgz#08a1f3f8a4caea9acf1b66b2361f81ffa5fa5758" - integrity sha512-1dix9pFiVJ6TEAuhsbGp8gVLDC4DRaykgPaQXUgczbCCwyg3d8rODxfN/jcFg5ACoBwaEWWUKFhQhhLjfmw+lQ== +grafserv@^0.1.1-beta.13: + version "0.1.1-beta.13" + resolved "https://registry.yarnpkg.com/grafserv/-/grafserv-0.1.1-beta.13.tgz#03109e682ace17db1086cb0edeb0e37e11097e7e" + integrity sha512-ub9VJ+6Xh0Ibkmg/Mhr2MIRq9EJ3nj057GIHRDGESyJkprJR7J+evQoAyJkuMIN/I078adCSxECUsyfwCYZE3Q== dependencies: "@graphile/lru" "^5.0.0-beta.3" debug "^4.3.4" eventemitter3 "^5.0.1" - graphile-config "^0.0.1-beta.7" + graphile-config "^0.0.1-beta.9" graphql-ws "^5.14.0" - ruru "^2.0.0-beta.11" + ruru "^2.0.0-beta.13" tslib "^2.6.2" graphemer@^1.4.0: @@ -2972,39 +2972,40 @@ graphemer@^1.4.0: resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6" integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag== -graphile-build-pg@5.0.0-beta.19, graphile-build-pg@^5.0.0-beta.17: - version "5.0.0-beta.19" - resolved "https://registry.yarnpkg.com/graphile-build-pg/-/graphile-build-pg-5.0.0-beta.19.tgz#029251b039840973bb16146f1532a18dcc86d2eb" - integrity sha512-RNXX0F3S90iJNWaSMrsNXKXFysO1Jc0xkJQ3U+MaVXk9P/Ay5bNrwX8krJrXUXG5livaXUpA3+FHzqhWMWcmRw== +graphile-build-pg@5.0.0-beta.25, graphile-build-pg@^5.0.0-beta.25: + version "5.0.0-beta.25" + resolved "https://registry.yarnpkg.com/graphile-build-pg/-/graphile-build-pg-5.0.0-beta.25.tgz#c662e5e00512ff0583be2ec2c95dbefefb4285b9" + integrity sha512-YF0zx0QC30/m6Ey4x9PVHn/kvBLZ9/y3rAIevPmMx9WzOkCy1u8Xn0j75RokmlCeq+jgMw/QCGjjbSOLyAVnjQ== dependencies: "@types/node" "^20.5.7" debug "^4.3.4" - graphile-config "^0.0.1-beta.7" + graphile-config "^0.0.1-beta.9" jsonwebtoken "^9.0.2" - pg-introspection "^0.0.1-beta.6" + pg-introspection "^0.0.1-beta.8" tslib "^2.6.2" -graphile-build@5.0.0-beta.15, graphile-build@^5.0.0-beta.1: - version "5.0.0-beta.15" - resolved "https://registry.yarnpkg.com/graphile-build/-/graphile-build-5.0.0-beta.15.tgz#94b5f9a1c54a43232d9de6c271c0c1224c5e197c" - integrity sha512-n/Us9ffKTW+eiygtYGNv6poBIiiJ/P0cAWwtdA+6+ysqeWAzel72/25YBBTrc7gvM/hNK9Fz4kQ340h+bpgdUA== +graphile-build@5.0.0-beta.21, graphile-build@^5.0.0-beta.21: + version "5.0.0-beta.21" + resolved "https://registry.yarnpkg.com/graphile-build/-/graphile-build-5.0.0-beta.21.tgz#b3e81c750018b1d647a7e697682d567e0f0198f8" + integrity sha512-Lqze4uTH1/ArCfTBx7viFHa+QiIv3JqKXNwUmXt07jK+C2fehBuZR9yCnwTpFwklpZYdP1WZFHJ/NeIOVgUuPA== dependencies: "@types/node" "^20.5.7" "@types/pluralize" "^0.0.30" "@types/semver" "^7.5.1" chalk "^4.1.2" debug "^4.3.4" - graphile-config "^0.0.1-beta.7" + graphile-config "^0.0.1-beta.9" graphql "^16.1.0-experimental-stream-defer.6" lodash "^4.17.21" pluralize "^7.0.0" semver "^7.5.4" + tamedevil "^0.0.0-beta.7" tslib "^2.6.2" -graphile-config@^0.0.1-beta.7: - version "0.0.1-beta.7" - resolved "https://registry.yarnpkg.com/graphile-config/-/graphile-config-0.0.1-beta.7.tgz#5afe920a46dcd7e2db4747b42e76ca110fd4d79a" - integrity sha512-/68rW6oN3EbjNcDCTuC8rAE0WEclhdehVyt+2Br+ZpgpdETdUgFDqUjDox2sfOmIm8lN6VMLzEWv3p0nBiDXOA== +graphile-config@^0.0.1-beta.9: + version "0.0.1-beta.9" + resolved "https://registry.yarnpkg.com/graphile-config/-/graphile-config-0.0.1-beta.9.tgz#a9da192f06b7d46fa66259ef381f21415544ffa1" + integrity sha512-7vNxXZ24OAgXxDKXYi9JtgWPMuNbBL3057Yf32Ux+/rVP4+EePgySCc+NNnn0tORi8qwqVreN8bdWqGIcSwNXg== dependencies: "@types/interpret" "^1.1.1" "@types/node" "^20.5.7" @@ -3016,10 +3017,10 @@ graphile-config@^0.0.1-beta.7: tslib "^2.6.2" yargs "^17.7.2" -graphile-export@^0.0.2-beta.8: - version "0.0.2-beta.10" - resolved "https://registry.yarnpkg.com/graphile-export/-/graphile-export-0.0.2-beta.10.tgz#8c3f6eed73beb51baf8b057d57292026241685b9" - integrity sha512-DPbqrDiL3W+5gBf2rsCHoiCDMZrVVTEMw0BnmTZRbSzkI1NBmANIU3HVU/U3cL3XL/xqmhPT1bjD+at+Xt8CGw== +graphile-export@^0.0.2-beta.16: + version "0.0.2-beta.16" + resolved "https://registry.yarnpkg.com/graphile-export/-/graphile-export-0.0.2-beta.16.tgz#88dcf920e988d86edc2bb0bde00bdc1db097686b" + integrity sha512-U77RDj2uNVoW5p+6ItVpupjPqlyY+QDIAR3qssDNmAeh8qeyIxb6xZKmkhmbMnevFOFlcXiPaymlheVGcBFVCg== dependencies: "@babel/generator" "^7.22.10" "@babel/parser" "^7.22.14" @@ -3030,10 +3031,10 @@ graphile-export@^0.0.2-beta.8: prettier "^3.0.3" tslib "^2.6.2" -graphile-utils@^5.0.0-beta.19: - version "5.0.0-beta.19" - resolved "https://registry.yarnpkg.com/graphile-utils/-/graphile-utils-5.0.0-beta.19.tgz#ea774a8c3dfd1021c2265a48a4eb9cc5eade8b2c" - integrity sha512-ioHTHS2CGKn2FOUeGDsnxKmPZNTuCzBCagZD3GO3m2vpUdZjS/ao7i+aLXN3OER1o6fo5Ko/sa6NYIo5PqNXKQ== +graphile-utils@^5.0.0-beta.25: + version "5.0.0-beta.25" + resolved "https://registry.yarnpkg.com/graphile-utils/-/graphile-utils-5.0.0-beta.25.tgz#2b03aacb2dd9a803106ec3045d5806d3f5dc848c" + integrity sha512-7EXIC0nsx+iHwEjE2nH3hHer1wua7YDN42ao4BpgOYaH0edBJCysGfe5aGTbDIoKe4WWTgc4VsxE1Tr8EJmw7A== dependencies: debug "^4.3.4" json5 "^2.2.3" @@ -4217,13 +4218,20 @@ pg-int8@1.0.1: resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c" integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw== -pg-introspection@^0.0.1-beta.5, pg-introspection@^0.0.1-beta.6: +pg-introspection@^0.0.1-beta.5: version "0.0.1-beta.6" resolved "https://registry.yarnpkg.com/pg-introspection/-/pg-introspection-0.0.1-beta.6.tgz#27948b7448888ee31941df9f108291a408cf79e1" integrity sha512-yDX7luNdf8r9wN7TB7fh00NOtP9t+mScs2lL744z692LObSoCYhcd3FyHRBh5mzIMMjUuNUXjgagjHrZEOes+w== dependencies: tslib "^2.6.2" +pg-introspection@^0.0.1-beta.8: + version "0.0.1-beta.8" + resolved "https://registry.yarnpkg.com/pg-introspection/-/pg-introspection-0.0.1-beta.8.tgz#e4704f357ed29d11a63222272781b148f0162107" + integrity sha512-QdUMILnmatkBsyfESVc+H1guCjBcH8ckaOR3sgxgGs7Hick5QlERCvlvqX96W32parxofsbDqoMFMCejMJLnDQ== + dependencies: + tslib "^2.6.2" + pg-numeric@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/pg-numeric/-/pg-numeric-1.0.2.tgz#816d9a44026086ae8ae74839acd6a09b0636aa3a" @@ -4239,10 +4247,10 @@ pg-protocol@*, pg-protocol@^1.6.0: resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.6.0.tgz#4c91613c0315349363af2084608db843502f8833" integrity sha512-M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q== -pg-sql2@^5.0.0-beta.4, pg-sql2@^5.0.0-beta.5: - version "5.0.0-beta.5" - resolved "https://registry.yarnpkg.com/pg-sql2/-/pg-sql2-5.0.0-beta.5.tgz#5be8151ace9d83f36d81a21f3a2000f9a34df4d9" - integrity sha512-b1Jz8FEGFvvymcki73ZcPU7b8auOPH+GYo8M/J1LvmRjUiBmMfPRWMbCKiFO+YKeotBu+BmmqSLXrZiSs53Yzg== +pg-sql2@^5.0.0-beta.6: + version "5.0.0-beta.6" + resolved "https://registry.yarnpkg.com/pg-sql2/-/pg-sql2-5.0.0-beta.6.tgz#63e591dfc091c658734060270da9780b46af558c" + integrity sha512-h9NZ0BhXB5Nc+tbHUIg/9rhG93JACS34ITduKK/yEVamPCDiPEBxBWEEaqRPd+Fq4ZkPN+ll0BmDA24SU6aF+Q== dependencies: "@graphile/lru" "^5.0.0-beta.3" tslib "^2.6.2" @@ -4320,29 +4328,29 @@ pluralize@^7.0.0: resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow== -postgraphile@^5.0.0-beta.18: - version "5.0.0-beta.20" - resolved "https://registry.yarnpkg.com/postgraphile/-/postgraphile-5.0.0-beta.20.tgz#b43c430f8471d3135655759aade67162814b30fd" - integrity sha512-F/GYofV28O7EON7+2v5iSjTa1mYhiTq6/H8GyZtNuV9gPkGKWYBPEyUf5wbeDXDnet1zKo0g6iGNrWZm7LQO8g== +postgraphile@^5.0.0-beta.26: + version "5.0.0-beta.26" + resolved "https://registry.yarnpkg.com/postgraphile/-/postgraphile-5.0.0-beta.26.tgz#4745f51da6d73fb5546846bbee32b3a6736fdcd6" + integrity sha512-rCLLyHFCHIZENbwyXbK7lew2WbQaXTGcyY1JNiZoAzYK4Eb1KuDw2h3mcpFMGjZtrspvGwnAtSv5crV+50QSsg== dependencies: - "@dataplan/json" "0.0.1-beta.14" - "@dataplan/pg" "0.0.1-beta.16" + "@dataplan/json" "0.0.1-beta.20" + "@dataplan/pg" "0.0.1-beta.22" "@graphile/lru" "^5.0.0-beta.3" "@types/node" "^20.5.7" "@types/pg" "^8.10.2" debug "^4.3.4" - grafast "^0.1.1-beta.5" - grafserv "^0.1.1-beta.7" - graphile-build "5.0.0-beta.15" - graphile-build-pg "5.0.0-beta.19" - graphile-config "^0.0.1-beta.7" - graphile-utils "^5.0.0-beta.19" + grafast "^0.1.1-beta.11" + grafserv "^0.1.1-beta.13" + graphile-build "5.0.0-beta.21" + graphile-build-pg "5.0.0-beta.25" + graphile-config "^0.0.1-beta.9" + graphile-utils "^5.0.0-beta.25" graphql "^16.1.0-experimental-stream-defer.6" iterall "^1.3.0" jsonwebtoken "^9.0.2" pg "^8.11.3" - pg-sql2 "^5.0.0-beta.5" - tamedevil "^0.0.0-beta.5" + pg-sql2 "^5.0.0-beta.6" + tamedevil "^0.0.0-beta.7" tslib "^2.6.2" ws "^8.13.0" @@ -4567,13 +4575,13 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" -ruru@^2.0.0-beta.11: - version "2.0.0-beta.11" - resolved "https://registry.yarnpkg.com/ruru/-/ruru-2.0.0-beta.11.tgz#5e1cc7e6f1c85acdbe288abf807e84a692940627" - integrity sha512-bFyTatjNANnb2QVMi+pspRiZ0TLDKFuhKelZwfTXfa9qAuCC1VXNYL3Hk/yFzmKaqmqzOSwG7qkuIuI2MszS1w== +ruru@^2.0.0-beta.13: + version "2.0.0-beta.13" + resolved "https://registry.yarnpkg.com/ruru/-/ruru-2.0.0-beta.13.tgz#8e653143a8996d8d6369f0c71c2068a00217fd87" + integrity sha512-TFloGwn4YGsBFuFgafYaDfW3oTtT9kdc4DrbE4p1GTimlFvhmyptTHbsqSBAJhAzZKLp+eBtmfb32rjoBoj19Q== dependencies: "@emotion/is-prop-valid" "^1.2.1" - graphile-config "^0.0.1-beta.7" + graphile-config "^0.0.1-beta.9" graphql "^16.1.0-experimental-stream-defer.6" http-proxy "^1.18.1" tslib "^2.6.2" @@ -4797,10 +4805,10 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== -tamedevil@^0.0.0-beta.5: - version "0.0.0-beta.5" - resolved "https://registry.yarnpkg.com/tamedevil/-/tamedevil-0.0.0-beta.5.tgz#f395ac4f9cdbe6329bbe0ff94a65930c06dc1ed1" - integrity sha512-fvrdvGDorIaN2dGUtncRGzCT22S+5veS8p6kGLYMTNFgKnnKTPHaRrTC9mBqB8fP/X44P1UggHKyMDpN0G2Jww== +tamedevil@^0.0.0-beta.7: + version "0.0.0-beta.7" + resolved "https://registry.yarnpkg.com/tamedevil/-/tamedevil-0.0.0-beta.7.tgz#a7405b4a674fdc1abf6033860eed9f225dd05079" + integrity sha512-58Y97vtQuCC5U35aQMcTgaBMaJiSrGftkQmVsbJDgoZ2oUVMrOonom6sIpxiBH+fmpNd85MuxxRnFNyT387QRA== dependencies: "@graphile/lru" "^5.0.0-beta.3" tslib "^2.6.2"