Allow different datatypes in the same component

lib/Component.luau

@@ -55,21 +55,18 @@ local function new(name: string, defaultData)
 	ComponentInstance.__index = ComponentInstance
 
 	function ComponentInstance.new(data)
-		local mt = getmetatable(ComponentInstance :: any)
-		if typeof(data) == "table" then
-			data = data or {}
+		data = if data == nil then defaultData or {} else data
 
+		local component = getmetatable(ComponentInstance :: any)
+		if typeof(data) == "table" then
 			if defaultData then
 				data = merge(defaultData, data)
 			end
 
-			mt[PRIMITIVE_MARKER] = false
-			return setmetatable(table.freeze(data), ComponentInstance)
+			return table.freeze(setmetatable(data, ComponentInstance))
 		else
-			data = data or defaultData
-
-			mt[PRIMITIVE_MARKER] = true
-			return setmetatable({ data }, ComponentInstance)
+			component[PRIMITIVE_MARKER] = true
+			return table.freeze(setmetatable({ data = data, [PRIMITIVE_MARKER] = true }, ComponentInstance))
 		end
 	end
 
@@ -184,7 +181,7 @@ local function assertComponentArgsProvided(...)
 end
 
 local function isPrimitive(componentInstance)
-	return getmetatable(componentInstance)[PRIMITIVE_MARKER] == true
+	return componentInstance[PRIMITIVE_MARKER] ~= nil
 end
 
 return {

lib/World.luau

@@ -271,7 +271,7 @@ local function executeInsert(world: World, insertCommand: InsertCommand)
 		local component = getmetatable(componentInstance)
 		local componentId = #component
 		local componentIds = table.clone(oldArchetype.componentIds)
-		local isPrimitive = Component.isPrimitive(component)
+		local isPrimitive = Component.isPrimitive(componentInstance)
 
 		local archetype: Archetype
 		local entityIndex: number
@@ -291,8 +291,9 @@ local function executeInsert(world: World, insertCommand: InsertCommand)
 		end
 
 		archetype.fields[archetype.idToIndex[componentId]][entityIndex] = if isPrimitive
-			then componentInstance[1]
+			then componentInstance.data
 			else componentInstance
+
 		world:_trackChanged(component, entityId, oldComponentInstance, componentInstance)
 
 		oldArchetype = archetype

lib/World.spec.luau

@@ -149,6 +149,10 @@ return function()
 				local B = component()
 
 				world:spawn(A("hello"))
+				world:spawn(A(1))
+				world:spawn(A({ whats_good = true }))
+				world:spawn(A())
+				world:spawn(A("test"))
 
 				for id, a in world:query(A) do
 					print(id, a)