microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-05 16:38:05 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Reverse order of decorator-injected initializers (#54269)

Browse Source
This commit is contained in:
Ron Buckton 2023-05-17 17:12:13 -04:00 committed by GitHub
parent dddd0667f0
commit b14264a2eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 58 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/factory/emitHelpers.ts
View File

@ -761,10 +761,10 @@ export const esDecorateHelper: UnscopedEmitHelper = {
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.push(_);
if (_ = accept(result.init)) initializers.unshift(_);
}
else if (_ = accept(result)) {
if (kind === "field") initializers.push(_);
if (kind === "field") initializers.unshift(_);
else descriptor[key] = _;
}
}

50
src/testRunner/unittests/evaluation/esDecorators.ts
View File

@ -1729,12 +1729,11 @@ describe("unittests:: evaluation:: esDecorators", () => {
`;
assert.strictEqual(C.x, 2);
});
it("multiple initializer pipe-throughs applied in reverse order", () => {
it("multiple initializer pipe-throughs applied in order", () => {
const { C } = exec`
function initializer(x) { return x + 1; }
export class C {
@((t, c) => x => [...x, 3])
@((t, c) => x => [...x, 2])
@((t, c) => x => [...x, 3])
static x: number[] = [1];
}
`;
@ -1797,12 +1796,11 @@ describe("unittests:: evaluation:: esDecorators", () => {
`;
assert.strictEqual(C.x, 2);
});
it("multiple initializer pipe-throughs applied in reverse order", () => {
it("multiple init pipe-throughs applied in order", () => {
const { C } = exec`
function initializer(x) { return x + 1; }
export class C {
@((t, c) => ({ init: x => [...x, 3] }))
@((t, c) => ({ init: x => [...x, 2] }))
@((t, c) => ({ init: x => [...x, 3] }))
static accessor x: number[] = [1];
}
`;
@ -1861,6 +1859,38 @@ describe("unittests:: evaluation:: esDecorators", () => {
assert.throws(() => main("abc"));
});
});
it("accessor 'init' evaluation order (#54267)", () => {
const { main } = exec`
function minusTwo({ set }: any, ctx: any) {
return {
set(v) { set.call(this, v - 2); },
init(v) { return v - 2; },
};
}
function timesFour({ set }: any, ctx: any) {
return {
set(v) { set.call(this, v * 4); },
init(v) { return v * 4; }
};
}
class C {
@minusTwo @timesFour accessor x = 5;
}
export const main = () => {
const obj = new C();
const afterInit = obj.x;
obj.x = 5;
const afterSet = obj.x;
return { afterInit, afterSet };
};
`;
const { afterInit, afterSet } = main();
assert.strictEqual(afterInit, 12);
assert.strictEqual(afterSet, 12);
});
});
const nodeVersion = new ts.Version(process.versions.node);
@ -2162,11 +2192,11 @@ describe("unittests:: evaluation:: esDecorators", () => {
// order and applied to the replacement class:
"static block evaluation",
"static field initializer evaluation",
"static field injected initializer evaluation 2",
"static field injected initializer evaluation 1",
"static field injected initializer evaluation 2",
"static auto-accessor initializer evaluation",
"static auto-accessor injected initializer evaluation 2",
"static auto-accessor injected initializer evaluation 1",
"static auto-accessor injected initializer evaluation 2",
// NOTE: at this point, static private fields will be installed (TODO: on the replacement class)
// finally, class extra initializers are applied in the order they were added (i.e., methods before fields,
@ -2208,11 +2238,11 @@ describe("unittests:: evaluation:: esDecorators", () => {
// next, instance initializers (i.e., fields, auto-accessors, and static blocks) are evaluated in document
// order:
"instance field initializer evaluation",
"instance field injected initializer evaluation 2",
"instance field injected initializer evaluation 1",
"instance field injected initializer evaluation 2",
"instance auto-accessor initializer evaluation",
"instance auto-accessor injected initializer evaluation 2",
"instance auto-accessor injected initializer evaluation 1",
"instance auto-accessor injected initializer evaluation 2",
// NOTE: at this point, instance private fields will be installed.
// finally, statements in the constructor after the call to `super()` are evaluated:

4
tests/baselines/reference/esDecorators-classDeclaration-commonjs-classNamespaceMerge.js
View File

@ -31,10 +31,10 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
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.push(_);
if (_ = accept(result.init)) initializers.unshift(_);
}
else if (_ = accept(result)) {
if (kind === "field") initializers.push(_);
if (kind === "field") initializers.unshift(_);
else descriptor[key] = _;
}
}

4
tests/baselines/reference/esDecorators-classDeclaration-commonjs.js
View File

@ -27,10 +27,10 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
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.push(_);
if (_ = accept(result.init)) initializers.unshift(_);
}
else if (_ = accept(result)) {
if (kind === "field") initializers.push(_);
if (kind === "field") initializers.unshift(_);
else descriptor[key] = _;
}
}

4
tests/baselines/reference/esDecorators-classDeclaration-sourceMap(target=es2015).js
View File

@ -64,10 +64,10 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
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.push(_);
if (_ = accept(result.init)) initializers.unshift(_);
}
else if (_ = accept(result)) {
if (kind === "field") initializers.push(_);
if (kind === "field") initializers.unshift(_);
else descriptor[key] = _;
}
}

2
tests/baselines/reference/esDecorators-classDeclaration-sourceMap(target=es2015).js.map
View File

File diff suppressed because one or more lines are too long

4
tests/baselines/reference/esDecorators-classDeclaration-sourceMap(target=es2015).sourcemap.txt
View File

@ -25,10 +25,10 @@ sourceFile:esDecorators-classDeclaration-sourceMap.ts
>>> 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.push(_);
>>> if (_ = accept(result.init)) initializers.unshift(_);
>>> }
>>> else if (_ = accept(result)) {
>>> if (kind === "field") initializers.push(_);
>>> if (kind === "field") initializers.unshift(_);
>>> else descriptor[key] = _;
>>> }
>>> }

4
tests/baselines/reference/esDecorators-classDeclaration-sourceMap(target=es2022).js
View File

@ -64,10 +64,10 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
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.push(_);
if (_ = accept(result.init)) initializers.unshift(_);
}
else if (_ = accept(result)) {
if (kind === "field") initializers.push(_);
if (kind === "field") initializers.unshift(_);
else descriptor[key] = _;
}
}

2
tests/baselines/reference/esDecorators-classDeclaration-sourceMap(target=es2022).js.map
View File

File diff suppressed because one or more lines are too long

4
tests/baselines/reference/esDecorators-classDeclaration-sourceMap(target=es2022).sourcemap.txt
View File

@ -25,10 +25,10 @@ sourceFile:esDecorators-classDeclaration-sourceMap.ts
>>> 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.push(_);
>>> if (_ = accept(result.init)) initializers.unshift(_);
>>> }
>>> else if (_ = accept(result)) {
>>> if (kind === "field") initializers.push(_);
>>> if (kind === "field") initializers.unshift(_);
>>> else descriptor[key] = _;
>>> }
>>> }

4
tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
View File

@ -96,10 +96,10 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
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.push(_);
if (_ = accept(result.init)) initializers.unshift(_);
}
else if (_ = accept(result)) {
if (kind === "field") initializers.push(_);
if (kind === "field") initializers.unshift(_);
else descriptor[key] = _;
}
}