pdf-creator-node 2.3.4 → 2.3.5

package/example/node_modules/uglify-js/lib/mozilla-ast.js

@@ -1,7 +1,7 @@
 /***********************************************************************
 
   A JavaScript tokenizer / parser / beautifier / compressor.
-  https://github.com/mishoo/UglifyJS2
+  https://github.com/mishoo/UglifyJS
 
   -------------------------------- (C) ---------------------------------
 
@@ -44,53 +44,174 @@
 "use strict";
 
 (function() {
-    function normalize_directives(body) {
-        var in_directive = true;
-        for (var i = 0; i < body.length; i++) {
-            if (in_directive && body[i] instanceof AST_Statement && body[i].body instanceof AST_String) {
-                body[i] = new AST_Directive({
-                    start: body[i].start,
-                    end: body[i].end,
-                    value: body[i].body.value
-                });
-            } else if (in_directive && !(body[i] instanceof AST_Statement && body[i].body instanceof AST_String)) {
-                in_directive = false;
-            }
-        }
-        return body;
-    }
-
     var MOZ_TO_ME = {
         Program: function(M) {
             return new AST_Toplevel({
                 start: my_start_token(M),
                 end: my_end_token(M),
-                body: normalize_directives(M.body.map(from_moz))
+                body: normalize_directives(M.body.map(from_moz)),
             });
         },
+        ArrowFunctionExpression: function(M) {
+            var argnames = [], rest = null;
+            M.params.forEach(function(param) {
+                if (param.type == "RestElement") {
+                    rest = from_moz(param.argument);
+                } else {
+                    argnames.push(from_moz(param));
+                }
+            });
+            var fn = new (M.async ? AST_AsyncArrow : AST_Arrow)({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                argnames: argnames,
+                rest: rest,
+            });
+            var node = from_moz(M.body);
+            if (node instanceof AST_BlockStatement) {
+                fn.body = normalize_directives(node.body);
+                fn.value = null;
+            } else {
+                fn.body = [];
+                fn.value = node;
+            }
+            return fn;
+        },
         FunctionDeclaration: function(M) {
-            return new AST_Defun({
+            var ctor;
+            if (M.async) {
+                ctor = M.generator ? AST_AsyncGeneratorDefun : AST_AsyncDefun;
+            } else {
+                ctor = M.generator ? AST_GeneratorDefun : AST_Defun;
+            }
+            var argnames = [], rest = null;
+            M.params.forEach(function(param) {
+                if (param.type == "RestElement") {
+                    rest = from_moz(param.argument);
+                } else {
+                    argnames.push(from_moz(param));
+                }
+            });
+            return new ctor({
                 start: my_start_token(M),
                 end: my_end_token(M),
                 name: from_moz(M.id),
-                argnames: M.params.map(from_moz),
-                body: normalize_directives(from_moz(M.body).body)
+                argnames: argnames,
+                rest: rest,
+                body: normalize_directives(from_moz(M.body).body),
             });
         },
         FunctionExpression: function(M) {
-            return new AST_Function({
+            var ctor;
+            if (M.async) {
+                ctor = M.generator ? AST_AsyncGeneratorFunction : AST_AsyncFunction;
+            } else {
+                ctor = M.generator ? AST_GeneratorFunction : AST_Function;
+            }
+            var argnames = [], rest = null;
+            M.params.forEach(function(param) {
+                if (param.type == "RestElement") {
+                    rest = from_moz(param.argument);
+                } else {
+                    argnames.push(from_moz(param));
+                }
+            });
+            return new ctor({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                name: from_moz(M.id),
+                argnames: argnames,
+                rest: rest,
+                body: normalize_directives(from_moz(M.body).body),
+            });
+        },
+        ClassDeclaration: function(M) {
+            return new AST_DefClass({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                name: from_moz(M.id),
+                extends: from_moz(M.superClass),
+                properties: M.body.body.map(from_moz),
+            });
+        },
+        ClassExpression: function(M) {
+            return new AST_ClassExpression({
                 start: my_start_token(M),
                 end: my_end_token(M),
                 name: from_moz(M.id),
-                argnames: M.params.map(from_moz),
-                body: normalize_directives(from_moz(M.body).body)
+                extends: from_moz(M.superClass),
+                properties: M.body.body.map(from_moz),
+            });
+        },
+        MethodDefinition: function(M) {
+            var key = M.key, internal = false;
+            if (M.computed) {
+                key = from_moz(key);
+            } else if (key.type == "PrivateIdentifier") {
+                internal = true;
+                key = "#" + key.name;
+            } else {
+                key = read_name(key);
+            }
+            var ctor = AST_ClassMethod, value = from_moz(M.value);
+            switch (M.kind) {
+              case "get":
+                ctor = AST_ClassGetter;
+                value = new AST_Accessor(value);
+                break;
+              case "set":
+                ctor = AST_ClassSetter;
+                value = new AST_Accessor(value);
+                break;
+            }
+            return new ctor({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                key: key,
+                private: internal,
+                static: M.static,
+                value: value,
+            });
+        },
+        PropertyDefinition: function(M) {
+            var key = M.key, internal = false;
+            if (M.computed) {
+                key = from_moz(key);
+            } else if (key.type == "PrivateIdentifier") {
+                internal = true;
+                key = "#" + key.name;
+            } else {
+                key = read_name(key);
+            }
+            return new AST_ClassField({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                key: key,
+                private: internal,
+                static: M.static,
+                value: from_moz(M.value),
+            });
+        },
+        StaticBlock: function(M) {
+            var start = my_start_token(M);
+            var end = my_end_token(M);
+            return new AST_ClassInit({
+                start: start,
+                end: end,
+                value: new AST_ClassInitBlock({
+                    start: start,
+                    end: end,
+                    body: normalize_directives(M.body.map(from_moz)),
+                }),
             });
         },
-        ExpressionStatement: function(M) {
-            return new AST_SimpleStatement({
+        ForOfStatement: function(M) {
+            return new (M.await ? AST_ForAwaitOf : AST_ForOf)({
                 start: my_start_token(M),
                 end: my_end_token(M),
-                body: from_moz(M.expression)
+                init: from_moz(M.left),
+                object: from_moz(M.right),
+                body: from_moz(M.body),
             });
         },
         TryStatement: function(M) {
@@ -103,57 +224,87 @@
                 end      : my_end_token(M),
                 body     : from_moz(M.block).body,
                 bcatch   : from_moz(handlers[0]),
-                bfinally : M.finalizer ? new AST_Finally(from_moz(M.finalizer)) : null
+                bfinally : M.finalizer ? new AST_Finally(from_moz(M.finalizer)) : null,
             });
         },
         Property: function(M) {
-            var key = M.key;
+            var key = M.computed ? from_moz(M.key) : read_name(M.key);
             var args = {
-                start    : my_start_token(key),
-                end      : my_end_token(M.value),
-                key      : key.type == "Identifier" ? key.name : key.value,
-                value    : from_moz(M.value)
+                start: my_start_token(M),
+                end: my_end_token(M),
+                key: key,
+                value: from_moz(M.value),
             };
-            if (M.kind == "init") return new AST_ObjectKeyVal(args);
-            args.key = new AST_SymbolAccessor({
-                name: args.key
-            });
+            if (M.kind == "init") return new (M.method ? AST_ObjectMethod : AST_ObjectKeyVal)(args);
             args.value = new AST_Accessor(args.value);
             if (M.kind == "get") return new AST_ObjectGetter(args);
             if (M.kind == "set") return new AST_ObjectSetter(args);
         },
         ArrayExpression: function(M) {
             return new AST_Array({
-                start    : my_start_token(M),
-                end      : my_end_token(M),
-                elements : M.elements.map(function(elem) {
+                start: my_start_token(M),
+                end: my_end_token(M),
+                elements: M.elements.map(function(elem) {
                     return elem === null ? new AST_Hole() : from_moz(elem);
-                })
+                }),
             });
         },
-        ObjectExpression: function(M) {
-            return new AST_Object({
-                start      : my_start_token(M),
-                end        : my_end_token(M),
-                properties : M.properties.map(function(prop) {
-                    prop.type = "Property";
-                    return from_moz(prop)
-                })
+        ArrayPattern: function(M) {
+            var elements = [], rest = null;
+            M.elements.forEach(function(el) {
+                if (el === null) {
+                    elements.push(new AST_Hole());
+                } else if (el.type == "RestElement") {
+                    rest = from_moz(el.argument);
+                } else {
+                    elements.push(from_moz(el));
+                }
+            });
+            return new AST_DestructuredArray({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                elements: elements,
+                rest: rest,
             });
         },
-        SequenceExpression: function(M) {
-            return new AST_Sequence({
-                start      : my_start_token(M),
-                end        : my_end_token(M),
-                expressions: M.expressions.map(from_moz)
+        ObjectPattern: function(M) {
+            var props = [], rest = null;
+            M.properties.forEach(function(prop) {
+                if (prop.type == "RestElement") {
+                    rest = from_moz(prop.argument);
+                } else {
+                    props.push(new AST_DestructuredKeyVal(from_moz(prop)));
+                }
+            });
+            return new AST_DestructuredObject({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                properties: props,
+                rest: rest,
             });
         },
         MemberExpression: function(M) {
             return new (M.computed ? AST_Sub : AST_Dot)({
-                start      : my_start_token(M),
-                end        : my_end_token(M),
-                property   : M.computed ? from_moz(M.property) : M.property.name,
-                expression : from_moz(M.object)
+                start: my_start_token(M),
+                end: my_end_token(M),
+                optional: M.optional,
+                expression: from_moz(M.object),
+                property: M.computed ? from_moz(M.property) : M.property.name,
+            });
+        },
+        MetaProperty: function(M) {
+            var expr = from_moz(M.meta);
+            var prop = read_name(M.property);
+            if (expr.name == "new" && prop == "target") return new AST_NewTarget({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                name: "new.target",
+            });
+            return new AST_Dot({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                expression: expr,
+                property: prop,
             });
         },
         SwitchCase: function(M) {
@@ -161,21 +312,156 @@
                 start      : my_start_token(M),
                 end        : my_end_token(M),
                 expression : from_moz(M.test),
-                body       : M.consequent.map(from_moz)
+                body       : M.consequent.map(from_moz),
+            });
+        },
+        ExportAllDeclaration: function(M) {
+            var start = my_start_token(M);
+            var end = my_end_token(M);
+            return new AST_ExportForeign({
+                start: start,
+                end: end,
+                aliases: [ M.exported ? from_moz_alias(M.exported) : new AST_String({
+                    start: start,
+                    value: "*",
+                    end: end,
+                }) ],
+                keys: [ new AST_String({
+                    start: start,
+                    value: "*",
+                    end: end,
+                }) ],
+                path: from_moz(M.source),
+            });
+        },
+        ExportDefaultDeclaration: function(M) {
+            var decl = from_moz(M.declaration);
+            if (!decl.name) switch (decl.CTOR) {
+              case AST_AsyncDefun:
+                decl = new AST_AsyncFunction(decl);
+                break;
+              case AST_AsyncGeneratorDefun:
+                decl = new AST_AsyncGeneratorFunction(decl);
+                break;
+              case AST_DefClass:
+                decl = new AST_ClassExpression(decl);
+                break;
+              case AST_Defun:
+                decl = new AST_Function(decl);
+                break;
+              case AST_GeneratorDefun:
+                decl = new AST_GeneratorFunction(decl);
+                break;
+            }
+            return new AST_ExportDefault({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                body: decl,
+            });
+        },
+        ExportNamedDeclaration: function(M) {
+            if (M.declaration) return new AST_ExportDeclaration({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                body: from_moz(M.declaration),
+            });
+            if (M.source) {
+                var aliases = [], keys = [];
+                M.specifiers.forEach(function(prop) {
+                    aliases.push(from_moz_alias(prop.exported));
+                    keys.push(from_moz_alias(prop.local));
+                });
+                return new AST_ExportForeign({
+                    start: my_start_token(M),
+                    end: my_end_token(M),
+                    aliases: aliases,
+                    keys: keys,
+                    path: from_moz(M.source),
+                });
+            }
+            return new AST_ExportReferences({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                properties: M.specifiers.map(function(prop) {
+                    var sym = new AST_SymbolExport(from_moz(prop.local));
+                    sym.alias = from_moz_alias(prop.exported);
+                    return sym;
+                }),
+            });
+        },
+        ImportDeclaration: function(M) {
+            var start = my_start_token(M);
+            var end = my_end_token(M);
+            var all = null, def = null, props = null;
+            M.specifiers.forEach(function(prop) {
+                var sym = new AST_SymbolImport(from_moz(prop.local));
+                switch (prop.type) {
+                  case "ImportDefaultSpecifier":
+                    def = sym;
+                    def.key = new AST_String({
+                        start: start,
+                        value: "",
+                        end: end,
+                    });
+                    break;
+                  case "ImportNamespaceSpecifier":
+                    all = sym;
+                    all.key = new AST_String({
+                        start: start,
+                        value: "*",
+                        end: end,
+                    });
+                    break;
+                  default:
+                    sym.key = from_moz_alias(prop.imported);
+                    if (!props) props = [];
+                    props.push(sym);
+                    break;
+                }
+            });
+            return new AST_Import({
+                start: start,
+                end: end,
+                all: all,
+                default: def,
+                properties: props,
+                path: from_moz(M.source),
+            });
+        },
+        ImportExpression: function(M) {
+            var start = my_start_token(M);
+            var arg = from_moz(M.source);
+            return new AST_Call({
+                start: start,
+                end: my_end_token(M),
+                expression: new AST_SymbolRef({
+                    start: start,
+                    end: arg.start,
+                    name: "import",
+                }),
+                args: [ arg ],
             });
         },
         VariableDeclaration: function(M) {
-            return new AST_Var({
-                start       : my_start_token(M),
-                end         : my_end_token(M),
-                definitions : M.declarations.map(from_moz)
+            return new ({
+                const: AST_Const,
+                let: AST_Let,
+            }[M.kind] || AST_Var)({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                definitions: M.declarations.map(from_moz),
             });
         },
         Literal: function(M) {
-            var val = M.value, args = {
-                start  : my_start_token(M),
-                end    : my_end_token(M)
+            var args = {
+                start: my_start_token(M),
+                end: my_end_token(M),
             };
+            if (M.bigint) {
+                args.value = M.bigint.toLowerCase() + "n";
+                return new AST_BigInt(args);
+            }
+            var val = M.value;
             if (val === null) return new AST_Null(args);
             var rx = M.regex;
             if (rx && rx.pattern) {
@@ -193,26 +479,119 @@
                 args.value = val;
                 return new AST_String(args);
               case "number":
-                args.value = val;
-                return new AST_Number(args);
+                if (isNaN(val)) return new AST_NaN(args);
+                var negate, node;
+                if (isFinite(val)) {
+                    negate = 1 / val < 0;
+                    args.value = negate ? -val : val;
+                    node = new AST_Number(args);
+                } else {
+                    negate = val < 0;
+                    node = new AST_Infinity(args);
+                }
+                return negate ? new AST_UnaryPrefix({
+                    start: args.start,
+                    end: args.end,
+                    operator: "-",
+                    expression: node,
+                }) : node;
               case "boolean":
                 return new (val ? AST_True : AST_False)(args);
             }
         },
+        TemplateLiteral: function(M) {
+            return new AST_Template({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                expressions: M.expressions.map(from_moz),
+                strings: M.quasis.map(function(el) {
+                    return el.value.raw;
+                }),
+            });
+        },
+        TaggedTemplateExpression: function(M) {
+            var tmpl = from_moz(M.quasi);
+            tmpl.start = my_start_token(M);
+            tmpl.end = my_end_token(M);
+            tmpl.tag = from_moz(M.tag);
+            return tmpl;
+        },
         Identifier: function(M) {
-            var p = FROM_MOZ_STACK[FROM_MOZ_STACK.length - 2];
-            return new (  p.type == "LabeledStatement" ? AST_Label
-                        : p.type == "VariableDeclarator" && p.id === M ? AST_SymbolVar
-                        : p.type == "FunctionExpression" ? (p.id === M ? AST_SymbolLambda : AST_SymbolFunarg)
-                        : p.type == "FunctionDeclaration" ? (p.id === M ? AST_SymbolDefun : AST_SymbolFunarg)
-                        : p.type == "CatchClause" ? AST_SymbolCatch
-                        : p.type == "BreakStatement" || p.type == "ContinueStatement" ? AST_LabelRef
-                        : AST_SymbolRef)({
-                            start : my_start_token(M),
-                            end   : my_end_token(M),
-                            name  : M.name
-                        });
-        }
+            var p, level = FROM_MOZ_STACK.length - 1;
+            do {
+                p = FROM_MOZ_STACK[--level];
+            } while (p.type == "ArrayPattern"
+                || p.type == "AssignmentPattern" && p.left === FROM_MOZ_STACK[level + 1]
+                || p.type == "ObjectPattern"
+                || p.type == "Property" && p.value === FROM_MOZ_STACK[level + 1]
+                || p.type == "VariableDeclarator" && p.id === FROM_MOZ_STACK[level + 1]);
+            var ctor = AST_SymbolRef;
+            switch (p.type) {
+              case "ArrowFunctionExpression":
+                if (p.body !== FROM_MOZ_STACK[level + 1]) ctor = AST_SymbolFunarg;
+                break;
+              case "BreakStatement":
+              case "ContinueStatement":
+                ctor = AST_LabelRef;
+                break;
+              case "CatchClause":
+                ctor = AST_SymbolCatch;
+                break;
+              case "ClassDeclaration":
+                if (p.id === FROM_MOZ_STACK[level + 1]) ctor = AST_SymbolDefClass;
+                break;
+              case "ClassExpression":
+                if (p.id === FROM_MOZ_STACK[level + 1]) ctor = AST_SymbolClass;
+                break;
+              case "FunctionDeclaration":
+                ctor = p.id === FROM_MOZ_STACK[level + 1] ? AST_SymbolDefun : AST_SymbolFunarg;
+                break;
+              case "FunctionExpression":
+                ctor = p.id === FROM_MOZ_STACK[level + 1] ? AST_SymbolLambda : AST_SymbolFunarg;
+                break;
+              case "LabeledStatement":
+                ctor = AST_Label;
+                break;
+              case "VariableDeclaration":
+                ctor = {
+                    const: AST_SymbolConst,
+                    let: AST_SymbolLet,
+                }[p.kind] || AST_SymbolVar;
+                break;
+            }
+            return new ctor({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                name: M.name,
+            });
+        },
+        Super: function(M) {
+            return new AST_Super({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                name: "super",
+            });
+        },
+        ThisExpression: function(M) {
+            return new AST_This({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                name: "this",
+            });
+        },
+        ParenthesizedExpression: function(M) {
+            var node = from_moz(M.expression);
+            if (!node.start.parens) node.start.parens = [];
+            node.start.parens.push(my_start_token(M));
+            if (!node.end.parens) node.end.parens = [];
+            node.end.parens.push(my_end_token(M));
+            return node;
+        },
+        ChainExpression: function(M) {
+            var node = from_moz(M.expression);
+            node.terminal = true;
+            return node;
+        },
     };
 
     MOZ_TO_ME.UpdateExpression =
@@ -228,6 +607,7 @@
     };
 
     map("EmptyStatement", AST_EmptyStatement);
+    map("ExpressionStatement", AST_SimpleStatement, "expression>body");
     map("BlockStatement", AST_BlockStatement, "body@body");
     map("IfStatement", AST_If, "test>condition, consequent>body, alternate>alternative");
     map("LabeledStatement", AST_LabeledStatement, "label>label, body>body");
@@ -245,50 +625,152 @@
     map("VariableDeclarator", AST_VarDef, "id>name, init>value");
     map("CatchClause", AST_Catch, "param>argname, body%body");
 
-    map("ThisExpression", AST_This);
     map("BinaryExpression", AST_Binary, "operator=operator, left>left, right>right");
     map("LogicalExpression", AST_Binary, "operator=operator, left>left, right>right");
     map("AssignmentExpression", AST_Assign, "operator=operator, left>left, right>right");
+    map("AssignmentPattern", AST_DefaultValue, "left>name, right>value");
     map("ConditionalExpression", AST_Conditional, "test>condition, consequent>consequent, alternate>alternative");
-    map("NewExpression", AST_New, "callee>expression, arguments@args");
-    map("CallExpression", AST_Call, "callee>expression, arguments@args");
+    map("NewExpression", AST_New, "callee>expression, arguments@args, pure=pure");
+    map("CallExpression", AST_Call, "callee>expression, arguments@args, optional=optional, pure=pure");
+    map("SequenceExpression", AST_Sequence, "expressions@expressions");
+    map("SpreadElement", AST_Spread, "argument>expression");
+    map("ObjectExpression", AST_Object, "properties@properties");
+    map("AwaitExpression", AST_Await, "argument>expression");
+    map("YieldExpression", AST_Yield, "argument>expression, delegate=nested");
 
     def_to_moz(AST_Toplevel, function To_Moz_Program(M) {
         return to_moz_scope("Program", M);
     });
 
-    def_to_moz(AST_Defun, function To_Moz_FunctionDeclaration(M) {
+    def_to_moz(AST_LambdaDefinition, function To_Moz_FunctionDeclaration(M) {
+        var params = M.argnames.map(to_moz);
+        if (M.rest) params.push({
+            type: "RestElement",
+            argument: to_moz(M.rest),
+        });
         return {
             type: "FunctionDeclaration",
             id: to_moz(M.name),
-            params: M.argnames.map(to_moz),
-            body: to_moz_scope("BlockStatement", M)
-        }
+            async: is_async(M),
+            generator: is_generator(M),
+            params: params,
+            body: to_moz_scope("BlockStatement", M),
+        };
     });
 
-    def_to_moz(AST_Function, function To_Moz_FunctionExpression(M) {
+    def_to_moz(AST_Lambda, function To_Moz_FunctionExpression(M) {
+        var params = M.argnames.map(to_moz);
+        if (M.rest) params.push({
+            type: "RestElement",
+            argument: to_moz(M.rest),
+        });
+        if (is_arrow(M)) return {
+            type: "ArrowFunctionExpression",
+            async: is_async(M),
+            params: params,
+            body: M.value ? to_moz(M.value) : to_moz_scope("BlockStatement", M),
+        };
         return {
             type: "FunctionExpression",
             id: to_moz(M.name),
-            params: M.argnames.map(to_moz),
-            body: to_moz_scope("BlockStatement", M)
-        }
+            async: is_async(M),
+            generator: is_generator(M),
+            params: params,
+            body: to_moz_scope("BlockStatement", M),
+        };
     });
 
-    def_to_moz(AST_Directive, function To_Moz_Directive(M) {
+    def_to_moz(AST_DefClass, function To_Moz_ClassDeclaration(M) {
         return {
-            type: "ExpressionStatement",
-            expression: {
+            type: "ClassDeclaration",
+            id: to_moz(M.name),
+            superClass: to_moz(M.extends),
+            body: {
+                type: "ClassBody",
+                body: M.properties.map(to_moz),
+            },
+        };
+    });
+
+    def_to_moz(AST_ClassExpression, function To_Moz_ClassExpression(M) {
+        return {
+            type: "ClassExpression",
+            id: to_moz(M.name),
+            superClass: to_moz(M.extends),
+            body: {
+                type: "ClassBody",
+                body: M.properties.map(to_moz),
+            },
+        };
+    });
+
+    function To_Moz_MethodDefinition(kind) {
+        return function(M) {
+            var computed = M.key instanceof AST_Node;
+            var key = computed ? to_moz(M.key) : M.private ? {
+                type: "PrivateIdentifier",
+                name: M.key.slice(1),
+            } : {
                 type: "Literal",
-                value: M.value
-            }
+                value: M.key,
+            };
+            return {
+                type: "MethodDefinition",
+                kind: kind,
+                computed: computed,
+                key: key,
+                static: M.static,
+                value: to_moz(M.value),
+            };
+        };
+    }
+    def_to_moz(AST_ClassGetter, To_Moz_MethodDefinition("get"));
+    def_to_moz(AST_ClassSetter, To_Moz_MethodDefinition("set"));
+    def_to_moz(AST_ClassMethod, To_Moz_MethodDefinition("method"));
+
+    def_to_moz(AST_ClassField, function To_Moz_PropertyDefinition(M) {
+        var computed = M.key instanceof AST_Node;
+        var key = computed ? to_moz(M.key) : M.private ? {
+            type: "PrivateIdentifier",
+            name: M.key.slice(1),
+        } : {
+            type: "Literal",
+            value: M.key,
+        };
+        return {
+            type: "PropertyDefinition",
+            computed: computed,
+            key: key,
+            static: M.static,
+            value: to_moz(M.value),
         };
     });
 
-    def_to_moz(AST_SimpleStatement, function To_Moz_ExpressionStatement(M) {
+    def_to_moz(AST_ClassInit, function To_Moz_StaticBlock(M) {
+        return to_moz_scope("StaticBlock", M.value);
+    });
+
+    function To_Moz_ForOfStatement(is_await) {
+        return function(M) {
+            return {
+                type: "ForOfStatement",
+                await: is_await,
+                left: to_moz(M.init),
+                right: to_moz(M.object),
+                body: to_moz(M.body),
+            };
+        };
+    }
+    def_to_moz(AST_ForAwaitOf, To_Moz_ForOfStatement(true));
+    def_to_moz(AST_ForOf, To_Moz_ForOfStatement(false));
+
+    def_to_moz(AST_Directive, function To_Moz_Directive(M) {
         return {
             type: "ExpressionStatement",
-            expression: to_moz(M.body)
+            expression: set_moz_loc(M, {
+                type: "Literal",
+                value: M.value,
+            }),
         };
     });
 
@@ -296,7 +778,7 @@
         return {
             type: "SwitchCase",
             test: to_moz(M.expression),
-            consequent: M.body.map(to_moz)
+            consequent: M.body.map(to_moz),
         };
     });
 
@@ -306,7 +788,7 @@
             block: to_moz_block(M),
             handler: to_moz(M.bcatch),
             guardedHandlers: [],
-            finalizer: to_moz(M.bfinally)
+            finalizer: to_moz(M.bfinally),
         };
     });
 
@@ -315,33 +797,114 @@
             type: "CatchClause",
             param: to_moz(M.argname),
             guard: null,
-            body: to_moz_block(M)
+            body: to_moz_block(M),
         };
     });
 
-    def_to_moz(AST_Definitions, function To_Moz_VariableDeclaration(M) {
+    def_to_moz(AST_ExportDeclaration, function To_Moz_ExportNamedDeclaration_declaration(M) {
         return {
-            type: "VariableDeclaration",
-            kind: "var",
-            declarations: M.definitions.map(to_moz)
+            type: "ExportNamedDeclaration",
+            declaration: to_moz(M.body),
         };
     });
 
-    def_to_moz(AST_Sequence, function To_Moz_SequenceExpression(M) {
+    def_to_moz(AST_ExportDefault, function To_Moz_ExportDefaultDeclaration(M) {
         return {
-            type: "SequenceExpression",
-            expressions: M.expressions.map(to_moz)
+            type: "ExportDefaultDeclaration",
+            declaration: to_moz(M.body),
         };
     });
 
-    def_to_moz(AST_PropAccess, function To_Moz_MemberExpression(M) {
-        var isComputed = M instanceof AST_Sub;
+    def_to_moz(AST_ExportForeign, function To_Moz_ExportAllDeclaration_ExportNamedDeclaration(M) {
+        if (M.keys[0].value == "*") return {
+            type: "ExportAllDeclaration",
+            exported: M.aliases[0].value == "*" ? null : to_moz_alias(M.aliases[0]),
+            source: to_moz(M.path),
+        };
+        var specifiers = [];
+        for (var i = 0; i < M.aliases.length; i++) {
+            specifiers.push(set_moz_loc({
+                start: M.keys[i].start,
+                end: M.aliases[i].end,
+            }, {
+                type: "ExportSpecifier",
+                local: to_moz_alias(M.keys[i]),
+                exported: to_moz_alias(M.aliases[i]),
+            }));
+        }
+        return {
+            type: "ExportNamedDeclaration",
+            specifiers: specifiers,
+            source: to_moz(M.path),
+        };
+    });
+
+    def_to_moz(AST_ExportReferences, function To_Moz_ExportNamedDeclaration_specifiers(M) {
+        return {
+            type: "ExportNamedDeclaration",
+            specifiers: M.properties.map(function(prop) {
+                return set_moz_loc({
+                    start: prop.start,
+                    end: prop.alias.end,
+                }, {
+                    type: "ExportSpecifier",
+                    local: to_moz(prop),
+                    exported: to_moz_alias(prop.alias),
+                });
+            }),
+        };
+    });
+
+    def_to_moz(AST_Import, function To_Moz_ImportDeclaration(M) {
+        var specifiers = M.properties ? M.properties.map(function(prop) {
+            return set_moz_loc({
+                start: prop.key.start,
+                end: prop.end,
+            }, {
+                type: "ImportSpecifier",
+                local: to_moz(prop),
+                imported: to_moz_alias(prop.key),
+            });
+        }) : [];
+        if (M.all) specifiers.unshift(set_moz_loc(M.all, {
+            type: "ImportNamespaceSpecifier",
+            local: to_moz(M.all),
+        }));
+        if (M.default) specifiers.unshift(set_moz_loc(M.default, {
+            type: "ImportDefaultSpecifier",
+            local: to_moz(M.default),
+        }));
+        return {
+            type: "ImportDeclaration",
+            specifiers: specifiers,
+            source: to_moz(M.path),
+        };
+    });
+
+    def_to_moz(AST_Definitions, function To_Moz_VariableDeclaration(M) {
         return {
+            type: "VariableDeclaration",
+            kind: M.TYPE.toLowerCase(),
+            declarations: M.definitions.map(to_moz),
+        };
+    });
+
+    def_to_moz(AST_PropAccess, function To_Moz_MemberExpression(M) {
+        var computed = M instanceof AST_Sub;
+        var expr = {
             type: "MemberExpression",
             object: to_moz(M.expression),
-            computed: isComputed,
-            property: isComputed ? to_moz(M.property) : {type: "Identifier", name: M.property}
+            computed: computed,
+            optional: M.optional,
+            property: computed ? to_moz(M.property) : {
+                type: "Identifier",
+                name: M.property,
+            },
         };
+        return M.terminal ? {
+            type: "ChainExpression",
+            expression: expr,
+        } : expr;
     });
 
     def_to_moz(AST_Unary, function To_Moz_Unary(M) {
@@ -365,37 +928,70 @@
     def_to_moz(AST_Array, function To_Moz_ArrayExpression(M) {
         return {
             type: "ArrayExpression",
-            elements: M.elements.map(to_moz)
+            elements: M.elements.map(to_moz),
+        };
+    });
+
+    def_to_moz(AST_DestructuredArray, function To_Moz_ArrayPattern(M) {
+        var elements = M.elements.map(to_moz);
+        if (M.rest) elements.push({
+            type: "RestElement",
+            argument: to_moz(M.rest),
+        });
+        return {
+            type: "ArrayPattern",
+            elements: elements,
+        };
+    });
+
+    def_to_moz(AST_DestructuredKeyVal, function To_Moz_Property(M) {
+        var computed = M.key instanceof AST_Node;
+        var key = computed ? to_moz(M.key) : {
+            type: "Literal",
+            value: M.key,
+        };
+        return {
+            type: "Property",
+            kind: "init",
+            computed: computed,
+            key: key,
+            value: to_moz(M.value),
         };
     });
 
-    def_to_moz(AST_Object, function To_Moz_ObjectExpression(M) {
+    def_to_moz(AST_DestructuredObject, function To_Moz_ObjectPattern(M) {
+        var props = M.properties.map(to_moz);
+        if (M.rest) props.push({
+            type: "RestElement",
+            argument: to_moz(M.rest),
+        });
         return {
-            type: "ObjectExpression",
-            properties: M.properties.map(to_moz)
+            type: "ObjectPattern",
+            properties: props,
         };
     });
 
     def_to_moz(AST_ObjectProperty, function To_Moz_Property(M) {
-        var key = {
+        var computed = M.key instanceof AST_Node;
+        var key = computed ? to_moz(M.key) : {
             type: "Literal",
-            value: M.key instanceof AST_SymbolAccessor ? M.key.name : M.key
+            value: M.key,
         };
         var kind;
         if (M instanceof AST_ObjectKeyVal) {
             kind = "init";
-        } else
-        if (M instanceof AST_ObjectGetter) {
+        } else if (M instanceof AST_ObjectGetter) {
             kind = "get";
-        } else
-        if (M instanceof AST_ObjectSetter) {
+        } else if (M instanceof AST_ObjectSetter) {
             kind = "set";
         }
         return {
             type: "Property",
             kind: kind,
+            computed: computed,
+            method: M instanceof AST_ObjectMethod,
             key: key,
-            value: to_moz(M.value)
+            value: to_moz(M.value),
         };
     });
 
@@ -403,12 +999,34 @@
         var def = M.definition();
         return {
             type: "Identifier",
-            name: def && def.mangled_name || M.name
+            name: def && def.mangled_name || M.name,
+        };
+    });
+
+    def_to_moz(AST_Super, function To_Moz_Super() {
+        return { type: "Super" };
+    });
+
+    def_to_moz(AST_This, function To_Moz_ThisExpression() {
+        return { type: "ThisExpression" };
+    });
+
+    def_to_moz(AST_NewTarget, function To_Moz_MetaProperty() {
+        return {
+            type: "MetaProperty",
+            meta: {
+                type: "Identifier",
+                name: "new",
+            },
+            property: {
+                type: "Identifier",
+                name: "target",
+            },
         };
     });
 
     def_to_moz(AST_RegExp, function To_Moz_RegExpLiteral(M) {
-        var flags = M.value.toString().match(/[gimuy]*$/)[0];
+        var flags = M.value.toString().match(/\/([gimuy]*)$/)[1];
         var value = "/" + M.value.raw_source + "/" + flags;
         return {
             type: "Literal",
@@ -416,14 +1034,23 @@
             raw: value,
             regex: {
                 pattern: M.value.raw_source,
-                flags: flags
-            }
+                flags: flags,
+            },
         };
     });
 
-    def_to_moz(AST_Constant, function To_Moz_Literal(M) {
+    def_to_moz(AST_BigInt, function To_Moz_BigInt(M) {
         var value = M.value;
-        if (typeof value === 'number' && (value < 0 || (value === 0 && 1 / value < 0))) {
+        return {
+            type: "Literal",
+            bigint: value.slice(0, -1),
+            raw: value,
+        };
+    });
+
+    function To_Moz_Literal(M) {
+        var value = M.value;
+        if (typeof value === "number" && (value < 0 || (value === 0 && 1 / value < 0))) {
             return {
                 type: "UnaryExpression",
                 operator: "-",
@@ -431,33 +1058,68 @@
                 argument: {
                     type: "Literal",
                     value: -value,
-                    raw: M.start.raw
-                }
+                    raw: M.start.raw,
+                },
             };
         }
         return {
             type: "Literal",
             value: value,
-            raw: M.start.raw
+            raw: M.start.raw,
         };
-    });
+    }
+    def_to_moz(AST_Boolean, To_Moz_Literal);
+    def_to_moz(AST_Constant, To_Moz_Literal);
+    def_to_moz(AST_Null, To_Moz_Literal);
 
     def_to_moz(AST_Atom, function To_Moz_Atom(M) {
         return {
             type: "Identifier",
-            name: String(M.value)
+            name: String(M.value),
         };
     });
 
-    AST_Boolean.DEFMETHOD("to_mozilla_ast", AST_Constant.prototype.to_mozilla_ast);
-    AST_Null.DEFMETHOD("to_mozilla_ast", AST_Constant.prototype.to_mozilla_ast);
-    AST_Hole.DEFMETHOD("to_mozilla_ast", function To_Moz_ArrayHole() { return null });
+    def_to_moz(AST_Template, function To_Moz_TemplateLiteral_TaggedTemplateExpression(M) {
+        var last = M.strings.length - 1;
+        var tmpl = {
+            type: "TemplateLiteral",
+            expressions: M.expressions.map(to_moz),
+            quasis: M.strings.map(function(str, index) {
+                return {
+                    type: "TemplateElement",
+                    tail: index == last,
+                    value: { raw: str },
+                };
+            }),
+        };
+        if (!M.tag) return tmpl;
+        return {
+            type: "TaggedTemplateExpression",
+            tag: to_moz(M.tag),
+            quasi: tmpl,
+        };
+    });
 
     AST_Block.DEFMETHOD("to_mozilla_ast", AST_BlockStatement.prototype.to_mozilla_ast);
-    AST_Lambda.DEFMETHOD("to_mozilla_ast", AST_Function.prototype.to_mozilla_ast);
+    AST_Hole.DEFMETHOD("to_mozilla_ast", return_null);
+    AST_Node.DEFMETHOD("to_mozilla_ast", function() {
+        throw new Error("Cannot convert AST_" + this.TYPE);
+    });
 
     /* -----[ tools ]----- */
 
