brighterscript 1.0.0-alpha.2 → 1.0.0-alpha.22

package/dist/roku-types/index.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.events = exports.interfaces = exports.components = exports.nodes = void 0;
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const data = require("./data.json");
+//apply any transforms/overrides before exporting
+exports.nodes = data.nodes;
+exports.components = data.components;
+exports.interfaces = data.interfaces;
+exports.events = data.events;
+//# sourceMappingURL=index.js.map

package/dist/roku-types/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/roku-types/index.ts"],"names":[],"mappings":";;;AAAA,iEAAiE;AACjE,oCAAqC;AAErC,iDAAiD;AAEpC,QAAA,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;AACnB,QAAA,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;AAC7B,QAAA,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;AAC7B,QAAA,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC"}

package/dist/types/ArrayType.d.ts

@@ -1,10 +1,13 @@
-import type { BscType } from './BscType';
+import type { BscType, TypeContext } from './BscType';
 export declare class ArrayType implements BscType {
     constructor(...innerTypes: BscType[]);
     innerTypes: BscType[];
-    isAssignableTo(targetType: BscType): boolean;
-    isConvertibleTo(targetType: BscType): boolean;
-    toString(): string;
+    isAssignableTo(targetType: BscType, context?: TypeContext): boolean;
+    isConvertibleTo(targetType: BscType, context?: TypeContext): boolean;
+    toString(context?: TypeContext): string;
+    toJsString(context?: TypeContext): string;
     toTypeString(): string;
-    equals(targetType: BscType): boolean;
+    getDefaultType(context?: TypeContext): BscType;
+    equals(targetType: BscType, context?: TypeContext): boolean;
+    private getUniqueTypesByAssignability;
 }

package/dist/types/ArrayType.js

@@ -2,21 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArrayType = void 0;
 const reflection_1 = require("../astUtils/reflection");
