bobe 0.0.41 → 0.0.43

package/dist/bobe.esm.js

@@ -1,4 +1,4 @@
-import { Queue, isNum, matchIdStart2, matchId, jsVarRegexp } from 'bobe-shared';
+import { Queue, isNum, matchIdStart2, matchId, escapeMap, jsVarRegexp, date32 } from 'bobe-shared';
 import { getPulling, setPulling, Keys, Computed, Effect, toRaw, runWithPulling, Scope, deepSignal, Store, shareSignal, effect } from 'aoye';
 export * from 'aoye';
 
@@ -225,7 +225,7 @@ class Tokenizer {
     if (!this.token) return false;
     return this.token.type & TokenType.Identifier && this.token.value === Tokenizer.EofId;
   }
-  setToken(type, value) {
+  setToken(type, value, dt = 1) {
     this.token = {
       type,
       typeName: TokenType[type],
@@ -328,23 +328,19 @@ class Tokenizer {
   condExp() {
     let value = '';
     this.token = null;
-    try {
-      if (this.code[this.i] === '\n') {
-        this.setToken(TokenType.Identifier, true);
-        return this.token;
-      }
-      while (this.code[this.i + 1] !== '\n') {
-        value += this.code[this.i];
-        this.next();
+    let char = this.code[this.i];
+    while (char !== '\n') {
+      if (char === '"' || char === "'") {
+        value += char + this.getStr(char);
       }
       value += this.code[this.i];
-      const trimmed = value.replace(/\/\/[\s\S]+/, '').trim();
-      this.setToken(TokenType.Identifier, trimmed ? trimmed : true);
-      return this.token;
-    } finally {
       this.next();
-      this.handledTokens.push(this.token);
+      char = this.code[this.i];
     }
+    const trimmed = value.replace(/\/\/[\s\S]+/, '').trim();
+    this.setToken(TokenType.Identifier, trimmed ? trimmed : true, 0);
+    this.handledTokens.push(this.token);
+    return this.token;
   }
   isEol(i) {
     return this.code[i] === '\n' || this.code[i] === '/';
@@ -352,25 +348,18 @@ class Tokenizer {
   jsExp() {
     this.token = null;
     let value = '';
-    try {
-      const char = this.code[this.i];
-      if (char === ';' || char === '\n') {
-        this.setToken(TokenType.Identifier, value);
-        return this.token;
-      }
-      let nextC = this.code[this.i + 1];
-      while (nextC !== ';' && nextC !== '\n') {
-        value += this.code[this.i];
-        this.next();
-        nextC = this.code[this.i + 1];
+    let char = this.code[this.i];
+    while (char !== ';' && char !== '\n') {
+      if (char === '"' || char === "'") {
+        value += char + this.getStr(char);
       }
       value += this.code[this.i];
-      this.setToken(TokenType.Identifier, value);
-      return this.token;
-    } finally {
       this.next();
-      this.handledTokens.push(this.token);
+      char = this.code[this.i];
     }
+    this.setToken(TokenType.Identifier, value, 0);
+    this.handledTokens.push(this.token);
+    return this.token;
   }
   peekChar() {
     let i = this.i;
@@ -428,10 +417,8 @@ class Tokenizer {
       startLine = this.line,
       startCol = this.preCol;
     let inComment,
-      inString,
       count = 0,
-      value = '',
-      backslashCount = 0;
+      value = '';
     while (1) {
       const char = this.code[this.i];
       if (char === undefined) {
@@ -444,11 +431,6 @@ class Tokenizer {
         inComment = null;
         value += this.code[this.i];
         this.next();
-      } else if (inString) {
-        if (char === inString && backslashCount % 2 === 0) {
-          inString = null;
-        }
-        backslashCount = char === '\\' ? backslashCount + 1 : 0;
       } else {
         if (char === '/' && nextChar === '/') {
           inComment = 'single';
@@ -458,15 +440,15 @@ class Tokenizer {
           inComment = 'multi';
           value += this.code[this.i];
           this.next();
-        } else if (char === "'" || char === '"' || char === '`') {
-          inString = char;
+        } else if (char === "'" || char === '"') {
+          value += char + this.getStr(char);
         } else if (char === '{') {
           count++;
         } else if (char === '}') {
           count--;
         }
       }
-      if (count === 0 && inString == null && inComment == null) {
+      if (count === 0 && inComment == null) {
         return value.slice(1);
       }
       value += this.code[this.i];
@@ -662,7 +644,7 @@ class Tokenizer {
     }
     this.setToken(tokenType, realValue);
   }
-  str(char) {
+  getStr(head, parseEscape = true) {
     const startOffset = this.preI,
       startLine = this.line,
       startCol = this.preCol;
@@ -681,11 +663,20 @@ class Tokenizer {
         continuousBackslashCount = 0;
       }
       this.next();
-      if (nextC === char && memoCount % 2 === 0) {
+      if (nextC === head && memoCount % 2 === 0) {
         break;
       }
-      value += nextC;
+      const mapped = escapeMap[nextC];
+      if (parseEscape && mapped) {
+        value += mapped;
+      } else {
+        value += nextC;
+      }
     }
+    return value;
+  }
+  str(char) {
+    const value = this.getStr(char, false);
     this.setToken(TokenType.String, value);
   }
   number(char) {
@@ -1125,7 +1116,7 @@ class Compiler {
   }
   parseLoopNode(node) {
     const forLoc = this.tokenizer.token.loc ?? this.tokenizer.emptyLoc();
-    this.tokenizer.nextToken();
+    this.tokenizer.jsExp();
     const collection = this.parseJsExp();
     if (!collection.value && collection.value !== 0) {
       this.addError(ParseErrorCode.MISSING_FOR_COLLECTION, '"for" 缺少集合表达式', forLoc, node);
@@ -1586,7 +1577,7 @@ class Interpreter {
     return _node;
   }
   forDeclaration() {
-    const arrExp = this.tokenizer.nextToken().value;
+    const arrExp = this.tokenizer.jsExp().value;
     this.tokenizer.nextToken();
     const itemToken = this.tokenizer.nextToken();
     const isDestruct = itemToken.type === TokenType.InsertionExp;
@@ -1917,16 +1908,20 @@ class Interpreter {
   }
   onePropParsed(data, node, key, value, valueIsMapKey, isFn, hookI) {
     if (isFn) {
-      this.setProp(node, key, value, hookI);
+      new Scope(() => {
+        return this.setProp(node, key, value, hookI);
+      }).get();
     } else if (typeof value === 'function') {
       new Effect(() => {
-        const res = value();
-        this.setProp(node, key, res, hookI);
+        const res = value(data);
+        const dispose = this.setProp(node, key, res, hookI);
+        return dispose;
       });
     } else if (valueIsMapKey) {
       new Effect(() => {
         const res = data[value];
-        this.setProp(node, key, res, hookI);
+        const dispose = this.setProp(node, key, res, hookI);
+        return dispose;
       });
     } else {
       this.setProp(node, key, value, hookI);
@@ -1951,7 +1946,7 @@ class Interpreter {
       realBefore: null,
       realAfter: null,
       data: child,
-      tokenizer: render ? render(true) : child['ui'](true)
+      tokenizer: render ? render(true) : child.ui(true)
     };
     this.onePropParsed = (data, _, key, value, valueIsMapKey, isFn, hookI) => {
       if (isFn) {
@@ -1962,7 +1957,7 @@ class Interpreter {
         const meta = child[Keys.Meta];
         const cells = meta.cells;
         if (typeof value === 'function') {
-          const computed = new Computed(value);
+          const computed = new Computed(() => value(data));
           cells.set(key, computed);
           child[Keys.Raw][key] = undefined;
         } else {
@@ -1979,6 +1974,10 @@ class Interpreter {
   getFn(data, expression) {
     return new Function('data', `let v;with(data){v=${expression}};return v;`).bind(undefined, data);
   }
+  getAssignFn(data, expression) {
+    const valueId = `value_bobe_${date32()}`;
+    return new Function('data', valueId, `with(data){${expression}=${valueId}};`).bind(undefined, data);
+  }
   condDeclaration(ctx) {
     const prevSibling = ctx.prevSibling;
     const keyWord = this.tokenizer.token;
@@ -2132,7 +2131,27 @@ class Interpreter {
           hookI = _this$tokenizer$_hook4[2];
         const rawVal = data[Keys.Raw][value];
         const isFn = typeof rawVal === 'function';
-        if (hookType === 'dynamic') {
+        if (key === 'ref') {
+          const valueIsMapKey = Reflect.has(data[Keys.Raw], value);
+          let refValue = _node;
+          if (_node.__logicType === FakeType.Component) {
+            refValue = _node.data;
+          } else {
+            refValue[Keys.ProxyFreeObject] = true;
+          }
+          if (valueIsMapKey) {
+            data[value] = refValue;
+            new Scope(() => () => {
+              data[value] = null;
+            }).get();
+          } else {
+            const fn = this.getAssignFn(data, value);
+            fn(refValue);
+            new Scope(() => () => {
+              fn(null);
+            }).get();
+          }
+        } else if (hookType === 'dynamic') {
           const valueIsMapKey = Reflect.has(data[Keys.Raw], value);
           const fn = isFn ? rawVal : valueIsMapKey ? value : this.getFn(data, value);
           this.onePropParsed(data, _node, key, fn, valueIsMapKey, isFn, hookI);
@@ -2217,7 +2236,7 @@ function bobe(fragments, ...values) {
 function customRender(option) {
   return function render(Ctor, root) {
     const store = Ctor.new();
-    const tokenizer = store['ui'](false);
+    const tokenizer = store.ui(false);
     const terp = new Interpreter(tokenizer);
     terp.config(option);
     const componentNode = {