warscript 0.0.1-dev.697548e → 0.0.1-dev.69b6655

package/engine/standard/entries/item-type.lua

@@ -0,0 +1,2 @@
+local ____exports = {}
+return ____exports

package/engine/standard/entries/unit-type.d.ts

@@ -15,6 +15,7 @@ export declare const MOUNTAIN_KING_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const PALADIN_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ARCHER_HIGH_ELF_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const CAPTAIN_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const CHAPLAIN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const SWORDSMAN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const ADMIRAL_PROUDMOORE_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ANASTERIAN_SUNSTRIDER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
@@ -47,6 +48,7 @@ export declare const SPIRIT_WALKER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const TAUREN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WIND_RIDER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WITCH_DOCTOR_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const BLADEMASTER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ARCHER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const CHIMAERA_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const DRUID_OF_THE_CLAW_UNIT_TYPE_ID: StandardUnitTypeId;
@@ -67,9 +69,11 @@ export declare const DEMON_HUNTER_DEMON_FORM_HERO_UNIT_TYPE_ID: StandardHeroUnit
 export declare const ABOMINATION_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const GHOUL_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const DEATH_KNIGHT_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const DREADLORD_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ZOMBIE_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const ZOMBIE_FEMALE_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const ARTHAS_EVIL_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const MAL_GANIS_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const DIRE_MAMMOTH_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const ELDER_JUNGLE_STALKER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const ENRAGED_ELEMENTAL_UNIT_TYPE_ID: StandardUnitTypeId;
@@ -98,6 +102,7 @@ export declare const WENDIGO_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WENDIGO_SHAMAN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WILDKIN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WRAITH_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const PIT_LORD_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const GOBLIN_LAND_MINE_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const CIRCLE_OF_POWER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const CIRCLE_OF_POWER_MEDIUM_UNIT_TYPE_ID: StandardUnitTypeId;

package/engine/standard/entries/unit-type.lua

@@ -14,6 +14,7 @@ ____exports.MOUNTAIN_KING_HERO_UNIT_TYPE_ID = fourCC("Hmkg")
 ____exports.PALADIN_HERO_UNIT_TYPE_ID = fourCC("Hpal")
 ____exports.ARCHER_HIGH_ELF_UNIT_TYPE_ID = fourCC("nhea")
 ____exports.CAPTAIN_UNIT_TYPE_ID = fourCC("hcth")
+____exports.CHAPLAIN_UNIT_TYPE_ID = fourCC("nchp")
 ____exports.SWORDSMAN_UNIT_TYPE_ID = fourCC("hhes")
 ____exports.ADMIRAL_PROUDMOORE_HERO_UNIT_TYPE_ID = fourCC("Hapm")
 ____exports.ANASTERIAN_SUNSTRIDER_HERO_UNIT_TYPE_ID = fourCC("Hssa")
@@ -46,6 +47,7 @@ ____exports.SPIRIT_WALKER_UNIT_TYPE_ID = fourCC("ospw")
 ____exports.TAUREN_UNIT_TYPE_ID = fourCC("otau")
 ____exports.WIND_RIDER_UNIT_TYPE_ID = fourCC("owyv")
 ____exports.WITCH_DOCTOR_UNIT_TYPE_ID = fourCC("odoc")
+____exports.BLADEMASTER_HERO_UNIT_TYPE_ID = fourCC("Obla")
 ____exports.ARCHER_UNIT_TYPE_ID = fourCC("earc")
 ____exports.CHIMAERA_UNIT_TYPE_ID = fourCC("echm")
 ____exports.DRUID_OF_THE_CLAW_UNIT_TYPE_ID = fourCC("edoc")
@@ -66,9 +68,11 @@ ____exports.DEMON_HUNTER_DEMON_FORM_HERO_UNIT_TYPE_ID = fourCC("Edmm")
 ____exports.ABOMINATION_UNIT_TYPE_ID = fourCC("uabo")
 ____exports.GHOUL_UNIT_TYPE_ID = fourCC("ugho")
 ____exports.DEATH_KNIGHT_HERO_UNIT_TYPE_ID = fourCC("Udea")
