some bug fixes

Author: CapsAdmin

nattlua/analyzer/control_flow.lua

@@ -266,8 +266,17 @@ return function(META--[[#: any]])
 					for _, a in ipairs(tracked_from_scope) do
 						for _, b in ipairs(current_tracked) do
 							if
-								(a.kind == "upvalue" and b.kind == "upvalue" and a.upvalue == b.upvalue) or
-								(a.kind == "table" and b.kind == "table" and a.obj == b.obj)
+								(
+									a.kind == "upvalue" and
+									b.kind == "upvalue" and
+									a.upvalue == b.upvalue
+								)
+								or
+								(
+									a.kind == "table" and
+									b.kind == "table" and
+									a.obj == b.obj
+								)
 							then
 								table_insert(tracked_objects, a)
 							end
@@ -282,11 +291,7 @@ return function(META--[[#: any]])
 			end
 
 			self:PushScope(function_scope)
-			self:ApplyMutationsAfterStatement(
-				frame.scope,
-				true,
-				frame.scope:GetTrackedNarrowings()
-			)
+			self:ApplyMutationsAfterStatement(frame.scope, true, frame.scope:GetTrackedNarrowings())
 			self:PopScope()
 		end
 	end

nattlua/analyzer/mutation_tracking.lua

@@ -225,7 +225,9 @@ return function(META--[[#: any]])
 				if self:IsInvertedExpressionContext() then
 					if self:IsFalsyExpressionContext() then
 						local val = stack[#stack].falsy
+
 						if set_upvalue_fn then set_upvalue_fn(val) end
+
 						return val
 					elseif self:IsTruthyExpressionContext() then
 						local union = stack[#stack].truthy
@@ -239,12 +241,15 @@ return function(META--[[#: any]])
 						end
 
 						if set_upvalue_fn then set_upvalue_fn(union) end
+
 						return union
 					end
 				else
 					if self:IsTruthyExpressionContext() then
 						local val = stack[#stack].truthy
+
 						if set_upvalue_fn then set_upvalue_fn(val) end
+
 						return val
 					elseif self:IsFalsyExpressionContext() then
 						local union = stack[#stack].falsy
@@ -258,6 +263,7 @@ return function(META--[[#: any]])
 						end
 
 						if set_upvalue_fn then set_upvalue_fn(union) end
+
 						return union
 					end
 				end
@@ -428,7 +434,10 @@ return function(META--[[#: any]])
 
 						-- stack is needed to simply track upvalues used, even if they were not mutated for warnings
 						if upvalue then
-							table.insert(objects, {kind = "upvalue", upvalue = upvalue, stack = stack and shallow_copy(stack)})
+							table.insert(
+								objects,
+								{kind = "upvalue", upvalue = upvalue, stack = stack and shallow_copy(stack)}
+							)
 						end
 					elseif data.kind == "table" then
 						if data.stack then

nattlua/analyzer/operators/binary.lua

@@ -337,9 +337,10 @@ local function BinaryWithUnion(self, node, l, r, op)
 
 			if upvalue then upvalue:SetTruthyFalsyUnion(truthy_union, falsy_union) end
 
-				-- Store truthy/falsy on the left value for table field narrowing
-				-- through stored checks (e.g., local check = t.x ~= nil; if check then)
-				if l:GetParentTable() then l:SetStoredTruthyFalsy(truthy_union, falsy_union) end
+			-- Store truthy/falsy on the left value for table field narrowing
+			-- through stored checks (e.g., local check = t.x ~= nil; if check then)
+			if l:GetParentTable() then l:SetStoredTruthyFalsy(truthy_union, falsy_union) end
+
 			-- special case for type(x) ==/~=
 			if self.type_checked and (op == "==" or op == "!=" or op == "~=") then
 				local type_checked = self.type_checked
@@ -468,19 +469,12 @@ local function is_condition_expression(node)
 
 		local pt = parent.Type
 
-		if
-			pt == "statement_if" or
-			pt == "statement_while" or
-			pt == "statement_repeat"
-		then
+		if pt == "statement_if" or pt == "statement_while" or pt == "statement_repeat" then
 			return true
 		end
 
 		-- keep walking up through nested binary/prefix operators
-		if
-			pt == "expression_binary_operator" or
-			pt == "expression_prefix_operator"
-		then
+		if pt == "expression_binary_operator" or pt == "expression_prefix_operator" then
 			n = parent
 		else
 			break

nattlua/analyzer/operators/function_call_body.lua

@@ -370,7 +370,32 @@ return function(self, obj, input)
 			function_node.Type == "statement_type_function"
 		then
 			if function_node.self_call then
-				self:CreateLocalValue("self", input:GetWithNumber(1) or Nil())
+				local arg = input:GetWithNumber(1) or Nil()
+				self:CreateLocalValue("self", arg)
+
+				-- if the meta table has @SelfArgument, also create a typesystem self
+				-- so that --[[#type]] blocks see the contract type instead of the concrete value
+				if not is_type_function and arg.Type == "table" then
+					local self_arg_contract
+
+					if arg:GetSelfArgument() then
+						self_arg_contract = arg:GetSelfArgument()
+					elseif arg:GetMetaTable() and arg:GetMetaTable().Type == "table" then
+						self_arg_contract = arg:GetMetaTable():GetSelfArgument()
+					end
+
+					if self_arg_contract then
+						-- make @SelfArgument accessible from the contract itself
+						-- so that self.@SelfArgument works in typesystem blocks
+						if not self_arg_contract:GetSelfArgument() then
+							self_arg_contract:SetSelfArgument(self_arg_contract)
+						end
+
+						self:PushAnalyzerEnvironment("typesystem")
+						self:CreateLocalValue("self", self_arg_contract)
+						self:PopAnalyzerEnvironment()
+					end
+				end
 			end
 		end
 
@@ -385,12 +410,9 @@ return function(self, obj, input)
 			for i, identifier in ipairs(function_node.identifiers_typesystem) do
 				local generic_expression = call_expression.expressions_typesystem and
 					call_expression.expressions_typesystem[i] or
-					nil
-
-				if generic_expression then
-					local T = self:AnalyzeExpression(generic_expression)
-					self:CreateLocalValue(identifier.value:GetValueString(), T)
-				end
+					identifier
+				local T = self:AnalyzeExpression(generic_expression)
+				self:CreateLocalValue(identifier.value:GetValueString(), T)
 			end
 		end
 

nattlua/analyzer/operators/prefix.lua

@@ -83,7 +83,20 @@ local function Prefix(analyzer, node, r)
 
 			if res then return res end
 
-			return r:GetArrayLength()
+			local len = r:GetArrayLength()
+
+			if len.Type == "number" or len.Type == "range" then
+				-- Tag with the contract table if it exists, since Get() is called on the contract
+				local contract = r:GetContract()
+
+				if contract and contract ~= r and contract.Type == "table" then
+					len.LengthSourceTable = contract
+				else
+					len.LengthSourceTable = r
+				end
+			end
+
+			return len
 		elseif r.Type == "string" then
 			local str = r:GetData()
 
@@ -209,7 +222,6 @@ return {
 			end
 
 			analyzer:TrackUpvalueUnion(r, truthy_union, falsy_union)
-
 			return new_union
 		end
 

nattlua/analyzer/statements/numeric_for.lua

@@ -112,6 +112,11 @@ return {
 					init = LNumber(literal_init)
 				end
 
+				-- Carry the LengthSourceTable tag from max to the range
+				if init.Type == "range" and max.LengthSourceTable then
+					init.LengthSourceTable = max.LengthSourceTable
+				end
+
 				if init.Type == "number" then init:SetDontWiden(true) end
 			else
 				if init:IsNumeric() and max:IsNumeric() then

nattlua/definitions/lua/globals.nlua

@@ -502,9 +502,7 @@ analyzer function setmetatable(tbl: Table, meta: Table | nil)
 		end
 	end
 
-	if meta.Type == "table" then
-		tbl:SetMetaTable(meta)
-	end
+	if meta.Type == "table" then tbl:SetMetaTable(meta) end
 
 	return tbl
 end

nattlua/types/number.lua

@@ -127,6 +127,7 @@ end
 function META:Copy()--[[#: TNumber]]
 	local copy = self.New(self.Data)
 	copy:CopyInternalsFrom(self)
+	copy.LengthSourceTable = self.LengthSourceTable
 	return copy
 end
 

nattlua/types/range.lua

@@ -97,6 +97,7 @@ end
 function META:Copy()
 	local copy = LNumberRange(self:GetMin(), self:GetMax())
 	copy:CopyInternalsFrom(self)
+	copy.LengthSourceTable = self.LengthSourceTable
 	return copy
 end
 

nattlua/types/table.lua

@@ -909,7 +909,11 @@ function META:Get(key--[[#: TBaseType]])--[[#: (TBaseType | false), (any | nil)]
 		local len = math_abs(min - max)
 
 		if len == math_huge or len == -math_huge then
-			union:AddType(Nil())
+			-- Check if this range key came from #self (tagged by the analyzer)
+			local source = key.LengthSourceTable
+			local is_bounded = source and source == self
+
+			if not is_bounded then union:AddType(Nil()) end
 
 			for _, keyval in ipairs(self.Data) do
 				if keyval.key.Type == "number" then union:AddType(keyval.val) end