@gridsheet/react-core 1.3.0-alpha.1 → 1.3.0-alpha.3

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.
Files changed (72) hide show
  1. package/dist/components/GridSheet.d.ts.map +1 -1
  2. package/dist/components/GridSheet.js +10 -0
  3. package/dist/components/GridSheet.js.map +1 -1
  4. package/dist/components/PluginBase.d.ts +21 -0
  5. package/dist/components/PluginBase.d.ts.map +1 -0
  6. package/dist/components/PluginBase.js +41 -0
  7. package/dist/components/PluginBase.js.map +1 -0
  8. package/dist/components/SheetProvider.d.ts +4 -2
  9. package/dist/components/SheetProvider.d.ts.map +1 -1
  10. package/dist/components/SheetProvider.js.map +1 -1
  11. package/dist/components/StoreInitializer.d.ts.map +1 -1
  12. package/dist/components/StoreInitializer.js +9 -0
  13. package/dist/components/StoreInitializer.js.map +1 -1
  14. package/dist/constants.d.ts +2 -0
  15. package/dist/constants.d.ts.map +1 -1
  16. package/dist/constants.js +3 -1
  17. package/dist/constants.js.map +1 -1
  18. package/dist/formula/functions/__utils.d.ts +6 -0
  19. package/dist/formula/functions/__utils.d.ts.map +1 -1
  20. package/dist/formula/functions/__utils.js +64 -18
  21. package/dist/formula/functions/__utils.js.map +1 -1
  22. package/dist/formula/functions/add.d.ts.map +1 -1
  23. package/dist/formula/functions/add.js +11 -3
  24. package/dist/formula/functions/add.js.map +1 -1
  25. package/dist/formula/functions/countif.d.ts.map +1 -1
  26. package/dist/formula/functions/countif.js +1 -0
  27. package/dist/formula/functions/countif.js.map +1 -1
  28. package/dist/formula/functions/countif.spec.d.ts +2 -0
  29. package/dist/formula/functions/countif.spec.d.ts.map +1 -0
  30. package/dist/formula/functions/countif.spec.js +185 -0
  31. package/dist/formula/functions/countif.spec.js.map +1 -0
  32. package/dist/formula/functions/eq.d.ts +1 -1
  33. package/dist/formula/functions/eq.d.ts.map +1 -1
  34. package/dist/formula/functions/eq.js +2 -1
  35. package/dist/formula/functions/eq.js.map +1 -1
  36. package/dist/formula/functions/eq.spec.d.ts +2 -0
  37. package/dist/formula/functions/eq.spec.d.ts.map +1 -0
  38. package/dist/formula/functions/eq.spec.js +92 -0
  39. package/dist/formula/functions/eq.spec.js.map +1 -0
  40. package/dist/formula/functions/gt.d.ts.map +1 -1
  41. package/dist/formula/functions/gt.js +1 -2
  42. package/dist/formula/functions/gt.js.map +1 -1
  43. package/dist/formula/functions/gte.d.ts.map +1 -1
  44. package/dist/formula/functions/gte.js +1 -2
  45. package/dist/formula/functions/gte.js.map +1 -1
  46. package/dist/formula/functions/lt.d.ts.map +1 -1
  47. package/dist/formula/functions/lt.js +1 -2
  48. package/dist/formula/functions/lt.js.map +1 -1
  49. package/dist/formula/functions/lte.d.ts.map +1 -1
  50. package/dist/formula/functions/lte.js +1 -2
  51. package/dist/formula/functions/lte.js.map +1 -1
  52. package/dist/formula/functions/minus.d.ts.map +1 -1
  53. package/dist/formula/functions/minus.js +8 -2
  54. package/dist/formula/functions/minus.js.map +1 -1
  55. package/dist/formula/functions/ne.d.ts.map +1 -1
  56. package/dist/formula/functions/ne.js +2 -1
  57. package/dist/formula/functions/ne.js.map +1 -1
  58. package/dist/formula/functions/sumif.d.ts.map +1 -1
  59. package/dist/formula/functions/sumif.js +1 -0
  60. package/dist/formula/functions/sumif.js.map +1 -1
  61. package/dist/lib/autofill.js +5 -2
  62. package/dist/lib/autofill.js.map +1 -1
  63. package/dist/lib/time.d.ts.map +1 -1
  64. package/dist/lib/time.js +8 -4
  65. package/dist/lib/time.js.map +1 -1
  66. package/dist/parsers/core.d.ts.map +1 -1
  67. package/dist/parsers/core.js +20 -7
  68. package/dist/parsers/core.js.map +1 -1
  69. package/dist/renderers/core.d.ts.map +1 -1
  70. package/dist/renderers/core.js +9 -6
  71. package/dist/renderers/core.js.map +1 -1
  72. package/package.json +2 -3