+____exports.DREADLORD_HERO_UNIT_TYPE_ID = fourCC("Udre")
 ____exports.ZOMBIE_UNIT_TYPE_ID = fourCC("nzom")
 ____exports.ZOMBIE_FEMALE_UNIT_TYPE_ID = fourCC("nzof")
 ____exports.ARTHAS_EVIL_HERO_UNIT_TYPE_ID = fourCC("Uear")
+____exports.MAL_GANIS_HERO_UNIT_TYPE_ID = fourCC("Umal")
 ____exports.DIRE_MAMMOTH_UNIT_TYPE_ID = fourCC("nmdr")
 ____exports.ELDER_JUNGLE_STALKER_UNIT_TYPE_ID = fourCC("njga")
 ____exports.ENRAGED_ELEMENTAL_UNIT_TYPE_ID = fourCC("nele")
@@ -97,6 +101,7 @@ ____exports.WENDIGO_UNIT_TYPE_ID = fourCC("nwen")
 ____exports.WENDIGO_SHAMAN_UNIT_TYPE_ID = fourCC("nwns")
 ____exports.WILDKIN_UNIT_TYPE_ID = fourCC("nowb")
 ____exports.WRAITH_UNIT_TYPE_ID = fourCC("ngh2")
+____exports.PIT_LORD_HERO_UNIT_TYPE_ID = fourCC("Nplh")
 ____exports.GOBLIN_LAND_MINE_UNIT_TYPE_ID = fourCC("nglm")
 ____exports.CIRCLE_OF_POWER_UNIT_TYPE_ID = fourCC("ncop")
 ____exports.CIRCLE_OF_POWER_MEDIUM_UNIT_TYPE_ID = fourCC("ncp2")

package/engine/standard/fields/item.d.ts

@@ -0,0 +1,4 @@
+/** @noSelfInFile */
+import { ItemBooleanField } from "../../object-field/item";
+export declare const CAN_BE_SOLD_TO_MERCHANTS_ITEM_FIELD: ItemBooleanField & symbol;
+export declare const IS_ACTIVELY_USED_ITEM_FIELD: ItemBooleanField & symbol;

package/engine/standard/fields/item.lua

@@ -0,0 +1,6 @@
+local ____exports = {}
+local ____item = require("engine.object-field.item")
+local ItemBooleanField = ____item.ItemBooleanField
+____exports.CAN_BE_SOLD_TO_MERCHANTS_ITEM_FIELD = ItemBooleanField:create(fourCC("ipaw"))
+____exports.IS_ACTIVELY_USED_ITEM_FIELD = ItemBooleanField:create(fourCC("iusa"))
+return ____exports

package/engine/unit.d.ts

@@ -2,10 +2,13 @@
 import "./internal/unit";
 import "./internal/unit/order";
 import "./internal/unit/ability";
+import "./internal/unit/appearance";
+import "./internal/unit/bag";
+import "./internal/unit/equipment";
 import "./internal/unit/allowed-targets";
 import "./internal/unit/buff";
 import "./internal/unit/expiration-timer";
-import "./internal/unit/item";
+import "./internal/unit/inventory";
 import "./internal/unit+ability";
 import "./internal/unit+damage";
 import "./internal/unit+rally";

package/engine/unit.lua

@@ -2,10 +2,13 @@ local ____exports = {}
 require("engine.internal.unit")
 require("engine.internal.unit.order")
 require("engine.internal.unit.ability")
+require("engine.internal.unit.appearance")
+require("engine.internal.unit.bag")
+require("engine.internal.unit.equipment")
 require("engine.internal.unit.allowed-targets")
 require("engine.internal.unit.buff")
 require("engine.internal.unit.expiration-timer")
-require("engine.internal.unit.item")
+require("engine.internal.unit.inventory")
 require("engine.internal.unit+ability")
 require("engine.internal.unit+damage")
 require("engine.internal.unit+rally")

package/event.d.ts

