brighterscript 1.0.0-alpha.48 → 1.0.0-alpha.49

package/dist/parser/Statement.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConditionalCompileConstStatement = exports.ConditionalCompileStatement = exports.AliasStatement = exports.ConditionalCompileErrorStatement = exports.TypecastStatement = exports.ContinueStatement = exports.ConstStatement = exports.EnumMemberStatement = exports.EnumStatement = exports.ThrowStatement = exports.CatchStatement = exports.TryCatchStatement = exports.FieldStatement = exports.MethodStatement = exports.ClassStatement = exports.InterfaceMethodStatement = exports.InterfaceFieldStatement = exports.InterfaceStatement = exports.ImportStatement = exports.NamespaceStatement = exports.LibraryStatement = exports.IndexedSetStatement = exports.DottedSetStatement = exports.WhileStatement = exports.ForEachStatement = exports.ForStatement = exports.StopStatement = exports.EndStatement = exports.ReturnStatement = exports.LabelStatement = exports.GotoStatement = exports.DimStatement = exports.PrintStatement = exports.IncrementStatement = exports.IfStatement = exports.FunctionStatement = exports.ExitStatement = exports.ExpressionStatement = exports.Block = exports.AugmentedAssignmentStatement = exports.AssignmentStatement = exports.Body = exports.EmptyStatement = void 0;
+exports.TypeStatement = exports.ConditionalCompileConstStatement = exports.ConditionalCompileStatement = exports.AliasStatement = exports.ConditionalCompileErrorStatement = exports.TypecastStatement = exports.ContinueStatement = exports.ConstStatement = exports.EnumMemberStatement = exports.EnumStatement = exports.ThrowStatement = exports.CatchStatement = exports.TryCatchStatement = exports.FieldStatement = exports.MethodStatement = exports.ClassStatement = exports.InterfaceMethodStatement = exports.InterfaceFieldStatement = exports.InterfaceStatement = exports.ImportStatement = exports.NamespaceStatement = exports.LibraryStatement = exports.IndexedSetStatement = exports.DottedSetStatement = exports.WhileStatement = exports.ForEachStatement = exports.ForStatement = exports.StopStatement = exports.EndStatement = exports.ReturnStatement = exports.LabelStatement = exports.GotoStatement = exports.DimStatement = exports.PrintStatement = exports.IncrementStatement = exports.IfStatement = exports.FunctionStatement = exports.ExitStatement = exports.ExpressionStatement = exports.Block = exports.AugmentedAssignmentStatement = exports.AssignmentStatement = exports.Body = exports.EmptyStatement = void 0;
 const TokenKind_1 = require("../lexer/TokenKind");
 const Expression_1 = require("./Expression");
 const Expression_2 = require("./Expression");
@@ -1780,11 +1780,16 @@ class ClassStatement extends AstNode_1.Statement {
     }
     transpile(state) {
         let result = [];
+        const className = this.getName(Parser_1.ParseMode.BrightScript).replace(/\./g, '_');
+        const ancestors = this.getAncestors(state);
+        const body = this.getTranspiledClassBody(ancestors);
+        //make the methods
+        result.push(...this.getTranspiledMethods(state, className, body));
         //make the builder
-        result.push(...this.getTranspiledBuilder(state));
+        result.push(...this.getTranspiledBuilder(state, className, ancestors, body));
         result.push('\n', state.indent());
         //make the class assembler (i.e. the public-facing class creator method)
-        result.push(...this.getTranspiledClassFunction(state));
+        result.push(...this.getTranspiledClassFunction(state, className));
         return result;
     }
     getTypedef(state) {
@@ -1876,11 +1881,11 @@ class ClassStatement extends AstNode_1.Statement {
         }
         return ancestors;
     }
