efront 4.0.55 → 4.0.57

package/coms/basic/color.js

@@ -259,14 +259,14 @@ function stringify(color) {
 	}
 	return "#" + [R, G, B].map(hex256).join("");
 }
-function doWith(manager, color, args) {
+function doWith(manager, color, ...args) {
 	var isparsed = color instanceof Array,
 		c = isparsed ? color : parse(color);
 	if (!c) {
 		console.warn(`颜色数据不正确:${color}`);
 		return color;
 	}
-	c = manager(c, args);
+	c = manager(c, ...args);
 	if (!isparsed) c = stringify(c);
 	return c;
 }
@@ -382,7 +382,89 @@ var gray4 = function (RGBA, A) {
 	return [r, g, b, A || a];
 };
 
+var saturate_rgb = function (RGBA, delta) {
+	var [r, g, b, a] = RGBA;
+	var h = rgb2h(r, g, b);
+	delta = percent(delta);
+	h += delta * 100;
+	[r, g, b] = rgb4h(r, g, b, h);
+	return [r, g, b, a];
+};
+
+var desaturate_rgb = function (RGBA, delta) {
+	delta = percent(delta);
+	return saturate_rgb(RGBA, -delta);
+};
+
+var lighten_rgb = function (RGBA, delta) {
+	var [r, g, b, a] = RGBA;
+	delta = percent(delta)
+	var l = rgb2v(r, g, b);
+	l += delta * 100;
+	[r, g, b] = rgb4v(r, g, b, l);
+	return [r, g, b, a];
+};
 
+var darken_rgb = function (RGBA, delta) {
+	delta = percent(delta);
+	return lighten_rgb(RGBA, -delta);
+};
+
+var fadein_rgb = function (RGBA, delta) {
+	delta = percent(delta);
+	var [r, g, b, a] = RGBA;
+	a += delta;
+	return [r, g, b, a];
+};
+
+var fadeout_rgb = function (RGBA, delta) {
+	delta = percent(delta);
+	return fadein_rgb(RGBA, -delta);
+};
+
+var fade_rgb = function (RGBA, alpha) {
+	var [r, g, b] = RGBA;
+	return [r, g, b, alpha];
+};
+
+var spin_rgb = function (RGBA, delta) {
+	var [r, g, b, a] = RGBA;
+	var s = rgb2s(r, g, b);
+	s += delta;
+	var [r, g, b] = rgb4s(r, g, b, s);
+	return [r, g, b, s];
+};
+
+var grayscale_rgb = function (RGBA) {
+	var [r, g, b, a] = RGBA;
+	[r, g, b] = rgb4s(r, g, b, 0);
+	return [r, g, b, a];
+};
+var grayluma_rgb = function (RGBA) {
+	var [r, g, b, a] = RGBA;
+	var v = rgb2v(r, g, b);
+	return [v, v, v, a];
+};
+var mix_rgb = function (RGBA, c2, power) {
+	var c1 = rgb2hsl(RGBA);
+	c1.push(RGBA[3]);
+	var rgba2 = parse(c2);
+	var c2 = rgb2hsl(rgba2);
+	c2.push(rgba2[3]);
+	return [0, 1, 2, 3].map(a => c1[a] * (1 - power) + c2[a] * power);
+};
+var tint_rgb = function (RGBA, power) {
+	return mix_rgb([255, 255, 255, RGBA[3]], RGBA, power);
+};
+var shade_rgb = function (RGBA, power) {
+	return mix_rgb([0, 0, 0, RGBA[3]], RGBA, power);
+};
+
+var wrap = function (f) {
+	return function () {
+		return doWith(f, ...arguments);
+	}
+};
 var random_base = Math.PI * Math.random() * 2;
 extend(color, {
 	setTransformer(transformer) {
@@ -394,6 +476,19 @@ extend(color, {
 	contrast(color, ratio) {
 		return doWith(contrast_rgb, color, ratio);
 	},
+	saturate: wrap(saturate_rgb),
+	desaturate: wrap(desaturate_rgb),
+	lighten: wrap(lighten_rgb),
+	darken: wrap(darken_rgb),
+	fadein: wrap(mix_rgb),
+	fadeout: wrap(fadeout_rgb),
+	fade: wrap(fade_rgb),
+	spin: wrap(spin_rgb),
+	mix: wrap(mix_rgb),
+	tint: wrap(tint_rgb),
+	shade: wrap(shade_rgb),
+	grayscale: wrap(grayscale_rgb),
+	grayluma: wrap(grayluma_rgb),
 	rgb2h,
 	rgb4h,
 	rgb2v,

package/coms/compile/Javascript.js

@@ -40,6 +40,8 @@ class Javascript extends Program {
     strapexp_reg = /^(new|void|typeof|delete|class|function|await)/;
     forceend_reg = /^(return|yield|break|continue|debugger)$/;
     classstrap_reg = /^(class|function|async)$/;
+    colonstrap_reg = /^(case|default)$/;
+
     defaultType = EXPRESS;
 }
 var propresolve_reg = /^(static|get|set|async)$/;
@@ -210,7 +212,126 @@ var isShortMethodEnd = function (o) {
     return o.isprop;
 };
 
+var setObject = function (o) {
+    o.isObject = true;
+    var needproperty = true;
+    for (var cx = 0; cx < o.length; cx++) {
+        var m = o[cx];
+        if (!needproperty) {
+            if (m.type === SCOPED && m.entry === '{') {
+                if (!m.isObject) setObject(m);
+                continue;
+            }
+            if (m.type !== STAMP || m.text !== ',') continue;
+        }
+        if (m.type === STAMP && m.text === ':') {
+            needproperty = false;
+            continue;
+        }
+        if (m.type === LABEL) {
+            o.splice(cx, 0, o[++cx].prev = m.next = m.next.prev = {
+                prev: m,
+                text: ':',
+                type: STAMP,
+                next: m.next,
+            });
+            m.type = PROPERTY;
+            m.text = m.text.replace(/\:$/, '');
+            m.isprop = true;
+            m.end--;
+            needproperty = false;
+            continue;
+        }
+        m.isprop = true;
+        if (m.type === EXPRESS || m.type === QUOTED) {
+            if (!/\./.test(m.text)) m.type = PROPERTY;
+        }
+        if (m.prev && m.prev.type === PROPERTY) {
+
+            m.prev.type = STRAP;
+        }
+    }
+};
+Javascript.prototype.detectLabel = function (o) {
+    var queue = o.queue;
+    var last = queue.last;
+    var m = o.text;
+    var type = o.type;
+    var colonstrap_reg = this.colonstrap_reg;
+    var end = o.end;
+
+    if (type === SPACE);
+    else if (type !== STAMP);
+    else if (m === ";") {
+        if (last && last.isend === false) last.isend = true;
+        queue.inExpress = false;
+    }
+    else if (last) check: switch (m) {
+        case "?":
+            queue.inExpress = true;
+            if (!queue.question) queue.question = 1;
+            else queue.question++;
+            break;
+        case "=":
+            queue.inExpress = true;
+            if (last.type === SCOPED && last.entry === "{") {
+                if (!last.isObject) {
+                    setObject(last);
+                }
+            }
+        case ",":
+            if (queue.isObject) {
+                if (last.type === PROPERTY) {
+                    last.short = true;
+                }
+            }
+            queue.inExpress = true;
+            break;
+        case ":":
+            if (queue.question) {
+                queue.question--;
+                queue.inExpress = true;
+                break;
+            }
+            if (queue.isObject) {
+                if (last.type === PROPERTY || last.isprop) {
+                    queue.inExpress = true;
+                    break;
+                }
+                if (last.type === SCOPED && (!last.prev || !last.prev.type === STAMP && last.prev.text === ",")) {
+                    queue.inExpress = true;
+                }
+                break;
+            }
+            var temp = last;
+            while (temp) {
+                if (temp.type === STRAP && colonstrap_reg.test(temp.text)) {
+                    queue.inExpress = false;
+                    break check;
+                }
+                if (!temp.isExpress) break;
+                temp = temp.prev;
+            }
+            queue.inExpress = false;
+            if (last.type & (EXPRESS | STRAP | VALUE | QUOTED)) {
+                // label
+                last.type = LABEL;
+                last.text += ":";
+                last.end = end;
+                return o;
+            }
+            break;
+        default:
+            queue.inExpress = true;
+    }
+    else {
+        queue.inExpress = true;
+    }
+    o.isExpress = queue.inExpress;
+}
+
 Javascript.prototype.setType = function (o) {
+    if (this.detectLabel(o)) return false;
     var last = o.prev;
     if (o.type === EXPRESS && /^\.[^\.]/.test(o.text) && last && last.type === STAMP && last.text === "?") {
         last = o.prev = snapExpressHead(last.prev);

package/coms/compile/Program.js

@@ -14,46 +14,7 @@ const {
     number_reg,
 } = require("./common");
 var combine = require("../basic/combine");
-var setObject = function (o) {
-    o.isObject = true;
-    var needproperty = true;
-    for (var cx = 0; cx < o.length; cx++) {
-        var m = o[cx];
-        if (!needproperty) {
-            if (m.type === SCOPED && m.entry === '{') {
-                if (!m.isObject) setObject(m);
-                continue;
-            }
-            if (m.type !== STAMP || m.text !== ',') continue;
-        }
-        if (m.type === STAMP && m.text === ':') {
-            needproperty = false;
-            continue;
-        }
-        if (m.type === LABEL) {
-            o.splice(cx, 0, o[++cx].prev = m.next = m.next.prev = {
-                prev: m,
-                text: ':',
-                type: STAMP,
-                next: m.next,
-            });
-            m.type = PROPERTY;
-            m.text = m.text.replace(/\:$/, '');
-            m.isprop = true;
-            m.end--;
-            needproperty = false;
-            continue;
-        }
-        m.isprop = true;
-        if (m.type === EXPRESS || m.type === QUOTED) {
-            if (!/\./.test(m.text)) m.type = PROPERTY;
-        }
-        if (m.prev && m.prev.type === PROPERTY) {
 
-            m.prev.type = STRAP;
-        }
-    }
-};
 var sortRegExpSource = function (a, b) {
     if (a.indexOf(b) >= 0) return -1;
     if (b.indexOf(a) >= 0) return 1;
@@ -147,7 +108,6 @@ class Program {
     Code = Array;
     transive_reg = /^(new|void|case|break|continue|return|throw|extends|import)$/
     straps = "if,for".split(',');
-    colonstrap_reg = /^(case|default)$/;
     forceend_reg = /^(return|break|continue)$/;
     classstrap_reg = /^(class)$/;
     extends_reg = /^(extends)$/;
@@ -186,7 +146,6 @@ class Program {
         var Code = this.Code;
         var queue = new Code();
         var origin = queue;
-        var colonstrap_reg = this.colonstrap_reg;
         var forceend_reg = this.forceend_reg;
         var program = this;
         var queue_push = function (scope) {
@@ -237,74 +196,7 @@ class Program {
                     return;
                 }
             }
-            var last = queue.last;
-            if (type === SPACE);
-            else if (type !== STAMP);
-            else if (m === ";") {
-                if (last && last.isend === false) last.isend = true;
-                queue.inExpress = false;
-            }
-            else if (last) check: switch (m) {
-                case "?":
-                    queue.inExpress = true;
-                    if (!queue.question) queue.question = 1;
-                    else queue.question++;
-                    break;
-                case "=":
-                    queue.inExpress = true;
-                    if (last.type === SCOPED && last.entry === "{") {
-                        if (!last.isObject) {
-                            setObject(last);
-                        }
-                    }
-                case ",":
-                    if (queue.isObject) {
-                        if (last.type === PROPERTY) {
-                            last.short = true;
-                        }
-                    }
-                    queue.inExpress = true;
-                    break;
-                case ":":
-                    if (queue.question) {
-                        queue.question--;
-                        queue.inExpress = true;
-                        break;
-                    }
-                    if (queue.isObject) {
-                        if (last.type === PROPERTY || last.isprop) {
-                            queue.inExpress = true;
-                            break;
-                        }
-                        if (last.type === SCOPED && (!last.prev || !last.prev.type === STAMP && last.prev.text === ",")) {
-                            queue.inExpress = true;
-                        }
-                        break;
-                    }
-                    var temp = last;
-                    while (temp) {
-                        if (temp.type === STRAP && colonstrap_reg.test(temp.text)) {
-                            queue.inExpress = false;
-                            break check;
-                        }
-                        if (!temp.isExpress) break;
-                        temp = temp.prev;
-                    }
-                    queue.inExpress = false;
-                    if (last.type & (EXPRESS | STRAP | VALUE | QUOTED)) {
-                        // label
-                        last.type = LABEL;
-                        last.text += ":";
-                        last.end = end;
-                        return;
-                    }
-                    break;
-                default:
-                    queue.inExpress = true;
-            }
-            else {
-                queue.inExpress = true;
-            }
+
             var scope = {
                 type,
                 start,

package/coms/compile/autoenum_test.js

@@ -27,4 +27,8 @@ t("for(;;a=1){ console.log(a)} console.log(a)", "for (;; a = 1) { console.log(a)
 t("for(var a = 1;;){ console.log(a)} console.log(a)", "for (var a = 1;;) { console.log(1) } console.log(1)");
 t("for(let a = 1;;){ console.log(a)} console.log(a)", "for (let a = 1;;) { console.log(a) } console.log(a)");
 t("var a=-1; console.log(-a)", "var a = -1; console.log(- -1)");
+t("var a=-1; console.log(--a)", "var a = -1; console.log(--a)");
+t("var a=-1; return ++a", "var a = -1; return ++a");
+t("var a=-1; typeof ++a", "var a = -1; typeof ++a");
+t("var a=-1; ++a", "var a = -1; ++a");
 // t(fs.readFileSync(path.join(__dirname,"../zimoli/spacechar_test.js")).toString())

package/coms/compile/common.js

@@ -404,7 +404,7 @@ var createScoped = function (parsed, wash) {
             var function_obj = null;
             if (o.type === STAMP && equal_reg.test(o.text)) {
                 var p = snapExpressHead(o.prev);
-                if (!p) {
+                if (!p || p.type & (STRAP | STAMP)) {
                     let n = o.next;
                     if (n && n.type & (EXPRESS | VALUE)) {
                         n.equal = o;
@@ -999,7 +999,9 @@ var setqueue = function (list, queue = list) {
 };
 
 var createString = function (parsed) {
+    var autospace = parsed.autospace !== false;
     var keepspace = parsed.keepspace !== false;
+    var patchspace = autospace && keepspace;
     var helpcode = parsed.helpcode;
     var lasttype = SPACE;
     var uncomment = parsed.comment === false;
@@ -1007,7 +1009,7 @@ var createString = function (parsed) {
     var helpcolor = parsed.keepcolor === false;
     var run = (o, i, a) => {
         var prev = o.prev;
-        if (!((SPACE | COMMENT | STAMP | PIECE | SCOPED) & o.type) && prev && lasttype !== SPACE && keepspace) {
+        if (!((SPACE | COMMENT | STAMP | PIECE | SCOPED) & o.type) && prev && lasttype !== SPACE && patchspace) {
             if ((QUOTED | SCOPED | STRAP | LABEL | COMMENT) & lasttype
                 || prev.type === STAMP && !prev.unary
             ) {
@@ -1048,12 +1050,12 @@ var createString = function (parsed) {
                     }
                 }
                 if (keepspace && !opentmp) {
-                    if (lasttype !== SPACE && lasttype !== EXPRESS) result.push(" ");
+                    if (patchspace && lasttype !== SPACE && lasttype !== EXPRESS) result.push(" ");
                     result.push(tmp);
                 }
                 break;
             case SPACE:
-                if (keepspace) {
+                if (!autospace || keepspace) {
                     result.push(o.text);
                     lasttype = SPACE;
                     break;
@@ -1068,21 +1070,21 @@ var createString = function (parsed) {
                     break;
                 }
             case SCOPED:
-                if (keepspace && o.type !== QUOTED && (lasttype & (STRAP | COMMENT | STAMP)
+                if (patchspace && o.type !== QUOTED && (lasttype & (STRAP | COMMENT | STAMP)
                     && (!o.prev || !/[\+\-\~\!]$/.test(o.prev.text) || /[\+\-]$/.test(o.prev.text) && (!o.prev.prev || !((STAMP | STRAP) & o.prev.prev.type)))
                     || lasttype === SCOPED && o.entry === "{"
                 )) result.push(" ");
                 result.push(o.entry);
                 if (o.length > 0) {
                     if (o.entry === "{" && o[0].type !== SPACE) {
-                        if (keepspace && lasttype !== PIECE) {
+                        if (patchspace && lasttype !== PIECE) {
                             result.push(" ");
                         }
                     }
                     lasttype = SPACE;
                     o.forEach(run);
                     if (o.prev && o.prev.type === STRAP && /^for$/.test(o.prev.text));
-                    else if (/^[,;]$/.test(result[result.length - 1]) && !keepspace) {
+                    else if (/^[,;]$/.test(result[result.length - 1]) && autospace && !keepspace) {
                         var last = o.last;
                         var lp = last && last.prev;
                         if (!lp) result.pop();
@@ -1093,7 +1095,7 @@ var createString = function (parsed) {
                         }
                     }
                     if (o.leave === "}" && o.entry === "{" && o[o.length - 1].type !== SPACE) {
-                        if (keepspace) result.push(" ");
+                        if (patchspace) result.push(" ");
                     }
                 }
                 result.push(o.leave);
@@ -1102,13 +1104,13 @@ var createString = function (parsed) {
                 if (o && typeof o === "object") {
                     if (o.prev && o.prev.type === EXPRESS && o.type === EXPRESS && (/^[\.\[]/.test(o.text) || /\.$/.test(o.prev.text)));
                     else if ((STRAP | EXPRESS | PROPERTY | COMMENT | VALUE) & lasttype && (STRAP | EXPRESS | PROPERTY | VALUE | LABEL) & o.type) {
-                        result.push(" ");
+                        if (autospace) result.push(" ");
                     }
                     else if (o.prev && o.type === STAMP && !/^([,;])$/.test(o.text)) {
                         if (result[result.length - 1] === " " || (lasttype === PROPERTY || !o.isExpress && o.prev && o.prev.type !== LABEL) && o.text === ':') { }
                         else if (lasttype === STAMP) {
                             var prev = o.prev;
-                            if (!prev.unary || /[\+\-]$/.test(prev.text) && prev.text === o.text) result.push(" ");
+                            if (autospace) if (!prev.unary || /[\+\-]$/.test(prev.text) && prev.text === o.text) result.push(" ");
                         }
                         else if (/^(\+\+|\-\-)$/.test(o.prev.text) && o.prev.prev) {
                             var prev_prev = o.prev.prev;
@@ -1119,10 +1121,10 @@ var createString = function (parsed) {
                         }
 
                         else if (o.text === '*') {
-                            if (keepspace && lasttype !== SPACE && (lasttype !== STRAP || o.prev && o.prev.text !== 'function')) result.push(" ");
+                            if (patchspace && lasttype !== SPACE && (lasttype !== STRAP || o.prev && o.prev.text !== 'function')) result.push(" ");
                         }
-                        else if (!/^(\+\+|\-\-)$/.test(o.text)) {
-                            if (keepspace && lasttype !== SPACE) result.push(" ");
+                        else if (!/^(\+\+|\-\-)$/.test(o.text) || o.prev && o.prev.type & (STAMP | STRAP)) {
+                            if (patchspace && lasttype !== SPACE) result.push(" ");
                         }
                     }
                     if (o.type === VALUE) {