+const DynamicType_1 = require("./DynamicType");
 class ArrayType {
     constructor(...innerTypes) {
         this.innerTypes = [];
-        this.innerTypes = innerTypes;
+        this.innerTypes = this.getUniqueTypesByAssignability(innerTypes);
     }
-    isAssignableTo(targetType) {
-        if (reflection_1.isArrayType(targetType)) {
+    isAssignableTo(targetType, context) {
+        if ((0, reflection_1.isObjectType)(targetType)) {
+            return true;
+        }
+        else if ((0, reflection_1.isArrayType)(targetType)) {
             //this array type is assignable to the target IF
             //1. all of the types in this array are present in the target
             outer: for (let innerType of this.innerTypes) {
                 //find this inner type in the target
                 // eslint-disable-next-line no-unreachable-loop
                 for (let targetInnerType of targetType.innerTypes) {
-                    //TODO is this loop correct? It ends after 1 iteration but we might need to do more iterations
-                    if (innerType.isAssignableTo(targetInnerType)) {
+                    //TODO TYPES is this loop correct? It ends after 1 iteration but we might need to do more iterations
+                    if (innerType.isAssignableTo(targetInnerType, context)) {
                         continue outer;
                     }
                     //our array contains a type that the target array does not...so these arrays are different
@@ -25,22 +29,58 @@ class ArrayType {
             }
             return true;
         }
-        else if (reflection_1.isDynamicType(targetType)) {
+        else if ((0, reflection_1.isDynamicType)(targetType) ||
+            (0, reflection_1.isObjectType)(targetType)) {
             return true;
         }
         return false;
     }
-    isConvertibleTo(targetType) {
-        return this.isAssignableTo(targetType);
+    isConvertibleTo(targetType, context) {
+        return this.isAssignableTo(targetType, context);
+    }
+    toString(context) {
+        // TODO TYPES: When we support union types, the output should be more like:
+        // `Array<${this.innerTypes.map((x) => x.toString(context)).join(' | ')}>`;
+        return `${this.getDefaultType(context).toString(context)}[]`;
     }
-    toString() {
-        return `Array<${this.innerTypes.map((x) => x.toString()).join(' | ')}>`;
+    toJsString(context) {
+        const uniqueInnerTypes = this.getUniqueTypesByAssignability(this.innerTypes);
+        return `Array<${uniqueInnerTypes.map((x) => x.toString(context)).join(' | ')}>`;
     }
     toTypeString() {
         return 'object';
     }
-    equals(targetType) {
-        return reflection_1.isArrayType(targetType) && this.isAssignableTo(targetType);
+    getDefaultType(context) {
+        const uniqueInnerTypes = this.getUniqueTypesByAssignability(this.innerTypes, context);
+        return (uniqueInnerTypes === null || uniqueInnerTypes === void 0 ? void 0 : uniqueInnerTypes.length) === 1 ? uniqueInnerTypes[0] : new DynamicType_1.DynamicType();
+    }
+    equals(targetType, context) {
+        return (0, reflection_1.isArrayType)(targetType) && this.isAssignableTo(targetType, context);
+    }
+    getUniqueTypesByAssignability(innerTypes, context) {
+        const uniqueTypes = [];
+        for (const innerType of innerTypes) {
+            let shouldAddType = true;
+            for (let i = 0; i < uniqueTypes.length; i++) {
+                const uniqueType = uniqueTypes[i];
+                if (innerType.isAssignableTo(uniqueType, context)) {
+                    // this type is already assignable to the existing type
+                    shouldAddType = false;
+                    break;
+                }
+                else if (uniqueType.isAssignableTo(innerType, context)) {
+                    // an existing type is assignable to this type. replace the existing type with this
+                    // as this is more general
+                    shouldAddType = false;
+                    uniqueTypes[i] = innerType;
+                    break;
+                }
+            }
+            if (shouldAddType) {
+                uniqueTypes.push(innerType);
+            }
+        }
+        return uniqueTypes;
     }
 }
 exports.ArrayType = ArrayType;

package/dist/types/ArrayType.js.map

@@ -1 +1 @@
-{"version":3,"file":"ArrayType.js","sourceRoot":"","sources":["../../src/types/ArrayType.ts"],"names":[],"mappings":";;;AAAA,uDAAoE;AAGpE,MAAa,SAAS;IAClB,YAAY,GAAG,UAAqB;QAG7B,eAAU,GAAc,EAAE,CAAC;QAF9B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAGM,cAAc,CAAC,UAAmB;QACrC,IAAI,wBAAW,CAAC,UAAU,CAAC,EAAE;YACzB,gDAAgD;YAChD,6DAA6D;YAC7D,KAAK,EAAE,KAAK,IAAI,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;gBAC1C,oCAAoC;gBACpC,+CAA+C;gBAC/C,KAAK,IAAI,eAAe,IAAI,UAAU,CAAC,UAAU,EAAE;oBAC/C,8FAA8F;oBAE9F,IAAI,SAAS,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE;wBAC3C,SAAS,KAAK,CAAC;qBAClB;oBAED,0FAA0F;oBAC1F,OAAO,KAAK,CAAC;iBAChB;aACJ;YACD,OAAO,IAAI,CAAC;SACf;aAAM,IAAI,0BAAa,CAAC,UAAU,CAAC,EAAE;YAClC,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,eAAe,CAAC,UAAmB;QACtC,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;IAEM,QAAQ;QACX,OAAO,SAAS,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;IAC5E,CAAC;IAEM,YAAY;QACf,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,wBAAW,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IACtE,CAAC;CACJ;AA9CD,8BA8CC"}
+{"version":3,"file":"ArrayType.js","sourceRoot":"","sources":["../../src/types/ArrayType.ts"],"names":[],"mappings":"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"}

package/dist/types/ArrayType.spec.js

@@ -5,25 +5,86 @@ const ArrayType_1 = require("./ArrayType");
 const DynamicType_1 = require("./DynamicType");
 const BooleanType_1 = require("./BooleanType");
 const StringType_1 = require("./StringType");
+const CustomType_1 = require("./CustomType");
+const IntegerType_1 = require("./IntegerType");
+const FloatType_1 = require("./FloatType");
+const Program_1 = require("../Program");
+const vscode_languageserver_protocol_1 = require("vscode-languageserver-protocol");
+const ObjectType_1 = require("./ObjectType");
 describe('ArrayType', () => {
-    it('is equivalent to array types', () => {
-        chai_1.expect(new ArrayType_1.ArrayType().isAssignableTo(new ArrayType_1.ArrayType())).to.be.true;
-        chai_1.expect(new ArrayType_1.ArrayType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
+    it('is assignable to correct types', () => {
+        (0, chai_1.expect)(new ArrayType_1.ArrayType().isAssignableTo(new ArrayType_1.ArrayType())).to.be.true;
+        (0, chai_1.expect)(new ArrayType_1.ArrayType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
+        (0, chai_1.expect)(new ArrayType_1.ArrayType().isAssignableTo(new ObjectType_1.ObjectType())).to.be.true;
     });
     it('catches arrays containing different inner types', () => {
-        chai_1.expect(new ArrayType_1.ArrayType(new BooleanType_1.BooleanType()).isAssignableTo(new ArrayType_1.ArrayType(new BooleanType_1.BooleanType()))).to.be.true;
-        chai_1.expect(new ArrayType_1.ArrayType(new BooleanType_1.BooleanType()).isAssignableTo(new ArrayType_1.ArrayType(new StringType_1.StringType()))).to.be.false;
+        (0, chai_1.expect)(new ArrayType_1.ArrayType(new BooleanType_1.BooleanType()).isAssignableTo(new ArrayType_1.ArrayType(new BooleanType_1.BooleanType()))).to.be.true;
+        (0, chai_1.expect)(new ArrayType_1.ArrayType(new BooleanType_1.BooleanType()).isAssignableTo(new ArrayType_1.ArrayType(new StringType_1.StringType()))).to.be.false;
+    });
+    it('sets the innerTypes to unique types', () => {
+        const boolArray = new ArrayType_1.ArrayType(new BooleanType_1.BooleanType(), new BooleanType_1.BooleanType());
+        (0, chai_1.expect)(boolArray.innerTypes.length).to.eql(1);
+        (0, chai_1.expect)(boolArray.innerTypes[0].equals(new BooleanType_1.BooleanType())).to.be.true;
+        (0, chai_1.expect)(boolArray.toJsString()).to.eql('Array<boolean>');
+        const multiTypeArray = new ArrayType_1.ArrayType(new BooleanType_1.BooleanType(), new StringType_1.StringType(), new BooleanType_1.BooleanType());
+        (0, chai_1.expect)(multiTypeArray.innerTypes.length).to.eql(2);
+        (0, chai_1.expect)(multiTypeArray.innerTypes[0].equals(new BooleanType_1.BooleanType())).to.be.true;
+        (0, chai_1.expect)(multiTypeArray.innerTypes[1].equals(new StringType_1.StringType())).to.be.true;
+        (0, chai_1.expect)(multiTypeArray.toJsString()).to.eql('Array<boolean | string>');
+    });
+    it('sets the innerTypes to custom types', () => {
+        (0, chai_1.expect)(new ArrayType_1.ArrayType(new CustomType_1.CustomType('MyKlass')).toString()).to.eql('MyKlass[]');
     });
     it('is not equivalent to other types', () => {
-        chai_1.expect(new ArrayType_1.ArrayType().isAssignableTo(new BooleanType_1.BooleanType())).to.be.false;
+        (0, chai_1.expect)(new ArrayType_1.ArrayType().isAssignableTo(new BooleanType_1.BooleanType())).to.be.false;
     });
-    describe('isConveribleTo', () => {
-        chai_1.expect(new ArrayType_1.ArrayType().isConvertibleTo(new BooleanType_1.BooleanType())).to.be.false;
-        chai_1.expect(new ArrayType_1.ArrayType().isConvertibleTo(new ArrayType_1.ArrayType())).to.be.true;
+    describe('isConvertibleTo', () => {
+        (0, chai_1.expect)(new ArrayType_1.ArrayType().isConvertibleTo(new BooleanType_1.BooleanType())).to.be.false;
+        (0, chai_1.expect)(new ArrayType_1.ArrayType().isConvertibleTo(new ArrayType_1.ArrayType())).to.be.true;
     });
     describe('toString', () => {
-        it('prints inner types', () => {
-            chai_1.expect(new ArrayType_1.ArrayType(new BooleanType_1.BooleanType(), new StringType_1.StringType()).toString()).to.eql('Array<boolean | string>');
+        it('returns the default type', () => {
+            (0, chai_1.expect)(new ArrayType_1.ArrayType(new BooleanType_1.BooleanType()).toString()).to.eql('boolean[]');
+            (0, chai_1.expect)(new ArrayType_1.ArrayType(new StringType_1.StringType()).toString()).to.eql('string[]');
+            (0, chai_1.expect)(new ArrayType_1.ArrayType(new CustomType_1.CustomType('MyKlass')).toString()).to.eql('MyKlass[]');
+        });
+        it('returns dynamic if more than one type is assigned', () => {
+            (0, chai_1.expect)(new ArrayType_1.ArrayType(new BooleanType_1.BooleanType(), new StringType_1.StringType()).toString()).to.eql('dynamic[]');
+        });
+    });
+    describe('unique types by assignability', () => {
+        it('follows the isAssignable method on the type', () => {
+            const numbersArray = new ArrayType_1.ArrayType(new IntegerType_1.IntegerType(), new FloatType_1.FloatType(), new IntegerType_1.IntegerType(), new FloatType_1.FloatType());
+            // integers ARE NOT assignable to float, and vice versa
+            (0, chai_1.expect)(numbersArray.innerTypes.length).to.eql(2);
+            (0, chai_1.expect)(numbersArray.innerTypes[0].equals(new IntegerType_1.IntegerType())).to.be.true;
+            (0, chai_1.expect)(numbersArray.innerTypes[1].equals(new FloatType_1.FloatType())).to.be.true;
+        });
+        it('sets the default type to Dynamic if types are not assignable', () => {
+            const numbersArray = new ArrayType_1.ArrayType(new IntegerType_1.IntegerType(), new FloatType_1.FloatType(), new IntegerType_1.IntegerType(), new FloatType_1.FloatType());
+            // integers ARE NOT assignable to float, and vice versa
+            (0, chai_1.expect)(numbersArray.getDefaultType().equals(new DynamicType_1.DynamicType())).to.be.true;
+        });
+        it('sets the default type to the most general of the types provided', () => {
+            const program = new Program_1.Program({
+                rootDir: process.cwd()
+            });
+            program.createSourceScope();
+            const file = program.setFile('source/main.bs', `
+                class Parent
+                end class
+
+                class Child extends Parent
+                end class
+
+                sub main()
+                    ' inside main
+                end sub
+            `);
+            const klassesArray = new ArrayType_1.ArrayType(new CustomType_1.CustomType('Child'), new CustomType_1.CustomType('Parent'), new CustomType_1.CustomType('Child'));
+            const context = { scope: program.getScopesForFile(file)[0], file: file, position: vscode_languageserver_protocol_1.Position.create(8, 23) };
+            (0, chai_1.expect)(klassesArray.innerTypes.length).to.eql(2);
+            (0, chai_1.expect)(klassesArray.getDefaultType(context).equals(new CustomType_1.CustomType('Parent'))).to.be.true;
         });
     });
 });

package/dist/types/ArrayType.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"ArrayType.spec.js","sourceRoot":"","sources":["../../src/types/ArrayType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,2CAAwC;AACxC,+CAA4C;AAC5C,+CAA4C;AAC5C,6CAA0C;AAE1C,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACvB,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACpC,aAAM,CAAC,IAAI,qBAAS,EAAE,CAAC,cAAc,CAAC,IAAI,qBAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACnE,aAAM,CAAC,IAAI,qBAAS,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IACzE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACvD,aAAM,CAAC,IAAI,qBAAS,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI,qBAAS,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACrG,aAAM,CAAC,IAAI,qBAAS,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI,qBAAS,CAAC,IAAI,uBAAU,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;IACzG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QACxC,aAAM,CAAC,IAAI,qBAAS,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC5B,aAAM,CAAC,IAAI,qBAAS,EAAE,CAAC,eAAe,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;QACvE,aAAM,CAAC,IAAI,qBAAS,EAAE,CAAC,eAAe,CAAC,IAAI,qBAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;QACtB,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;YAC1B,aAAM,CAAC,IAAI,qBAAS,CAAC,IAAI,yBAAW,EAAE,EAAE,IAAI,uBAAU,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;QAC5G,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"ArrayType.spec.js","sourceRoot":"","sources":["../../src/types/ArrayType.spec.ts"],"names":[],"mappings":"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"}

package/dist/types/BooleanType.d.ts

@@ -1,7 +1,9 @@
 import type { BscType } from './BscType';
 export declare class BooleanType implements BscType {
-    isAssignableTo(targetType: BscType): any;
-    isConvertibleTo(targetType: BscType): any;
+    typeText?: string;
+    constructor(typeText?: string);
+    isAssignableTo(targetType: BscType): boolean;
+    isConvertibleTo(targetType: BscType): boolean;
     toString(): string;
     toTypeString(): string;
     equals(targetType: BscType): boolean;

package/dist/types/BooleanType.js

@@ -3,21 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BooleanType = void 0;
 const reflection_1 = require("../astUtils/reflection");
 class BooleanType {
+    constructor(typeText) {
+        this.typeText = typeText;
+    }
     isAssignableTo(targetType) {
-        return (reflection_1.isBooleanType(targetType) ||
-            reflection_1.isDynamicType(targetType));
+        return ((0, reflection_1.isBooleanType)(targetType) ||
+            (0, reflection_1.isDynamicType)(targetType) ||
+            (0, reflection_1.isObjectType)(targetType));
     }
     isConvertibleTo(targetType) {
         return this.isAssignableTo(targetType);
     }
     toString() {
-        return 'boolean';
+        var _a;
+        return (_a = this.typeText) !== null && _a !== void 0 ? _a : 'boolean';
     }
     toTypeString() {
         return this.toString();
     }
     equals(targetType) {
-        return reflection_1.isBooleanType(targetType);
+        return (0, reflection_1.isBooleanType)(targetType);
     }
 }
 exports.BooleanType = BooleanType;

package/dist/types/BooleanType.js.map

@@ -1 +1 @@
-{"version":3,"file":"BooleanType.js","sourceRoot":"","sources":["../../src/types/BooleanType.ts"],"names":[],"mappings":";;;AAAA,uDAAsE;AAGtE,MAAa,WAAW;IACb,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,0BAAa,CAAC,UAAU,CAAC;YACzB,0BAAa,CAAC,UAAU,CAAC,CAC5B,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,UAAmB;QACtC,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;IAEM,QAAQ;QACX,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,0BAAa,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;CACJ;AAvBD,kCAuBC"}
+{"version":3,"file":"BooleanType.js","sourceRoot":"","sources":["../../src/types/BooleanType.ts"],"names":[],"mappings":";;;AAAA,uDAAoF;AAGpF,MAAa,WAAW;IACpB,YACW,QAAiB;QAAjB,aAAQ,GAAR,QAAQ,CAAS;IACxB,CAAC;IAEE,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC,CAC3B,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,UAAmB;QACtC,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,SAAS,CAAC;IACtC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,IAAA,0BAAa,EAAC,UAAU,CAAC,CAAC;IACrC,CAAC;CACJ;AA5BD,kCA4BC"}

package/dist/types/BooleanType.spec.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const chai_1 = require("chai");
 const BooleanType_1 = require("./BooleanType");
 const DynamicType_1 = require("./DynamicType");
+const ObjectType_1 = require("./ObjectType");
 describe('BooleanType', () => {
-    it('is equivalent to boolean types', () => {
-        chai_1.expect(new BooleanType_1.BooleanType().isAssignableTo(new BooleanType_1.BooleanType())).to.be.true;
-        chai_1.expect(new BooleanType_1.BooleanType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
+    it('is assignable to various types', () => {
+        (0, chai_1.expect)(new BooleanType_1.BooleanType().isAssignableTo(new BooleanType_1.BooleanType())).to.be.true;
+        (0, chai_1.expect)(new BooleanType_1.BooleanType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
+        (0, chai_1.expect)(new BooleanType_1.BooleanType().isAssignableTo(new ObjectType_1.ObjectType())).to.be.true;
     });
 });
 //# sourceMappingURL=BooleanType.spec.js.map

package/dist/types/BooleanType.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"BooleanType.spec.js","sourceRoot":"","sources":["../../src/types/BooleanType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,+CAA4C;AAC5C,+CAA4C;AAE5C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,aAAM,CAAC,IAAI,yBAAW,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACvE,aAAM,CAAC,IAAI,yBAAW,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC3E,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"BooleanType.spec.js","sourceRoot":"","sources":["../../src/types/BooleanType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,+CAA4C;AAC5C,+CAA4C;AAC5C,6CAA0C;AAE1C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,IAAA,aAAM,EAAC,IAAI,yBAAW,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACvE,IAAA,aAAM,EAAC,IAAI,yBAAW,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACvE,IAAA,aAAM,EAAC,IAAI,yBAAW,EAAE,CAAC,cAAc,CAAC,IAAI,uBAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC1E,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/dist/types/BscType.d.ts

@@ -1,7 +1,22 @@
+import type { Position } from 'vscode-languageserver';
+import type { BrsFile } from '../files/BrsFile';
+import type { Scope } from '../Scope';
+import type { SymbolTable } from '../SymbolTable';
 export interface BscType {
-    isAssignableTo(targetType: BscType): boolean;
-    isConvertibleTo(targetType: BscType): boolean;
-    toString(): string;
-    toTypeString(): string;
-    equals(targetType: BscType): boolean;
+    isAssignableTo(targetType: BscType, context?: TypeContext): boolean;
+    isConvertibleTo(targetType: BscType, context?: TypeContext): boolean;
+    toString(context?: TypeContext): string;
+    toTypeString(context?: TypeContext): string;
+    equals(targetType: BscType, context?: TypeContext): boolean;
+    memberTable?: SymbolTable;
 }
+export interface SymbolContainer {
+    memberTable: SymbolTable;
+}
+export interface TypeContext {
+    file: BrsFile;
+    scope: Scope;
+    position?: Position;
+}
+export declare function getTypeFromContext(type: BscType, context?: TypeContext): BscType;
+export declare function checkAssignabilityToInterface(sourceType: BscType, targetType: BscType, context?: TypeContext): any;

package/dist/types/BscType.js

@@ -1,3 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkAssignabilityToInterface = exports.getTypeFromContext = void 0;
+const reflection_1 = require("../astUtils/reflection");
+function getTypeFromContext(type, context) {
+    if ((0, reflection_1.isLazyType)(type)) {
+        return type.getTypeFromContext(context);
+    }
+    return type;
+}
+exports.getTypeFromContext = getTypeFromContext;
+function checkAssignabilityToInterface(sourceType, targetType, context) {
+    var _a;
+    if (!sourceType.memberTable || !targetType.memberTable || !(0, reflection_1.isInterfaceType)(targetType)) {
+        return false;
+    }
+    let isSuperSet = true;
+    const targetSymbols = (_a = targetType.memberTable) === null || _a === void 0 ? void 0 : _a.getAllSymbols();
+    for (const targetSymbol of targetSymbols) {
+        // TODO TYPES: this ignores union types
+        const mySymbolsWithName = sourceType.memberTable.getSymbol(targetSymbol.name);
+        isSuperSet = isSuperSet && mySymbolsWithName && mySymbolsWithName.length > 0 && mySymbolsWithName[0].type.isAssignableTo(targetSymbol.type, context);
+    }
+    return isSuperSet;
+}
+exports.checkAssignabilityToInterface = checkAssignabilityToInterface;
 //# sourceMappingURL=BscType.js.map

package/dist/types/BscType.js.map

@@ -1 +1 @@
-{"version":3,"file":"BscType.js","sourceRoot":"","sources":["../../src/types/BscType.ts"],"names":[],"mappings":""}
+{"version":3,"file":"BscType.js","sourceRoot":"","sources":["../../src/types/BscType.ts"],"names":[],"mappings":";;;AACA,uDAAqE;AAyBrE,SAAgB,kBAAkB,CAAC,IAAa,EAAE,OAAqB;IACnE,IAAI,IAAA,uBAAU,EAAC,IAAI,CAAC,EAAE;QAClB,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;KAC3C;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AALD,gDAKC;AAED,SAAgB,6BAA6B,CAAC,UAAmB,EAAE,UAAmB,EAAE,OAAqB;;IACzG,IAAI,CAAC,UAAU,CAAC,WAAW,IAAI,CAAC,UAAU,CAAC,WAAW,IAAI,CAAC,IAAA,4BAAe,EAAC,UAAU,CAAC,EAAE;QACpF,OAAO,KAAK,CAAC;KAChB;IACD,IAAI,UAAU,GAAG,IAAI,CAAC;IACtB,MAAM,aAAa,GAAG,MAAA,UAAU,CAAC,WAAW,0CAAE,aAAa,EAAE,CAAC;IAC9D,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;QACtC,uCAAuC;QAEvC,MAAM,iBAAiB,GAAG,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC9E,UAAU,GAAG,UAAU,IAAI,iBAAiB,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACxJ;IACD,OAAO,UAAU,CAAC;AACtB,CAAC;AAbD,sEAaC"}

package/dist/types/CustomType.d.ts

@@ -1,10 +1,12 @@
-import type { BscType } from './BscType';
-export declare class CustomType implements BscType {
+import type { SymbolTable } from '../SymbolTable';
+import type { BscType, SymbolContainer, TypeContext } from './BscType';
+export declare class CustomType implements BscType, SymbolContainer {
     name: string;
-    constructor(name: string);
+    memberTable: SymbolTable;
+    constructor(name: string, memberTable?: SymbolTable);
     toString(): string;
     toTypeString(): string;
-    isAssignableTo(targetType: BscType): boolean;
-    isConvertibleTo(targetType: BscType): boolean;
-    equals(targetType: BscType): boolean;
+    isAssignableTo(targetType: BscType, context?: TypeContext): boolean;
+    isConvertibleTo(targetType: BscType, context?: TypeContext): boolean;
+    equals(targetType: BscType, context?: TypeContext): boolean;
 }

package/dist/types/CustomType.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomType = void 0;
 const reflection_1 = require("../astUtils/reflection");
+const BscType_1 = require("./BscType");
 class CustomType {
-    constructor(name) {
+    constructor(name, memberTable = null) {
         this.name = name;
+        this.memberTable = memberTable;
     }
     toString() {
         return this.name;
@@ -12,23 +14,30 @@ class CustomType {
     toTypeString() {
         return 'object';
     }
-    isAssignableTo(targetType) {
-        //TODO for now, if the custom types have the same name, assume they're the same thing
-        if (reflection_1.isCustomType(targetType) && targetType.name === this.name) {
+    isAssignableTo(targetType, context) {
+        var _a;
+        if ((0, reflection_1.isObjectType)(targetType)) {
             return true;
         }
-        else if (reflection_1.isDynamicType(targetType)) {
+        const ancestorTypes = (_a = context === null || context === void 0 ? void 0 : context.scope) === null || _a === void 0 ? void 0 : _a.getAncestorTypeListByContext(this, context);
+        if (ancestorTypes === null || ancestorTypes === void 0 ? void 0 : ancestorTypes.find(ancestorType => targetType.equals(ancestorType, context))) {
             return true;
         }
-        else {
-            return false;
+        if (this.memberTable && targetType.memberTable) {
+            // both have symbol tables, so check if the target is an interface and has all the members of the target
+            if ((0, BscType_1.checkAssignabilityToInterface)(this, targetType, context)) {
+                return true;
+            }
         }
+        return (this.equals(targetType, context) ||
+            (0, reflection_1.isObjectType)(targetType) ||
+            (0, reflection_1.isDynamicType)(targetType));
     }
-    isConvertibleTo(targetType) {
-        return this.isAssignableTo(targetType);
+    isConvertibleTo(targetType, context) {
+        return this.isAssignableTo(targetType, context);
     }
-    equals(targetType) {
-        return this.toString() === targetType.toString();
+    equals(targetType, context) {
+        return (0, reflection_1.isCustomType)(targetType) && this.toString() === (targetType === null || targetType === void 0 ? void 0 : targetType.toString());
     }
 }
 exports.CustomType = CustomType;

package/dist/types/CustomType.js.map

@@ -1 +1 @@
-{"version":3,"file":"CustomType.js","sourceRoot":"","sources":["../../src/types/CustomType.ts"],"names":[],"mappings":";;;AAAA,uDAAqE;AAGrE,MAAa,UAAU;IAEnB,YAAmB,IAAY;QAAZ,SAAI,GAAJ,IAAI,CAAQ;IAC/B,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAEM,YAAY;QACf,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,cAAc,CAAC,UAAmB;QACrC,qFAAqF;QACrF,IAAI,yBAAY,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE;YAC3D,OAAO,IAAI,CAAC;SACf;aAAM,IAAI,0BAAa,CAAC,UAAU,CAAC,EAAE;YAClC,OAAO,IAAI,CAAC;SACf;aAAM;YACH,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IAEM,eAAe,CAAC,UAAmB;QACtC,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,IAAI,CAAC,QAAQ,EAAE,KAAK,UAAU,CAAC,QAAQ,EAAE,CAAC;IACrD,CAAC;CACJ;AA/BD,gCA+BC"}
+{"version":3,"file":"CustomType.js","sourceRoot":"","sources":["../../src/types/CustomType.ts"],"names":[],"mappings":";;;AAAA,uDAAmF;AAGnF,uCAA0D;AAE1D,MAAa,UAAU;IAEnB,YAAmB,IAAY,EAAS,cAA2B,IAAI;QAApD,SAAI,GAAJ,IAAI,CAAQ;QAAS,gBAAW,GAAX,WAAW,CAAoB;IACvE,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAEM,YAAY;QACf,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,cAAc,CAAC,UAAmB,EAAE,OAAqB;;QAC5D,IAAI,IAAA,yBAAY,EAAC,UAAU,CAAC,EAAE;YAC1B,OAAO,IAAI,CAAC;SACf;QACD,MAAM,aAAa,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,4BAA4B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClF,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,EAAE;YAC/E,OAAO,IAAI,CAAC;SACf;QACD,IAAI,IAAI,CAAC,WAAW,IAAI,UAAU,CAAC,WAAW,EAAE;YAC5C,wGAAwG;YACxG,IAAI,IAAA,uCAA6B,EAAC,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE;gBAC1D,OAAO,IAAI,CAAC;aACf;SACJ;QACD,OAAO,CACH,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC;YAChC,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC,CAC5B,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,UAAmB,EAAE,OAAqB;QAC7D,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IAEM,MAAM,CAAC,UAAmB,EAAE,OAAqB;QACpD,OAAO,IAAA,yBAAY,EAAC,UAAU,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,MAAK,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,EAAE,CAAA,CAAC;IAClF,CAAC;CACJ;AAzCD,gCAyCC"}

package/dist/types/DoubleType.d.ts

@@ -1,5 +1,7 @@
 import type { BscType } from './BscType';
 export declare class DoubleType implements BscType {
+    typeText?: string;
+    constructor(typeText?: string);
     isAssignableTo(targetType: BscType): boolean;
     isConvertibleTo(targetType: BscType): boolean;
     toString(): string;

package/dist/types/DoubleType.js

@@ -3,16 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DoubleType = void 0;
 const reflection_1 = require("../astUtils/reflection");
 class DoubleType {
+    constructor(typeText) {
+        this.typeText = typeText;
+    }
     isAssignableTo(targetType) {
-        return (reflection_1.isDoubleType(targetType) ||
-            reflection_1.isDynamicType(targetType));
+        return ((0, reflection_1.isDoubleType)(targetType) ||
+            (0, reflection_1.isDynamicType)(targetType) ||
+            (0, reflection_1.isObjectType)(targetType));
     }
     isConvertibleTo(targetType) {
-        if (reflection_1.isDynamicType(targetType) ||
-            reflection_1.isIntegerType(targetType) ||
-            reflection_1.isFloatType(targetType) ||
-            reflection_1.isDoubleType(targetType) ||
-            reflection_1.isLongIntegerType(targetType)) {
+        if ((0, reflection_1.isDynamicType)(targetType) ||
+            (0, reflection_1.isIntegerType)(targetType) ||
+            (0, reflection_1.isFloatType)(targetType) ||
+            (0, reflection_1.isDoubleType)(targetType) ||
+            (0, reflection_1.isLongIntegerType)(targetType)) {
             return true;
         }
         else {
@@ -20,13 +24,14 @@ class DoubleType {
         }
     }
     toString() {
-        return 'double';
+        var _a;
+        return (_a = this.typeText) !== null && _a !== void 0 ? _a : 'double';
     }
     toTypeString() {
         return this.toString();
     }
     equals(targetType) {
-        return this.toString() === targetType.toString();
+        return this.toString() === (targetType === null || targetType === void 0 ? void 0 : targetType.toString());
     }
 }
 exports.DoubleType = DoubleType;

package/dist/types/DoubleType.js.map

@@ -1 +1 @@
-{"version":3,"file":"DoubleType.js","sourceRoot":"","sources":["../../src/types/DoubleType.ts"],"names":[],"mappings":";;;AAAA,uDAAoH;AAGpH,MAAa,UAAU;IACZ,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,yBAAY,CAAC,UAAU,CAAC;YACxB,0BAAa,CAAC,UAAU,CAAC,CAC5B,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,UAAmB;QACtC,IACI,0BAAa,CAAC,UAAU,CAAC;YACzB,0BAAa,CAAC,UAAU,CAAC;YACzB,wBAAW,CAAC,UAAU,CAAC;YACvB,yBAAY,CAAC,UAAU,CAAC;YACxB,8BAAiB,CAAC,UAAU,CAAC,EAC/B;YACE,OAAO,IAAI,CAAC;SACf;aAAM;YACH,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IACM,QAAQ;QACX,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,IAAI,CAAC,QAAQ,EAAE,KAAK,UAAU,CAAC,QAAQ,EAAE,CAAC;IACrD,CAAC;CACJ;AAhCD,gCAgCC"}
+{"version":3,"file":"DoubleType.js","sourceRoot":"","sources":["../../src/types/DoubleType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAGlI,MAAa,UAAU;IACnB,YACW,QAAiB;QAAjB,aAAQ,GAAR,QAAQ,CAAS;IACxB,CAAC;IAEE,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC,CAC3B,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,UAAmB;QACtC,IACI,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,wBAAW,EAAC,UAAU,CAAC;YACvB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,8BAAiB,EAAC,UAAU,CAAC,EAC/B;YACE,OAAO,IAAI,CAAC;SACf;aAAM;YACH,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IACM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,QAAQ,CAAC;IACrC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,IAAI,CAAC,QAAQ,EAAE,MAAK,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,EAAE,CAAA,CAAC;IACtD,CAAC;CACJ;AArCD,gCAqCC"}

package/dist/types/DoubleType.spec.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const chai_1 = require("chai");
 const DoubleType_1 = require("./DoubleType");
 const DynamicType_1 = require("./DynamicType");
+const ObjectType_1 = require("./ObjectType");
 describe('DoubleType', () => {
-    it('is equivalent to double types', () => {
-        chai_1.expect(new DoubleType_1.DoubleType().isAssignableTo(new DoubleType_1.DoubleType())).to.be.true;
-        chai_1.expect(new DoubleType_1.DoubleType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
+    it('is assignable to correct types', () => {
+        (0, chai_1.expect)(new DoubleType_1.DoubleType().isAssignableTo(new DoubleType_1.DoubleType())).to.be.true;
+        (0, chai_1.expect)(new DoubleType_1.DoubleType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
+        (0, chai_1.expect)(new DoubleType_1.DoubleType().isAssignableTo(new ObjectType_1.ObjectType())).to.be.true;
     });
 });
 //# sourceMappingURL=DoubleType.spec.js.map

package/dist/types/DoubleType.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"DoubleType.spec.js","sourceRoot":"","sources":["../../src/types/DoubleType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,6CAA0C;AAC1C,+CAA4C;AAE5C,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IACxB,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACrC,aAAM,CAAC,IAAI,uBAAU,EAAE,CAAC,cAAc,CAAC,IAAI,uBAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACrE,aAAM,CAAC,IAAI,uBAAU,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC1E,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"DoubleType.spec.js","sourceRoot":"","sources":["../../src/types/DoubleType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,6CAA0C;AAC1C,+CAA4C;AAC5C,6CAA0C;AAE1C,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IACxB,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,IAAA,aAAM,EAAC,IAAI,uBAAU,EAAE,CAAC,cAAc,CAAC,IAAI,uBAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACrE,IAAA,aAAM,EAAC,IAAI,uBAAU,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACtE,IAAA,aAAM,EAAC,IAAI,uBAAU,EAAE,CAAC,cAAc,CAAC,IAAI,uBAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IACzE,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/dist/types/DynamicType.d.ts

@@ -1,5 +1,7 @@
 import type { BscType } from './BscType';
 export declare class DynamicType implements BscType {
+    typeText?: string;
+    constructor(typeText?: string);
     isAssignableTo(targetType: BscType): boolean;
     /**
      * The dynamic type is convertible to everything.

package/dist/types/DynamicType.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DynamicType = void 0;
 const reflection_1 = require("../astUtils/reflection");
 class DynamicType {
+    constructor(typeText) {
+        this.typeText = typeText;
+    }
     isAssignableTo(targetType) {
         //everything can be dynamic, so as long as a type is provided, this is true
         return !!targetType;
@@ -16,13 +19,14 @@ class DynamicType {
         return !!targetType;
     }
     toString() {
-        return 'dynamic';
+        var _a;
+        return (_a = this.typeText) !== null && _a !== void 0 ? _a : 'dynamic';
     }
     toTypeString() {
         return this.toString();
     }
     equals(targetType) {
-        return reflection_1.isDynamicType(targetType);
+        return (0, reflection_1.isDynamicType)(targetType);
     }
 }
 exports.DynamicType = DynamicType;

package/dist/types/DynamicType.js.map

@@ -1 +1 @@
-{"version":3,"file":"DynamicType.js","sourceRoot":"","sources":["../../src/types/DynamicType.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AAGvD,MAAa,WAAW;IAEb,cAAc,CAAC,UAAmB;QACrC,2EAA2E;QAC3E,OAAO,CAAC,CAAC,UAAU,CAAC;IACxB,CAAC;IAED;;;OAGG;IACI,eAAe,CAAC,UAAmB;QACtC,2EAA2E;QAC3E,OAAO,CAAC,CAAC,UAAU,CAAC;IACxB,CAAC;IAEM,QAAQ;QACX,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,0BAAa,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;CACJ;AA3BD,kCA2BC"}
+{"version":3,"file":"DynamicType.js","sourceRoot":"","sources":["../../src/types/DynamicType.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AAGvD,MAAa,WAAW;IACpB,YACW,QAAiB;QAAjB,aAAQ,GAAR,QAAQ,CAAS;IACxB,CAAC;IAEE,cAAc,CAAC,UAAmB;QACrC,2EAA2E;QAC3E,OAAO,CAAC,CAAC,UAAU,CAAC;IACxB,CAAC;IAED;;;OAGG;IACI,eAAe,CAAC,UAAmB;QACtC,2EAA2E;QAC3E,OAAO,CAAC,CAAC,UAAU,CAAC;IACxB,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,SAAS,CAAC;IACtC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,IAAA,0BAAa,EAAC,UAAU,CAAC,CAAC;IACrC,CAAC;CACJ;AA9BD,kCA8BC"}