From a5f0db8be9f018ed6c928fc8160b945d6aa1bc97 Mon Sep 17 00:00:00 2001 From: Scott Trinh Date: Tue, 19 Mar 2024 12:01:38 -0400 Subject: [PATCH] Bump to latest TypeScript to get bad perf --- integration-tests/legacy/package.json | 2 +- integration-tests/lts/bench.ts | 37 +++++++++++--------- integration-tests/lts/package.json | 2 +- integration-tests/nightly/package.json | 2 +- integration-tests/stable/package.json | 2 +- package.json | 2 +- packages/auth-core/package.json | 2 +- packages/auth-express/package.json | 2 +- packages/auth-nextjs/package.json | 8 ++--- packages/auth-remix/package.json | 2 +- packages/auth-sveltekit/package.json | 4 +-- packages/create/package.json | 2 +- packages/driver/package.json | 2 +- packages/driver/test/shared-client-testcases | 2 +- packages/generate/package.json | 2 +- yarn.lock | 24 ++++++------- 16 files changed, 51 insertions(+), 46 deletions(-) diff --git a/integration-tests/legacy/package.json b/integration-tests/legacy/package.json index 85d0c4047..7da154f35 100644 --- a/integration-tests/legacy/package.json +++ b/integration-tests/legacy/package.json @@ -16,7 +16,7 @@ "jest": "^29.5.0", "superjson": "^1.12.4", "ts-jest": "^29.1.0", - "typescript": "^5.2.2" + "typescript": "^5.4.2" }, "dependencies": {} } diff --git a/integration-tests/lts/bench.ts b/integration-tests/lts/bench.ts index 256c11f2b..063a4f864 100644 --- a/integration-tests/lts/bench.ts +++ b/integration-tests/lts/bench.ts @@ -5,51 +5,56 @@ import e from "./dbschema/edgeql-js"; bench("scalar literal", () => { const lit = e.int32(42); return {} as typeof lit; -}).types([555, "instantiations"]); +}).types([558, "instantiations"]); bench("array literal", () => { const lit = e.literal(e.array(e.str), ["abcd"]); return {} as typeof lit; -}).types([2407, "instantiations"]); +}).types([4116, "instantiations"]); bench("named tuple literal", () => { const lit = e.literal(e.tuple({ str: e.str }), { str: "asdf", }); return {} as typeof lit; -}).types([11597, "instantiations"]); +}).types([13063, "instantiations"]); + +bench("tuple literal", () => { + const lit = e.literal(e.tuple([e.str, e.int32]), ["asdf", 42]); + return {} as typeof lit; +}).types([9668, "instantiations"]); bench("base type: array", () => { const baseType = e.array(e.str); return {} as typeof baseType; -}).types([348, "instantiations"]); +}).types([351, "instantiations"]); bench("base type: named tuple", () => { const baseType = e.tuple({ str: e.str }); return {} as typeof baseType; -}).types([2160, "instantiations"]); +}).types([3545, "instantiations"]); bench("select: scalar", () => { const query = e.select(e.int32(42)); return {} as typeof query; -}).types([1155, "instantiations"]); +}).types([1177, "instantiations"]); bench("select: free object", () => { const query = e.select({ meaning: e.int32(42) }); return {} as typeof query; -}).types([2012, "instantiations"]); +}).types([2033, "instantiations"]); bench("select: id only", () => { const query = e.select(e.User, () => ({ id: true })); return {} as typeof query; -}).types([3687, "instantiations"]); +}).types([3702, "instantiations"]); bench("select: filtered", () => { const query = e.select(e.User, () => ({ filter_single: { id: e.uuid("123") }, })); return {} as typeof query; -}).types([5019, "instantiations"]); +}).types([5046, "instantiations"]); bench("select: nested", () => { const user = e.select(e.User, () => ({ @@ -58,7 +63,7 @@ bench("select: nested", () => { const query = e.select(user, () => ({ id: true })); return {} as typeof query; -}).types([6037, "instantiations"]); +}).types([6064, "instantiations"]); bench("select: complex", () => { const query = e.select(e.Movie, () => ({ @@ -70,7 +75,7 @@ bench("select: complex", () => { }), })); return {} as typeof query; -}).types([6342, "instantiations"]); +}).types([6374, "instantiations"]); bench("select: with filter", () => { const query = e.select(e.Hero, (hero) => ({ @@ -82,7 +87,7 @@ bench("select: with filter", () => { filter_single: e.op(hero.name, "=", "Peter Parker"), })); return {} as typeof query; -}).types([6289, "instantiations"]); +}).types([6447, "instantiations"]); bench("select: with order", () => { const query = e.select(e.Hero, (hero) => ({ @@ -95,7 +100,7 @@ bench("select: with order", () => { filter_single: e.op(hero.name, "=", "Peter Parker"), })); return {} as typeof query; -}).types([6624, "instantiations"]); +}).types([6786, "instantiations"]); bench("select: with limit", () => { const query = e.select(e.Hero, (hero) => ({ @@ -108,7 +113,7 @@ bench("select: with limit", () => { filter_single: e.op(hero.name, "=", "Peter Parker"), })); return {} as typeof query; -}).types([6352, "instantiations"]); +}).types([6510, "instantiations"]); bench("select: with offset", () => { const query = e.select(e.Hero, (hero) => ({ @@ -121,7 +126,7 @@ bench("select: with offset", () => { filter_single: e.op(hero.name, "=", "Peter Parker"), })); return {} as typeof query; -}).types([6391, "instantiations"]); +}).types([6553, "instantiations"]); bench("params select", () => { const query = e.params({ name: e.str }, (params) => @@ -135,4 +140,4 @@ bench("params select", () => { })) ); return {} as typeof query; -}).types([11865, "instantiations"]); +}).types([12005, "instantiations"]); diff --git a/integration-tests/lts/package.json b/integration-tests/lts/package.json index b11d5a6d4..51d29d018 100644 --- a/integration-tests/lts/package.json +++ b/integration-tests/lts/package.json @@ -24,7 +24,7 @@ "jest": "^29.5.0", "superjson": "^1.12.4", "ts-jest": "^29.1.0", - "typescript": "^5.2.2" + "typescript": "^5.4.2" }, "dependencies": {} } diff --git a/integration-tests/nightly/package.json b/integration-tests/nightly/package.json index de8ea7ad9..4961e368d 100644 --- a/integration-tests/nightly/package.json +++ b/integration-tests/nightly/package.json @@ -16,7 +16,7 @@ "jest": "^29.5.0", "superjson": "^1.12.4", "ts-jest": "^29.1.0", - "typescript": "^5.2.2" + "typescript": "^5.4.2" }, "dependencies": {} } diff --git a/integration-tests/stable/package.json b/integration-tests/stable/package.json index 59f4c8f49..8531230be 100644 --- a/integration-tests/stable/package.json +++ b/integration-tests/stable/package.json @@ -16,7 +16,7 @@ "jest": "^29.5.0", "superjson": "^1.12.4", "ts-jest": "^29.1.0", - "typescript": "^5.2.2" + "typescript": "^5.4.2" }, "dependencies": {} } diff --git a/package.json b/package.json index aa0125ae7..d676762e5 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "tslint": "^6.1.3", "tslint-config-prettier": "^1.18.0", "tslint-plugin-prettier": "^2.3.0", - "typescript": "^5.2.2" + "typescript": "^5.4.2" }, "scripts": { "lint": "tslint 'packages/*/src/**/*.ts'", diff --git a/packages/auth-core/package.json b/packages/auth-core/package.json index 71fc8be47..eb2f1412e 100644 --- a/packages/auth-core/package.json +++ b/packages/auth-core/package.json @@ -37,7 +37,7 @@ "edgedb": "^1.4.0", "jest": "29.5.0", "ts-jest": "29.1.0", - "typescript": "^5.2.2" + "typescript": "^5.4.2" }, "peerDependencies": { "edgedb": "^1.3.6" diff --git a/packages/auth-express/package.json b/packages/auth-express/package.json index b6b122295..6b2fbcf47 100644 --- a/packages/auth-express/package.json +++ b/packages/auth-express/package.json @@ -31,7 +31,7 @@ "@types/node": "^20.8.4", "edgedb": "^1.3.6", "express": "^4.18.2", - "typescript": "^5.2.2" + "typescript": "^5.4.2" }, "peerDependencies": { "cookie-parser": "^1.4.6", diff --git a/packages/auth-nextjs/package.json b/packages/auth-nextjs/package.json index 83bab2c99..28e5cda03 100644 --- a/packages/auth-nextjs/package.json +++ b/packages/auth-nextjs/package.json @@ -27,13 +27,13 @@ "@types/react": "^18.2.42", "edgedb": "^1.3.6", "next": "13.5.6", - "typescript": "^5.2.2", - "react": "^18.2.0" + "react": "^18.2.0", + "typescript": "^5.4.2" }, "peerDependencies": { "edgedb": "^1.3.6", - "react": "^18.2.0", - "next": ">=13.5.6 <15.0.0" + "next": ">=13.5.6 <15.0.0", + "react": "^18.2.0" }, "dependencies": { "@edgedb/auth-core": "0.2.0-beta.1" diff --git a/packages/auth-remix/package.json b/packages/auth-remix/package.json index 03524b07d..4403c3723 100644 --- a/packages/auth-remix/package.json +++ b/packages/auth-remix/package.json @@ -21,7 +21,7 @@ "devDependencies": { "@types/node": "^20.8.4", "edgedb": "^1.4.0", - "typescript": "^5.2.2" + "typescript": "^5.4.2" }, "peerDependencies": { "edgedb": "^1.3.6" diff --git a/packages/auth-sveltekit/package.json b/packages/auth-sveltekit/package.json index b774802cd..3bf4d081a 100644 --- a/packages/auth-sveltekit/package.json +++ b/packages/auth-sveltekit/package.json @@ -19,11 +19,11 @@ "build": "tsc --project tsconfig.json" }, "devDependencies": { + "@sveltejs/kit": "^2.0.0", "@types/node": "^20.8.4", "edgedb": "^1.3.6", - "typescript": "^5.2.2", "svelte": "^4.2.7", - "@sveltejs/kit": "^2.0.0", + "typescript": "^5.4.2", "vite": "^5.0.3" }, "peerDependencies": { diff --git a/packages/create/package.json b/packages/create/package.json index 3c63a8fe3..71746d385 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -23,7 +23,7 @@ "@types/debug": "^4.1.12", "@types/node": "^20.10.4", "tsx": "^4.6.2", - "typescript": "^5.2.2" + "typescript": "^5.4.2" }, "dependencies": { "@clack/prompts": "^0.7.0", diff --git a/packages/driver/package.json b/packages/driver/package.json index a3400eec3..b381c6e6d 100644 --- a/packages/driver/package.json +++ b/packages/driver/package.json @@ -34,7 +34,7 @@ "jest-environment-jsdom": "^29.5.0", "ts-jest": "29.1.0", "tsx": "^3.12.7", - "typescript": "^5.2.2" + "typescript": "^5.4.2" }, "scripts": { "typecheck": "tsc --project tsconfig.json --noEmit", diff --git a/packages/driver/test/shared-client-testcases b/packages/driver/test/shared-client-testcases index b260ad9b3..0e0ae1c31 160000 --- a/packages/driver/test/shared-client-testcases +++ b/packages/driver/test/shared-client-testcases @@ -1 +1 @@ -Subproject commit b260ad9b3fd0ddb6d4bc9174477fe8ad14220af3 +Subproject commit 0e0ae1c31b3aa04104b344d200967b5ddad66605 diff --git a/packages/generate/package.json b/packages/generate/package.json index f6bd8deb9..eb697f06a 100644 --- a/packages/generate/package.json +++ b/packages/generate/package.json @@ -31,7 +31,7 @@ "jest": "^29.5.0", "superjson": "^1.12.4", "ts-jest": "^29.1.0", - "typescript": "^5.2.2" + "typescript": "^5.4.2" }, "dependencies": {}, "scripts": { diff --git a/yarn.lock b/yarn.lock index 2ac0b0257..6753d9ca5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1157,12 +1157,12 @@ "@next/env@13.5.6": version "13.5.6" - resolved "https://registry.npmjs.org/@next/env/-/env-13.5.6.tgz" + resolved "https://registry.yarnpkg.com/@next/env/-/env-13.5.6.tgz#c1148e2e1aa166614f05161ee8f77ded467062bc" integrity sha512-Yac/bV5sBGkkEXmAX5FWPS9Mmo2rthrOPRQQNfycJPkjUAUclomCPH7QFVCDQ4Mp2k2K1SSM6m0zrxYrOwtFQw== "@next/swc-darwin-arm64@13.5.6": version "13.5.6" - resolved "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.6.tgz" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.6.tgz#b15d139d8971360fca29be3bdd703c108c9a45fb" integrity sha512-5nvXMzKtZfvcu4BhtV0KH1oGv4XEW+B+jOfmBdpFI3C7FrB/MfujRpWYSBBO64+qbW8pkZiSyQv9eiwnn5VIQA== "@next/swc-darwin-x64@13.5.6": @@ -2036,9 +2036,9 @@ camelcase@^6.2.0: integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== caniuse-lite@^1.0.30001406: - version "1.0.30001554" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001554.tgz" - integrity sha512-A2E3U//MBwbJVzebddm1YfNp7Nud5Ip+IPn4BozBmn4KqVX7AvluoIDFWjsv5OkGnKUXQVmMSoMKLa3ScCblcQ== + version "1.0.30001597" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001597.tgz#8be94a8c1d679de23b22fbd944232aa1321639e6" + integrity sha512-7LjJvmQU6Sj7bL0j5b5WY/3n7utXUJvAe1lxhsHDbLmwX9mdL86Yjtr+5SRCyf8qME4M7pU2hswj0FpyBVCv9w== caniuse-lite@^1.0.30001449: version "1.0.30001481" @@ -2982,7 +2982,7 @@ glob-parent@^6.0.2: glob-to-regexp@^0.4.1: version "0.4.1" - resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== glob@^7.1.1, glob@^7.1.3, glob@^7.1.4: @@ -4078,7 +4078,7 @@ negotiator@0.6.3: next@13.5.6: version "13.5.6" - resolved "https://registry.npmjs.org/next/-/next-13.5.6.tgz" + resolved "https://registry.yarnpkg.com/next/-/next-13.5.6.tgz#e964b5853272236c37ce0dd2c68302973cf010b1" integrity sha512-Y2wTcTbO4WwEsVb4A8VSnOsG1I9ok+h74q0ZdxkwM3EODqrs4pasq7O0iUxbcS9VtWMicG7f3+HAj0r1+NtKSw== dependencies: "@next/env" "13.5.6" @@ -5110,10 +5110,10 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -typescript@^5.2.2: - version "5.2.2" - resolved "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz" - integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w== +typescript@^5.4.2: + version "5.4.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.2.tgz#0ae9cebcfae970718474fe0da2c090cad6577372" + integrity sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ== undici-types@~5.26.4: version "5.26.5" @@ -5217,7 +5217,7 @@ walker@^1.0.8: watchpack@2.4.0: version "2.4.0" - resolved "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg== dependencies: glob-to-regexp "^0.4.1"