desmost 0.12.0 → 0.12.1

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 (9) hide show
  1. package/dist/compiler/format.d.ts.map +1 -1
  2. package/dist/compiler/format.js +6 -3
  3. package/dist/compiler/format.js.map +1 -1
  4. package/dist/decompiler/format.d.ts.map +1 -1
  5. package/dist/decompiler/format.js +5 -1
  6. package/dist/decompiler/format.js.map +1 -1
  7. package/package.json +1 -1
  8. package/src/compiler/format.ts +9 -4
  9. package/src/decompiler/format.ts +11 -1
package/dist/compiler/format.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/compiler/format.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAIzC,wBAAgB,YAAY,CAC3B,CAAC,EAAE,YAAY,EACf,OAAO,EAAE,cAAc,GACrB,MAAM,CA8BR;AAGD;;GAEG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIrD;AAGD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAmBpD"}
1
+ {"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/compiler/format.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAIzC,wBAAgB,YAAY,CAC3B,CAAC,EAAE,YAAY,EACf,OAAO,EAAE,cAAc,GACrB,MAAM,CA8BR;AAGD;;GAEG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIrD;AAGD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAwBpD"}
package/dist/compiler/format.js CHANGED
@@ -49,13 +49,16 @@ export function normalise_latex(latex) {
49
49
  * ```
50
50
  */
51
51
  export function prettify_latex(latex) {
52
+ latex = latex.replaceAll(/\s=<\s/g, " \\leq ");
53
+ latex = latex.replaceAll(/\s>=\s/g, " \\geq ");
52
54
  latex = latex.replaceAll(/(?<!\\left)(\(|\[|\\\{)/g, "\\left$1");
53
55
  latex = latex.replaceAll(/(?:\\left\s?)+/g, "\\left");
54
56
  latex = latex.replaceAll(/(?<!\\right)(\)|\]|\\\})/g, "\\right$1");
55
57
  latex = latex.replaceAll(/(?:\\right\s?)+/g, "\\right");
56
- latex = latex.replaceAll(/(:|,)(?!\\ ) */g, "$1\\ ");
57
- latex = latex.replaceAll(/(?<=[^\w]|^)\\?(length|mean|median|min|max|count|total|repeat|join|sort|shuffle|unique|mod|ceil|floor|round|sign) ?(?=\(|\\left\()/g, "\\operatorname{$1}");
58
- latex = latex.replaceAll(/\s(and|or)\s/g, "\\operatorname{$1}");
58
+ latex = latex.replaceAll(/(:|,)\s*(?!\\ )/g, "$1\\ ");
59
+ latex = latex.replaceAll(/(?<=[^\w]|^)\\?(length|mean|median|count|total|repeat|join|sort|shuffle|unique|mod|ceil|floor|round|sign)\s*(?=\(|\\left\()/g, "\\operatorname{$1}");
60
+ latex = latex.replaceAll(/\\?(min|max)\s*(?=\(|\\left\()/g, "\\$1");
61
+ latex = latex.replaceAll(/\s(and|or)\s/g, " \\operatorname{$1} ");
59
62
  return latex;
60
63
  }
61
64
  //# sourceMappingURL=format.js.map
package/dist/compiler/format.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/compiler/format.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAGhC,MAAM,UAAU,YAAY,CAC3B,CAAe,EACf,OAAuB;IAGvB,IAAI,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAClC,IAAI,GAAG,GAAG,CAAC,MAAM,KAAK,EAAE,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;IAE9D,4CAA4C;IAC5C,IAAI,OAAO,GAAG,GAAG,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IAEvD,IAAI,CAAC,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC;IAChB,CAAC;IAED,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC;QAC9B,OAAO,IAAI,KAAK,IAAI,IAAI,CAAC;QACzB,OAAO,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QAE5B,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC;YACnC,OAAO,IAAI,IAAI,CAAC;YAChB,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9C,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAChD,CAAC;IACF,CAAC;IAED,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;QAC3B,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,IAAK,SAAS;YAAE,OAAO,IAAI,KAAK,IAAI,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5E,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,IAAK,SAAS;YAAE,OAAO,IAAI,KAAK,IAAI,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5E,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,SAAS;YAAE,OAAO,IAAI,KAAK,IAAI,kBAAkB,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IACrF,CAAC;IAED,OAAO,OAAO,CAAC;AAChB,CAAC;AAGD;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,KAAa;IAE5C,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACtC,OAAO,KAAK,CAAC;AACd,CAAC;AAGD;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,cAAc,CAAC,KAAa;IAE3C,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,0BAA0B,EAAE,UAAU,CAAC,CAAC;IACjE,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;IACtD,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,2BAA2B,EAAE,WAAW,CAAC,CAAC;IACnE,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;IACxD,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAErD,KAAK,GAAG,KAAK,CAAC,UAAU,CACvB,qIAAqI,EACrI,oBAAoB,CACpB,CAAC;IAEF,KAAK,GAAG,KAAK,CAAC,UAAU,CACvB,eAAe,EACf,oBAAoB,CACpB,CAAC;IAEF,OAAO,KAAK,CAAC;AACd,CAAC"}
1
+ {"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/compiler/format.ts"],"names":[],"mappings":"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"}
package/dist/decompiler/format.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/decompiler/format.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAatD"}
1
+ {"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/decompiler/format.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAuBtD"}
package/dist/decompiler/format.js CHANGED
@@ -12,11 +12,15 @@
12
12
  * ```
13
13
  */
14
14
  export function prettify_source(source) {
15
+ source = source.replaceAll(/\s*\\leq\s*/g, " =< ");
16
+ source = source.replaceAll(/\s*\\geq\s*/g, " >= ");
15
17
  source = source.replaceAll(/(?<=[^ ])=(?=[^ ])/g, " = ");
16
18
  source = source.replaceAll(/\\left\s*(\(|\[|\\\{)/g, "$1");
17
19
  source = source.replaceAll(/\\right\s*(\)|\]|\\\})/g, "$1");
18
20
  source = source.replaceAll(/(:|,)\\ /g, "$1 ");
19
- source = source.replaceAll(/\\operatorname\{(length|mean|median|min|max|count|total|repeat|join|sort|shuffle|unique|mod|ceil|floor|round|sign)\} ?(?=\(|\\left\()/g, "$1");
21
+ source = source.replaceAll(/\\operatorname\{(length|mean|median|count|total|repeat|join|sort|shuffle|unique|mod|ceil|floor|round|sign)\}\s*(?=\(|\\left\()/g, "$1");
22
+ source = source.replaceAll(/\\(min|max)\s*(?=\(|\\left\()/g, "$1");
23
+ source = source.replaceAll(/\\operatorname\{(and|or)\}/g, "$1");
20
24
  return source;
21
25
  }
22
26
  //# sourceMappingURL=format.js.map
package/dist/decompiler/format.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/decompiler/format.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,eAAe,CAAC,MAAc;IAE3C,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;IACzD,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;IAC3D,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,yBAAyB,EAAE,IAAI,CAAC,CAAC;IAC9D,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAE/C,MAAM,GAAG,MAAM,CAAC,UAAU,CACrB,wIAAwI,EAC5I,IAAI,CACJ,CAAC;IAEA,OAAO,MAAM,CAAC;AACjB,CAAC"}
1
+ {"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/decompiler/format.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,eAAe,CAAC,MAAc;IAE7C,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;IAClD,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;IAChD,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;IACzD,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;IAC3D,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,yBAAyB,EAAE,IAAI,CAAC,CAAC;IAC9D,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAE/C,MAAM,GAAG,MAAM,CAAC,UAAU,CACrB,iIAAiI,EACrI,IAAI,CACJ,CAAC;IACA,MAAM,GAAG,MAAM,CAAC,UAAU,CAC3B,gCAAgC,EAChC,IAAI,CACJ,CAAC;IACF,MAAM,GAAG,MAAM,CAAC,UAAU,CACzB,6BAA6B,EAC7B,IAAI,CACJ,CAAC;IAEA,OAAO,MAAM,CAAC;AACjB,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "desmost",
3
3
  "author": "Sup#2.0",
4
- "version": "0.12.0",
4
+ "version": "0.12.1",
5
5
  "license": "MIT",
6
6
 
7
7
  "description": "A tiny DSL for compiling LaTeX to Desmos",
package/src/compiler/format.ts CHANGED
@@ -66,20 +66,25 @@ export function normalise_latex(latex: string): string
66
66
  */
67
67
  export function prettify_latex(latex: string): string
68
68
  {
69
+ latex = latex.replaceAll(/\s=<\s/g, " \\leq ");
70
+ latex = latex.replaceAll(/\s>=\s/g, " \\geq ");
69
71
  latex = latex.replaceAll(/(?<!\\left)(\(|\[|\\\{)/g, "\\left$1");
70
72
  latex = latex.replaceAll(/(?:\\left\s?)+/g, "\\left");
71
73
  latex = latex.replaceAll(/(?<!\\right)(\)|\]|\\\})/g, "\\right$1");
72
74
  latex = latex.replaceAll(/(?:\\right\s?)+/g, "\\right");
73
- latex = latex.replaceAll(/(:|,)(?!\\ ) */g, "$1\\ ");
75
+ latex = latex.replaceAll(/(:|,)\s*(?!\\ )/g, "$1\\ ");
74
76
 
75
77
  latex = latex.replaceAll(
76
- /(?<=[^\w]|^)\\?(length|mean|median|min|max|count|total|repeat|join|sort|shuffle|unique|mod|ceil|floor|round|sign) ?(?=\(|\\left\()/g,
78
+ /(?<=[^\w]|^)\\?(length|mean|median|count|total|repeat|join|sort|shuffle|unique|mod|ceil|floor|round|sign)\s*(?=\(|\\left\()/g,
77
79
  "\\operatorname{$1}"
78
80
  );
79
-
81
+ latex = latex.replaceAll(
82
+ /\\?(min|max)\s*(?=\(|\\left\()/g,
83
+ "\\$1"
84
+ );
80
85
  latex = latex.replaceAll(
81
86
  /\s(and|or)\s/g,
82
- "\\operatorname{$1}"
87
+ " \\operatorname{$1} "
83
88
  );
84
89
 
85
90
  return latex;
package/src/decompiler/format.ts CHANGED
@@ -13,15 +13,25 @@
13
13
  */
14
14
  export function prettify_source(source: string): string
15
15
  {
16
+ source = source.replaceAll(/\s*\\leq\s*/g, " =< ")
17
+ source = source.replaceAll(/\s*\\geq\s*/g, " >= ")
16
18
  source = source.replaceAll(/(?<=[^ ])=(?=[^ ])/g, " = ");
17
19
  source = source.replaceAll(/\\left\s*(\(|\[|\\\{)/g, "$1");
18
20
  source = source.replaceAll(/\\right\s*(\)|\]|\\\})/g, "$1");
19
21
  source = source.replaceAll(/(:|,)\\ /g, "$1 ");
20
22
 
21
23
  source = source.replaceAll(
22
- /\\operatorname\{(length|mean|median|min|max|count|total|repeat|join|sort|shuffle|unique|mod|ceil|floor|round|sign)\} ?(?=\(|\\left\()/g,
24
+ /\\operatorname\{(length|mean|median|count|total|repeat|join|sort|shuffle|unique|mod|ceil|floor|round|sign)\}\s*(?=\(|\\left\()/g,
23
25
  "$1"
24
26
  );
27
+ source = source.replaceAll(
28
+ /\\(min|max)\s*(?=\(|\\left\()/g,
29
+ "$1"
30
+ );
31
+ source = source.replaceAll(
32
+ /\\operatorname\{(and|or)\}/g,
33
+ "$1",
34
+ );
25
35
 
26
36
  return source;
27
37
  }