@hailin-zheng/editor-core 1.1.4 → 1.1.6

package/index-cjs.js

@@ -6,6 +6,7 @@ var nanoid = require('nanoid');
 var moment = require('moment');
 var acor = require('acorn');
 var astring = require('astring');
+var estraverse = require('estraverse');
 var bwipjs = require('bwip-js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -30,6 +31,7 @@ function _interopNamespace(e) {
 
 var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
 var acor__namespace = /*#__PURE__*/_interopNamespace(acor);
+var estraverse__namespace = /*#__PURE__*/_interopNamespace(estraverse);
 var bwipjs__default = /*#__PURE__*/_interopDefaultLegacy(bwipjs);
 
 /**
@@ -2708,814 +2710,9 @@ class DataDecorateRenderObject extends LeafRenderObject {
     }
 }
 
-/*
-  Copyright (C) 2012-2013 Yusuke Suzuki <utatane.tea@gmail.com>
-  Copyright (C) 2012 Ariya Hidayat <ariya.hidayat@gmail.com>
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-/*jslint vars:false, bitwise:true*/
-/*jshint indent:4*/
-/*global exports:true*/
-(function clone(exports) {
-
-    var Syntax,
-        VisitorOption,
-        VisitorKeys,
-        BREAK,
-        SKIP,
-        REMOVE;
-
-    function deepCopy(obj) {
-        var ret = {}, key, val;
-        for (key in obj) {
-            if (obj.hasOwnProperty(key)) {
-                val = obj[key];
-                if (typeof val === 'object' && val !== null) {
-                    ret[key] = deepCopy(val);
-                } else {
-                    ret[key] = val;
-                }
-            }
-        }
-        return ret;
-    }
-
-    // based on LLVM libc++ upper_bound / lower_bound
-    // MIT License
-
-    function upperBound(array, func) {
-        var diff, len, i, current;
-
-        len = array.length;
-        i = 0;
-
-        while (len) {
-            diff = len >>> 1;
-            current = i + diff;
-            if (func(array[current])) {
-                len = diff;
-            } else {
-                i = current + 1;
-                len -= diff + 1;
-            }
-        }
-        return i;
-    }
-
-    Syntax = {
-        AssignmentExpression: 'AssignmentExpression',
-        AssignmentPattern: 'AssignmentPattern',
-        ArrayExpression: 'ArrayExpression',
-        ArrayPattern: 'ArrayPattern',
-        ArrowFunctionExpression: 'ArrowFunctionExpression',
-        AwaitExpression: 'AwaitExpression', // CAUTION: It's deferred to ES7.
-        BlockStatement: 'BlockStatement',
-        BinaryExpression: 'BinaryExpression',
-        BreakStatement: 'BreakStatement',
-        CallExpression: 'CallExpression',
-        CatchClause: 'CatchClause',
-        ChainExpression: 'ChainExpression',
-        ClassBody: 'ClassBody',
-        ClassDeclaration: 'ClassDeclaration',
-        ClassExpression: 'ClassExpression',
-        ComprehensionBlock: 'ComprehensionBlock',  // CAUTION: It's deferred to ES7.
-        ComprehensionExpression: 'ComprehensionExpression',  // CAUTION: It's deferred to ES7.
-        ConditionalExpression: 'ConditionalExpression',
-        ContinueStatement: 'ContinueStatement',
-        DebuggerStatement: 'DebuggerStatement',
-        DirectiveStatement: 'DirectiveStatement',
-        DoWhileStatement: 'DoWhileStatement',
-        EmptyStatement: 'EmptyStatement',
-        ExportAllDeclaration: 'ExportAllDeclaration',
-        ExportDefaultDeclaration: 'ExportDefaultDeclaration',
-        ExportNamedDeclaration: 'ExportNamedDeclaration',
-        ExportSpecifier: 'ExportSpecifier',
-        ExpressionStatement: 'ExpressionStatement',
-        ForStatement: 'ForStatement',
-        ForInStatement: 'ForInStatement',
-        ForOfStatement: 'ForOfStatement',
-        FunctionDeclaration: 'FunctionDeclaration',
-        FunctionExpression: 'FunctionExpression',
-        GeneratorExpression: 'GeneratorExpression',  // CAUTION: It's deferred to ES7.
-        Identifier: 'Identifier',
-        IfStatement: 'IfStatement',
-        ImportExpression: 'ImportExpression',
-        ImportDeclaration: 'ImportDeclaration',
-        ImportDefaultSpecifier: 'ImportDefaultSpecifier',
-        ImportNamespaceSpecifier: 'ImportNamespaceSpecifier',
-        ImportSpecifier: 'ImportSpecifier',
-        Literal: 'Literal',
-        LabeledStatement: 'LabeledStatement',
-        LogicalExpression: 'LogicalExpression',
-        MemberExpression: 'MemberExpression',
-        MetaProperty: 'MetaProperty',
-        MethodDefinition: 'MethodDefinition',
-        ModuleSpecifier: 'ModuleSpecifier',
-        NewExpression: 'NewExpression',
-        ObjectExpression: 'ObjectExpression',
-        ObjectPattern: 'ObjectPattern',
-        PrivateIdentifier: 'PrivateIdentifier',
-        Program: 'Program',
-        Property: 'Property',
-        PropertyDefinition: 'PropertyDefinition',
-        RestElement: 'RestElement',
-        ReturnStatement: 'ReturnStatement',
-        SequenceExpression: 'SequenceExpression',
-        SpreadElement: 'SpreadElement',
-        Super: 'Super',
-        SwitchStatement: 'SwitchStatement',
-        SwitchCase: 'SwitchCase',
-        TaggedTemplateExpression: 'TaggedTemplateExpression',
-        TemplateElement: 'TemplateElement',
-        TemplateLiteral: 'TemplateLiteral',
-        ThisExpression: 'ThisExpression',
-        ThrowStatement: 'ThrowStatement',
-        TryStatement: 'TryStatement',
-        UnaryExpression: 'UnaryExpression',
-        UpdateExpression: 'UpdateExpression',
-        VariableDeclaration: 'VariableDeclaration',
-        VariableDeclarator: 'VariableDeclarator',
-        WhileStatement: 'WhileStatement',
-        WithStatement: 'WithStatement',
-        YieldExpression: 'YieldExpression'
-    };
-
-    VisitorKeys = {
-        AssignmentExpression: ['left', 'right'],
-        AssignmentPattern: ['left', 'right'],
-        ArrayExpression: ['elements'],
-        ArrayPattern: ['elements'],
-        ArrowFunctionExpression: ['params', 'body'],
-        AwaitExpression: ['argument'], // CAUTION: It's deferred to ES7.
-        BlockStatement: ['body'],
-        BinaryExpression: ['left', 'right'],
-        BreakStatement: ['label'],
-        CallExpression: ['callee', 'arguments'],
-        CatchClause: ['param', 'body'],
-        ChainExpression: ['expression'],
-        ClassBody: ['body'],
-        ClassDeclaration: ['id', 'superClass', 'body'],
-        ClassExpression: ['id', 'superClass', 'body'],
-        ComprehensionBlock: ['left', 'right'],  // CAUTION: It's deferred to ES7.
-        ComprehensionExpression: ['blocks', 'filter', 'body'],  // CAUTION: It's deferred to ES7.
-        ConditionalExpression: ['test', 'consequent', 'alternate'],
-        ContinueStatement: ['label'],
-        DebuggerStatement: [],
-        DirectiveStatement: [],
-        DoWhileStatement: ['body', 'test'],
-        EmptyStatement: [],
-        ExportAllDeclaration: ['source'],
-        ExportDefaultDeclaration: ['declaration'],
-        ExportNamedDeclaration: ['declaration', 'specifiers', 'source'],
-        ExportSpecifier: ['exported', 'local'],
-        ExpressionStatement: ['expression'],
-        ForStatement: ['init', 'test', 'update', 'body'],
-        ForInStatement: ['left', 'right', 'body'],
-        ForOfStatement: ['left', 'right', 'body'],
-        FunctionDeclaration: ['id', 'params', 'body'],
-        FunctionExpression: ['id', 'params', 'body'],
-        GeneratorExpression: ['blocks', 'filter', 'body'],  // CAUTION: It's deferred to ES7.
-        Identifier: [],
-        IfStatement: ['test', 'consequent', 'alternate'],
-        ImportExpression: ['source'],
-        ImportDeclaration: ['specifiers', 'source'],
-        ImportDefaultSpecifier: ['local'],
-        ImportNamespaceSpecifier: ['local'],
-        ImportSpecifier: ['imported', 'local'],
-        Literal: [],
-        LabeledStatement: ['label', 'body'],
-        LogicalExpression: ['left', 'right'],
-        MemberExpression: ['object', 'property'],
-        MetaProperty: ['meta', 'property'],
-        MethodDefinition: ['key', 'value'],
-        ModuleSpecifier: [],
-        NewExpression: ['callee', 'arguments'],
-        ObjectExpression: ['properties'],
-        ObjectPattern: ['properties'],
-        PrivateIdentifier: [],
-        Program: ['body'],
-        Property: ['key', 'value'],
-        PropertyDefinition: ['key', 'value'],
-        RestElement: [ 'argument' ],
-        ReturnStatement: ['argument'],
-        SequenceExpression: ['expressions'],
-        SpreadElement: ['argument'],
-        Super: [],
-        SwitchStatement: ['discriminant', 'cases'],
-        SwitchCase: ['test', 'consequent'],
-        TaggedTemplateExpression: ['tag', 'quasi'],
-        TemplateElement: [],
-        TemplateLiteral: ['quasis', 'expressions'],
-        ThisExpression: [],
-        ThrowStatement: ['argument'],
-        TryStatement: ['block', 'handler', 'finalizer'],
-        UnaryExpression: ['argument'],
-        UpdateExpression: ['argument'],
-        VariableDeclaration: ['declarations'],
-        VariableDeclarator: ['id', 'init'],
-        WhileStatement: ['test', 'body'],
-        WithStatement: ['object', 'body'],
-        YieldExpression: ['argument']
-    };
-
-    // unique id
-    BREAK = {};
-    SKIP = {};
-    REMOVE = {};
-
-    VisitorOption = {
-        Break: BREAK,
-        Skip: SKIP,
-        Remove: REMOVE
-    };
-
-    function Reference(parent, key) {
-        this.parent = parent;
-        this.key = key;
-    }
-
-    Reference.prototype.replace = function replace(node) {
-        this.parent[this.key] = node;
-    };
-
-    Reference.prototype.remove = function remove() {
-        if (Array.isArray(this.parent)) {
-            this.parent.splice(this.key, 1);
-            return true;
-        } else {
-            this.replace(null);
-            return false;
-        }
-    };
-
-    function Element(node, path, wrap, ref) {
-        this.node = node;
-        this.path = path;
-        this.wrap = wrap;
-        this.ref = ref;
-    }
-
-    function Controller() { }
-
-    // API:
-    // return property path array from root to current node
-    Controller.prototype.path = function path() {
-        var i, iz, j, jz, result, element;
-
-        function addToPath(result, path) {
-            if (Array.isArray(path)) {
-                for (j = 0, jz = path.length; j < jz; ++j) {
-                    result.push(path[j]);
-                }
-            } else {
-                result.push(path);
-            }
-        }
-
-        // root node
-        if (!this.__current.path) {
-            return null;
-        }
-
-        // first node is sentinel, second node is root element
-        result = [];
-        for (i = 2, iz = this.__leavelist.length; i < iz; ++i) {
-            element = this.__leavelist[i];
-            addToPath(result, element.path);
-        }
-        addToPath(result, this.__current.path);
-        return result;
-    };
-
-    // API:
-    // return type of current node
-    Controller.prototype.type = function () {
-        var node = this.current();
-        return node.type || this.__current.wrap;
-    };
-
-    // API:
-    // return array of parent elements
-    Controller.prototype.parents = function parents() {
-        var i, iz, result;
-
-        // first node is sentinel
-        result = [];
-        for (i = 1, iz = this.__leavelist.length; i < iz; ++i) {
-            result.push(this.__leavelist[i].node);
-        }
-
-        return result;
-    };
-
-    // API:
-    // return current node
-    Controller.prototype.current = function current() {
-        return this.__current.node;
-    };
-
-    Controller.prototype.__execute = function __execute(callback, element) {
-        var previous, result;
-
-        result = undefined;
-
-        previous  = this.__current;
-        this.__current = element;
-        this.__state = null;
-        if (callback) {
-            result = callback.call(this, element.node, this.__leavelist[this.__leavelist.length - 1].node);
-        }
-        this.__current = previous;
-
-        return result;
-    };
-
-    // API:
-    // notify control skip / break
-    Controller.prototype.notify = function notify(flag) {
-        this.__state = flag;
-    };
-
-    // API:
-    // skip child nodes of current node
-    Controller.prototype.skip = function () {
-        this.notify(SKIP);
-    };
-
-    // API:
-    // break traversals
-    Controller.prototype['break'] = function () {
-        this.notify(BREAK);
-    };
-
-    // API:
-    // remove node
-    Controller.prototype.remove = function () {
-        this.notify(REMOVE);
-    };
-
-    Controller.prototype.__initialize = function(root, visitor) {
-        this.visitor = visitor;
-        this.root = root;
-        this.__worklist = [];
-        this.__leavelist = [];
-        this.__current = null;
-        this.__state = null;
-        this.__fallback = null;
-        if (visitor.fallback === 'iteration') {
-            this.__fallback = Object.keys;
-        } else if (typeof visitor.fallback === 'function') {
-            this.__fallback = visitor.fallback;
-        }
-
-        this.__keys = VisitorKeys;
-        if (visitor.keys) {
-            this.__keys = Object.assign(Object.create(this.__keys), visitor.keys);
-        }
-    };
-
-    function isNode(node) {
-        if (node == null) {
-            return false;
-        }
-        return typeof node === 'object' && typeof node.type === 'string';
-    }
-
-    function isProperty(nodeType, key) {
-        return (nodeType === Syntax.ObjectExpression || nodeType === Syntax.ObjectPattern) && 'properties' === key;
-    }
-  
-    function candidateExistsInLeaveList(leavelist, candidate) {
-        for (var i = leavelist.length - 1; i >= 0; --i) {
-            if (leavelist[i].node === candidate) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    Controller.prototype.traverse = function traverse(root, visitor) {
-        var worklist,
-            leavelist,
-            element,
-            node,
-            nodeType,
-            ret,
-            key,
-            current,
-            current2,
-            candidates,
-            candidate,
-            sentinel;
-
-        this.__initialize(root, visitor);
-
-        sentinel = {};
-
-        // reference
-        worklist = this.__worklist;
-        leavelist = this.__leavelist;
-
-        // initialize
-        worklist.push(new Element(root, null, null, null));
-        leavelist.push(new Element(null, null, null, null));
-
-        while (worklist.length) {
-            element = worklist.pop();
-
-            if (element === sentinel) {
-                element = leavelist.pop();
-
-                ret = this.__execute(visitor.leave, element);
-
-                if (this.__state === BREAK || ret === BREAK) {
-                    return;
-                }
-                continue;
-            }
-
-            if (element.node) {
-
-                ret = this.__execute(visitor.enter, element);
-
-                if (this.__state === BREAK || ret === BREAK) {
-                    return;
-                }
-
-                worklist.push(sentinel);
-                leavelist.push(element);
-
-                if (this.__state === SKIP || ret === SKIP) {
-                    continue;
-                }
-
-                node = element.node;
-                nodeType = node.type || element.wrap;
-                candidates = this.__keys[nodeType];
-                if (!candidates) {
-                    if (this.__fallback) {
-                        candidates = this.__fallback(node);
-                    } else {
-                        throw new Error('Unknown node type ' + nodeType + '.');
-                    }
-                }
-
-                current = candidates.length;
-                while ((current -= 1) >= 0) {
-                    key = candidates[current];
-                    candidate = node[key];
-                    if (!candidate) {
-                        continue;
-                    }
-
-                    if (Array.isArray(candidate)) {
-                        current2 = candidate.length;
-                        while ((current2 -= 1) >= 0) {
-                            if (!candidate[current2]) {
-                                continue;
-                            }
-
-                            if (candidateExistsInLeaveList(leavelist, candidate[current2])) {
-                              continue;
-                            }
-
-                            if (isProperty(nodeType, candidates[current])) {
-                                element = new Element(candidate[current2], [key, current2], 'Property', null);
-                            } else if (isNode(candidate[current2])) {
-                                element = new Element(candidate[current2], [key, current2], null, null);
-                            } else {
-                                continue;
-                            }
-                            worklist.push(element);
-                        }
-                    } else if (isNode(candidate)) {
-                        if (candidateExistsInLeaveList(leavelist, candidate)) {
-                          continue;
-                        }
-
-                        worklist.push(new Element(candidate, key, null, null));
-                    }
-                }
-            }
-        }
-    };
-
-    Controller.prototype.replace = function replace(root, visitor) {
-        var worklist,
-            leavelist,
-            node,
-            nodeType,
-            target,
-            element,
-            current,
-            current2,
-            candidates,
-            candidate,
-            sentinel,
-            outer,
-            key;
-
-        function removeElem(element) {
-            var i,
-                key,
-                nextElem,
-                parent;
-
-            if (element.ref.remove()) {
-                // When the reference is an element of an array.
-                key = element.ref.key;
-                parent = element.ref.parent;
-
-                // If removed from array, then decrease following items' keys.
-                i = worklist.length;
-                while (i--) {
-                    nextElem = worklist[i];
-                    if (nextElem.ref && nextElem.ref.parent === parent) {
-                        if  (nextElem.ref.key < key) {
-                            break;
-                        }
-                        --nextElem.ref.key;
-                    }
-                }
-            }
-        }
-
-        this.__initialize(root, visitor);
-
-        sentinel = {};
-
-        // reference
-        worklist = this.__worklist;
-        leavelist = this.__leavelist;
-
-        // initialize
-        outer = {
-            root: root
-        };
-        element = new Element(root, null, null, new Reference(outer, 'root'));
-        worklist.push(element);
-        leavelist.push(element);
-
-        while (worklist.length) {
-            element = worklist.pop();
-
-            if (element === sentinel) {
-                element = leavelist.pop();
-
-                target = this.__execute(visitor.leave, element);
-
-                // node may be replaced with null,
-                // so distinguish between undefined and null in this place
-                if (target !== undefined && target !== BREAK && target !== SKIP && target !== REMOVE) {
-                    // replace
-                    element.ref.replace(target);
-                }
-
-                if (this.__state === REMOVE || target === REMOVE) {
-                    removeElem(element);
-                }
-
-                if (this.__state === BREAK || target === BREAK) {
-                    return outer.root;
-                }
-                continue;
-            }
-
-            target = this.__execute(visitor.enter, element);
-
-            // node may be replaced with null,
-            // so distinguish between undefined and null in this place
-            if (target !== undefined && target !== BREAK && target !== SKIP && target !== REMOVE) {
-                // replace
-                element.ref.replace(target);
-                element.node = target;
-            }
-
-            if (this.__state === REMOVE || target === REMOVE) {
-                removeElem(element);
-                element.node = null;
-            }
-
-            if (this.__state === BREAK || target === BREAK) {
-                return outer.root;
-            }
-
-            // node may be null
-            node = element.node;
-            if (!node) {
-                continue;
-            }
-
-            worklist.push(sentinel);
-            leavelist.push(element);
-
-            if (this.__state === SKIP || target === SKIP) {
-                continue;
-            }
-
-            nodeType = node.type || element.wrap;
-            candidates = this.__keys[nodeType];
-            if (!candidates) {
-                if (this.__fallback) {
-                    candidates = this.__fallback(node);
-                } else {
-                    throw new Error('Unknown node type ' + nodeType + '.');
-                }
-            }
-
-            current = candidates.length;
-            while ((current -= 1) >= 0) {
-                key = candidates[current];
-                candidate = node[key];
-                if (!candidate) {
-                    continue;
-                }
-
-                if (Array.isArray(candidate)) {
-                    current2 = candidate.length;
-                    while ((current2 -= 1) >= 0) {
-                        if (!candidate[current2]) {
-                            continue;
-                        }
-                        if (isProperty(nodeType, candidates[current])) {
-                            element = new Element(candidate[current2], [key, current2], 'Property', new Reference(candidate, current2));
-                        } else if (isNode(candidate[current2])) {
-                            element = new Element(candidate[current2], [key, current2], null, new Reference(candidate, current2));
-                        } else {
-                            continue;
-                        }
-                        worklist.push(element);
-                    }
-                } else if (isNode(candidate)) {
-                    worklist.push(new Element(candidate, key, null, new Reference(node, key)));
-                }
-            }
-        }
-
-        return outer.root;
-    };
-
-    function traverse(root, visitor) {
-        var controller = new Controller();
-        return controller.traverse(root, visitor);
-    }
-
-    function replace(root, visitor) {
-        var controller = new Controller();
-        return controller.replace(root, visitor);
-    }
-
-    function extendCommentRange(comment, tokens) {
-        var target;
-
-        target = upperBound(tokens, function search(token) {
-            return token.range[0] > comment.range[0];
-        });
-
-        comment.extendedRange = [comment.range[0], comment.range[1]];
-
-        if (target !== tokens.length) {
-            comment.extendedRange[1] = tokens[target].range[0];
-        }
-
-        target -= 1;
-        if (target >= 0) {
-            comment.extendedRange[0] = tokens[target].range[1];
-        }
-
-        return comment;
-    }
-
-    function attachComments(tree, providedComments, tokens) {
-        // At first, we should calculate extended comment ranges.
-        var comments = [], comment, len, i, cursor;
-
-        if (!tree.range) {
-            throw new Error('attachComments needs range information');
-        }
-
-        // tokens array is empty, we attach comments to tree as 'leadingComments'
-        if (!tokens.length) {
-            if (providedComments.length) {
-                for (i = 0, len = providedComments.length; i < len; i += 1) {
-                    comment = deepCopy(providedComments[i]);
-                    comment.extendedRange = [0, tree.range[0]];
-                    comments.push(comment);
-                }
-                tree.leadingComments = comments;
-            }
-            return tree;
-        }
-
-        for (i = 0, len = providedComments.length; i < len; i += 1) {
-            comments.push(extendCommentRange(deepCopy(providedComments[i]), tokens));
-        }
-
-        // This is based on John Freeman's implementation.
-        cursor = 0;
-        traverse(tree, {
-            enter: function (node) {
-                var comment;
-
-                while (cursor < comments.length) {
-                    comment = comments[cursor];
-                    if (comment.extendedRange[1] > node.range[0]) {
-                        break;
-                    }
-
-                    if (comment.extendedRange[1] === node.range[0]) {
-                        if (!node.leadingComments) {
-                            node.leadingComments = [];
-                        }
-                        node.leadingComments.push(comment);
-                        comments.splice(cursor, 1);
-                    } else {
-                        cursor += 1;
-                    }
-                }
-
-                // already out of owned node
-                if (cursor === comments.length) {
-                    return VisitorOption.Break;
-                }
-
-                if (comments[cursor].extendedRange[0] > node.range[1]) {
-                    return VisitorOption.Skip;
-                }
-            }
-        });
-
-        cursor = 0;
-        traverse(tree, {
-            leave: function (node) {
-                var comment;
-
-                while (cursor < comments.length) {
-                    comment = comments[cursor];
-                    if (node.range[1] < comment.extendedRange[0]) {
-                        break;
-                    }
-
-                    if (node.range[1] === comment.extendedRange[0]) {
-                        if (!node.trailingComments) {
-                            node.trailingComments = [];
-                        }
-                        node.trailingComments.push(comment);
-                        comments.splice(cursor, 1);
-                    } else {
-                        cursor += 1;
-                    }
-                }
-
-                // already out of owned node
-                if (cursor === comments.length) {
-                    return VisitorOption.Break;
-                }
-
-                if (comments[cursor].extendedRange[0] > node.range[1]) {
-                    return VisitorOption.Skip;
-                }
-            }
-        });
-
-        return tree;
-    }
-
-    exports.Syntax = Syntax;
-    exports.traverse = traverse;
-    exports.replace = replace;
-    exports.attachComments = attachComments;
-    exports.VisitorKeys = VisitorKeys;
-    exports.VisitorOption = VisitorOption;
-    exports.Controller = Controller;
-    exports.cloneEnvironment = function () { return clone({}); };
-
-    return exports;
-}(exports));
-/* vim: set sw=4 ts=4 et tw=80 : */
-
 function parser(code) {
     const node = acor__namespace.parse(code, { ecmaVersion: 'latest' });
-    undefined(node, {
+    estraverse__namespace.traverse(node, {
         enter: (child, parent) => {
             if (child.type === 'Identifier') {
                 const identifierName = child['name'];
@@ -3525,7 +2722,7 @@ function parser(code) {
             }
         }
     });
-    undefined(node, {
+    estraverse__namespace.replace(node, {
         leave: (child) => {
             //函数调用
             if (child.type == 'CallExpression') {
@@ -5064,7 +4261,6 @@ class TableUtil {
         if (!ss.startControl) {
             return;
         }
-        ss.clear();
         const startCell = ElementUtil.getParentByType(ss.startControl, TableCellElement);
         if (!startCell?.parent) {
             throw new Error('parent is null');
@@ -5075,6 +4271,7 @@ class TableUtil {
         if (tb.length === 0) {
             tb.remove();
         }
+        ss.clear();
     }
     /**
      * 移除光标所在的当前列
@@ -11996,6 +11193,7 @@ class ParagraphMeasure {
      */
     measureParagraph(p, limitWidth) {
         ElementUtil.fixParagraphContent(p);
+        this.verifyPara(p, limitWidth);
         p.cacheRender = null;
         const paraModels = [];
         let currRenderLine;
@@ -12116,6 +11314,17 @@ class ParagraphMeasure {
         }
         return paraRenders;
     }
+    /**
+     * 校验当前段落属性
+     */
+    verifyPara(p, limitWidth) {
+        if (p.props.indent > 0 && p.props.indent + 20 > limitWidth) {
+            p.props.indent = limitWidth - 20;
+        }
+        if (p.props.hanging > 0 && p.props.hanging + 20 > limitWidth) {
+            p.props.hanging = limitWidth - 20;
+        }
+    }
     /**
      * 获取段落行布局横向坐标起始位置，被段落text-align影响
      */
@@ -17952,6 +17161,10 @@ var ModifyFlag;
 class NodeCore {
     enableClip = true;
     pointEvent = true;
+    allowHitTest = false;
+    hitTest(hitPos, currPos) {
+        return false;
+    }
     get enable() {
         return this._enable;
     }
@@ -18281,6 +17494,9 @@ class NodeItems extends NodeCore {
     eventMap = new WeakMap();
     absoluteItems = false;
     containerPropName;
+    constructor() {
+        super();
+    }
     addChild(control, index = -1) {
         if (this.containerPropName) {
             this[this.containerPropName].addChild(control, index);
@@ -18352,6 +17568,33 @@ class NodeItems extends NodeCore {
         return this.controls.length;
     }
 }
+/**
+ * 子内容采用绝对定位的容器
+ */
+class AbsolutePanel extends NodeItems {
+    constructor() {
+        super();
+        this.absoluteItems = true;
+    }
+    measureOverride(e, availableSize) {
+        this.controls.forEach(item => {
+            item.measure(e, availableSize);
+        });
+        return super.measureOverride(e, availableSize);
+    }
+    arrangeOverride(e, finalSize) {
+        this.controls.forEach(item => {
+            const itemRect = {
+                x: item.x,
+                y: item.y,
+                width: item.desiredSize.width,
+                height: item.desiredSize.height
+            };
+            item.arrange(e, itemRect);
+        });
+        return super.arrangeOverride(e, finalSize);
+    }
+}
 let currentActiveAppContext = null;
 function getCurrentActiveAppContext() {
     return currentActiveAppContext;
@@ -18469,7 +17712,7 @@ function drawBorderline(node, renderCtx) {
     if (!node.border) {
         return;
     }
-    let { x, y, finalRect: { width, height } } = node;
+    let { finalRect: { x, y, width, height } } = node;
     const ctx = renderCtx.ctx;
     ctx.save();
     ctx.fillStyle = node.borderColor;
@@ -19033,7 +18276,7 @@ class NodeEvent {
         };
         mouseleaveRenders.forEach(item => {
             onMouseoutEvent.target = item;
-            invokeEvent(onMouseoutEvent, 'mouseleave', item, false);
+            invokeEvent(onMouseoutEvent, 'mouseout', item, false);
         });
         const onMouseoverEvent = {
             pos: this.appState.pos,
@@ -19199,7 +18442,8 @@ class NodeEvent {
             width: width,
             height: height
         };
-        if (isInsideRectByPosition(currRect, hitPos)) {
+        const hitTest = node.allowHitTest ? node.hitTest(hitPos, currRect) : isInsideRectByPosition(currRect, hitPos);
+        if (hitTest) {
             //有边框和内边距，所以在计算子节点的时候，需要考虑
             const innerPos = {
                 x: currRect.x + node.border + node.padding,
@@ -19361,6 +18605,13 @@ class ViewPaint {
             this.drawHoriLine(x, y, width, textProps.color, 1);
         }
     }
+    drawText2(text, textProps, x, y) {
+        this.ctx.save();
+        this.ctx.fillStyle = textProps.color;
+        this.ctx.font = `${textProps.fontSize}px ${textProps.fontName}`;
+        this.ctx.fillText(text, x, y + textProps.fontSize / 7);
+        this.ctx.restore();
+    }
     fillCircular(x, y, r, color = 'black') {
         this.ctx.save();
         this.ctx.beginPath();
@@ -19375,6 +18626,10 @@ class ViewPaint {
         const textMeasure = this.ctx.measureText(text);
         return { width: textMeasure.width, height: textProps.fontSize };
     }
+    measureText2(text, font) {
+        this.ctx.font = font.fontSize + 'px ' + font.fontName;
+        return this.ctx.measureText(text).width;
+    }
     measureTextUnits(units, textProps) {
         this.ctx.font = textProps.getFont();
         const letterSpace = textProps.letterSpace ?? 0;
@@ -19791,6 +19046,11 @@ class SurfaceView extends NodeItems {
  * 如果有默认宽度限制，而且支持换行显示，则内容高度等于多行累计高度
  */
 class LabelNode extends TextBase {
+    constructor() {
+        super();
+        this.border = 1;
+        this.borderColor = '#000';
+    }
     _textWrapping = 'no';
     get textWrapping() {
         return this._textWrapping;
@@ -19800,34 +19060,54 @@ class LabelNode extends TextBase {
         this._textWrapping = value;
     }
     cacheTextRect;
-    textUnits;
+    //private textUnits!: Array<TextUnits>;
+    lines = [];
     measureOverride(e, availableSize) {
-        const textProps = this.getTextProps();
-        this.textUnits = this.text.split('').map(char => ({ char, actualSize: 0, sourceSize: 0 }));
-        e.render.measureTextUnits(this.textUnits, textProps);
+        this.getTextProps();
+        this.lines = this.getMuiltLines(this.text, e);
+        // this.textUnits = this.text.split('').map<TextUnits>(char => ({char, actualSize: 0, sourceSize: 0}));
+        // e.render.measureTextUnits(this.textUnits, textProps);
         //没有宽度限制，测量横向排列的尺寸大小，此时不需要考虑换行
-        if (Number.isNaN(this._width)) {
-            return {
-                width: this.textUnits.reduce((prev, curr) => {
-                    return prev + curr.sourceSize;
-                }, 0), height: this.fontSize
-            };
-        }
-        if (this._textWrapping === 'no') {
-            return { width: this.getPercentWidth(availableSize.width), height: this.fontSize };
-        }
-        return this.measureTextRect(this.textUnits, {
+        // if (Number.isNaN(this._width)) {
+        //     // return {
+        //     //     width: this.lines[0].textUnits.reduce((prev, curr) => {
+        //     //         return prev + curr.sourceSize
+        //     //     }, 0), height: this.fontSize
+        //     // };
+        //     return this.measureTextRect(this.lines, {
+        //         width: availableSize.width,
+        //         height: this.getPercentHeight(availableSize.height)
+        //     });
+        // }
+        // if (this._textWrapping === 'no') {
+        //     return {width: this.getPercentWidth(availableSize.width), height: this.fontSize};
+        // }
+        return this.measureTextRect(this.lines, {
             width: availableSize.width,
             height: this.getPercentHeight(availableSize.height)
         });
     }
-    arrangeOverride(e, finalSize) {
-        if (!Number.isNaN(this._width) && this._textWrapping === 'wrap') {
-            this.measureTextRect(this.textUnits, {
-                width: finalSize.width,
-                height: finalSize.height
-            });
+    getMuiltLines(text, e) {
+        const lineRects = [];
+        const lines = this.text.split('\r\n');
+        for (let i = 0; i < lines.length; i++) {
+            const units = lines[i].split('').map(char => ({ char, actualSize: 0, sourceSize: 0 }));
+            e.render.measureTextUnits(units, this.getTextProps());
+            lineRects.push({ textUnits: units });
         }
+        return lineRects;
+    }
+    arrangeOverride(e, finalSize) {
+        // if (!Number.isNaN(this._width) && this._textWrapping === 'wrap') {
+        //     this.measureTextRect(this.lines, {
+        //         width: finalSize.width,
+        //         height: finalSize.height
+        //     });
+        // }
+        this.measureTextRect(this.lines, {
+            width: finalSize.width,
+            height: finalSize.height
+        });
         return super.arrangeOverride(e, finalSize);
     }
     getTextProps() {
@@ -19837,54 +19117,56 @@ class LabelNode extends TextBase {
         textProps.color = this.color ?? '#000';
         return textProps;
     }
-    measureTextRect(textUnits, availableSize, final = false) {
-        const sumWidth = textUnits.reduce((prev, curr) => {
-            return curr.sourceSize + prev;
-        }, 0);
+    measureTextRect(lines, availableSize, final = false) {
         //总宽度大于可用宽度，换行计算
         const cacheLines = [];
         const { width: limitWidth, height: limitHeight } = availableSize;
-        let line = { lineUnits: [], x: 0, y: 0, width: 0, height: 0 };
-        cacheLines.push(line);
-        for (let i = 0; i < textUnits.length; i++) {
-            const unit = textUnits[i];
-            //至少每行一个字符
-            if (line.lineUnits.length > 0 && line.width + unit.sourceSize > limitWidth) {
-                line = { lineUnits: [], x: 0, y: 0, width: 0, height: 0 };
-                cacheLines.push(line);
-            }
-            line.lineUnits.push(unit);
-            line.width += unit.sourceSize;
-            line.height = this.fontSize;
+        for (let i = 0; i < lines.length; i++) {
+            const lineText = lines[i];
+            let line = { lineUnits: [], x: 0, y: 0, width: 0, height: 0 };
+            cacheLines.push(line);
+            for (let j = 0; j < lineText.textUnits.length; j++) {
+                const unit = lineText.textUnits[j];
+                //至少每行一个字符
+                if (line.lineUnits.length > 0 && line.width + unit.sourceSize > limitWidth) {
+                    line = { lineUnits: [], x: 0, y: 0, width: 0, height: 0 };
+                    cacheLines.push(line);
+                }
+                line.lineUnits.push(unit);
+                line.width += unit.sourceSize;
+                line.height = this.fontSize;
+            }
         }
         let contentHeight = 0;
+        let maxLineWidth = 0;
         cacheLines.forEach(line => {
             line.y = contentHeight;
             contentHeight += line.height;
+            maxLineWidth = Math.max(line.width, maxLineWidth);
         });
         //期望高度
         let desiredHeight = final ? limitHeight : contentHeight;
         this.cacheTextRect = {
             lines: cacheLines,
-            width: sumWidth,
+            width: maxLineWidth,
             height: contentHeight,
             desiredHeight,
             desiredWidth: limitWidth
         };
         return {
-            width: limitWidth,
+            width: maxLineWidth,
             height: desiredHeight
         };
     }
     render(e) {
-        const textProp = new TextProps();
-        textProp.fontName = this.fontName;
-        textProp.fontSize = this.fontSize;
-        textProp.color = this.color;
-        if (this.textWrapping === 'no' || Number.isNaN(this._width)) {
-            e.render.drawText(this.text, textProp, 0, 0, this.finalRect.width, textProp.fontSize);
-            return;
-        }
+        // const textProp = new TextProps();
+        // textProp.fontName = this.fontName;
+        // textProp.fontSize = this.fontSize;
+        // textProp.color = this.color;
+        // if (this.textWrapping === 'no' || Number.isNaN(this._width)) {
+        //     e.render.drawText(this.text, textProp, 0, 0, this.finalRect.width, textProp.fontSize);
+        //     return;
+        // }
         for (let i = 0; i < this.cacheTextRect.lines.length; i++) {
             const line = this.cacheTextRect.lines[i];
             this.drawLine(e, line);
@@ -19900,7 +19182,7 @@ class LabelNode extends TextBase {
         render.tran(() => {
             const textProps = this.getTextProps();
             render.ctx.font = textProps.getFont();
-            render.drawText(line.lineUnits.join(''), textProps, 0, line.y, line.width, line.height);
+            render.drawText(line.lineUnits.map(item => item.char).join(''), textProps, 0, line.y, line.width, line.height);
         });
     }
 }
@@ -20150,8 +19432,8 @@ class ScrollView extends NodeItems {
         });
         this.addEventListener('wheel', evt => {
             const { deltaY, deltaX } = evt;
-            this.horBar.updateScrollByCurrent(deltaX / 10, deltaY / 10);
-            this.verBar.updateScrollByCurrent(deltaX / 10, deltaY / 10);
+            this.horBar.updateScrollByCurrent(deltaX, deltaY);
+            this.verBar.updateScrollByCurrent(deltaX, deltaY);
         });
     }
     scrollTo(x, y) {
@@ -20870,7 +20152,7 @@ function pointInPoly(pt, poly) {
  * 1.在单页模式下，文档最小宽度为单个文档宽度+合适的外边距
  * 2.在多页模式下，文档最小宽度为单个文档宽度+合适的外边距
  */
-class CanvasTextEditor extends NodeItems {
+class CanvasTextEditor extends AbsolutePanel {
     editCanvas;
     editInput;
     contentCtx;
@@ -21797,6 +21079,13 @@ class CanvasTextEditor extends NodeItems {
         const win = new Window();
         win.width = 1000;
         win.height = 800;
+        //win.content.addChild(timelineScrollbar)
+        const rule2 = new RuleControl(this.docCtx);
+        this.rule = rule2;
+        rule2.width = 700;
+        rule2.height = 30;
+        rule2.x = 20;
+        rule2.y = 500;
         const surface = new SurfaceView(this.editCanvas, this.editInput);
         this.surfaceView = surface;
         surface.width = 1000;
@@ -21808,12 +21097,6 @@ class CanvasTextEditor extends NodeItems {
             this.resetViewer();
         });
         surface.addChild(scrollView);
-        const rule2 = new RuleControl(this.docCtx);
-        this.rule = rule2;
-        rule2.width = 700;
-        rule2.height = 30;
-        rule2.x = 20;
-        rule2.y = 500;
         surface.addChild(rule2);
         //surface.addChild(win);
         surface.start();
@@ -21888,24 +21171,6 @@ class CanvasTextEditor extends NodeItems {
             appCtx.root.setInputPosition(caretPos);
         }
     }
-    measureOverride(e, availableSize) {
-        this.controls.forEach(item => {
-            item.measure(e, availableSize);
-        });
-        return super.measureOverride(e, availableSize);
-    }
-    arrangeOverride(e, finalSize) {
-        this.controls.forEach(item => {
-            const itemRect = {
-                x: item.x,
-                y: item.y,
-                width: item.desiredSize.width,
-                height: item.desiredSize.height
-            };
-            item.arrange(e, itemRect);
-        });
-        return super.arrangeOverride(e, finalSize);
-    }
 }
 
 /**