brighterscript 1.0.0-alpha.51 → 1.0.0-alpha.53

package/dist/parser/Expression.d.ts

@@ -61,6 +61,8 @@ export declare class CallExpression extends Expression {
     };
     readonly kind = AstNodeKind.CallExpression;
     readonly location: Location | undefined;
+    /** `a.b()` -> `a.b` (not the args) */
+    get previousInChain(): Expression;
     transpile(state: BrsTranspileState, nameOverride?: string): TranspileResult;
     walk(visitor: WalkVisitor, options: WalkOptions): void;
     getType(options: GetTypeOptions): BscType;
@@ -97,11 +99,11 @@ export declare class FunctionExpression extends Expression implements TypedefPro
      */
     get location(): Location;
     transpile(state: BrsTranspileState, name?: Identifier, includeBody?: boolean): TranspileResult;
-    getTypedef(state: BrsTranspileState): SourceNode[];
+    getTypedef(state: BrsTranspileState): any;
     walk(visitor: WalkVisitor, options: WalkOptions): void;
     getType(options: GetTypeOptions): TypedFunctionType;
     private get requiresReturnType();
-    clone(): FunctionExpression;
+    clone(): any;
 }
 export declare class FunctionParameterExpression extends Expression {
     constructor(options: {
@@ -141,10 +143,20 @@ export declare class DottedGetExpression extends Expression {
         readonly dot?: Token;
     };
     readonly obj: Expression;
+    /**
+     * @deprecated use `tokens.name` instead
+     */
+    get name(): Identifier;
+    /**
+     * @deprecated use `tokens.dot` instead
+     */
+    get dot(): Token | undefined;
     readonly kind = AstNodeKind.DottedGetExpression;
     readonly location: Location | undefined;
-    transpile(state: BrsTranspileState): (string | SourceNode | TranspileResult)[];
-    getTypedef(state: BrsTranspileState): (string | SourceNode | TranspileResult)[];
+    /** `a.b` -> `a` */
+    get previousInChain(): Expression;
+    transpile(state: BrsTranspileState): (string | TranspileResult | SourceNode)[];
+    getTypedef(state: BrsTranspileState): (string | TranspileResult | SourceNode)[];
     walk(visitor: WalkVisitor, options: WalkOptions): void;
     getType(options: GetTypeOptions): BscType;
     getName(parseMode: ParseMode): string;
@@ -167,7 +179,9 @@ export declare class XmlAttributeGetExpression extends Expression {
     };
     readonly obj: Expression;
     readonly location: Location | undefined;
-    transpile(state: BrsTranspileState): (string | SourceNode | TranspileResult)[];
+    /** `a@b` -> `a` */
+    get previousInChain(): Expression;
+    transpile(state: BrsTranspileState): (string | TranspileResult | SourceNode)[];
     walk(visitor: WalkVisitor, options: WalkOptions): void;
     get leadingTrivia(): Token[];
     clone(): XmlAttributeGetExpression;
@@ -194,7 +208,21 @@ export declare class IndexedGetExpression extends Expression {
         readonly closingSquare?: Token;
         readonly questionDot?: Token;
     };
+    /**
+     * @deprecated use `tokens.questionDot` instead
+     */
+    get questionDotToken(): Token | undefined;
+    /**
+     * @deprecated use `tokens.openingSquare` instead
+     */
+    get openingSquare(): Token | undefined;
+    /**
+     * @deprecated use `indexes[0]` instead
+     */
+    get index(): Expression | undefined;
     readonly location: Location | undefined;
+    /** `a[i]` -> `a` (not the index) */
+    get previousInChain(): Expression;
     transpile(state: BrsTranspileState): any[];
     walk(visitor: WalkVisitor, options: WalkOptions): void;
     getType(options: GetTypeOptions): BscType;
@@ -248,7 +276,7 @@ export declare class PrintSeparatorExpression extends Expression {
     };
     readonly kind = AstNodeKind.PrintSeparatorExpression;
     location: Location;
-    transpile(state: BrsTranspileState): (string | SourceNode | TranspileResult)[];
+    transpile(state: BrsTranspileState): (string | TranspileResult | SourceNode)[];
     walk(visitor: WalkVisitor, options: WalkOptions): void;
     get leadingTrivia(): Token[];
     clone(): PrintSeparatorExpression;
@@ -373,7 +401,7 @@ export declare class UnaryExpression extends Expression {
         readonly operator: Token;
     };
     readonly right: Expression;
-    transpile(state: BrsTranspileState): (string | SourceNode | TranspileResult)[];
+    transpile(state: BrsTranspileState): (string | TranspileResult | SourceNode)[];
     walk(visitor: WalkVisitor, options: WalkOptions): void;
     getType(options: GetTypeOptions): BscType;
     get leadingTrivia(): Token[];
@@ -388,6 +416,10 @@ export declare class VariableExpression extends Expression {
     };
     readonly kind = AstNodeKind.VariableExpression;
     readonly location: Location;
+    /**
+     * @deprecated use `tokens.name` instead
+     */
+    get name(): Identifier;
     getName(parseMode?: ParseMode): string;
     transpile(state: BrsTranspileState): TranspileResult;
     getTypedef(state: BrsTranspileState): TranspileResult[];
@@ -439,6 +471,8 @@ export declare class NewExpression extends Expression {
      * The name of the class to initialize (with optional namespace prefixed)
      */
     get className(): DottedGetExpression | VariableExpression;
+    /** `new Alpha.Beta()` -> `Alpha.Beta()` */
+    get previousInChain(): CallExpression;
     transpile(state: BrsTranspileState): TranspileResult;
     walk(visitor: WalkVisitor, options: WalkOptions): void;
     getType(options: GetTypeOptions): BscType;
@@ -464,6 +498,8 @@ export declare class CallfuncExpression extends Expression {
     };
     readonly kind = AstNodeKind.CallfuncExpression;
     readonly location: Location | undefined;
+    /** `a@.b()` -> `a` (not the args) */
+    get previousInChain(): Expression;
     transpile(state: BrsTranspileState): TranspileResult;
     walk(visitor: WalkVisitor, options: WalkOptions): void;
     getType(options: GetTypeOptions): BscType;
@@ -548,7 +584,7 @@ export declare class AnnotationExpression extends Expression {
     get leadingTrivia(): Token[];
     transpile(state: BrsTranspileState): (string | SourceNode)[];
     walk(visitor: WalkVisitor, options: WalkOptions): void;
-    getTypedef(state: BrsTranspileState): (string | SourceNode | TranspileResult)[];
+    getTypedef(state: BrsTranspileState): (string | TranspileResult | SourceNode)[];
     clone(): AnnotationExpression;
 }
 export declare class TernaryExpression extends Expression {
@@ -614,12 +650,23 @@ export declare class TypeExpression extends Expression implements TypedefProvide
          * The standard AST expression that represents the type for this TypeExpression.
          */
         expression: Expression;
+        /**
+         * An already-known type for this TypeExpression, bypassing resolution of `expression`
+         * via symbol table lookup. Useful when `expression` is not attached to (or can't resolve
+         * against) a real symbol table - e.g. a type reference synthesized for a detached AST node.
+         */
+        resolvedType?: BscType;
     });
     readonly kind = AstNodeKind.TypeExpression;
     /**
      * The standard AST expression that represents the type for this TypeExpression.
      */
     readonly expression: Expression;
+    /**
+     * An already-known type for this TypeExpression. When set, `getType()` returns this
+     * directly instead of resolving `expression` via symbol table lookup.
+     */
+    readonly resolvedType?: BscType;
     readonly location: Location;
     transpile(state: BrsTranspileState): TranspileResult;
     walk(visitor: WalkVisitor, options: WalkOptions): void;
@@ -726,6 +773,7 @@ export declare class TypedFunctionTypeExpression extends Expression {
     readonly returnType?: TypeExpression;
     readonly location: Location;
     transpile(state: BrsTranspileState): TranspileResult;
+    getTypedef(state: BrsTranspileState): TranspileResult;
     walk(visitor: WalkVisitor, options: WalkOptions): void;
     getType(options: GetTypeOptions): BscType;
     clone(): TypedFunctionTypeExpression;

package/dist/parser/Expression.js

@@ -4,7 +4,6 @@ exports.TypedFunctionTypeExpression = exports.InlineInterfaceMemberExpression =
 const TokenKind_1 = require("../lexer/TokenKind");
 const util_1 = require("../util");
 const Parser_1 = require("./Parser");
-const fileUrl = require("file-url");
 const visitors_1 = require("../astUtils/visitors");
 const visitors_2 = require("../astUtils/visitors");
 const reflection_1 = require("../astUtils/reflection");
@@ -96,6 +95,10 @@ class CallExpression extends AstNode_1.Expression {
         this.args = (_a = options.args) !== null && _a !== void 0 ? _a : [];
         this.location = util_1.default.createBoundingLocation(this.callee, this.tokens.openingParen, ...(_b = this.args) !== null && _b !== void 0 ? _b : [], this.tokens.closingParen);
     }
+    /** `a.b()` -> `a.b` (not the args) */
+    get previousInChain() {
+        return this.callee;
+    }
     transpile(state, nameOverride) {
         let result = [];
         //transpile the name
@@ -486,6 +489,22 @@ class DottedGetExpression extends AstNode_1.Expression {
         this.obj = options.obj;
         this.location = util_1.default.createBoundingLocation(this.obj, this.tokens.dot, this.tokens.name);
     }
+    /**
+     * @deprecated use `tokens.name` instead
+     */
+    get name() {
+        return this.tokens.name;
+    }
+    /**
+     * @deprecated use `tokens.dot` instead
+     */
+    get dot() {
+        return this.tokens.dot;
+    }
+    /** `a.b` -> `a` */
+    get previousInChain() {
+        return this.obj;
+    }
     transpile(state) {
         //if the callee starts with a namespace name, transpile the name
         if (state.file.calleeStartsWithNamespace(this)) {
@@ -564,6 +583,10 @@ class XmlAttributeGetExpression extends AstNode_1.Expression {
         this.tokens = { at: options.at, name: options.name };
         this.location = util_1.default.createBoundingLocation(this.obj, this.tokens.at, this.tokens.name);
     }
+    /** `a@b` -> `a` */
+    get previousInChain() {
+        return this.obj;
+    }
     transpile(state) {
         return [
             ...this.obj.transpile(state),
@@ -603,6 +626,29 @@ class IndexedGetExpression extends AstNode_1.Expression {
         this.indexes = options.indexes;
         this.location = util_1.default.createBoundingLocation(this.obj, this.tokens.openingSquare, this.tokens.questionDot, this.tokens.openingSquare, ...(_a = this.indexes) !== null && _a !== void 0 ? _a : [], this.tokens.closingSquare);
     }
+    /**
+     * @deprecated use `tokens.questionDot` instead
+     */
+    get questionDotToken() {
+        return this.tokens.questionDot;
+    }
+    /**
+     * @deprecated use `tokens.openingSquare` instead
+     */
+    get openingSquare() {
+        return this.tokens.openingSquare;
+    }
+    /**
+     * @deprecated use `indexes[0]` instead
+     */
+    get index() {
+        var _a;
+        return (_a = this.indexes) === null || _a === void 0 ? void 0 : _a[0];
+    }
+    /** `a[i]` -> `a` (not the index) */
+    get previousInChain() {
+        return this.obj;
+    }
     transpile(state) {
         var _a;
         const result = [];
@@ -1083,6 +1129,12 @@ class VariableExpression extends AstNode_1.Expression {
         };
         this.location = util_1.default.cloneLocation((_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.location);
     }
+    /**
+     * @deprecated use `tokens.name` instead
+     */
+    get name() {
+        return this.tokens.name;
+    }
     getName(parseMode) {
         return this.tokens.name.text;
     }
@@ -1198,7 +1250,7 @@ class SourceLiteralExpression extends AstNode_1.Expression {
         let text;
         switch (this.tokens.value.kind) {
             case TokenKind_1.TokenKind.SourceFilePathLiteral:
-                const pathUrl = fileUrl(state.srcPath);
+                const pathUrl = util_1.default.fileUrl(state.srcPath);
                 text = `"${pathUrl.substring(0, 4)}" + "${pathUrl.substring(4)}"`;
                 break;
             case TokenKind_1.TokenKind.SourceLineNumLiteral:
@@ -1223,7 +1275,7 @@ class SourceLiteralExpression extends AstNode_1.Expression {
                 text = `"${rootNamespace}"`;
                 break;
             case TokenKind_1.TokenKind.SourceLocationLiteral:
-                const locationUrl = fileUrl(state.srcPath);
+                const locationUrl = util_1.default.fileUrl(state.srcPath);
                 //TODO find first parent that has range, or default to -1
                 text = `"${locationUrl.substring(0, 4)}" + "${locationUrl.substring(4)}:${this.getClosestLineNumber()}"`;
                 break;
@@ -1279,6 +1331,10 @@ class NewExpression extends AstNode_1.Expression {
         //either a VariableExpression or a DottedGet
         return this.call.callee;
     }
+    /** `new Alpha.Beta()` -> `Alpha.Beta()` */
+    get previousInChain() {
+        return this.call;
+    }
     transpile(state) {
         var _a;
         const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
@@ -1330,6 +1386,10 @@ class CallfuncExpression extends AstNode_1.Expression {
         this.args = (_a = options.args) !== null && _a !== void 0 ? _a : [];
         this.location = util_1.default.createBoundingLocation(this.callee, this.tokens.operator, this.tokens.methodName, this.tokens.openingParen, ...(_b = this.args) !== null && _b !== void 0 ? _b : [], this.tokens.closingParen);
     }
+    /** `a@.b()` -> `a` (not the args) */
+    get previousInChain() {
+        return this.callee;
+    }
     transpile(state) {
         var _a;
         let result = [];
@@ -1839,6 +1899,7 @@ class TypeExpression extends AstNode_1.Expression {
         super();
         this.kind = AstNode_1.AstNodeKind.TypeExpression;
         this.expression = options.expression;
+        this.resolvedType = options.resolvedType;
         this.location = util_1.default.cloneLocation((_a = this.expression) === null || _a === void 0 ? void 0 : _a.location);
     }
     transpile(state) {
@@ -1861,15 +1922,31 @@ class TypeExpression extends AstNode_1.Expression {
         }
     }
     getType(options) {
-        return this.expression.getType(Object.assign(Object.assign({}, options), { flags: 2 /* SymbolTypeFlag.typetime */ }));
+        var _a;
+        return (_a = this.resolvedType) !== null && _a !== void 0 ? _a : this.expression.getType(Object.assign(Object.assign({}, options), { flags: 2 /* SymbolTypeFlag.typetime */ }));
     }
     getTypedef(state) {
+        // classes and enums always know their own fully-namespace-qualified name, regardless
+        // of how they were referenced in source (bare same-namespace shorthand, fully-qualified,
+        // etc.) - use that instead of the raw written text, which would otherwise be flattened
+        // to the type's compiled runtime symbol name (e.g. `Namespace_Type`) for class references
+        const exprType = this.getType({ flags: 2 /* SymbolTypeFlag.typetime */ });
+        if ((0, reflection_1.isClassType)(exprType) || (0, reflection_1.isEnumType)(exprType)) {
+            return [exprType.toString()];
+        }
         // TypeDefs should pass through any valid type names
-        return this.expression.transpile(state);
+        return this.expression.getTypedef
+            ? this.expression.getTypedef(state)
+            : this.expression.transpile(state);
     }
     getName(parseMode = Parser_1.ParseMode.BrighterScript) {
-        //TODO: this may not support Complex Types, eg. generics or Unions
-        return util_1.default.getAllDottedGetPartsAsString(this.expression, parseMode);
+        const dottedName = util_1.default.getAllDottedGetPartsAsString(this.expression, parseMode);
+        if (dottedName !== undefined) {
+            return dottedName;
+        }
+        //complex types (unions/intersections, inline interfaces, typed arrays, typed function
+        //types, groupings) aren't dotted-get chains, so reconstruct their written name instead
+        return util_1.default.getTypeExpressionName(this.expression, parseMode);
     }
     getNameParts() {
         //TODO: really, this code is only used to get Namespaces. It could be more clear.
@@ -1878,7 +1955,8 @@ class TypeExpression extends AstNode_1.Expression {
     clone() {
         var _a;
         return this.finalizeClone(new TypeExpression({
-            expression: (_a = this.expression) === null || _a === void 0 ? void 0 : _a.clone()
+            expression: (_a = this.expression) === null || _a === void 0 ? void 0 : _a.clone(),
+            resolvedType: this.resolvedType
         }), ['expression']);
     }
 }
@@ -2069,6 +2147,11 @@ class TypedFunctionTypeExpression extends AstNode_1.Expression {
     transpile(state) {
         return [this.getType({ flags: 2 /* SymbolTypeFlag.typetime */ }).toTypeString()];
     }
+    getTypedef(state) {
+        //preserve the full signature (param names/types, return type) in typedefs,
+        //rather than the generic runtime type name used by `transpile()`
+        return [this.getType({ flags: 2 /* SymbolTypeFlag.typetime */ }).toString()];
+    }
     walk(visitor, options) {
         if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
             (0, visitors_2.walkArray)(this.params, visitor, options, this);