@dcl/ecs 7.1.4-4670008948.commit-217b840 → 7.1.4-4672664161.commit-7ba5d40

package/dist/composite/instance.js

@@ -142,10 +142,20 @@ export function instanceComposite(engine, compositeResource, compositeProvider,
                 if (transform.parent) {
                     transform.parent = getCompositeEntity(transform.parent);
                 }
+                else {
+                    transform.parent = getCompositeEntity(0);
+                }
                 // TODO: is it going to be necessary to remap assets? e.g. src param from AudioSource and GltfContainer
             }
             else {
-                // TODO: with static reflection, look for `Schema.Entity` in custom components
+                Schemas.mutateNestedValues(componentDefinition.schema.jsonSchema, componentValue, (value, valueType) => {
+                    if (valueType.serializationType === 'entity') {
+                        return { changed: true, value: getCompositeEntity(value) };
+                    }
+                    else {
+                        return { changed: false };
+                    }
+                });
             }
         }
     }

package/dist/composite/proto/gen/composite.gen.js

@@ -13,31 +13,40 @@ function createBaseComponentData() {
  */
 export const ComponentData = {
     encode(message, writer = _m0.Writer.create()) {
-        if (message.data?.$case === "json") {
-            Value.encode(Value.wrap(message.data.json), writer.uint32(10).fork()).ldelim();
-        }
-        if (message.data?.$case === "binary") {
-            writer.uint32(18).bytes(message.data.binary);
+        switch (message.data?.$case) {
+            case "json":
+                Value.encode(Value.wrap(message.data.json), writer.uint32(10).fork()).ldelim();
+                break;
+            case "binary":
+                writer.uint32(18).bytes(message.data.binary);
+                break;
         }
         return writer;
     },
     decode(input, length) {
-        const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
         let end = length === undefined ? reader.len : reader.pos + length;
         const message = createBaseComponentData();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
+                    if (tag != 10) {
+                        break;
+                    }
                     message.data = { $case: "json", json: Value.unwrap(Value.decode(reader, reader.uint32())) };
-                    break;
+                    continue;
                 case 2:
+                    if (tag != 18) {
+                        break;
+                    }
                     message.data = { $case: "binary", binary: reader.bytes() };
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
+                    continue;
+            }
+            if ((tag & 7) == 4 || tag == 0) {
+                break;
             }
+            reader.skipType(tag & 7);
         }
         return message;
     },
@@ -75,34 +84,44 @@ export const CompositeComponent = {
         if (message.jsonSchema !== undefined) {
             Value.encode(Value.wrap(message.jsonSchema), writer.uint32(18).fork()).ldelim();
         }
-        message.data.forEach((value, key) => {
+        (message.data).forEach((value, key) => {
             CompositeComponent_DataEntry.encode({ key: key, value }, writer.uint32(26).fork()).ldelim();
         });
         return writer;
     },
     decode(input, length) {
-        const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
         let end = length === undefined ? reader.len : reader.pos + length;
         const message = createBaseCompositeComponent();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
+                    if (tag != 10) {
+                        break;
+                    }
                     message.name = reader.string();
-                    break;
+                    continue;
                 case 2:
+                    if (tag != 18) {
+                        break;
+                    }
                     message.jsonSchema = Value.unwrap(Value.decode(reader, reader.uint32()));
-                    break;
+                    continue;
                 case 3:
+                    if (tag != 26) {
+                        break;
+                    }
                     const entry3 = CompositeComponent_DataEntry.decode(reader, reader.uint32());
                     if (entry3.value !== undefined) {
                         message.data.set(entry3.key, entry3.value);
                     }
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
+                    continue;
             }
+            if ((tag & 7) == 4 || tag == 0) {
+                break;
+            }
+            reader.skipType(tag & 7);
         }
         return message;
     },
@@ -151,22 +170,29 @@ export const CompositeComponent_DataEntry = {
         return writer;
     },
     decode(input, length) {
-        const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
         let end = length === undefined ? reader.len : reader.pos + length;
         const message = createBaseCompositeComponent_DataEntry();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
+                    if (tag != 8) {
+                        break;
+                    }
                     message.key = reader.int32();
-                    break;
+                    continue;
                 case 2:
+                    if (tag != 18) {
+                        break;
+                    }
                     message.value = ComponentData.decode(reader, reader.uint32());
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
+                    continue;
+            }
+            if ((tag & 7) == 4 || tag == 0) {
+                break;
             }
+            reader.skipType(tag & 7);
         }
         return message;
     },
