Skip to content

Downlevel Awaited #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Newbie012 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Downlevel Awaited #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions baselines/reference/ts3.4/test.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,6 @@ export declare const foo: {
};
};
export type IR = IteratorResult<number>;
export type K<T> = T extends null | undefined ? T : T extends object & {
then(onfulfilled: infer F): any;
} ? F extends ((value: infer V, ...args: any) => any) ? K<V> : never : T;
3 changes: 3 additions & 0 deletions baselines/reference/ts3.5/test.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,6 @@ export declare const foo: {
};
};
export type IR = IteratorResult<number>;
export type K<T> = T extends null | undefined ? T : T extends object & {
then(onfulfilled: infer F): any;
} ? F extends ((value: infer V, ...args: any) => any) ? K<V> : never : T;
3 changes: 3 additions & 0 deletions baselines/reference/ts3.6/test.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,6 @@ export declare const foo: {
};
};
export type IR = IteratorResult<number, string>;
export type K<T> = T extends null | undefined ? T : T extends object & {
then(onfulfilled: infer F): any;
} ? F extends ((value: infer V, ...args: any) => any) ? K<V> : never : T;
3 changes: 3 additions & 0 deletions baselines/reference/ts3.7/test.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,6 @@ export declare const foo: {
};
};
export type IR = IteratorResult<number, string>;
export type K<T> = T extends null | undefined ? T : T extends object & {
then(onfulfilled: infer F): any;
} ? F extends ((value: infer V, ...args: any) => any) ? K<V> : never : T;
3 changes: 3 additions & 0 deletions baselines/reference/ts3.8/test.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,6 @@ export declare const foo: {
};
};
export type IR = IteratorResult<number, string>;
export type K<T> = T extends null | undefined ? T : T extends object & {
then(onfulfilled: infer F): any;
} ? F extends ((value: infer V, ...args: any) => any) ? K<V> : never : T;
3 changes: 3 additions & 0 deletions baselines/reference/ts3.9/test.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,6 @@ export declare const foo: {
};
};
export type IR = IteratorResult<number, string>;
export type K<T> = T extends null | undefined ? T : T extends object & {
then(onfulfilled: infer F): any;
} ? F extends ((value: infer V, ...args: any) => any) ? K<V> : never : T;
3 changes: 3 additions & 0 deletions baselines/reference/ts4.0/test.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,6 @@ export declare const foo: {
};
};
export type IR = IteratorResult<number, string>;
export type K<T> = T extends null | undefined ? T : T extends object & {
then(onfulfilled: infer F): any;
} ? F extends ((value: infer V, ...args: any) => any) ? K<V> : never : T;
3 changes: 3 additions & 0 deletions baselines/reference/ts4.1/test.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,6 @@ export declare const foo: {
};
};
export type IR = IteratorResult<number, string>;
export type K<T> = T extends null | undefined ? T : T extends object & {
then(onfulfilled: infer F): any;
} ? F extends ((value: infer V, ...args: any) => any) ? K<V> : never : T;
3 changes: 3 additions & 0 deletions baselines/reference/ts4.2/test.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,6 @@ export declare const foo: {
};
};
export type IR = IteratorResult<number, string>;
export type K<T> = T extends null | undefined ? T : T extends object & {
then(onfulfilled: infer F): any;
} ? F extends ((value: infer V, ...args: any) => any) ? K<V> : never : T;
3 changes: 3 additions & 0 deletions baselines/reference/ts4.3/test.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,6 @@ export declare const foo: {
};
};
export type IR = IteratorResult<number, string>;
export type K<T> = T extends null | undefined ? T : T extends object & {
then(onfulfilled: infer F): any;
} ? F extends ((value: infer V, ...args: any) => any) ? K<V> : never : T;
3 changes: 3 additions & 0 deletions baselines/reference/ts4.4/test.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,6 @@ export declare const foo: {
};
};
export type IR = IteratorResult<number, string>;
export type K<T> = T extends null | undefined ? T : T extends object & {
then(onfulfilled: infer F): any;
} ? F extends ((value: infer V, ...args: any) => any) ? K<V> : never : T;
1 change: 1 addition & 0 deletions baselines/reference/ts4.5/test.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,4 @@ export declare const foo: {
};
};
export type IR = IteratorResult<number, string>;
export type K<T> = Awaited<Promise<T>>;
1 change: 1 addition & 0 deletions baselines/reference/ts4.6/test.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,4 @@ export declare const foo: {
};
};
export type IR = IteratorResult<number, string>;
export type K<T> = Awaited<Promise<T>>;
1 change: 1 addition & 0 deletions baselines/reference/ts4.7/test.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,4 @@ export declare const foo: {
};
};
export type IR = IteratorResult<number, string>;
export type K<T> = Awaited<Promise<T>>;
88 changes: 88 additions & 0 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,94 @@ function doTransform(checker, targetVersion, k) {
])
]);
}
} else if (isTypeReference(n, "Awaited") && ts.isTypeAliasDeclaration(n.parent)) {
const symbol = checker.getSymbolAtLocation(ts.isTypeReferenceNode(n) ? n.typeName : n.expression);
const typeArguments = n.typeArguments;

if (semver.lt(targetVersion, "4.5.0") && isStdLibSymbol(symbol) && typeArguments) {
return ts.factory.createConditionalTypeNode(
ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("T"), undefined),
ts.factory.createUnionTypeNode([
ts.factory.createLiteralTypeNode(ts.factory.createNull()),
ts.factory.createKeywordTypeNode(ts.SyntaxKind.UndefinedKeyword)
]),
ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("T"), undefined),
ts.factory.createConditionalTypeNode(
ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("T"), undefined),
ts.factory.createIntersectionTypeNode([
ts.factory.createKeywordTypeNode(ts.SyntaxKind.ObjectKeyword),
ts.factory.createTypeLiteralNode([
ts.factory.createMethodSignature(
undefined,
ts.factory.createIdentifier("then"),
undefined,
undefined,
[
ts.factory.createParameterDeclaration(
undefined,
undefined,
undefined,
ts.factory.createIdentifier("onfulfilled"),
undefined,
ts.factory.createInferTypeNode(
ts.factory.createTypeParameterDeclaration(
undefined,
ts.factory.createIdentifier("F"),
undefined,
undefined
)
),
undefined
)
],
ts.factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)
)
])
]),
ts.factory.createConditionalTypeNode(
ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("F"), undefined),
ts.factory.createParenthesizedType(
ts.factory.createFunctionTypeNode(
undefined,
[
ts.factory.createParameterDeclaration(
undefined,
undefined,
undefined,
ts.factory.createIdentifier("value"),
undefined,
ts.factory.createInferTypeNode(
ts.factory.createTypeParameterDeclaration(
undefined,
ts.factory.createIdentifier("V"),
undefined,
undefined
)
),
undefined
),
ts.factory.createParameterDeclaration(
undefined,
undefined,
ts.factory.createToken(ts.SyntaxKind.DotDotDotToken),
ts.factory.createIdentifier("args"),
undefined,
ts.factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword),
undefined
)
],
ts.factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)
)
),
ts.factory.createTypeReferenceNode(ts.factory.createIdentifier(n.parent.name.escapedText.toString()), [
ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("V"), undefined)
]),
ts.factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword)
),
ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("T"), undefined)
)
);
}
} else if (semver.lt(targetVersion, "4.0.0") && n.kind === ts.SyntaxKind.NamedTupleMember) {
const member = /** @type {import("typescript").NamedTupleMember} */ (n);
return ts.addSyntheticLeadingComment(
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion test/test.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,6 @@ export declare const foo: {
};
};

export type IR = IteratorResult<number, string>;
export type IR = IteratorResult<number, string>;

export type K<T> = Awaited<Promise<T>>;