warscript 0.0.1-dev.2bde093 → 0.0.1-dev.2cd2e68

package/engine/object-field.lua

@@ -25,6 +25,8 @@ local mutableLinkedSet = ____linked_2Dset.mutableLinkedSet
 local ____lua_2Dmaps = require("utility.lua-maps")
 local getOrPut = ____lua_2Dmaps.getOrPut
 local mutableWeakLuaMap = ____lua_2Dmaps.mutableWeakLuaMap
+local ____arrays = require("utility.arrays")
+local emptyArray = ____arrays.emptyArray
 local compiletimeDefaultValueByObjectDataEntryIdByObjectFieldId = {}
 local defaultValueByObjectDataEntryIdByObjectFieldId = postcompile(function() return compiletimeDefaultValueByObjectDataEntryIdByObjectFieldId end)
 local objectFieldById = {}
@@ -34,7 +36,11 @@ local idGenerator = __TS__New(
 )
 local ObjectFieldBase = __TS__Class()
 ObjectFieldBase.name = "ObjectFieldBase"
-function ObjectFieldBase.prototype.____constructor(self, id)
+function ObjectFieldBase.prototype.____constructor(self, id, isGlobal)
+    if isGlobal == nil then
+        isGlobal = true
+    end
+    self.isGlobal = isGlobal
     self.valueByInstance = setmetatable({}, {__mode = "k"})
     if objectFieldById[id] ~= nil then
         error(
@@ -53,12 +59,13 @@ function ObjectFieldBase.prototype.supports(self, instance)
 end
 function ObjectFieldBase.prototype.hasValue(self, instance)
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
-    return defaultValueByObjectDataEntryId ~= nil and defaultValueByObjectDataEntryId[self:getObjectDataEntryId(instance)] ~= nil or self:hasNativeFieldValue(instance)
+    return self.isGlobal or defaultValueByObjectDataEntryId ~= nil and defaultValueByObjectDataEntryId[self:getObjectDataEntryId(instance)] ~= nil or self:hasNativeFieldValue(instance)
 end
-function ObjectFieldBase.create(self, id)
+function ObjectFieldBase.create(self, id, isGlobal)
     return __TS__New(
         self,
-        id or idGenerator:next()
+        id or idGenerator:next(),
+        isGlobal
     )
 end
 function ObjectFieldBase.of(self, id)
@@ -187,34 +194,38 @@ function ObjectField.prototype.getActualValue(self, instance)
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
     if defaultValueByObjectDataEntryId ~= nil then
         local defaultValue = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(instance)]
-        if defaultValue ~= nil then
+        if defaultValue ~= nil or self.isGlobal then
             local ____self_valueByInstance_instance_0 = self.valueByInstance[instance]
             if ____self_valueByInstance_instance_0 == nil then
                 ____self_valueByInstance_instance_0 = defaultValue
             end
-            return ____self_valueByInstance_instance_0
+            local ____self_valueByInstance_instance_0_1 = ____self_valueByInstance_instance_0
+            if ____self_valueByInstance_instance_0_1 == nil then
+                ____self_valueByInstance_instance_0_1 = self.defaultValue
+            end
+            return ____self_valueByInstance_instance_0_1
         end
     end
-    local ____temp_1 = self:getNativeFieldValue(instance)
-    if ____temp_1 == nil then
-        ____temp_1 = self.defaultValue
+    local ____temp_2 = self:getNativeFieldValue(instance)
+    if ____temp_2 == nil then
+        ____temp_2 = self.defaultValue
     end
-    return ____temp_1
+    return ____temp_2
 end
 function ObjectField.prototype.setActualValue(self, instance, value)
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
     if defaultValueByObjectDataEntryId ~= nil then
         local defaultValue = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(instance)]
-        if defaultValue ~= nil then
-            local ____self_valueByInstance_instance_2 = self.valueByInstance[instance]
-            if ____self_valueByInstance_instance_2 == nil then
-                ____self_valueByInstance_instance_2 = defaultValue
+        if defaultValue ~= nil or self.isGlobal then
+            local ____self_valueByInstance_instance_3 = self.valueByInstance[instance]
+            if ____self_valueByInstance_instance_3 == nil then
+                ____self_valueByInstance_instance_3 = defaultValue
             end
-            local ____self_valueByInstance_instance_2_3 = ____self_valueByInstance_instance_2
-            if ____self_valueByInstance_instance_2_3 == nil then
-                ____self_valueByInstance_instance_2_3 = self.defaultValue
+            local ____self_valueByInstance_instance_3_4 = ____self_valueByInstance_instance_3
+            if ____self_valueByInstance_instance_3_4 == nil then
+                ____self_valueByInstance_instance_3_4 = self.defaultValue
             end
-            local previousValue = ____self_valueByInstance_instance_2_3
+            local previousValue = ____self_valueByInstance_instance_3_4
             if value ~= previousValue then
                 self.valueByInstance[instance] = value
                 self:invokeValueChangeEvent(instance, self, previousValue, value)
@@ -235,10 +246,10 @@ function ObjectField.prototype.setActualValue(self, instance, value)
     return true
 end
 function ObjectField.prototype.calculateActualValue(self, instance)
-    local ____opt_4 = self.originalValueByInstance
-    local originalValue = ____opt_4 and ____opt_4[instance]
-    local ____opt_6 = self.modifiersByInstance
-    local modifiers = ____opt_6 and ____opt_6[instance]
+    local ____opt_5 = self.originalValueByInstance
+    local originalValue = ____opt_5 and ____opt_5[instance]
+    local ____opt_7 = self.modifiersByInstance
+    local modifiers = ____opt_7 and ____opt_7[instance]
     if originalValue ~= nil then
         local value = originalValue
         if modifiers ~= nil then
