catto.js 0.8.7 → 0.8.8

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 (2) hide show
  1. package/cjs_client.js +26 -18
  2. package/package.json +1 -1
package/cjs_client.js CHANGED
@@ -5,7 +5,7 @@
5
5
  (() => {
6
6
  var symbol = "%";
7
7
 
8
- var incid = -1;
8
+ var incid = 0;
9
9
  var cache = {};
10
10
  var ignoret = !1;
11
11
  var dstartcode = "output += `<span id=\"_cattojs_d%\">`;\ncfs[%] = function() {\nvar ignoret = !0;\n";
@@ -15,32 +15,40 @@
15
15
  var parts = code.split(new RegExp(`<${symbol}c(?:lient)?(\\*)?(?!=) +(.+?) +${symbol}>`, "g"));
16
16
  var output = "";
17
17
  var compile = "";
18
- var dstreak = 0;
19
18
  var did = 0;
19
+ var ob = 0;
20
20
  var cfs = {};
21
21
  parts.forEach((part, index) => {
22
22
  if ((index + 1) % 3 == 2) {
23
- if (part == "*") {
24
- dstreak++;
25
- } else if (dstreak) {
26
- dstreak = -1;
27
- } else {
28
- dstreak = 0;
23
+ if (!did && part == "*") {
24
+ compile += dstartcode.split("%").join(++incid);
25
+ did = incid;
29
26
  }
30
27
  return;
31
28
  }
32
- if (dstreak == 1 && (index + 1) % 3 < 1) {
33
- compile += dstartcode.split("%").join(++incid);
34
- did = incid;
35
- }
36
- if (dstreak == -1) {
37
- dstreak = 0;
38
- compile += dendcode.split("%").join(did);
29
+ if ((index + 1) % 3 < 1) {
30
+ var instr = !1;
31
+ var chstr = "";
32
+ for (var char of part) {
33
+ if (!instr && "'\"`".includes(char)) {
34
+ instr = !0;
35
+ chstr = char;
36
+ }
37
+ if (instr && char == chstr) {
38
+ instr = !1;
39
+ }
40
+ if (!instr && char == "{") {
41
+ ob++;
42
+ }
43
+ if (!instr && char == "}") {
44
+ ob--;
45
+ }
46
+ }
39
47
  }
40
- compile += ((index + 1) % 3 < 1 ? `${part}\n` : `output += ${JSON.stringify(part)}.replace(/<${symbol}c(?:lient)?(\\*)?= +(.+?) +${symbol}>/g, (_, t, g) => __rpf(t, g, eval(g), !0, ignoret)).replace(/<${symbol}c(?:lient)?(\\*)?- +(.+?) +${symbol}>/g, (_, t, g) => __rpf(t, g, eval(g), !1, ignoret)).replace(/<${symbol}c(lient)\\*?# +(.+?) +${symbol}>/g, "");\n`);
41
- if (dstreak && !parts[index + 2]) {
42
- dstreak = 0;
48
+ compile += ((index + 1) % 3 < 1 ? `${part}\n` : `output += ${JSON.stringify(part)}.replace(/<${symbol.replace("\\", "\\\\")}c(?:lient)?(\\*)?= +(.+?) +${symbol.replace("\\", "\\\\")}>/g, (_, t, g) => __rpf(t, g, eval(g), !0, ignoret)).replace(/<${symbol.replace("\\", "\\\\")}c(?:lient)?(\\*)?- +(.+?) +${symbol.replace("\\", "\\\\")}>/g, (_, t, g) => __rpf(t, g, eval(g), !1, ignoret)).replace(/<${symbol.replace("\\", "\\\\")}c(lient)\\*?# +(.+?) +${symbol.replace("\\", "\\\\")}>/g, "");\n`);
49
+ if (did && !ob) {
43
50
  compile += dendcode.split("%").join(did);
51
+ did = 0;
44
52
  }
45
53
  });
46
54
  function __rpf(t, g, result, r, ignoret) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "catto.js",
3
- "version": "0.8.7",
3
+ "version": "0.8.8",
4
4
  "description": "Universal module for everything.",
5
5
  "main": "index.js",
6
6
  "scripts": {