@dcl/content-validator 6.0.2 → 6.0.3-18319340951.commit-fde8bc9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/validations/ADR51.d.ts +1 -0
- package/dist/validations/ADR51.d.ts.map +1 -1
- package/dist/validations/ADR51.js +2 -1
- package/dist/validations/ADR51.js.map +1 -1
- package/dist/validations/access/common/stores.js +1 -1
- package/dist/validations/access/common/stores.js.map +1 -1
- package/dist/validations/access/subgraph/the-graph-client.d.ts.map +1 -1
- package/dist/validations/access/subgraph/the-graph-client.js +2 -1
- package/dist/validations/access/subgraph/the-graph-client.js.map +1 -1
- package/dist/validations/items/items.d.ts.map +1 -1
- package/dist/validations/items/items.js +6 -2
- package/dist/validations/items/items.js.map +1 -1
- package/dist/validations/items/wearables.d.ts.map +1 -1
- package/dist/validations/items/wearables.js +2 -2
- package/dist/validations/items/wearables.js.map +1 -1
- package/dist/validations/outfits.d.ts.map +1 -1
- package/dist/validations/outfits.js +1 -1
- package/dist/validations/outfits.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ADR51.d.ts","sourceRoot":"","sources":["../../src/validations/ADR51.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAE5G,KAAK,MAAM,GAAG;IACZ,QAAQ,EAAE,gBAAgB,CAAC,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,CAAC,CAAA;IAChF,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,eAAe,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"ADR51.d.ts","sourceRoot":"","sources":["../../src/validations/ADR51.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAE5G,KAAK,MAAM,GAAG;IACZ,QAAQ,EAAE,gBAAgB,CAAC,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,CAAC,CAAA;IAChF,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,eAAe,IAAI,CAAA;AAChC,eAAO,MAAM,oBAAoB,IAAI,CAAA;AAErC,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAyBvD,CAAA"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.entityParameters = exports.skinMaxSizeInMb = void 0;
|
|
3
|
+
exports.entityParameters = exports.thumbnailMaxSizeInMb = exports.skinMaxSizeInMb = void 0;
|
|
4
4
|
const schemas_1 = require("@dcl/schemas");
|
|
5
5
|
exports.skinMaxSizeInMb = 9;
|
|
6
|
+
exports.thumbnailMaxSizeInMb = 1;
|
|
6
7
|
exports.entityParameters = {
|
|
7
8
|
scene: {
|
|
8
9
|
validate: schemas_1.Scene.validate,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ADR51.js","sourceRoot":"","sources":["../../src/validations/ADR51.ts"],"names":[],"mappings":";;;AAAA,0CAA4G;AAO/F,QAAA,eAAe,GAAG,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"ADR51.js","sourceRoot":"","sources":["../../src/validations/ADR51.ts"],"names":[],"mappings":";;;AAAA,0CAA4G;AAO/F,QAAA,eAAe,GAAG,CAAC,CAAA;AACnB,QAAA,oBAAoB,GAAG,CAAC,CAAA;AAExB,QAAA,gBAAgB,GAA+B;IAC1D,KAAK,EAAE;QACL,QAAQ,EAAE,eAAK,CAAC,QAAQ;QACxB,WAAW,EAAE,EAAE;KAChB;IACD,OAAO,EAAE;QACP,QAAQ,EAAE,iBAAO,CAAC,QAAQ;QAC1B,WAAW,EAAE,CAAC;KACf;IACD,QAAQ,EAAE;QACR,QAAQ,EAAE,kBAAQ,CAAC,QAAQ;QAC3B,WAAW,EAAE,CAAC;KACf;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,eAAK,CAAC,QAAQ;QACxB,WAAW,EAAE,CAAC;KACf;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,eAAK,CAAC,QAAQ;QACxB,WAAW,EAAE,CAAC;KACf;IACD,OAAO,EAAE;QACP,QAAQ,EAAE,iBAAO,CAAC,QAAQ;QAC1B,WAAW,EAAE,CAAC;KACf;CACF,CAAA"}
|
|
@@ -26,7 +26,7 @@ function createStoreValidateFn({ externalCalls }) {
|
|
|
26
26
|
const offchainAsset = await parseUrnNoFail(pointer);
|
|
27
27
|
if (!offchainAsset)
|
|
28
28
|
return (0, types_1.validationFailed)(`Store pointers should be a urn, for example (urn:decentraland:off-chain:marketplace-stores:{address}). Invalid pointer: ${pointer}`);
|
|
29
|
-
if (offchainAsset.id !== ethAddress)
|
|
29
|
+
if (offchainAsset.id.toLowerCase() !== ethAddress.toLowerCase())
|
|
30
30
|
return (0, types_1.validationFailed)(`You can only alter your own store. The pointer address and the signer address are different (address:${offchainAsset.id.toLowerCase()} signer: ${ethAddress.toLowerCase()}).`);
|
|
31
31
|
return types_1.OK;
|
|
32
32
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stores.js","sourceRoot":"","sources":["../../../../src/validations/access/common/stores.ts"],"names":[],"mappings":";;;AAAA,oDAA2D;AAC3D,0CAOuB;AAEvB,KAAK,UAAU,cAAc,CAAC,OAAe;IAC3C,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAQ,EAAC,OAAO,CAAC,CAAA;QACtC,IAAI,CAAC,MAAM,IAAI,MAAM,EAAE,IAAI,KAAK,WAAW;YAAE,OAAO,SAAS,CAAA;QAC7D,OAAO,MAAM,CAAA;KACd;IAAC,MAAM,GAAE;AACZ,CAAC;AAED;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,EACpC,aAAa,EACqC;IAClD,OAAO,KAAK,UAAU,UAAU,CAAC,UAAgC;QAC/D,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAA;QAC3C,MAAM,UAAU,GAAG,aAAa,CAAC,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;QAEnE,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YACvB,OAAO,IAAA,wBAAgB,EAAC,kEAAkE,QAAQ,EAAE,CAAC,CAAA;QAEvG,MAAM,OAAO,GAAW,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAA;QACjD,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,CAAA;QAEnD,IAAI,CAAC,aAAa;YAChB,OAAO,IAAA,wBAAgB,EACrB,2HAA2H,OAAO,EAAE,CACrI,CAAA;QAEH,IAAI,aAAa,CAAC,EAAE,KAAK,UAAU;
|
|
1
|
+
{"version":3,"file":"stores.js","sourceRoot":"","sources":["../../../../src/validations/access/common/stores.ts"],"names":[],"mappings":";;;AAAA,oDAA2D;AAC3D,0CAOuB;AAEvB,KAAK,UAAU,cAAc,CAAC,OAAe;IAC3C,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAQ,EAAC,OAAO,CAAC,CAAA;QACtC,IAAI,CAAC,MAAM,IAAI,MAAM,EAAE,IAAI,KAAK,WAAW;YAAE,OAAO,SAAS,CAAA;QAC7D,OAAO,MAAM,CAAA;KACd;IAAC,MAAM,GAAE;AACZ,CAAC;AAED;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,EACpC,aAAa,EACqC;IAClD,OAAO,KAAK,UAAU,UAAU,CAAC,UAAgC;QAC/D,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAA;QAC3C,MAAM,UAAU,GAAG,aAAa,CAAC,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;QAEnE,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YACvB,OAAO,IAAA,wBAAgB,EAAC,kEAAkE,QAAQ,EAAE,CAAC,CAAA;QAEvG,MAAM,OAAO,GAAW,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAA;QACjD,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,CAAA;QAEnD,IAAI,CAAC,aAAa;YAChB,OAAO,IAAA,wBAAgB,EACrB,2HAA2H,OAAO,EAAE,CACrI,CAAA;QAEH,IAAI,aAAa,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,WAAW,EAAE;YAC7D,OAAO,IAAA,wBAAgB,EACrB,wGAAwG,aAAa,CAAC,EAAE,CAAC,WAAW,EAAE,YAAY,UAAU,CAAC,WAAW,EAAE,IAAI,CAC/K,CAAA;QAEH,OAAO,UAAE,CAAA;IACX,CAAC,CAAA;AACH,CAAC;AAzBD,sDAyBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"the-graph-client.d.ts","sourceRoot":"","sources":["../../../../src/validations/access/subgraph/the-graph-client.ts"],"names":[],"mappings":"AAGA,OAAO,EAAoB,+BAA+B,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAGlG,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,OAAO,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CACnB,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,eACnB,KAAK,+BAA+B,EAAE,MAAM,GAAG,WAAW,CAAC,KACtE,
|
|
1
|
+
{"version":3,"file":"the-graph-client.d.ts","sourceRoot":"","sources":["../../../../src/validations/access/subgraph/the-graph-client.ts"],"names":[],"mappings":"AAGA,OAAO,EAAoB,+BAA+B,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAGlG,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,OAAO,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CACnB,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,eACnB,KAAK,+BAA+B,EAAE,MAAM,GAAG,WAAW,CAAC,KACtE,cAwOF,CAAA"}
|
|
@@ -110,7 +110,8 @@ const createTheGraphClient = (components) => {
|
|
|
110
110
|
for (const urn of urnsToCheck) {
|
|
111
111
|
if (urn.type === 'blockchain-collection-v1-item' || urn.type === 'blockchain-collection-v2-item') {
|
|
112
112
|
const { assetUrn, tokenId } = (0, urn_resolver_1.getTokenIdAndAssetUrn)(urn.urn);
|
|
113
|
-
if (!ownedItemsArray.some((item) => item.urn === assetUrn
|
|
113
|
+
if (!ownedItemsArray.some((item) => item.urn.toLowerCase() === assetUrn.toLowerCase() &&
|
|
114
|
+
item.tokenId.toLowerCase() === tokenId.toLowerCase())) {
|
|
114
115
|
notOwned.push(urn.urn);
|
|
115
116
|
}
|
|
116
117
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"the-graph-client.js","sourceRoot":"","sources":["../../../../src/validations/access/subgraph/the-graph-client.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"the-graph-client.js","sourceRoot":"","sources":["../../../../src/validations/access/subgraph/the-graph-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"items.d.ts","sourceRoot":"","sources":["../../../src/validations/items/items.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,0BAA0B,EAG1B,UAAU,EAGX,MAAM,aAAa,CAAA;AAIpB,2EAA2E;AAC3E,wBAAgB,gEAAgE,CAC9E,UAAU,EAAE,IAAI,CAAC,0BAA0B,EAAE,eAAe,CAAC,GAC5D,UAAU,
|
|
1
|
+
{"version":3,"file":"items.d.ts","sourceRoot":"","sources":["../../../src/validations/items/items.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,0BAA0B,EAG1B,UAAU,EAGX,MAAM,aAAa,CAAA;AAIpB,2EAA2E;AAC3E,wBAAgB,gEAAgE,CAC9E,UAAU,EAAE,IAAI,CAAC,0BAA0B,EAAE,eAAe,CAAC,GAC5D,UAAU,CAiDZ;AAKD,wBAAgB,6CAA6C,CAC3D,UAAU,EAAE,IAAI,CAAC,0BAA0B,EAAE,eAAe,GAAG,MAAM,CAAC,GACrE,UAAU,CA2CZ;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,0BAA0B,GAAG,UAAU,CAQxF"}
|
|
@@ -24,7 +24,7 @@ function createDeploymentMaxSizeExcludingThumbnailIsNotExceededValidateFn(compon
|
|
|
24
24
|
maxSizeInMB = ADR51_1.skinMaxSizeInMb;
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
|
-
const modelSizeInMB = maxSizeInMB -
|
|
27
|
+
const modelSizeInMB = maxSizeInMB - ADR51_1.thumbnailMaxSizeInMb;
|
|
28
28
|
const metadata = entity.metadata;
|
|
29
29
|
const thumbnailHash = entity.content?.find(({ file }) => file === metadata.thumbnail)?.hash;
|
|
30
30
|
if (!thumbnailHash) {
|
|
@@ -34,6 +34,10 @@ function createDeploymentMaxSizeExcludingThumbnailIsNotExceededValidateFn(compon
|
|
|
34
34
|
if (typeof totalDeploymentSizeInB === 'string')
|
|
35
35
|
return (0, types_1.validationFailed)(totalDeploymentSizeInB);
|
|
36
36
|
const thumbnailSize = deployment.files.get(thumbnailHash)?.byteLength ?? 0;
|
|
37
|
+
// Check if thumbnail size exceeds the allowed maximum
|
|
38
|
+
if (thumbnailSize > ADR51_1.thumbnailMaxSizeInMb * 1024 * 1024) {
|
|
39
|
+
return (0, types_1.validationFailed)(`The thumbnail is too big. The maximum allowed size for thumbnail model files is ${ADR51_1.thumbnailMaxSizeInMb} MB. You can upload up to ${ADR51_1.thumbnailMaxSizeInMb * 1024 * 1024} bytes but you tried to upload ${thumbnailSize}.`);
|
|
40
|
+
}
|
|
37
41
|
const modelSize = totalDeploymentSizeInB - thumbnailSize;
|
|
38
42
|
if (modelSize > modelSizeInMB * 1024 * 1024)
|
|
39
43
|
return (0, types_1.validationFailed)(`The deployment is too big. The maximum allowed size for ${entity.type} model files is ${modelSizeInMB} MB. You can upload up to ${modelSizeInMB * 1024 * 1024} bytes but you tried to upload ${modelSize}.`);
|
|
@@ -43,7 +47,7 @@ function createDeploymentMaxSizeExcludingThumbnailIsNotExceededValidateFn(compon
|
|
|
43
47
|
}
|
|
44
48
|
exports.createDeploymentMaxSizeExcludingThumbnailIsNotExceededValidateFn = createDeploymentMaxSizeExcludingThumbnailIsNotExceededValidateFn;
|
|
45
49
|
/** Validate that given item deployment includes a thumbnail with valid format and size */
|
|
46
|
-
const maxThumbnailSizeInB = 1024;
|
|
50
|
+
const maxThumbnailSizeInB = ADR51_1.thumbnailMaxSizeInMb * 1024;
|
|
47
51
|
function createThumbnailMaxSizeIsNotExceededValidateFn(components) {
|
|
48
52
|
const { externalCalls, logs } = components;
|
|
49
53
|
const logger = logs.getLogger('thumbnail size validator');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"items.js","sourceRoot":"","sources":["../../../src/validations/items/items.ts"],"names":[],"mappings":";;;;;;AAAA,0CAAqE;AAErE,kDAAyB;AACzB,0BAA4C;AAC5C,uCAOoB;AACpB,
|
|
1
|
+
{"version":3,"file":"items.js","sourceRoot":"","sources":["../../../src/validations/items/items.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wearables.d.ts","sourceRoot":"","sources":["../../../src/validations/items/wearables.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wearables.d.ts","sourceRoot":"","sources":["../../../src/validations/items/wearables.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAA;AAC5C,OAAO,EAAwB,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAGtE,sEAAsE;AACtE,wBAAsB,uCAAuC,CAC3D,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAe7B;AAED,wBAAsB,8CAA8C,CAClE,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAwC7B;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,4BAG9B,CAAA"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.wearableValidateFn = exports.thirdPartyWearableMerkleProofContentValidateFn = exports.wearableRepresentationContentValidateFn = void 0;
|
|
4
|
+
const hashing_1 = require("@dcl/hashing");
|
|
4
5
|
const schemas_1 = require("@dcl/schemas");
|
|
5
6
|
const types_1 = require("../../types");
|
|
6
7
|
const validations_1 = require("../validations");
|
|
7
|
-
const hashing_1 = require("@dcl/hashing");
|
|
8
8
|
/** Validate wearable representations are referencing valid content */
|
|
9
9
|
async function wearableRepresentationContentValidateFn(deployment) {
|
|
10
10
|
const { entity } = deployment;
|
|
@@ -31,7 +31,7 @@ async function thirdPartyWearableMerkleProofContentValidateFn(deployment) {
|
|
|
31
31
|
}
|
|
32
32
|
const wearableMetadata = entity.metadata;
|
|
33
33
|
// Check the id in the metadata matches the pointer being deployed
|
|
34
|
-
if (wearableMetadata.id !== entity.pointers[0]) {
|
|
34
|
+
if (wearableMetadata.id.toLowerCase() !== entity.pointers[0].toLowerCase()) {
|
|
35
35
|
return (0, types_1.validationFailed)(`The id '${wearableMetadata.id}' does not match the pointer '${entity.pointers[0]}'`);
|
|
36
36
|
}
|
|
37
37
|
// Check the content files declared inside the metadata is exactly the same as the files uploaded with the entity
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wearables.js","sourceRoot":"","sources":["../../../src/validations/items/wearables.ts"],"names":[],"mappings":";;;AAAA,0CAAkF;AAElF,uCAAsE;AACtE,gDAAmE;
|
|
1
|
+
{"version":3,"file":"wearables.js","sourceRoot":"","sources":["../../../src/validations/items/wearables.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outfits.d.ts","sourceRoot":"","sources":["../../src/validations/outfits.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"outfits.d.ts","sourceRoot":"","sources":["../../src/validations/outfits.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,0BAA0B,EAC1B,oBAAoB,EAEpB,UAAU,EACV,kBAAkB,EAEnB,MAAM,UAAU,CAAA;AAGjB,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,IAAI,CAAC,0BAA0B,EAAE,eAAe,CAAC,GAC5D,UAAU,CA4BZ;AAED,wBAAsB,mCAAmC,CACvD,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAQ7B;AAED,wBAAsB,6CAA6C,CACjE,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAO7B;AAED,wBAAsB,oDAAoD,CACxE,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAW7B;AAED,eAAO,MAAM,mCAAmC,YA2B9C,CAAA;AAEF,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,0BAA0B,GAAG,UAAU,CAU1F"}
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createOutfitsValidateFn = exports.outfitsWearableUrnsIncludeTokenIdFn = exports.outfitsNumberOfNamesForExtraSlotsIsCorrectValidateFn = exports.outfitSlotsAreBetween0and9inclusiveValidateFn = exports.outfitSlotsAreNotRepeatedValidateFn = exports.createOutfitsPointerValidateFn = void 0;
|
|
4
4
|
const schemas_1 = require("@dcl/schemas");
|
|
5
|
+
const urn_resolver_1 = require("@dcl/urn-resolver");
|
|
5
6
|
const types_1 = require("../types");
|
|
6
7
|
const validations_1 = require("./validations");
|
|
7
|
-
const urn_resolver_1 = require("@dcl/urn-resolver");
|
|
8
8
|
function createOutfitsPointerValidateFn(components) {
|
|
9
9
|
return async function validateFn(deployment) {
|
|
10
10
|
const pointers = deployment.entity.pointers;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outfits.js","sourceRoot":"","sources":["../../src/validations/outfits.ts"],"names":[],"mappings":";;;AAAA,0CAA8D;AAC9D,oCAOiB;AACjB,+CAAuF;
|
|
1
|
+
{"version":3,"file":"outfits.js","sourceRoot":"","sources":["../../src/validations/outfits.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dcl/content-validator",
|
|
3
|
-
"version": "6.0.
|
|
3
|
+
"version": "6.0.3-18319340951.commit-fde8bc9",
|
|
4
4
|
"description": "Catalyst content validations",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "dist/index.d.ts",
|
|
@@ -53,5 +53,5 @@
|
|
|
53
53
|
"files": [
|
|
54
54
|
"dist"
|
|
55
55
|
],
|
|
56
|
-
"commit": "
|
|
56
|
+
"commit": "fde8bc965ed5dcd8078fcdb2e735cfcc28ded4d9"
|
|
57
57
|
}
|