@@ -0,0 +1,185 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const countif_1 = require("./countif");
4
+ const table_1 = require("../../lib/table");
5
+ const evaluator_1 = require("../evaluator");
6
+ describe('countif', () => {
7
+ const table = new table_1.Table({});
8
+ table.initialize({
9
+ A1: { value: 1 },
10
+ B1: { value: 10 },
11
+ C1: { value: 3 },
12
+ D1: { value: 2 },
13
+ E1: { value: 3 },
14
+ A2: { value: 'a' },
15
+ B2: { value: 'aa' },
16
+ C2: { value: 'a日' },
17
+ D2: { value: 'abc' },
18
+ E2: { value: 'bb' },
19
+ A3: { value: new Date('2022-01-05T00:00:00.000Z') },
20
+ B3: { value: new Date('2022-01-03T00:00:00.000Z') },
21
+ C3: { value: new Date('2022-01-04T00:00:00.000Z') },
22
+ D3: { value: new Date('2022-01-04T00:00:00.000+09:00') },
23
+ A4: { value: null },
24
+ B4: { value: 0 },
25
+ C4: { value: '' },
26
+ D4: { value: false },
27
+ E4: { value: true },
28
+ });
29
+ describe('normal', () => {
30
+ it('eq', () => {
31
+ {
32
+ const f = new countif_1.CountifFunction({
33
+ table,
34
+ args: [new evaluator_1.RangeEntity('A1:E1'), new evaluator_1.ValueEntity('3')],
35
+ });
36
+ expect(f.call()).toBe(2);
37
+ }
38
+ {
39
+ const f = new countif_1.CountifFunction({
40
+ table,
41
+ args: [new evaluator_1.RangeEntity('A1:E1'), new evaluator_1.ValueEntity('=3')],
42
+ });
43
+ expect(f.call()).toBe(2);
44
+ }
45
+ {
46
+ const f = new countif_1.CountifFunction({
47
+ table,
48
+ args: [new evaluator_1.RangeEntity('A1:E1'), new evaluator_1.RefEntity('E1')],
49
+ });
50
+ expect(f.call()).toBe(2);
51
+ }
52
+ {
53
+ const f = new countif_1.CountifFunction({
54
+ table,
55
+ args: [new evaluator_1.RangeEntity('A2:E2'), new evaluator_1.ValueEntity('a*')],
56
+ });
57
+ expect(f.call()).toBe(4);
58
+ }
59
+ {
60
+ const f = new countif_1.CountifFunction({
61
+ table,
62
+ args: [new evaluator_1.RangeEntity('A2:E2'), new evaluator_1.ValueEntity('a?')],
63
+ });
64
+ expect(f.call()).toBe(2);
65
+ }
66
+ {
67
+ const f = new countif_1.CountifFunction({
68
+ table,
69
+ args: [new evaluator_1.RangeEntity('A2:E2'), new evaluator_1.ValueEntity('?b*')],
70
+ });
71
+ expect(f.call()).toBe(2);
72
+ }
73
+ {
74
+ const f = new countif_1.CountifFunction({
75
+ table,
76
+ args: [new evaluator_1.RangeEntity('A3:E3'), new evaluator_1.ValueEntity(new Date('2022-01-04T00:00:00.000Z'))],
77
+ });
78
+ expect(f.call()).toBe(1);
79
+ }
80
+ {
81
+ const f = new countif_1.CountifFunction({
82
+ table,
83
+ args: [new evaluator_1.RangeEntity('A4:E4'), new evaluator_1.ValueEntity('')],
84
+ });
85
+ expect(f.call()).toBe(2);
86
+ }
87
+ });
88
+ it('ne', () => {
89
+ {
90
+ const f = new countif_1.CountifFunction({
91
+ table,
92
+ args: [new evaluator_1.RangeEntity('A1:E1'), new evaluator_1.ValueEntity('<>3')],
93
+ });
94
+ expect(f.call()).toBe(3);
95
+ }
96
+ {
97
+ const f = new countif_1.CountifFunction({
98
+ table,
99
+ args: [new evaluator_1.RangeEntity('A2:E2'), new evaluator_1.ValueEntity('<>a*')],
100
+ });
101
+ expect(f.call()).toBe(1);
102
+ }
103
+ {
104
+ const f = new countif_1.CountifFunction({
105
+ table,
106
+ args: [new evaluator_1.RangeEntity('A4:E4'), new evaluator_1.ValueEntity('<>')],
107
+ });
108
+ expect(f.call()).toBe(3);
109
+ }
110
+ });
111
+ it('gt', () => {
112
+ {
113
+ const f = new countif_1.CountifFunction({
114
+ table,
115
+ args: [new evaluator_1.RangeEntity('A1:E1'), new evaluator_1.ValueEntity('>3')],
116
+ });
117
+ expect(f.call()).toBe(1);
118
+ }
119
+ {
120
+ const f = new countif_1.CountifFunction({
121
+ table,
122
+ args: [new evaluator_1.RangeEntity('A2:E2'), new evaluator_1.ValueEntity('>aa')],
123
+ });
124
+ expect(f.call()).toBe(3);
125
+ }
126
+ });
127
+ it('gte', () => {
128
+ {
129
+ const f = new countif_1.CountifFunction({
130
+ table,
131
+ args: [new evaluator_1.RangeEntity('A1:E1'), new evaluator_1.ValueEntity('>=3')],
132
+ });
133
+ expect(f.call()).toBe(3);
134
+ }
135
+ {
136
+ const f = new countif_1.CountifFunction({
137
+ table,
138
+ args: [new evaluator_1.RangeEntity('A2:E2'), new evaluator_1.ValueEntity('>=aa')],
139
+ });
140
+ expect(f.call()).toBe(4);
141
+ }
142
+ });
143
+ it('lt', () => {
144
+ {
145
+ const f = new countif_1.CountifFunction({
146
+ table,
147
+ args: [new evaluator_1.RangeEntity('A1:E1'), new evaluator_1.ValueEntity('<3')],
148
+ });
149
+ expect(f.call()).toBe(2);
150
+ }
151
+ {
152
+ const f = new countif_1.CountifFunction({
153
+ table,
154
+ args: [new evaluator_1.RangeEntity('A2:E2'), new evaluator_1.ValueEntity('<aa')],
155
+ });
156
+ expect(f.call()).toBe(1);
157
+ }
158
+ });
159
+ it('lte', () => {
160
+ {
161
+ const f = new countif_1.CountifFunction({
162
+ table,
163
+ args: [new evaluator_1.RangeEntity('A1:E1'), new evaluator_1.ValueEntity('<=3')],
164
+ });
165
+ expect(f.call()).toBe(4);
166
+ }
167
+ {
168
+ const f = new countif_1.CountifFunction({
169
+ table,
170
+ args: [new evaluator_1.RangeEntity('A2:E2'), new evaluator_1.ValueEntity('<=aa')],
171
+ });
172
+ expect(f.call()).toBe(2);
173
+ }
174
+ });
175
+ });
176
+ describe('validation error', () => {
177
+ it('missing argument', () => {
178
+ {
179
+ const f = new countif_1.CountifFunction({ table, args: [new evaluator_1.RangeEntity('A1:A3')] });
180
+ expect(f.call.bind(f)).toThrow(evaluator_1.FormulaError);
181
+ }
182
+ });
183
+ });
184
+ });
185
+ //# sourceMappingURL=countif.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"countif.spec.js","sourceRoot":"","sources":["../../../src/formula/functions/countif.spec.ts"],"names":[],"mappings":"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"}
@@ -7,6 +7,6 @@ export declare class EqFunction extends BaseFunction {
7
7
  description: string;
8
8
  }[];
9
9
  protected validate(): void;
10
- protected main(v1: number, v2: number): boolean;
10
+ protected main(v1: any, v2: any): boolean;
11
11
  }
12
12
  //# sourceMappingURL=eq.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"eq.d.ts","sourceRoot":"","sources":["../../../src/formula/functions/eq.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,qBAAa,UAAW,SAAQ,YAAY;IAC1C,OAAO,SAAc;IACrB,QAAQ,WAGN;IACF,QAAQ;;;QAGN;IAEF,SAAS,CAAC,QAAQ;IAMlB,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;CAGtC"}
