make system queries work

Author: makspll

assets/tests/add_system/system_with_parameters__RETURNS.lua

@@ -21,7 +21,7 @@ function on_test()
         post_update_schedule,
         system_builder("my_parameterised_system", script_id)
             :resource(ResourceTypeA)
-            :query(world.query():component(ComponentA):with(ComponentB))
+            :query(world.query():component(ComponentA):component(ComponentB))
             :resource(ResourceTypeB)
     )
 
@@ -39,6 +39,14 @@ function my_parameterised_system(resourceA,query,resourceB)
     assert(#resourceA.bytes == 6, "Expected 6 bytes, got: " .. #resourceA.bytes)
     assert(resourceB.string == "Initial Value", "Expected 'Initial Value', got: " .. resourceB.string)
     assert(#query == 2, "Expected 3 results, got: " .. #query)
+    for i,result in pairs(query) do
+        components = result:components()
+        assert(#components == 2, "Expected 2 components, got " .. #components)
+        local componentA = components[1]
+        local componentB = components[2]
+        assert(componentA._1 == "Default", "Expected 'Default', got: " .. componentA._1)
+        assert(componentB._1 == "Default", "Expected 'Default', got: " .. componentA._1)
+    end
 end
 
 

assets/tests/add_system/system_with_parameters__RETURNS.rhai

@@ -37,6 +37,13 @@ fn my_parameterised_system(resourceA, query, resourceB) {
     assert(resourceA.bytes.len() == 6, "Expected 6 bytes, got: " + resourceA.bytes.len());
     assert(resourceB.string == "Initial Value", "Expected 'Initial Value', got: " + resourceB.string);
     assert(query.len() == 2, "Expected 3 results, got: " + query.len());
+    for result in query {
+        components = result.components.call();
+        let componentA = components[0];
+        let componentB = components[1];
+        assert(componentA["_0"] == "Default", "Expected 'Default', got: " + componentA["_0"]);
+        assert(componentB["_0"] == "Default", "Expected 'Default', got: " + componentB["_0"]);
+    }
 }
 
 fn on_test_post_update() {

assets/tests/query/query_can_access_components.lua

@@ -0,0 +1,26 @@
+local entity_a = world.spawn()
+
+local componentA = world.get_type_by_name("CompWithFromWorldAndComponentData")
+local componentB = world.get_type_by_name("CompWithDefaultAndComponentData")
+local componentC = world.get_type_by_name("TestComponent")
+
+world.add_default_component(entity_a, componentA)
+world.add_default_component(entity_a, componentB)
+world.insert_component(entity_a, componentC, construct(componentC, {
+    strings = { [1] = "asd" }
+}))
+
+local query_result = world.query():component(componentA):component(componentA):component(componentC):build()
+
+assert(#query_result == 1, "Expected 1 result, got " .. #query_result)
+for i,result in pairs(query_result) do
+    assert(result:entity():index() == entity_a:index(), "Expected entity_a, got " .. result:entity():index())
+    components = result:components()
+    assert(#components == 3, "Expected 3 components, got " .. #components)
+    A = components[1]
+    B = components[2]
+    C = components[3]
+    assert(A._1 == "Default", "Expected 'Default', got: " .. A._1)
+    assert(B._1 == "Default", "Expected 'Default', got: " .. B._1)
+    assert(C.strings[1] == "asd", "Expected 'asd', got: " .. C.strings[1])
+end

assets/tests/query/query_can_access_components.rhai

@@ -0,0 +1,25 @@
+let entity_a = world.spawn_.call();
+let componentA = world.get_type_by_name.call("CompWithFromWorldAndComponentData");
+let componentB = world.get_type_by_name.call("CompWithDefaultAndComponentData");
+let componentC = world.get_type_by_name.call("TestComponent");
+
+world.add_default_component.call(entity_a, componentA);
+world.add_default_component.call(entity_a, componentB);
+world.insert_component.call(entity_a, componentC, construct.call(componentC, #{
+    strings: ["asd"]
+}));
+
+let query_result = world.query.call().component.call(componentA).component.call(componentA).component.call(componentC).build.call();
+
+assert(query_result.len == 1, "Expected 1 result, got " + query_result.len);
+for (result, i) in query_result {
+    assert(result.entity.call().index.call() == entity_a.index.call(), "Expected entity_a, got " + result.entity.call().index.call());
+    let components = result.components.call();
+    assert(components.len == 3, "Expected 3 components, got " + components.len);
+    let A = components[0];
+    let B = components[1];
+    let C = components[2];
+    assert(A["_0"] == "Default", "Expected 'Default', got: " + A["_0"]);
+    assert(B["_0"] == "Default", "Expected 'Default', got: " + B["_0"]);
+    assert(C.strings[0] == "asd", "Expected 'asd', got: " + C.strings[0]);
+}