@dcl/sdk 7.0.0-2956503917.commit-061e376 → 7.0.0-2966684214.commit-a567432

package/dist/ecs7/proto-definitions/MeshCollider.proto

@@ -0,0 +1,35 @@
+syntax = "proto3";
+
+import "common/id.proto";
+option (ecs_component_id) = 1019;
+
+enum ColliderLayer {
+    None = 0;
+    Pointer = 1;
+    Physics = 2;
+}
+
+message PBMeshCollider {    
+    message BoxMesh {
+    }
+
+    message CylinderMesh {
+        optional float radius_top = 1; // default=1.0
+        optional float radius_bottom = 2; // default=1.0
+    }
+
+    message PlaneMesh {
+    }
+
+    message SphereMesh {
+    }
+
+    optional int32 collision_mask = 1; // default = ColliderLayer.Physics | ColliderLayer.Pointer
+    
+    oneof mesh {
+        BoxMesh box = 2;
+        SphereMesh sphere = 3;
+        CylinderMesh cylinder = 4;
+        PlaneMesh plane = 5;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/sdk",
-  "version": "7.0.0-2956503917.commit-061e376",
+  "version": "7.0.0-2966684214.commit-a567432",
   "description": "",
   "main": "dist/src/index.js",
   "typings": "dist/index.d.ts",
@@ -27,8 +27,8 @@
     "src/cli/**/*.js"
   ],
   "dependencies": {
-    "@dcl/amd": "6.11.5-2956503917.commit-061e376",
-    "@dcl/build-ecs": "6.11.5-2956503917.commit-061e376",
+    "@dcl/amd": "6.11.5-2966684214.commit-a567432",
+    "@dcl/build-ecs": "6.11.5-2966684214.commit-a567432",
     "@dcl/kernel": "1.0.0-2638443584.commit-696a74b",
     "@dcl/posix": "^1.0.4",
     "@dcl/schemas": "4.8.0",
@@ -38,5 +38,5 @@
     "ignore": "^5.1.8"
   },
   "minCliVersion": "3.10.2",
-  "commit": "061e376a76165b398a714ab71202cafdd9adc673"
+  "commit": "a567432815d98b2eb5bdfd38b44f4439f938c2b3"
 }

package/src/cli/mock-catalyst/index.js

