efront 4.0.58 → 4.1.1

package/coms/compile/{richcss.js → /347/264/240/351/246/250.js}

@@ -3,7 +3,7 @@ var createString = function (a) {
     a.autospace = false;
     return _createString(a);
 };
-class Richarg extends Program {
+class 素玉 extends Program {
     straps = ["and"];
     stamps = ',:;>+~&!/'.split("");
     quotes = this.quotes.slice(0, 2).concat();
@@ -11,7 +11,7 @@ class Richarg extends Program {
     scopes = [["(", ")"], ["{", "}"]];
 }
 
-var rarg = new Richarg;
+var rarg = new 素玉;
 rarg.quotes.push(["url(", ")"]);
 var numberReg = /((?:[\+\-]+)?(?:\d+(?:\.\d*)?|\.\d+))(?:\s*(px|%|pt|pc|in|cm|mm|r?em|deg|rad|vw|vh|%))?/;
 var replaceHReg = new RegExp(numberReg.source + /\s*([\/\*])\s*/.source + numberReg.source, 'gi');
@@ -125,7 +125,7 @@ var createArgMap = function (args, split = ',', equal = ':') {
     var args = [];
     while (o) {
         if (!(o.type & (PROPERTY | EXPRESS))) {
-            throw new Error("参数异常！");
+            throw new Error(i18n`参数异常！`);
         }
         var k = o.text;
         args.push(k);
@@ -174,7 +174,7 @@ macros.range = function () {
         }
         return result;
     }
-    throw new Error("range参数错误:" + arguments);
+    throw new Error(i18n`range参数错误:` + arguments);
 };
 macros.extract = function (list, index) {
     if (typeof list === 'string') list = list.split(',');
@@ -223,10 +223,10 @@ macros.grayluma = wrapColor(color.grayluma);
 macros.fade = wrapColor(color.fade);
 macros.each = function (list, body) {
     var match = /^(?:\s*[#\.]?\(([\s\S]*?)\))?\s*\{([\s\S]*)\}$/.exec(body);
-    if (!match) throw new Error("each参数异常!");
+    if (!match) throw new Error(i18n`each参数异常!`);
     var [_, args, content] = match;
     if (!content) return;
-    content = richcss(content);
+    content = 素馨(content);
     if (args) args = args.split(",").map(a => a.trim());
     else args = [];
     if (args.length < 1) args.push("@value");
@@ -274,7 +274,7 @@ macros.each = function (list, body) {
 };
 
 
-class Richcss extends Program {
+class 素心 extends Program {
     straps = ["and"];
     stamps = `;:,>+~&!/`.split("");
     quotes = rarg.quotes;
@@ -284,7 +284,7 @@ class Richcss extends Program {
 
 var presets = /^@(media|keyframes|layer|import|namespace|page|property|suppports|font-face|document|counter-style|charset|color-profile|container|font-feature-values|font-palette-values)(\s|\(|$)/i;
 
-Richcss.prototype.setType = function (o) {
+素心.prototype.setType = function (o) {
     var p = o.prev;
     if (o.type !== SCOPED) {
         if (!p || p.type === STAMP && p.text === ";" || p.type === SCOPED && p.entry === '{') {
@@ -309,7 +309,7 @@ Richcss.prototype.setType = function (o) {
     }
 };
 
-Richcss.prototype.createScoped = function (code) {
+素心.prototype.createScoped = function (code) {
     var setVarsUsed = function (s) {
         var vars = null, used = null;
         for (var cx = s.length - 1; cx >= 0; cx--) {
@@ -336,7 +336,7 @@ Richcss.prototype.createScoped = function (code) {
             if (o && (o.type & (SPACE | COMMENT) || o.type === STAMP && o.text === ';')) continue;
             if (o.type !== PROPERTY) {
                 console.log(createString([o]), o.type, createString(code))
-                throw new Error("结构异常");
+                throw new Error(i18n`结构异常`);
             }
             var p = [], v = [];
             while (o && (o.type !== SCOPED || o.entry !== "{")) {
@@ -383,7 +383,7 @@ Richcss.prototype.createScoped = function (code) {
     };
     return run(code);
 };
-Richcss.prototype.createString = createString;
+素心.prototype.createString = createString;
 var getFromScopeList = function (name, varsList, value = name) {
     name = name.replace(/^@\{\s*(\S*)\s*\}$/g, '@$1');
     var queue = [];
@@ -398,7 +398,8 @@ var getFromScopeList = function (name, varsList, value = name) {
         }
     }
     return value;
-}
+};
+var removeSelectorSpace = a => a.trim().replace(/\s*([\+~\>])\s*/g, "$1");
 var fixBase = function (b, a) {
     return a.split(/,\s*/).map(a => {
         if (presets.test(a)) a = `@{${a}}`;
@@ -411,7 +412,7 @@ var fixBase = function (b, a) {
                 return b;
             });
             if (!replaced) {
-                if (/^[>~+]/.test(a)) {
+                if (/^[\>~\+]/.test(a) || /[\>~\+]$/.test(b)) {
                     a1 = b + a;
                 }
                 else a1 = b + " " + a;
@@ -421,6 +422,7 @@ var fixBase = function (b, a) {
     }).join(",");
 }
 function evalscoped(scoped, base = '') {
+    base = removeSelectorSpace(base);
     var smaps = scoped.maps;
     var root = smaps[":root"], scope = smaps[":scope"];
     var vars = extend(Object.create(null), scoped.vars);
@@ -530,6 +532,7 @@ function evalscoped(scoped, base = '') {
             if (p.isMethod) continue;
             if (p.used) {
                 k = calcvars(k);
+                k = removeSelectorSpace(k);
                 if (base && !p.rooted) p.base = fixBase(base, k);
                 else p.base = presets.test(k) ? `@{${k}}` : k;
                 if (p.vars) vlist.push(p.vars);
@@ -561,8 +564,8 @@ function evalscoped(scoped, base = '') {
     return result;
 }
 var rcss = null;
-function richcss(text, scopeName, compress) {
-    if (!rcss) rcss = new Richcss;
+function 素馨(text, scopeName, compress) {
+    if (!rcss) rcss = new 素心;
     rcss.debug = true;
     var code = scanner2(text, rcss);
     var { scoped } = code;

package/coms/compile/{richcss_test.js → /347/264/240/351/246/250_test.js}

@@ -1,5 +1,5 @@
 var test = function (data, expect) {
-    assert(richcss(data), expect);
+    assert(素馨(data), expect);
 };
 test(`&{--a:1;a{opacity:--a}}`, `a{opacity:1;}`);
 test(`:root{--a:1}a{opacity:--a}`, `a{opacity:1;}`);
@@ -54,12 +54,15 @@ test(`b{a:darken(#6cd205, 20%)}`, `b{a:#58be00;}`);
 test(`b{a:darken(#7ff,10%)}`, `b{a:#6df5f5;}`);
 
 test(`:not(a):not(b){c:d}`, `:not(a):not(b){c:d;}`);
-assert(richcss(`:not(a):not(b){c:d}`, 'abc'), `abc :not(a):not(b){c:d;}`);
-assert(richcss(`&:not(a):not(b){c:d}`, 'abc'), `abc:not(a):not(b){c:d;}`);
-assert(richcss(`:scope{&:not(a):not(b){c:d}}`, 'abc'), `abc:not(a):not(b){c:d;}`);
-assert(richcss(`:root{&:not(a):not(b){c:d}}`, 'abc'), `abc:not(a):not(b){c:d;}`);
-assert(richcss(`&{&:not(a):not(b){c:d}}`, 'abc'), `abc:not(a):not(b){c:d;}`);
-assert(richcss(`:root>a{&:not(a):not(b){c:d}}`, '.abc-'), `.abc->a:not(a):not(b){c:d;}`);
-assert(richcss(`a>:root{&:not(a):not(b){c:d}}`, '.abc-'), `a>.abc-:not(a):not(b){c:d;}`);
+test(`a>{b{a:b}}`, `a>b{a:b;}`);
+test(`a    >{b{a:b}}`, `a>b{a:b;}`);
+test(`a{>b{a:b}}`, `a>b{a:b;}`);
+assert(素馨(`:not(a):not(b){c:d}`, 'abc'), `abc :not(a):not(b){c:d;}`);
+assert(素馨(`&:not(a):not(b){c:d}`, 'abc'), `abc:not(a):not(b){c:d;}`);
+assert(素馨(`:scope{&:not(a):not(b){c:d}}`, 'abc'), `abc:not(a):not(b){c:d;}`);
+assert(素馨(`:root{&:not(a):not(b){c:d}}`, 'abc'), `abc:not(a):not(b){c:d;}`);
+assert(素馨(`&{&:not(a):not(b){c:d}}`, 'abc'), `abc:not(a):not(b){c:d;}`);
+assert(素馨(`:root>a{&:not(a):not(b){c:d}}`, '.abc-'), `.abc->a:not(a):not(b){c:d;}`);
+assert(素馨(`a>:root{&:not(a):not(b){c:d}}`, '.abc-'), `a>.abc-:not(a):not(b){c:d;}`);
 
-assert(richcss(`.a (){ &:after{abc:1}} .b{.a();}`, '.abc-'), `.abc- .b:after{abc:1;}`);
+assert(素馨(`.a (){ &:after{abc:1}} .b{.a();}`, '.abc-'), `.abc- .b:after{abc:1;}`);

package/coms/docs/codetext.xht

@@ -173,6 +173,7 @@
         javascript(a, blink) {
             if (blink) var index = a.indexOf(blink);
             if (index >= 0) a = a.slice(0, index) + a.slice(index + 1);
+            js.keepspace = !!blink;
             var c = compile$scanner2(a, js);
             if (index >= 0) {
                 var patched = patchBlink(c, index, blink);

package/coms/zimoli/icon.js

@@ -1,3 +1,4 @@
+console.error("图标组件的服务端已从efront移除，请勿使用！");
 var setBackGround, icon, icn;
 var binaryImagePathReg = /^https?\:|\.(?:png|gif|bmp|jpe?g)$/i;
 if (/MSIE\s*[2-8]/.test(navigator.userAgent)) {

package/docs/version-desc.md

@@ -9,3 +9,5 @@
 3.x With a self built grammar parser, `efront` no longer relies on `esprima`, `esmangle`, and `escodegen`. The self compilation time has gradually decreased from the original 10 minute Github workflow to about 2 minutes.
 
 4.0 No longer relying on `typescript` (nearly 170000 lines of source code), the compilation speed has increased by four times, the memory usage has been reduced to 1/8 of the original, and the self compilation time on GitHub has also been reduced to about 15 seconds.
+
+4.1 No longer relying on `less-node` or `pngjs`, while the `less-node` is replaced with [suxin](https://www.npmjs.com/package/suxin) from `efront`.

package/docs//345/267/245/345/205/267//345/233/275/351/231/205/345/214/226.xht

@@ -362,7 +362,7 @@
                     if (v === false) alert(i18n`暂不支持翻译其他语言`, 'warn');
                 },
                 test(a) {
-                    return /[\u3400-\ufad9\u{20000}-\u{2a6d6}\u{2fa1d}]/u.test(a.text);
+                    return !!a.fanyi || /[\u3400-\ufad9\u{20000}-\u{2a6d6}\u{2fa1d}]/u.test(a.text);
                 }
             }
         ]

package/docs//345/267/245/345/205/267//346/225/260/345/200/274/346/215/242/347/256/227.xht

@@ -6,37 +6,37 @@
     var _value = 0;
     var parseFloat = (a, b) => new BigNumber(a, b);
     var value = {
-        get 十进制() {
+        get [i18n`十进制`]() {
             return _value;
         },
-        set 十进制(v) {
+        set [i18n`十进制`](v) {
             _value = parseFloat(v)
         },
-        get 十六进制() {
+        get [i18n`十六进制`]() {
             return _value.toString(16);
         },
-        set 十六进制(v) {
+        set [i18n`十六进制`](v) {
             _value = parseFloat(v, 16);
         },
-        get 二进制() {
+        get [i18n`二进制`]() {
             return _value.toString(2);
         },
-        set 二进制(v) {
+        set [i18n`二进制`](v) {
             _value = parseFloat(v, 2);
         },
-        get 八进制() {
+        get [i18n`八进制`]() {
             return _value.toString(8)
         },
-        set 八进制(v) {
+        set [i18n`八进制`](v) {
             _value = parseFloat(v, 8)
         },
-        get 三十六进制() {
+        get [i18n`三十六进制`]() {
             return _value.toString(36);
         },
-        set 三十六进制(v) {
+        set [i18n`三十六进制`](v) {
             _value = parseFloat(v, 36);
         },
-        get 浮点数机器码() {
+        get [i18n`浮点数机器码`]() {
             var v = +_value;
             var s = /^-/.test(v);
             if (s) v = -v;
@@ -46,7 +46,7 @@
             v = s << 31 | i << 23 | v & 0x7fffff;
             return [v >> 24 & 0xff, v >> 16 & 0xff, v >> 8 & 0xff, v & 0xff].map(hex).join('');
         },
-        set 浮点数机器码(v) {
+        set [i18n`浮点数机器码`](v) {
             v = parseInt(v, 16);
             var s = v >> 31;
             var i = v >> 23 & 0xff;
@@ -56,7 +56,7 @@
             if (s) v = -v;
             _value = v;
         },
-        get 双精度机器码() {
+        get [i18n`双精度机器码`]() {
             var s = /^-/.test(_value);
             var v = window.parseFloat(_value);
             if (s) v = -v;
@@ -72,7 +72,7 @@
                 v >> 8 & 0xff, v & 0xff
             ].map(hex).join('');
         },
-        set 双精度机器码(v) {
+        set [i18n`双精度机器码`](v) {
             var s = parseInt(v[0], 16) >> 3;
             var i = parseInt(v.slice(0, 3), 16) & 0x7ff;
             v = parseInt(v.slice(3), 16);

package/docs//347/211/210/346/234/254/350/257/264/346/230/216.md

@@ -9,3 +9,5 @@
 3.x版本 `efront`拥有自建的语法解析器，不再依赖`esprima`、`esmangle`、`escodegen`，自我编译耗时由原来的10分钟github工作流，逐步减少到2分钟左右。
 
 4.0版本 不再依赖`typescipt`（近17万行源码），编译速度再次提升4倍，占用内存减少到原来的1/8，github上自我编译时间也减少到15秒左右。
+
+4.1版本 不再依赖`less-node`和`pngjs`，其中`less-node` 由`efront`自建的css工具[素馨](https://www.npmjs.com/package/suxin)代替。

package/docs//347/273/204/344/273/266.xht

@@ -200,7 +200,7 @@
             var cssWrap = `css-` + +new Date;
             if (scope.doc.test.indexOf(lessName) >= 0) {
                 lessData = await cross("get", "./components:" + modName + ".less");
-                lessData = compile$richcss(lessData.responseText, "." + cssWrap);
+                lessData = compile$素馨(lessData.responseText, "." + cssWrap);
                 if (code.isExpressQueue()) {
                     codetext = `return cless(${codetext},\`${lessData}\`,"${cssWrap}")`;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.0.58",
+    "version": "4.1.1",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {