refactor: use ModifyTypeOfProperty of @nidomiro/ts-type-utils

nidomiro · Nov 7, 2022 · fa8d16a · fa8d16a
1 parent ab21100
commit fa8d16a
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,13 +11,14 @@
 		"@nestjs/common": "^9.0.0",
 		"@nestjs/core": "^9.0.0",
 		"@nestjs/platform-express": "^9.0.0",
+		"@nidomiro/ts-type-utils": "^0.1.1",
 		"@ory/keto-client": "^0.10.0-alpha.0",
 		"@ory/keto-grpc-client": "^0.10.0-alpha.0",
 		"assert-never": "^1.2.1",
 		"defekt": "^9.3.1",
 		"reflect-metadata": "^0.1.13",
 		"rxjs": "^7.0.0",
-		"tslib": "^2.3.0"
+		"tslib": "^2.4.1"
 	},
 	"devDependencies": {
 		"@nestjs/schematics": "^9.0.0",

diff --git a/packages/typescript/src/lib/relation-tuple-parser.ts b/packages/typescript/src/lib/relation-tuple-parser.ts
@@ -1,19 +1,19 @@
 import { defekt, error, Result, value } from 'defekt'
 import { RelationTuple, SubjectSet } from './relation-tuple'
-import { type ModifyTypeOfAttribute } from './util/type.util'
+import { ModifyTypeOfProperty } from '@nidomiro/ts-type-utils'
 
 export class RelationTupleSyntaxError extends defekt({ code: 'RelationTupleSyntaxError' }) {}
 
 const forbiddenValueCharacters = [':', '#', '@', '(', ')']
 
-type PartialRelationTuple = ModifyTypeOfAttribute<
+type PartialRelationTuple = ModifyTypeOfProperty<
 	Partial<RelationTuple>,
 	{
 		subjectIdOrSet?: Partial<RelationTuple['subjectIdOrSet']>
 	}
 >
 
-type PartialRelationTupleWithSubjectSet = ModifyTypeOfAttribute<
+type PartialRelationTupleWithSubjectSet = ModifyTypeOfProperty<
 	Partial<RelationTuple>,
 	{
 		subjectIdOrSet: Partial<SubjectSet>

diff --git a/packages/typescript/src/lib/util/type.util.ts b/packages/typescript/src/lib/util/type.util.ts