+    function normalize_directives(body) {
+        for (var i = 0; i < body.length; i++) {
+            var stat = body[i];
+            if (!(stat instanceof AST_SimpleStatement)) break;
+            var node = stat.body;
+            if (!(node instanceof AST_String)) break;
+            if (stat.start.pos !== node.start.pos) break;
+            body[i] = new AST_Directive(node);
+        }
+        return body;
+    }
+
     function raw_token(moznode) {
         if (moznode.type == "Literal") {
             return moznode.raw != null ? moznode.raw : moznode.value + "";
@@ -494,68 +1156,80 @@
         });
     }
 
-    function map(moztype, mytype, propmap) {
-        var moz_to_me = "function From_Moz_" + moztype + "(M){\n";
-        moz_to_me += "return new U2." + mytype.name + "({\n" +
-            "start: my_start_token(M),\n" +
-            "end: my_end_token(M)";
+    function read_name(M) {
+        return "" + M[M.type == "Identifier" ? "name" : "value"];
+    }
 
-        var me_to_moz = "function To_Moz_" + moztype + "(M){\n";
-        me_to_moz += "return {\n" +
-            "type: " + JSON.stringify(moztype);
+    function map(moztype, mytype, propmap) {
+        var moz_to_me = [
+            "start: my_start_token(M)",
+            "end: my_end_token(M)",
+        ];
+        var me_to_moz = [
+            "type: " + JSON.stringify(moztype),
+        ];
 
         if (propmap) propmap.split(/\s*,\s*/).forEach(function(prop) {
             var m = /([a-z0-9$_]+)(=|@|>|%)([a-z0-9$_]+)/i.exec(prop);
             if (!m) throw new Error("Can't understand property map: " + prop);
             var moz = m[1], how = m[2], my = m[3];
-            moz_to_me += ",\n" + my + ": ";
-            me_to_moz += ",\n" + moz + ": ";
             switch (how) {
-                case "@":
-                    moz_to_me += "M." + moz + ".map(from_moz)";
-                    me_to_moz += "M." +  my + ".map(to_moz)";
-                    break;
-                case ">":
-                    moz_to_me += "from_moz(M." + moz + ")";
-                    me_to_moz += "to_moz(M." + my + ")";
-                    break;
-                case "=":
-                    moz_to_me += "M." + moz;
-                    me_to_moz += "M." + my;
-                    break;
-                case "%":
-                    moz_to_me += "from_moz(M." + moz + ").body";
-                    me_to_moz += "to_moz_block(M)";
-                    break;
-                default:
-                    throw new Error("Can't understand operator in propmap: " + prop);
+              case "@":
+                moz_to_me.push(my + ": M." + moz + ".map(from_moz)");
+                me_to_moz.push(moz + ": M." +  my + ".map(to_moz)");
+                break;
+              case ">":
+                moz_to_me.push(my + ": from_moz(M." + moz + ")");
+                me_to_moz.push(moz + ": to_moz(M." + my + ")");
+                break;
+              case "=":
+                moz_to_me.push(my + ": M." + moz);
+                me_to_moz.push(moz + ": M." + my);
+                break;
+              case "%":
+                moz_to_me.push(my + ": from_moz(M." + moz + ").body");
+                me_to_moz.push(moz + ": to_moz_block(M)");
+                break;
+              default:
+                throw new Error("Can't understand operator in propmap: " + prop);
             }
         });
 
-        moz_to_me += "\n})\n}";
-        me_to_moz += "\n}\n}";
-
-        //moz_to_me = parse(moz_to_me).print_to_string({ beautify: true });
-        //me_to_moz = parse(me_to_moz).print_to_string({ beautify: true });
-        //console.log(moz_to_me);
-
-        moz_to_me = new Function("U2", "my_start_token", "my_end_token", "from_moz", "return(" + moz_to_me + ")")(
-            exports, my_start_token, my_end_token, from_moz
-        );
-        me_to_moz = new Function("to_moz", "to_moz_block", "to_moz_scope", "return(" + me_to_moz + ")")(
-            to_moz, to_moz_block, to_moz_scope
-        );
-        MOZ_TO_ME[moztype] = moz_to_me;
-        def_to_moz(mytype, me_to_moz);
+        MOZ_TO_ME[moztype] = new Function("U2", "my_start_token", "my_end_token", "from_moz", [
+            "return function From_Moz_" + moztype + "(M) {",
+            "    return new U2.AST_" + mytype.TYPE + "({",
+            moz_to_me.join(",\n"),
+            "    });",
+            "};",
+        ].join("\n"))(exports, my_start_token, my_end_token, from_moz);
+        def_to_moz(mytype, new Function("to_moz", "to_moz_block", "to_moz_scope", [
+            "return function To_Moz_" + moztype + "(M) {",
+            "    return {",
+            me_to_moz.join(",\n"),
+            "    };",
+            "};",
+        ].join("\n"))(to_moz, to_moz_block, to_moz_scope));
     }
 
     var FROM_MOZ_STACK = null;
 
-    function from_moz(node) {
-        FROM_MOZ_STACK.push(node);
-        var ret = node != null ? MOZ_TO_ME[node.type](node) : null;
+    function from_moz(moz) {
+        FROM_MOZ_STACK.push(moz);
+        var node = null;
+        if (moz) {
+            if (!HOP(MOZ_TO_ME, moz.type)) throw new Error("Unsupported type: " + moz.type);
+            node = MOZ_TO_ME[moz.type](moz);
+        }
         FROM_MOZ_STACK.pop();
-        return ret;
+        return node;
+    }
+
+    function from_moz_alias(moz) {
+        return new AST_String({
+            start: my_start_token(moz),
+            value: read_name(moz),
+            end: my_end_token(moz),
+        });
     }
 
     AST_Node.from_mozilla_ast = function(node) {
@@ -581,7 +1255,7 @@
         return ast;
     };
 
-    function set_moz_loc(mynode, moznode, myparent) {
+    function set_moz_loc(mynode, moznode) {
         var start = mynode.start;
         var end = mynode.end;
         if (start.pos != null && end.endpos != null) {
@@ -590,7 +1264,7 @@
         if (start.line) {
             moznode.loc = {
                 start: {line: start.line, column: start.col},
-                end: end.endline ? {line: end.endline, column: end.endcol} : null
+                end: end.endline ? {line: end.endline, column: end.endcol} : null,
             };
             if (start.file) {
                 moznode.loc.source = start.file;
@@ -609,10 +1283,17 @@
         return node != null ? node.to_mozilla_ast() : null;
     }
 
+    function to_moz_alias(alias) {
+        return is_identifier_string(alias.value) ? set_moz_loc(alias, {
+            type: "Identifier",
+            name: alias.value,
+        }) : to_moz(alias);
+    }
+
     function to_moz_block(node) {
         return {
             type: "BlockStatement",
-            body: node.body.map(to_moz)
+            body: node.body.map(to_moz),
         };
     }
 
@@ -623,7 +1304,7 @@
         }
         return {
             type: type,
-            body: body
+            body: body,
         };
     }
 })();