diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 948dd834d8..498f61ef2f 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -107,9 +107,6 @@ importers: prettier: specifier: ^3.1.0 version: 3.6.2 - simplytyped: - specifier: ^3.3.0 - version: 3.3.0(typescript@5.9.3) ts-jest: specifier: ^29.1.1 version: 29.4.4(@babel/core@7.28.4)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.28.4))(esbuild@0.25.10)(jest-util@29.7.0)(jest@29.7.0(@types/node@22.18.8)(ts-node@10.9.2(@types/node@22.18.8)(typescript@5.9.3)))(typescript@5.9.3) @@ -171,9 +168,6 @@ importers: prettier: specifier: ^3.1.0 version: 3.6.2 - simplytyped: - specifier: ^3.3.0 - version: 3.3.0(typescript@5.9.3) ts-jest: specifier: ^29.1.1 version: 29.4.4(@babel/core@7.28.4)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.28.4))(esbuild@0.25.10)(jest-util@29.7.0)(jest@29.7.0(@types/node@22.18.8)(ts-node@10.9.2(@types/node@22.18.8)(typescript@5.9.3)))(typescript@5.9.3) @@ -253,9 +247,6 @@ importers: prettier: specifier: ^3.1.0 version: 3.6.2 - simplytyped: - specifier: ^3.3.0 - version: 3.3.0(typescript@5.9.3) ts-jest: specifier: ^29.1.1 version: 29.4.4(@babel/core@7.28.4)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.28.4))(esbuild@0.25.10)(jest-util@29.7.0)(jest@29.7.0(@types/node@22.18.8)(ts-node@10.9.2(@types/node@22.18.8)(typescript@5.9.3)))(typescript@5.9.3) @@ -489,9 +480,6 @@ importers: prettier: specifier: ^3.1.0 version: 3.6.2 - simplytyped: - specifier: ^3.3.0 - version: 3.3.0(typescript@5.9.3) ts-jest: specifier: ^29.1.1 version: 29.4.4(@babel/core@7.28.4)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.28.4))(esbuild@0.25.10)(jest-util@29.7.0)(jest@29.7.0(@types/node@22.18.8)(ts-node@10.9.2(@types/node@22.18.8)(typescript@5.9.3)))(typescript@5.9.3) @@ -724,9 +712,6 @@ importers: prettier: specifier: ^3.1.0 version: 3.6.2 - simplytyped: - specifier: ^3.3.0 - version: 3.3.0(typescript@5.9.3) ts-jest: specifier: ^29.1.1 version: 29.4.4(@babel/core@7.28.4)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.28.4))(esbuild@0.25.10)(jest-util@29.7.0)(jest@29.7.0(@types/node@22.18.8)(ts-node@10.9.2(@types/node@22.18.8)(typescript@5.9.3)))(typescript@5.9.3) @@ -931,9 +916,6 @@ importers: prettier: specifier: ^3.1.0 version: 3.6.2 - simplytyped: - specifier: ^3.3.0 - version: 3.3.0(typescript@5.9.3) ts-jest: specifier: ^29.1.1 version: 29.4.4(@babel/core@7.28.4)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.28.4))(esbuild@0.25.10)(jest-util@29.7.0)(jest@29.7.0(@types/node@22.18.8)(ts-node@10.9.2(@types/node@22.18.8)(typescript@5.9.3)))(typescript@5.9.3) @@ -4833,11 +4815,6 @@ packages: signal-exit@3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} - simplytyped@3.3.0: - resolution: {integrity: sha512-mz4RaNdKTZiaKXgi6P1k/cdsxV3gz+y1Wh2NXHWD40dExktLh4Xx/h6MFakmQWODZHj/2rKe59acacpL74ZhQA==} - peerDependencies: - typescript: '>=2.8.0' - sisteransi@1.0.5: resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} @@ -9438,10 +9415,6 @@ snapshots: signal-exit@3.0.7: {} - simplytyped@3.3.0(typescript@5.9.3): - dependencies: - typescript: 5.9.3 - sisteransi@1.0.5: {} slash@3.0.0: {} diff --git a/packages/analytics-service/package.json b/packages/analytics-service/package.json index cee54cf61c..c23bad45fa 100644 --- a/packages/analytics-service/package.json +++ b/packages/analytics-service/package.json @@ -30,7 +30,6 @@ "eslint-plugin-promise": "^6.1.1", "eslint-plugin-n": "^15.4.0", "eslint": "^8.54.0", - "simplytyped": "^3.3.0", "@typescript-eslint/parser": "^6.11.0", "eslint-config-standard-with-typescript": "^40.0.0", "prettier": "^3.1.0", diff --git a/packages/analytics/package.json b/packages/analytics/package.json index eaab31c266..f33be9077f 100644 --- a/packages/analytics/package.json +++ b/packages/analytics/package.json @@ -30,7 +30,6 @@ "eslint-plugin-promise": "^6.1.1", "eslint-plugin-n": "^15.4.0", "eslint": "^8.54.0", - "simplytyped": "^3.3.0", "@typescript-eslint/parser": "^6.11.0", "eslint-config-standard-with-typescript": "^40.0.0", "prettier": "^3.1.0", diff --git a/packages/api-client/package.json b/packages/api-client/package.json index 02975b8d45..0101f5035e 100644 --- a/packages/api-client/package.json +++ b/packages/api-client/package.json @@ -38,7 +38,6 @@ "eslint-plugin-promise": "^6.1.1", "eslint-plugin-n": "^15.4.0", "eslint": "^8.54.0", - "simplytyped": "^3.3.0", "@typescript-eslint/parser": "^6.11.0", "eslint-config-standard-with-typescript": "^40.0.0", "prettier": "^3.1.0", diff --git a/packages/core/package.json b/packages/core/package.json index dc83714070..7147740fd7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -34,7 +34,6 @@ "eslint-plugin-promise": "^6.1.1", "eslint-plugin-n": "^15.4.0", "eslint": "^8.54.0", - "simplytyped": "^3.3.0", "@typescript-eslint/parser": "^6.11.0", "eslint-config-standard-with-typescript": "^40.0.0", "prettier": "^3.1.0", diff --git a/packages/core/src/storage.ts b/packages/core/src/storage.ts index b66cf9c88f..a97a84b076 100644 --- a/packages/core/src/storage.ts +++ b/packages/core/src/storage.ts @@ -15,9 +15,9 @@ import type { Asset, Resource } from '@hcengineering/platform' -import type { KeysByType } from 'simplytyped' import type { Association, AttachedDoc, Class, Doc, Domain, Ref, Space } from './classes' import type { Tx } from './tx' +import type { KeysByType } from './utils' export type ArraySizeSelector = | { diff --git a/packages/core/src/tx.ts b/packages/core/src/tx.ts index 46a8c64d3b..af3cea4f17 100644 --- a/packages/core/src/tx.ts +++ b/packages/core/src/tx.ts @@ -13,7 +13,6 @@ // limitations under the License. // -import type { KeysByType } from 'simplytyped' import type { Arr, AttachedDoc, @@ -35,7 +34,7 @@ import { setObjectValue } from './objvalue' import { _getOperator } from './operator' import { _toDoc } from './proxy' import type { DocumentQuery, TxResult } from './storage' -import { generateId } from './utils' +import { generateId, type KeysByType } from './utils' /** * @public diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts index cf7d2debfa..344a3e32ce 100644 --- a/packages/core/src/utils.ts +++ b/packages/core/src/utils.ts @@ -998,3 +998,5 @@ export interface PermissionsGrant { spaces?: Ref[] grantedBy?: AccountUuid } + +export type KeysByType = { [k in keyof O]-?: O[k] extends T ? k : never; }[keyof O] diff --git a/packages/query/package.json b/packages/query/package.json index f04a13c65c..95aed20761 100644 --- a/packages/query/package.json +++ b/packages/query/package.json @@ -30,7 +30,6 @@ "eslint-plugin-promise": "^6.1.1", "eslint-plugin-n": "^15.4.0", "eslint": "^8.54.0", - "simplytyped": "^3.3.0", "@typescript-eslint/parser": "^6.11.0", "eslint-config-standard-with-typescript": "^40.0.0", "prettier": "^3.1.0", diff --git a/packages/storage/package.json b/packages/storage/package.json index 98224c4eb8..cb14cdb0ad 100644 --- a/packages/storage/package.json +++ b/packages/storage/package.json @@ -24,7 +24,6 @@ "eslint-plugin-promise": "^6.1.1", "eslint-plugin-n": "^15.4.0", "eslint": "^8.54.0", - "simplytyped": "^3.3.0", "@typescript-eslint/parser": "^6.11.0", "eslint-config-standard-with-typescript": "^40.0.0", "prettier": "^3.1.0",