@calcit/procs 0.10.6 → 0.10.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/js-cirru.mjs +14 -1
- package/lib/package.json +5 -5
- package/package.json +5 -5
- package/ts-src/js-cirru.mts +21 -5
package/lib/js-cirru.mjs
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { writeCirruCode } from "@cirru/writer.ts";
|
|
1
|
+
import { writeCirruCode, writeCirruOneLiner } from "@cirru/writer.ts";
|
|
2
2
|
import { isLiteral, _$n_compare } from "./js-primes.mjs";
|
|
3
3
|
import { CalcitList, CalcitSliceList } from "./js-list.mjs";
|
|
4
4
|
import { CalcitRecord } from "./js-record.mjs";
|
|
@@ -61,6 +61,19 @@ export let format_cirru = (data, useInline) => {
|
|
|
61
61
|
}
|
|
62
62
|
return writeCirruCode(chunk, { useInline });
|
|
63
63
|
};
|
|
64
|
+
export let format_cirru_one_liner = (data) => {
|
|
65
|
+
let chunk;
|
|
66
|
+
if (data instanceof CalcitCirruQuote) {
|
|
67
|
+
chunk = data.value;
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
chunk = toWriterNode(data);
|
|
71
|
+
}
|
|
72
|
+
if (!Array.isArray(chunk)) {
|
|
73
|
+
throw new Error("Expected data of list");
|
|
74
|
+
}
|
|
75
|
+
return writeCirruOneLiner(chunk);
|
|
76
|
+
};
|
|
64
77
|
/** better use string version of Cirru EDN in future */
|
|
65
78
|
export let to_cirru_edn = (x) => {
|
|
66
79
|
if (x == null) {
|
package/lib/package.json
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@calcit/procs",
|
|
3
|
-
"version": "0.10.
|
|
3
|
+
"version": "0.10.7",
|
|
4
4
|
"main": "./lib/calcit.procs.mjs",
|
|
5
5
|
"devDependencies": {
|
|
6
|
-
"@types/node": "^
|
|
7
|
-
"typescript": "^5.9.
|
|
6
|
+
"@types/node": "^25.0.6",
|
|
7
|
+
"typescript": "^5.9.3"
|
|
8
8
|
},
|
|
9
9
|
"scripts": {
|
|
10
10
|
"compile": "rm -rfv lib/* && tsc",
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
},
|
|
24
24
|
"dependencies": {
|
|
25
25
|
"@calcit/ternary-tree": "0.0.25",
|
|
26
|
-
"@cirru/parser.ts": "^0.0.
|
|
27
|
-
"@cirru/writer.ts": "^0.1.
|
|
26
|
+
"@cirru/parser.ts": "^0.0.7",
|
|
27
|
+
"@cirru/writer.ts": "^0.1.7"
|
|
28
28
|
}
|
|
29
29
|
}
|
package/package.json
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@calcit/procs",
|
|
3
|
-
"version": "0.10.
|
|
3
|
+
"version": "0.10.7",
|
|
4
4
|
"main": "./lib/calcit.procs.mjs",
|
|
5
5
|
"devDependencies": {
|
|
6
|
-
"@types/node": "^
|
|
7
|
-
"typescript": "^5.9.
|
|
6
|
+
"@types/node": "^25.0.6",
|
|
7
|
+
"typescript": "^5.9.3"
|
|
8
8
|
},
|
|
9
9
|
"scripts": {
|
|
10
10
|
"compile": "rm -rfv lib/* && tsc",
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
},
|
|
24
24
|
"dependencies": {
|
|
25
25
|
"@calcit/ternary-tree": "0.0.25",
|
|
26
|
-
"@cirru/parser.ts": "^0.0.
|
|
27
|
-
"@cirru/writer.ts": "^0.1.
|
|
26
|
+
"@cirru/parser.ts": "^0.0.7",
|
|
27
|
+
"@cirru/writer.ts": "^0.1.7"
|
|
28
28
|
}
|
|
29
29
|
}
|
package/ts-src/js-cirru.mts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { overwriteComparator, initTernaryTreeMap } from "@calcit/ternary-tree";
|
|
2
|
-
import { CirruWriterNode, writeCirruCode } from "@cirru/writer.ts";
|
|
2
|
+
import { CirruWriterNode, writeCirruCode, writeCirruOneLiner } from "@cirru/writer.ts";
|
|
3
3
|
|
|
4
4
|
import { CalcitValue, isLiteral, _$n_compare } from "./js-primes.mjs";
|
|
5
5
|
import { CalcitList, CalcitSliceList } from "./js-list.mjs";
|
|
@@ -15,8 +15,8 @@ import { atom } from "./js-ref.mjs";
|
|
|
15
15
|
type CirruEdnFormat = string | CirruEdnFormat[];
|
|
16
16
|
|
|
17
17
|
export class CalcitCirruQuote {
|
|
18
|
-
value: CirruWriterNode;
|
|
19
|
-
constructor(value: CirruWriterNode) {
|
|
18
|
+
value: CirruWriterNode[];
|
|
19
|
+
constructor(value: CirruWriterNode[]) {
|
|
20
20
|
if (value == null) {
|
|
21
21
|
throw new Error("cirru node cannot be null");
|
|
22
22
|
}
|
|
@@ -31,7 +31,7 @@ export class CalcitCirruQuote {
|
|
|
31
31
|
nth(idx: number): CalcitValue {
|
|
32
32
|
if (Array.isArray(this.value)) {
|
|
33
33
|
if (idx < this.value.length) {
|
|
34
|
-
return new CalcitCirruQuote(this.value[idx]);
|
|
34
|
+
return new CalcitCirruQuote(this.value[idx] as CirruWriterNode[]);
|
|
35
35
|
} else {
|
|
36
36
|
throw new Error(`nth out of range: ${idx}`);
|
|
37
37
|
}
|
|
@@ -66,6 +66,22 @@ export let format_cirru = (data: CalcitCirruQuote | CalcitList, useInline: boole
|
|
|
66
66
|
return writeCirruCode(chunk, { useInline });
|
|
67
67
|
};
|
|
68
68
|
|
|
69
|
+
export let format_cirru_one_liner = (data: CalcitCirruQuote | CalcitList): string => {
|
|
70
|
+
let chunk: CirruWriterNode;
|
|
71
|
+
|
|
72
|
+
if (data instanceof CalcitCirruQuote) {
|
|
73
|
+
chunk = data.value;
|
|
74
|
+
} else {
|
|
75
|
+
chunk = toWriterNode(data);
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
if (!Array.isArray(chunk)) {
|
|
79
|
+
throw new Error("Expected data of list");
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
return writeCirruOneLiner(chunk);
|
|
83
|
+
};
|
|
84
|
+
|
|
69
85
|
/** better use string version of Cirru EDN in future */
|
|
70
86
|
export let to_cirru_edn = (x: CalcitValue): CirruEdnFormat => {
|
|
71
87
|
if (x == null) {
|
|
@@ -325,7 +341,7 @@ export let extract_cirru_edn = (x: CirruEdnFormat, options: CalcitValue): Calcit
|
|
|
325
341
|
if (x.length !== 2) {
|
|
326
342
|
throw new Error(`quote expects 1 argument, got: ${x}`);
|
|
327
343
|
}
|
|
328
|
-
return new CalcitCirruQuote(x[1]);
|
|
344
|
+
return new CalcitCirruQuote(x[1] as CirruWriterNode[]);
|
|
329
345
|
}
|
|
330
346
|
if (x[0] === "::") {
|
|
331
347
|
if (x.length < 2) {
|