@@ -40,7 +40,7 @@ export declare const createDispatchingEvent: {
     <T extends Event<any>, S extends Event<EventParameters<T>>>(underlyingEvent: T, extractKey: (this: void, ...args: EventParameters<T>) => number, invokeEvent?: (this: void, event: S, ...args: EventParameters<T>) => unknown, ...createEvent: [...(Event<any> extends S ? [((this: void) => S)?] : [(this: void) => S])]): DispatchingEvent<EventParameters<T>, T, S>;
 };
 export declare class DependentInitializingEvent<T extends any[], R extends any[]> extends InitializingEvent<R, EventListener<T>> {
-    constructor(underlyingEvent: Event<T>, priority: EventListenerPriority, collector: (...args: T) => LuaMultiReturn<[false] | [true, ...R]>);
+    constructor(underlyingEvent: Event<T>, priority: EventListenerPriority, collector: (...args: T) => LuaMultiReturn<[false, ...unknown[]] | [boolean, ...R]>);
 }
 export declare class EventParametersCaptor<T extends any[]> {
     private readonly event;

package/lualib_bundle.lua

@@ -653,6 +653,7 @@ do
         self.state = 0
         self.fulfilledCallbacks = {}
         self.rejectedCallbacks = {}
+        self.finallyCallbacks = {}
         local success, ____error = ____pcall(
             executor,
             nil,
@@ -702,40 +703,14 @@ do
         return self["then"](self, nil, onRejected)
     end
     function __TS__Promise.prototype.finally(self, onFinally)
-        if type(onFinally) ~= "function" then
-            return self["then"](self, onFinally, onFinally)
-        end
-        return self["then"](
-            self,
-            function(____, x)
-                local ____self_2 = __TS__New(
-                    __TS__Promise,
-                    function(____, resolve) return resolve(
-                        nil,
-                        onFinally(nil)
-                    ) end
-                )
-                return ____self_2["then"](
-                    ____self_2,
-                    function() return x end
-                )
-            end,
-            function(____, e)
-                local ____self_3 = __TS__New(
-                    __TS__Promise,
-                    function(____, resolve) return resolve(
-                        nil,
-                        onFinally(nil)
-                    ) end
-                )
-                return ____self_3["then"](
-                    ____self_3,
-                    function()
-                        error(e, 0)
-                    end
-                )
+        if onFinally then
+            local ____self_finallyCallbacks_2 = self.finallyCallbacks
+            ____self_finallyCallbacks_2[#____self_finallyCallbacks_2 + 1] = onFinally
+            if self.state ~= 0 then
+                onFinally(nil)
             end
-        )
+        end
+        return self
     end
     function __TS__Promise.prototype.resolve(self, value)
         if isPromiseLike(value) then
@@ -759,11 +734,22 @@ do
     end
     function __TS__Promise.prototype.invokeCallbacks(self, callbacks, value)
         local callbacksLength = #callbacks
+        local finallyCallbacks = self.finallyCallbacks
+        local finallyCallbacksLength = #finallyCallbacks
         if callbacksLength ~= 0 then
             for i = 1, callbacksLength - 1 do
                 callbacks[i](callbacks, value)
             end
-            return callbacks[callbacksLength](callbacks, value)
+            if finallyCallbacksLength == 0 then
+                return callbacks[callbacksLength](callbacks, value)
+            end
+            callbacks[callbacksLength](callbacks, value)
+        end
+        if finallyCallbacksLength ~= 0 then
+            for i = 1, finallyCallbacksLength - 1 do
+                finallyCallbacks[i](finallyCallbacks)
+            end
+            return finallyCallbacks[finallyCallbacksLength](finallyCallbacks)
         end
     end
     function __TS__Promise.prototype.createPromiseResolvingCallback(self, f, resolve, reject)
@@ -918,10 +904,8 @@ local function __TS__ObjectAssign(target, ...)
     local sources = {...}
     for i = 1, #sources do
         local source = sources[i]
-        if type(source) == "table" then
-            for key in pairs(source) do
-                target[key] = source[key]
-            end
+        for key in pairs(source) do
+            target[key] = source[key]
         end
     end
     return target
@@ -1027,13 +1011,6 @@ do
             metatable = {}
             setmetatable(target, metatable)
         end
-        if not isPrototype and not rawget(metatable, "_isOwnDescriptorMetatable") then
-            local instanceMetatable = {}
-            instanceMetatable._isOwnDescriptorMetatable = true
-            setmetatable(instanceMetatable, metatable)
-            setmetatable(target, instanceMetatable)
-            metatable = instanceMetatable
-        end
         local value = rawget(target, key)
         if value ~= nil then
             rawset(target, key, nil)
@@ -1406,70 +1383,46 @@ do
         return self:entries()
     end
     function Map.prototype.entries(self)
-        local function getFirstKey()
-            return self.firstKey
-        end
         local items = self.items
         local nextKey = self.nextKey
-        local key
-        local started = false
+        local key = self.firstKey
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                if not started then
-                    started = true
-                    key = getFirstKey(nil)
-                else
-                    key = nextKey[key]
-                end
-                return {done = not key, value = {key, items[key]}}
+                local result = {done = not key, value = {key, items[key]}}
+                key = nextKey[key]
+                return result
             end
         }
     end
     function Map.prototype.keys(self)
-        local function getFirstKey()
-            return self.firstKey
-        end
         local nextKey = self.nextKey
-        local key
-        local started = false
+        local key = self.firstKey
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                if not started then
-                    started = true
-                    key = getFirstKey(nil)
-                else
-                    key = nextKey[key]
-                end
-                return {done = not key, value = key}
+                local result = {done = not key, value = key}
+                key = nextKey[key]
+                return result
             end
         }
     end
     function Map.prototype.values(self)
-        local function getFirstKey()
-            return self.firstKey
-        end
         local items = self.items
         local nextKey = self.nextKey
-        local key
-        local started = false
+        local key = self.firstKey
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                if not started then
-                    started = true
-                    key = getFirstKey(nil)
-                else
-                    key = nextKey[key]
-                end
-                return {done = not key, value = items[key]}
+                local result = {done = not key, value = items[key]}
+                key = nextKey[key]
+                return result
             end
         }
     end