@@ -47,7 +47,7 @@ var mockCatalyst = function (app, baseFolders) {
         res.json([
             {
                 serverName: 'localhost',
-                url: "http://" + req.get('host'),
+                url: "http://".concat(req.get('host')),
                 layer: 'stub',
                 usersCount: 0,
                 maxUsers: 100,
@@ -58,7 +58,7 @@ var mockCatalyst = function (app, baseFolders) {
     app.get('/lambdas/contracts/servers', function (req, res) {
         res.json([
             {
-                address: "http://" + req.get('host'),
+                address: "http://".concat(req.get('host')),
                 owner: '0x0000000000000000000000000000000000000000',
                 id: '0x0000000000000000000000000000000000000000000000000000000000000000'
             }
@@ -70,7 +70,7 @@ var mockCatalyst = function (app, baseFolders) {
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    baseUrl = req.protocol + "://" + req.get('host') + "/content/contents";
+                    baseUrl = "".concat(req.protocol, "://").concat(req.get('host'), "/content/contents");
                     _b.label = 1;
                 case 1:
                     _b.trys.push([1, 6, , 7]);
@@ -81,7 +81,7 @@ var mockCatalyst = function (app, baseFolders) {
                 case 2:
                     previewWearables = _b.sent();
                     if (!(previewWearables.length === 1)) return [3 /*break*/, 5];
-                    return [4 /*yield*/, fetch("https://peer.decentraland.org" + req.originalUrl)];
+                    return [4 /*yield*/, fetch("https://peer.decentraland.org".concat(req.originalUrl))];
                 case 3: return [4 /*yield*/, (_b.sent()).json()];
                 case 4:
                     deployedProfile = _b.sent();

package/src/cli/setupUtils.js

@@ -275,7 +275,7 @@ var downloadFile = function (url, path, timeout_seg) {
                     setTimeout(function () {
                         if (!finished) {
                             request.destroy();
-                            reject(new Error("Timeout " + url));
+                            reject(new Error("Timeout ".concat(url)));
                         }
                     }, timeout_seg * 1000);
                 })];

package/src/cli/wearables.js

@@ -60,15 +60,15 @@ var serveWearable = function (_a) {
     var wearableJson = JSON.parse(fs.readFileSync(wearableJsonPath).toString());
     if (!(0, exports.wearableValidator)(wearableJson)) {
         var errors = (exports.wearableValidator.errors || [])
-            .map(function (a) { return a.dataPath + " " + a.message; })
+            .map(function (a) { return "".concat(a.dataPath, " ").concat(a.message); })
             .join('');
         if (errors.length > 0) {
-            console.error("Unable to validate '" + wearableJsonPath + "' properly, please check it: " + errors);
+            console.error("Unable to validate '".concat(wearableJsonPath, "' properly, please check it: ").concat(errors));
         }
         else {
-            console.error("Unable to validate '" + wearableJsonPath + "' properly, please check it.");
+            console.error("Unable to validate '".concat(wearableJsonPath, "' properly, please check it."));
         }
-        throw new Error("Invalid wearable.json (" + wearableJson + ")");
+        throw new Error("Invalid wearable.json (".concat(wearableJson, ")"));
     }
     else {
     }
@@ -85,10 +85,10 @@ var serveWearable = function (_a) {
     var thumbnailFiltered = hashedFiles.filter(function ($) { return ($ === null || $ === void 0 ? void 0 : $.file) === wearableJson.thumbnail; });
     var thumbnail = thumbnailFiltered.length > 0 &&
         ((_b = thumbnailFiltered[0]) === null || _b === void 0 ? void 0 : _b.hash) &&
-        baseUrl + "/" + thumbnailFiltered[0].hash;
+        "".concat(baseUrl, "/").concat(thumbnailFiltered[0].hash);
     var wearableJsonWithContents = __assign(__assign({}, wearableJson), { baseUrl: baseUrl, thumbnail: thumbnail, data: __assign(__assign({}, wearableJson.data), { thumbnail: thumbnail, scene: hashedFiles, baseUrl: baseUrl, representations: wearableJson.data.representations.map(function (representation) { return (__assign(__assign({}, representation), { contents: hashedFiles.map(function (file) { return ({
-                    key: "" + (file === null || file === void 0 ? void 0 : file.file),
-                    url: baseUrl + "/" + (file === null || file === void 0 ? void 0 : file.hash)
+                    key: "".concat(file === null || file === void 0 ? void 0 : file.file),
+                    url: "".concat(baseUrl, "/").concat(file === null || file === void 0 ? void 0 : file.hash)
                 }); }) })); }) }) });
     return wearableJsonWithContents;
 };
@@ -109,7 +109,7 @@ var getAllPreviewWearables = function (_a) {
             ret.push(serveWearable({ wearableJsonPath: wearableJsonPath, baseUrl: baseUrl }));
         }
         catch (err) {
-            console.error("Couldn't mock the wearable " + wearableJsonPath + ". Please verify the correct format and scheme.", err);
+            console.error("Couldn't mock the wearable ".concat(wearableJsonPath, ". Please verify the correct format and scheme."), err);
         }
     }
     return ret;
@@ -119,7 +119,7 @@ var mockPreviewWearables = function (app, baseFolders) {
     app.use('/preview-wearables/:id', function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
         var baseUrl, wearables, wearableId;
         return __generator(this, function (_a) {
-            baseUrl = req.protocol + "://" + req.get('host') + "/content/contents";
+            baseUrl = "".concat(req.protocol, "://").concat(req.get('host'), "/content/contents");
             wearables = (0, exports.getAllPreviewWearables)({
                 baseUrl: baseUrl,
                 baseFolders: baseFolders
@@ -134,7 +134,7 @@ var mockPreviewWearables = function (app, baseFolders) {
     app.use('/preview-wearables', function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
         var baseUrl;
         return __generator(this, function (_a) {
-            baseUrl = req.protocol + "://" + req.get('host') + "/content/contents";
+            baseUrl = "".concat(req.protocol, "://").concat(req.get('host'), "/content/contents");
             return [2 /*return*/, res.json({
                     ok: true,
                     data: (0, exports.getAllPreviewWearables)({ baseUrl: baseUrl, baseFolders: baseFolders })

package/src/setupProxy.js

@@ -151,7 +151,7 @@ var setupProxy = function (dcl, app) {
         var featureFlagResponse, featureFlagBody;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, fetch("https://feature-flags.decentraland.zone/" + req.params.file)];
+                case 0: return [4 /*yield*/, fetch("https://feature-flags.decentraland.zone/".concat(req.params.file))];
                 case 1:
                     featureFlagResponse = _a.sent();
                     return [4 /*yield*/, featureFlagResponse.json()];

package/types/ecs7/index.d.ts

@@ -229,6 +229,8 @@ declare namespace Components {
     /** @public */
     const Material: ComponentDefinition<ISchema<PBMaterial>, PBMaterial>;
     /** @public */
+    const MeshCollider: ComponentDefinition<ISchema<PBMeshCollider>, PBMeshCollider>;
+    /** @public */
     const MeshRenderer: ComponentDefinition<ISchema<PBMeshRenderer>, Partial<PBMeshRenderer>>;
     /** @public */
     const NFTShape: ComponentDefinition<ISchema<PBNFTShape>, PBNFTShape>;
@@ -407,14 +409,36 @@ declare interface CreateByteBufferOptions {
 /** @public */
 declare const CylinderShape: ComponentDefinition<ISchema<PBCylinderShape>, PBCylinderShape>;
 
+/**
+ * @public
+ */
+declare type DeepReadonly<T> = T extends ReadonlyPrimitive ? T : T extends Map<infer K, infer V> ? DeepReadonlyMap<K, V> : T extends Set<infer M> ? DeepReadonlySet<M> : DeepReadonlyObject<T>;
+
 /**
  * Make each field readonly deeply
  * @public
  */
-declare type DeepReadonly<T> = {
-    readonly [P in keyof T]: DeepReadonly<T[P]>;
+declare type DeepReadonly_2<T> = {
+    readonly [P in keyof T]: DeepReadonly_2<T[P]>;
 };
 
+/**
+ * @public
+ */
+declare type DeepReadonlyMap<K, V> = ReadonlyMap<DeepReadonly<K>, DeepReadonly<V>>;
+
+/**
+ * @public
+ */
+declare type DeepReadonlyObject<T> = {
+    readonly [K in keyof T]: DeepReadonly<T[K]>;
+};
+
+/**
+ * @public
+ */
+declare type DeepReadonlySet<T> = ReadonlySet<DeepReadonly<T>>;
+
 declare function defineSdkComponents(engine: PreEngine): {
     Transform: ComponentDefinition<ISchema<TransformType>, Partial<TransformType>>;
     MeshRenderer: ComponentDefinition<ISchema<PBMeshRenderer>, Partial<PBMeshRenderer>>;
@@ -430,6 +454,7 @@ declare function defineSdkComponents(engine: PreEngine): {
     CylinderShape: ComponentDefinition<ISchema<PBCylinderShape>, PBCylinderShape>;
     GLTFShape: ComponentDefinition<ISchema<PBGLTFShape>, PBGLTFShape>;
     Material: ComponentDefinition<ISchema<PBMaterial>, PBMaterial>;
+    MeshCollider: ComponentDefinition<ISchema<PBMeshCollider>, PBMeshCollider>;
     NFTShape: ComponentDefinition<ISchema<PBNFTShape>, PBNFTShape>;
     OnPointerDown: ComponentDefinition<ISchema<PBOnPointerDown>, PBOnPointerDown>;
     OnPointerDownResult: ComponentDefinition<ISchema<PBOnPointerDownResult>, PBOnPointerDownResult>;
@@ -462,10 +487,6 @@ declare type EcsResult<T extends ISchema> = T extends ISchema ? ReturnType<T['de
  */
 declare function Engine({ transports }?: IEngineParams): IEngine;
 
-/**
- * @alpha * This file initialization is an alpha one. This is based on the old-ecs
- * init and it'll be changing.
- */
 declare const engine: IEngine;
 
 /**
@@ -570,7 +591,7 @@ declare type IEngine = {
      *
      * ```
      */
-    defineComponent<T extends Spec, ConstructorType = Partial<Result<T>>>(spec: Spec, componentId: number, constructorDefault?: Partial<Result<T>>): ComponentDefinition<ISchema<Result<T>>, ConstructorType>;
+    defineComponent<T extends Spec, ConstructorType = Partial<Result<T>>>(spec: T, componentId: number, constructorDefault?: Partial<Result<T>>): ComponentDefinition<ISchema<Result<T>>, ConstructorType>;
     /**
      * Define a component and add it to the engine.
      * @param spec An object with schema fields
@@ -601,11 +622,11 @@ declare type IEngine = {
      * Example:
      * ```ts
      * for (const [entity, boxShape, transform] of engine.getEntitiesWith(BoxShape, Transform)) {
-     * // the properties of boxShape and transform are read only
+     *   // the properties of boxShape and transform are read only
      * }
      * ```
      */
-    getEntitiesWith<T extends [ComponentDefinition, ...ComponentDefinition[]]>(...components: T): Iterable<[Entity, ...DeepReadonly<ComponentSchema<T>>]>;
+    getEntitiesWith<T extends [ComponentDefinition, ...ComponentDefinition[]]>(...components: T): Iterable<[Entity, ...ReadonlyComponentSchema<T>]>;
     baseComponents: SdkComponents;
 };
 
@@ -701,7 +722,7 @@ declare namespace Matrix {
         _isIdentity3x2Dirty: boolean;
         _m: Matrix4x4;
     };
-    type ReadonlyMatrix = DeepReadonly<MutableMatrix>;
+    type ReadonlyMatrix = DeepReadonly_2<MutableMatrix>;
     /**
      * Gets the internal data of the matrix
      */
@@ -1384,6 +1405,9 @@ declare namespace Matrix {
     function toggleProjectionMatrixHandInPlace(self: MutableMatrix): void;
 }
 
+/** @public */
+declare const MeshCollider: ComponentDefinition<ISchema<PBMeshCollider>, PBMeshCollider>;
+
 /** @public */
 declare const MeshRenderer: ComponentDefinition<ISchema<PBMeshRenderer>, Partial<PBMeshRenderer>>;
 
@@ -1573,6 +1597,31 @@ declare interface PBMaterial_Texture {
     filterMode?: FilterMode | undefined;
 }
 
+declare interface PBMeshCollider {
+    /** default = ColliderLayer.Physics | ColliderLayer.Pointer */
+    collisionMask?: number | undefined;
+    box: PBMeshCollider_BoxMesh | undefined;
+    sphere: PBMeshCollider_SphereMesh | undefined;
+    cylinder: PBMeshCollider_CylinderMesh | undefined;
+    plane: PBMeshCollider_PlaneMesh | undefined;
+}
+
+declare interface PBMeshCollider_BoxMesh {
+}
+
+declare interface PBMeshCollider_CylinderMesh {
+    /** default=1.0 */
+    radiusTop?: number | undefined;
+    /** default=1.0 */
+    radiusBottom?: number | undefined;
+}
+
+declare interface PBMeshCollider_PlaneMesh {
+}
+
+declare interface PBMeshCollider_SphereMesh {
+}
+
 declare interface PBMeshRenderer {
     box: PBMeshRenderer_BoxMesh | undefined;
     sphere: PBMeshRenderer_SphereMesh | undefined;
@@ -1740,7 +1789,7 @@ declare namespace Plane {
          */
         d: number;
     };
-    type ReadonlyPlane = DeepReadonly<MutablePlane>;
+    type ReadonlyPlane = DeepReadonly_2<MutablePlane>;
     /**
      * Creates a Plane object according to the given floats a, b, c, d and the plane equation : ax + by + cz + d = 0
      * @param a - a component of the plane
@@ -1860,7 +1909,7 @@ declare function preEngine(): {
     removeSystem: (selector: string | Update) => boolean;
     defineComponent: <T extends Spec, ConstructorType = Partial<Result<T>>>(spec: T, componentId: number, constructorDefault?: ConstructorType | undefined) => ComponentDefinition<ISchema<Result<T>>, ConstructorType>;
     defineComponentFromSchema: <T_1 extends ISchema<any>, ConstructorType_1 = EcsResult<T_1>>(spec: T_1, componentId: number, constructorDefault?: ConstructorType_1 | undefined) => ComponentDefinition<T_1, ConstructorType_1>;
-    getEntitiesWith: <T_2 extends [ComponentDefinition<ISchema<any>, any>, ...ComponentDefinition<ISchema<any>, any>[]]>(...components: T_2) => Iterable<[Entity, ...DeepReadonly<ComponentSchema<T_2>>]>;
+    getEntitiesWith: <T_2 extends [ComponentDefinition<ISchema<any>, any>, ...ComponentDefinition<ISchema<any>, any>[]]>(...components: T_2) => Iterable<[Entity, ...ReadonlyComponentSchema<T_2>]>;
     getComponent: <T_3 extends ISchema<any>>(componentId: number) => ComponentDefinition<T_3, EcsResult<T_3>>;
     removeComponentDefinition: (componentId: number) => void;
 };
@@ -1881,7 +1930,7 @@ declare namespace Quaternion {
     /**
      * @public
      */
-    export type ReadonlyQuaternion = DeepReadonly<MutableQuaternion>;
+    export type ReadonlyQuaternion = DeepReadonly_2<MutableQuaternion>;
     /**
      * Creates a new Quaternion from the given floats
      * @param x - defines the first component (0 by default)
@@ -2035,6 +2084,18 @@ declare namespace Quaternion {
  */
 declare const RAD2DEG: number;
 
+/**
+ * @public
+ */
+declare type ReadonlyComponentSchema<T extends [ComponentDefinition, ...ComponentDefinition[]]> = {
+    [K in keyof T]: T[K] extends ComponentDefinition ? ReturnType<T[K]['get']> : never;
+};
+
+/**
+ * @public
+ */
+declare type ReadonlyPrimitive = number | string | number[] | string[] | boolean | boolean[];
+
 declare type ReceiveMessage = {
     type: WireMessage.Enum;
     entity: Entity;
@@ -2199,7 +2260,7 @@ declare namespace Vector3 {
     /**
      * @public
      */
-    export type ReadonlyVector3 = DeepReadonly<MutableVector3>;
+    export type ReadonlyVector3 = DeepReadonly_2<MutableVector3>;
     /**
      * Creates a new Vector3 object from the given x, y, z (floats) coordinates.
      * @param x - defines the first coordinates (on X axis)

package/types/tsconfig.ecs7.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es2018",
+    "target": "es2020",
     "module": "amd",
     "moduleResolution": "classic",
     "pretty": true,
@@ -37,4 +37,4 @@
       "."
     ]
   }
-}
+}