@mathrunet/masamune 3.5.5 → 3.5.7
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/CHANGELOG.md +22 -0
- package/dist/lib/model_field_value/converters/firestore_model_counter_converter.js +32 -10
- package/dist/lib/model_field_value/converters/firestore_model_counter_converter.js.map +1 -1
- package/dist/lib/model_field_value/converters/firestore_model_localized_value_converter.js +8 -2
- package/dist/lib/model_field_value/converters/firestore_model_localized_value_converter.js.map +1 -1
- package/dist/lib/model_field_value/converters/firestore_model_ref_converter.js +17 -11
- package/dist/lib/model_field_value/converters/firestore_model_ref_converter.js.map +1 -1
- package/dist/lib/model_field_value/converters/firestore_model_timestamp_converter.js +51 -19
- package/dist/lib/model_field_value/converters/firestore_model_timestamp_converter.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,25 @@
|
|
|
1
|
+
## [3.5.7](https://github.com/mathrunet/node_masamune/compare/v3.5.6...v3.5.7) (2025-09-17)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### chore
|
|
5
|
+
|
|
6
|
+
* コメントを削除 ([900f3b9](https://github.com/mathrunet/node_masamune/commit/900f3b98417ebe17c9d9f481223d493db4892d13))
|
|
7
|
+
|
|
8
|
+
### fix
|
|
9
|
+
|
|
10
|
+
* Fixed incorrect `convertFrom`. ([5cd046f](https://github.com/mathrunet/node_masamune/commit/5cd046f34ec1f332f2f845d5e73ab4f460b08d78))
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
## [3.5.6](https://github.com/mathrunet/node_masamune/compare/v3.5.5...v3.5.6) (2025-09-17)
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### fix
|
|
18
|
+
|
|
19
|
+
* Corrected an error that appeared in the log. ([538688c](https://github.com/mathrunet/node_masamune/commit/538688c9815e20470a309e11f62ed83464c269f0))
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
1
23
|
## [3.5.5](https://github.com/mathrunet/node_masamune/compare/v3.5.4...v3.5.5) (2025-09-17)
|
|
2
24
|
|
|
3
25
|
|
|
@@ -20,54 +20,76 @@ class FirestoreModelCounterConverter extends firestore_model_field_value_convert
|
|
|
20
20
|
this.type = "ModelCounter";
|
|
21
21
|
}
|
|
22
22
|
convertFrom(key, value, original, firestoreInstance) {
|
|
23
|
-
var _a, _b, _c, _d, _e, _f;
|
|
23
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
24
24
|
if (typeof value === "number") {
|
|
25
25
|
const targetKey = `#${key}`;
|
|
26
26
|
const targetMap = (_a = original[targetKey]) !== null && _a !== void 0 ? _a : {};
|
|
27
27
|
const type = (_b = targetMap["@type"]) !== null && _b !== void 0 ? _b : "";
|
|
28
28
|
if (type == this.type) {
|
|
29
|
+
const increment = (_c = targetMap["@increment"]) !== null && _c !== void 0 ? _c : 0;
|
|
29
30
|
return {
|
|
30
|
-
[key]:
|
|
31
|
+
[key]: {
|
|
32
|
+
"@type": "ModelCounter",
|
|
33
|
+
"@value": value,
|
|
34
|
+
"@increment": increment,
|
|
35
|
+
"@source": "server"
|
|
36
|
+
},
|
|
37
|
+
[targetKey]: null,
|
|
31
38
|
};
|
|
32
39
|
}
|
|
33
40
|
}
|
|
34
41
|
else if (Array.isArray(value)) {
|
|
35
42
|
const targetKey = `#${key}`;
|
|
36
|
-
const targetList = (
|
|
43
|
+
const targetList = (_d = original[targetKey]) !== null && _d !== void 0 ? _d : [];
|
|
37
44
|
if (targetList != null && targetList.length > 0 && targetList.every((e) => e["@type"] === this.type)) {
|
|
38
45
|
const res = [];
|
|
39
|
-
for (
|
|
40
|
-
|
|
41
|
-
|
|
46
|
+
for (let i = 0; i < value.length; i++) {
|
|
47
|
+
const tmp = value[i];
|
|
48
|
+
if (typeof tmp === "number" && i < targetList.length) {
|
|
49
|
+
const increment = (_e = targetList[i]["@increment"]) !== null && _e !== void 0 ? _e : 0;
|
|
50
|
+
res.push({
|
|
51
|
+
"@type": "ModelCounter",
|
|
52
|
+
"@value": tmp,
|
|
53
|
+
"@increment": increment,
|
|
54
|
+
"@source": "server"
|
|
55
|
+
});
|
|
42
56
|
}
|
|
43
57
|
}
|
|
44
58
|
if (res.length > 0) {
|
|
45
59
|
return {
|
|
46
60
|
[key]: res,
|
|
61
|
+
[targetKey]: null,
|
|
47
62
|
};
|
|
48
63
|
}
|
|
49
64
|
}
|
|
50
65
|
}
|
|
51
66
|
else if ((0, utils_1.isDynamicMap)(value)) {
|
|
52
67
|
const targetKey = `#${key}`;
|
|
53
|
-
const targetMap = (
|
|
68
|
+
const targetMap = (_f = original[targetKey]) !== null && _f !== void 0 ? _f : {};
|
|
54
69
|
targetMap;
|
|
55
70
|
if (targetMap != null) {
|
|
56
71
|
const res = {};
|
|
57
72
|
for (const key in value) {
|
|
58
73
|
const val = value[key];
|
|
59
|
-
const mapVal = (
|
|
60
|
-
const type = (
|
|
74
|
+
const mapVal = (_g = targetMap[key]) !== null && _g !== void 0 ? _g : {};
|
|
75
|
+
const type = (_h = mapVal["@type"]) !== null && _h !== void 0 ? _h : "";
|
|
61
76
|
if (type != this.type) {
|
|
62
77
|
continue;
|
|
63
78
|
}
|
|
64
79
|
if (typeof val === "number") {
|
|
65
|
-
|
|
80
|
+
const increment = (_j = mapVal["@increment"]) !== null && _j !== void 0 ? _j : 0;
|
|
81
|
+
res[key] = {
|
|
82
|
+
"@type": "ModelCounter",
|
|
83
|
+
"@value": val,
|
|
84
|
+
"@increment": increment,
|
|
85
|
+
"@source": "server"
|
|
86
|
+
};
|
|
66
87
|
}
|
|
67
88
|
}
|
|
68
89
|
if (Object.keys(res).length > 0) {
|
|
69
90
|
return {
|
|
70
91
|
[key]: res,
|
|
92
|
+
[targetKey]: null,
|
|
71
93
|
};
|
|
72
94
|
}
|
|
73
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"firestore_model_counter_converter.js","sourceRoot":"","sources":["../../../../src/lib/model_field_value/converters/firestore_model_counter_converter.ts"],"names":[],"mappings":";;;AAAA,oGAA6F;AAC7F,uCAA2C;AAC3C,uDAAqD;AAErD;;;;GAIG;AACH,MAAa,8BAA+B,SAAQ,yEAAiC;IACnF;;;;OAIG;IACH;QACE,KAAK,EAAE,CAAC;QAGV,SAAI,GAAW,cAAc,CAAC;IAF9B,CAAC;IAID,WAAW,CACT,GAAW,EACX,KAAU,EACV,QAAkC,EAClC,iBAA8C;;QAE9C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAgD,mCAAI,EAAE,CAAC;YAC3F,MAAM,IAAI,GAAG,MAAA,SAAS,CAAC,OAAO,CAA8B,mCAAI,EAAE,CAAC;YACnE,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACtB,OAAO;oBACL,CAAC,GAAG,CAAC,EAAE,KAAK;
|
|
1
|
+
{"version":3,"file":"firestore_model_counter_converter.js","sourceRoot":"","sources":["../../../../src/lib/model_field_value/converters/firestore_model_counter_converter.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,14 +19,20 @@ class FirestoreModelLocalizedValueConverter extends firestore_model_field_value_
|
|
|
19
19
|
this.type = "ModelLocalizedValue";
|
|
20
20
|
}
|
|
21
21
|
convertFrom(key, value, original, firestoreInstance) {
|
|
22
|
-
var _a, _b;
|
|
22
|
+
var _a, _b, _c;
|
|
23
23
|
if (Array.isArray(value)) {
|
|
24
24
|
const targetKey = `#${key}`;
|
|
25
25
|
const targetMap = (_a = original[targetKey]) !== null && _a !== void 0 ? _a : {};
|
|
26
26
|
const type = (_b = targetMap["@type"]) !== null && _b !== void 0 ? _b : "";
|
|
27
27
|
if (type == this.type) {
|
|
28
|
+
const localized = (_c = targetMap["@localized"]) !== null && _c !== void 0 ? _c : {};
|
|
28
29
|
return {
|
|
29
|
-
[key]:
|
|
30
|
+
[key]: {
|
|
31
|
+
"@type": "ModelLocalizedValue",
|
|
32
|
+
"@localized": localized,
|
|
33
|
+
"@source": "server"
|
|
34
|
+
},
|
|
35
|
+
[targetKey]: null,
|
|
30
36
|
};
|
|
31
37
|
}
|
|
32
38
|
}
|
package/dist/lib/model_field_value/converters/firestore_model_localized_value_converter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"firestore_model_localized_value_converter.js","sourceRoot":"","sources":["../../../../src/lib/model_field_value/converters/firestore_model_localized_value_converter.ts"],"names":[],"mappings":";;;AAAA,oGAA6F;AAC7F,uCAA2C;AAE3C;;;;GAIG;AACH,MAAa,qCAAsC,SAAQ,yEAAiC;IAC1F;;;;OAIG;IACH;QACE,KAAK,EAAE,CAAC;QAGV,SAAI,GAAW,qBAAqB,CAAC;IAFrC,CAAC;IAID,WAAW,CACT,GAAW,EACX,KAAU,EACV,QAAkC,EAClC,iBAA8C;;QAE9C,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAgD,mCAAI,EAAE,CAAC;YAC3F,MAAM,IAAI,GAAG,MAAA,SAAS,CAAC,OAAO,CAA8B,mCAAI,EAAE,CAAC;YACnE,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACtB,OAAO;oBACL,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"firestore_model_localized_value_converter.js","sourceRoot":"","sources":["../../../../src/lib/model_field_value/converters/firestore_model_localized_value_converter.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,17 +20,22 @@ class FirestoreModelRefConverter extends firestore_model_field_value_converter_1
|
|
|
20
20
|
this.type = "ModelRefBase";
|
|
21
21
|
}
|
|
22
22
|
convertFrom(key, value, original, firestoreInstance) {
|
|
23
|
-
console.log(`${key} is ${typeof value}`);
|
|
24
23
|
if (value instanceof firestore_1.DocumentReference) {
|
|
25
24
|
return {
|
|
26
|
-
[key]:
|
|
25
|
+
[key]: {
|
|
26
|
+
"@type": "ModelRefBase",
|
|
27
|
+
"@ref": value.path.replace(/\/+$/, ''), // Remove trailing slashes
|
|
28
|
+
},
|
|
27
29
|
};
|
|
28
30
|
}
|
|
29
31
|
else if (Array.isArray(value)) {
|
|
30
32
|
const res = [];
|
|
31
33
|
for (const tmp of value) {
|
|
32
34
|
if (tmp instanceof firestore_1.DocumentReference) {
|
|
33
|
-
res.push(
|
|
35
|
+
res.push({
|
|
36
|
+
"@type": "ModelRefBase",
|
|
37
|
+
"@ref": tmp.path.replace(/\/+$/, ''), // Remove trailing slashes
|
|
38
|
+
});
|
|
34
39
|
}
|
|
35
40
|
}
|
|
36
41
|
if (res.length > 0) {
|
|
@@ -44,7 +49,10 @@ class FirestoreModelRefConverter extends firestore_model_field_value_converter_1
|
|
|
44
49
|
for (const k in value) {
|
|
45
50
|
const val = value[k];
|
|
46
51
|
if (val instanceof firestore_1.DocumentReference) {
|
|
47
|
-
res[k] =
|
|
52
|
+
res[k] = {
|
|
53
|
+
"@type": "ModelRefBase",
|
|
54
|
+
"@ref": val.path.replace(/\/+$/, ''), // Remove trailing slashes
|
|
55
|
+
};
|
|
48
56
|
}
|
|
49
57
|
}
|
|
50
58
|
if (Object.keys(res).length > 0) {
|
|
@@ -56,13 +64,11 @@ class FirestoreModelRefConverter extends firestore_model_field_value_converter_1
|
|
|
56
64
|
return null;
|
|
57
65
|
}
|
|
58
66
|
convertTo(key, value, _original, firestoreInstance) {
|
|
59
|
-
var _a, _b, _c, _d
|
|
60
|
-
console.log(`${key} is ${typeof value}`);
|
|
61
|
-
console.log(`value: ${"@type" in value} ${JSON.stringify(value)} ${(_a = value["@type"]) !== null && _a !== void 0 ? _a : ""}`);
|
|
67
|
+
var _a, _b, _c, _d;
|
|
62
68
|
if (value != null && typeof value === "object" && "@type" in value) {
|
|
63
|
-
const type = (
|
|
69
|
+
const type = (_a = value["@type"]) !== null && _a !== void 0 ? _a : "";
|
|
64
70
|
if (type.startsWith(this.type)) {
|
|
65
|
-
const refPath = (
|
|
71
|
+
const refPath = (_b = value["@ref"]) !== null && _b !== void 0 ? _b : "";
|
|
66
72
|
return {
|
|
67
73
|
[key]: firestoreInstance.doc(refPath),
|
|
68
74
|
};
|
|
@@ -73,7 +79,7 @@ class FirestoreModelRefConverter extends firestore_model_field_value_converter_1
|
|
|
73
79
|
if (list.length > 0 && list.every((e) => { var _a; return (_a = e["@type"]) === null || _a === void 0 ? void 0 : _a.startsWith(this.type); })) {
|
|
74
80
|
const res = [];
|
|
75
81
|
for (const entry of list) {
|
|
76
|
-
const refPath = (
|
|
82
|
+
const refPath = (_c = entry["@ref"]) !== null && _c !== void 0 ? _c : "";
|
|
77
83
|
res.push(firestoreInstance.doc(refPath));
|
|
78
84
|
}
|
|
79
85
|
return {
|
|
@@ -92,7 +98,7 @@ class FirestoreModelRefConverter extends firestore_model_field_value_converter_1
|
|
|
92
98
|
if (Object.keys(map).length > 0 && Object.values(map).every((e) => { var _a; return (_a = e["@type"]) === null || _a === void 0 ? void 0 : _a.startsWith(this.type); })) {
|
|
93
99
|
const res = {};
|
|
94
100
|
for (const [k, entry] of Object.entries(map)) {
|
|
95
|
-
const refPath = (
|
|
101
|
+
const refPath = (_d = entry["@ref"]) !== null && _d !== void 0 ? _d : "";
|
|
96
102
|
res[k] = firestoreInstance.doc(refPath);
|
|
97
103
|
}
|
|
98
104
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"firestore_model_ref_converter.js","sourceRoot":"","sources":["../../../../src/lib/model_field_value/converters/firestore_model_ref_converter.ts"],"names":[],"mappings":";;;AAAA,oGAA6F;AAC7F,uCAA2C;AAC3C,wDAA6D;AAG7D;;;;GAIG;AACH,MAAa,0BAA2B,SAAQ,yEAAiC;IAC/E;;;;OAIG;IACH;QACE,KAAK,EAAE,CAAC;QAGV,SAAI,GAAW,cAAc,CAAC;IAF9B,CAAC;IAID,WAAW,CACT,GAAW,EACX,KAAU,EACV,QAAkC,EAClC,iBAA8C;QAE9C,
|
|
1
|
+
{"version":3,"file":"firestore_model_ref_converter.js","sourceRoot":"","sources":["../../../../src/lib/model_field_value/converters/firestore_model_ref_converter.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,7 +40,13 @@ class FirestoreModelTimestampConverter extends firestore_model_field_value_conve
|
|
|
40
40
|
const type = (_b = targetMap["@type"]) !== null && _b !== void 0 ? _b : "";
|
|
41
41
|
if (type == this.type) {
|
|
42
42
|
return {
|
|
43
|
-
[key]:
|
|
43
|
+
[key]: {
|
|
44
|
+
"@type": "ModelTimestamp",
|
|
45
|
+
"@timestamp": value * 1000, // Convert milliseconds to microseconds
|
|
46
|
+
"@now": false,
|
|
47
|
+
"@source": "server"
|
|
48
|
+
},
|
|
49
|
+
[targetKey]: null,
|
|
44
50
|
};
|
|
45
51
|
}
|
|
46
52
|
}
|
|
@@ -50,7 +56,13 @@ class FirestoreModelTimestampConverter extends firestore_model_field_value_conve
|
|
|
50
56
|
const type = (_d = targetMap["@type"]) !== null && _d !== void 0 ? _d : "";
|
|
51
57
|
if (type == this.type) {
|
|
52
58
|
return {
|
|
53
|
-
[key]:
|
|
59
|
+
[key]: {
|
|
60
|
+
"@type": "ModelTimestamp",
|
|
61
|
+
"@timestamp": value.toMillis() * 1000, // Convert milliseconds to microseconds
|
|
62
|
+
"@now": false,
|
|
63
|
+
"@source": "server"
|
|
64
|
+
},
|
|
65
|
+
[targetKey]: null,
|
|
54
66
|
};
|
|
55
67
|
}
|
|
56
68
|
}
|
|
@@ -61,15 +73,26 @@ class FirestoreModelTimestampConverter extends firestore_model_field_value_conve
|
|
|
61
73
|
const res = [];
|
|
62
74
|
for (const tmp of value) {
|
|
63
75
|
if (typeof tmp === "number") {
|
|
64
|
-
res.push(
|
|
76
|
+
res.push({
|
|
77
|
+
"@type": "ModelTimestamp",
|
|
78
|
+
"@timestamp": tmp * 1000, // Convert milliseconds to microseconds
|
|
79
|
+
"@now": false,
|
|
80
|
+
"@source": "server"
|
|
81
|
+
});
|
|
65
82
|
}
|
|
66
83
|
else if (tmp instanceof firestore_1.Timestamp) {
|
|
67
|
-
res.push(
|
|
84
|
+
res.push({
|
|
85
|
+
"@type": "ModelTimestamp",
|
|
86
|
+
"@timestamp": tmp.toMillis() * 1000, // Convert milliseconds to microseconds
|
|
87
|
+
"@now": false,
|
|
88
|
+
"@source": "server"
|
|
89
|
+
});
|
|
68
90
|
}
|
|
69
91
|
}
|
|
70
92
|
if (res.length > 0) {
|
|
71
93
|
return {
|
|
72
94
|
[key]: res,
|
|
95
|
+
[targetKey]: null,
|
|
73
96
|
};
|
|
74
97
|
}
|
|
75
98
|
}
|
|
@@ -88,15 +111,26 @@ class FirestoreModelTimestampConverter extends firestore_model_field_value_conve
|
|
|
88
111
|
continue;
|
|
89
112
|
}
|
|
90
113
|
if (typeof val === "number") {
|
|
91
|
-
res[key] =
|
|
114
|
+
res[key] = {
|
|
115
|
+
"@type": "ModelTimestamp",
|
|
116
|
+
"@timestamp": val * 1000, // Convert milliseconds to microseconds
|
|
117
|
+
"@now": false,
|
|
118
|
+
"@source": "server"
|
|
119
|
+
};
|
|
92
120
|
}
|
|
93
121
|
else if (val instanceof firestore_1.Timestamp) {
|
|
94
|
-
res[key] =
|
|
122
|
+
res[key] = {
|
|
123
|
+
"@type": "ModelTimestamp",
|
|
124
|
+
"@timestamp": val.toMillis() * 1000, // Convert milliseconds to microseconds
|
|
125
|
+
"@now": false,
|
|
126
|
+
"@source": "server"
|
|
127
|
+
};
|
|
95
128
|
}
|
|
96
129
|
}
|
|
97
130
|
if (Object.keys(res).length > 0) {
|
|
98
131
|
return {
|
|
99
132
|
[key]: res,
|
|
133
|
+
[targetKey]: null,
|
|
100
134
|
};
|
|
101
135
|
}
|
|
102
136
|
}
|
|
@@ -104,15 +138,13 @@ class FirestoreModelTimestampConverter extends firestore_model_field_value_conve
|
|
|
104
138
|
return null;
|
|
105
139
|
}
|
|
106
140
|
convertTo(key, value, _original, firestoreInstance) {
|
|
107
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k
|
|
108
|
-
console.log(`${key} is ${typeof value}`);
|
|
109
|
-
console.log(`value: ${"@type" in value} ${JSON.stringify(value)} ${(_a = value["@type"]) !== null && _a !== void 0 ? _a : ""}`);
|
|
141
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
110
142
|
if (value != null && typeof value === "object" && "@type" in value) {
|
|
111
|
-
const type = (
|
|
143
|
+
const type = (_a = value["@type"]) !== null && _a !== void 0 ? _a : "";
|
|
112
144
|
if (type === this.type) {
|
|
113
|
-
const fromUser = ((
|
|
114
|
-
const val = (
|
|
115
|
-
const useNow = (
|
|
145
|
+
const fromUser = ((_b = value["@source"]) !== null && _b !== void 0 ? _b : "") === "user";
|
|
146
|
+
const val = (_c = value["@timestamp"]) !== null && _c !== void 0 ? _c : 0;
|
|
147
|
+
const useNow = (_d = value["@now"]) !== null && _d !== void 0 ? _d : false;
|
|
116
148
|
const targetKey = `#${key}`;
|
|
117
149
|
const result = {
|
|
118
150
|
[targetKey]: {
|
|
@@ -142,9 +174,9 @@ class FirestoreModelTimestampConverter extends firestore_model_field_value_conve
|
|
|
142
174
|
const res = [];
|
|
143
175
|
const targetKey = `#${key}`;
|
|
144
176
|
for (const entry of list) {
|
|
145
|
-
const fromUser = ((
|
|
146
|
-
const time = (
|
|
147
|
-
const useNow = (
|
|
177
|
+
const fromUser = ((_e = entry["@source"]) !== null && _e !== void 0 ? _e : "") === "user";
|
|
178
|
+
const time = (_f = entry["@timestamp"]) !== null && _f !== void 0 ? _f : 0;
|
|
179
|
+
const useNow = (_g = entry["@now"]) !== null && _g !== void 0 ? _g : false;
|
|
148
180
|
target.push({
|
|
149
181
|
"@type": this.type,
|
|
150
182
|
"@timestamp": time,
|
|
@@ -181,9 +213,9 @@ class FirestoreModelTimestampConverter extends firestore_model_field_value_conve
|
|
|
181
213
|
const res = {};
|
|
182
214
|
const targetKey = `#${key}`;
|
|
183
215
|
for (const [k, entry] of Object.entries(map)) {
|
|
184
|
-
const fromUser = ((
|
|
185
|
-
const time = (
|
|
186
|
-
const useNow = (
|
|
216
|
+
const fromUser = ((_h = entry["@source"]) !== null && _h !== void 0 ? _h : "") === "user";
|
|
217
|
+
const time = (_j = entry["@timestamp"]) !== null && _j !== void 0 ? _j : 0;
|
|
218
|
+
const useNow = (_k = entry["@now"]) !== null && _k !== void 0 ? _k : false;
|
|
187
219
|
target[k] = {
|
|
188
220
|
"@type": this.type,
|
|
189
221
|
"@timestamp": time,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"firestore_model_timestamp_converter.js","sourceRoot":"","sources":["../../../../src/lib/model_field_value/converters/firestore_model_timestamp_converter.ts"],"names":[],"mappings":";;;AAAA,oGAA6F;AAC7F,uCAA2C;AAC3C,wDAAqD;AACrD,uDAAqD;AAErD;;;;GAIG;AACH,MAAa,gCAAiC,SAAQ,yEAAiC;IAC7E,MAAM,CAAC,gCAAgC,CAAC,YAAoB;QAClE,IAAI,YAAY,IAAI,CAAC,EAAE,CAAC;YACtB,OAAO,qBAAS,CAAC,UAAU,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC;QACnD,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,OAAO,CAAC,CAAC;QACnD,MAAM,eAAe,GAAG,YAAY,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC;QAC3D,MAAM,WAAW,GAAG,eAAe,GAAG,IAAI,CAAC;QAC3C,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;YACpB,OAAO,IAAI,qBAAS,CAAC,OAAO,GAAG,CAAC,EAAE,WAAW,GAAG,UAAU,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,IAAI,qBAAS,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC7C,CAAC;IAED;;;;OAIG;IACH;QACE,KAAK,EAAE,CAAC;QAGV,SAAI,GAAW,gBAAgB,CAAC;IAFhC,CAAC;IAID,WAAW,CACT,GAAW,EACX,KAAU,EACV,QAAkC,EAClC,iBAA8C;;QAE9C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAgD,mCAAI,EAAE,CAAC;YAC3F,MAAM,IAAI,GAAG,MAAA,SAAS,CAAC,OAAO,CAA8B,mCAAI,EAAE,CAAC;YACnE,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACtB,OAAO;oBACL,CAAC,GAAG,CAAC,EAAE,KAAK;
|
|
1
|
+
{"version":3,"file":"firestore_model_timestamp_converter.js","sourceRoot":"","sources":["../../../../src/lib/model_field_value/converters/firestore_model_timestamp_converter.ts"],"names":[],"mappings":"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"}
|