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

package/dist/types/DynamicType.spec.js

@@ -5,8 +5,8 @@ const DynamicType_1 = require("./DynamicType");
 const StringType_1 = require("./StringType");
 describe('DynamicType', () => {
     it('is equivalent to dynamic types', () => {
-        chai_1.expect(new DynamicType_1.DynamicType().isAssignableTo(new StringType_1.StringType())).to.be.true;
-        chai_1.expect(new DynamicType_1.DynamicType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
+        (0, chai_1.expect)(new DynamicType_1.DynamicType().isAssignableTo(new StringType_1.StringType())).to.be.true;
+        (0, chai_1.expect)(new DynamicType_1.DynamicType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
     });
 });
 //# sourceMappingURL=DynamicType.spec.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"DynamicType.spec.js","sourceRoot":"","sources":["../../src/types/DynamicType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,+CAA4C;AAC5C,6CAA0C;AAE1C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,aAAM,CAAC,IAAI,yBAAW,EAAE,CAAC,cAAc,CAAC,IAAI,uBAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACtE,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":"DynamicType.spec.js","sourceRoot":"","sources":["../../src/types/DynamicType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,+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,uBAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACtE,IAAA,aAAM,EAAC,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"}

package/dist/types/EnumType.d.ts

@@ -0,0 +1,22 @@
+import type { BscType, SymbolContainer } from './BscType';
+import type { SymbolTable } from '../SymbolTable';
+export declare class EnumType implements BscType, SymbolContainer {
+    name: string;
+    memberTable: SymbolTable;
+    constructor(name: string, memberTable?: SymbolTable);
+    isAssignableTo(targetType: BscType): boolean;
+    isConvertibleTo(targetType: BscType): boolean;
+    toString(): string;
+    toTypeString(): string;
+    equals(targetType: BscType): boolean;
+}
+export declare class EnumMemberType implements BscType {
+    enumName: string;
+    memberName: string;
+    constructor(enumName: string, memberName: string);
+    isAssignableTo(targetType: BscType): boolean;
+    isConvertibleTo(targetType: BscType): boolean;
+    toString(): string;
+    toTypeString(): string;
+    equals(targetType: BscType): boolean;
+}

package/dist/types/EnumType.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EnumMemberType = exports.EnumType = void 0;
+const reflection_1 = require("../astUtils/reflection");
+class EnumType {
+    constructor(name, memberTable = null) {
+        this.name = name;
+        this.memberTable = memberTable;
+    }
+    isAssignableTo(targetType) {
+        return (this.equals(targetType) ||
+            (0, reflection_1.isDynamicType)(targetType));
+    }
+    isConvertibleTo(targetType) {
+        return this.isAssignableTo(targetType);
+    }
+    toString() {
+        return this.name;
+    }
+    toTypeString() {
+        return 'dynamic';
+    }
+    equals(targetType) {
+        return (0, reflection_1.isEnumType)(targetType) && (targetType === null || targetType === void 0 ? void 0 : targetType.name.toLowerCase()) === this.name.toLowerCase();
+    }
+}
+exports.EnumType = EnumType;
+class EnumMemberType {
+    constructor(enumName, memberName) {
+        this.enumName = enumName;
+        this.memberName = memberName;
+    }
+    isAssignableTo(targetType) {
+        return (this.equals(targetType) ||
+            ((0, reflection_1.isEnumType)(targetType) &&
+                (targetType === null || targetType === void 0 ? void 0 : targetType.name.toLowerCase()) === this.enumName.toLowerCase()) ||
+            (0, reflection_1.isDynamicType)(targetType));
+    }
+    isConvertibleTo(targetType) {
+        return this.isAssignableTo(targetType);
+    }
+    toString() {
+        return this.enumName;
+    }
+    toTypeString() {
+        return 'dynamic';
+    }
+    equals(targetType) {
+        return (0, reflection_1.isEnumMemberType)(targetType) &&
+            (targetType === null || targetType === void 0 ? void 0 : targetType.enumName.toLowerCase()) === this.enumName.toLowerCase() &&
+            (targetType === null || targetType === void 0 ? void 0 : targetType.memberName.toLowerCase()) === this.memberName.toLowerCase();
+    }
+}
+exports.EnumMemberType = EnumMemberType;
+//# sourceMappingURL=EnumType.js.map

package/dist/types/EnumType.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EnumType.js","sourceRoot":"","sources":["../../src/types/EnumType.ts"],"names":[],"mappings":";;;AAAA,uDAAqF;AAIrF,MAAa,QAAQ;IACjB,YACW,IAAY,EAAS,cAA2B,IAAI;QAApD,SAAI,GAAJ,IAAI,CAAQ;QAAS,gBAAW,GAAX,WAAW,CAAoB;IAC3D,CAAC;IAEE,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;YACvB,IAAA,0BAAa,EAAC,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,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAEM,YAAY;QACf,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,IAAA,uBAAU,EAAC,UAAU,CAAC,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,CAAC,WAAW,EAAE,MAAK,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IAChG,CAAC;CACJ;AA3BD,4BA2BC;AAGD,MAAa,cAAc;IACvB,YACW,QAAgB,EAChB,UAAkB;QADlB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,eAAU,GAAV,UAAU,CAAQ;IACzB,CAAC;IAEE,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;YACvB,CAAC,IAAA,uBAAU,EAAC,UAAU,CAAC;gBACnB,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,CAAC,WAAW,EAAE,MAAK,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;YACnE,IAAA,0BAAa,EAAC,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,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAEM,YAAY;QACf,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,IAAA,6BAAgB,EAAC,UAAU,CAAC;YAC/B,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,CAAC,WAAW,EAAE,MAAK,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE;YAClE,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,CAAC,WAAW,EAAE,MAAK,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;IAC/E,CAAC;CACJ;AAhCD,wCAgCC"}

package/dist/types/FloatType.d.ts

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

package/dist/types/FloatType.js

@@ -3,16 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FloatType = void 0;
 const reflection_1 = require("../astUtils/reflection");
 class FloatType {
+    constructor(typeText) {
+        this.typeText = typeText;
+    }
     isAssignableTo(targetType) {
-        return (reflection_1.isFloatType(targetType) ||
-            reflection_1.isDynamicType(targetType));
+        return ((0, reflection_1.isFloatType)(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 FloatType {
         }
     }
     toString() {
-        return 'float';
+        var _a;
+        return (_a = this.typeText) !== null && _a !== void 0 ? _a : 'float';
     }
     toTypeString() {
         return this.toString();
     }
     equals(targetType) {
-        return this.toString() === targetType.toString();
+        return this.toString() === (targetType === null || targetType === void 0 ? void 0 : targetType.toString());
     }
 }
 exports.FloatType = FloatType;

package/dist/types/FloatType.js.map

@@ -1 +1 @@
-{"version":3,"file":"FloatType.js","sourceRoot":"","sources":["../../src/types/FloatType.ts"],"names":[],"mappings":";;;AAAA,uDAAoH;AAGpH,MAAa,SAAS;IACX,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,wBAAW,CAAC,UAAU,CAAC;YACvB,0BAAa,CAAC,UAAU,CAAC,CAE5B,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;IAEM,QAAQ;QACX,OAAO,OAAO,CAAC;IACnB,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;AAlCD,8BAkCC"}
+{"version":3,"file":"FloatType.js","sourceRoot":"","sources":["../../src/types/FloatType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAGlI,MAAa,SAAS;IAClB,YACW,QAAiB;QAAjB,aAAQ,GAAR,QAAQ,CAAS;IACxB,CAAC;IAEE,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,IAAA,wBAAW,EAAC,UAAU,CAAC;YACvB,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;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,OAAO,CAAC;IACpC,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;AAtCD,8BAsCC"}

package/dist/types/FloatType.spec.js

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

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

@@ -1 +1 @@
-{"version":3,"file":"FloatType.spec.js","sourceRoot":"","sources":["../../src/types/FloatType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,+CAA4C;AAC5C,2CAAwC;AAExC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACvB,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACrC,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;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"FloatType.spec.js","sourceRoot":"","sources":["../../src/types/FloatType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,+CAA4C;AAC5C,2CAAwC;AACxC,6CAA0C;AAE1C,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACvB,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACrC,IAAA,aAAM,EAAC,IAAI,qBAAS,EAAE,CAAC,cAAc,CAAC,IAAI,qBAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACnE,IAAA,aAAM,EAAC,IAAI,qBAAS,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACrE,IAAA,aAAM,EAAC,IAAI,qBAAS,EAAE,CAAC,cAAc,CAAC,IAAI,uBAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IACxE,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/dist/types/FunctionType.d.ts

@@ -1,33 +1,9 @@
-import type { BscType } from './BscType';
-export declare class FunctionType implements BscType {
-    returnType: BscType;
-    /**
-     * Determines if this is a sub or not
-     */
-    isSub: boolean;
-    params: {
-        name: string;
-        type: BscType;
-        isRequired: boolean;
-    }[];
-    constructor(returnType: BscType, 
-    /**
-     * Determines if this is a sub or not
-     */
-    isSub?: boolean, params?: {
-        name: string;
-        type: BscType;
-        isRequired: boolean;
-    }[]);
-    /**
-     * The name of the function for this type. Can be null
-     */
-    name: string;
+import type { CallableParam } from '../interfaces';
+import type { BscType, TypeContext } from './BscType';
+import { TypedFunctionType } from './TypedFunctionType';
+export declare class FunctionType extends TypedFunctionType implements BscType {
+    constructor();
     setName(name: string): this;
-    addParameter(name: string, type: BscType, isRequired: boolean): this;
-    isAssignableTo(targetType: BscType): boolean;
-    isConvertibleTo(targetType: BscType): boolean;
-    toString(): string;
-    toTypeString(): string;
-    equals(targetType: BscType): boolean;
+    addParameter(paramOrName: CallableParam | string, type?: BscType, isOptional?: boolean): this;
+    equals(targetType: BscType, context?: TypeContext): boolean;
 }

package/dist/types/FunctionType.js

@@ -2,69 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FunctionType = void 0;
 const reflection_1 = require("../astUtils/reflection");
-class FunctionType {
-    constructor(returnType, 
-    /**
-     * Determines if this is a sub or not
-     */
-    isSub = false, params = []) {
-        this.returnType = returnType;
-        this.isSub = isSub;
-        this.params = params;
+const DynamicType_1 = require("./DynamicType");
+const TypedFunctionType_1 = require("./TypedFunctionType");
+class FunctionType extends TypedFunctionType_1.TypedFunctionType {
+    constructor() {
+        super(new DynamicType_1.DynamicType());
+        this.isVariadic = true;
     }
     setName(name) {
-        this.name = name;
+        // noop
         return this;
     }
-    addParameter(name, type, isRequired) {
-        this.params.push({
-            name: name,
-            type: type,
-            isRequired: isRequired === false ? false : true
-        });
+    addParameter(paramOrName, type, isOptional) {
+        // noop
         return this;
     }
-    isAssignableTo(targetType) {
-        if (reflection_1.isFunctionType(targetType)) {
-            //compare all parameters
-            let len = Math.max(this.params.length, targetType.params.length);
-            for (let i = 0; i < len; i++) {
-                let myParam = this.params[i];
-                let targetParam = targetType.params[i];
-                if (!myParam || !targetParam || !myParam.type.isAssignableTo(targetParam.type)) {
-                    return false;
-                }
-            }
-            //compare return type
-            if (!this.returnType || !targetType.returnType || !this.returnType.isAssignableTo(targetType.returnType)) {
-                return false;
-            }
-            //made it here, all params and return type are equivalent
-            return true;
-        }
-        else if (reflection_1.isDynamicType(targetType)) {
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-    isConvertibleTo(targetType) {
-        return this.isAssignableTo(targetType);
-    }
-    toString() {
-        var _a;
-        let paramTexts = [];
-        for (let param of this.params) {
-            paramTexts.push(`${param.name}${param.isRequired ? '' : '?'} as ${param.type.toString()}`);
-        }
-        return `${this.isSub ? 'sub' : 'function'} ${(_a = this.name) !== null && _a !== void 0 ? _a : ''}(${paramTexts.join(', ')}) as ${this.returnType.toString()}`;
-    }
-    toTypeString() {
-        return 'Function';
-    }
-    equals(targetType) {
-        return (reflection_1.isFunctionType(targetType)) && this.isAssignableTo(targetType);
+    equals(targetType, context) {
+        return ((0, reflection_1.isFunctionType)(targetType));
     }
 }
 exports.FunctionType = FunctionType;

package/dist/types/FunctionType.js.map

@@ -1 +1 @@
-{"version":3,"file":"FunctionType.js","sourceRoot":"","sources":["../../src/types/FunctionType.ts"],"names":[],"mappings":";;;AAAA,uDAAuE;AAGvE,MAAa,YAAY;IACrB,YACW,UAAmB;IAC1B;;OAEG;IACI,QAAQ,KAAK,EACb,SAAS,EAAiE;QAL1E,eAAU,GAAV,UAAU,CAAS;QAInB,UAAK,GAAL,KAAK,CAAQ;QACb,WAAM,GAAN,MAAM,CAAoE;IAErF,CAAC;IAOM,OAAO,CAAC,IAAY;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,YAAY,CAAC,IAAY,EAAE,IAAa,EAAE,UAAmB;QAChE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;YACV,UAAU,EAAE,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;SAClD,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,cAAc,CAAC,UAAmB;QACrC,IAAI,2BAAc,CAAC,UAAU,CAAC,EAAE;YAC5B,wBAAwB;YACxB,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACjE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;gBAC1B,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC7B,IAAI,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACvC,IAAI,CAAC,OAAO,IAAI,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;oBAC5E,OAAO,KAAK,CAAC;iBAChB;aACJ;YAED,qBAAqB;YACrB,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;gBACtG,OAAO,KAAK,CAAC;aAChB;YAED,yDAAyD;YACzD,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,QAAQ;;QACX,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,KAAK,IAAI,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE;YAC3B,UAAU,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SAC9F;QACD,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,IAAI,MAAA,IAAI,CAAC,IAAI,mCAAI,EAAE,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAC;IAE9H,CAAC;IAEM,YAAY;QACf,OAAO,UAAU,CAAC;IACtB,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,CAAC,2BAAc,CAAC,UAAU,CAAC,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAC3E,CAAC;CACJ;AA5ED,oCA4EC"}
+{"version":3,"file":"FunctionType.js","sourceRoot":"","sources":["../../src/types/FunctionType.ts"],"names":[],"mappings":";;;AAAA,uDAAwD;AAGxD,+CAA4C;AAC5C,2DAAwD;AAExD,MAAa,YAAa,SAAQ,qCAAiB;IAE/C;QAEI,KAAK,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IAC3B,CAAC;IAEM,OAAO,CAAC,IAAY;QACvB,OAAO;QACP,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,YAAY,CAAC,WAAmC,EAAE,IAAc,EAAE,UAAoB;QACzF,OAAO;QACP,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,MAAM,CAAC,UAAmB,EAAE,OAAqB;QACpD,OAAO,CAAC,IAAA,2BAAc,EAAC,UAAU,CAAC,CAAC,CAAC;IACxC,CAAC;CACJ;AApBD,oCAoBC"}

package/dist/types/IntegerType.d.ts

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

package/dist/types/IntegerType.js

@@ -3,16 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.IntegerType = void 0;
 const reflection_1 = require("../astUtils/reflection");
 class IntegerType {
+    constructor(typeText) {
+        this.typeText = typeText;
+    }
     isAssignableTo(targetType) {
-        return (reflection_1.isIntegerType(targetType) ||
-            reflection_1.isDynamicType(targetType));
+        return ((0, reflection_1.isIntegerType)(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 IntegerType {
         }
     }
     toString() {
-        return 'integer';
+        var _a;
+        return (_a = this.typeText) !== null && _a !== void 0 ? _a : 'integer';
     }
     toTypeString() {
         return this.toString();
     }
     equals(targetType) {
-        return this.toString() === targetType.toString();
+        return this.toString() === (targetType === null || targetType === void 0 ? void 0 : targetType.toString());
     }
 }
 exports.IntegerType = IntegerType;

package/dist/types/IntegerType.js.map

@@ -1 +1 @@
-{"version":3,"file":"IntegerType.js","sourceRoot":"","sources":["../../src/types/IntegerType.ts"],"names":[],"mappings":";;;AAAA,uDAAoH;AAIpH,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,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;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,IAAI,CAAC,QAAQ,EAAE,KAAK,UAAU,CAAC,QAAQ,EAAE,CAAC;IACrD,CAAC;CACJ;AAjCD,kCAiCC"}
+{"version":3,"file":"IntegerType.js","sourceRoot":"","sources":["../../src/types/IntegerType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAIlI,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,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;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,IAAI,CAAC,QAAQ,EAAE,MAAK,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,EAAE,CAAA,CAAC;IACtD,CAAC;CACJ;AAtCD,kCAsCC"}

package/dist/types/IntegerType.spec.js

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

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

@@ -1 +1 @@
-{"version":3,"file":"IntegerType.spec.js","sourceRoot":"","sources":["../../src/types/IntegerType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,+CAA4C;AAC5C,+CAA4C;AAE5C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC5C,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":"IntegerType.spec.js","sourceRoot":"","sources":["../../src/types/IntegerType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,+CAA4C;AAC5C,+CAA4C;AAC5C,6CAA0C;AAE1C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC3C,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/InterfaceType.d.ts

@@ -1,8 +1,17 @@
-import type { BscType } from './BscType';
-export declare class InterfaceType implements BscType {
-    isAssignableTo(targetType: BscType): any;
+import type { SymbolTable } from '../SymbolTable';
+import type { BscType, SymbolContainer, TypeContext } from './BscType';
+export declare class InterfaceType implements BscType, SymbolContainer {
+    name: string;
+    memberTable: SymbolTable;
+    constructor(name: string, memberTable?: SymbolTable);
+    isAssignableTo(targetType: BscType, context?: TypeContext): any;
     isConvertibleTo(targetType: BscType): any;
     toString(): string;
+    /**
+     * Gets a string representation of the Interface that looks like javascript
+     * @returns {string}
+     */
+    toJsString(): string;
     toTypeString(): string;
-    equals(targetType: BscType): boolean;
+    equals(targetType: BscType, context?: TypeContext): boolean;
 }

package/dist/types/InterfaceType.js

@@ -2,23 +2,63 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InterfaceType = void 0;
 const reflection_1 = require("../astUtils/reflection");
+const BscType_1 = require("./BscType");
 class InterfaceType {
-    isAssignableTo(targetType) {
-        return (reflection_1.isInterfaceType(targetType) ||
-            reflection_1.isDynamicType(targetType));
+    constructor(name, memberTable = null) {
+        this.name = name;
+        this.memberTable = memberTable;
+    }
+    isAssignableTo(targetType, context) {
+        var _a;
+        if ((0, reflection_1.isObjectType)(targetType)) {
+            return true;
+        }
+        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;
+        }
+        if (this.memberTable && targetType.memberTable) {
+            // both have symbol tables, so check if this interface has all the members of the target
+            return (0, BscType_1.checkAssignabilityToInterface)(this, targetType, context);
+        }
+        return (this.equals(targetType, context) ||
+            (0, reflection_1.isObjectType)(targetType) ||
+            (0, reflection_1.isDynamicType)(targetType));
     }
     isConvertibleTo(targetType) {
         return this.isAssignableTo(targetType);
     }
     toString() {
-        //TODO make this match the actual interface of the object
-        return 'interface';
+        return this.name;
+    }
+    /**
+     * Gets a string representation of the Interface that looks like javascript
+     * @returns {string}
+     */
+    toJsString() {
+        var _a;
+        let result = '{';
+        const memberSymbols = (((_a = this.memberTable) === null || _a === void 0 ? void 0 : _a.getAllSymbols()) || []).sort((a, b) => a.name.localeCompare(b.name));
+        for (const symbol of memberSymbols) {
+            let symbolTypeString = symbol.type.toString();
+            if ((0, reflection_1.isInterfaceType)(symbol.type)) {
+                symbolTypeString = symbol.type.toJsString();
+            }
+            result += ' ' + symbol.name + ': ' + symbolTypeString + ';';
+        }
+        if (memberSymbols.length > 0) {
+            result += ' ';
+        }
+        return result + '}';
     }
     toTypeString() {
-        return this.toString();
+        return 'object';
     }
-    equals(targetType) {
-        return reflection_1.isInterfaceType(targetType);
+    equals(targetType, context) {
+        if ((0, reflection_1.isInterfaceType)(targetType)) {
+            return this.isAssignableTo(targetType, context) && targetType.isAssignableTo(this, context);
+        }
+        return false;
     }
 }
 exports.InterfaceType = InterfaceType;

package/dist/types/InterfaceType.js.map

@@ -1 +1 @@
-{"version":3,"file":"InterfaceType.js","sourceRoot":"","sources":["../../src/types/InterfaceType.ts"],"names":[],"mappings":";;;AAAA,uDAAwE;AAGxE,MAAa,aAAa;IACf,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,4BAAe,CAAC,UAAU,CAAC;YAC3B,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,yDAAyD;QACzD,OAAO,WAAW,CAAC;IACvB,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,4BAAe,CAAC,UAAU,CAAC,CAAC;IACvC,CAAC;CACJ;AAxBD,sCAwBC"}
+{"version":3,"file":"InterfaceType.js","sourceRoot":"","sources":["../../src/types/InterfaceType.ts"],"names":[],"mappings":";;;AAAA,uDAAsF;AAGtF,uCAA0D;AAE1D,MAAa,aAAa;IACtB,YACW,IAAY,EAAS,cAA2B,IAAI;QAApD,SAAI,GAAJ,IAAI,CAAQ;QAAS,gBAAW,GAAX,WAAW,CAAoB;IAG/D,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,wFAAwF;YACxF,OAAO,IAAA,uCAA6B,EAAC,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;SACnE;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;QACtC,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAED;;;OAGG;IACI,UAAU;;QACb,IAAI,MAAM,GAAG,GAAG,CAAC;QACjB,MAAM,aAAa,GAAG,CAAC,CAAA,MAAA,IAAI,CAAC,WAAW,0CAAE,aAAa,EAAE,KAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7G,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE;YAChC,IAAI,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC9C,IAAI,IAAA,4BAAe,EAAC,MAAM,CAAC,IAAI,CAAC,EAAE;gBAC9B,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;aAC/C;YACD,MAAM,IAAI,GAAG,GAAG,MAAM,CAAC,IAAI,GAAG,IAAI,GAAG,gBAAgB,GAAG,GAAG,CAAC;SAC/D;QACD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1B,MAAM,IAAI,GAAG,CAAC;SACjB;QACD,OAAO,MAAM,GAAG,GAAG,CAAC;IACxB,CAAC;IAEM,YAAY;QACf,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,MAAM,CAAC,UAAmB,EAAE,OAAqB;QAEpD,IAAI,IAAA,4BAAe,EAAC,UAAU,CAAC,EAAE;YAC7B,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,UAAU,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC/F;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CAEJ;AAlED,sCAkEC"}

package/dist/types/InterfaceType.spec.d.ts

@@ -0,0 +1 @@
+export {};