-    getBuilderName(name) {
-        if (name.includes('.')) {
-            name = name.replace(/\./gi, '_');
-        }
-        return `__${name}_builder`;
+    getBuilderName(transpiledClassName) {
+        return `__${transpiledClassName}_builder`;
+    }
+    getMethodIdentifier(transpiledClassName, statement) {
+        return Object.assign(Object.assign({}, statement.tokens.name), { text: `__${transpiledClassName}_method_${statement.tokens.name.text}` });
     }
     getConstructorType() {
         var _a, _b;
@@ -1928,21 +1933,17 @@ class ClassStatement extends AstNode_1.Statement {
      * This needs to be a separate function so that child classes can call the builder from their parent
      * without instantiating the parent constructor at that point in time.
      */
-    getTranspiledBuilder(state) {
+    getTranspiledBuilder(state, transpiledClassName, ancestors, body) {
         let result = [];
-        result.push(`function ${this.getBuilderName(this.getName(Parser_1.ParseMode.BrightScript))}()\n`);
+        result.push(`function ${this.getBuilderName(transpiledClassName)}()\n`);
         state.blockDepth++;
         //indent
         result.push(state.indent());
-        /**
-         * The lineage of this class. index 0 is a direct parent, index 1 is index 0's parent, etc...
-         */
-        let ancestors = this.getAncestors(state);
         //construct parent class or empty object
         if (ancestors[0]) {
             const ancestorNamespace = ancestors[0].findAncestor(reflection_1.isNamespaceStatement);
             let fullyQualifiedClassName = util_1.util.getFullyQualifiedClassName(ancestors[0].getName(Parser_1.ParseMode.BrighterScript), ancestorNamespace === null || ancestorNamespace === void 0 ? void 0 : ancestorNamespace.getName(Parser_1.ParseMode.BrighterScript));
-            result.push('instance = ', this.getBuilderName(fullyQualifiedClassName), '()');
+            result.push(`instance = ${this.getBuilderName(fullyQualifiedClassName.replace(/\./g, '_'))}()`);
         }
         else {
             //use an empty object.
@@ -1950,47 +1951,6 @@ class ClassStatement extends AstNode_1.Statement {
         }
         result.push(state.newline, state.indent());
         let parentClassIndex = this.getParentClassIndex(state);
-        let body = this.body;
-        //inject an empty "new" method if missing
-        if (!this.getConstructorFunction()) {
-            if (ancestors.length === 0) {
-                body = [
-                    (0, creators_1.createMethodStatement)('new', TokenKind_1.TokenKind.Sub),
-                    ...this.body
-                ];
-            }
-            else {
-                const params = this.getConstructorParams(ancestors);
-                const call = new ExpressionStatement({
-                    expression: new Expression_2.CallExpression({
-                        callee: new Expression_2.VariableExpression({
-                            name: (0, creators_1.createToken)(TokenKind_1.TokenKind.Identifier, 'super')
-                        }),
-                        openingParen: (0, creators_1.createToken)(TokenKind_1.TokenKind.LeftParen),
-                        args: params.map(x => new Expression_2.VariableExpression({
-                            name: util_1.util.cloneToken(x.tokens.name)
-                        })),
-                        closingParen: (0, creators_1.createToken)(TokenKind_1.TokenKind.RightParen)
-                    })
-                });
-                body = [
-                    new MethodStatement({
-                        name: (0, creators_1.createIdentifier)('new'),
-                        func: new Expression_1.FunctionExpression({
-                            parameters: params.map(x => x.clone()),
-                            body: new Block({
-                                statements: [call]
-                            }),
-                            functionType: (0, creators_1.createToken)(TokenKind_1.TokenKind.Sub),
-                            endFunctionType: (0, creators_1.createToken)(TokenKind_1.TokenKind.EndSub),
-                            leftParen: (0, creators_1.createToken)(TokenKind_1.TokenKind.LeftParen),
-                            rightParen: (0, creators_1.createToken)(TokenKind_1.TokenKind.RightParen)
-                        })
-                    }),
-                    ...this.body
-                ];
-            }
-        }
         for (let statement of body) {
             //is field statement
             if ((0, reflection_1.isFieldStatement)(statement)) {
@@ -2013,7 +1973,7 @@ class ClassStatement extends AstNode_1.Statement {
                 if (statement.leadingTrivia.filter(token => token.kind === TokenKind_1.TokenKind.Comment).length > 0) {
                     result.push(...state.transpileComments(statement.leadingTrivia), state.indent());
                 }
-                result.push('instance.', state.transpileToken(statement.tokens.name), ' = ', ...statement.transpile(state), state.newline, state.indent());
+                result.push('instance.', state.transpileToken(statement.tokens.name), ' = ', state.transpileToken(this.getMethodIdentifier(transpiledClassName, statement)), state.newline, state.indent());
                 state.skipLeadingComments = false;
                 delete state.classStatement;
             }
@@ -2029,12 +1989,69 @@ class ClassStatement extends AstNode_1.Statement {
         result.push(`end function`);
         return result;
     }
+    /**
+     * Returns a copy of the class' body, with the constructor function added if it doesn't exist.
+     */
+    getTranspiledClassBody(ancestors) {
+        const body = [];
+        body.push(...this.body);
+        //inject an empty "new" method if missing
+        if (!this.getConstructorFunction()) {
+            if (ancestors.length === 0) {
+                body.unshift((0, creators_1.createMethodStatement)('new', TokenKind_1.TokenKind.Sub));
+            }
+            else {
+                const params = this.getConstructorParams(ancestors);
+                const call = new ExpressionStatement({
+                    expression: new Expression_2.CallExpression({
+                        callee: new Expression_2.VariableExpression({
+                            name: (0, creators_1.createToken)(TokenKind_1.TokenKind.Identifier, 'super')
+                        }),
+                        openingParen: (0, creators_1.createToken)(TokenKind_1.TokenKind.LeftParen),
+                        args: params.map(x => new Expression_2.VariableExpression({
+                            name: x.tokens.name
+                        })),
+                        closingParen: (0, creators_1.createToken)(TokenKind_1.TokenKind.RightParen)
+                    })
+                });
+                body.unshift(new MethodStatement({
+                    modifiers: [],
+                    name: (0, creators_1.createIdentifier)('new'),
+                    func: new Expression_1.FunctionExpression({
+                        parameters: params.map(x => x.clone()),
+                        body: new Block({ statements: [call] }),
+                        functionType: (0, creators_1.createToken)(TokenKind_1.TokenKind.Sub),
+                        endFunctionType: (0, creators_1.createToken)(TokenKind_1.TokenKind.EndSub),
+                        leftParen: (0, creators_1.createToken)(TokenKind_1.TokenKind.LeftParen),
+                        rightParen: (0, creators_1.createToken)(TokenKind_1.TokenKind.RightParen)
+                    }),
+                    override: null
+                }));
+            }
+        }
+        return body;
+    }
+    /**
+     * These are the methods that are defined in this class. They are transpiled outside of the class body
+     * to ensure they don't appear as "$anon_#" in stack traces and crash logs.
+     */
+    getTranspiledMethods(state, transpiledClassName, body) {
+        let result = [];
+        for (let statement of body) {
+            if ((0, reflection_1.isMethodStatement)(statement)) {
+                state.classStatement = this;
+                result.push(...statement.transpile(state, this.getMethodIdentifier(transpiledClassName, statement)), state.newline, state.indent());
+                delete state.classStatement;
+            }
+        }
+        return result;
+    }
     /**
      * The class function is the function with the same name as the class. This is the function that
      * consumers should call to create a new instance of that class.
      * This invokes the builder, gets an instance of the class, then invokes the "new" function on that class.
      */
-    getTranspiledClassFunction(state) {
+    getTranspiledClassFunction(state, transpiledClassName) {
         let result = state.transpileAnnotations(this);
         const constructorFunction = this.getConstructorFunction();
         let constructorParams = [];
@@ -2056,7 +2073,7 @@ class ClassStatement extends AstNode_1.Statement {
         result.push(')', '\n');
         state.blockDepth++;
         result.push(state.indent());
-        result.push(`instance = ${this.getBuilderName(this.getName(Parser_1.ParseMode.BrightScript))}()\n`);
+        result.push(`instance = ${this.getBuilderName(transpiledClassName)}()\n`);
         result.push(state.indent());
         result.push(`instance.new(`);
         //append constructor arguments
@@ -2161,7 +2178,7 @@ class MethodStatement extends FunctionStatement {
     get leadingTrivia() {
         return this.func.leadingTrivia;
     }
-    transpile(state) {
+    transpile(state, name) {
         if (this.tokens.name.text.toLowerCase() === 'new') {
             this.ensureSuperConstructorCall(state);
             //TODO we need to undo this at the bottom of this method
@@ -2190,7 +2207,7 @@ class MethodStatement extends FunctionStatement {
             visitor(statement, undefined);
             statement.walk(visitor, walkOptions);
         }
-        return this.func.transpile(state);
+        return this.func.transpile(state, name);
     }
     getTypedef(state) {
         var _a, _b;
@@ -2937,7 +2954,7 @@ class AliasStatement extends AstNode_1.Statement {
         this.location = util_1.util.createBoundingLocation(this.tokens.alias, this.tokens.name, this.tokens.equals, this.value);
     }
     transpile(state) {
-        //the alias statement is a comment just for debugging purposes
+        //transpile to a comment just for debugging purposes
         return [
             state.transpileToken(this.tokens.alias, 'alias', true),
             ' ',
@@ -3129,4 +3146,51 @@ class ConditionalCompileConstStatement extends AstNode_1.Statement {
     }
 }
 exports.ConditionalCompileConstStatement = ConditionalCompileConstStatement;
+class TypeStatement extends AstNode_1.Statement {
+    constructor(options) {
+        super();
+        this.kind = AstNode_1.AstNodeKind.TypeStatement;
+        this.tokens = {
+            type: options.type,
+            name: options.name,
+            equals: options.equals
+        };
+        this.value = options.value;
+        this.location = util_1.util.createBoundingLocation(this.tokens.type, this.tokens.name, this.tokens.equals, this.value);
+    }
+    transpile(state) {
+        //transpile to a comment just for debugging purposes
+        return [
+            state.transpileToken(this.tokens.type, 'type', true),
+            ' ',
+            state.transpileToken(this.tokens.name),
+            ' ',
+            state.transpileToken(this.tokens.equals, '='),
+            ' ',
+            this.value.transpile(state)
+        ];
+    }
+    walk(visitor, options) {
+        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
+            (0, visitors_1.walk)(this, 'value', visitor, options);
+        }
+    }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.type) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    getType(options) {
+        return this.value.getType(options);
+    }
+    clone() {
+        var _a;
+        return this.finalizeClone(new TypeStatement({
+            type: util_1.util.cloneToken(this.tokens.type),
+            name: util_1.util.cloneToken(this.tokens.name),
+            equals: util_1.util.cloneToken(this.tokens.equals),
+            value: (_a = this.value) === null || _a === void 0 ? void 0 : _a.clone()
+        }), ['value']);
+    }
+}
+exports.TypeStatement = TypeStatement;
 //# sourceMappingURL=Statement.js.map