efront 3.36.1 → 3.36.2

package/coms/compile/common.js

@@ -419,6 +419,7 @@ var createScoped = function (parsed, wash) {
                             if (o.next.type === STAMP) {
                                 isAster = true;
                                 o = o.next;
+                                o.isExpress = o.prev.isExpress;
                             }
                         case "catch":
                             if (s === 'catch') isCatch = true;
@@ -560,6 +561,7 @@ var createScoped = function (parsed, wash) {
                     scoped.body = o;
                     o.isExpress = isExpress;
                     run(o.first);
+                    if (isArrow && id >= 0 && o) o = o.next;
                     if (wash && isFunction) {
                         var e = o.next;
                         if (e && e.type === EXPRESS && /^[\.\[]/.test(e.text) || e && e.type === SCOPED && e.entry === "[") {

package/coms/compile/scanner2_test.js

@@ -76,6 +76,13 @@ function testAssign() {
     a()`);
     console.log(m.press().toString());
 }
+function testArrow() {
+    var m = scanner(`(a)=>(b)=>{c,b};`);
+    console.log("1", m.envs);
+    var m = scanner(`(a,b)=>{c,b};`);
+    console.log("2", m.envs);
+}
+
 function testFormat() {
     var t = fs.readFileSync(path.join(__dirname, "../efront/memery.js")).toString();
     assert(scanner(t).toString(), t);
@@ -111,6 +118,7 @@ Program.debug = true;
 // testJsx2();
 // testJsx3();
 // testJsxOnlyHtml();
-testSpaceLess();
+// testSpaceLess();
+testArrow();
 // var typescript = require("../typescript/index");
 // typescript.transpile(data.toString(), { noEmitHelpers: true });

package/coms/typescript-helpers/__asyncDelegator.js

@@ -0,0 +1,12 @@
+/**
+ * typescript:asyncDelegator
+ * 这个文件由工具生成，请不要手动修改
+ * 
+ * Efront Authors
+ * 2023-03-31T13:49:30.678Z
+ */
+var __asyncDelegator = (this && this.__asyncDelegator) || function (o) {
+    var i, p;
+    return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
+    function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: false } : f ? f(v) : v; } : f; }
+};

package/coms/typescript-helpers/__asyncValues.js

@@ -0,0 +1,14 @@
+/**
+ * typescript:asyncValues
+ * 这个文件由工具生成，请不要手动修改
+ * 
+ * Efront Authors
+ * 2023-03-31T13:49:30.678Z
+ */
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};

package/coms/typescript-helpers/__esDecorate.js

@@ -0,0 +1,34 @@
+/**
+ * typescript:esDecorate
+ * 这个文件由工具生成，请不要手动修改
+ * 
+ * Efront Authors
+ * 2023-03-31T13:49:30.678Z
+ */
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.push(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.push(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};

package/coms/typescript-helpers/__propKey.js

@@ -0,0 +1,10 @@
+/**
+ * typescript:propKey
+ * 这个文件由工具生成，请不要手动修改
+ * 
+ * Efront Authors
+ * 2023-03-31T13:49:30.678Z
+ */
+var __propKey = (this && this.__propKey) || function (x) {
+    return typeof x === "symbol" ? x : "".concat(x);
+};

package/coms/typescript-helpers/__runInitializers.js

@@ -0,0 +1,14 @@
+/**
+ * typescript:runInitializers
+ * 这个文件由工具生成，请不要手动修改
+ * 
+ * Efront Authors
+ * 2023-03-31T13:49:30.678Z
+ */
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};

package/coms/typescript-helpers/__setFunctionName.js

@@ -0,0 +1,11 @@
+/**
+ * typescript:setFunctionName
+ * 这个文件由工具生成，请不要手动修改
+ * 
+ * Efront Authors
+ * 2023-03-31T13:49:30.678Z
+ */
+var __setFunctionName = (this && this.__setFunctionName) || function (f, name, prefix) {
+    if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
+    return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
+};

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

@@ -325,22 +325,23 @@
         { name: "斯洛文尼亚语", id: "slo", lang: 'sl' },
     ];
     supports.forEach(s => s.key = s.id);
-    var getAllText = function (data, e) {
+    var getAllText = function (data, f) {
         try {
-            if (/^\s*<!doctype\s/i.test(data)) return [];
-            if (/\.(xht|vue)$/i.test(e.name)) {
+            if (/^\s*(\<\!--[\s\S]*?--\>\s*)*<!doctype\s/i.test(data)) return [];
+            if (/\.(xht|vue)$/i.test(f.name)) {
                 var { scripts, outerHTML: htmltext, attributes = '', tagName, styles } = compile$scanner2(data, 'html').scoped;
                 data = compile$wraphtml(htmltext) + ";\r\n" + scripts.join("\r\n");
             }
-            else if (/\.html?$/i.test(e.name)) {
+            else if (/\.html?$/i.test(f.name)) {
                 data = compile$wraphtml(data);
             }
             var code = compile$scanner2(String(data));
             return compile$translate.getI18nPrefixed(code);
         }
         catch (e) {
-            alert("提取出错了", "error");
-            throw e;
+            alert("提取文本时存在异常", "error");
+            console.error(e, f.path);
+            return [];
         }
     };
     var 已找到的字符串 = [];

package/package.json

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