@@ -2046,68 +1999,44 @@ do
         return self:values()
     end
     function Set.prototype.entries(self)
-        local function getFirstKey()
-            return self.firstKey
-        end
         local nextKey = self.nextKey
-        local key
-        local started = false
+        local key = self.firstKey
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                if not started then
-                    started = true
-                    key = getFirstKey(nil)
-                else
-                    key = nextKey[key]
-                end
-                return {done = not key, value = {key, key}}
+                local result = {done = not key, value = {key, key}}
+                key = nextKey[key]
+                return result
             end
         }
     end
     function Set.prototype.keys(self)
-        local function getFirstKey()
-            return self.firstKey
-        end
         local nextKey = self.nextKey
-        local key
-        local started = false
+        local key = self.firstKey
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                if not started then
-                    started = true
-                    key = getFirstKey(nil)
-                else
-                    key = nextKey[key]
-                end
-                return {done = not key, value = key}
+                local result = {done = not key, value = key}
+                key = nextKey[key]
+                return result
             end
         }
     end
     function Set.prototype.values(self)
-        local function getFirstKey()
-            return self.firstKey
-        end
         local nextKey = self.nextKey
-        local key
-        local started = false
+        local key = self.firstKey
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                if not started then
-                    started = true
-                    key = getFirstKey(nil)
-                else
-                    key = nextKey[key]
-                end
-                return {done = not key, value = key}
+                local result = {done = not key, value = key}
+                key = nextKey[key]
+                return result
             end
         }
     end

package/math.d.ts

@@ -23,6 +23,8 @@ export declare const floor: typeof math.floor;
 export declare const log: typeof math.log;
 export declare const max: typeof math.max;
 export declare const min: typeof math.min;