@@ -203,22 +229,29 @@ export const CompositeDefinition = {
         return writer;
     },
     decode(input, length) {
-        const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
         let end = length === undefined ? reader.len : reader.pos + length;
         const message = createBaseCompositeDefinition();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
+                    if (tag != 8) {
+                        break;
+                    }
                     message.version = reader.int32();
-                    break;
+                    continue;
                 case 2:
+                    if (tag != 18) {
+                        break;
+                    }
                     message.components.push(CompositeComponent.decode(reader, reader.uint32()));
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
+                    continue;
+            }
+            if ((tag & 7) == 4 || tag == 0) {
+                break;
             }
+            reader.skipType(tag & 7);
         }
         return message;
     },

package/dist/composite/proto/gen/google/protobuf/struct.gen.js

@@ -49,7 +49,7 @@ function createBaseStruct() {
  */
 export const Struct = {
     encode(message, writer = _m0.Writer.create()) {
-        message.fields.forEach((value, key) => {
+        (message.fields).forEach((value, key) => {
             if (value !== undefined) {
                 Struct_FieldsEntry.encode({ key: key, value }, writer.uint32(10).fork()).ldelim();
             }
@@ -57,22 +57,26 @@ export const Struct = {
         return writer;
     },
     decode(input, length) {
-        const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
         let end = length === undefined ? reader.len : reader.pos + length;
         const message = createBaseStruct();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
+                    if (tag != 10) {
+                        break;
+                    }
                     const entry1 = Struct_FieldsEntry.decode(reader, reader.uint32());
                     if (entry1.value !== undefined) {
                         message.fields.set(entry1.key, entry1.value);
                     }
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
+                    continue;
+            }
+            if ((tag & 7) == 4 || tag == 0) {
+                break;
             }
+            reader.skipType(tag & 7);
         }
         return message;
     },
@@ -133,22 +137,29 @@ export const Struct_FieldsEntry = {
         return writer;
     },
     decode(input, length) {
-        const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
         let end = length === undefined ? reader.len : reader.pos + length;
         const message = createBaseStruct_FieldsEntry();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
+                    if (tag != 10) {
+                        break;
+                    }
                     message.key = reader.string();
-                    break;
+                    continue;
                 case 2:
+                    if (tag != 18) {
+                        break;
+                    }
                     message.value = Value.unwrap(Value.decode(reader, reader.uint32()));
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
+                    continue;
+            }
+            if ((tag & 7) == 4 || tag == 0) {
+                break;
             }
+            reader.skipType(tag & 7);
         }
         return message;
     },
@@ -173,55 +184,76 @@ function createBaseValue() {
  */
 export const Value = {
     encode(message, writer = _m0.Writer.create()) {
-        if (message.kind?.$case === "nullValue") {
-            writer.uint32(8).int32(message.kind.nullValue);
-        }
-        if (message.kind?.$case === "numberValue") {
-            writer.uint32(17).double(message.kind.numberValue);
-        }
-        if (message.kind?.$case === "stringValue") {
-            writer.uint32(26).string(message.kind.stringValue);
-        }
-        if (message.kind?.$case === "boolValue") {
-            writer.uint32(32).bool(message.kind.boolValue);
-        }
-        if (message.kind?.$case === "structValue") {
-            Struct.encode(Struct.wrap(message.kind.structValue), writer.uint32(42).fork()).ldelim();
-        }
-        if (message.kind?.$case === "listValue") {
-            ListValue.encode(ListValue.wrap(message.kind.listValue), writer.uint32(50).fork()).ldelim();
+        switch (message.kind?.$case) {
+            case "nullValue":
+                writer.uint32(8).int32(message.kind.nullValue);
+                break;
+            case "numberValue":
+                writer.uint32(17).double(message.kind.numberValue);
+                break;
+            case "stringValue":
+                writer.uint32(26).string(message.kind.stringValue);
+                break;
+            case "boolValue":
+                writer.uint32(32).bool(message.kind.boolValue);
+                break;
+            case "structValue":
+                Struct.encode(Struct.wrap(message.kind.structValue), writer.uint32(42).fork()).ldelim();
+                break;
+            case "listValue":
+                ListValue.encode(ListValue.wrap(message.kind.listValue), writer.uint32(50).fork()).ldelim();
+                break;
         }
         return writer;
     },
     decode(input, length) {
-        const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
         let end = length === undefined ? reader.len : reader.pos + length;
         const message = createBaseValue();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
+                    if (tag != 8) {
+                        break;
+                    }
                     message.kind = { $case: "nullValue", nullValue: reader.int32() };
-                    break;
+                    continue;
                 case 2:
+                    if (tag != 17) {
+                        break;
+                    }
                     message.kind = { $case: "numberValue", numberValue: reader.double() };
-                    break;
+                    continue;
                 case 3:
+                    if (tag != 26) {
+                        break;
+                    }
                     message.kind = { $case: "stringValue", stringValue: reader.string() };
-                    break;
+                    continue;
                 case 4:
+                    if (tag != 32) {
+                        break;
+                    }
                     message.kind = { $case: "boolValue", boolValue: reader.bool() };
-                    break;
+                    continue;
                 case 5:
+                    if (tag != 42) {
+                        break;
+                    }
                     message.kind = { $case: "structValue", structValue: Struct.unwrap(Struct.decode(reader, reader.uint32())) };
-                    break;
+                    continue;
                 case 6:
+                    if (tag != 50) {
+                        break;
+                    }
                     message.kind = { $case: "listValue", listValue: ListValue.unwrap(ListValue.decode(reader, reader.uint32())) };
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
+                    continue;
+            }
+            if ((tag & 7) == 4 || tag == 0) {
+                break;
             }
+            reader.skipType(tag & 7);
         }
         return message;
     },
@@ -319,19 +351,23 @@ export const ListValue = {
         return writer;
     },
     decode(input, length) {
-        const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
         let end = length === undefined ? reader.len : reader.pos + length;
         const message = createBaseListValue();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
+                    if (tag != 10) {
+                        break;
+                    }
                     message.values.push(Value.unwrap(Value.decode(reader, reader.uint32())));
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
+                    continue;
+            }
+            if ((tag & 7) == 4 || tag == 0) {
+                break;
             }
+            reader.skipType(tag & 7);
         }
         return message;
     },
@@ -348,13 +384,18 @@ export const ListValue = {
         }
         return obj;
     },
-    wrap(value) {
+    wrap(array) {
         const result = createBaseListValue();
-        result.values = value ?? [];
+        result.values = array ?? [];
         return result;
     },
     unwrap(message) {
-        return message.values;
+        if (message?.hasOwnProperty("values") && Array.isArray(message.values)) {
+            return message.values;
+        }
+        else {
+            return message;
+        }
     },
 };
 var tsProtoGlobalThis = (() => {

package/dist/engine/component.d.ts

@@ -115,6 +115,13 @@ export interface LastWriteWinElementSetComponentDefinition<T> extends BaseCompon
      * @param entity - Entity to get the component from
      */
     getMutableOrNull(entity: Entity): T | null;
+    /**
+     * Get the mutable component of the entity. If the entity doesn't have the component, it's created.
+     * - Internal comment: This method adds the &lt;entity,component&gt; to the list to be reviewed next frame
+     * @param entity - Entity to get the component from
+     * @param val - The initial value if it doesn't exist
+     */
+    getOrCreateMutable(entity: Entity, initialValue?: T): T;
 }
 /**
  * @public

package/dist/engine/lww-element-set-component-definition.js

@@ -222,6 +222,16 @@ export function createComponentDefinitionFromSchema(componentName, componentId,
             dirtyIterator.add(entity);
             return component;
         },
+        getOrCreateMutable(entity, value) {
+            const component = data.get(entity);
+            if (!component) {
+                return this.create(entity, value);
+            }
+            else {
+                dirtyIterator.add(entity);
+                return component;
+            }
+        },
         getMutable(entity) {
             const component = this.getMutableOrNull(entity);
             if (component === null) {

package/dist/schemas/buildSchema.d.ts

@@ -5,3 +5,7 @@ import { ISchema, JsonSchemaExtended } from './ISchema';
  * @returns a ISchema or fail for unsupported json-schema
  */
 export declare function jsonSchemaToSchema(jsonSchema: JsonSchemaExtended): ISchema<any>;
+export declare function mutateValues(jsonSchema: JsonSchemaExtended, value: unknown, mutateFn: (value: unknown, valueType: JsonSchemaExtended) => {
+    changed: boolean;
+    value?: any;
+}): void;

package/dist/schemas/buildSchema.js

@@ -61,3 +61,37 @@ export function jsonSchemaToSchema(jsonSchema) {
     }
     throw new Error(`${jsonSchema.serializationType} is not supported as reverse schema generation.`);
 }
+export function mutateValues(jsonSchema, value, mutateFn) {
+    if (jsonSchema.serializationType === 'map') {
+        const mapJsonSchema = jsonSchema;
+        const mapValue = value;
+        for (const key in mapJsonSchema.properties) {
+            const valueType = mapJsonSchema.properties[key];
+            if (valueType.serializationType === 'array' || valueType.serializationType === 'map') {
+                mutateValues(mapJsonSchema.properties[key], mapValue[key], mutateFn);
+            }
+            else {
+                const newValue = mutateFn(mapValue[key], valueType);
+                if (newValue.changed) {
+                    mapValue[key] = newValue.value;
+                }
+            }
+        }
+    }
+    else if (jsonSchema.serializationType === 'array') {
+        const withItemsJsonSchema = jsonSchema;
+        const arrayValue = value;
+        const nestedMutateValues = withItemsJsonSchema.items.serializationType === 'array' || withItemsJsonSchema.items.serializationType === 'map';
+        for (let i = 0, n = arrayValue.length; i < n; i++) {
+            if (nestedMutateValues) {
+                mutateValues(withItemsJsonSchema.items, arrayValue[i], mutateFn);
+            }
+            else {
+                const newValue = mutateFn(arrayValue[i], withItemsJsonSchema.items);
+                if (newValue.changed) {
+                    arrayValue[i] = newValue.value;
+                }
+            }
+        }
+    }
+}

package/dist/schemas/index.d.ts

@@ -55,4 +55,21 @@ export declare namespace Schemas {
      * @returns a ISchema or fail for unsupported json-schema
      */
     const fromJson: (json: JsonSchemaExtended) => ISchema<unknown>;
+    /**
+     * @public
+     *
+     * Traverses and mutates values in a JSON schema-based structure, applying the given mutation function to each value.
+     * The function is designed to work with nested maps and arrays, recursively processing each element.
+     *
+     * @param jsonSchema - The JSON schema object that describes the structure of the value.
+     *                   It must have a serializationType of 'map', 'array', or other custom types like 'entity'.
+     * @param value - The value to be mutated, which should conform to the provided JSON schema.
+     * @param mutateFn - A function that takes a value and its corresponding valueType (JsonSchemaExtended) as arguments
+     *                   and returns a tuple [boolean, any]. The boolean indicates whether the mutation should be applied,
+     *                   and the second element is the mutated value.
+     */
+    const mutateNestedValues: (jsonSchema: JsonSchemaExtended, value: unknown, mutateFn: (value: unknown, valueType: JsonSchemaExtended) => {
+        changed: boolean;
+        value?: any;
+    }) => void;
 }

package/dist/schemas/index.js

@@ -11,7 +11,7 @@ import { QuaternionSchema } from './custom/Quaternion';
 import { Vector3Schema } from './custom/Vector3';
 import { IMap } from './Map';
 import { IOptional } from './Optional';
-import { jsonSchemaToSchema } from './buildSchema';
+import { jsonSchemaToSchema, mutateValues } from './buildSchema';
 /**
  * @public
  */
@@ -61,4 +61,18 @@ export var Schemas;
      * @returns a ISchema or fail for unsupported json-schema
      */
     Schemas.fromJson = jsonSchemaToSchema;
+    /**
+     * @public
+     *
+     * Traverses and mutates values in a JSON schema-based structure, applying the given mutation function to each value.
+     * The function is designed to work with nested maps and arrays, recursively processing each element.
+     *
+     * @param jsonSchema - The JSON schema object that describes the structure of the value.
+     *                   It must have a serializationType of 'map', 'array', or other custom types like 'entity'.
+     * @param value - The value to be mutated, which should conform to the provided JSON schema.
+     * @param mutateFn - A function that takes a value and its corresponding valueType (JsonSchemaExtended) as arguments
+     *                   and returns a tuple [boolean, any]. The boolean indicates whether the mutation should be applied,
+     *                   and the second element is the mutated value.
+     */
+    Schemas.mutateNestedValues = mutateValues;
 })(Schemas || (Schemas = {}));

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@dcl/ecs",
   "description": "Decentraland ECS",
-  "version": "7.1.4-4670008948.commit-217b840",
+  "version": "7.1.4-4672664161.commit-7ba5d40",
   "author": "DCL",
   "bugs": "https://github.com/decentraland/ecs/issues",
   "dependencies": {
-    "@dcl/js-runtime": "7.1.4-4670008948.commit-217b840"
+    "@dcl/js-runtime": "7.1.4-4672664161.commit-7ba5d40"
   },
   "devDependencies": {
     "ts-proto": "^1.122.0"
@@ -34,5 +34,5 @@
   },
   "types": "./dist/index.d.ts",
   "typings": "./dist/index.d.ts",
-  "commit": "217b84016c8133b7605bff70f5851981972a2614"
+  "commit": "7ba5d4034c725e90e5c8ca8e37275bbb5e20b297"
 }