Skip to content
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

Jump to bottom

fix: allow setType on binding patterns #1380

Merged
merged 2 commits into from
Mar 16, 2023
Merged

fix: allow setType on binding patterns #1380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
819a4a7
fix: allow setType on object bindind patterns
jquense Jan 9, 2023
c9d52a4
Revert unrelated changes.
dsherret Mar 16, 2023
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: 2 additions & 1 deletion deno/ts_morph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10081,7 +10081,8 @@ function TypedNode(Base) {
});
return this;
function getInsertPosWhenNoType(node) {
const identifier = node.getFirstChildByKindOrThrow(SyntaxKind.Identifier);
var _a;
let identifier = (_a = node.getFirstChildByKind(SyntaxKind.Identifier)) !== null && _a !== void 0 ? _a : node.getFirstChildIfKindOrThrow(SyntaxKind.ObjectBindingPattern, "A first child of the kind Identifier or ObjectBindingPattern was expected.");
const nextSibling = identifier.getNextSibling();
const insertAfterNode = isQuestionOrExclamation(nextSibling) ? nextSibling : identifier;
return insertAfterNode.getEnd();
Expand Down
8 changes: 7 additions & 1 deletion packages/ts-morph/src/compiler/ast/base/TypedNode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,13 @@ export function TypedNode<T extends Constructor<TypedNodeExtensionType>>(Base: T
return this;

function getInsertPosWhenNoType(node: Node) {
const identifier = node.getFirstChildByKindOrThrow(SyntaxKind.Identifier);
let identifier = node.getFirstChildByKind(SyntaxKind.Identifier) ?? node.getFirstChildByKind(
SyntaxKind.ArrayBindingPattern,
) ?? node.getFirstChildIfKindOrThrow(
SyntaxKind.ObjectBindingPattern,
"A first child of the kind Identifier, ArrayBindingPattern, or ObjectBindingPattern was expected.",
);

const nextSibling = identifier.getNextSibling();
const insertAfterNode = isQuestionOrExclamation(nextSibling) ? nextSibling : identifier;

Expand Down
8 changes: 8 additions & 0 deletions packages/ts-morph/src/tests/compiler/ast/base/typedNodeTests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,14 @@ describe("TypedNode", () => {
doTest(`function Identifier(param, param2) {}`, "number", `function Identifier(param: number, param2) {}`);
});

it("should set with object binding pattern", () => {
doTest(`function Identifier({ foo }) {}`, "Record<string, any>", `function Identifier({ foo }: Record<string, any>) {}`);
});

it("should set with array binding pattern", () => {
doTest(`function Identifier([foo]) {}`, "number[]", `function Identifier([foo]: number[]) {}`);
});

it("should set when explicit", () => {
doTest(`function Identifier(param: string) {}`, "number", `function Identifier(param: number) {}`);
});
Expand Down