@dcl/opscli 1.0.0-10506787171.commit-f460b87 → 1.0.0-10507092676.commit-a604d88
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/bin.d.ts.map +1 -1
- package/dist/bin.js +42 -18
- package/dist/bin.js.map +1 -1
- package/dist/commands/check-ab-conversion.d.ts.map +1 -1
- package/dist/commands/check-ab-conversion.js +14 -14
- package/dist/commands/check-ab-conversion.js.map +1 -1
- package/dist/commands/circleci.js +10 -10
- package/dist/commands/circleci.js.map +1 -1
- package/dist/commands/concat-snapshots.js +12 -12
- package/dist/commands/concat-snapshots.js.map +1 -1
- package/dist/commands/deploy-entity.js +25 -25
- package/dist/commands/deploy-entity.js.map +1 -1
- package/dist/commands/download-entity.js +7 -7
- package/dist/commands/parameters-manager.js +22 -22
- package/dist/commands/parameters-manager.js.map +1 -1
- package/dist/commands/pointer-consistency.js +8 -8
- package/dist/commands/pointer-consistency.js.map +1 -1
- package/dist/commands/query-rollout.js +6 -6
- package/dist/commands/queue-ab-conversion-about.js +17 -17
- package/dist/commands/queue-ab-conversion-snapshot.d.ts.map +1 -1
- package/dist/commands/queue-ab-conversion-snapshot.js +35 -33
- package/dist/commands/queue-ab-conversion-snapshot.js.map +1 -1
- package/dist/commands/queue-ab-conversion.d.ts.map +1 -1
- package/dist/commands/queue-ab-conversion.js +20 -18
- package/dist/commands/queue-ab-conversion.js.map +1 -1
- package/dist/commands/secret-manager.js +28 -28
- package/dist/commands/secret-manager.js.map +1 -1
- package/dist/commands/update-renderer-upm.d.ts.map +1 -1
- package/dist/commands/update-renderer-upm.js +14 -14
- package/dist/commands/update-renderer-upm.js.map +1 -1
- package/dist/commands/wearables-consistency.js +5 -5
- package/dist/commands/wearables-consistency.js.map +1 -1
- package/dist/helpers/ago.js +10 -10
- package/dist/helpers/ago.js.map +1 -1
- package/dist/helpers/assert.d.ts +1 -1
- package/dist/helpers/asset-bundles.d.ts +1 -1
- package/dist/helpers/asset-bundles.d.ts.map +1 -1
- package/dist/helpers/asset-bundles.js +10 -9
- package/dist/helpers/asset-bundles.js.map +1 -1
- package/dist/helpers/catalysts.js +4 -4
- package/dist/helpers/downloads.d.ts +1 -1
- package/dist/helpers/downloads.js +6 -6
- package/dist/helpers/env-domains.js +9 -9
- package/dist/helpers/fileWriter.d.ts.map +1 -1
- package/dist/helpers/fileWriter.js +4 -1
- package/dist/helpers/fileWriter.js.map +1 -1
- package/dist/helpers/parse-utils.js +6 -6
- package/dist/helpers/parse-utils.js.map +1 -1
- package/dist/helpers/parseEntityUrn.d.ts.map +1 -1
- package/dist/helpers/parseEntityUrn.js.map +1 -1
- package/dist/helpers/rollouts.d.ts.map +1 -1
- package/dist/helpers/rollouts.js +2 -2
- package/dist/helpers/sign-gpg.js +5 -5
- package/package.json +15 -11
|
@@ -12,18 +12,18 @@ const bin_1 = require("../bin");
|
|
|
12
12
|
const parseEntityUrn_1 = require("../helpers/parseEntityUrn");
|
|
13
13
|
exports.default = async () => {
|
|
14
14
|
const args = (0, arg_1.default)({
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
15
|
+
'--about-url': String,
|
|
16
|
+
'--ab-server': String,
|
|
17
|
+
'--token': String,
|
|
18
|
+
'--force': Boolean,
|
|
19
|
+
'--prioritize': Boolean
|
|
20
20
|
});
|
|
21
|
-
const aboutUrl = args[
|
|
22
|
-
const token = args[
|
|
23
|
-
const abServer = args[
|
|
24
|
-
const force = args[
|
|
25
|
-
const shouldPrioritize = !!args[
|
|
26
|
-
(0, assert_1.assert)(!!token,
|
|
21
|
+
const aboutUrl = args['--about-url'];
|
|
22
|
+
const token = args['--token'];
|
|
23
|
+
const abServer = args['--ab-server'] || asset_bundles_1.multiPlatformFlag;
|
|
24
|
+
const force = args['--force'] || false;
|
|
25
|
+
const shouldPrioritize = !!args['--prioritize'];
|
|
26
|
+
(0, assert_1.assert)(!!token, '--token is missing');
|
|
27
27
|
console.log(`> Parameters:`);
|
|
28
28
|
console.log(` Asset bundle server: ${abServer}`);
|
|
29
29
|
console.log(` Force rebuild: ${force}`);
|
|
@@ -42,13 +42,13 @@ exports.default = async () => {
|
|
|
42
42
|
authChain: [
|
|
43
43
|
{
|
|
44
44
|
type: schemas_1.AuthLinkType.SIGNER,
|
|
45
|
-
payload:
|
|
46
|
-
signature:
|
|
47
|
-
}
|
|
48
|
-
]
|
|
45
|
+
payload: '0x0000000000000000000000000000000000000000',
|
|
46
|
+
signature: ''
|
|
47
|
+
}
|
|
48
|
+
]
|
|
49
49
|
},
|
|
50
|
-
contentServerUrls: [parsed.baseUrl ||
|
|
51
|
-
force
|
|
50
|
+
contentServerUrls: [parsed.baseUrl || 'https://peer.decentraland.org/content'],
|
|
51
|
+
force
|
|
52
52
|
}, token, shouldPrioritize);
|
|
53
53
|
console.log(` Result: ${JSON.stringify(result)}`);
|
|
54
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-ab-conversion-snapshot.d.ts","sourceRoot":"","sources":["../../src/commands/queue-ab-conversion-snapshot.ts"],"names":[],"mappings":";AAWA,
|
|
1
|
+
{"version":3,"file":"queue-ab-conversion-snapshot.d.ts","sourceRoot":"","sources":["../../src/commands/queue-ab-conversion-snapshot.ts"],"names":[],"mappings":";AAWA,wBAmGC"}
|
|
@@ -14,29 +14,29 @@ const process_1 = require("process");
|
|
|
14
14
|
// PROCESS AN ENTIRE SNAPSHOT
|
|
15
15
|
exports.default = async () => {
|
|
16
16
|
const args = (0, arg_1.default)({
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
17
|
+
'--snapshot': String,
|
|
18
|
+
'--world-name': String,
|
|
19
|
+
'--content-server': String,
|
|
20
|
+
'--start-position': String,
|
|
21
|
+
'--start-date': String,
|
|
22
|
+
'--grep': String,
|
|
23
|
+
'--ab-server': String,
|
|
24
|
+
'--token': String,
|
|
25
|
+
'--prioritize': Boolean
|
|
26
26
|
});
|
|
27
|
-
const snapshot = args[
|
|
28
|
-
const token = args[
|
|
29
|
-
const abServer = args[
|
|
30
|
-
const shouldPrioritize = !!args[
|
|
31
|
-
(0, assert_1.assert)(!!snapshot,
|
|
32
|
-
(0, assert_1.assert)(!!token,
|
|
27
|
+
const snapshot = args['--snapshot'] || 'wearable';
|
|
28
|
+
const token = args['--token'];
|
|
29
|
+
const abServer = args['--ab-server'] || asset_bundles_1.multiPlatformFlag;
|
|
30
|
+
const shouldPrioritize = !!args['--prioritize'];
|
|
31
|
+
(0, assert_1.assert)(!!snapshot, '--snapshot is missing');
|
|
32
|
+
(0, assert_1.assert)(!!token, '--token is missing');
|
|
33
33
|
console.log(`> Parameters:`);
|
|
34
|
-
const contentUrl = (args[
|
|
34
|
+
const contentUrl = (args['--content-server'] || 'https://peer.decentraland.org/content').replace(/\/$/, '');
|
|
35
35
|
console.log(` Entity type: ${snapshot}`);
|
|
36
36
|
console.log(` Content server: ${contentUrl}`);
|
|
37
37
|
console.log(` Asset bundle server: ${abServer}`);
|
|
38
|
-
if (snapshot
|
|
39
|
-
|
|
38
|
+
if (snapshot === 'worlds') {
|
|
39
|
+
const specificWorld = args['--world-name'];
|
|
40
40
|
if (specificWorld) {
|
|
41
41
|
await processWorld(abServer, token, specificWorld, shouldPrioritize);
|
|
42
42
|
}
|
|
@@ -50,9 +50,9 @@ exports.default = async () => {
|
|
|
50
50
|
const snapshotReq = await (0, undici_1.fetch)(`${contentUrl}/snapshots`);
|
|
51
51
|
if (!snapshotReq.ok)
|
|
52
52
|
throw new bin_1.CliError(`Invalid snapshot response from ${contentUrl}/snapshots`);
|
|
53
|
-
const snapshotsJson = await snapshotReq.json();
|
|
53
|
+
const snapshotsJson = (await snapshotReq.json());
|
|
54
54
|
const startDate = (args['--start-date'] ? new Date(args['--start-date']).getTime() : 0) || -1;
|
|
55
|
-
|
|
55
|
+
const snapshotEntitiesToProcess = Array();
|
|
56
56
|
// select valid snapshots based on the start date
|
|
57
57
|
for (let i = 0; i < snapshotsJson.length; i++) {
|
|
58
58
|
const value = snapshotsJson[i];
|
|
@@ -62,11 +62,11 @@ exports.default = async () => {
|
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
64
|
const snapshotsCount = snapshotEntitiesToProcess.length;
|
|
65
|
-
if (snapshotsCount
|
|
65
|
+
if (snapshotsCount === 0) {
|
|
66
66
|
throw new bin_1.CliError(`No snapshot entity found at time ${startDate}`);
|
|
67
67
|
}
|
|
68
|
-
|
|
69
|
-
|
|
68
|
+
const argStartPosition = args['--start-position'];
|
|
69
|
+
const argGrep = args['--grep'];
|
|
70
70
|
let shouldSkipUntilStartPosition = argStartPosition || false;
|
|
71
71
|
for (let i = 0; i < snapshotsCount; i++) {
|
|
72
72
|
const hash = snapshotEntitiesToProcess[i].hash;
|
|
@@ -80,14 +80,14 @@ exports.default = async () => {
|
|
|
80
80
|
return;
|
|
81
81
|
const entity = JSON.parse(line);
|
|
82
82
|
if (shouldSkipUntilStartPosition) {
|
|
83
|
-
if (entity.entityId
|
|
83
|
+
if (entity.entityId === argStartPosition) {
|
|
84
84
|
shouldSkipUntilStartPosition = false;
|
|
85
85
|
}
|
|
86
86
|
else {
|
|
87
87
|
return;
|
|
88
88
|
}
|
|
89
89
|
}
|
|
90
|
-
if (startDate <= entity.entityTimestamp && entity.entityType
|
|
90
|
+
if (startDate <= entity.entityTimestamp && entity.entityType === snapshot) {
|
|
91
91
|
await tryRetryQueueConversion(abServer, entity.entityId, contentUrl, token, shouldPrioritize);
|
|
92
92
|
console.log(` (${i + 1}/${snapshotsCount}) [${percent}%]`, entity.entityId, entity.pointers[0]);
|
|
93
93
|
}
|
|
@@ -100,13 +100,13 @@ exports.default = async () => {
|
|
|
100
100
|
console.log(`Finished!`);
|
|
101
101
|
};
|
|
102
102
|
const processWorlds = async (abServer, token, prioritize) => {
|
|
103
|
-
console.log(
|
|
103
|
+
console.log('Processing worlds.');
|
|
104
104
|
const worldsIndexUrl = 'https://worlds-content-server.decentraland.org/index';
|
|
105
105
|
const worldsContentUrl = 'https://worlds-content-server.decentraland.org/';
|
|
106
106
|
const worldsReq = await (0, undici_1.fetch)(worldsIndexUrl);
|
|
107
107
|
if (!worldsReq.ok)
|
|
108
108
|
throw new bin_1.CliError(`Invalid response from ${worldsIndexUrl}`);
|
|
109
|
-
const worldsJson = await worldsReq.json();
|
|
109
|
+
const worldsJson = (await worldsReq.json());
|
|
110
110
|
if (!worldsJson.data)
|
|
111
111
|
throw new bin_1.CliError(`Json has invalid format`);
|
|
112
112
|
const worlds = worldsJson.data;
|
|
@@ -130,12 +130,12 @@ const processWorld = async (abServer, token, worldName, prioritize) => {
|
|
|
130
130
|
const worldsReq = await (0, undici_1.fetch)(worldsIndexUrl);
|
|
131
131
|
if (!worldsReq.ok)
|
|
132
132
|
throw new bin_1.CliError(`Invalid response from ${worldsIndexUrl}`);
|
|
133
|
-
const worldsJson = await worldsReq.json();
|
|
133
|
+
const worldsJson = (await worldsReq.json());
|
|
134
134
|
if (!worldsJson.data)
|
|
135
135
|
throw new bin_1.CliError(`Json has invalid format`);
|
|
136
136
|
const worlds = worldsJson.data;
|
|
137
137
|
if (worldName) {
|
|
138
|
-
const world = worlds.find(f => f.name
|
|
138
|
+
const world = worlds.find((f) => f.name === worldName);
|
|
139
139
|
if (!world) {
|
|
140
140
|
console.error(`World ${worldName} was not found in index. Cannot process.`);
|
|
141
141
|
}
|
|
@@ -159,19 +159,21 @@ const tryRetryQueueConversion = async (abServer, entityId, contentUrl, token, pr
|
|
|
159
159
|
try {
|
|
160
160
|
await (0, asset_bundles_1.queueConversions)(abServer, {
|
|
161
161
|
entity: {
|
|
162
|
-
entityId: entityId,
|
|
162
|
+
entityId: entityId,
|
|
163
|
+
authChain: [
|
|
163
164
|
{
|
|
164
165
|
type: schemas_1.AuthLinkType.SIGNER,
|
|
165
166
|
payload: '0x0000000000000000000000000000000000000000',
|
|
166
167
|
signature: ''
|
|
167
168
|
}
|
|
168
169
|
]
|
|
169
|
-
},
|
|
170
|
+
},
|
|
171
|
+
contentServerUrls: [contentUrl]
|
|
170
172
|
}, token, prioritize);
|
|
171
173
|
}
|
|
172
174
|
catch (error) {
|
|
173
175
|
console.log(`> Unexpected error, retrying in 5 seconds...`);
|
|
174
|
-
await new Promise(f => setTimeout(f, 5000));
|
|
176
|
+
await new Promise((f) => setTimeout(f, 5000));
|
|
175
177
|
await tryRetryQueueConversion(abServer, entityId, contentUrl, token, prioritize, retryCount + 1);
|
|
176
178
|
}
|
|
177
179
|
};
|
|
@@ -215,7 +217,7 @@ const processSnapshot = async (url, processLine, retryCount = 0, skipToIndex = -
|
|
|
215
217
|
}
|
|
216
218
|
catch (error) {
|
|
217
219
|
console.error(`Failed downloading snapshot ${url}: ${error} \n - Retrying in 5 seconds...`);
|
|
218
|
-
await new Promise(f => setTimeout(f, 5000));
|
|
220
|
+
await new Promise((f) => setTimeout(f, 5000));
|
|
219
221
|
await processSnapshot(url, processLine, retryCount + 1, index);
|
|
220
222
|
}
|
|
221
223
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-ab-conversion-snapshot.js","sourceRoot":"","sources":["../../src/commands/queue-ab-conversion-snapshot.ts"],"names":[],"mappings":";;;;;AAAA,0CAA2C;AAC3C,8CAAqB;AACrB,mCAA8B;AAC9B,gCAAiC;AACjC,8CAA0C;AAC1C,4DAA8E;AAC9E,mDAA8C;AAC9C,qCAA8B;AAE9B,6BAA6B;AAE7B,kBAAe,KAAK,IAAI,EAAE;IACxB,MAAM,IAAI,GAAG,IAAA,aAAG,EAAC;QACf,YAAY,EAAE,MAAM;QACpB,cAAc,EAAE,MAAM;QACtB,kBAAkB,EAAE,MAAM;QAC1B,kBAAkB,EAAE,MAAM;QAC1B,cAAc,EAAE,MAAM;QACtB,QAAQ,EAAE,MAAM;QAChB,aAAa,EAAE,MAAM;QACrB,SAAS,EAAE,MAAM;QACjB,cAAc,EAAE,OAAO;KACxB,CAAC,CAAA;IAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,UAAU,CAAA;IACjD,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAE,CAAA;IAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,iCAAiB,CAAA;IACzD,MAAM,gBAAgB,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"queue-ab-conversion-snapshot.js","sourceRoot":"","sources":["../../src/commands/queue-ab-conversion-snapshot.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-ab-conversion.d.ts","sourceRoot":"","sources":["../../src/commands/queue-ab-conversion.ts"],"names":[],"mappings":";AAMA,
|
|
1
|
+
{"version":3,"file":"queue-ab-conversion.d.ts","sourceRoot":"","sources":["../../src/commands/queue-ab-conversion.ts"],"names":[],"mappings":";AAMA,wBAmEC"}
|
|
@@ -10,24 +10,24 @@ const asset_bundles_1 = require("../helpers/asset-bundles");
|
|
|
10
10
|
const downloads_1 = require("../helpers/downloads");
|
|
11
11
|
exports.default = async () => {
|
|
12
12
|
const args = (0, arg_1.default)({
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
13
|
+
'--cid': [String],
|
|
14
|
+
'--pointer': [String],
|
|
15
|
+
'--content-server': String,
|
|
16
|
+
'--ab-server': String,
|
|
17
|
+
'--token': String,
|
|
18
|
+
'--prioritize': Boolean
|
|
19
19
|
});
|
|
20
|
-
const pointers = args[
|
|
21
|
-
const cids = args[
|
|
22
|
-
const token = args[
|
|
23
|
-
const abServer = args[
|
|
24
|
-
const shouldPrioritize = !!args[
|
|
25
|
-
(0, assert_1.assert)(!!token,
|
|
26
|
-
(0, assert_1.assert)(pointers.length > 0 || cids.length > 0,
|
|
20
|
+
const pointers = args['--pointer'] || [];
|
|
21
|
+
const cids = args['--cid'] || [];
|
|
22
|
+
const token = args['--token'];
|
|
23
|
+
const abServer = args['--ab-server'] || asset_bundles_1.multiPlatformFlag;
|
|
24
|
+
const shouldPrioritize = !!args['--prioritize'];
|
|
25
|
+
(0, assert_1.assert)(!!token, '--token is missing');
|
|
26
|
+
(0, assert_1.assert)(pointers.length > 0 || cids.length > 0, '--pointer or --cid are required');
|
|
27
27
|
console.log(`> Parameters:`);
|
|
28
|
-
pointers.length && console.log(` Pointers: ${pointers.join(
|
|
29
|
-
cids.length && console.log(` CIDs: ${cids.join(
|
|
30
|
-
const contentUrl = (args[
|
|
28
|
+
pointers.length && console.log(` Pointers: ${pointers.join(',')}`);
|
|
29
|
+
cids.length && console.log(` CIDs: ${cids.join(',')}`);
|
|
30
|
+
const contentUrl = (args['--content-server'] || 'https://peer.decentraland.org/content').replace(/\/$/, '');
|
|
31
31
|
console.log(` Content server: ${contentUrl}`);
|
|
32
32
|
console.log(` Asset bundle server: ${abServer}`);
|
|
33
33
|
const entityIdsToConvert = [];
|
|
@@ -49,14 +49,16 @@ exports.default = async () => {
|
|
|
49
49
|
console.log(`> Scheduling conversion of entity ${entity}`);
|
|
50
50
|
const result = await (0, asset_bundles_1.queueConversions)(abServer, {
|
|
51
51
|
entity: {
|
|
52
|
-
entityId: entity,
|
|
52
|
+
entityId: entity,
|
|
53
|
+
authChain: [
|
|
53
54
|
{
|
|
54
55
|
type: schemas_1.AuthLinkType.SIGNER,
|
|
55
56
|
payload: '0x0000000000000000000000000000000000000000',
|
|
56
57
|
signature: ''
|
|
57
58
|
}
|
|
58
59
|
]
|
|
59
|
-
},
|
|
60
|
+
},
|
|
61
|
+
contentServerUrls: [contentUrl]
|
|
60
62
|
}, token, shouldPrioritize);
|
|
61
63
|
console.log(` Result: ${JSON.stringify(result)}`);
|
|
62
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-ab-conversion.js","sourceRoot":"","sources":["../../src/commands/queue-ab-conversion.ts"],"names":[],"mappings":";;;;;AAAA,0CAA2D;AAC3D,8CAAqB;AACrB,8CAA0C;AAC1C,4DAA8E;AAC9E,oDAAwD;AAExD,kBAAe,KAAK,IAAI,EAAE;IACxB,MAAM,IAAI,GAAG,IAAA,aAAG,EAAC;QACf,OAAO,EAAE,CAAC,MAAM,CAAC;QACjB,WAAW,EAAE,CAAC,MAAM,CAAC;QACrB,kBAAkB,EAAE,MAAM;QAC1B,aAAa,EAAE,MAAM;QACrB,SAAS,EAAE,MAAM;QACjB,cAAc,EAAE,OAAO;KACxB,CAAC,CAAA;IAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAA;IACxC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAA;IAChC,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAE,CAAA;IAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,iCAAiB,CAAA;IACzD,MAAM,gBAAgB,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;IAE/C,IAAA,eAAM,EAAC,CAAC,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAA;IACrC,IAAA,eAAM,EAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,iCAAiC,CAAC,CAAA;IAEjF,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAA;IAC5C,QAAQ,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,iCAAiC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACrF,IAAI,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAC7E,MAAM,UAAU,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,uCAAuC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IAC3G,OAAO,CAAC,GAAG,CAAC,iCAAiC,UAAU,EAAE,CAAC,CAAA;IAC1D,OAAO,CAAC,GAAG,CAAC,iCAAiC,QAAQ,EAAE,CAAC,CAAA;IAExD,MAAM,kBAAkB,GAAa,EAAE,CAAA;IAEvC,IAAI,QAAQ,CAAC,MAAM,EAAE;QACnB,KAAK,MAAM,MAAM,IAAI,MAAM,IAAA,6BAAiB,EAAC,QAAQ,EAAE,UAAU,CAAC,EAAE;YAClE,OAAO,CAAC,GAAG,CAAC,UAAU,MAAM,CAAC,EAAE,QAAQ,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;YACzE,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;SACnC;KACF;IAED,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,IAAI,gBAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,gBAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAChD,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;SAC7B;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAG,sBAAsB,CAAC,CAAA;SACzD;KACF;IAED,KAAK,MAAM,MAAM,IAAI,kBAAkB,EAAE;QACvC,OAAO,CAAC,GAAG,CAAC,qCAAqC,MAAM,EAAE,CAAC,CAAA;QAC1D,MAAM,MAAM,GAAG,MAAM,IAAA,gCAAgB,
|
|
1
|
+
{"version":3,"file":"queue-ab-conversion.js","sourceRoot":"","sources":["../../src/commands/queue-ab-conversion.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,62 +11,62 @@ const env_domains_1 = require("../helpers/env-domains");
|
|
|
11
11
|
const sign_gpg_1 = require("../helpers/sign-gpg");
|
|
12
12
|
async function default_1() {
|
|
13
13
|
const args = (0, arg_1.default)({
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
14
|
+
'--env': String,
|
|
15
|
+
'--name': String,
|
|
16
|
+
'--secretFile': String,
|
|
17
|
+
'--secret': String,
|
|
18
|
+
'--update': Boolean,
|
|
19
|
+
'--delete': Boolean
|
|
20
20
|
});
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
const hasSecretValue = !!args[
|
|
24
|
-
const hasSecretFile = !!args[
|
|
25
|
-
const hasUpdate = !!args[
|
|
26
|
-
const hasDelete = !!args[
|
|
21
|
+
const env = (0, assert_1.assert)(args['--env'], '--env is missing');
|
|
22
|
+
const name = (0, assert_1.assert)(args['--name'], '--name is missing');
|
|
23
|
+
const hasSecretValue = !!args['--secret'];
|
|
24
|
+
const hasSecretFile = !!args['--secretFile'];
|
|
25
|
+
const hasUpdate = !!args['--update'];
|
|
26
|
+
const hasDelete = !!args['--delete'];
|
|
27
27
|
if (hasSecretValue && hasSecretFile) {
|
|
28
|
-
throw new Error(
|
|
28
|
+
throw new Error('Cannot use both --secretFile and --secret');
|
|
29
29
|
}
|
|
30
30
|
if (hasDelete && (hasSecretFile || hasSecretValue)) {
|
|
31
|
-
throw new Error(
|
|
31
|
+
throw new Error('Cannot use --delete with --secretFile or --secret');
|
|
32
32
|
}
|
|
33
33
|
if (hasDelete && hasUpdate) {
|
|
34
|
-
throw new Error(
|
|
34
|
+
throw new Error('Cannot use --delete with --update');
|
|
35
35
|
}
|
|
36
36
|
if (!hasDelete && !hasSecretValue && !hasSecretFile) {
|
|
37
|
-
throw new Error(
|
|
37
|
+
throw new Error('You must provide either --secretFile, --secret or --delete');
|
|
38
38
|
}
|
|
39
|
-
let secretContent =
|
|
39
|
+
let secretContent = '';
|
|
40
40
|
if (hasDelete) {
|
|
41
|
-
secretContent =
|
|
41
|
+
secretContent = '';
|
|
42
42
|
}
|
|
43
43
|
else if (hasSecretValue) {
|
|
44
|
-
secretContent = args[
|
|
44
|
+
secretContent = args['--secret'];
|
|
45
45
|
}
|
|
46
46
|
else if (hasSecretFile) {
|
|
47
|
-
secretContent = (await promises_1.default.readFile(args[
|
|
47
|
+
secretContent = (await promises_1.default.readFile(args['--secretFile'])).toString();
|
|
48
48
|
}
|
|
49
|
-
const fileContent = [env, name, secretContent].join(
|
|
49
|
+
const fileContent = [env, name, secretContent].join('\n');
|
|
50
50
|
const envDomain = (0, env_domains_1.tldFromEnv)(env);
|
|
51
51
|
const signed = await (0, sign_gpg_1.signGpgCleartext)(fileContent);
|
|
52
52
|
if (hasDelete) {
|
|
53
|
-
console.log(
|
|
53
|
+
console.log('> Deleting the secrets...');
|
|
54
54
|
}
|
|
55
55
|
else {
|
|
56
|
-
console.log(
|
|
56
|
+
console.log('> Uploading the secrets...');
|
|
57
57
|
}
|
|
58
58
|
const res = await (0, undici_1.fetch)(`https://ops-lambdas.decentraland.${envDomain}/secrets-manager`, {
|
|
59
|
-
method: hasDelete ?
|
|
60
|
-
body: signed.toString()
|
|
59
|
+
method: hasDelete ? 'DELETE' : hasUpdate ? 'PUT' : 'POST',
|
|
60
|
+
body: signed.toString()
|
|
61
61
|
});
|
|
62
62
|
const response = await res.text();
|
|
63
|
-
if (res.status
|
|
64
|
-
if (response.includes(
|
|
63
|
+
if (res.status !== 200) {
|
|
64
|
+
if (response.includes('ResourceExistsException')) {
|
|
65
65
|
throw new Error("That secret already exists, please use '--update' if you want to update it");
|
|
66
66
|
}
|
|
67
67
|
throw new Error(`An error has occured while uploading the secret: ${response}`);
|
|
68
68
|
}
|
|
69
|
-
console.log(
|
|
69
|
+
console.log(' OK! Response:');
|
|
70
70
|
console.log(response);
|
|
71
71
|
}
|
|
72
72
|
exports.default = default_1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secret-manager.js","sourceRoot":"","sources":["../../src/commands/secret-manager.ts"],"names":[],"mappings":";;;;;AAAA,8CAAqB;AACrB,2DAA4B;AAC5B,mCAA8B;AAC9B,8CAA0C;AAC1C,wDAAmD;AACnD,kDAAsD;AAEvC,KAAK;IAClB,MAAM,IAAI,GAAG,IAAA,aAAG,EAAC;QACf,OAAO,EAAE,MAAM;QACf,QAAQ,EAAE,MAAM;QAChB,cAAc,EAAE,MAAM;QACtB,UAAU,EAAE,MAAM;QAClB,UAAU,EAAE,OAAO;QACnB,UAAU,EAAE,OAAO;KACpB,CAAC,CAAA;IAEF,
|
|
1
|
+
{"version":3,"file":"secret-manager.js","sourceRoot":"","sources":["../../src/commands/secret-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-renderer-upm.d.ts","sourceRoot":"","sources":["../../src/commands/update-renderer-upm.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"update-renderer-upm.d.ts","sourceRoot":"","sources":["../../src/commands/update-renderer-upm.ts"],"names":[],"mappings":";AAsBA,wBA0CC"}
|
|
@@ -8,40 +8,40 @@ const assert_1 = require("../helpers/assert");
|
|
|
8
8
|
const simple_git_1 = __importDefault(require("simple-git"));
|
|
9
9
|
const bin_1 = require("../bin");
|
|
10
10
|
const parse_utils_1 = require("../helpers/parse-utils");
|
|
11
|
-
const git = (0, simple_git_1.default)(process.cwd(), { binary:
|
|
11
|
+
const git = (0, simple_git_1.default)(process.cwd(), { binary: 'git' });
|
|
12
12
|
const getLastCommitHash = async (branch) => {
|
|
13
|
-
const list = await git.listRemote([
|
|
13
|
+
const list = await git.listRemote(['https://github.com/decentraland/unity-renderer.git', branch]);
|
|
14
14
|
if (!list) {
|
|
15
15
|
throw new bin_1.CliError(`'${branch}' is not a valid branch.\n`);
|
|
16
16
|
}
|
|
17
|
-
return list.split(
|
|
17
|
+
return list.split('\t')[0];
|
|
18
18
|
};
|
|
19
19
|
exports.default = async () => {
|
|
20
20
|
const args = (0, arg_1.default)({
|
|
21
|
-
|
|
22
|
-
|
|
21
|
+
'--branch': String,
|
|
22
|
+
'--path': String
|
|
23
23
|
});
|
|
24
|
-
const branch = args[
|
|
25
|
-
const path = `${process.cwd()}/${args[
|
|
26
|
-
(0, assert_1.assert)(branch || path,
|
|
27
|
-
(0, assert_1.assert)((0, parse_utils_1.validDesktopLocation)(),
|
|
24
|
+
const branch = args['--branch'];
|
|
25
|
+
const path = `${process.cwd()}/${args['--path']}`;
|
|
26
|
+
(0, assert_1.assert)(branch || path, '--branch and --path are missing');
|
|
27
|
+
(0, assert_1.assert)((0, parse_utils_1.validDesktopLocation)(), 'Invalid explorer-desktop location. Please set your terminal to a valid explorer-desktop repository.');
|
|
28
28
|
if (branch) {
|
|
29
29
|
const commitHash = await getLastCommitHash(branch);
|
|
30
30
|
const gitUrl = `git+https://github.com/decentraland/unity-renderer.git?path=unity-renderer/Assets#${branch}`;
|
|
31
31
|
(0, parse_utils_1.changeJSONFile)(parse_utils_1.packagesLockPath, (content) => {
|
|
32
|
-
content[
|
|
33
|
-
content[
|
|
32
|
+
content['dependencies']['com.decentraland.unity-renderer']['hash'] = commitHash;
|
|
33
|
+
content['dependencies']['com.decentraland.unity-renderer']['version'] = gitUrl;
|
|
34
34
|
});
|
|
35
35
|
(0, parse_utils_1.changeJSONFile)(parse_utils_1.manifestPath, (content) => {
|
|
36
|
-
content[
|
|
36
|
+
content['dependencies']['com.decentraland.unity-renderer'] = gitUrl;
|
|
37
37
|
});
|
|
38
38
|
console.log(`Done! unity-renderer remote branch=${branch} hash=${commitHash}`);
|
|
39
39
|
}
|
|
40
40
|
else if (path) {
|
|
41
41
|
const upmPath = (0, parse_utils_1.getUPMRendererPath)(path);
|
|
42
|
-
(0, assert_1.assert)(upmPath,
|
|
42
|
+
(0, assert_1.assert)(upmPath, 'Invalid file path. Please, set the location for the unity-render UPM');
|
|
43
43
|
(0, parse_utils_1.changeJSONFile)(parse_utils_1.manifestPath, (content) => {
|
|
44
|
-
content[
|
|
44
|
+
content['dependencies']['com.decentraland.unity-renderer'] = `file:${upmPath}`;
|
|
45
45
|
});
|
|
46
46
|
console.log(`Done! unity-renderer local file=${upmPath}`);
|
|
47
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-renderer-upm.js","sourceRoot":"","sources":["../../src/commands/update-renderer-upm.ts"],"names":[],"mappings":";;;;;AAAA,8CAAqB;AACrB,8CAA0C;AAC1C,4DAAiD;AACjD,gCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"update-renderer-upm.js","sourceRoot":"","sources":["../../src/commands/update-renderer-upm.ts"],"names":[],"mappings":";;;;;AAAA,8CAAqB;AACrB,8CAA0C;AAC1C,4DAAiD;AACjD,gCAAiC;AACjC,wDAM+B;AAE/B,MAAM,GAAG,GAAc,IAAA,oBAAS,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;AAElE,MAAM,iBAAiB,GAAG,KAAK,EAAE,MAAc,EAAmB,EAAE;IAClE,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,CAAC,oDAAoD,EAAE,MAAM,CAAC,CAAC,CAAA;IACjG,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,cAAQ,CAAC,IAAI,MAAM,4BAA4B,CAAC,CAAA;KAC3D;IACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AAC5B,CAAC,CAAA;AAED,kBAAe,KAAK,IAAI,EAAE;IACxB,MAAM,IAAI,GAAG,IAAA,aAAG,EAAC;QACf,UAAU,EAAE,MAAM;QAClB,QAAQ,EAAE,MAAM;KACjB,CAAC,CAAA;IAEF,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAE,CAAA;IAChC,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAE,EAAE,CAAA;IAElD,IAAA,eAAM,EAAC,MAAM,IAAI,IAAI,EAAE,iCAAiC,CAAC,CAAA;IAEzD,IAAA,eAAM,EACJ,IAAA,kCAAoB,GAAE,EACtB,qGAAqG,CACtG,CAAA;IAED,IAAI,MAAM,EAAE;QACV,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,MAAM,CAAC,CAAA;QAElD,MAAM,MAAM,GAAG,qFAAqF,MAAM,EAAE,CAAA;QAE5G,IAAA,4BAAc,EAAC,8BAAgB,EAAE,CAAC,OAAY,EAAO,EAAE;YACrD,OAAO,CAAC,cAAc,CAAC,CAAC,iCAAiC,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU,CAAA;YAC/E,OAAO,CAAC,cAAc,CAAC,CAAC,iCAAiC,CAAC,CAAC,SAAS,CAAC,GAAG,MAAM,CAAA;QAChF,CAAC,CAAC,CAAA;QAEF,IAAA,4BAAc,EAAC,0BAAY,EAAE,CAAC,OAAY,EAAO,EAAE;YACjD,OAAO,CAAC,cAAc,CAAC,CAAC,iCAAiC,CAAC,GAAG,MAAM,CAAA;QACrE,CAAC,CAAC,CAAA;QAEF,OAAO,CAAC,GAAG,CAAC,sCAAsC,MAAM,SAAS,UAAU,EAAE,CAAC,CAAA;KAC/E;SAAM,IAAI,IAAI,EAAE;QACf,MAAM,OAAO,GAAG,IAAA,gCAAkB,EAAC,IAAI,CAAC,CAAA;QAExC,IAAA,eAAM,EAAC,OAAO,EAAE,sEAAsE,CAAC,CAAA;QAEvF,IAAA,4BAAc,EAAC,0BAAY,EAAE,CAAC,OAAY,EAAO,EAAE;YACjD,OAAO,CAAC,cAAc,CAAC,CAAC,iCAAiC,CAAC,GAAG,QAAQ,OAAO,EAAE,CAAA;QAChF,CAAC,CAAC,CAAA;QAEF,OAAO,CAAC,GAAG,CAAC,mCAAmC,OAAO,EAAE,CAAC,CAAA;KAC1D;AACH,CAAC,CAAA"}
|
|
@@ -8,16 +8,16 @@ const assert_1 = require("../helpers/assert");
|
|
|
8
8
|
const catalysts_1 = require("../helpers/catalysts");
|
|
9
9
|
async function default_1() {
|
|
10
10
|
const args = (0, arg_1.default)({
|
|
11
|
-
|
|
11
|
+
'--address': String
|
|
12
12
|
});
|
|
13
|
-
const address = (0, assert_1.assert)(args[
|
|
13
|
+
const address = (0, assert_1.assert)(args['--address'], '--address is missing');
|
|
14
14
|
const catalysts = await (0, catalysts_1.daoCatalysts)();
|
|
15
15
|
console.log(` Got ${catalysts.length} catalysts`);
|
|
16
16
|
console.log(`> Fetching wearables in every catalyst`);
|
|
17
17
|
const results = await Promise.allSettled(catalysts.map(($) => (0, catalysts_1.fetchWearablesByAddress)($.baseUrl, address)));
|
|
18
|
-
for (
|
|
19
|
-
if (result.status
|
|
20
|
-
console.log(' ' + result.value.baseUrl +
|
|
18
|
+
for (const result of results) {
|
|
19
|
+
if (result.status === 'fulfilled') {
|
|
20
|
+
console.log(' ' + result.value.baseUrl + ': ' + result.value.wearables.length);
|
|
21
21
|
}
|
|
22
22
|
else {
|
|
23
23
|
console.error(result.reason);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wearables-consistency.js","sourceRoot":"","sources":["../../src/commands/wearables-consistency.ts"],"names":[],"mappings":";;;;;AAAA,8CAAqB;AACrB,8CAA0C;AAC1C,oDAA4E;AAE7D,KAAK;IAClB,MAAM,IAAI,GAAG,IAAA,aAAG,EAAC;QACf,WAAW,EAAE,MAAM;KACpB,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,IAAA,eAAM,EAAC,IAAI,CAAC,WAAW,CAAC,EAAE,sBAAsB,CAAC,CAAA;IAEjE,MAAM,SAAS,GAAG,MAAM,IAAA,wBAAY,GAAE,CAAA;IAEtC,OAAO,CAAC,GAAG,CAAC,SAAS,SAAS,CAAC,MAAM,YAAY,CAAC,CAAA;IAClD,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAA;IAErD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,mCAAuB,EAAC,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;IAE3G,KAAK,
|
|
1
|
+
{"version":3,"file":"wearables-consistency.js","sourceRoot":"","sources":["../../src/commands/wearables-consistency.ts"],"names":[],"mappings":";;;;;AAAA,8CAAqB;AACrB,8CAA0C;AAC1C,oDAA4E;AAE7D,KAAK;IAClB,MAAM,IAAI,GAAG,IAAA,aAAG,EAAC;QACf,WAAW,EAAE,MAAM;KACpB,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,IAAA,eAAM,EAAC,IAAI,CAAC,WAAW,CAAC,EAAE,sBAAsB,CAAC,CAAA;IAEjE,MAAM,SAAS,GAAG,MAAM,IAAA,wBAAY,GAAE,CAAA;IAEtC,OAAO,CAAC,GAAG,CAAC,SAAS,SAAS,CAAC,MAAM,YAAY,CAAC,CAAA;IAClD,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAA;IAErD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,mCAAuB,EAAC,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;IAE3G,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,EAAE;YACjC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;SAChF;aAAM;YACL,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;SAC7B;KACF;AACH,CAAC;AArBD,4BAqBC"}
|
package/dist/helpers/ago.js
CHANGED
|
@@ -2,21 +2,21 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ago = void 0;
|
|
4
4
|
function format(diff, divisor, unit, past, future, isInTheFuture) {
|
|
5
|
-
|
|
5
|
+
const val = Math.round(Math.abs(diff) / divisor);
|
|
6
6
|
if (isInTheFuture)
|
|
7
|
-
return val <= 1 ? future :
|
|
8
|
-
return val <= 1 ? past : val +
|
|
7
|
+
return val <= 1 ? future : 'in ' + val + ' ' + unit + 's';
|
|
8
|
+
return val <= 1 ? past : val + ' ' + unit + 's ago';
|
|
9
9
|
}
|
|
10
10
|
const units = [
|
|
11
|
-
{ max: 2760000, value: 60000, name:
|
|
12
|
-
{ max: 72000000, value: 3600000, name:
|
|
13
|
-
{ max: 518400000, value: 86400000, name:
|
|
14
|
-
{ max: 2419200000, value: 604800000, name:
|
|
15
|
-
{ max: 28512000000, value: 2592000000, name:
|
|
11
|
+
{ max: 2760000, value: 60000, name: 'minute', past: 'a minute ago', future: 'in a minute' },
|
|
12
|
+
{ max: 72000000, value: 3600000, name: 'hour', past: 'an hour ago', future: 'in an hour' },
|
|
13
|
+
{ max: 518400000, value: 86400000, name: 'day', past: 'yesterday', future: 'tomorrow' },
|
|
14
|
+
{ max: 2419200000, value: 604800000, name: 'week', past: 'last week', future: 'in a week' },
|
|
15
|
+
{ max: 28512000000, value: 2592000000, name: 'month', past: 'last month', future: 'in a month' } // max: 11 months
|
|
16
16
|
];
|
|
17
17
|
function ago(date, max) {
|
|
18
18
|
const diff = Date.now() - date.getTime();
|
|
19
|
-
for (
|
|
19
|
+
for (let i = 0; i < units.length; i++) {
|
|
20
20
|
if (Math.abs(diff) < units[i].max || (max && units[i].name === max)) {
|
|
21
21
|
return format(diff, units[i].value, units[i].name, units[i].past, units[i].future, diff < 0);
|
|
22
22
|
}
|
|
@@ -29,7 +29,7 @@ function ago(date, max) {
|
|
|
29
29
|
// name: 'year',
|
|
30
30
|
// past: 'last year'
|
|
31
31
|
// }
|
|
32
|
-
return format(diff, 31536000000,
|
|
32
|
+
return format(diff, 31536000000, 'year', 'last year', 'in a year', diff < 0);
|
|
33
33
|
}
|
|
34
34
|
exports.ago = ago;
|
|
35
35
|
//# sourceMappingURL=ago.js.map
|
package/dist/helpers/ago.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ago.js","sourceRoot":"","sources":["../../src/helpers/ago.ts"],"names":[],"mappings":";;;AAAA,SAAS,MAAM,CAAC,IAAY,EAAE,OAAe,EAAE,IAAY,EAAE,IAAY,EAAE,MAAc,EAAE,aAAsB;IAC/G,
|
|
1
|
+
{"version":3,"file":"ago.js","sourceRoot":"","sources":["../../src/helpers/ago.ts"],"names":[],"mappings":";;;AAAA,SAAS,MAAM,CAAC,IAAY,EAAE,OAAe,EAAE,IAAY,EAAE,IAAY,EAAE,MAAc,EAAE,aAAsB;IAC/G,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAA;IAChD,IAAI,aAAa;QAAE,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,GAAG,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,CAAA;IAC5E,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,GAAG,IAAI,GAAG,OAAO,CAAA;AACrD,CAAC;AAED,MAAM,KAAK,GAAG;IACZ,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE;IAC3F,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE;IAC1F,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE;IACvF,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE;IAC3F,EAAE,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,iBAAiB;CACnH,CAAA;AAED,SAAgB,GAAG,CAAC,IAAU,EAAE,GAAY;IAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;IAExC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACrC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE;YACnE,OAAO,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,GAAG,CAAC,CAAC,CAAA;SAC7F;KACF;IAED,4BAA4B;IAC5B,WAAW;IACX,KAAK;IACL,oBAAoB;IACpB,yBAAyB;IACzB,mBAAmB;IACnB,uBAAuB;IACvB,KAAK;IACL,OAAO,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,GAAG,CAAC,CAAC,CAAA;AAC9E,CAAC;AAlBD,kBAkBC"}
|
package/dist/helpers/assert.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare function assert<T>(cond: T | undefined | null | false | 0 |
|
|
1
|
+
export declare function assert<T>(cond: T | undefined | null | false | 0 | '', message: string): T | never;
|
|
2
2
|
//# sourceMappingURL=assert.d.ts.map
|