FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix crash on malformed object destructuring assignment in decorated class by Andarist · Pull Request #64472 · microsoft/TypeScript · GitHub

Repository navigation

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .go  (1) .js  (1) .symbols  (1) .ts  (1) .txt  (1) .types  (1) All 6 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -2261,7 +2261,6 @@ func (tx *esDecoratorTransformer) visitAssignmentRestProperty(node *ast.Node) *a
}

func (tx *esDecoratorTransformer) visitObjectAssignmentElement(node *ast.Node) *ast.Node {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Yes, removing an assert without an explanation is dubious.

debug.Assert(ast.IsObjectBindingOrAssignmentElement(node))
if ast.IsSpreadAssignment(node) {
return tx.visitAssignmentRestProperty(node)
}
Expand Down
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
malformedObjectDestructuringAssignmentESDecorators.ts(6,12): error TS1136: Property assignment expected.
malformedObjectDestructuringAssignmentESDecorators.ts(6,24): error TS1136: Property assignment expected.
malformedObjectDestructuringAssignmentESDecorators.ts(6,47): error TS1136: Property assignment expected.


==== malformedObjectDestructuringAssignmentESDecorators.ts (3 errors) ====
declare function dec(...args: any[]): any;

@dec
class C {
static {
({ m() {}, get g() { return 1; }, set s(v) {} } = this);
~
!!! error TS1136: Property assignment expected.
~
!!! error TS1136: Property assignment expected.
~
!!! error TS1136: Property assignment expected.
}
}

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
//// [tests/cases/compiler/malformedObjectDestructuringAssignmentESDecorators.ts] ////

//// [malformedObjectDestructuringAssignmentESDecorators.ts]
declare function dec(...args: any[]): any;

@dec
class C {
static {
({ m() {}, get g() { return 1; }, set s(v) {} } = this);
}
}


//// [malformedObjectDestructuringAssignmentESDecorators.js]
"use strict";
var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
var _, done = false;
for (var i = decorators.length - 1; i >= 0; i--) {
var context = {};
for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
for (var p in contextIn.access) context.access[p] = contextIn.access[p];
context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
if (kind === "accessor") {
if (result === void 0) continue;
if (result === null || typeof result !== "object") throw new TypeError("Object expected");
if (_ = accept(result.get)) descriptor.get = _;
if (_ = accept(result.set)) descriptor.set = _;
if (_ = accept(result.init)) initializers.unshift(_);
}
else if (_ = accept(result)) {
if (kind === "field") initializers.unshift(_);
else descriptor[key] = _;
}
}
if (target) Object.defineProperty(target, contextIn.name, descriptor);
done = true;
};
var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
var useValue = arguments.length > 2;
for (var i = 0; i < initializers.length; i++) {
value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
}
return useValue ? value : void 0;
};
let C = (() => {
let _classDecorators = [dec];
let _classDescriptor;
let _classExtraInitializers = [];
let _classThis;
var C = class {
static { _classThis = this; }
static {
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
C = _classThis = _classDescriptor.value;
if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
}
static {
({ m() { }, get g() { return 1; }, set s(v) { } } = _classThis);
}
static {
__runInitializers(_classThis, _classExtraInitializers);
}
};
return C = _classThis;
})();
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//// [tests/cases/compiler/malformedObjectDestructuringAssignmentESDecorators.ts] ////

=== malformedObjectDestructuringAssignmentESDecorators.ts ===
declare function dec(...args: any[]): any;
>dec : Symbol(dec, Decl(malformedObjectDestructuringAssignmentESDecorators.ts, 0, 0))
>args : Symbol(args, Decl(malformedObjectDestructuringAssignmentESDecorators.ts, 0, 21))

@dec
>dec : Symbol(dec, Decl(malformedObjectDestructuringAssignmentESDecorators.ts, 0, 0))

class C {
>C : Symbol(C, Decl(malformedObjectDestructuringAssignmentESDecorators.ts, 0, 42))

static {
({ m() {}, get g() { return 1; }, set s(v) {} } = this);
>m : Symbol(m, Decl(malformedObjectDestructuringAssignmentESDecorators.ts, 5, 10))
>g : Symbol(g, Decl(malformedObjectDestructuringAssignmentESDecorators.ts, 5, 18))
>s : Symbol(s, Decl(malformedObjectDestructuringAssignmentESDecorators.ts, 5, 41))
>v : Symbol(v, Decl(malformedObjectDestructuringAssignmentESDecorators.ts, 5, 48))
>this : Symbol(C, Decl(malformedObjectDestructuringAssignmentESDecorators.ts, 0, 42))
}
}

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
//// [tests/cases/compiler/malformedObjectDestructuringAssignmentESDecorators.ts] ////

=== malformedObjectDestructuringAssignmentESDecorators.ts ===
declare function dec(...args: any[]): any;
>dec : (...args: any[]) => any
>args : any[]

@dec
>dec : (...args: any[]) => any

class C {
>C : C

static {
({ m() {}, get g() { return 1; }, set s(v) {} } = this);
>({ m() {}, get g() { return 1; }, set s(v) {} } = this) : typeof C
>{ m() {}, get g() { return 1; }, set s(v) {} } = this : typeof C
>{ m() {}, get g() { return 1; }, set s(v) {} } : { m(): void; readonly g: number; s: any; }
>m : () => void
>g : number
>1 : 1
>s : any
>v : any
>this : typeof C
}
}

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// @target: es2022

declare function dec(...args: any[]): any;

@dec
class C {
static {
({ m() {}, get g() { return 1; }, set s(v) {} } = this);
}
}

Back | FazBrowse Home | New Git URL