warscript 0.0.1-dev.a12bd26 → 0.0.1-dev.a4deb44

package/engine/internal/ability.d.ts

@@ -12,7 +12,7 @@ interface Fields<K, V> {
 interface AbilityLevel {
     realFields: Fields<jabilityreallevelfield, number>;
 }
-type jabilityfield = jabilityintegerfield | jabilityrealfield | jabilitybooleanfield | jabilitystringfield | jabilityintegerlevelfield | jabilityreallevelfield | jabilitybooleanlevelfield | jabilitystringlevelfield;
+export type jabilityfield = jabilityintegerfield | jabilityrealfield | jabilitybooleanfield | jabilitystringfield | jabilityintegerlevelfield | jabilityreallevelfield | jabilitybooleanlevelfield | jabilitystringlevelfield;
 export declare class AbilitySnapshot {
 }
 export declare abstract class Ability extends Handle<jability> {

package/engine/object-data/entry/ability-type.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
+import "../../internal/unit/ability";
 import { TupleOf } from "../../../utility/types";
 import { AnimationName } from "../auxiliary/animation-name";
 import { AnimationQualifier } from "../auxiliary/animation-qualifier";

package/engine/object-data/entry/ability-type.lua

@@ -6,6 +6,7 @@ local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
+require("engine.internal.unit.ability")
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
 local ____effect = require("core.types.effect")

package/engine/object-field/ability.d.ts

@@ -1,14 +1,15 @@
 /** @noSelfInFile */
-import { Ability } from "../internal/ability";
+import { Ability, jabilityfield } from "../internal/ability";
 import { ObjectArrayField, ObjectField, ObjectFieldValueChangeEvent, ObjectLevelField, ObjectLevelFieldValueChangeEvent, ReadonlyObjectFieldType, ReadonlyObjectLevelFieldType } from "../object-field";
 import { AbilityType, AbilityTypeId } from "../object-data/entry/ability-type";
 import { ObjectDataEntryId } from "../object-data/entry";
 import { LightningTypeId } from "../object-data/entry/lightning-type";
 import { CombatClassifications } from "../object-data/auxiliary/combat-classification";
 import { UnitTypeId } from "../object-data/entry/unit-type";
-export declare abstract class AbilityField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType = unknown> extends ObjectField<AbilityType, Ability, ValueType, NativeFieldType> {
+export declare abstract class AbilityField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType extends jabilityfield = jabilityfield> extends ObjectField<AbilityType, Ability, ValueType, NativeFieldType> {
     protected get instanceClass(): typeof Ability;
     protected getObjectDataEntryId(instance: Ability): AbilityTypeId;
+    protected hasNativeFieldValue(instance: Ability): boolean;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<AbilityField>>;
 }
 export declare class AbilityBooleanField extends AbilityField<boolean, jabilitybooleanfield> {
@@ -18,7 +19,7 @@ export declare class AbilityBooleanField extends AbilityField<boolean, jabilityb
     protected setNativeFieldValue(instance: Ability, value: boolean): boolean;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<AbilityBooleanField>;
 }
-export declare abstract class AbilityNumberField<NativeFieldType = unknown> extends AbilityField<number, NativeFieldType> {
+export declare abstract class AbilityNumberField<NativeFieldType extends jabilityfield = jabilityfield> extends AbilityField<number, NativeFieldType> {
     protected get defaultValue(): number;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<AbilityNumberField>;
 }
@@ -59,10 +60,11 @@ export declare abstract class AbilityObjectDataEntryIdArrayField<T extends Objec
 }
 export declare class AbilityLightningTypeIdArrayField extends AbilityObjectDataEntryIdArrayField<LightningTypeId> {
 }
-export declare abstract class AbilityLevelField<ValueType extends number | string | boolean = number | string | boolean, InputValueType extends ValueType = never, NativeFieldType = unknown> extends ObjectLevelField<AbilityType, Ability, ValueType, InputValueType, NativeFieldType> {
+export declare abstract class AbilityLevelField<ValueType extends number | string | boolean = number | string | boolean, InputValueType extends ValueType = never, NativeFieldType extends jabilityfield = jabilityfield> extends ObjectLevelField<AbilityType, Ability, ValueType, InputValueType, NativeFieldType> {
     protected get instanceClass(): typeof Ability;
     protected getLevelCount(entry: AbilityType | Ability): number;
     protected getObjectDataEntryId(instance: Ability): AbilityTypeId;
+    protected hasNativeFieldValue(instance: Ability): boolean;
     static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<ReadonlyObjectLevelFieldType<AbilityLevelField>>;
 }
 export declare class AbilityBooleanLevelField extends AbilityLevelField<boolean, boolean, jabilityintegerlevelfield> {
@@ -72,7 +74,7 @@ export declare class AbilityBooleanLevelField extends AbilityLevelField<boolean,
     protected setNativeFieldValue(instance: Ability, level: number, value: boolean): boolean;
     static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<AbilityBooleanLevelField>;
 }
-export declare abstract class AbilityNumberLevelField<NativeFieldType = unknown> extends AbilityLevelField<number, number, NativeFieldType> {
+export declare abstract class AbilityNumberLevelField<NativeFieldType extends jabilityfield = jabilityfield> extends AbilityLevelField<number, number, NativeFieldType> {
     protected get defaultValue(): number;
     static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<AbilityNumberLevelField>;
 }

package/engine/object-field/ability.lua

@@ -27,6 +27,9 @@ __TS__ClassExtends(AbilityField, ObjectField)
 function AbilityField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
+function AbilityField.prototype.hasNativeFieldValue(self, instance)
+    return instance:hasField(self.nativeField)
+end
 __TS__SetDescriptor(
     AbilityField.prototype,
     "instanceClass",
@@ -261,6 +264,9 @@ end
 function AbilityLevelField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
+function AbilityLevelField.prototype.hasNativeFieldValue(self, instance)
+    return instance:hasField(self.nativeField)
+end
 __TS__SetDescriptor(
     AbilityLevelField.prototype,
     "instanceClass",

package/engine/object-field/unit.d.ts

@@ -9,6 +9,7 @@ export declare abstract class UnitField<ValueType extends number | string | bool
 export declare class UnitStringField extends UnitField<string, junitstringfield> {
     protected get defaultValue(): string;
     protected getNativeFieldById(id: number): junitstringfield;
+    protected hasNativeFieldValue(): boolean;
     protected getNativeFieldValue(instance: Unit): string;
     protected getObjectDataEntryId(instance: Unit): UnitTypeId;
     protected setNativeFieldValue(instance: Unit, value: string): boolean;

package/engine/object-field/unit.lua

@@ -29,6 +29,9 @@ __TS__ClassExtends(UnitStringField, ____exports.UnitField)
 function UnitStringField.prototype.getNativeFieldById(self, id)
     return ConvertUnitStringField(id)
 end
+function UnitStringField.prototype.hasNativeFieldValue(self)
+    return true
+end
 function UnitStringField.prototype.getNativeFieldValue(self, instance)
     return instance:getField(self.nativeField)
 end

package/engine/object-field.d.ts

@@ -9,7 +9,6 @@ export type ObjectFieldId = number & {
 export type ObjectFieldConstructor<T extends ObjectFieldBase<any, any, any, any>> = OmitConstructor<typeof ObjectFieldBase> & (new (id: number) => T);
 export type ObjectFieldAbstractConstructor<T extends ObjectFieldBase<any, any, any, any>> = OmitConstructor<typeof ObjectFieldBase> & (abstract new (id: number) => T);
 declare abstract class ObjectFieldBase<ObjectDataEntryType extends ObjectDataEntry, InstanceType extends AnyNotNil, ValueType, NativeFieldType> {
-    protected readonly valueByInstance: LuaMap<InstanceType, ValueType>;
     protected abstract readonly instanceClass: AbstractConstructor<InstanceType> | Function;
     supports(instance: AnyNotNil): instance is InstanceType & {
         readonly __oneSidedTypeGuard: unique symbol;
@@ -37,6 +36,7 @@ export type ReadonlyObjectFieldType<T extends ObjectField<any, any, any, any>> =
 type ReadonlyObjectFieldConstructor<T extends ObjectField> = OmitConstructor<typeof ObjectField> & (abstract new (...args: any[]) => ReadonlyObjectFieldType<T>);
 export declare abstract class ObjectField<ObjectDataEntryType extends ObjectDataEntry = ObjectDataEntry, InstanceType extends AnyNotNil = AnyNotNil, ValueType extends number | string | boolean = number | string | boolean, NativeFieldType = unknown> extends ObjectFieldBase<ObjectDataEntryType, InstanceType, ValueType, NativeFieldType> {
     protected abstract readonly defaultValue: ValueType;
+    protected abstract hasNativeFieldValue(instance: InstanceType): boolean;
     protected abstract getNativeFieldValue(instance: InstanceType): ValueType;
     protected abstract setNativeFieldValue(instance: InstanceType, value: ValueType): boolean;
     getValue(entry: ObjectDataEntryType | InstanceType): ValueType;
@@ -72,6 +72,7 @@ export declare abstract class ObjectArrayField<ObjectDataEntryType extends Objec
 }
 export declare abstract class ObjectLevelField<ObjectDataEntryType extends ObjectDataEntry = ObjectDataEntry, InstanceType extends AnyNotNil = AnyNotNil, ValueType extends number | string | boolean = number | string | boolean, InputValueType extends ValueType = never, NativeFieldType = unknown> extends ObjectFieldBase<ObjectDataEntryType, InstanceType, ValueType[], NativeFieldType> {
     protected abstract readonly defaultValue: ValueType;
+    protected abstract hasNativeFieldValue(instance: InstanceType): boolean;
     protected abstract getNativeFieldValue(instance: InstanceType, level: number): ValueType;
     protected abstract setNativeFieldValue(instance: InstanceType, level: number, value: ValueType): boolean;
     protected abstract getLevelCount(entry: ObjectDataEntryType | InstanceType): number;

package/engine/object-field.lua

@@ -132,13 +132,15 @@ function ObjectField.prototype.setValue(self, entry, value)
             return true
         end
     end
+    if not self:hasNativeFieldValue(entry) then
+        return false
+    end
     local previousValue = self:getNativeFieldValue(entry)
     if value ~= previousValue then
-        if self:setNativeFieldValue(entry, value) then
-            self:invokeValueChangeEvent(entry, self, previousValue, value)
-        else
+        if not self:setNativeFieldValue(entry, value) then
             return false
         end
+        self:invokeValueChangeEvent(entry, self, previousValue, value)
     end
     return true
 end
@@ -390,19 +392,21 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
             return true
         end
     end
+    if not self:hasNativeFieldValue(entry) then
+        return false
+    end
     local previousValue = self:getNativeFieldValue(entry, level)
     if value ~= previousValue then
-        if self:setNativeFieldValue(entry, level, value) then
-            self:invokeValueChangeEvent(
-                entry,
-                self,
-                level,
-                previousValue,
-                value
-            )
-        else
+        if not self:setNativeFieldValue(entry, level, value) then
             return false
         end
+        self:invokeValueChangeEvent(
+            entry,
+            self,
+            level,
+            previousValue,
+            value
+        )
     end
     return true
 end

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.a12bd26",
+    "version": "0.0.1-dev.a4deb44",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",

package/utility/linked-set.d.ts

@@ -44,6 +44,7 @@ export declare class LinkedSet<T extends AnyNotNil> implements ReadonlyLinkedSet
     sortBy<R>(selector: ((value: T) => R) | KeysOfType<T, R>): void;
     protected __pairs(this: LinkedSet<T>): LuaIterator<T | undefined, IteratorState<T>>;
 }
+export declare const emptyLinkedSet: <T extends AnyNotNil>() => ReadonlyLinkedSet<T>;
 export declare const linkedSetOf: <T extends AnyNotNil>(...elements: readonly T[]) => LinkedSet<T>;
 export declare const linkedSetOfNotNull: <T extends AnyNotNil>(...elements: readonly (T | null | undefined)[]) => LinkedSet<T>;
 export {};

package/utility/linked-set.lua

@@ -2,9 +2,12 @@ local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__New = ____lualib.__TS__New
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local ____exports = {}
 local ____arrays = require("utility.arrays")
 local sortBy = ____arrays.sortBy
+local ____exception = require("exception")
+local UnsupportedOperationException = ____exception.UnsupportedOperationException
 local function linkedSetNext(state)
     local n = state.n
     state.n = state.t[n]
@@ -161,6 +164,19 @@ __TS__SetDescriptor(
     end},
     true
 )
+local EmptyLinkedSet = __TS__Class()
+EmptyLinkedSet.name = "EmptyLinkedSet"
+__TS__ClassExtends(EmptyLinkedSet, ____exports.LinkedSet)
+function EmptyLinkedSet.prototype.add(self)
+    error(
+        __TS__New(UnsupportedOperationException),
+        0
+    )
+end
+local EMPTY_LINKED_SET = __TS__New(EmptyLinkedSet)
+____exports.emptyLinkedSet = function()
+    return EMPTY_LINKED_SET
+end
 ____exports.linkedSetOf = function(...)
     local linkedSet = __TS__New(____exports.LinkedSet)
     for i = 1, select("#", ...) do