@0xtorch/csv 0.0.16 → 0.0.18
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/_cjs/parseRowsToActions/parse.js +9 -2
- package/_cjs/parseRowsToActions/parse.js.map +1 -1
- package/_cjs/parseRowsToActions/transfer.js +18 -14
- package/_cjs/parseRowsToActions/transfer.js.map +1 -1
- package/_cjs/schemas/formatterTypes.js +1 -1
- package/_cjs/schemas/formatterTypes.js.map +1 -1
- package/_esm/parseRowsToActions/parse.js +10 -3
- package/_esm/parseRowsToActions/parse.js.map +1 -1
- package/_esm/parseRowsToActions/transfer.js +19 -15
- package/_esm/parseRowsToActions/transfer.js.map +1 -1
- package/_esm/schemas/formatterTypes.js +1 -1
- package/_esm/schemas/formatterTypes.js.map +1 -1
- package/_types/parseRowsToActions/parse.d.ts.map +1 -1
- package/_types/parseRowsToActions/transfer.d.ts.map +1 -1
- package/package.json +1 -1
- package/parseRowsToActions/parse.ts +10 -2
- package/parseRowsToActions/transfer.ts +34 -24
- package/schemas/formatterTypes.ts +1 -1
|
@@ -44,7 +44,7 @@ const parseRowsToActionsByParser = ({ rows, parser, symbolAssetMap, service, cry
|
|
|
44
44
|
rows,
|
|
45
45
|
service,
|
|
46
46
|
});
|
|
47
|
-
|
|
47
|
+
const action = {
|
|
48
48
|
source,
|
|
49
49
|
order: 0,
|
|
50
50
|
type: generator.type,
|
|
@@ -64,7 +64,14 @@ const parseRowsToActionsByParser = ({ rows, parser, symbolAssetMap, service, cry
|
|
|
64
64
|
crossType: generator.crossType,
|
|
65
65
|
loanId,
|
|
66
66
|
target: target === undefined || target.type !== 'Nft' ? undefined : target,
|
|
67
|
-
}
|
|
67
|
+
};
|
|
68
|
+
if (action.transfers.length === 0) {
|
|
69
|
+
continue;
|
|
70
|
+
}
|
|
71
|
+
if (!(0, core_1.checkIfActionsIsValid)({ actions: [action], accountIds: new Set() })) {
|
|
72
|
+
continue;
|
|
73
|
+
}
|
|
74
|
+
actions.push(action);
|
|
68
75
|
}
|
|
69
76
|
return actions;
|
|
70
77
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../parseRowsToActions/parse.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../parseRowsToActions/parse.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,29 +8,33 @@ const asset_1 = require("./asset");
|
|
|
8
8
|
const pattern_1 = require("./pattern");
|
|
9
9
|
const createTransfers = ({ schema, rows, service, symbolAssetMap, cryptoes, fiats, }) => {
|
|
10
10
|
if (schema.target === undefined) {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
11
|
+
const transfer = createSingleTransfer({
|
|
12
|
+
schema,
|
|
13
|
+
rows,
|
|
14
|
+
service,
|
|
15
|
+
symbolAssetMap,
|
|
16
|
+
cryptoes,
|
|
17
|
+
fiats,
|
|
18
|
+
});
|
|
19
|
+
if (transfer.amount.value === 0n) {
|
|
20
|
+
return [];
|
|
21
|
+
}
|
|
22
|
+
return [transfer];
|
|
21
23
|
}
|
|
22
24
|
const targetRows = filterTargetRows({
|
|
23
25
|
conditions: schema.target,
|
|
24
26
|
rows,
|
|
25
27
|
});
|
|
26
|
-
return targetRows
|
|
28
|
+
return targetRows
|
|
29
|
+
.map((targetRow) => createSingleTransfer({
|
|
27
30
|
schema,
|
|
28
31
|
rows: [targetRow],
|
|
29
32
|
service,
|
|
30
33
|
symbolAssetMap,
|
|
31
34
|
cryptoes,
|
|
32
35
|
fiats,
|
|
33
|
-
}))
|
|
36
|
+
}))
|
|
37
|
+
.filter((transfer) => transfer.amount.value !== 0n);
|
|
34
38
|
};
|
|
35
39
|
exports.createTransfers = createTransfers;
|
|
36
40
|
const filterTargetRows = ({ conditions, rows, }) => {
|
|
@@ -69,11 +73,11 @@ const createSingleTransfer = ({ schema, rows, service, symbolAssetMap, cryptoes,
|
|
|
69
73
|
cryptoes,
|
|
70
74
|
fiats,
|
|
71
75
|
}),
|
|
72
|
-
amount: createAmount({
|
|
76
|
+
amount: (0, big_decimal_1.absoluteValue)(createAmount({
|
|
73
77
|
schema: schema.amount,
|
|
74
78
|
rows,
|
|
75
79
|
service,
|
|
76
|
-
}),
|
|
80
|
+
})),
|
|
77
81
|
};
|
|
78
82
|
};
|
|
79
83
|
const createAmount = ({ schema, rows, service, }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transfer.js","sourceRoot":"","sources":["../../parseRowsToActions/transfer.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"transfer.js","sourceRoot":"","sources":["../../parseRowsToActions/transfer.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ exports.iso8601JpTextSchema = zod_1.z
|
|
|
27
27
|
.transform((v) => new Date(`${v}+09:00`).getTime());
|
|
28
28
|
exports.datetimeJpTextSchema = zod_1.z
|
|
29
29
|
.string()
|
|
30
|
-
.regex(/^\d{4}\/\d{2}\/\d{2} \d{2}:\d{2}:\d{2}$/)
|
|
30
|
+
.regex(/^\d{4}\/\d{1,2}\/\d{1,2} \d{1,2}:\d{1,2}:\d{1,2}$/)
|
|
31
31
|
.transform((v) => new Date(`${v}+09:00`).getTime());
|
|
32
32
|
exports.formatterValueSchema = zod_1.z.union([
|
|
33
33
|
exports.blankTextSchema,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatterTypes.js","sourceRoot":"","sources":["../../schemas/formatterTypes.ts"],"names":[],"mappings":";;;AAAA,sDAAuD;AACvD,6BAAuB;AAEV,QAAA,eAAe,GAAG,OAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;AAE1D,QAAA,gBAAgB,GAAG,OAAC,CAAC,MAAM,EAAE,CAAA;AAE7B,QAAA,oBAAoB,GAAG,OAAC;KAClC,MAAM,EAAE;KACR,KAAK,CAAC,oBAAoB,CAAC;KAC3B,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,8BAAgB,EAAC,CAAC,CAAC,CAAC,CAAA;AAE3B,QAAA,4BAA4B,GAAG,OAAC;KAC1C,MAAM,EAAE;KACR,KAAK,CAAC,kBAAkB,CAAC;KACzB,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,8BAAgB,EAAC,CAAC,CAAC,CAAC,CAAA;AAE3B,QAAA,4BAA4B,GAAG,OAAC;KAC1C,MAAM,EAAE;KACR,KAAK,CAAC,mBAAmB,CAAC;KAC1B,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,8BAAgB,EAAC,CAAC,CAAC,CAAC,CAAA;AAE3B,QAAA,iBAAiB,GAAG,OAAC;KAC/B,MAAM,EAAE;KACR,KAAK,CACJ,mHAAmH,CACpH;KACA,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;AAE7B,QAAA,mBAAmB,GAAG,OAAC;KACjC,MAAM,EAAE;KACR,KAAK,CAAC,iDAAiD,CAAC;KACxD,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;AAGxC,QAAA,oBAAoB,GAAG,OAAC;KAClC,MAAM,EAAE;KACR,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"formatterTypes.js","sourceRoot":"","sources":["../../schemas/formatterTypes.ts"],"names":[],"mappings":";;;AAAA,sDAAuD;AACvD,6BAAuB;AAEV,QAAA,eAAe,GAAG,OAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;AAE1D,QAAA,gBAAgB,GAAG,OAAC,CAAC,MAAM,EAAE,CAAA;AAE7B,QAAA,oBAAoB,GAAG,OAAC;KAClC,MAAM,EAAE;KACR,KAAK,CAAC,oBAAoB,CAAC;KAC3B,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,8BAAgB,EAAC,CAAC,CAAC,CAAC,CAAA;AAE3B,QAAA,4BAA4B,GAAG,OAAC;KAC1C,MAAM,EAAE;KACR,KAAK,CAAC,kBAAkB,CAAC;KACzB,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,8BAAgB,EAAC,CAAC,CAAC,CAAC,CAAA;AAE3B,QAAA,4BAA4B,GAAG,OAAC;KAC1C,MAAM,EAAE;KACR,KAAK,CAAC,mBAAmB,CAAC;KAC1B,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,8BAAgB,EAAC,CAAC,CAAC,CAAC,CAAA;AAE3B,QAAA,iBAAiB,GAAG,OAAC;KAC/B,MAAM,EAAE;KACR,KAAK,CACJ,mHAAmH,CACpH;KACA,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;AAE7B,QAAA,mBAAmB,GAAG,OAAC;KACjC,MAAM,EAAE;KACR,KAAK,CAAC,iDAAiD,CAAC;KACxD,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;AAGxC,QAAA,oBAAoB,GAAG,OAAC;KAClC,MAAM,EAAE;KACR,KAAK,CAAC,mDAAmD,CAAC;KAC1D,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;AAExC,QAAA,oBAAoB,GAAG,OAAC,CAAC,KAAK,CAAC;IAC1C,uBAAe;IACf,wBAAgB;IAChB,4BAAoB;IACpB,oCAA4B;IAC5B,oCAA4B;IAC5B,yBAAiB;IACjB,2BAAmB;IACnB,4BAAoB;CACrB,CAAC,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { stringify, } from '@0xtorch/core';
|
|
1
|
+
import { checkIfActionsIsValid, stringify, } from '@0xtorch/core';
|
|
2
2
|
import { getAllValue } from './allValue';
|
|
3
3
|
import { getAssetById } from './asset';
|
|
4
4
|
import { getCellValue } from './cellValue';
|
|
@@ -43,7 +43,7 @@ export const parseRowsToActionsByParser = ({ rows, parser, symbolAssetMap, servi
|
|
|
43
43
|
rows,
|
|
44
44
|
service,
|
|
45
45
|
});
|
|
46
|
-
|
|
46
|
+
const action = {
|
|
47
47
|
source,
|
|
48
48
|
order: 0,
|
|
49
49
|
type: generator.type,
|
|
@@ -63,7 +63,14 @@ export const parseRowsToActionsByParser = ({ rows, parser, symbolAssetMap, servi
|
|
|
63
63
|
crossType: generator.crossType,
|
|
64
64
|
loanId,
|
|
65
65
|
target: target === undefined || target.type !== 'Nft' ? undefined : target,
|
|
66
|
-
}
|
|
66
|
+
};
|
|
67
|
+
if (action.transfers.length === 0) {
|
|
68
|
+
continue;
|
|
69
|
+
}
|
|
70
|
+
if (!checkIfActionsIsValid({ actions: [action], accountIds: new Set() })) {
|
|
71
|
+
continue;
|
|
72
|
+
}
|
|
73
|
+
actions.push(action);
|
|
67
74
|
}
|
|
68
75
|
return actions;
|
|
69
76
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../parseRowsToActions/parse.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,SAAS,GACV,MAAM,eAAe,CAAA;AAItB,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAW5C,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,EACzC,IAAI,EACJ,MAAM,EACN,cAAc,EACd,OAAO,EACP,QAAQ,EACR,KAAK,GACgC,EAAiC,EAAE;IACxE,uCAAuC;IACvC,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,WAAW,CAAC;YACxB,MAAM,EAAE,SAAS,CAAC,KAAK;YACvB,IAAI;YACJ,OAAO;SACR,CAAC,CAAA;QACF,IACE,CAAC,cAAc,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC,EACxE,CAAC;YACD,OAAO,SAAS,CAAA;QAClB,CAAC;IACH,CAAC;IAED,yBAAyB;IACzB,MAAM,OAAO,GAAa,EAAE,CAAA;IAC5B,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;QAC1C,MAAM,MAAM,GAAG,SAAS,CACtB,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CACzD,CAAA;QACD,MAAM,cAAc,GAAG,YAAY,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAC1E,MAAM,SAAS,GACb,OAAO,cAAc,KAAK,QAAQ;YAChC,CAAC,CAAC,cAAc;YAChB,CAAC,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,EAAE,CAAA;QACnD,MAAM,OAAO,GACX,SAAS,CAAC,OAAO,KAAK,SAAS;YAC7B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;QAC1E,MAAM,GAAG,GACP,SAAS,CAAC,GAAG,KAAK,SAAS;YACzB,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;QACtE,MAAM,OAAO,GACX,SAAS,CAAC,OAAO,KAAK,SAAS;YAC7B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;QAC1E,MAAM,MAAM,GACV,SAAS,CAAC,MAAM,KAAK,SAAS;YAC5B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;QACzE,MAAM,MAAM,GACV,SAAS,CAAC,MAAM,KAAK,SAAS;YAC5B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,YAAY,CAAC;gBACX,MAAM,EAAE,SAAS,CAAC,MAAM;gBACxB,IAAI;gBACJ,OAAO;aACR,CAAC,CAAA;QACR,
|
|
1
|
+
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../parseRowsToActions/parse.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,33 +1,37 @@
|
|
|
1
|
-
import { createBigDecimal } from '@0xtorch/big-decimal';
|
|
1
|
+
import { absoluteValue, createBigDecimal, } from '@0xtorch/big-decimal';
|
|
2
2
|
import { stringify, } from '@0xtorch/core';
|
|
3
3
|
import { getAllValue } from './allValue';
|
|
4
4
|
import { getAsset } from './asset';
|
|
5
5
|
import { isMatchPattern } from './pattern';
|
|
6
6
|
export const createTransfers = ({ schema, rows, service, symbolAssetMap, cryptoes, fiats, }) => {
|
|
7
7
|
if (schema.target === undefined) {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
8
|
+
const transfer = createSingleTransfer({
|
|
9
|
+
schema,
|
|
10
|
+
rows,
|
|
11
|
+
service,
|
|
12
|
+
symbolAssetMap,
|
|
13
|
+
cryptoes,
|
|
14
|
+
fiats,
|
|
15
|
+
});
|
|
16
|
+
if (transfer.amount.value === 0n) {
|
|
17
|
+
return [];
|
|
18
|
+
}
|
|
19
|
+
return [transfer];
|
|
18
20
|
}
|
|
19
21
|
const targetRows = filterTargetRows({
|
|
20
22
|
conditions: schema.target,
|
|
21
23
|
rows,
|
|
22
24
|
});
|
|
23
|
-
return targetRows
|
|
25
|
+
return targetRows
|
|
26
|
+
.map((targetRow) => createSingleTransfer({
|
|
24
27
|
schema,
|
|
25
28
|
rows: [targetRow],
|
|
26
29
|
service,
|
|
27
30
|
symbolAssetMap,
|
|
28
31
|
cryptoes,
|
|
29
32
|
fiats,
|
|
30
|
-
}))
|
|
33
|
+
}))
|
|
34
|
+
.filter((transfer) => transfer.amount.value !== 0n);
|
|
31
35
|
};
|
|
32
36
|
const filterTargetRows = ({ conditions, rows, }) => {
|
|
33
37
|
const filteredRows = [];
|
|
@@ -65,11 +69,11 @@ const createSingleTransfer = ({ schema, rows, service, symbolAssetMap, cryptoes,
|
|
|
65
69
|
cryptoes,
|
|
66
70
|
fiats,
|
|
67
71
|
}),
|
|
68
|
-
amount: createAmount({
|
|
72
|
+
amount: absoluteValue(createAmount({
|
|
69
73
|
schema: schema.amount,
|
|
70
74
|
rows,
|
|
71
75
|
service,
|
|
72
|
-
}),
|
|
76
|
+
})),
|
|
73
77
|
};
|
|
74
78
|
};
|
|
75
79
|
const createAmount = ({ schema, rows, service, }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transfer.js","sourceRoot":"","sources":["../../parseRowsToActions/transfer.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"transfer.js","sourceRoot":"","sources":["../../parseRowsToActions/transfer.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ export const iso8601JpTextSchema = z
|
|
|
25
25
|
// TODO timezone 追加型 date を導入する
|
|
26
26
|
export const datetimeJpTextSchema = z
|
|
27
27
|
.string()
|
|
28
|
-
.regex(/^\d{4}\/\d{2}\/\d{2} \d{2}:\d{2}:\d{2}$/)
|
|
28
|
+
.regex(/^\d{4}\/\d{1,2}\/\d{1,2} \d{1,2}:\d{1,2}:\d{1,2}$/)
|
|
29
29
|
.transform((v) => new Date(`${v}+09:00`).getTime());
|
|
30
30
|
export const formatterValueSchema = z.union([
|
|
31
31
|
blankTextSchema,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatterTypes.js","sourceRoot":"","sources":["../../schemas/formatterTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;AAEvE,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,EAAE,CAAA;AAE1C,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC;KAClC,MAAM,EAAE;KACR,KAAK,CAAC,oBAAoB,CAAC;KAC3B,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAA;AAExC,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC;KAC1C,MAAM,EAAE;KACR,KAAK,CAAC,kBAAkB,CAAC;KACzB,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAA;AAExC,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC;KAC1C,MAAM,EAAE;KACR,KAAK,CAAC,mBAAmB,CAAC;KAC1B,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAA;AAExC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC;KAC/B,MAAM,EAAE;KACR,KAAK,CACJ,mHAAmH,CACpH;KACA,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;AAE1C,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC;KACjC,MAAM,EAAE;KACR,KAAK,CAAC,iDAAiD,CAAC;KACxD,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;AAErD,+BAA+B;AAC/B,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC;KAClC,MAAM,EAAE;KACR,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"formatterTypes.js","sourceRoot":"","sources":["../../schemas/formatterTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;AAEvE,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,EAAE,CAAA;AAE1C,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC;KAClC,MAAM,EAAE;KACR,KAAK,CAAC,oBAAoB,CAAC;KAC3B,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAA;AAExC,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC;KAC1C,MAAM,EAAE;KACR,KAAK,CAAC,kBAAkB,CAAC;KACzB,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAA;AAExC,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC;KAC1C,MAAM,EAAE;KACR,KAAK,CAAC,mBAAmB,CAAC;KAC1B,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAA;AAExC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC;KAC/B,MAAM,EAAE;KACR,KAAK,CACJ,mHAAmH,CACpH;KACA,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;AAE1C,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC;KACjC,MAAM,EAAE;KACR,KAAK,CAAC,iDAAiD,CAAC;KACxD,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;AAErD,+BAA+B;AAC/B,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC;KAClC,MAAM,EAAE;KACR,KAAK,CAAC,mDAAmD,CAAC;KAC1D,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;AAErD,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC;IAC1C,eAAe;IACf,gBAAgB;IAChB,oBAAoB;IACpB,4BAA4B;IAC5B,4BAA4B;IAC5B,iBAAiB;IACjB,mBAAmB;IACnB,oBAAoB;CACrB,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../parseRowsToActions/parse.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,MAAM,EACX,KAAK,cAAc,EACnB,KAAK,YAAY,
|
|
1
|
+
{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../parseRowsToActions/parse.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,MAAM,EACX,KAAK,cAAc,EACnB,KAAK,YAAY,EAGlB,MAAM,eAAe,CAAA;AACtB,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAO5C,KAAK,oCAAoC,GAAG;IAC1C,IAAI,EAAE,SAAS,YAAY,EAAE,CAAA;IAC7B,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAA;IACpC,cAAc,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IACtD,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,SAAS,cAAc,EAAE,CAAA;IACnC,KAAK,EAAE,SAAS,YAAY,EAAE,CAAA;CAC/B,CAAA;AAED,eAAO,MAAM,0BAA0B,gEAOpC,oCAAoC,KAAG,SAAS,MAAM,EAAE,GAAG,SAmF7D,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transfer.d.ts","sourceRoot":"","sources":["../../parseRowsToActions/transfer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"transfer.d.ts","sourceRoot":"","sources":["../../parseRowsToActions/transfer.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,QAAQ,EAEd,MAAM,eAAe,CAAA;AACtB,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,KAAK,EAGV,uBAAuB,EACxB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAK5C,eAAO,MAAM,eAAe,gEAOzB;IACD,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAA;IAC/C,IAAI,EAAE,SAAS,YAAY,EAAE,CAAA;IAC7B,OAAO,EAAE,MAAM,CAAA;IACf,cAAc,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IACtD,QAAQ,EAAE,SAAS,cAAc,EAAE,CAAA;IACnC,KAAK,EAAE,SAAS,YAAY,EAAE,CAAA;CAC/B,KAAG,SAAS,QAAQ,EA+BpB,CAAA"}
|
package/package.json
CHANGED
|
@@ -2,6 +2,7 @@ import {
|
|
|
2
2
|
type Action,
|
|
3
3
|
type CryptoCurrency,
|
|
4
4
|
type FiatCurrency,
|
|
5
|
+
checkIfActionsIsValid,
|
|
5
6
|
stringify,
|
|
6
7
|
} from '@0xtorch/core'
|
|
7
8
|
import type { z } from 'zod'
|
|
@@ -79,7 +80,7 @@ export const parseRowsToActionsByParser = ({
|
|
|
79
80
|
rows,
|
|
80
81
|
service,
|
|
81
82
|
})
|
|
82
|
-
|
|
83
|
+
const action: Action = {
|
|
83
84
|
source,
|
|
84
85
|
order: 0,
|
|
85
86
|
type: generator.type,
|
|
@@ -102,7 +103,14 @@ export const parseRowsToActionsByParser = ({
|
|
|
102
103
|
loanId,
|
|
103
104
|
target:
|
|
104
105
|
target === undefined || target.type !== 'Nft' ? undefined : target,
|
|
105
|
-
}
|
|
106
|
+
}
|
|
107
|
+
if (action.transfers.length === 0) {
|
|
108
|
+
continue
|
|
109
|
+
}
|
|
110
|
+
if (!checkIfActionsIsValid({ actions: [action], accountIds: new Set() })) {
|
|
111
|
+
continue
|
|
112
|
+
}
|
|
113
|
+
actions.push(action)
|
|
106
114
|
}
|
|
107
115
|
return actions
|
|
108
116
|
}
|
|
@@ -1,4 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
type BigDecimal,
|
|
3
|
+
absoluteValue,
|
|
4
|
+
createBigDecimal,
|
|
5
|
+
} from '@0xtorch/big-decimal'
|
|
2
6
|
import {
|
|
3
7
|
type CryptoCurrency,
|
|
4
8
|
type FiatCurrency,
|
|
@@ -32,31 +36,35 @@ export const createTransfers = ({
|
|
|
32
36
|
fiats: readonly FiatCurrency[]
|
|
33
37
|
}): readonly Transfer[] => {
|
|
34
38
|
if (schema.target === undefined) {
|
|
35
|
-
|
|
39
|
+
const transfer = createSingleTransfer({
|
|
40
|
+
schema,
|
|
41
|
+
rows,
|
|
42
|
+
service,
|
|
43
|
+
symbolAssetMap,
|
|
44
|
+
cryptoes,
|
|
45
|
+
fiats,
|
|
46
|
+
})
|
|
47
|
+
if (transfer.amount.value === 0n) {
|
|
48
|
+
return []
|
|
49
|
+
}
|
|
50
|
+
return [transfer]
|
|
51
|
+
}
|
|
52
|
+
const targetRows = filterTargetRows({
|
|
53
|
+
conditions: schema.target,
|
|
54
|
+
rows,
|
|
55
|
+
})
|
|
56
|
+
return targetRows
|
|
57
|
+
.map((targetRow) =>
|
|
36
58
|
createSingleTransfer({
|
|
37
59
|
schema,
|
|
38
|
-
rows,
|
|
60
|
+
rows: [targetRow],
|
|
39
61
|
service,
|
|
40
62
|
symbolAssetMap,
|
|
41
63
|
cryptoes,
|
|
42
64
|
fiats,
|
|
43
65
|
}),
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
const targetRows = filterTargetRows({
|
|
47
|
-
conditions: schema.target,
|
|
48
|
-
rows,
|
|
49
|
-
})
|
|
50
|
-
return targetRows.map((targetRow) =>
|
|
51
|
-
createSingleTransfer({
|
|
52
|
-
schema,
|
|
53
|
-
rows: [targetRow],
|
|
54
|
-
service,
|
|
55
|
-
symbolAssetMap,
|
|
56
|
-
cryptoes,
|
|
57
|
-
fiats,
|
|
58
|
-
}),
|
|
59
|
-
)
|
|
66
|
+
)
|
|
67
|
+
.filter((transfer) => transfer.amount.value !== 0n)
|
|
60
68
|
}
|
|
61
69
|
|
|
62
70
|
const filterTargetRows = ({
|
|
@@ -118,11 +126,13 @@ const createSingleTransfer = ({
|
|
|
118
126
|
cryptoes,
|
|
119
127
|
fiats,
|
|
120
128
|
}),
|
|
121
|
-
amount:
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
129
|
+
amount: absoluteValue(
|
|
130
|
+
createAmount({
|
|
131
|
+
schema: schema.amount,
|
|
132
|
+
rows,
|
|
133
|
+
service,
|
|
134
|
+
}),
|
|
135
|
+
),
|
|
126
136
|
}
|
|
127
137
|
}
|
|
128
138
|
|
|
@@ -35,7 +35,7 @@ export const iso8601JpTextSchema = z
|
|
|
35
35
|
// TODO timezone 追加型 date を導入する
|
|
36
36
|
export const datetimeJpTextSchema = z
|
|
37
37
|
.string()
|
|
38
|
-
.regex(/^\d{4}\/\d{2}\/\d{2} \d{2}:\d{2}:\d{2}$/)
|
|
38
|
+
.regex(/^\d{4}\/\d{1,2}\/\d{1,2} \d{1,2}:\d{1,2}:\d{1,2}$/)
|
|
39
39
|
.transform((v) => new Date(`${v}+09:00`).getTime())
|
|
40
40
|
|
|
41
41
|
export const formatterValueSchema = z.union([
|