+export declare const sum: (x: number, ...numbers: number[]) => number;
+export declare const product: (x: number, ...numbers: number[]) => number;
 /** Returns the signum function of the argument;
  * zero if the argument is zero,
  * 1.0 if the argument is greater than zero,

package/math.lua

@@ -39,6 +39,20 @@ ____exports.floor = math.floor
 ____exports.log = math.log
 ____exports.max = math.max
 ____exports.min = math.min
+____exports.sum = function(x, ...)
+    for i = 1, select("#", ...) do
+        local number = select(i, ...)
+        x = x + number
+    end
+    return x
+end
+____exports.product = function(x, ...)
+    for i = 1, select("#", ...) do
+        local number = select(i, ...)
+        x = x * number
+    end
+    return x
+end
 --- Returns the signum function of the argument;
 -- zero if the argument is zero,
 -- 1.0 if the argument is greater than zero,

package/network.lua

@@ -8,6 +8,7 @@ local ____exports = {}
 local ____event = require("event")
 local TriggerEvent = ____event.TriggerEvent
 local ____exception = require("exception")
+local CancellationException = ____exception.CancellationException
 local IllegalArgumentException = ____exception.IllegalArgumentException
 local ____player = require("core.types.player")
 local Player = ____player.Player
@@ -86,6 +87,9 @@ function SyncOperation.prototype.____constructor(self, player, data)
     self.l = #self.d
 end
 function SyncOperation.prototype.estimate(self)
+    if self.isCanceled or not self.player.isPlaying then
+        return __TS__Promise.reject(__TS__New(CancellationException))
+    end
     if self.player.isLocal then
         sendSyncData(
             "__oh",
@@ -98,6 +102,7 @@ function SyncOperation.prototype.estimate(self)
 end
 function SyncOperation.prototype.work(self)
     if self.progress >= self.maximum then
+        syncOperationById[self.x] = nil
         return decode(concat(self.c))
     end
     self.s = packetsPerRound
@@ -116,7 +121,18 @@ function SyncOperation.prototype.work(self)
     return __TS__New(__TS__Promise, syncPromiseExecutor)
 end
 function SyncOperation.prototype.doCancel(self)
-    return false
+    if not (syncOperationById[self.x] ~= nil) then
+        return false
+    end
+    syncOperationById[self.x] = nil
+    local ____opt_1 = self.r
+    if ____opt_1 ~= nil then
+        ____opt_1(
+            self,
+            __TS__New(CancellationException)
+        )
+    end
+    return true
 end
 __TS__ObjectDefineProperty(
     SyncOperation,
@@ -178,6 +194,7 @@ SyncOperation._ = (function()
             local resolveWork = syncOperation.w
             if resolveWork then
                 if syncOperation.progress >= syncOperation.maximum then
+                    syncOperationById[id] = nil
                     resolveWork(
                         nil,
                         decode(concat(chunks))
@@ -188,6 +205,13 @@ SyncOperation._ = (function()
             end
         end
     end)
+    Player.onLeave:addListener(function(player)
+        for ____, operation in pairs(syncOperationById) do
+            if operation.player == player then
+                operation:cancel()
+            end
+        end
+    end)
 end)()
 function ____exports.synchronize(player, data)
     return __TS__New(____exports.SyncOperation, player, data):execute()

package/operation.d.ts

@@ -16,9 +16,11 @@ export { OperationContinue };
 export declare abstract class Operation<T> {
     protected constructor();
     private started;
+    private settled;
+    private canceled;
     protected progress: number;
     protected maximum: number;
-    isCanceled: boolean;
+    get isCanceled(): boolean;
     get isStarted(): boolean;
     execute(): OperationMonitor<T>;
     protected abstract estimate(): number | Promise<number>;
@@ -30,6 +32,11 @@ export declare abstract class Operation<T> {
         ...result: [success: true, result: T] | [success: false, reason?: any]
     ]>;
     get onProgress(): Event<[operation: Operation<T>]>;
+    /**
+     * Invoked with `isCanceled` already set. Should unblock any pending `estimate`/`work` promise
+     * (e.g. by rejecting it) and return whether cancellation is possible; on `false` the canceled
+     * state is reverted.
+     */
     protected abstract doCancel(): boolean;
     cancel(): boolean;
 }