1
+ {"version":3,"file":"eq.d.ts","sourceRoot":"","sources":["../../../src/formula/functions/eq.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGxC,qBAAa,UAAW,SAAQ,YAAY;IAC1C,OAAO,SAAc;IACrB,QAAQ,WAGN;IACF,QAAQ;;;QAGN;IAEF,SAAS,CAAC,QAAQ;IAMlB,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG;CAGhC"}
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.EqFunction = void 0;
4
4
  const evaluator_1 = require("../evaluator");
5
5
  const __base_1 = require("./__base");
6
+ const __utils_1 = require("./__utils");
6
7
  class EqFunction extends __base_1.BaseFunction {
7
8
  constructor() {
8
9
  super(...arguments);
@@ -22,7 +23,7 @@ class EqFunction extends __base_1.BaseFunction {
22
23
  }
23
24
  }
24
25
  main(v1, v2) {
25
- return v1 === v2;
26
+ return (0, __utils_1.eq)(v1, v2);
26
27
  }
27
28
  }
28
29
  exports.EqFunction = EqFunction;
@@ -1 +1 @@
1
- {"version":3,"file":"eq.js","sourceRoot":"","sources":["../../../src/formula/functions/eq.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,qCAAwC;AAExC,MAAa,UAAW,SAAQ,qBAAY;IAA5C;;QACE,YAAO,GAAG,UAAU,CAAC;QACrB,aAAQ,GAAG;YACT,4EAA4E;YAC5E,uCAAuC;SACxC,CAAC;QACF,aAAQ,GAAG;YACT,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE;YAC/C,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qCAAqC,EAAE;SACvE,CAAC;IAWJ,CAAC;IATW,QAAQ;QAChB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,MAAM,IAAI,wBAAY,CAAC,MAAM,EAAE,0CAA0C,CAAC,CAAC;SAC5E;IACH,CAAC;IAES,IAAI,CAAC,EAAU,EAAE,EAAU;QACnC,OAAO,EAAE,KAAK,EAAE,CAAC;IACnB,CAAC;CACF;AApBD,gCAoBC"}
1
+ {"version":3,"file":"eq.js","sourceRoot":"","sources":["../../../src/formula/functions/eq.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,qCAAwC;AACxC,uCAA+B;AAE/B,MAAa,UAAW,SAAQ,qBAAY;IAA5C;;QACE,YAAO,GAAG,UAAU,CAAC;QACrB,aAAQ,GAAG;YACT,4EAA4E;YAC5E,uCAAuC;SACxC,CAAC;QACF,aAAQ,GAAG;YACT,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE;YAC/C,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qCAAqC,EAAE;SACvE,CAAC;IAWJ,CAAC;IATW,QAAQ;QAChB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,MAAM,IAAI,wBAAY,CAAC,MAAM,EAAE,0CAA0C,CAAC,CAAC;SAC5E;IACH,CAAC;IAES,IAAI,CAAC,EAAO,EAAE,EAAO;QAC7B,OAAO,IAAA,YAAE,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACpB,CAAC;CACF;AApBD,gCAoBC"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=eq.spec.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"eq.spec.d.ts","sourceRoot":"","sources":["../../../src/formula/functions/eq.spec.ts"],"names":[],"mappings":""}
@@ -0,0 +1,92 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const eq_1 = require("./eq");
4
+ const table_1 = require("../../lib/table");
5
+ const evaluator_1 = require("../evaluator");
6
+ describe('eq', () => {
7
+ const table = new table_1.Table({});
8
+ table.initialize({
9
+ A1: { value: 101 },
10
+ A2: { value: 101 },
11
+ A3: { value: 103 },
12
+ B1: { value: 'abc' },
13
+ B2: { value: 'abcd' },
14
+ C1: { value: new Date('2022-05-23T12:34:56+09:00') },
15
+ C2: { value: new Date('2022-05-23T12:34:56.999+09:00') },
16
+ C3: { value: new Date('2022-05-23T12:34:56Z') },
17
+ D4: { value: '=1/0' },
18
+ E5: { value: null },
19
+ });
20
+ describe('normal', () => {
21
+ it('A1=101 is true', () => {
22
+ const f = new eq_1.EqFunction({
23
+ table,
24
+ args: [new evaluator_1.RefEntity('A1'), new evaluator_1.ValueEntity(101)],
25
+ });
26
+ expect(f.call()).toBe(true);
27
+ });
28
+ it('A1=A2 is true', () => {
29
+ const f = new eq_1.EqFunction({
30
+ table,
31
+ args: [new evaluator_1.RefEntity('A1'), new evaluator_1.RefEntity('A2')],
32
+ });
33
+ expect(f.call()).toBe(true);
34
+ });
35
+ it('A1=A3 is false', () => {
36
+ const f = new eq_1.EqFunction({
37
+ table,
38
+ args: [new evaluator_1.RefEntity('A1'), new evaluator_1.RefEntity('A3')],
39
+ });
40
+ expect(f.call()).toBe(false);
41
+ });
42
+ it('B1=abc is true', () => {
43
+ const f = new eq_1.EqFunction({
44
+ table,
45
+ args: [new evaluator_1.RefEntity('B1'), new evaluator_1.ValueEntity('abc')],
46
+ });
47
+ expect(f.call()).toBe(true);
48
+ });
49
+ it('B1=B2 is false', () => {
50
+ const f = new eq_1.EqFunction({
51
+ table,
52
+ args: [new evaluator_1.RefEntity('B1'), new evaluator_1.RefEntity('B2')],
53
+ });
54
+ expect(f.call()).toBe(false);
55
+ });
56
+ it('C1=raw date is true', () => {
57
+ const f = new eq_1.EqFunction({
58
+ table,
59
+ args: [new evaluator_1.RefEntity('C1'), new evaluator_1.ValueEntity(new Date('2022-05-23T12:34:56+09:00'))],
60
+ });
61
+ expect(f.call()).toBe(true);
62
+ });
63
+ it('C1=C2 is false', () => {
64
+ const f = new eq_1.EqFunction({
65
+ table,
66
+ args: [new evaluator_1.RefEntity('C1'), new evaluator_1.RefEntity('C2')],
67
+ });
68
+ expect(f.call()).toBe(false);
69
+ });
70
+ it('C1=C3 is false', () => {
71
+ const f = new eq_1.EqFunction({
72
+ table,
73
+ args: [new evaluator_1.RefEntity('C1'), new evaluator_1.RefEntity('C3')],
74
+ });
75
+ expect(f.call()).toBe(false);
76
+ });
77
+ it('null is blank', () => {
78
+ const f = new eq_1.EqFunction({
79
+ table,
80
+ args: [new evaluator_1.ValueEntity(null), new evaluator_1.ValueEntity('')],
81
+ });
82
+ expect(f.call()).toBe(true);
83
+ });
84
+ });
85
+ describe('validation error', () => {
86
+ it('missing argument', () => {
87
+ const f = new eq_1.EqFunction({ table, args: [] });
88
+ expect(f.call.bind(f)).toThrow(evaluator_1.FormulaError);
89
+ });
90
+ });
91
+ });
92
+ //# sourceMappingURL=eq.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"eq.spec.js","sourceRoot":"","sources":["../../../src/formula/functions/eq.spec.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"gt.d.ts","sourceRoot":"","sources":["../../../src/formula/functions/gt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGxC,qBAAa,UAAW,SAAQ,YAAY;IAC1C,OAAO,SAAc;IACrB,QAAQ,WAGN;IACF,QAAQ;;;QAGN;IAEF,SAAS,CAAC,QAAQ;IAOlB,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;CAGtC"}
1
+ {"version":3,"file":"gt.d.ts","sourceRoot":"","sources":["../../../src/formula/functions/gt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGxC,qBAAa,UAAW,SAAQ,YAAY;IAC1C,OAAO,SAAc;IACrB,QAAQ,WAGN;IACF,QAAQ;;;QAGN;IAEF,SAAS,CAAC,QAAQ;IAMlB,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;CAGtC"}
@@ -21,10 +21,9 @@ class GtFunction extends __base_1.BaseFunction {
21
21
  if (this.bareArgs.length !== 2) {
22
22
  throw new evaluator_1.FormulaError('#N/A', 'Number of arguments for GT is incorrect.');
23
23
  }
24
- this.bareArgs = this.bareArgs.map((arg) => (0, __utils_1.ensureNumber)(arg));
25
24
  }
26
25
  main(v1, v2) {
27
- return v1 > v2;
26
+ return (0, __utils_1.gt)(v1, v2);
28
27
  }
29
28
  }
30
29
  exports.GtFunction = GtFunction;
@@ -1 +1 @@
1
- {"version":3,"file":"gt.js","sourceRoot":"","sources":["../../../src/formula/functions/gt.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,qCAAwC;AACxC,uCAAyC;AAEzC,MAAa,UAAW,SAAQ,qBAAY;IAA5C;;QACE,YAAO,GAAG,UAAU,CAAC;QACrB,aAAQ,GAAG;YACT,uFAAuF;YACvF,uCAAuC;SACxC,CAAC;QACF,aAAQ,GAAG;YACT,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE;YAC/C,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qCAAqC,EAAE;SACvE,CAAC;IAYJ,CAAC;IAVW,QAAQ;QAChB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,MAAM,IAAI,wBAAY,CAAC,MAAM,EAAE,0CAA0C,CAAC,CAAC;SAC5E;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,sBAAY,EAAC,GAAG,CAAC,CAAC,CAAC;IAChE,CAAC;IAES,IAAI,CAAC,EAAU,EAAE,EAAU;QACnC,OAAO,EAAE,GAAG,EAAE,CAAC;IACjB,CAAC;CACF;AArBD,gCAqBC"}
1
+ {"version":3,"file":"gt.js","sourceRoot":"","sources":["../../../src/formula/functions/gt.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,qCAAwC;AACxC,uCAA+B;AAE/B,MAAa,UAAW,SAAQ,qBAAY;IAA5C;;QACE,YAAO,GAAG,UAAU,CAAC;QACrB,aAAQ,GAAG;YACT,uFAAuF;YACvF,uCAAuC;SACxC,CAAC;QACF,aAAQ,GAAG;YACT,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE;YAC/C,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qCAAqC,EAAE;SACvE,CAAC;IAWJ,CAAC;IATW,QAAQ;QAChB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,MAAM,IAAI,wBAAY,CAAC,MAAM,EAAE,0CAA0C,CAAC,CAAC;SAC5E;IACH,CAAC;IAES,IAAI,CAAC,EAAU,EAAE,EAAU;QACnC,OAAO,IAAA,YAAE,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACpB,CAAC;CACF;AApBD,gCAoBC"}
@@ -1 +1 @@
1
- {"version":3,"file":"gte.d.ts","sourceRoot":"","sources":["../../../src/formula/functions/gte.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGxC,qBAAa,WAAY,SAAQ,YAAY;IAC3C,OAAO,SAAe;IACtB,QAAQ,WAGN;IACF,QAAQ;;;QAGN;IAEF,SAAS,CAAC,QAAQ;IAOlB,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;CAGtC"}
1
+ {"version":3,"file":"gte.d.ts","sourceRoot":"","sources":["../../../src/formula/functions/gte.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGxC,qBAAa,WAAY,SAAQ,YAAY;IAC3C,OAAO,SAAe;IACtB,QAAQ,WAGN;IACF,QAAQ;;;QAGN;IAEF,SAAS,CAAC,QAAQ;IAMlB,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;CAGtC"}
@@ -21,10 +21,9 @@ class GteFunction extends __base_1.BaseFunction {
21
21
  if (this.bareArgs.length !== 2) {
22
22
  throw new evaluator_1.FormulaError('#N/A', 'Number of arguments for GTE is incorrect.');
23
23
  }
24
- this.bareArgs = this.bareArgs.map((arg) => (0, __utils_1.ensureNumber)(arg));
25
24
  }
26
25
  main(v1, v2) {
27
- return v1 >= v2;
26
+ return (0, __utils_1.gte)(v1, v2);
28
27
  }
29
28
  }
30
29
  exports.GteFunction = GteFunction;
@@ -1 +1 @@
1
- {"version":3,"file":"gte.js","sourceRoot":"","sources":["../../../src/formula/functions/gte.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,qCAAwC;AACxC,uCAAyC;AAEzC,MAAa,WAAY,SAAQ,qBAAY;IAA7C;;QACE,YAAO,GAAG,WAAW,CAAC;QACtB,aAAQ,GAAG;YACT,iFAAiF;YACjF,wCAAwC;SACzC,CAAC;QACF,aAAQ,GAAG;YACT,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE;YAC/C,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qCAAqC,EAAE;SACvE,CAAC;IAYJ,CAAC;IAVW,QAAQ;QAChB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,MAAM,IAAI,wBAAY,CAAC,MAAM,EAAE,2CAA2C,CAAC,CAAC;SAC7E;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,sBAAY,EAAC,GAAG,CAAC,CAAC,CAAC;IAChE,CAAC;IAES,IAAI,CAAC,EAAU,EAAE,EAAU;QACnC,OAAO,EAAE,IAAI,EAAE,CAAC;IAClB,CAAC;CACF;AArBD,kCAqBC"}
1
+ {"version":3,"file":"gte.js","sourceRoot":"","sources":["../../../src/formula/functions/gte.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,qCAAwC;AACxC,uCAAgC;AAEhC,MAAa,WAAY,SAAQ,qBAAY;IAA7C;;QACE,YAAO,GAAG,WAAW,CAAC;QACtB,aAAQ,GAAG;YACT,iFAAiF;YACjF,wCAAwC;SACzC,CAAC;QACF,aAAQ,GAAG;YACT,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE;YAC/C,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qCAAqC,EAAE;SACvE,CAAC;IAWJ,CAAC;IATW,QAAQ;QAChB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,MAAM,IAAI,wBAAY,CAAC,MAAM,EAAE,2CAA2C,CAAC,CAAC;SAC7E;IACH,CAAC;IAES,IAAI,CAAC,EAAU,EAAE,EAAU;QACnC,OAAO,IAAA,aAAG,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACrB,CAAC;CACF;AApBD,kCAoBC"}
@@ -1 +1 @@
1
- {"version":3,"file":"lt.d.ts","sourceRoot":"","sources":["../../../src/formula/functions/lt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGxC,qBAAa,UAAW,SAAQ,YAAY;IAC1C,OAAO,SAAc;IACrB,QAAQ,WAGN;IACF,QAAQ;;;QAGN;IAEF,SAAS,CAAC,QAAQ;IAOlB,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;CAGtC"}
1
+ {"version":3,"file":"lt.d.ts","sourceRoot":"","sources":["../../../src/formula/functions/lt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGxC,qBAAa,UAAW,SAAQ,YAAY;IAC1C,OAAO,SAAc;IACrB,QAAQ,WAGN;IACF,QAAQ;;;QAGN;IAEF,SAAS,CAAC,QAAQ;IAMlB,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;CAGtC"}
@@ -21,10 +21,9 @@ class LtFunction extends __base_1.BaseFunction {
21
21
  if (this.bareArgs.length !== 2) {
22
22
  throw new evaluator_1.FormulaError('#N/A', 'Number of arguments for LT is incorrect.');
23
23
  }
24
- this.bareArgs = this.bareArgs.map((arg) => (0, __utils_1.ensureNumber)(arg));
25
24
  }
26
25
  main(v1, v2) {
27
- return v1 < v2;
26
+ return (0, __utils_1.lt)(v1, v2);
28
27
  }
29
28
  }
30
29
  exports.LtFunction = LtFunction;
@@ -1 +1 @@
1
- {"version":3,"file":"lt.js","sourceRoot":"","sources":["../../../src/formula/functions/lt.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,qCAAwC;AACxC,uCAAyC;AAEzC,MAAa,UAAW,SAAQ,qBAAY;IAA5C;;QACE,YAAO,GAAG,UAAU,CAAC;QACrB,aAAQ,GAAG;YACT,8FAA8F;YAC9F,uCAAuC;SACxC,CAAC;QACF,aAAQ,GAAG;YACT,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE;YAC/C,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qCAAqC,EAAE;SACvE,CAAC;IAYJ,CAAC;IAVW,QAAQ;QAChB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,MAAM,IAAI,wBAAY,CAAC,MAAM,EAAE,0CAA0C,CAAC,CAAC;SAC5E;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,sBAAY,EAAC,GAAG,CAAC,CAAC,CAAC;IAChE,CAAC;IAES,IAAI,CAAC,EAAU,EAAE,EAAU;QACnC,OAAO,EAAE,GAAG,EAAE,CAAC;IACjB,CAAC;CACF;AArBD,gCAqBC"}
1
+ {"version":3,"file":"lt.js","sourceRoot":"","sources":["../../../src/formula/functions/lt.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,qCAAwC;AACxC,uCAA+B;AAE/B,MAAa,UAAW,SAAQ,qBAAY;IAA5C;;QACE,YAAO,GAAG,UAAU,CAAC;QACrB,aAAQ,GAAG;YACT,8FAA8F;YAC9F,uCAAuC;SACxC,CAAC;QACF,aAAQ,GAAG;YACT,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE;YAC/C,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qCAAqC,EAAE;SACvE,CAAC;IAWJ,CAAC;IATW,QAAQ;QAChB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,MAAM,IAAI,wBAAY,CAAC,MAAM,EAAE,0CAA0C,CAAC,CAAC;SAC5E;IACH,CAAC;IAES,IAAI,CAAC,EAAU,EAAE,EAAU;QACnC,OAAO,IAAA,YAAE,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACpB,CAAC;CACF;AApBD,gCAoBC"}
@@ -1 +1 @@
1
- {"version":3,"file":"lte.d.ts","sourceRoot":"","sources":["../../../src/formula/functions/lte.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGxC,qBAAa,WAAY,SAAQ,YAAY;IAC3C,OAAO,SAAe;IACtB,QAAQ,WAGN;IACF,QAAQ;;;QAGN;IAEF,SAAS,CAAC,QAAQ;IAOlB,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;CAGtC"}
1
+ {"version":3,"file":"lte.d.ts","sourceRoot":"","sources":["../../../src/formula/functions/lte.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGxC,qBAAa,WAAY,SAAQ,YAAY;IAC3C,OAAO,SAAe;IACtB,QAAQ,WAGN;IACF,QAAQ;;;QAGN;IAEF,SAAS,CAAC,QAAQ;IAMlB,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;CAGtC"}
@@ -21,10 +21,9 @@ class LteFunction extends __base_1.BaseFunction {
21
21
  if (this.bareArgs.length !== 2) {
22
22
  throw new evaluator_1.FormulaError('#N/A', 'Number of arguments for LTE is incorrect.');
23
23
  }
24
- this.bareArgs = this.bareArgs.map((arg) => (0, __utils_1.ensureNumber)(arg));
25
24
  }
26
25
  main(v1, v2) {
27
- return v1 <= v2;
26
+ return (0, __utils_1.lte)(v1, v2);
28
27
  }
29
28
  }
30
29
  exports.LteFunction = LteFunction;
@@ -1 +1 @@
1
- {"version":3,"file":"lte.js","sourceRoot":"","sources":["../../../src/formula/functions/lte.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,qCAAwC;AACxC,uCAAyC;AAEzC,MAAa,WAAY,SAAQ,qBAAY;IAA7C;;QACE,YAAO,GAAG,WAAW,CAAC;QACtB,aAAQ,GAAG;YACT,uFAAuF;YACvF,wCAAwC;SACzC,CAAC;QACF,aAAQ,GAAG;YACT,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE;YAC/C,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qCAAqC,EAAE;SACvE,CAAC;IAYJ,CAAC;IAVW,QAAQ;QAChB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,MAAM,IAAI,wBAAY,CAAC,MAAM,EAAE,2CAA2C,CAAC,CAAC;SAC7E;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,sBAAY,EAAC,GAAG,CAAC,CAAC,CAAC;IAChE,CAAC;IAES,IAAI,CAAC,EAAU,EAAE,EAAU;QACnC,OAAO,EAAE,IAAI,EAAE,CAAC;IAClB,CAAC;CACF;AArBD,kCAqBC"}
1
+ {"version":3,"file":"lte.js","sourceRoot":"","sources":["../../../src/formula/functions/lte.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,qCAAwC;AACxC,uCAAgC;AAEhC,MAAa,WAAY,SAAQ,qBAAY;IAA7C;;QACE,YAAO,GAAG,WAAW,CAAC;QACtB,aAAQ,GAAG;YACT,uFAAuF;YACvF,wCAAwC;SACzC,CAAC;QACF,aAAQ,GAAG;YACT,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE;YAC/C,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qCAAqC,EAAE;SACvE,CAAC;IAWJ,CAAC;IATW,QAAQ;QAChB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,MAAM,IAAI,wBAAY,CAAC,MAAM,EAAE,2CAA2C,CAAC,CAAC;SAC7E;IACH,CAAC;IAES,IAAI,CAAC,EAAU,EAAE,EAAU;QACnC,OAAO,IAAA,aAAG,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACrB,CAAC;CACF;AApBD,kCAoBC"}
@@ -1 +1 @@
1
- {"version":3,"file":"minus.d.ts","sourceRoot":"","sources":["../../../src/formula/functions/minus.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAIxC,qBAAa,aAAc,SAAQ,YAAY;IAC7C,OAAO,SAAiB;IACxB,QAAQ,WAAuF;IAC/F,QAAQ;;;QAGN;IAEF,SAAS,CAAC,QAAQ;IAYlB,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;CAwB5E"}
1
+ {"version":3,"file":"minus.d.ts","sourceRoot":"","sources":["../../../src/formula/functions/minus.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAKxC,qBAAa,aAAc,SAAQ,YAAY;IAC7C,OAAO,SAAiB;IACxB,QAAQ,WAAuF;IAC/F,QAAQ;;;QAGN;IAEF,SAAS,CAAC,QAAQ;IAYlB,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;CA0B5E"}
@@ -1,12 +1,16 @@
1
1
  "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
2
5
  Object.defineProperty(exports, "__esModule", { value: true });
3
6
  exports.MinusFunction = void 0;
4
- const date_fns_1 = require("date-fns");
7
+ const dayjs_1 = __importDefault(require("dayjs"));
5
8
  const evaluator_1 = require("../evaluator");
6
9
  const time_1 = require("../../lib/time");
7
10
  const __base_1 = require("./__base");
8
11
  const __utils_1 = require("./__utils");
9
12
  const table_1 = require("../../lib/table");
13
+ const constants_1 = require("../../constants");
10
14
  class MinusFunction extends __base_1.BaseFunction {
11
15
  constructor() {
12
16
  super(...arguments);
@@ -42,7 +46,9 @@ class MinusFunction extends __base_1.BaseFunction {
42
46
  return v1.sub(v2);
43
47
  }
44
48
  if (v1 instanceof Date && typeof v2 === 'number') {
45
- return (0, date_fns_1.subSeconds)(v1, v2);
49
+ return (0, dayjs_1.default)(v1)
50
+ .subtract(v2 * constants_1.SECONDS_IN_DAY, 'second')
51
+ .toDate();
46
52
  }
47
53
  if (!v1) {
48
54
  return -v2;
@@ -1 +1 @@
1
- {"version":3,"file":"minus.js","sourceRoot":"","sources":["../../../src/formula/functions/minus.ts"],"names":[],"mappings":";;;AAAA,uCAAsC;AAEtC,4CAA4C;AAC5C,yCAA2C;AAC3C,qCAAwC;AACxC,uCAAqD;AACrD,2CAAwC;AAExC,MAAa,aAAc,SAAQ,qBAAY;IAA/C;;QACE,YAAO,GAAG,aAAa,CAAC;QACxB,aAAQ,GAAG,CAAC,wCAAwC,EAAE,uCAAuC,CAAC,CAAC;QAC/F,aAAQ,GAAG;YACT,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,mCAAmC,EAAE;YACpE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,0CAA0C,EAAE;SAC5E,CAAC;IAsCJ,CAAC;IApCW,QAAQ;QAChB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,MAAM,IAAI,wBAAY,CAAC,MAAM,EAAE,6CAA6C,CAAC,CAAC;SAC/E;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACxC,IAAI,GAAG,YAAY,aAAK,EAAE;gBACxB,GAAG,GAAG,IAAA,oBAAU,EAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;aAC7B;YACD,OAAO,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAA,sBAAY,EAAC,GAAG,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;IACL,CAAC;IAES,IAAI,CAAC,EAA6B,EAAE,EAA6B;QACzE,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE;YACpD,OAAO,EAAE,GAAG,EAAE,CAAC;SAChB;QACD,IAAI,EAAE,YAAY,IAAI,IAAI,EAAE,YAAY,IAAI,EAAE;YAC5C,OAAO,IAAI,gBAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;SAC9B;QACD,IAAI,EAAE,YAAY,IAAI,IAAI,EAAE,YAAY,gBAAS,EAAE;YACjD,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;SACnB;QACD,IAAI,EAAE,YAAY,gBAAS,IAAI,EAAE,YAAY,IAAI,EAAE;YACjD,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;SACnB;QACD,IAAI,EAAE,YAAY,IAAI,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE;YAChD,OAAO,IAAA,qBAAU,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;SAC3B;QACD,IAAI,CAAC,EAAE,EAAE;YACP,OAAO,CAAC,EAAE,CAAC;SACZ;QACD,IAAI,CAAC,EAAE,EAAE;YACP,OAAO,EAAE,CAAC;SACX;QACD,MAAM,IAAI,wBAAY,CAAC,SAAS,EAAE,8CAA8C,CAAC,CAAC;IACpF,CAAC;CACF;AA5CD,sCA4CC"}
1
+ {"version":3,"file":"minus.js","sourceRoot":"","sources":["../../../src/formula/functions/minus.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,4CAA4C;AAC5C,yCAA2C;AAC3C,qCAAwC;AACxC,uCAAqD;AACrD,2CAAwC;AACxC,+CAAiD;AAEjD,MAAa,aAAc,SAAQ,qBAAY;IAA/C;;QACE,YAAO,GAAG,aAAa,CAAC;QACxB,aAAQ,GAAG,CAAC,wCAAwC,EAAE,uCAAuC,CAAC,CAAC;QAC/F,aAAQ,GAAG;YACT,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,mCAAmC,EAAE;YACpE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,0CAA0C,EAAE;SAC5E,CAAC;IAwCJ,CAAC;IAtCW,QAAQ;QAChB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,MAAM,IAAI,wBAAY,CAAC,MAAM,EAAE,6CAA6C,CAAC,CAAC;SAC/E;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACxC,IAAI,GAAG,YAAY,aAAK,EAAE;gBACxB,GAAG,GAAG,IAAA,oBAAU,EAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;aAC7B;YACD,OAAO,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAA,sBAAY,EAAC,GAAG,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;IACL,CAAC;IAES,IAAI,CAAC,EAA6B,EAAE,EAA6B;QACzE,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE;YACpD,OAAO,EAAE,GAAG,EAAE,CAAC;SAChB;QACD,IAAI,EAAE,YAAY,IAAI,IAAI,EAAE,YAAY,IAAI,EAAE;YAC5C,OAAO,IAAI,gBAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;SAC9B;QACD,IAAI,EAAE,YAAY,IAAI,IAAI,EAAE,YAAY,gBAAS,EAAE;YACjD,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;SACnB;QACD,IAAI,EAAE,YAAY,gBAAS,IAAI,EAAE,YAAY,IAAI,EAAE;YACjD,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;SACnB;QACD,IAAI,EAAE,YAAY,IAAI,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE;YAChD,OAAO,IAAA,eAAK,EAAC,EAAE,CAAC;iBACb,QAAQ,CAAC,EAAE,GAAG,0BAAc,EAAE,QAAQ,CAAC;iBACvC,MAAM,EAAE,CAAC;SACb;QACD,IAAI,CAAC,EAAE,EAAE;YACP,OAAO,CAAC,EAAE,CAAC;SACZ;QACD,IAAI,CAAC,EAAE,EAAE;YACP,OAAO,EAAE,CAAC;SACX;QACD,MAAM,IAAI,wBAAY,CAAC,SAAS,EAAE,8CAA8C,CAAC,CAAC;IACpF,CAAC;CACF;AA9CD,sCA8CC"}
@@ -1 +1 @@
1
- {"version":3,"file":"ne.d.ts","sourceRoot":"","sources":["../../../src/formula/functions/ne.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,qBAAa,UAAW,SAAQ,YAAY;IAC1C,OAAO,SAAc;IACrB,QAAQ,WAGN;IACF,QAAQ;;;QAGN;IAEF,SAAS,CAAC,QAAQ;IAMlB,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;CAGtC"}
1
+ {"version":3,"file":"ne.d.ts","sourceRoot":"","sources":["../../../src/formula/functions/ne.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGxC,qBAAa,UAAW,SAAQ,YAAY;IAC1C,OAAO,SAAc;IACrB,QAAQ,WAGN;IACF,QAAQ;;;QAGN;IAEF,SAAS,CAAC,QAAQ;IAMlB,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;CAGtC"}
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.NeFunction = void 0;
4
4
  const evaluator_1 = require("../evaluator");
5
5
  const __base_1 = require("./__base");
6
+ const __utils_1 = require("./__utils");
6
7
  class NeFunction extends __base_1.BaseFunction {
7
8
  constructor() {
8
9
  super(...arguments);
@@ -22,7 +23,7 @@ class NeFunction extends __base_1.BaseFunction {
22
23
  }
23
24
  }
24
25
  main(v1, v2) {
25
- return v1 !== v2;
26
+ return (0, __utils_1.ne)(v1, v2);
26
27
  }
27
28
  }
28
29
  exports.NeFunction = NeFunction;
@@ -1 +1 @@
1
- {"version":3,"file":"ne.js","sourceRoot":"","sources":["../../../src/formula/functions/ne.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,qCAAwC;AAExC,MAAa,UAAW,SAAQ,qBAAY;IAA5C;;QACE,YAAO,GAAG,UAAU,CAAC;QACrB,aAAQ,GAAG;YACT,4EAA4E;YAC5E,wCAAwC;SACzC,CAAC;QACF,aAAQ,GAAG;YACT,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE;YAC/C,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qCAAqC,EAAE;SACvE,CAAC;IAWJ,CAAC;IATW,QAAQ;QAChB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,MAAM,IAAI,wBAAY,CAAC,MAAM,EAAE,0CAA0C,CAAC,CAAC;SAC5E;IACH,CAAC;IAES,IAAI,CAAC,EAAU,EAAE,EAAU;QACnC,OAAO,EAAE,KAAK,EAAE,CAAC;IACnB,CAAC;CACF;AApBD,gCAoBC"}
1
+ {"version":3,"file":"ne.js","sourceRoot":"","sources":["../../../src/formula/functions/ne.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,qCAAwC;AACxC,uCAA+B;AAE/B,MAAa,UAAW,SAAQ,qBAAY;IAA5C;;QACE,YAAO,GAAG,UAAU,CAAC;QACrB,aAAQ,GAAG;YACT,4EAA4E;YAC5E,wCAAwC;SACzC,CAAC;QACF,aAAQ,GAAG;YACT,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE;YAC/C,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qCAAqC,EAAE;SACvE,CAAC;IAWJ,CAAC;IATW,QAAQ;QAChB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,MAAM,IAAI,wBAAY,CAAC,MAAM,EAAE,0CAA0C,CAAC,CAAC;SAC5E;IACH,CAAC;IAES,IAAI,CAAC,EAAU,EAAE,EAAU;QACnC,OAAO,IAAA,YAAE,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACpB,CAAC;CACF;AApBD,gCAoBC"}
@@ -1 +1 @@
1
- {"version":3,"file":"sumif.d.ts","sourceRoot":"","sources":["../../../src/formula/functions/sumif.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAIxC,qBAAa,aAAc,SAAQ,YAAY;IAC7C,OAAO,SAAyB;IAChC,QAAQ,WAA6C;IACrD,QAAQ;;;;;;;;SAWN;IAEF,SAAS,CAAC,QAAQ;IASlB,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK;CA2BhE"}
1
+ {"version":3,"file":"sumif.d.ts","sourceRoot":"","sources":["../../../src/formula/functions/sumif.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAIxC,qBAAa,aAAc,SAAQ,YAAY;IAC7C,OAAO,SAAyB;IAChC,QAAQ,WAA6C;IACrD,QAAQ;;;;;;;;SAWN;IAEF,SAAS,CAAC,QAAQ;IAUlB,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK;CA2BhE"}
@@ -31,6 +31,7 @@ class SumifFunction extends __base_1.BaseFunction {
31
31
  if (this.bareArgs[2] != undefined && this.bareArgs[2] instanceof table_1.Table) {
32
32
  throw new evaluator_1.FormulaError('#N/A', '3rd argument must be range.');
33
33
  }
34
+ this.bareArgs[1] = (0, __utils_1.ensureString)(this.bareArgs[1]);
34
35
  }
35
36
  main(range, condition, sumRange) {
36
37
  if (!(range instanceof table_1.Table)) {
@@ -1 +1 @@
1
- {"version":3,"file":"sumif.js","sourceRoot":"","sources":["../../../src/formula/functions/sumif.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,sCAAuC;AACvC,2CAAwC;AACxC,qCAAwC;AACxC,uCAAkC;AAGlC,MAAa,aAAc,SAAQ,qBAAY;IAA/C;;QACE,YAAO,GAAG,qBAAqB,CAAC;QAChC,aAAQ,GAAG,CAAC,uCAAuC,CAAC,CAAC;QACrD,aAAQ,GAAG;YACT,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,oBAAoB,EAAE;YACrD;gBACE,IAAI,EAAE,WAAW;gBACjB,WAAW,EAAE,gCAAgC;aAC9C;YACD;gBACE,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,2BAA2B;gBACxC,QAAQ,EAAE,IAAI;aACf;SACF,CAAC;IAsCJ,CAAC;IApCW,QAAQ;QAChB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5D,MAAM,IAAI,wBAAY,CAAC,MAAM,EAAE,6CAA6C,CAAC,CAAC;SAC/E;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,SAAS,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,aAAK,EAAE;YACtE,MAAM,IAAI,wBAAY,CAAC,MAAM,EAAE,6BAA6B,CAAC,CAAC;SAC/D;IACH,CAAC;IAES,IAAI,CAAC,KAAY,EAAE,SAAiB,EAAE,QAAe;QAC7D,IAAI,CAAC,CAAC,KAAK,YAAY,aAAK,CAAC,EAAE;YAC7B,OAAO,IAAA,eAAK,EAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAC5C;QACD,MAAM,eAAe,GAAG,IAAA,mBAAU,EAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QACrD,IAAI,SAAS,GAAG,eAAe,CAAC;QAChC,IAAI,QAAQ,EAAE;YACZ,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClD,MAAM,IAAI,GAAa;gBACrB,GAAG;gBACH,IAAI;gBACJ,MAAM,EAAE,GAAG,GAAG,QAAQ,CAAC,UAAU,EAAE;gBACnC,KAAK,EAAE,IAAI,GAAG,QAAQ,CAAC,UAAU,EAAE;aACpC,CAAC;YACF,SAAS,GAAG,IAAA,mBAAU,EAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC1D;QACD,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,eAAe,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CACjC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;;YACnB,MAAM,CAAC,GAAG,CAAA,MAAA,SAAS,CAAC,CAAC,CAAC,0CAAG,CAAC,CAAC,KAAI,CAAC,CAAC;YACjC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,IAAA,eAAK,EAAC,CAAC,EAAE,SAAS,CAAC,EAAE;gBAChD,KAAK,IAAI,CAAC,CAAC;aACZ;QACH,CAAC,CAAC,CACH,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AApDD,sCAoDC"}
1
+ {"version":3,"file":"sumif.js","sourceRoot":"","sources":["../../../src/formula/functions/sumif.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,sCAAuC;AACvC,2CAAwC;AACxC,qCAAwC;AACxC,uCAAgD;AAGhD,MAAa,aAAc,SAAQ,qBAAY;IAA/C;;QACE,YAAO,GAAG,qBAAqB,CAAC;QAChC,aAAQ,GAAG,CAAC,uCAAuC,CAAC,CAAC;QACrD,aAAQ,GAAG;YACT,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,oBAAoB,EAAE;YACrD;gBACE,IAAI,EAAE,WAAW;gBACjB,WAAW,EAAE,gCAAgC;aAC9C;YACD;gBACE,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,2BAA2B;gBACxC,QAAQ,EAAE,IAAI;aACf;SACF,CAAC;IAuCJ,CAAC;IArCW,QAAQ;QAChB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5D,MAAM,IAAI,wBAAY,CAAC,MAAM,EAAE,6CAA6C,CAAC,CAAC;SAC/E;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,SAAS,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,aAAK,EAAE;YACtE,MAAM,IAAI,wBAAY,CAAC,MAAM,EAAE,6BAA6B,CAAC,CAAC;SAC/D;QACD,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAA,sBAAY,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;IAES,IAAI,CAAC,KAAY,EAAE,SAAiB,EAAE,QAAe;QAC7D,IAAI,CAAC,CAAC,KAAK,YAAY,aAAK,CAAC,EAAE;YAC7B,OAAO,IAAA,eAAK,EAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAC5C;QACD,MAAM,eAAe,GAAG,IAAA,mBAAU,EAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QACrD,IAAI,SAAS,GAAG,eAAe,CAAC;QAChC,IAAI,QAAQ,EAAE;YACZ,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClD,MAAM,IAAI,GAAa;gBACrB,GAAG;gBACH,IAAI;gBACJ,MAAM,EAAE,GAAG,GAAG,QAAQ,CAAC,UAAU,EAAE;gBACnC,KAAK,EAAE,IAAI,GAAG,QAAQ,CAAC,UAAU,EAAE;aACpC,CAAC;YACF,SAAS,GAAG,IAAA,mBAAU,EAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC1D;QACD,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,eAAe,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CACjC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;;YACnB,MAAM,CAAC,GAAG,CAAA,MAAA,SAAS,CAAC,CAAC,CAAC,0CAAG,CAAC,CAAC,KAAI,CAAC,CAAC;YACjC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,IAAA,eAAK,EAAC,CAAC,EAAE,SAAS,CAAC,EAAE;gBAChD,KAAK,IAAI,CAAC,CAAC;aACZ;QACH,CAAC,CAAC,CACH,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AArDD,sCAqDC"}
@@ -1,7 +1,10 @@
1
1
  "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
2
5
  Object.defineProperty(exports, "__esModule", { value: true });
3
6
  exports.Autofill = void 0;
4
- const date_fns_1 = require("date-fns");
7
+ const dayjs_1 = __importDefault(require("dayjs"));
5
8
  const structs_1 = require("./structs");
6
9
  const converters_1 = require("./converters");
7
10
  const evaluator_1 = require("../formula/evaluator");
@@ -347,7 +350,7 @@ class TypedGroup {
347
350
  switch (this.kind) {
348
351
  case 'date': {
349
352
  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
350
- const eq = this.nexts.every((v, i) => i === 0 || (0, date_fns_1.isEqual)(v, this.timeDelta.add(this.nexts[i - 1])));
353
+ const eq = this.nexts.every((v, i) => i === 0 || (0, dayjs_1.default)(v).isSame(this.timeDelta.add(this.nexts[i - 1])));
351
354
  this.equidistant = eq;
352
355
  return [];
353
356
  }