@mathrunet/masamune 3.5.7 → 3.5.8

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 CHANGED
@@ -1,3 +1,12 @@
1
+ ## [3.5.8](https://github.com/mathrunet/node_masamune/compare/v3.5.7...v3.5.8) (2025-09-17)
2
+
3
+
4
+ ### fix
5
+
6
+ * Corrected the `timestamp` key as it was incorrect. ([302d56f](https://github.com/mathrunet/node_masamune/commit/302d56f0ee152d625df4cf850ab7c6a0ff943c68))
7
+
8
+
9
+
1
10
  ## [3.5.7](https://github.com/mathrunet/node_masamune/compare/v3.5.6...v3.5.7) (2025-09-17)
2
11
 
3
12
 
@@ -42,7 +42,7 @@ class FirestoreModelTimestampConverter extends firestore_model_field_value_conve
42
42
  return {
43
43
  [key]: {
44
44
  "@type": "ModelTimestamp",
45
- "@timestamp": value * 1000, // Convert milliseconds to microseconds
45
+ "@time": value * 1000, // Convert milliseconds to microseconds
46
46
  "@now": false,
47
47
  "@source": "server"
48
48
  },
@@ -58,7 +58,7 @@ class FirestoreModelTimestampConverter extends firestore_model_field_value_conve
58
58
  return {
59
59
  [key]: {
60
60
  "@type": "ModelTimestamp",
61
- "@timestamp": value.toMillis() * 1000, // Convert milliseconds to microseconds
61
+ "@time": value.toMillis() * 1000, // Convert milliseconds to microseconds
62
62
  "@now": false,
63
63
  "@source": "server"
64
64
  },
@@ -75,7 +75,7 @@ class FirestoreModelTimestampConverter extends firestore_model_field_value_conve
75
75
  if (typeof tmp === "number") {
76
76
  res.push({
77
77
  "@type": "ModelTimestamp",
78
- "@timestamp": tmp * 1000, // Convert milliseconds to microseconds
78
+ "@time": tmp * 1000, // Convert milliseconds to microseconds
79
79
  "@now": false,
80
80
  "@source": "server"
81
81
  });
@@ -83,7 +83,7 @@ class FirestoreModelTimestampConverter extends firestore_model_field_value_conve
83
83
  else if (tmp instanceof firestore_1.Timestamp) {
84
84
  res.push({
85
85
  "@type": "ModelTimestamp",
86
- "@timestamp": tmp.toMillis() * 1000, // Convert milliseconds to microseconds
86
+ "@time": tmp.toMillis() * 1000, // Convert milliseconds to microseconds
87
87
  "@now": false,
88
88
  "@source": "server"
89
89
  });
@@ -113,7 +113,7 @@ class FirestoreModelTimestampConverter extends firestore_model_field_value_conve
113
113
  if (typeof val === "number") {
114
114
  res[key] = {
115
115
  "@type": "ModelTimestamp",
116
- "@timestamp": val * 1000, // Convert milliseconds to microseconds
116
+ "@time": val * 1000, // Convert milliseconds to microseconds
117
117
  "@now": false,
118
118
  "@source": "server"
119
119
  };
@@ -121,7 +121,7 @@ class FirestoreModelTimestampConverter extends firestore_model_field_value_conve
121
121
  else if (val instanceof firestore_1.Timestamp) {
122
122
  res[key] = {
123
123
  "@type": "ModelTimestamp",
124
- "@timestamp": val.toMillis() * 1000, // Convert milliseconds to microseconds
124
+ "@time": val.toMillis() * 1000, // Convert milliseconds to microseconds
125
125
  "@now": false,
126
126
  "@source": "server"
127
127
  };
@@ -143,13 +143,13 @@ class FirestoreModelTimestampConverter extends firestore_model_field_value_conve
143
143
  const type = (_a = value["@type"]) !== null && _a !== void 0 ? _a : "";
144
144
  if (type === this.type) {
145
145
  const fromUser = ((_b = value["@source"]) !== null && _b !== void 0 ? _b : "") === "user";
146
- const val = (_c = value["@timestamp"]) !== null && _c !== void 0 ? _c : 0;
146
+ const val = (_c = value["@time"]) !== null && _c !== void 0 ? _c : 0;
147
147
  const useNow = (_d = value["@now"]) !== null && _d !== void 0 ? _d : false;
148
148
  const targetKey = `#${key}`;
149
149
  const result = {
150
150
  [targetKey]: {
151
151
  "@type": this.type,
152
- "@timestamp": val,
152
+ "@time": val,
153
153
  "@target": key,
154
154
  },
155
155
  };
@@ -175,11 +175,11 @@ class FirestoreModelTimestampConverter extends firestore_model_field_value_conve
175
175
  const targetKey = `#${key}`;
176
176
  for (const entry of list) {
177
177
  const fromUser = ((_e = entry["@source"]) !== null && _e !== void 0 ? _e : "") === "user";
178
- const time = (_f = entry["@timestamp"]) !== null && _f !== void 0 ? _f : 0;
178
+ const time = (_f = entry["@time"]) !== null && _f !== void 0 ? _f : 0;
179
179
  const useNow = (_g = entry["@now"]) !== null && _g !== void 0 ? _g : false;
180
180
  target.push({
181
181
  "@type": this.type,
182
- "@timestamp": time,
182
+ "@time": time,
183
183
  "@target": key,
184
184
  });
185
185
  if (fromUser) {
@@ -214,11 +214,11 @@ class FirestoreModelTimestampConverter extends firestore_model_field_value_conve
214
214
  const targetKey = `#${key}`;
215
215
  for (const [k, entry] of Object.entries(map)) {
216
216
  const fromUser = ((_h = entry["@source"]) !== null && _h !== void 0 ? _h : "") === "user";
217
- const time = (_j = entry["@timestamp"]) !== null && _j !== void 0 ? _j : 0;
217
+ const time = (_j = entry["@time"]) !== null && _j !== void 0 ? _j : 0;
218
218
  const useNow = (_k = entry["@now"]) !== null && _k !== void 0 ? _k : false;
219
219
  target[k] = {
220
220
  "@type": this.type,
221
- "@timestamp": time,
221
+ "@time": time,
222
222
  "@target": key,
223
223
  };
224
224
  if (fromUser) {
@@ -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":"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"}
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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"}
@@ -89,7 +89,7 @@ class FirestoreModelFieldValue {
89
89
  static timestampToModelTimestamp({ key, timestamp, }) {
90
90
  const res = {};
91
91
  res[key] = {
92
- "@timestamp": timestamp.toMillis(),
92
+ "@time": timestamp.toMillis(),
93
93
  "@type": "ModelTimestamp",
94
94
  };
95
95
  return res;
@@ -117,7 +117,7 @@ class FirestoreModelFieldValue {
117
117
  static geoPointToModelGeoValue({ key, timestamp, }) {
118
118
  const res = {};
119
119
  res[key] = {
120
- "@timestamp": timestamp.toMillis(),
120
+ "@time": timestamp.toMillis(),
121
121
  "@type": "ModelTimestamp",
122
122
  };
123
123
  return res;
@@ -1 +1 @@
1
- {"version":3,"file":"firestore_model_field_value_converter.js","sourceRoot":"","sources":["../../../src/lib/model_field_value/firestore_model_field_value_converter.ts"],"names":[],"mappings":";;;AAEA;;;;GAIG;AACH,MAAsB,iCAAiC;IACnD;;;;OAIG;IACH,gBAAgB,CAAC;IA+CjB;;;;;;;;;OASG;IACH,MAAM;QACF,OAAO;YACH,SAAS,EAAE,QAAQ;YACnB,OAAO,EAAE,IAAI,CAAC,IAAI;SACrB,CAAC;IACN,CAAC;IAAA,CAAC;CAEL;AAtED,8EAsEC;AAED;;;;GAIG;AACH,MAAa,wBAAwB;IACjC;;;;;;;;;;;;;;;;;;;OAmBG;IACH,MAAM,CAAC,2BAA2B,CAAC,EAC/B,GAAG,EAAE,GAAG,GAGX;QACG,MAAM,GAAG,GAA2B,EAAE,CAAC;QACvC,GAAG,CAAC,GAAG,CAAC,GAAG;YACP,MAAM,EAAE,GAAG,CAAC,IAAI;YAChB,OAAO,EAAE,cAAc;SAC1B,CAAC;QACF,OAAO,GAAG,CAAC;IACf,CAAC;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACH,MAAM,CAAC,yBAAyB,CAAC,EAC7B,GAAG,EAAE,SAAS,GAGjB;QACG,MAAM,GAAG,GAA2B,EAAE,CAAC;QACvC,GAAG,CAAC,GAAG,CAAC,GAAG;YACP,YAAY,EAAE,SAAS,CAAC,QAAQ,EAAE;YAClC,OAAO,EAAE,gBAAgB;SAC5B,CAAC;QACF,OAAO,GAAG,CAAC;IACf,CAAC;IAGD;;;;;;;;;;;;;;;;;;;OAmBG;IACH,MAAM,CAAC,uBAAuB,CAAC,EAC3B,GAAG,EAAE,SAAS,GAGjB;QACG,MAAM,GAAG,GAA2B,EAAE,CAAC;QACvC,GAAG,CAAC,GAAG,CAAC,GAAG;YACP,YAAY,EAAE,SAAS,CAAC,QAAQ,EAAE;YAClC,OAAO,EAAE,gBAAgB;SAC5B,CAAC;QACF,OAAO,GAAG,CAAC;IACf,CAAC;CACJ;AApGD,4DAoGC"}
1
+ {"version":3,"file":"firestore_model_field_value_converter.js","sourceRoot":"","sources":["../../../src/lib/model_field_value/firestore_model_field_value_converter.ts"],"names":[],"mappings":";;;AAEA;;;;GAIG;AACH,MAAsB,iCAAiC;IACnD;;;;OAIG;IACH,gBAAgB,CAAC;IA+CjB;;;;;;;;;OASG;IACH,MAAM;QACF,OAAO;YACH,SAAS,EAAE,QAAQ;YACnB,OAAO,EAAE,IAAI,CAAC,IAAI;SACrB,CAAC;IACN,CAAC;IAAA,CAAC;CAEL;AAtED,8EAsEC;AAED;;;;GAIG;AACH,MAAa,wBAAwB;IACjC;;;;;;;;;;;;;;;;;;;OAmBG;IACH,MAAM,CAAC,2BAA2B,CAAC,EAC/B,GAAG,EAAE,GAAG,GAGX;QACG,MAAM,GAAG,GAA2B,EAAE,CAAC;QACvC,GAAG,CAAC,GAAG,CAAC,GAAG;YACP,MAAM,EAAE,GAAG,CAAC,IAAI;YAChB,OAAO,EAAE,cAAc;SAC1B,CAAC;QACF,OAAO,GAAG,CAAC;IACf,CAAC;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACH,MAAM,CAAC,yBAAyB,CAAC,EAC7B,GAAG,EAAE,SAAS,GAGjB;QACG,MAAM,GAAG,GAA2B,EAAE,CAAC;QACvC,GAAG,CAAC,GAAG,CAAC,GAAG;YACP,OAAO,EAAE,SAAS,CAAC,QAAQ,EAAE;YAC7B,OAAO,EAAE,gBAAgB;SAC5B,CAAC;QACF,OAAO,GAAG,CAAC;IACf,CAAC;IAGD;;;;;;;;;;;;;;;;;;;OAmBG;IACH,MAAM,CAAC,uBAAuB,CAAC,EAC3B,GAAG,EAAE,SAAS,GAGjB;QACG,MAAM,GAAG,GAA2B,EAAE,CAAC;QACvC,GAAG,CAAC,GAAG,CAAC,GAAG;YACP,OAAO,EAAE,SAAS,CAAC,QAAQ,EAAE;YAC7B,OAAO,EAAE,gBAAgB;SAC5B,CAAC;QACF,OAAO,GAAG,CAAC;IACf,CAAC;CACJ;AApGD,4DAoGC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mathrunet/masamune",
3
- "version": "3.5.7",
3
+ "version": "3.5.8",
4
4
  "description": "Manages packages for the server portion (NodeJS) of the Masamune framework.",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",