package/operation.lua

@@ -35,9 +35,10 @@ local Operation = ____exports.Operation
 Operation.name = "Operation"
 function Operation.prototype.____constructor(self)
     self.started = false
+    self.settled = false
+    self.canceled = false
     self.progress = 0
     self.maximum = 0
-    self.isCanceled = false
 end
 function Operation.prototype.execute(self)
     if self.started then
@@ -54,8 +55,13 @@ function Operation.prototype.execute(self)
             return __TS__AsyncAwaiter(function(____awaiter_resolve)
                 local result
                 local progress = self.progress
-                local ____hasReturned, ____returnValue
                 local ____try = __TS__AsyncAwaiter(function()
+                    if self.canceled then
+                        error(
+                            __TS__New(CancellationException),
+                            0
+                        )
+                    end
                     local maximum = __TS__Await(self:estimate())
                     self.maximum = maximum
                     if maximum ~= 0 then
@@ -66,21 +72,19 @@ function Operation.prototype.execute(self)
                     end
                     repeat
                         do
-                            if self.isCanceled then
-                                local reason = __TS__New(CancellationException)
-                                reject(nil, reason)
-                                local onFailure = ____rawget(self, "onFailure")
-                                if onFailure ~= nil then
-                                    Event.invoke(onFailure, self, reason)
-                                end
-                                local onComplete = ____rawget(self, "onComplete")
-                                if onComplete ~= nil then
-                                    Event.invoke(onComplete, self, false, reason)
-                                end
-                                ____hasReturned = true
-                                return
+                            if self.canceled then
+                                error(
+                                    __TS__New(CancellationException),
+                                    0
+                                )
                             end
                             result = __TS__Await(self:work())
+                            if self.canceled then
+                                error(
+                                    __TS__New(CancellationException),
+                                    0
+                                )
+                            end
                             if self.progress ~= progress or self.maximum ~= maximum then
                                 progress = self.progress
                                 maximum = self.maximum
@@ -92,28 +96,23 @@ function Operation.prototype.execute(self)
                         end
                     until not (result == OperationContinue)
                 end)
-                ____try = ____try.catch(
+                __TS__Await(____try.catch(
                     ____try,
                     function(____, reason)
-                        return __TS__AsyncAwaiter(function()
-                            reject(nil, reason)
-                            local onFailure = ____rawget(self, "onFailure")
-                            if onFailure ~= nil then
-                                Event.invoke(onFailure, self, reason)
-                            end
-                            local onComplete = ____rawget(self, "onComplete")
-                            if onComplete ~= nil then
-                                Event.invoke(onComplete, self, false, reason)
-                            end
-                            ____hasReturned = true
-                            return
-                        end)
+                        self.settled = true
+                        reject(nil, reason)
+                        local onFailure = ____rawget(self, "onFailure")
+                        if onFailure ~= nil then
+                            Event.invoke(onFailure, self, reason)
+                        end
+                        local onComplete = ____rawget(self, "onComplete")
+                        if onComplete ~= nil then
+                            Event.invoke(onComplete, self, false, reason)
+                        end
+                        return ____awaiter_resolve(nil)
                     end
-                )
-                __TS__Await(____try)
-                if ____hasReturned then
-                    return ____awaiter_resolve(nil, ____returnValue)
-                end
+                ))
+                self.settled = true
                 resolve(nil, result)
                 local onSuccess = ____rawget(self, "onSuccess")
                 if onSuccess ~= nil then
@@ -128,12 +127,27 @@ function Operation.prototype.execute(self)
     )
 end
 function Operation.prototype.cancel(self)
+    if self.canceled then
+        return true
+    end
+    if self.settled then
+        return false
+    end
+    self.canceled = true
     if self:doCancel() then
-        self.isCanceled = true
         return true
     end
+    self.canceled = false
     return false
 end
+__TS__SetDescriptor(
+    Operation.prototype,
+    "isCanceled",
+    {get = function(self)
+        return self.canceled
+    end},
+    true
+)
 __TS__SetDescriptor(
     Operation.prototype,
     "isStarted",