Skip to content

Commit

Permalink
chore: update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
lbguilherme committed Oct 1, 2021
1 parent 15415b3 commit 758fb19
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 44 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/spec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 14
- run: npm i
- run: npx tsc -noEmit
- run: npm install
- run: npm test
- run: npm run eslint:check
- run: npm run prettier:check
48 changes: 21 additions & 27 deletions index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,19 @@ declare namespace AsTypedInternal {
[K in keyof Props]?: Resolve<Props[K]>;
};

type ResolveObjectAdditionalProps<
AdditionalProperties
> = unknown extends AdditionalProperties
? unknown
: AdditionalProperties extends false | undefined
? unknown
: AdditionalProperties extends true
? { [key: string]: unknown }
: { [key: string]: Resolve<AdditionalProperties> };

type ResolveObject<
Props,
RequiredPropNames,
AdditionalProperties
> = ResolveObjectRequiredProps<Props, RequiredPropNames> &
ResolveObjectOptionalProps<Props, RequiredPropNames> &
ResolveObjectAdditionalProps<AdditionalProperties>;
type ResolveObjectAdditionalProps<AdditionalProperties> =
unknown extends AdditionalProperties
? unknown
: AdditionalProperties extends false | undefined
? unknown
: AdditionalProperties extends true
? { [key: string]: unknown }
: { [key: string]: Resolve<AdditionalProperties> };

type ResolveObject<Props, RequiredPropNames, AdditionalProperties> =
ResolveObjectRequiredProps<Props, RequiredPropNames> &
ResolveObjectOptionalProps<Props, RequiredPropNames> &
ResolveObjectAdditionalProps<AdditionalProperties>;

type AsTypedTupleSchema<Tuple extends unknown[]> = Tuple extends []
? []
Expand Down Expand Up @@ -146,16 +142,14 @@ declare namespace AsTypedInternal {
? Resolve<Head> & ResolveAllOf<Tail>
: unknown;

type ResolvePath<
Schema,
Path
> = Path extends `${infer Prop}/${infer PathRest}`
? Prop extends keyof Schema
? ResolvePath<Schema[Prop], PathRest>
: never
: Path extends keyof Schema
? Schema[Path]
: never;
type ResolvePath<Schema, Path> =
Path extends `${infer Prop}/${infer PathRest}`
? Prop extends keyof Schema
? ResolvePath<Schema[Prop], PathRest>
: never
: Path extends keyof Schema
? Schema[Path]
: never;

type LocateId<Candidates, Id> = Candidates extends { $id: Id }
? Candidates
Expand Down
22 changes: 10 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
"scripts": {
"test": "tsc -noEmit",
"eslint:fix": "eslint --fix '*.ts'",
"eslint:check": "eslint '*.ts'",
"prettier:fix": "prettier --write '*.{t,j}s'",
"prettier:check": "prettier --check '*.{t,j}s'"
"eslint:check": "eslint '*.ts'"
},
"keywords": [
"typescript",
Expand All @@ -30,15 +28,15 @@
},
"homepage": "https://github.com/lbguilherme/as-typed#readme",
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^4.22.0",
"@typescript-eslint/parser": "^4.22.0",
"@typescript-eslint/typescript-estree": "^4.22.0",
"eslint": "^7.24.0",
"eslint-config-prettier": "^8.2.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-prettier": "^3.3.1",
"prettier": "^2.2.1",
"@typescript-eslint/eslint-plugin": "^4.32.0",
"@typescript-eslint/parser": "^4.32.0",
"@typescript-eslint/typescript-estree": "^4.32.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.24.2",
"eslint-plugin-prettier": "^4.0.0",
"prettier": "^2.4.1",
"spec.ts": "^1.1.3",
"typescript": "^4.2.4"
"typescript": "^4.4.3"
}
}

0 comments on commit 758fb19

Please sign in to comment.