@calcit/procs 0.8.47 → 0.8.48
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/lib/calcit-data.mjs +8 -4
- package/lib/calcit.procs.mjs +6 -3
- package/lib/custom-formatter.mjs +6 -2
- package/lib/js-cirru.mjs +2 -1
- package/lib/js-map.mjs +12 -4
- package/lib/js-record.mjs +2 -1
- package/lib/package.json +1 -1
- package/package.json +1 -1
- package/ts-src/calcit-data.mts +8 -4
- package/ts-src/calcit.procs.mts +6 -3
- package/ts-src/custom-formatter.mts +6 -2
- package/ts-src/js-cirru.mts +2 -1
- package/ts-src/js-map.mts +12 -4
- package/ts-src/js-record.mts +2 -1
package/lib/calcit-data.mjs
CHANGED
|
@@ -258,7 +258,8 @@ export let hashFunction = (x) => {
|
|
|
258
258
|
let pairs = x.pairs();
|
|
259
259
|
pairs.sort((a, b) => _$n_compare(a[0], b[0]));
|
|
260
260
|
for (let idx = 0; idx < pairs.length; idx++) {
|
|
261
|
-
let
|
|
261
|
+
let k = pairs[idx][0];
|
|
262
|
+
let v = pairs[idx][1];
|
|
262
263
|
base = mergeValueHash(base, hashFunction(k));
|
|
263
264
|
base = mergeValueHash(base, hashFunction(v));
|
|
264
265
|
}
|
|
@@ -270,7 +271,8 @@ export let hashFunction = (x) => {
|
|
|
270
271
|
let pairs = x.pairs();
|
|
271
272
|
pairs.sort((a, b) => _$n_compare(a[0], b[0]));
|
|
272
273
|
for (let idx = 0; idx < pairs.length; idx++) {
|
|
273
|
-
let
|
|
274
|
+
let k = pairs[idx][0];
|
|
275
|
+
let v = pairs[idx][1];
|
|
274
276
|
base = mergeValueHash(base, hashFunction(k));
|
|
275
277
|
base = mergeValueHash(base, hashFunction(v));
|
|
276
278
|
}
|
|
@@ -421,7 +423,8 @@ export let to_js_data = (x, addColon = false) => {
|
|
|
421
423
|
let result = {};
|
|
422
424
|
let pairs = x.pairs();
|
|
423
425
|
for (let idx = 0; idx < pairs.length; idx++) {
|
|
424
|
-
let
|
|
426
|
+
let k = pairs[idx][0];
|
|
427
|
+
let v = pairs[idx][1];
|
|
425
428
|
var key = to_js_data(k, addColon);
|
|
426
429
|
result[key] = to_js_data(v, addColon);
|
|
427
430
|
}
|
|
@@ -527,7 +530,8 @@ export let _$n__$e_ = (x, y) => {
|
|
|
527
530
|
}
|
|
528
531
|
let pairs = x.pairs();
|
|
529
532
|
for (let idx = 0; idx < pairs.length; idx++) {
|
|
530
|
-
let
|
|
533
|
+
let k = pairs[idx][0];
|
|
534
|
+
let v = pairs[idx][1];
|
|
531
535
|
if (!y.contains(k)) {
|
|
532
536
|
return false;
|
|
533
537
|
}
|
package/lib/calcit.procs.mjs
CHANGED
|
@@ -383,7 +383,8 @@ export let reset_$x_ = (a, v) => {
|
|
|
383
383
|
}
|
|
384
384
|
let prev = a.value;
|
|
385
385
|
a.value = v;
|
|
386
|
-
for (let
|
|
386
|
+
for (let k in a.listeners) {
|
|
387
|
+
let f = a.listeners.get(k);
|
|
387
388
|
f(v, prev);
|
|
388
389
|
}
|
|
389
390
|
return null;
|
|
@@ -687,7 +688,8 @@ export let _$n_merge = (a, b) => {
|
|
|
687
688
|
}
|
|
688
689
|
let pairs = b.pairs();
|
|
689
690
|
for (let idx = 0; idx < pairs.length; idx++) {
|
|
690
|
-
let
|
|
691
|
+
let k = pairs[idx][0];
|
|
692
|
+
let v = pairs[idx][1];
|
|
691
693
|
let field;
|
|
692
694
|
if (k instanceof CalcitTag) {
|
|
693
695
|
field = k;
|
|
@@ -1279,7 +1281,8 @@ export function invoke_method(p, obj, ...args) {
|
|
|
1279
1281
|
if (pair == null) {
|
|
1280
1282
|
throw new Error(`No class for ${obj?.toString() || JSON.stringify(obj)} to lookup .${p}`);
|
|
1281
1283
|
}
|
|
1282
|
-
let
|
|
1284
|
+
let klass = pair[0];
|
|
1285
|
+
let tag = pair[1];
|
|
1283
1286
|
let method = klass.getOrNil(p);
|
|
1284
1287
|
if (method == null) {
|
|
1285
1288
|
throw new Error(`No method '.${p}' for '${tag}' object '${obj}'.\navailable fields are: ${klass.fields.map((fd) => fd.value).join(" ")}`);
|
package/lib/custom-formatter.mjs
CHANGED
|
@@ -116,7 +116,10 @@ export let load_console_formatter_$x_ = () => {
|
|
|
116
116
|
if (obj instanceof CalcitMap || obj instanceof CalcitSliceMap) {
|
|
117
117
|
let preview = "";
|
|
118
118
|
let hasCollection = false;
|
|
119
|
-
|
|
119
|
+
let pairs = obj.pairs();
|
|
120
|
+
for (let idx = 0; idx < pairs.length; idx++) {
|
|
121
|
+
let k = pairs[idx][0];
|
|
122
|
+
let v = pairs[idx][1];
|
|
120
123
|
preview += " ";
|
|
121
124
|
if (isLiteral(k) && isLiteral(v)) {
|
|
122
125
|
preview += `(${saveString(k)} ${saveString(v)})`;
|
|
@@ -243,7 +246,8 @@ export let load_console_formatter_$x_ = () => {
|
|
|
243
246
|
}
|
|
244
247
|
});
|
|
245
248
|
for (let idx = 0; idx < pairs.length; idx++) {
|
|
246
|
-
let
|
|
249
|
+
let k = pairs[idx][0];
|
|
250
|
+
let v = pairs[idx][1];
|
|
247
251
|
ret.push(tr({}, td({ paddingLeft: "8px", verticalAlign: "top", whiteSpace: "nowrap", minWidth: "40px" }, embedObject(k)), td({ paddingLeft: "8px" }, embedObject(v))));
|
|
248
252
|
}
|
|
249
253
|
return ret;
|
package/lib/js-cirru.mjs
CHANGED
|
@@ -124,7 +124,8 @@ export let to_cirru_edn = (x) => {
|
|
|
124
124
|
}
|
|
125
125
|
});
|
|
126
126
|
for (let idx = 0; idx < pairs_buffer.length; idx++) {
|
|
127
|
-
let
|
|
127
|
+
let k = pairs_buffer[idx][0];
|
|
128
|
+
let v = pairs_buffer[idx][1];
|
|
128
129
|
buffer.push([to_cirru_edn(k), to_cirru_edn(v)]);
|
|
129
130
|
}
|
|
130
131
|
return buffer;
|
package/lib/js-map.mjs
CHANGED
|
@@ -50,7 +50,8 @@ export class CalcitMap {
|
|
|
50
50
|
let itemsCode = "";
|
|
51
51
|
let pairs = this.pairs();
|
|
52
52
|
for (let idx = 0; idx < pairs.length; idx++) {
|
|
53
|
-
let
|
|
53
|
+
let k = pairs[idx][0];
|
|
54
|
+
let v = pairs[idx][1];
|
|
54
55
|
if (shorter) {
|
|
55
56
|
let keyPart = isNestedCalcitData(k) ? tipNestedCalcitData(k) : toString(k, true, disableJsDataWarning);
|
|
56
57
|
let valuePart = isNestedCalcitData(v) ? tipNestedCalcitData(v) : toString(v, true, disableJsDataWarning);
|
|
@@ -155,7 +156,10 @@ export class CalcitMap {
|
|
|
155
156
|
}
|
|
156
157
|
/** detecthing in custom formatter */
|
|
157
158
|
nestedDataInChildren() {
|
|
158
|
-
|
|
159
|
+
let pairs = this.pairs();
|
|
160
|
+
for (let idx = 0; idx < pairs.length; idx++) {
|
|
161
|
+
let k = pairs[idx][0];
|
|
162
|
+
let v = pairs[idx][1];
|
|
159
163
|
if (!isLiteral(k) || !isLiteral(v)) {
|
|
160
164
|
return true;
|
|
161
165
|
}
|
|
@@ -247,7 +251,8 @@ export class CalcitSliceMap {
|
|
|
247
251
|
let itemsCode = "";
|
|
248
252
|
let pairs = this.pairs();
|
|
249
253
|
for (let idx = 0; idx < pairs.length; idx++) {
|
|
250
|
-
let
|
|
254
|
+
let k = pairs[idx][0];
|
|
255
|
+
let v = pairs[idx][1];
|
|
251
256
|
if (shorter) {
|
|
252
257
|
let keyPart = isNestedCalcitData(k) ? tipNestedCalcitData(k) : toString(k, true, disableJsDataWarning);
|
|
253
258
|
let valuePart = isNestedCalcitData(v) ? tipNestedCalcitData(v) : toString(v, true, disableJsDataWarning);
|
|
@@ -356,7 +361,10 @@ export class CalcitSliceMap {
|
|
|
356
361
|
}
|
|
357
362
|
/** detecthing in custom formatter */
|
|
358
363
|
nestedDataInChildren() {
|
|
359
|
-
|
|
364
|
+
let pairs = this.pairs();
|
|
365
|
+
for (let idx = 0; idx < pairs.length; idx++) {
|
|
366
|
+
let k = pairs[idx][0];
|
|
367
|
+
let v = pairs[idx][1];
|
|
360
368
|
if (!isLiteral(k) || !isLiteral(v)) {
|
|
361
369
|
return true;
|
|
362
370
|
}
|
package/lib/js-record.mjs
CHANGED
|
@@ -182,7 +182,8 @@ export let _$n_record_$o_from_map = (proto, data) => {
|
|
|
182
182
|
let pairs_buffer = [];
|
|
183
183
|
let pairs = data.pairs();
|
|
184
184
|
for (let i = 0; i < pairs.length; i++) {
|
|
185
|
-
let
|
|
185
|
+
let k = pairs[i][0];
|
|
186
|
+
let v = pairs[i][1];
|
|
186
187
|
pairs_buffer.push([castTag(k), v]);
|
|
187
188
|
}
|
|
188
189
|
// mutable sort
|
package/lib/package.json
CHANGED
package/package.json
CHANGED
package/ts-src/calcit-data.mts
CHANGED
|
@@ -290,7 +290,8 @@ export let hashFunction = (x: CalcitValue): Hash => {
|
|
|
290
290
|
let pairs = x.pairs();
|
|
291
291
|
pairs.sort((a, b) => _$n_compare(a[0], b[0]));
|
|
292
292
|
for (let idx = 0; idx < pairs.length; idx++) {
|
|
293
|
-
let
|
|
293
|
+
let k = pairs[idx][0];
|
|
294
|
+
let v = pairs[idx][1];
|
|
294
295
|
base = mergeValueHash(base, hashFunction(k));
|
|
295
296
|
base = mergeValueHash(base, hashFunction(v));
|
|
296
297
|
}
|
|
@@ -303,7 +304,8 @@ export let hashFunction = (x: CalcitValue): Hash => {
|
|
|
303
304
|
let pairs = x.pairs();
|
|
304
305
|
pairs.sort((a, b) => _$n_compare(a[0], b[0]));
|
|
305
306
|
for (let idx = 0; idx < pairs.length; idx++) {
|
|
306
|
-
let
|
|
307
|
+
let k = pairs[idx][0];
|
|
308
|
+
let v = pairs[idx][1];
|
|
307
309
|
base = mergeValueHash(base, hashFunction(k));
|
|
308
310
|
base = mergeValueHash(base, hashFunction(v));
|
|
309
311
|
}
|
|
@@ -456,7 +458,8 @@ export let to_js_data = (x: CalcitValue, addColon: boolean = false): any => {
|
|
|
456
458
|
let result: Record<string, CalcitValue> = {};
|
|
457
459
|
let pairs = x.pairs();
|
|
458
460
|
for (let idx = 0; idx < pairs.length; idx++) {
|
|
459
|
-
let
|
|
461
|
+
let k = pairs[idx][0];
|
|
462
|
+
let v = pairs[idx][1];
|
|
460
463
|
var key = to_js_data(k, addColon);
|
|
461
464
|
result[key] = to_js_data(v, addColon);
|
|
462
465
|
}
|
|
@@ -569,7 +572,8 @@ export let _$n__$e_ = (x: CalcitValue, y: CalcitValue): boolean => {
|
|
|
569
572
|
}
|
|
570
573
|
let pairs = x.pairs();
|
|
571
574
|
for (let idx = 0; idx < pairs.length; idx++) {
|
|
572
|
-
let
|
|
575
|
+
let k = pairs[idx][0];
|
|
576
|
+
let v = pairs[idx][1];
|
|
573
577
|
if (!y.contains(k)) {
|
|
574
578
|
return false;
|
|
575
579
|
}
|
package/ts-src/calcit.procs.mts
CHANGED
|
@@ -437,7 +437,8 @@ export let reset_$x_ = (a: CalcitRef, v: CalcitValue): null => {
|
|
|
437
437
|
}
|
|
438
438
|
let prev = a.value;
|
|
439
439
|
a.value = v;
|
|
440
|
-
for (let
|
|
440
|
+
for (let k in a.listeners) {
|
|
441
|
+
let f = a.listeners.get(k);
|
|
441
442
|
f(v, prev);
|
|
442
443
|
}
|
|
443
444
|
return null;
|
|
@@ -760,7 +761,8 @@ export let _$n_merge = (a: CalcitValue, b: CalcitMap | CalcitSliceMap): CalcitVa
|
|
|
760
761
|
}
|
|
761
762
|
let pairs = b.pairs();
|
|
762
763
|
for (let idx = 0; idx < pairs.length; idx++) {
|
|
763
|
-
let
|
|
764
|
+
let k = pairs[idx][0];
|
|
765
|
+
let v = pairs[idx][1];
|
|
764
766
|
let field: CalcitTag;
|
|
765
767
|
if (k instanceof CalcitTag) {
|
|
766
768
|
field = k;
|
|
@@ -1372,7 +1374,8 @@ export function invoke_method(p: string, obj: CalcitValue, ...args: CalcitValue[
|
|
|
1372
1374
|
if (pair == null) {
|
|
1373
1375
|
throw new Error(`No class for ${obj?.toString() || JSON.stringify(obj)} to lookup .${p}`);
|
|
1374
1376
|
}
|
|
1375
|
-
let
|
|
1377
|
+
let klass = pair[0];
|
|
1378
|
+
let tag = pair[1];
|
|
1376
1379
|
let method = klass.getOrNil(p);
|
|
1377
1380
|
if (method == null) {
|
|
1378
1381
|
throw new Error(`No method '.${p}' for '${tag}' object '${obj}'.\navailable fields are: ${klass.fields.map((fd: CalcitTag) => fd.value).join(" ")}`);
|
|
@@ -137,7 +137,10 @@ export let load_console_formatter_$x_ = () => {
|
|
|
137
137
|
if (obj instanceof CalcitMap || obj instanceof CalcitSliceMap) {
|
|
138
138
|
let preview = "";
|
|
139
139
|
let hasCollection = false;
|
|
140
|
-
|
|
140
|
+
let pairs = obj.pairs();
|
|
141
|
+
for (let idx = 0; idx < pairs.length; idx++) {
|
|
142
|
+
let k = pairs[idx][0];
|
|
143
|
+
let v = pairs[idx][1];
|
|
141
144
|
preview += " ";
|
|
142
145
|
if (isLiteral(k) && isLiteral(v)) {
|
|
143
146
|
preview += `(${saveString(k)} ${saveString(v)})`;
|
|
@@ -306,7 +309,8 @@ export let load_console_formatter_$x_ = () => {
|
|
|
306
309
|
}
|
|
307
310
|
});
|
|
308
311
|
for (let idx = 0; idx < pairs.length; idx++) {
|
|
309
|
-
let
|
|
312
|
+
let k = pairs[idx][0];
|
|
313
|
+
let v = pairs[idx][1];
|
|
310
314
|
ret.push(
|
|
311
315
|
tr(
|
|
312
316
|
{},
|
package/ts-src/js-cirru.mts
CHANGED
|
@@ -124,7 +124,8 @@ export let to_cirru_edn = (x: CalcitValue): CirruEdnFormat => {
|
|
|
124
124
|
}
|
|
125
125
|
});
|
|
126
126
|
for (let idx = 0; idx < pairs_buffer.length; idx++) {
|
|
127
|
-
let
|
|
127
|
+
let k = pairs_buffer[idx][0];
|
|
128
|
+
let v = pairs_buffer[idx][1];
|
|
128
129
|
buffer.push([to_cirru_edn(k), to_cirru_edn(v)]);
|
|
129
130
|
}
|
|
130
131
|
return buffer;
|
package/ts-src/js-map.mts
CHANGED
|
@@ -70,7 +70,8 @@ export class CalcitMap {
|
|
|
70
70
|
let itemsCode = "";
|
|
71
71
|
let pairs = this.pairs();
|
|
72
72
|
for (let idx = 0; idx < pairs.length; idx++) {
|
|
73
|
-
let
|
|
73
|
+
let k = pairs[idx][0];
|
|
74
|
+
let v = pairs[idx][1];
|
|
74
75
|
if (shorter) {
|
|
75
76
|
let keyPart = isNestedCalcitData(k) ? tipNestedCalcitData(k) : toString(k, true, disableJsDataWarning);
|
|
76
77
|
let valuePart = isNestedCalcitData(v) ? tipNestedCalcitData(v) : toString(v, true, disableJsDataWarning);
|
|
@@ -177,7 +178,10 @@ export class CalcitMap {
|
|
|
177
178
|
|
|
178
179
|
/** detecthing in custom formatter */
|
|
179
180
|
nestedDataInChildren() {
|
|
180
|
-
|
|
181
|
+
let pairs = this.pairs();
|
|
182
|
+
for (let idx = 0; idx < pairs.length; idx++) {
|
|
183
|
+
let k = pairs[idx][0];
|
|
184
|
+
let v = pairs[idx][1];
|
|
181
185
|
if (!isLiteral(k) || !isLiteral(v)) {
|
|
182
186
|
return true;
|
|
183
187
|
}
|
|
@@ -267,7 +271,8 @@ export class CalcitSliceMap {
|
|
|
267
271
|
let itemsCode = "";
|
|
268
272
|
let pairs = this.pairs();
|
|
269
273
|
for (let idx = 0; idx < pairs.length; idx++) {
|
|
270
|
-
let
|
|
274
|
+
let k = pairs[idx][0];
|
|
275
|
+
let v = pairs[idx][1];
|
|
271
276
|
if (shorter) {
|
|
272
277
|
let keyPart = isNestedCalcitData(k) ? tipNestedCalcitData(k) : toString(k, true, disableJsDataWarning);
|
|
273
278
|
let valuePart = isNestedCalcitData(v) ? tipNestedCalcitData(v) : toString(v, true, disableJsDataWarning);
|
|
@@ -381,7 +386,10 @@ export class CalcitSliceMap {
|
|
|
381
386
|
|
|
382
387
|
/** detecthing in custom formatter */
|
|
383
388
|
nestedDataInChildren() {
|
|
384
|
-
|
|
389
|
+
let pairs = this.pairs();
|
|
390
|
+
for (let idx = 0; idx < pairs.length; idx++) {
|
|
391
|
+
let k = pairs[idx][0];
|
|
392
|
+
let v = pairs[idx][1];
|
|
385
393
|
if (!isLiteral(k) || !isLiteral(v)) {
|
|
386
394
|
return true;
|
|
387
395
|
}
|
package/ts-src/js-record.mts
CHANGED
|
@@ -188,7 +188,8 @@ export let _$n_record_$o_from_map = (proto: CalcitValue, data: CalcitValue): Cal
|
|
|
188
188
|
let pairs_buffer: Array<[CalcitTag, CalcitValue]> = [];
|
|
189
189
|
let pairs = data.pairs();
|
|
190
190
|
for (let i = 0; i < pairs.length; i++) {
|
|
191
|
-
let
|
|
191
|
+
let k = pairs[i][0];
|
|
192
|
+
let v = pairs[i][1];
|
|
192
193
|
pairs_buffer.push([castTag(k), v]);
|
|
193
194
|
}
|
|
194
195
|
// mutable sort
|