bobe 0.0.41 → 0.0.43

package/dist/index.d.ts

@@ -49,6 +49,7 @@ declare class Interpreter {
     oneRealPropParsed: Interpreter['onePropParsed'];
     componentOrFragmentDeclaration(ComponentOrRender: BobeUI | typeof Store, ctx: ProgramCtx): ComponentNode$1;
     getFn(data: any, expression: string | number): any;
+    getAssignFn(data: any, expression: string | number): any;
     condDeclaration(ctx: ProgramCtx): IfNode;
     removeLogicNode(node: LogicNode): void;
     /**
@@ -89,7 +90,7 @@ declare class Interpreter {
     defaultInsert(parent: any, node: any, prev: any): void;
     remove(node: any, parent?: any, prev?: any): void;
     defaultRemove(node: any, parent: any, prevSibling: any): void;
-    setProp(node: any, key: string, value: any, hookI?: number): void;
+    setProp(node: any, key: string, value: any, hookI?: number): void | undefined | (() => void);
 }
 
 interface StackNode<T> {
@@ -347,6 +348,7 @@ declare class Tokenizer {
     private dent;
     private shorterThanBaseDentEof;
     private identifier;
+    private getStr;
     private str;
     private number;
     private eof;

package/dist/index.umd.js

@@ -227,7 +227,7 @@
       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],
@@ -330,23 +330,19 @@
     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] === '/';
@@ -354,25 +350,18 @@
     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;
@@ -430,10 +419,8 @@
         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) {
@@ -446,11 +433,6 @@
           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';
@@ -460,15 +442,15 @@
             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];
@@ -664,7 +646,7 @@
       }
       this.setToken(tokenType, realValue);
     }
-    str(char) {
+    getStr(head, parseEscape = true) {
       const startOffset = this.preI,
         startLine = this.line,
         startCol = this.preCol;
@@ -683,11 +665,20 @@
           continuousBackslashCount = 0;
         }
         this.next();
-        if (nextC === char && memoCount % 2 === 0) {
+        if (nextC === head && memoCount % 2 === 0) {
           break;
         }
-        value += nextC;
+        const mapped = bobeShared.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) {
@@ -1127,7 +1118,7 @@
     }
     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);
@@ -1588,7 +1579,7 @@
       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;
@@ -1919,16 +1910,20 @@
     }
     onePropParsed(data, node, key, value, valueIsMapKey, isFn, hookI) {
       if (isFn) {
-        this.setProp(node, key, value, hookI);
+        new aoye.Scope(() => {
+          return this.setProp(node, key, value, hookI);
+        }).get();
       } else if (typeof value === 'function') {
         new aoye.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 aoye.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);
@@ -1953,7 +1948,7 @@
         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) {
@@ -1964,7 +1959,7 @@
           const meta = child[aoye.Keys.Meta];
           const cells = meta.cells;
           if (typeof value === 'function') {
-            const computed = new aoye.Computed(value);
+            const computed = new aoye.Computed(() => value(data));
             cells.set(key, computed);
             child[aoye.Keys.Raw][key] = undefined;
           } else {
@@ -1981,6 +1976,10 @@
     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_${bobeShared.date32()}`;
+      return new Function('data', valueId, `with(data){${expression}=${valueId}};`).bind(undefined, data);
+    }
     condDeclaration(ctx) {
       const prevSibling = ctx.prevSibling;
       const keyWord = this.tokenizer.token;
@@ -2134,7 +2133,27 @@
             hookI = _this$tokenizer$_hook4[2];
           const rawVal = data[aoye.Keys.Raw][value];
           const isFn = typeof rawVal === 'function';
-          if (hookType === 'dynamic') {
+          if (key === 'ref') {
+            const valueIsMapKey = Reflect.has(data[aoye.Keys.Raw], value);
+            let refValue = _node;
+            if (_node.__logicType === FakeType.Component) {
+              refValue = _node.data;
+            } else {
+              refValue[aoye.Keys.ProxyFreeObject] = true;
+            }
+            if (valueIsMapKey) {
+              data[value] = refValue;
+              new aoye.Scope(() => () => {
+                data[value] = null;
+              }).get();
+            } else {
+              const fn = this.getAssignFn(data, value);
+              fn(refValue);
+              new aoye.Scope(() => () => {
+                fn(null);
+              }).get();
+            }
+          } else if (hookType === 'dynamic') {
             const valueIsMapKey = Reflect.has(data[aoye.Keys.Raw], value);
             const fn = isFn ? rawVal : valueIsMapKey ? value : this.getFn(data, value);
             this.onePropParsed(data, _node, key, fn, valueIsMapKey, isFn, hookI);
@@ -2219,7 +2238,7 @@
   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 = {