@mathrunet/masamune 2.2.9 → 2.2.10

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
+ ## [2.2.10](https://github.com/mathrunet/node_masamune/compare/v2.2.9...v2.2.10) (2024-01-18)
2
+
3
+
4
+ ### fix
5
+
6
+ * Changed the order of type checks. ([a05e2d7](https://github.com/mathrunet/node_masamune/commit/a05e2d79cdd567a33a31a2bc544e8ae9e51deeb2))
7
+
8
+
9
+
1
10
  ## [2.2.9](https://github.com/mathrunet/node_masamune/compare/v2.2.8...v2.2.9) (2024-01-18)
2
11
 
3
12
 
@@ -20,9 +20,19 @@ class FirestoreModelCounterConverter extends firestore_model_field_value_convert
20
20
  }
21
21
  convertFrom(key, value, original) {
22
22
  var _a, _b, _c, _d, _e, _f;
23
- if (Array.isArray(value)) {
23
+ if (typeof value === "number") {
24
24
  const targetKey = `#${key}`;
25
- const targetList = (_a = original[targetKey]) !== null && _a !== void 0 ? _a : [];
25
+ const targetMap = (_a = original[targetKey]) !== null && _a !== void 0 ? _a : {};
26
+ const type = (_b = targetMap["@type"]) !== null && _b !== void 0 ? _b : "";
27
+ if (type == this.type) {
28
+ return {
29
+ [key]: value,
30
+ };
31
+ }
32
+ }
33
+ else if (Array.isArray(value)) {
34
+ const targetKey = `#${key}`;
35
+ const targetList = (_c = original[targetKey]) !== null && _c !== void 0 ? _c : [];
26
36
  if (targetList != null && targetList.length > 0 && targetList.every((e) => e["@type"] === this.type)) {
27
37
  const res = [];
28
38
  for (const tmp of value) {
@@ -39,14 +49,14 @@ class FirestoreModelCounterConverter extends firestore_model_field_value_convert
39
49
  }
40
50
  else if ((0, utils_1.isDynamicMap)(value)) {
41
51
  const targetKey = `#${key}`;
42
- const targetMap = (_b = original[targetKey]) !== null && _b !== void 0 ? _b : {};
52
+ const targetMap = (_d = original[targetKey]) !== null && _d !== void 0 ? _d : {};
43
53
  targetMap;
44
54
  if (targetMap != null) {
45
55
  const res = {};
46
56
  for (const key in value) {
47
57
  const val = value[key];
48
- const mapVal = (_c = targetMap[key]) !== null && _c !== void 0 ? _c : {};
49
- const type = (_d = mapVal["@type"]) !== null && _d !== void 0 ? _d : "";
58
+ const mapVal = (_e = targetMap[key]) !== null && _e !== void 0 ? _e : {};
59
+ const type = (_f = mapVal["@type"]) !== null && _f !== void 0 ? _f : "";
50
60
  if (type != this.type) {
51
61
  continue;
52
62
  }
@@ -61,16 +71,6 @@ class FirestoreModelCounterConverter extends firestore_model_field_value_convert
61
71
  }
62
72
  }
63
73
  }
64
- else if (typeof value === "number") {
65
- const targetKey = `#${key}`;
66
- const targetMap = (_e = original[targetKey]) !== null && _e !== void 0 ? _e : {};
67
- const type = (_f = targetMap["@type"]) !== null && _f !== void 0 ? _f : "";
68
- if (type == this.type) {
69
- return {
70
- [key]: value,
71
- };
72
- }
73
- }
74
74
  return null;
75
75
  }
76
76
  }
@@ -1 +1 @@
1
- {"version":3,"file":"firestore_model_counter_converter.js","sourceRoot":"","sources":["../../src/converter/firestore_model_counter_converter.ts"],"names":[],"mappings":";;;AAAA,wGAAiG;AACjG,wCAA4C;AAE5C;;;;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;;QAClC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,UAAU,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAkD,mCAAI,EAAE,CAAC;YAC9F,IAAI,UAAU,IAAI,IAAI,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE;gBACpG,MAAM,GAAG,GAAa,EAAE,CAAC;gBACzB,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;wBAC3B,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;qBACf;iBACF;gBACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;oBAClB,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;aAAM,IAAI,IAAA,oBAAY,EAAC,KAAK,CAAC,EAAE;YAC9B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAqE,mCAAI,EAAE,CAAC;YAChH,SAAS,CAAA;YACT,IAAI,SAAS,IAAI,IAAI,EAAE;gBACrB,MAAM,GAAG,GAEL,EAAE,CAAC;gBACP,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;oBACvB,MAAM,MAAM,GAAG,MAAA,SAAS,CAAC,GAAG,CAAgD,mCAAI,EAAE,CAAC;oBACnF,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,OAAO,CAA8B,mCAAI,EAAE,CAAC;oBAChE,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;wBACrB,SAAS;qBACV;oBACD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;wBAC3B,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;qBAChB;iBACF;gBACD,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC/B,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,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;gBACrB,OAAO;oBACL,CAAC,GAAG,CAAC,EAAE,KAAK;iBACb,CAAC;aACH;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AArED,wEAqEC"}
1
+ {"version":3,"file":"firestore_model_counter_converter.js","sourceRoot":"","sources":["../../src/converter/firestore_model_counter_converter.ts"],"names":[],"mappings":";;;AAAA,wGAAiG;AACjG,wCAA4C;AAE5C;;;;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;;QAClC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,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;gBACrB,OAAO;oBACL,CAAC,GAAG,CAAC,EAAE,KAAK;iBACb,CAAC;aACH;SACF;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC/B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,UAAU,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAkD,mCAAI,EAAE,CAAC;YAC9F,IAAI,UAAU,IAAI,IAAI,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE;gBACpG,MAAM,GAAG,GAAa,EAAE,CAAC;gBACzB,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;wBAC3B,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;qBACf;iBACF;gBACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;oBAClB,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;aAAM,IAAI,IAAA,oBAAY,EAAC,KAAK,CAAC,EAAE;YAC9B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAqE,mCAAI,EAAE,CAAC;YAChH,SAAS,CAAA;YACT,IAAI,SAAS,IAAI,IAAI,EAAE;gBACrB,MAAM,GAAG,GAEL,EAAE,CAAC;gBACP,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;oBACvB,MAAM,MAAM,GAAG,MAAA,SAAS,CAAC,GAAG,CAAgD,mCAAI,EAAE,CAAC;oBACnF,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,OAAO,CAA8B,mCAAI,EAAE,CAAC;oBAChE,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;wBACrB,SAAS;qBACV;oBACD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;wBAC3B,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;qBAChB;iBACF;gBACD,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC/B,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AArED,wEAqEC"}
@@ -21,9 +21,29 @@ class FirestoreModelDateConverter extends firestore_model_field_value_converter_
21
21
  }
22
22
  convertFrom(key, value, original) {
23
23
  var _a, _b, _c, _d, _e, _f, _g, _h;
24
- if (Array.isArray(value)) {
24
+ if (typeof value === "number") {
25
25
  const targetKey = `#${key}`;
26
- const targetList = (_a = original[targetKey]) !== null && _a !== void 0 ? _a : [];
26
+ const targetMap = (_a = original[targetKey]) !== null && _a !== void 0 ? _a : {};
27
+ const type = (_b = targetMap["@type"]) !== null && _b !== void 0 ? _b : "";
28
+ if (type == this.type) {
29
+ return {
30
+ [key]: value,
31
+ };
32
+ }
33
+ }
34
+ else if (value instanceof firestore_1.Timestamp) {
35
+ const targetKey = `#${key}`;
36
+ const targetMap = (_c = original[targetKey]) !== null && _c !== void 0 ? _c : {};
37
+ const type = (_d = targetMap["@type"]) !== null && _d !== void 0 ? _d : "";
38
+ if (type == this.type) {
39
+ return {
40
+ [key]: value.toMillis(),
41
+ };
42
+ }
43
+ }
44
+ else if (Array.isArray(value)) {
45
+ const targetKey = `#${key}`;
46
+ const targetList = (_e = original[targetKey]) !== null && _e !== void 0 ? _e : [];
27
47
  if (targetList != null && targetList.length > 0 && targetList.every((e) => e["@type"] === this.type)) {
28
48
  const res = [];
29
49
  for (const tmp of value) {
@@ -43,14 +63,14 @@ class FirestoreModelDateConverter extends firestore_model_field_value_converter_
43
63
  }
44
64
  else if ((0, utils_1.isDynamicMap)(value)) {
45
65
  const targetKey = `#${key}`;
46
- const targetMap = (_b = original[targetKey]) !== null && _b !== void 0 ? _b : {};
66
+ const targetMap = (_f = original[targetKey]) !== null && _f !== void 0 ? _f : {};
47
67
  targetMap;
48
68
  if (targetMap != null) {
49
69
  const res = {};
50
70
  for (const key in value) {
51
71
  const val = value[key];
52
- const mapVal = (_c = targetMap[key]) !== null && _c !== void 0 ? _c : {};
53
- const type = (_d = mapVal["@type"]) !== null && _d !== void 0 ? _d : "";
72
+ const mapVal = (_g = targetMap[key]) !== null && _g !== void 0 ? _g : {};
73
+ const type = (_h = mapVal["@type"]) !== null && _h !== void 0 ? _h : "";
54
74
  if (type != this.type) {
55
75
  continue;
56
76
  }
@@ -68,26 +88,6 @@ class FirestoreModelDateConverter extends firestore_model_field_value_converter_
68
88
  }
69
89
  }
70
90
  }
71
- else if (typeof value === "number") {
72
- const targetKey = `#${key}`;
73
- const targetMap = (_e = original[targetKey]) !== null && _e !== void 0 ? _e : {};
74
- const type = (_f = targetMap["@type"]) !== null && _f !== void 0 ? _f : "";
75
- if (type == this.type) {
76
- return {
77
- [key]: value,
78
- };
79
- }
80
- }
81
- else if (value instanceof firestore_1.Timestamp) {
82
- const targetKey = `#${key}`;
83
- const targetMap = (_g = original[targetKey]) !== null && _g !== void 0 ? _g : {};
84
- const type = (_h = targetMap["@type"]) !== null && _h !== void 0 ? _h : "";
85
- if (type == this.type) {
86
- return {
87
- [key]: value.toMillis(),
88
- };
89
- }
90
- }
91
91
  return null;
92
92
  }
93
93
  }
@@ -1 +1 @@
1
- {"version":3,"file":"firestore_model_date_converter.js","sourceRoot":"","sources":["../../src/converter/firestore_model_date_converter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"firestore_model_date_converter.js","sourceRoot":"","sources":["../../src/converter/firestore_model_date_converter.ts"],"names":[],"mappings":"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"}
@@ -21,13 +21,23 @@ class FirestoreModelGeoValueConverter extends firestore_model_field_value_conver
21
21
  }
22
22
  convertFrom(key, value, original) {
23
23
  var _a, _b, _c, _d, _e, _f, _g, _h, _j;
24
- if (Array.isArray(value)) {
24
+ if (typeof value === "string" || value instanceof firestore_1.GeoPoint) {
25
25
  const targetKey = `#${key}`;
26
- const targetList = (_a = original[targetKey]) !== null && _a !== void 0 ? _a : [];
26
+ const targetMap = (_a = original[targetKey]) !== null && _a !== void 0 ? _a : {};
27
+ const type = (_b = targetMap["@type"]) !== null && _b !== void 0 ? _b : "";
28
+ if (type == this.type) {
29
+ return {
30
+ [key]: (_c = targetMap["@geoHash"]) !== null && _c !== void 0 ? _c : "",
31
+ };
32
+ }
33
+ }
34
+ else if (Array.isArray(value)) {
35
+ const targetKey = `#${key}`;
36
+ const targetList = (_d = original[targetKey]) !== null && _d !== void 0 ? _d : [];
27
37
  if (targetList != null && targetList.length > 0 && targetList.every((e) => e["@type"] === this.type)) {
28
38
  const res = [];
29
39
  for (const tmp of targetList) {
30
- res.push((_b = tmp["@geoHash"]) !== null && _b !== void 0 ? _b : "");
40
+ res.push((_e = tmp["@geoHash"]) !== null && _e !== void 0 ? _e : "");
31
41
  }
32
42
  if (res.length > 0) {
33
43
  return {
@@ -38,19 +48,19 @@ class FirestoreModelGeoValueConverter extends firestore_model_field_value_conver
38
48
  }
39
49
  else if ((0, utils_1.isDynamicMap)(value)) {
40
50
  const targetKey = `#${key}`;
41
- const targetMap = (_c = original[targetKey]) !== null && _c !== void 0 ? _c : {};
51
+ const targetMap = (_f = original[targetKey]) !== null && _f !== void 0 ? _f : {};
42
52
  targetMap;
43
53
  if (targetMap != null) {
44
54
  const res = {};
45
55
  for (const key in value) {
46
56
  const val = value[key];
47
- const mapVal = (_d = targetMap[key]) !== null && _d !== void 0 ? _d : {};
48
- const type = (_e = mapVal["@type"]) !== null && _e !== void 0 ? _e : "";
57
+ const mapVal = (_g = targetMap[key]) !== null && _g !== void 0 ? _g : {};
58
+ const type = (_h = mapVal["@type"]) !== null && _h !== void 0 ? _h : "";
49
59
  if (type != this.type) {
50
60
  continue;
51
61
  }
52
62
  if (typeof val === "string" || val instanceof firestore_1.GeoPoint) {
53
- res[key] = (_f = mapVal["@geoHash"]) !== null && _f !== void 0 ? _f : "";
63
+ res[key] = (_j = mapVal["@geoHash"]) !== null && _j !== void 0 ? _j : "";
54
64
  }
55
65
  }
56
66
  if (Object.keys(res).length > 0) {
@@ -60,16 +70,6 @@ class FirestoreModelGeoValueConverter extends firestore_model_field_value_conver
60
70
  }
61
71
  }
62
72
  }
63
- else if (typeof value === "string" || value instanceof firestore_1.GeoPoint) {
64
- const targetKey = `#${key}`;
65
- const targetMap = (_g = original[targetKey]) !== null && _g !== void 0 ? _g : {};
66
- const type = (_h = targetMap["@type"]) !== null && _h !== void 0 ? _h : "";
67
- if (type == this.type) {
68
- return {
69
- [key]: (_j = targetMap["@geoHash"]) !== null && _j !== void 0 ? _j : "",
70
- };
71
- }
72
- }
73
73
  return null;
74
74
  }
75
75
  }
@@ -1 +1 @@
1
- {"version":3,"file":"firestore_model_geo_value_converter.js","sourceRoot":"","sources":["../../src/converter/firestore_model_geo_value_converter.ts"],"names":[],"mappings":";;;AAAA,wGAAiG;AACjG,wCAA4C;AAC5C,wDAAoD;AAEpD;;;;GAIG;AACH,MAAa,+BAAgC,SAAQ,yEAAiC;IACpF;;;;OAIG;IACH;QACE,KAAK,EAAE,CAAC;QAGV,SAAI,GAAW,eAAe,CAAC;IAF/B,CAAC;IAID,WAAW,CACT,GAAW,EACX,KAAU,EACV,QAAkC;;QAClC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,UAAU,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAkD,mCAAI,EAAE,CAAC;YAC9F,IAAI,UAAU,IAAI,IAAI,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE;gBACpG,MAAM,GAAG,GAAa,EAAE,CAAC;gBACzB,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;oBAC5B,GAAG,CAAC,IAAI,CACN,MAAA,GAAG,CAAC,UAAU,CAA8B,mCAAI,EAAE,CACnD,CAAC;iBACH;gBACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;oBAClB,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;aAAM,IAAI,IAAA,oBAAY,EAAC,KAAK,CAAC,EAAE;YAC9B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAqE,mCAAI,EAAE,CAAC;YAChH,SAAS,CAAA;YACT,IAAI,SAAS,IAAI,IAAI,EAAE;gBACrB,MAAM,GAAG,GAEL,EAAE,CAAC;gBACP,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;oBACvB,MAAM,MAAM,GAAG,MAAA,SAAS,CAAC,GAAG,CAAgD,mCAAI,EAAE,CAAC;oBACnF,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,OAAO,CAA8B,mCAAI,EAAE,CAAC;oBAChE,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;wBACrB,SAAS;qBACV;oBACD,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,YAAY,oBAAQ,EAAE;wBACtD,GAAG,CAAC,GAAG,CAAC,GAAG,MAAA,MAAM,CAAC,UAAU,CAA8B,mCAAI,EAAE,CAAC;qBAClE;iBACF;gBACD,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC/B,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,oBAAQ,EAAE;YACjE,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;gBACrB,OAAO;oBACL,CAAC,GAAG,CAAC,EAAE,MAAA,SAAS,CAAC,UAAU,CAA8B,mCAAI,EAAE;iBAChE,CAAC;aACH;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AArED,0EAqEC"}
1
+ {"version":3,"file":"firestore_model_geo_value_converter.js","sourceRoot":"","sources":["../../src/converter/firestore_model_geo_value_converter.ts"],"names":[],"mappings":";;;AAAA,wGAAiG;AACjG,wCAA4C;AAC5C,wDAAoD;AAEpD;;;;GAIG;AACH,MAAa,+BAAgC,SAAQ,yEAAiC;IACpF;;;;OAIG;IACH;QACE,KAAK,EAAE,CAAC;QAGV,SAAI,GAAW,eAAe,CAAC;IAF/B,CAAC;IAID,WAAW,CACT,GAAW,EACX,KAAU,EACV,QAAkC;;QAClC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,oBAAQ,EAAE;YAC1D,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;gBACrB,OAAO;oBACL,CAAC,GAAG,CAAC,EAAE,MAAA,SAAS,CAAC,UAAU,CAA8B,mCAAI,EAAE;iBAChE,CAAC;aACH;SACF;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC/B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,UAAU,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAkD,mCAAI,EAAE,CAAC;YAC9F,IAAI,UAAU,IAAI,IAAI,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE;gBACpG,MAAM,GAAG,GAAa,EAAE,CAAC;gBACzB,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;oBAC5B,GAAG,CAAC,IAAI,CACN,MAAA,GAAG,CAAC,UAAU,CAA8B,mCAAI,EAAE,CACnD,CAAC;iBACH;gBACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;oBAClB,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;aAAM,IAAI,IAAA,oBAAY,EAAC,KAAK,CAAC,EAAE;YAC9B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAqE,mCAAI,EAAE,CAAC;YAChH,SAAS,CAAA;YACT,IAAI,SAAS,IAAI,IAAI,EAAE;gBACrB,MAAM,GAAG,GAEL,EAAE,CAAC;gBACP,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;oBACvB,MAAM,MAAM,GAAG,MAAA,SAAS,CAAC,GAAG,CAAgD,mCAAI,EAAE,CAAC;oBACnF,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,OAAO,CAA8B,mCAAI,EAAE,CAAC;oBAChE,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;wBACrB,SAAS;qBACV;oBACD,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,YAAY,oBAAQ,EAAE;wBACtD,GAAG,CAAC,GAAG,CAAC,GAAG,MAAA,MAAM,CAAC,UAAU,CAA8B,mCAAI,EAAE,CAAC;qBAClE;iBACF;gBACD,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC/B,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AArED,0EAqEC"}
@@ -20,9 +20,19 @@ class FirestoreModelImageUriConverter extends firestore_model_field_value_conver
20
20
  }
21
21
  convertFrom(key, value, original) {
22
22
  var _a, _b, _c, _d, _e, _f;
23
- if (Array.isArray(value)) {
23
+ if (typeof value === "string") {
24
24
  const targetKey = `#${key}`;
25
- const targetList = (_a = original[targetKey]) !== null && _a !== void 0 ? _a : [];
25
+ const targetMap = (_a = original[targetKey]) !== null && _a !== void 0 ? _a : {};
26
+ const type = (_b = targetMap["@type"]) !== null && _b !== void 0 ? _b : "";
27
+ if (type == this.type) {
28
+ return {
29
+ [key]: String(value),
30
+ };
31
+ }
32
+ }
33
+ else if (Array.isArray(value)) {
34
+ const targetKey = `#${key}`;
35
+ const targetList = (_c = original[targetKey]) !== null && _c !== void 0 ? _c : [];
26
36
  if (targetList != null && targetList.length > 0 && targetList.every((e) => e["@type"] === this.type)) {
27
37
  const res = [];
28
38
  for (const tmp of value) {
@@ -37,14 +47,14 @@ class FirestoreModelImageUriConverter extends firestore_model_field_value_conver
37
47
  }
38
48
  else if ((0, utils_1.isDynamicMap)(value)) {
39
49
  const targetKey = `#${key}`;
40
- const targetMap = (_b = original[targetKey]) !== null && _b !== void 0 ? _b : {};
50
+ const targetMap = (_d = original[targetKey]) !== null && _d !== void 0 ? _d : {};
41
51
  targetMap;
42
52
  if (targetMap != null) {
43
53
  const res = {};
44
54
  for (const key in value) {
45
55
  const val = value[key];
46
- const mapVal = (_c = targetMap[key]) !== null && _c !== void 0 ? _c : {};
47
- const type = (_d = mapVal["@type"]) !== null && _d !== void 0 ? _d : "";
56
+ const mapVal = (_e = targetMap[key]) !== null && _e !== void 0 ? _e : {};
57
+ const type = (_f = mapVal["@type"]) !== null && _f !== void 0 ? _f : "";
48
58
  if (type != this.type) {
49
59
  continue;
50
60
  }
@@ -57,16 +67,6 @@ class FirestoreModelImageUriConverter extends firestore_model_field_value_conver
57
67
  }
58
68
  }
59
69
  }
60
- else if (typeof value === "string") {
61
- const targetKey = `#${key}`;
62
- const targetMap = (_e = original[targetKey]) !== null && _e !== void 0 ? _e : {};
63
- const type = (_f = targetMap["@type"]) !== null && _f !== void 0 ? _f : "";
64
- if (type == this.type) {
65
- return {
66
- [key]: String(value),
67
- };
68
- }
69
- }
70
70
  return null;
71
71
  }
72
72
  }
@@ -1 +1 @@
1
- {"version":3,"file":"firestore_model_image_uri_converter.js","sourceRoot":"","sources":["../../src/converter/firestore_model_image_uri_converter.ts"],"names":[],"mappings":";;;AAAA,wGAAiG;AACjG,wCAA4C;AAE5C;;;;GAIG;AACH,MAAa,+BAAgC,SAAQ,yEAAiC;IACpF;;;;OAIG;IACH;QACE,KAAK,EAAE,CAAC;QAGV,SAAI,GAAW,eAAe,CAAC;IAF/B,CAAC;IAID,WAAW,CACT,GAAW,EACX,KAAU,EACV,QAAkC;;QAClC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,UAAU,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAkD,mCAAI,EAAE,CAAC;YAC9F,IAAI,UAAU,IAAI,IAAI,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE;gBACpG,MAAM,GAAG,GAAa,EAAE,CAAC;gBACzB,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;iBACvB;gBACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;oBAClB,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;aAAM,IAAI,IAAA,oBAAY,EAAC,KAAK,CAAC,EAAE;YAC9B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAqE,mCAAI,EAAE,CAAC;YAChH,SAAS,CAAA;YACT,IAAI,SAAS,IAAI,IAAI,EAAE;gBACrB,MAAM,GAAG,GAEL,EAAE,CAAC;gBACP,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;oBACvB,MAAM,MAAM,GAAG,MAAA,SAAS,CAAC,GAAG,CAAgD,mCAAI,EAAE,CAAC;oBACnF,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,OAAO,CAA8B,mCAAI,EAAE,CAAC;oBAChE,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;wBACrB,SAAS;qBACV;oBACD,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;iBACxB;gBACD,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC/B,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,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;gBACrB,OAAO;oBACL,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;iBACrB,CAAC;aACH;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAjED,0EAiEC"}
1
+ {"version":3,"file":"firestore_model_image_uri_converter.js","sourceRoot":"","sources":["../../src/converter/firestore_model_image_uri_converter.ts"],"names":[],"mappings":";;;AAAA,wGAAiG;AACjG,wCAA4C;AAE5C;;;;GAIG;AACH,MAAa,+BAAgC,SAAQ,yEAAiC;IACpF;;;;OAIG;IACH;QACE,KAAK,EAAE,CAAC;QAGV,SAAI,GAAW,eAAe,CAAC;IAF/B,CAAC;IAID,WAAW,CACT,GAAW,EACX,KAAU,EACV,QAAkC;;QAClC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,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;gBACrB,OAAO;oBACL,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;iBACrB,CAAC;aACH;SACF;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC/B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,UAAU,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAkD,mCAAI,EAAE,CAAC;YAC9F,IAAI,UAAU,IAAI,IAAI,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE;gBACpG,MAAM,GAAG,GAAa,EAAE,CAAC;gBACzB,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;iBACvB;gBACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;oBAClB,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;aAAM,IAAI,IAAA,oBAAY,EAAC,KAAK,CAAC,EAAE;YAC9B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAqE,mCAAI,EAAE,CAAC;YAChH,SAAS,CAAA;YACT,IAAI,SAAS,IAAI,IAAI,EAAE;gBACrB,MAAM,GAAG,GAEL,EAAE,CAAC;gBACP,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;oBACvB,MAAM,MAAM,GAAG,MAAA,SAAS,CAAC,GAAG,CAAgD,mCAAI,EAAE,CAAC;oBACnF,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,OAAO,CAA8B,mCAAI,EAAE,CAAC;oBAChE,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;wBACrB,SAAS;qBACV;oBACD,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;iBACxB;gBACD,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC/B,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAjED,0EAiEC"}
@@ -20,9 +20,19 @@ class FirestoreModelLocaleConverter extends firestore_model_field_value_converte
20
20
  }
21
21
  convertFrom(key, value, original) {
22
22
  var _a, _b, _c, _d, _e, _f;
23
- if (Array.isArray(value)) {
23
+ if (typeof value === "string") {
24
24
  const targetKey = `#${key}`;
25
- const targetList = (_a = original[targetKey]) !== null && _a !== void 0 ? _a : [];
25
+ const targetMap = (_a = original[targetKey]) !== null && _a !== void 0 ? _a : {};
26
+ const type = (_b = targetMap["@type"]) !== null && _b !== void 0 ? _b : "";
27
+ if (type == this.type) {
28
+ return {
29
+ [key]: String(value),
30
+ };
31
+ }
32
+ }
33
+ else if (Array.isArray(value)) {
34
+ const targetKey = `#${key}`;
35
+ const targetList = (_c = original[targetKey]) !== null && _c !== void 0 ? _c : [];
26
36
  if (targetList != null && targetList.length > 0 && targetList.every((e) => e["@type"] === this.type)) {
27
37
  const res = [];
28
38
  for (const tmp of value) {
@@ -37,14 +47,14 @@ class FirestoreModelLocaleConverter extends firestore_model_field_value_converte
37
47
  }
38
48
  else if ((0, utils_1.isDynamicMap)(value)) {
39
49
  const targetKey = `#${key}`;
40
- const targetMap = (_b = original[targetKey]) !== null && _b !== void 0 ? _b : {};
50
+ const targetMap = (_d = original[targetKey]) !== null && _d !== void 0 ? _d : {};
41
51
  targetMap;
42
52
  if (targetMap != null) {
43
53
  const res = {};
44
54
  for (const key in value) {
45
55
  const val = value[key];
46
- const mapVal = (_c = targetMap[key]) !== null && _c !== void 0 ? _c : {};
47
- const type = (_d = mapVal["@type"]) !== null && _d !== void 0 ? _d : "";
56
+ const mapVal = (_e = targetMap[key]) !== null && _e !== void 0 ? _e : {};
57
+ const type = (_f = mapVal["@type"]) !== null && _f !== void 0 ? _f : "";
48
58
  if (type != this.type) {
49
59
  continue;
50
60
  }
@@ -57,16 +67,6 @@ class FirestoreModelLocaleConverter extends firestore_model_field_value_converte
57
67
  }
58
68
  }
59
69
  }
60
- else if (typeof value === "string") {
61
- const targetKey = `#${key}`;
62
- const targetMap = (_e = original[targetKey]) !== null && _e !== void 0 ? _e : {};
63
- const type = (_f = targetMap["@type"]) !== null && _f !== void 0 ? _f : "";
64
- if (type == this.type) {
65
- return {
66
- [key]: String(value),
67
- };
68
- }
69
- }
70
70
  return null;
71
71
  }
72
72
  }
@@ -1 +1 @@
1
- {"version":3,"file":"firestore_model_locale_converter.js","sourceRoot":"","sources":["../../src/converter/firestore_model_locale_converter.ts"],"names":[],"mappings":";;;AAAA,wGAAiG;AACjG,wCAA4C;AAE5C;;;;GAIG;AACH,MAAa,6BAA8B,SAAQ,yEAAiC;IAClF;;;;OAIG;IACH;QACE,KAAK,EAAE,CAAC;QAGV,SAAI,GAAW,aAAa,CAAC;IAF7B,CAAC;IAID,WAAW,CACT,GAAW,EACX,KAAU,EACV,QAAkC;;QAClC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,UAAU,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAkD,mCAAI,EAAE,CAAC;YAC9F,IAAI,UAAU,IAAI,IAAI,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE;gBACpG,MAAM,GAAG,GAAa,EAAE,CAAC;gBACzB,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;iBACvB;gBACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;oBAClB,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;aAAM,IAAI,IAAA,oBAAY,EAAC,KAAK,CAAC,EAAE;YAC9B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAqE,mCAAI,EAAE,CAAC;YAChH,SAAS,CAAA;YACT,IAAI,SAAS,IAAI,IAAI,EAAE;gBACrB,MAAM,GAAG,GAEL,EAAE,CAAC;gBACP,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;oBACvB,MAAM,MAAM,GAAG,MAAA,SAAS,CAAC,GAAG,CAAgD,mCAAI,EAAE,CAAC;oBACnF,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,OAAO,CAA8B,mCAAI,EAAE,CAAC;oBAChE,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;wBACrB,SAAS;qBACV;oBACD,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;iBACxB;gBACD,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC/B,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,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;gBACrB,OAAO;oBACL,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;iBACrB,CAAC;aACH;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAjED,sEAiEC"}
1
+ {"version":3,"file":"firestore_model_locale_converter.js","sourceRoot":"","sources":["../../src/converter/firestore_model_locale_converter.ts"],"names":[],"mappings":";;;AAAA,wGAAiG;AACjG,wCAA4C;AAE5C;;;;GAIG;AACH,MAAa,6BAA8B,SAAQ,yEAAiC;IAClF;;;;OAIG;IACH;QACE,KAAK,EAAE,CAAC;QAGV,SAAI,GAAW,aAAa,CAAC;IAF7B,CAAC;IAID,WAAW,CACT,GAAW,EACX,KAAU,EACV,QAAkC;;QAClC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,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;gBACrB,OAAO;oBACL,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;iBACrB,CAAC;aACH;SACF;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC/B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,UAAU,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAkD,mCAAI,EAAE,CAAC;YAC9F,IAAI,UAAU,IAAI,IAAI,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE;gBACpG,MAAM,GAAG,GAAa,EAAE,CAAC;gBACzB,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;iBACvB;gBACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;oBAClB,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;aAAM,IAAI,IAAA,oBAAY,EAAC,KAAK,CAAC,EAAE;YAC9B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAqE,mCAAI,EAAE,CAAC;YAChH,SAAS,CAAA;YACT,IAAI,SAAS,IAAI,IAAI,EAAE;gBACrB,MAAM,GAAG,GAEL,EAAE,CAAC;gBACP,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;oBACvB,MAAM,MAAM,GAAG,MAAA,SAAS,CAAC,GAAG,CAAgD,mCAAI,EAAE,CAAC;oBACnF,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,OAAO,CAA8B,mCAAI,EAAE,CAAC;oBAChE,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;wBACrB,SAAS;qBACV;oBACD,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;iBACxB;gBACD,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC/B,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAjED,sEAiEC"}
@@ -20,7 +20,13 @@ class FirestoreModelRefConverter extends firestore_model_field_value_converter_1
20
20
  this.type = "ModelRefBase";
21
21
  }
22
22
  convertFrom(key, value, original) {
23
- if (Array.isArray(value)) {
23
+ console.log(`${key} is ${typeof value}`);
24
+ if (value instanceof firestore_1.DocumentReference) {
25
+ return {
26
+ [key]: Object.assign({ "@ref": value.path }, this.header()),
27
+ };
28
+ }
29
+ else if (Array.isArray(value)) {
24
30
  const res = [];
25
31
  for (const tmp of value) {
26
32
  if (tmp instanceof firestore_1.DocumentReference) {
@@ -47,11 +53,6 @@ class FirestoreModelRefConverter extends firestore_model_field_value_converter_1
47
53
  };
48
54
  }
49
55
  }
50
- else if (value instanceof firestore_1.DocumentReference) {
51
- return {
52
- [key]: Object.assign({ "@ref": value.path }, this.header()),
53
- };
54
- }
55
56
  return null;
56
57
  }
57
58
  }
@@ -1 +1 @@
1
- {"version":3,"file":"firestore_model_ref_converter.js","sourceRoot":"","sources":["../../src/converter/firestore_model_ref_converter.ts"],"names":[],"mappings":";;;AAAA,wGAAiG;AACjG,wCAA4C;AAC5C,wDAA6D;AAE7D;;;;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;QAClC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACtB,MAAM,GAAG,GAA+B,EAAE,CAAC;YAC7C,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;gBACvB,IAAI,GAAG,YAAY,6BAAiB,EAAE;oBACpC,GAAG,CAAC,IAAI,iBACN,MAAM,EAAE,GAAG,CAAC,IAAI,IACb,IAAI,CAAC,MAAM,EAAE,EAChB,CAAC;iBACJ;aACF;YACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClB,OAAO;oBACL,CAAC,GAAG,CAAC,EAAE,GAAG;iBACX,CAAC;aACH;SACF;aAAM,IAAI,IAAA,oBAAY,EAAC,KAAK,CAAC,EAAE;YAC9B,MAAM,GAAG,GAEL,EAAE,CAAC;YACP,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;gBACrB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACrB,IAAI,GAAG,YAAY,6BAAiB,EAAE;oBACpC,GAAG,CAAC,CAAC,CAAC,mBACJ,MAAM,EAAE,GAAG,CAAC,IAAI,IACb,IAAI,CAAC,MAAM,EAAE,CACjB,CAAC;iBACH;aACF;YACD,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC/B,OAAO;oBACL,CAAC,GAAG,CAAC,EAAE,GAAG;iBACX,CAAC;aACH;SACF;aAAM,IAAI,KAAK,YAAY,6BAAiB,EAAE;YAC7C,OAAO;gBACL,CAAC,GAAG,CAAC,kBACH,MAAM,EAAE,KAAK,CAAC,IAAI,IACf,IAAI,CAAC,MAAM,EAAE,CACjB;aACF,CAAC;SACH;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA3DD,gEA2DC"}
1
+ {"version":3,"file":"firestore_model_ref_converter.js","sourceRoot":"","sources":["../../src/converter/firestore_model_ref_converter.ts"],"names":[],"mappings":";;;AAAA,wGAAiG;AACjG,wCAA4C;AAC5C,wDAA6D;AAE7D;;;;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;QAClC,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,OAAO,OAAO,KAAK,EAAE,CAAC,CAAC;QACzC,IAAI,KAAK,YAAY,6BAAiB,EAAE;YACtC,OAAO;gBACL,CAAC,GAAG,CAAC,kBACH,MAAM,EAAE,KAAK,CAAC,IAAI,IACf,IAAI,CAAC,MAAM,EAAE,CACjB;aACF,CAAC;SACH;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC7B,MAAM,GAAG,GAA+B,EAAE,CAAC;YAC7C,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;gBACvB,IAAI,GAAG,YAAY,6BAAiB,EAAE;oBACpC,GAAG,CAAC,IAAI,iBACN,MAAM,EAAE,GAAG,CAAC,IAAI,IACb,IAAI,CAAC,MAAM,EAAE,EAChB,CAAC;iBACJ;aACF;YACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClB,OAAO;oBACL,CAAC,GAAG,CAAC,EAAE,GAAG;iBACX,CAAC;aACH;SACF;aAAM,IAAI,IAAA,oBAAY,EAAC,KAAK,CAAC,EAAE;YAC9B,MAAM,GAAG,GAEL,EAAE,CAAC;YACP,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;gBACrB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACrB,IAAI,GAAG,YAAY,6BAAiB,EAAE;oBACpC,GAAG,CAAC,CAAC,CAAC,mBACJ,MAAM,EAAE,GAAG,CAAC,IAAI,IACb,IAAI,CAAC,MAAM,EAAE,CACjB,CAAC;iBACH;aACF;YACD,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC/B,OAAO;oBACL,CAAC,GAAG,CAAC,EAAE,GAAG;iBACX,CAAC;aACH;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA5DD,gEA4DC"}
@@ -21,9 +21,29 @@ class FirestoreModelTimestampConverter extends firestore_model_field_value_conve
21
21
  }
22
22
  convertFrom(key, value, original) {
23
23
  var _a, _b, _c, _d, _e, _f, _g, _h;
24
- if (Array.isArray(value)) {
24
+ if (typeof value === "number") {
25
25
  const targetKey = `#${key}`;
26
- const targetList = (_a = original[targetKey]) !== null && _a !== void 0 ? _a : [];
26
+ const targetMap = (_a = original[targetKey]) !== null && _a !== void 0 ? _a : {};
27
+ const type = (_b = targetMap["@type"]) !== null && _b !== void 0 ? _b : "";
28
+ if (type == this.type) {
29
+ return {
30
+ [key]: value,
31
+ };
32
+ }
33
+ }
34
+ else if (value instanceof firestore_1.Timestamp) {
35
+ const targetKey = `#${key}`;
36
+ const targetMap = (_c = original[targetKey]) !== null && _c !== void 0 ? _c : {};
37
+ const type = (_d = targetMap["@type"]) !== null && _d !== void 0 ? _d : "";
38
+ if (type == this.type) {
39
+ return {
40
+ [key]: value.toMillis(),
41
+ };
42
+ }
43
+ }
44
+ else if (Array.isArray(value)) {
45
+ const targetKey = `#${key}`;
46
+ const targetList = (_e = original[targetKey]) !== null && _e !== void 0 ? _e : [];
27
47
  if (targetList != null && targetList.length > 0 && targetList.every((e) => e["@type"] === this.type)) {
28
48
  const res = [];
29
49
  for (const tmp of value) {
@@ -43,14 +63,14 @@ class FirestoreModelTimestampConverter extends firestore_model_field_value_conve
43
63
  }
44
64
  else if ((0, utils_1.isDynamicMap)(value)) {
45
65
  const targetKey = `#${key}`;
46
- const targetMap = (_b = original[targetKey]) !== null && _b !== void 0 ? _b : {};
66
+ const targetMap = (_f = original[targetKey]) !== null && _f !== void 0 ? _f : {};
47
67
  targetMap;
48
68
  if (targetMap != null) {
49
69
  const res = {};
50
70
  for (const key in value) {
51
71
  const val = value[key];
52
- const mapVal = (_c = targetMap[key]) !== null && _c !== void 0 ? _c : {};
53
- const type = (_d = mapVal["@type"]) !== null && _d !== void 0 ? _d : "";
72
+ const mapVal = (_g = targetMap[key]) !== null && _g !== void 0 ? _g : {};
73
+ const type = (_h = mapVal["@type"]) !== null && _h !== void 0 ? _h : "";
54
74
  if (type != this.type) {
55
75
  continue;
56
76
  }
@@ -68,26 +88,6 @@ class FirestoreModelTimestampConverter extends firestore_model_field_value_conve
68
88
  }
69
89
  }
70
90
  }
71
- else if (typeof value === "number") {
72
- const targetKey = `#${key}`;
73
- const targetMap = (_e = original[targetKey]) !== null && _e !== void 0 ? _e : {};
74
- const type = (_f = targetMap["@type"]) !== null && _f !== void 0 ? _f : "";
75
- if (type == this.type) {
76
- return {
77
- [key]: value,
78
- };
79
- }
80
- }
81
- else if (value instanceof firestore_1.Timestamp) {
82
- const targetKey = `#${key}`;
83
- const targetMap = (_g = original[targetKey]) !== null && _g !== void 0 ? _g : {};
84
- const type = (_h = targetMap["@type"]) !== null && _h !== void 0 ? _h : "";
85
- if (type == this.type) {
86
- return {
87
- [key]: value.toMillis(),
88
- };
89
- }
90
- }
91
91
  return null;
92
92
  }
93
93
  }
@@ -1 +1 @@
1
- {"version":3,"file":"firestore_model_timestamp_converter.js","sourceRoot":"","sources":["../../src/converter/firestore_model_timestamp_converter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"firestore_model_timestamp_converter.js","sourceRoot":"","sources":["../../src/converter/firestore_model_timestamp_converter.ts"],"names":[],"mappings":"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"}
@@ -20,9 +20,19 @@ class FirestoreModelUriConverter extends firestore_model_field_value_converter_1
20
20
  }
21
21
  convertFrom(key, value, original) {
22
22
  var _a, _b, _c, _d, _e, _f;
23
- if (Array.isArray(value)) {
23
+ if (typeof value === "string") {
24
24
  const targetKey = `#${key}`;
25
- const targetList = (_a = original[targetKey]) !== null && _a !== void 0 ? _a : [];
25
+ const targetMap = (_a = original[targetKey]) !== null && _a !== void 0 ? _a : {};
26
+ const type = (_b = targetMap["@type"]) !== null && _b !== void 0 ? _b : "";
27
+ if (type == this.type) {
28
+ return {
29
+ [key]: String(value),
30
+ };
31
+ }
32
+ }
33
+ else if (Array.isArray(value)) {
34
+ const targetKey = `#${key}`;
35
+ const targetList = (_c = original[targetKey]) !== null && _c !== void 0 ? _c : [];
26
36
  if (targetList != null && targetList.length > 0 && targetList.every((e) => e["@type"] === this.type)) {
27
37
  const res = [];
28
38
  for (const tmp of value) {
@@ -37,14 +47,14 @@ class FirestoreModelUriConverter extends firestore_model_field_value_converter_1
37
47
  }
38
48
  else if ((0, utils_1.isDynamicMap)(value)) {
39
49
  const targetKey = `#${key}`;
40
- const targetMap = (_b = original[targetKey]) !== null && _b !== void 0 ? _b : {};
50
+ const targetMap = (_d = original[targetKey]) !== null && _d !== void 0 ? _d : {};
41
51
  targetMap;
42
52
  if (targetMap != null) {
43
53
  const res = {};
44
54
  for (const key in value) {
45
55
  const val = value[key];
46
- const mapVal = (_c = targetMap[key]) !== null && _c !== void 0 ? _c : {};
47
- const type = (_d = mapVal["@type"]) !== null && _d !== void 0 ? _d : "";
56
+ const mapVal = (_e = targetMap[key]) !== null && _e !== void 0 ? _e : {};
57
+ const type = (_f = mapVal["@type"]) !== null && _f !== void 0 ? _f : "";
48
58
  if (type != this.type) {
49
59
  continue;
50
60
  }
@@ -57,16 +67,6 @@ class FirestoreModelUriConverter extends firestore_model_field_value_converter_1
57
67
  }
58
68
  }
59
69
  }
60
- else if (typeof value === "string") {
61
- const targetKey = `#${key}`;
62
- const targetMap = (_e = original[targetKey]) !== null && _e !== void 0 ? _e : {};
63
- const type = (_f = targetMap["@type"]) !== null && _f !== void 0 ? _f : "";
64
- if (type == this.type) {
65
- return {
66
- [key]: String(value),
67
- };
68
- }
69
- }
70
70
  return null;
71
71
  }
72
72
  }
@@ -1 +1 @@
1
- {"version":3,"file":"firestore_model_uri_converter.js","sourceRoot":"","sources":["../../src/converter/firestore_model_uri_converter.ts"],"names":[],"mappings":";;;AAAA,wGAAiG;AACjG,wCAA4C;AAE5C;;;;GAIG;AACH,MAAa,0BAA2B,SAAQ,yEAAiC;IAC/E;;;;OAIG;IACH;QACE,KAAK,EAAE,CAAC;QAGV,SAAI,GAAW,UAAU,CAAC;IAF1B,CAAC;IAID,WAAW,CACT,GAAW,EACX,KAAU,EACV,QAAkC;;QAClC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,UAAU,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAkD,mCAAI,EAAE,CAAC;YAC9F,IAAI,UAAU,IAAI,IAAI,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE;gBACpG,MAAM,GAAG,GAAa,EAAE,CAAC;gBACzB,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;iBACvB;gBACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;oBAClB,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;aAAM,IAAI,IAAA,oBAAY,EAAC,KAAK,CAAC,EAAE;YAC9B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAqE,mCAAI,EAAE,CAAC;YAChH,SAAS,CAAA;YACT,IAAI,SAAS,IAAI,IAAI,EAAE;gBACrB,MAAM,GAAG,GAEL,EAAE,CAAC;gBACP,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;oBACvB,MAAM,MAAM,GAAG,MAAA,SAAS,CAAC,GAAG,CAAgD,mCAAI,EAAE,CAAC;oBACnF,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,OAAO,CAA8B,mCAAI,EAAE,CAAC;oBAChE,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;wBACrB,SAAS;qBACV;oBACD,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;iBACxB;gBACD,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC/B,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,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;gBACrB,OAAO;oBACL,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;iBACrB,CAAC;aACH;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAjED,gEAiEC"}
1
+ {"version":3,"file":"firestore_model_uri_converter.js","sourceRoot":"","sources":["../../src/converter/firestore_model_uri_converter.ts"],"names":[],"mappings":";;;AAAA,wGAAiG;AACjG,wCAA4C;AAE5C;;;;GAIG;AACH,MAAa,0BAA2B,SAAQ,yEAAiC;IAC/E;;;;OAIG;IACH;QACE,KAAK,EAAE,CAAC;QAGV,SAAI,GAAW,UAAU,CAAC;IAF1B,CAAC;IAID,WAAW,CACT,GAAW,EACX,KAAU,EACV,QAAkC;;QAClC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,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;gBACrB,OAAO;oBACL,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;iBACrB,CAAC;aACH;SACF;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC/B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,UAAU,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAkD,mCAAI,EAAE,CAAC;YAC9F,IAAI,UAAU,IAAI,IAAI,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE;gBACpG,MAAM,GAAG,GAAa,EAAE,CAAC;gBACzB,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;iBACvB;gBACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;oBAClB,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;aAAM,IAAI,IAAA,oBAAY,EAAC,KAAK,CAAC,EAAE;YAC9B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAqE,mCAAI,EAAE,CAAC;YAChH,SAAS,CAAA;YACT,IAAI,SAAS,IAAI,IAAI,EAAE;gBACrB,MAAM,GAAG,GAEL,EAAE,CAAC;gBACP,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;oBACvB,MAAM,MAAM,GAAG,MAAA,SAAS,CAAC,GAAG,CAAgD,mCAAI,EAAE,CAAC;oBACnF,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,OAAO,CAA8B,mCAAI,EAAE,CAAC;oBAChE,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;wBACrB,SAAS;qBACV;oBACD,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;iBACxB;gBACD,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC/B,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAjED,gEAiEC"}
@@ -20,9 +20,19 @@ class FirestoreModelVideoUriConverter extends firestore_model_field_value_conver
20
20
  }
21
21
  convertFrom(key, value, original) {
22
22
  var _a, _b, _c, _d, _e, _f;
23
- if (Array.isArray(value)) {
23
+ if (typeof value === "string") {
24
24
  const targetKey = `#${key}`;
25
- const targetList = (_a = original[targetKey]) !== null && _a !== void 0 ? _a : [];
25
+ const targetMap = (_a = original[targetKey]) !== null && _a !== void 0 ? _a : {};
26
+ const type = (_b = targetMap["@type"]) !== null && _b !== void 0 ? _b : "";
27
+ if (type == this.type) {
28
+ return {
29
+ [key]: String(value),
30
+ };
31
+ }
32
+ }
33
+ else if (Array.isArray(value)) {
34
+ const targetKey = `#${key}`;
35
+ const targetList = (_c = original[targetKey]) !== null && _c !== void 0 ? _c : [];
26
36
  if (targetList != null && targetList.length > 0 && targetList.every((e) => e["@type"] === this.type)) {
27
37
  const res = [];
28
38
  for (const tmp of value) {
@@ -37,14 +47,14 @@ class FirestoreModelVideoUriConverter extends firestore_model_field_value_conver
37
47
  }
38
48
  else if ((0, utils_1.isDynamicMap)(value)) {
39
49
  const targetKey = `#${key}`;
40
- const targetMap = (_b = original[targetKey]) !== null && _b !== void 0 ? _b : {};
50
+ const targetMap = (_d = original[targetKey]) !== null && _d !== void 0 ? _d : {};
41
51
  targetMap;
42
52
  if (targetMap != null) {
43
53
  const res = {};
44
54
  for (const key in value) {
45
55
  const val = value[key];
46
- const mapVal = (_c = targetMap[key]) !== null && _c !== void 0 ? _c : {};
47
- const type = (_d = mapVal["@type"]) !== null && _d !== void 0 ? _d : "";
56
+ const mapVal = (_e = targetMap[key]) !== null && _e !== void 0 ? _e : {};
57
+ const type = (_f = mapVal["@type"]) !== null && _f !== void 0 ? _f : "";
48
58
  if (type != this.type) {
49
59
  continue;
50
60
  }
@@ -57,16 +67,6 @@ class FirestoreModelVideoUriConverter extends firestore_model_field_value_conver
57
67
  }
58
68
  }
59
69
  }
60
- else if (typeof value === "string") {
61
- const targetKey = `#${key}`;
62
- const targetMap = (_e = original[targetKey]) !== null && _e !== void 0 ? _e : {};
63
- const type = (_f = targetMap["@type"]) !== null && _f !== void 0 ? _f : "";
64
- if (type == this.type) {
65
- return {
66
- [key]: String(value),
67
- };
68
- }
69
- }
70
70
  return null;
71
71
  }
72
72
  }
@@ -1 +1 @@
1
- {"version":3,"file":"firestore_model_video_uri_converter.js","sourceRoot":"","sources":["../../src/converter/firestore_model_video_uri_converter.ts"],"names":[],"mappings":";;;AAAA,wGAAiG;AACjG,wCAA4C;AAE5C;;;;GAIG;AACH,MAAa,+BAAgC,SAAQ,yEAAiC;IACpF;;;;OAIG;IACH;QACE,KAAK,EAAE,CAAC;QAGV,SAAI,GAAW,eAAe,CAAC;IAF/B,CAAC;IAID,WAAW,CACT,GAAW,EACX,KAAU,EACV,QAAkC;;QAClC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,UAAU,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAkD,mCAAI,EAAE,CAAC;YAC9F,IAAI,UAAU,IAAI,IAAI,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE;gBACpG,MAAM,GAAG,GAAa,EAAE,CAAC;gBACzB,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;iBACvB;gBACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;oBAClB,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;aAAM,IAAI,IAAA,oBAAY,EAAC,KAAK,CAAC,EAAE;YAC9B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAqE,mCAAI,EAAE,CAAC;YAChH,SAAS,CAAA;YACT,IAAI,SAAS,IAAI,IAAI,EAAE;gBACrB,MAAM,GAAG,GAEL,EAAE,CAAC;gBACP,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;oBACvB,MAAM,MAAM,GAAG,MAAA,SAAS,CAAC,GAAG,CAAgD,mCAAI,EAAE,CAAC;oBACnF,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,OAAO,CAA8B,mCAAI,EAAE,CAAC;oBAChE,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;wBACrB,SAAS;qBACV;oBACD,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;iBACxB;gBACD,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC/B,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,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;gBACrB,OAAO;oBACL,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;iBACrB,CAAC;aACH;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAjED,0EAiEC"}
1
+ {"version":3,"file":"firestore_model_video_uri_converter.js","sourceRoot":"","sources":["../../src/converter/firestore_model_video_uri_converter.ts"],"names":[],"mappings":";;;AAAA,wGAAiG;AACjG,wCAA4C;AAE5C;;;;GAIG;AACH,MAAa,+BAAgC,SAAQ,yEAAiC;IACpF;;;;OAIG;IACH;QACE,KAAK,EAAE,CAAC;QAGV,SAAI,GAAW,eAAe,CAAC;IAF/B,CAAC;IAID,WAAW,CACT,GAAW,EACX,KAAU,EACV,QAAkC;;QAClC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,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;gBACrB,OAAO;oBACL,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;iBACrB,CAAC;aACH;SACF;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC/B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,UAAU,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAkD,mCAAI,EAAE,CAAC;YAC9F,IAAI,UAAU,IAAI,IAAI,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE;gBACpG,MAAM,GAAG,GAAa,EAAE,CAAC;gBACzB,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;iBACvB;gBACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;oBAClB,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;aAAM,IAAI,IAAA,oBAAY,EAAC,KAAK,CAAC,EAAE;YAC9B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,SAAS,CAAqE,mCAAI,EAAE,CAAC;YAChH,SAAS,CAAA;YACT,IAAI,SAAS,IAAI,IAAI,EAAE;gBACrB,MAAM,GAAG,GAEL,EAAE,CAAC;gBACP,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;oBACvB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;oBACvB,MAAM,MAAM,GAAG,MAAA,SAAS,CAAC,GAAG,CAAgD,mCAAI,EAAE,CAAC;oBACnF,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,OAAO,CAA8B,mCAAI,EAAE,CAAC;oBAChE,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;wBACrB,SAAS;qBACV;oBACD,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;iBACxB;gBACD,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC/B,OAAO;wBACL,CAAC,GAAG,CAAC,EAAE,GAAG;qBACX,CAAC;iBACH;aACF;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAjED,0EAiEC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mathrunet/masamune",
3
- "version": "2.2.9",
3
+ "version": "2.2.10",
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",