efront 3.35.0 → 3.35.1

package/coms/basic/renderExpress.js

@@ -3,7 +3,8 @@ function createSeek(express) {
     express.forEach(function (search) {
         if (dist) {
             if (/[\=]/.test(dist)) dist = `(${dist})`;
-            dist = `typeof ${dist}!=='undefined'&&${dist}!==null?${dist}${search}:''`
+            var pd = /[\.\[]/.test(dist) ? `${dist}!==void 0` : `typeof ${dist}!=='undefined'`;
+            dist = `${pd}&&${dist}!==null?${dist}${search}:''`
         } else {
             dist = search;
         }

package/coms/compile/Javascript.js

@@ -18,6 +18,7 @@ const {
     createString,
     getDeclared,
     createScoped,
+    snapExpressHead,
     relink,
     skipAssignment,
 } = require("./common");
@@ -180,8 +181,13 @@ var isShortMethodEnd = function (o) {
 };
 
 Javascript.prototype.setType = function (o) {
-    this.fixType(o);
     var last = o.prev;
+    if (o.type === EXPRESS && /^\.[^\.]/.test(o.text) && last.type === STAMP && last.text === "?") {
+        last = o.prev = snapExpressHead(last.prev);
+        last.type = EXPRESS;
+        return false;
+    }
+    this.fixType(o);
     var queue = o.queue;
     if (queue.isObject || queue.isClass) {
         if (o.type & (VALUE | QUOTED | STRAP)) {
@@ -282,13 +288,32 @@ var collectProperty = function (o, text) {
     q.defined[text] = o;
 };
 
+var replace = function (o, ...args) {
+    var queue = o.queue;
+    var i = queue.indexOf(o);
+    if (i >= 0) queue.splice(i, 1, ...args);
+    var prev = o.prev;
+    var next = o.next;
+    if (!args.length) {
+        if (prev) prev.next = next;
+        else queue.first = next;
+        if (next) next.prev = prev;
+        else queue.last = prev;
+    }
+    else {
+        if (prev) prev.next = args[0], args[0].prev = prev;
+        else queue.first = args[0];
+        if (next) next.prev = args[args.length - 1], args[args.length - 1].next = next;
+        else queue.last = args[args.length - 1];
+    }
+    return args.length ? args[0] : next;
+};
 var hasComma = function (c) {
     for (var cc of c) {
         if (cc.type === STAMP && cc.text === ',') return true;
     }
     return false;
 }
-
 var removeQoute = function (o, c, i) {
     if (hasComma(c)) return;
     if (!isFinite(i)) i = o.indexOf(c);
@@ -309,13 +334,21 @@ Javascript.prototype.detour = function detour(o, ie) {
                 this.detour(o.first, ie);
                 break;
             case EXPRESS:
+                var text = o.text.replace(/^\.\.\./, '');
+                var hasdot = o.text.length !== text.length;
                 if (avoidMap) {
-                    var m = /^[^\.\[\]]+/.exec(o.text.replace(/^\.\.\./, ''));
+                    var m = /^[^\.\[\]]+/.exec(o.text);
                     if (m) { avoidMap[m[0]] = true; }
                 }
-                if (!/^\.\.\.|\.\.\.$/.test(o.text)) {
-                    o.text = o.text.replace(/\.([^\.\[]+)/g, (_, a) => ie === undefined || this.strap_reg.test(a) ? `[${strings.recode(a)}]` : _);
+                if (/\?\./.test(text)) {
+                    text = renderExpress(text);
+                    if (hasdot) text = "..." + text;
+                    o = replace(o, ...scan(text));
+                    continue;
                 }
+                text = text.replace(/\.([^\.\[\!\=\:]+)/g, (_, a) => ie === undefined || this.strap_reg.test(a) ? `[${strings.recode(a)}]` : _);
+                if (hasdot) text = "..." + text;
+                o.text = text;
                 break;
             case QUOTED:
                 if (o.length) {

package/coms/compile/Program.js

@@ -188,7 +188,9 @@ class Program {
             scope.prev = last;
             if (scope.type !== COMMENT && scope.type !== SPACE) {
                 if (program.setType(scope) === false) {
-                    last = scope.prev;
+                    if (queue.last !== last) last = queue.last;
+                    else if (scope.prev !== last) last = scope.prev;
+                    while (queue[queue.length - 1] !== last) queue.pop();
                     last.end = scope.end;
                     last.text = text.slice(last.start, last.end);
                     return;

package/coms/compile/common.js

@@ -237,7 +237,7 @@ var snapExpressHead = function (o) {
     while (o && o.prev) {
         var p = o.prev;
         if (p.type & (EXPRESS | VALUE)) {
-            if (o.type === SCOPED && o.entry === '[' || o.type === EXPRESS && /^\./.test(o.text) || /\.$/.test(p.text) && !p.isdigit) {
+            if (o.type === SCOPED && o.entry === '[' || o.type === EXPRESS && /^\??\.[^\.]/.test(o.text) || /\.$/.test(p.text) && !p.isdigit) {
                 o = p;
                 continue;
             }
@@ -250,7 +250,7 @@ var snapExpressFoot = function (o) {
     if (!o || !(o.type & (EXPRESS | VALUE))) return;
     while (o && o.next) {
         var n = o.next;
-        if (n.type === SCOPED && o.entry === '[' || /\.$/.test(o.text) && !o.isdigit || n.type === EXPRESS && /^\./.test(n.text)) {
+        if (n.type === SCOPED && o.entry === '[' || /\.$/.test(o.text) && !o.isdigit || n.type === EXPRESS && /^\??\.[^\.]/.test(n.text)) {
             if (n.type & (EXPRESS | SCOPED)) {
                 o = n;
                 continue;

package/docs/components.jsp

@@ -2,9 +2,16 @@
 
     var fs = require("fs").promises;
     var path = require("path");
-    var comm_file_reg = /\.([tj]sx?|xht|md)$/i;
+    var comm_file_reg = /\.([tj]sx?|xht|md|less)$/i;
+    var basepath = path.join(String(__efront), 'coms');
+    if (req.id) {
+        var compath = path.join(basepath, req.id);
+        if (!comm_file_reg.test(req.id) || !/^\.\./.test(path.relative(compath, basepath))) return forbidden("禁止访问");
+        return fs.readFile(compath);
+    }
+
     var readdir = async function (a) {
-        var b = path.join(__efront, "coms", a);
+        var b = path.join(basepath, a);
         var names = await fs.readdir(b);
         names = names.filter(name => {
             if (/#/.test(name) || !comm_file_reg.test(name)) return false;

package/docs/index.html

@@ -39,6 +39,8 @@
     </script>
 </head>
 
-<body scroll=no max-render=1440></body>
+<body scroll=no max-render=1440>
+    走过多少路口，听过多少叹息，我认真着你的不知所措..
+</body>
 
 </html>

package/docs/main.xht

@@ -3,6 +3,7 @@
         --leftwidth: 260px;
         display: block;
         width: auto;
+        top: 0;
         left: 0;
         right: 0;
         margin-right: -16px;
@@ -21,16 +22,25 @@
         vertical-align: top;
     }
 
-    div2 test:before {
+    :root>menu f {
+        margin-left: 6px;
+    }
+
+    :root>menu f[test]:before {
         color: #fc0;
         content: "测";
     }
-    
-    div2 dang:before {
+
+    :root>menu f[dang]:before {
         color: #2cf;
         content: "档";
     }
 
+    :root>menu f[less]:before {
+        color: #2c9;
+        content: "样";
+    }
+
     menu {
         width: var(--leftwidth);
         margin-left: -var(--leftwidth);
@@ -51,6 +61,12 @@
         position: relative;
         background: linear-gradient(#f2f4ff, 70%, #e9fff2);
     }
+    :root>menu v{
+        display: inline-block;
+        font-size: 12px;
+        color: #79a;
+        margin-left: 12px;
+    }
 </style>
 <menu #mulu inline -src="m in menus" @active="openMenu(m)">
     <div2></div2>
@@ -92,10 +108,16 @@
             }
         ]);
     })
+    var initVersionInfo = async function () {
+        var xhr = await cross("get", "version");
+        console.log(xhr)
+        var version = xhr.response.split(",");
+        menus[0].name += ` <v>${version[0]}</v>`;
+    }
     var initCommandsDocs = async function () {
         var helps = await init("docs$helps");
         var m = {
-            name: "命令详解",
+            name: "命令参考",
             children: [
                 { name: "防御系", a: "f" },
                 { name: "强攻系", a: "q" },
@@ -129,11 +151,13 @@
             }
             for (var cc of children) {
                 cc.data = {
-                    mark: !!map[cc.name.replace(/\.js$/i, ".md")],
-                    test: !!map[cc.name.replace(/\.js$/i, "_test.js")]
+                    mark: !!map[cc.name.replace(/\.[tj]sx?$/i, ".md")],
+                    test: !!map[cc.name.replace(/\.[tj]sx?$/i, "_test.js")],
+                    less: !!map[cc.name.replace(/\.[tj]sx?$/i, ".less")]
                 }
-                if(cc.data.mark)cc.name+="<dang></dang>"
-                if(cc.data.test)cc.name+="<test></test>"
+                if (cc.data.less) cc.name += "<f less></f>"
+                if (cc.data.mark) cc.name += "<f dang></f>"
+                if (cc.data.test) cc.name += "<f test></f>"
             }
             c.children = children;
             c.closed = true;
@@ -144,6 +168,7 @@
     var initMenus = async function () {
         menus[0].children.forEach(c => { c.path = "/mark/" + c.md });
         zimoli.switch('', scope.content, menus[0].children[0].path);
+        await initVersionInfo();
         await initCommandsDocs();
         await initComponentDocs();
         var route = await init("frame$route");

package/docs/mark.xht

@@ -143,11 +143,16 @@
             var target = this;
             var href = target.getAttribute("href");
             event.preventDefault();
-            if (!/^\w+:/.test(href) && /\.md$/i.test(href)) {
-                href = md.replace(/[^\/]+$/, "") + href;
-                href = decodeURI(href);
-                console.log(href)
-                go('/mark/' + href);
+            if (!/^\w+:/.test(href)) {
+                if (/\.md$/i.test(href)) {
+                    href = md.replace(/[^\/]+$/, "") + href;
+                    href = decodeURI(href);
+                    console.log(href)
+                    go('/mark/' + href);
+                }
+                else {
+                    window.open('https://github.com/yunxu1019/efront/blob/develop/' + md.replace(/[^\/]+$/, "") + href);
+                }
             }
             else {
                 window.open(href);

package/docs/version.jsp

@@ -0,0 +1,3 @@
+<script serverside>
+    return __efront.version;
+</script>

package/docs/welcome.jsp

@@ -1,4 +1,5 @@
 <script serverside>
+    __efront = String(__efront);
     var fullpath = path.join(__efront, req.id);
     if (!/^\.\./.test(path.relative(fullpath, __efront)) || !/\.md$/.test(req.id)) {
         return forbidden("禁止访问！");

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

@@ -5,11 +5,13 @@
         display: block;
     }
 
-    p {
+    p4 {
         line-height: 1.8;
+        display: block;
+        margin: 20px 0;
     }
 
-    m {
+    p4 m{
         line-height: 1.2;
         display: inline-block;
         margin-right: 6px;
@@ -34,46 +36,68 @@
         color: #29f;
     }
 
+    b[l] {
+        color: #29c;
+    }
+
     h2 b {
         font-size: 14px;
         display: inline-block;
         border: 1.2px solid;
+        margin-left: 6px;
+        padding: 2px 4px;
     }
-    markdown{
+
+    markdown {
         margin: 0 -20px;
     }
 </style>
 <h2>
     <span -bind="name"></span>
+    <b -if="doc?.less" l>有样式表</b>
     <b -if="doc?.mark" w>有文档</b>
     <b -if="doc?.test" t>有测试代码</b>
 </h2>
 <container -if="doc?.url" .src="doc.url">
 </container>
-<p envs>
-    <span -if="com?.args.length">
-        环境依赖项:&nbsp; <m -repeat="c in com.args" -bind="c"> </m>
+<p4 envs>
+    <span -if="envs?.length">
+        环境依赖项:&nbsp; <m -repeat="c in envs" -bind="c"> </m>
     </span>
     <span -else> 无环境依赖项 </span>
-</p>
-<p imported>
-    <span -if="com?.required.length">
-        导入项:&nbsp;<m -repeat="c in com.required" -bind="c"></m>
+</p4>
+<p4 imported>
+    <span -if="required?.length">
+        导入项:&nbsp;<m -repeat="c in required" -bind="c"></m>
     </span>
     <span -else>
         无导入项
     </span>
-</p>
+</p4>
 <script>
-    var 分析 = async function (com, props) {
-        scope.name = com;
-        await new Promise(ok => load(com, ok));
-        var loaded = loadedModules[com];
-        scope.com = loaded;
-        scope.doc = props;
+    var 分析 = lazy(async function (com, props) {
         if (props.mark) props.url = '/mark/coms/' + com.replace(/\.js$/i, '.md');
+        scope.doc = props;
+        scope.name = com;
+        var xhr = await cross("get", "./components:" + com);
+        var code = compile$scanner2(xhr.response);
+        code.fix();
+        var envs = code.envs;
+        if (props.less) envs.cless = true;
+        var required = [];
+        if (envs.require) code.used.require.forEach(r => {
+            var next = r.next;
+            if (!next) return;
+            if (next.type !== code.SCOPED || next.entry !== '(') return;
+            var first = next.first;
+            if (!first || first.type !== code.QUOTED) return;
+            var req = code.program.createString([first]);
+            required.push(req);
+        });
+        scope.required = required;
+        scope.envs = Object.keys(envs);
         render.refresh();
-    };
+    });
     var page = document.createElement("component");
     page.innerHTML = template;
     var scope = {

package/package.json

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