@@ -303,17 +314,17 @@ function ObjectArrayField.prototype.getValue(self, entry, index)
         if defaultValueByObjectDataEntryId ~= nil then
             local value = defaultValueByObjectDataEntryId[entry.id]
             if value ~= nil then
-                local ____temp_9
+                local ____temp_10
                 if index == nil then
-                    ____temp_9 = value
+                    ____temp_10 = value
                 else
-                    local ____value_index_8 = value[index + 1]
-                    if ____value_index_8 == nil then
-                        ____value_index_8 = self.defaultValue
+                    local ____value_index_9 = value[index + 1]
+                    if ____value_index_9 == nil then
+                        ____value_index_9 = self.defaultValue
                     end
-                    ____temp_9 = ____value_index_8
+                    ____temp_10 = ____value_index_9
                 end
-                return ____temp_9
+                return ____temp_10
             end
         end
         return index == nil and ({}) or self.defaultValue
@@ -323,17 +334,17 @@ function ObjectArrayField.prototype.getValue(self, entry, index)
         local defaultValue = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(entry)]
         if defaultValue ~= nil then
             local value = self.valueByInstance[entry] or defaultValue
-            local ____temp_11
+            local ____temp_12
             if index == nil then
-                ____temp_11 = value
+                ____temp_12 = value
             else
-                local ____value_index_10 = value[index + 1]
-                if ____value_index_10 == nil then
-                    ____value_index_10 = self.defaultValue
+                local ____value_index_11 = value[index + 1]
+                if ____value_index_11 == nil then
+                    ____value_index_11 = self.defaultValue
                 end
-                ____temp_11 = ____value_index_10
+                ____temp_12 = ____value_index_11
             end
-            return ____temp_11
+            return ____temp_12
         end
     end
     if index ~= nil then
@@ -378,11 +389,11 @@ function ObjectLevelField.prototype.getValue(self, entry, level)
         if defaultValueByObjectDataEntryId ~= nil then
             local valueByLevel = defaultValueByObjectDataEntryId[entry.id]
             if valueByLevel ~= nil then
-                local ____valueByLevel_index_12 = valueByLevel[level + 1]
-                if ____valueByLevel_index_12 == nil then
-                    ____valueByLevel_index_12 = self.defaultValue
+                local ____valueByLevel_index_13 = valueByLevel[level + 1]
+                if ____valueByLevel_index_13 == nil then
+                    ____valueByLevel_index_13 = self.defaultValue
                 end
-                return ____valueByLevel_index_12
+                return ____valueByLevel_index_13
             end
         end
         return self.defaultValue
@@ -390,24 +401,24 @@ function ObjectLevelField.prototype.getValue(self, entry, level)
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
     if defaultValueByObjectDataEntryId ~= nil then
         local defaultValueByLevel = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(entry)]
-        if defaultValueByLevel ~= nil then
-            local ____opt_13 = self.valueByInstance[entry]
-            local ____temp_15 = ____opt_13 and ____opt_13[level + 1]
-            if ____temp_15 == nil then
-                ____temp_15 = defaultValueByLevel[level + 1]
+        if defaultValueByLevel ~= nil or self.isGlobal then
+            local ____opt_14 = self.valueByInstance[entry]
+            local ____temp_16 = ____opt_14 and ____opt_14[level + 1]
+            if ____temp_16 == nil then
+                ____temp_16 = (defaultValueByLevel or emptyArray())[level + 1]
             end
-            local ____temp_15_16 = ____temp_15
-            if ____temp_15_16 == nil then
-                ____temp_15_16 = self.defaultValue
+            local ____temp_16_17 = ____temp_16
+            if ____temp_16_17 == nil then
+                ____temp_16_17 = self.defaultValue
             end
-            return ____temp_15_16
+            return ____temp_16_17
         end
     end
-    local ____temp_17 = self:getNativeFieldValue(entry, level)
-    if ____temp_17 == nil then
-        ____temp_17 = self.defaultValue
+    local ____temp_18 = self:getNativeFieldValue(entry, level)
+    if ____temp_18 == nil then
+        ____temp_18 = self.defaultValue
     end
-    return ____temp_17
+    return ____temp_18
 end
 function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
     if value == nil then
@@ -450,21 +461,21 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
     if defaultValueByObjectDataEntryId ~= nil then
         local defaultValueByLevel = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(entry)]
-        if defaultValueByLevel ~= nil then
+        if defaultValueByLevel ~= nil or self.isGlobal then
             local valueByLevel = self.valueByInstance[entry]
             if valueByLevel == nil then
                 valueByLevel = {}
                 self.valueByInstance[entry] = valueByLevel
             end
-            local ____valueByLevel_index_18 = valueByLevel[level + 1]
-            if ____valueByLevel_index_18 == nil then
-                ____valueByLevel_index_18 = defaultValueByLevel[level + 1]
+            local ____valueByLevel_index_19 = valueByLevel[level + 1]
+            if ____valueByLevel_index_19 == nil then
+                ____valueByLevel_index_19 = (defaultValueByLevel or emptyArray())[level + 1]
             end
-            local ____valueByLevel_index_18_19 = ____valueByLevel_index_18
-            if ____valueByLevel_index_18_19 == nil then
-                ____valueByLevel_index_18_19 = self.defaultValue
+            local ____valueByLevel_index_19_20 = ____valueByLevel_index_19
+            if ____valueByLevel_index_19_20 == nil then
+                ____valueByLevel_index_19_20 = self.defaultValue
             end
-            local previousValue = ____valueByLevel_index_18_19
+            local previousValue = ____valueByLevel_index_19_20
             if value ~= previousValue then
                 valueByLevel[level + 1] = value
                 self:invokeValueChangeEvent(

package/package.json

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