brighterscript 0.66.0-alpha.1 → 0.66.0-alpha.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +21 -0
- package/README.md +0 -6
- package/dist/BsConfig.d.ts +0 -5
- package/dist/Cache.js +3 -3
- package/dist/Cache.js.map +1 -1
- package/dist/CacheVerifier.d.ts +0 -1
- package/dist/CodeActionUtil.d.ts +2 -2
- package/dist/DiagnosticCollection.js +8 -5
- package/dist/DiagnosticCollection.js.map +1 -1
- package/dist/DiagnosticMessages.d.ts +6 -1
- package/dist/DiagnosticMessages.js +5 -0
- package/dist/DiagnosticMessages.js.map +1 -1
- package/dist/FunctionScope.d.ts +1 -1
- package/dist/LanguageServer.d.ts +5 -1
- package/dist/LanguageServer.js +7 -0
- package/dist/LanguageServer.js.map +1 -1
- package/dist/Logger.d.ts +2 -1
- package/dist/Logger.js +10 -2
- package/dist/Logger.js.map +1 -1
- package/dist/Program.d.ts +1 -3
- package/dist/Program.js +4 -14
- package/dist/Program.js.map +1 -1
- package/dist/ProgramBuilder.js +1 -1
- package/dist/ProgramBuilder.js.map +1 -1
- package/dist/Scope.d.ts +11 -6
- package/dist/Scope.js +77 -93
- package/dist/Scope.js.map +1 -1
- package/dist/SymbolTable.d.ts +13 -5
- package/dist/SymbolTable.js +34 -10
- package/dist/SymbolTable.js.map +1 -1
- package/dist/astUtils/reflection.d.ts +4 -0
- package/dist/astUtils/reflection.js +9 -1
- package/dist/astUtils/reflection.js.map +1 -1
- package/dist/bscPlugin/hover/HoverProcessor.d.ts +5 -0
- package/dist/bscPlugin/hover/HoverProcessor.js +108 -77
- package/dist/bscPlugin/hover/HoverProcessor.js.map +1 -1
- package/dist/bscPlugin/hover/HoverProcessor.spec.js +83 -29
- package/dist/bscPlugin/hover/HoverProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/validation/BrsFileValidator.d.ts +0 -4
- package/dist/bscPlugin/validation/BrsFileValidator.js +10 -16
- package/dist/bscPlugin/validation/BrsFileValidator.js.map +1 -1
- package/dist/bscPlugin/validation/ScopeValidator.d.ts +4 -0
- package/dist/bscPlugin/validation/ScopeValidator.js +77 -42
- package/dist/bscPlugin/validation/ScopeValidator.js.map +1 -1
- package/dist/bscPlugin/validation/ScopeValidator.spec.js +684 -0
- package/dist/bscPlugin/validation/ScopeValidator.spec.js.map +1 -0
- package/dist/cli.js +95 -13
- package/dist/cli.js.map +1 -1
- package/dist/files/BrsFile.Class.spec.js +5 -0
- package/dist/files/BrsFile.Class.spec.js.map +1 -1
- package/dist/files/BrsFile.d.ts +1 -11
- package/dist/files/BrsFile.js +9 -101
- package/dist/files/BrsFile.js.map +1 -1
- package/dist/files/BrsFile.spec.js +3 -267
- package/dist/files/BrsFile.spec.js.map +1 -1
- package/dist/globalCallables.js +78 -78
- package/dist/globalCallables.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/interfaces.d.ts +7 -5
- package/dist/interfaces.js.map +1 -1
- package/dist/parser/Expression.d.ts +4 -3
- package/dist/parser/Expression.js +32 -9
- package/dist/parser/Expression.js.map +1 -1
- package/dist/parser/SGParser.d.ts +2 -2
- package/dist/parser/Statement.d.ts +11 -6
- package/dist/parser/Statement.js +54 -21
- package/dist/parser/Statement.js.map +1 -1
- package/dist/parser/tests/expression/TernaryExpression.spec.js +2 -2
- package/dist/types/BaseFunctionType.d.ts +8 -0
- package/dist/types/BaseFunctionType.js +25 -0
- package/dist/types/BaseFunctionType.js.map +1 -0
- package/dist/types/BooleanType.js +2 -1
- package/dist/types/BooleanType.js.map +1 -1
- package/dist/types/BscTypeKind.d.ts +1 -0
- package/dist/types/BscTypeKind.js +1 -0
- package/dist/types/BscTypeKind.js.map +1 -1
- package/dist/types/ClassType.js +1 -1
- package/dist/types/ClassType.js.map +1 -1
- package/dist/types/DoubleType.js +1 -0
- package/dist/types/DoubleType.js.map +1 -1
- package/dist/types/EnumType.d.ts +20 -4
- package/dist/types/EnumType.js +14 -2
- package/dist/types/EnumType.js.map +1 -1
- package/dist/types/FloatType.js +1 -0
- package/dist/types/FloatType.js.map +1 -1
- package/dist/types/FunctionType.d.ts +6 -19
- package/dist/types/FunctionType.js +12 -44
- package/dist/types/FunctionType.js.map +1 -1
- package/dist/types/IntegerType.js +1 -0
- package/dist/types/IntegerType.js.map +1 -1
- package/dist/types/InterfaceType.js +3 -3
- package/dist/types/InterfaceType.js.map +1 -1
- package/dist/types/InvalidType.d.ts +1 -0
- package/dist/types/InvalidType.js +3 -1
- package/dist/types/InvalidType.js.map +1 -1
- package/dist/types/LongIntegerType.js +1 -0
- package/dist/types/LongIntegerType.js.map +1 -1
- package/dist/types/ObjectType.js +2 -9
- package/dist/types/ObjectType.js.map +1 -1
- package/dist/types/ReferenceType.d.ts +1 -3
- package/dist/types/ReferenceType.js +27 -13
- package/dist/types/ReferenceType.js.map +1 -1
- package/dist/types/ReferenceType.spec.js +6 -6
- package/dist/types/ReferenceType.spec.js.map +1 -1
- package/dist/types/StringType.js +4 -1
- package/dist/types/StringType.js.map +1 -1
- package/dist/types/TypedFunctionType.d.ts +27 -0
- package/dist/types/TypedFunctionType.js +69 -0
- package/dist/types/TypedFunctionType.js.map +1 -0
- package/dist/types/TypedFunctionType.spec.d.ts +1 -0
- package/dist/types/TypedFunctionType.spec.js +23 -0
- package/dist/types/TypedFunctionType.spec.js.map +1 -0
- package/dist/types/UnionType.js +4 -1
- package/dist/types/UnionType.js.map +1 -1
- package/dist/types/VoidType.js +2 -1
- package/dist/types/VoidType.js.map +1 -1
- package/dist/types/index.d.ts +1 -1
- package/dist/types/index.js +1 -1
- package/dist/types/index.js.map +1 -1
- package/dist/util.d.ts +22 -5
- package/dist/util.js +245 -79
- package/dist/util.js.map +1 -1
- package/package.json +3 -1
- package/dist/types/FunctionType.spec.js +0 -23
- package/dist/types/FunctionType.spec.js.map +0 -1
- /package/dist/{types/FunctionType.spec.d.ts → bscPlugin/validation/ScopeValidator.spec.d.ts} +0 -0
package/dist/types/EnumType.d.ts
CHANGED
|
@@ -2,9 +2,17 @@ import { BscType } from './BscType';
|
|
|
2
2
|
import { BscTypeKind } from './BscTypeKind';
|
|
3
3
|
export declare class EnumType extends BscType {
|
|
4
4
|
name: string;
|
|
5
|
-
|
|
5
|
+
/**
|
|
6
|
+
* The runtime type for this enum (i.e. what type the value will be transpiled into)
|
|
7
|
+
*/
|
|
8
|
+
underlyingType: BscType;
|
|
9
|
+
constructor(name: string,
|
|
10
|
+
/**
|
|
11
|
+
* The runtime type for this enum (i.e. what type the value will be transpiled into)
|
|
12
|
+
*/
|
|
13
|
+
underlyingType?: BscType);
|
|
6
14
|
readonly kind = BscTypeKind.EnumType;
|
|
7
|
-
isTypeCompatible(targetType: BscType):
|
|
15
|
+
isTypeCompatible(targetType: BscType): boolean;
|
|
8
16
|
toString(): string;
|
|
9
17
|
toTypeString(): string;
|
|
10
18
|
isEqual(targetType: BscType): boolean;
|
|
@@ -12,9 +20,17 @@ export declare class EnumType extends BscType {
|
|
|
12
20
|
export declare class EnumMemberType extends BscType {
|
|
13
21
|
enumName: string;
|
|
14
22
|
memberName: string;
|
|
15
|
-
|
|
23
|
+
/**
|
|
24
|
+
* The runtime type for this enum (i.e. what type the value will be transpiled into)
|
|
25
|
+
*/
|
|
26
|
+
underlyingType: BscType;
|
|
27
|
+
constructor(enumName: string, memberName: string,
|
|
28
|
+
/**
|
|
29
|
+
* The runtime type for this enum (i.e. what type the value will be transpiled into)
|
|
30
|
+
*/
|
|
31
|
+
underlyingType?: BscType);
|
|
16
32
|
readonly kind = BscTypeKind.EnumMemberType;
|
|
17
|
-
isAssignableTo(targetType: BscType):
|
|
33
|
+
isAssignableTo(targetType: BscType): boolean;
|
|
18
34
|
isTypeCompatible(targetType: BscType): boolean;
|
|
19
35
|
toString(): string;
|
|
20
36
|
toTypeString(): string;
|
package/dist/types/EnumType.js
CHANGED
|
@@ -4,14 +4,21 @@ exports.EnumMemberType = exports.EnumType = void 0;
|
|
|
4
4
|
const reflection_1 = require("../astUtils/reflection");
|
|
5
5
|
const BscType_1 = require("./BscType");
|
|
6
6
|
const BscTypeKind_1 = require("./BscTypeKind");
|
|
7
|
+
const DynamicType_1 = require("./DynamicType");
|
|
7
8
|
class EnumType extends BscType_1.BscType {
|
|
8
|
-
constructor(name
|
|
9
|
+
constructor(name,
|
|
10
|
+
/**
|
|
11
|
+
* The runtime type for this enum (i.e. what type the value will be transpiled into)
|
|
12
|
+
*/
|
|
13
|
+
underlyingType = DynamicType_1.DynamicType.instance) {
|
|
9
14
|
super(name);
|
|
10
15
|
this.name = name;
|
|
16
|
+
this.underlyingType = underlyingType;
|
|
11
17
|
this.kind = BscTypeKind_1.BscTypeKind.EnumType;
|
|
12
18
|
}
|
|
13
19
|
isTypeCompatible(targetType) {
|
|
14
20
|
return ((0, reflection_1.isDynamicType)(targetType) ||
|
|
21
|
+
(0, reflection_1.isObjectType)(targetType) ||
|
|
15
22
|
this.isEqual(targetType) ||
|
|
16
23
|
((0, reflection_1.isEnumMemberType)(targetType) && (targetType === null || targetType === void 0 ? void 0 : targetType.enumName.toLowerCase()) === this.name.toLowerCase()));
|
|
17
24
|
}
|
|
@@ -27,10 +34,15 @@ class EnumType extends BscType_1.BscType {
|
|
|
27
34
|
}
|
|
28
35
|
exports.EnumType = EnumType;
|
|
29
36
|
class EnumMemberType extends BscType_1.BscType {
|
|
30
|
-
constructor(enumName, memberName
|
|
37
|
+
constructor(enumName, memberName,
|
|
38
|
+
/**
|
|
39
|
+
* The runtime type for this enum (i.e. what type the value will be transpiled into)
|
|
40
|
+
*/
|
|
41
|
+
underlyingType = DynamicType_1.DynamicType.instance) {
|
|
31
42
|
super(`${enumName}.${memberName}`);
|
|
32
43
|
this.enumName = enumName;
|
|
33
44
|
this.memberName = memberName;
|
|
45
|
+
this.underlyingType = underlyingType;
|
|
34
46
|
this.kind = BscTypeKind_1.BscTypeKind.EnumMemberType;
|
|
35
47
|
}
|
|
36
48
|
isAssignableTo(targetType) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnumType.js","sourceRoot":"","sources":["../../src/types/EnumType.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"EnumType.js","sourceRoot":"","sources":["../../src/types/EnumType.ts"],"names":[],"mappings":";;;AAAA,uDAAmG;AACnG,uCAAoC;AACpC,+CAA4C;AAC5C,+CAA4C;AAE5C,MAAa,QAAS,SAAQ,iBAAO;IACjC,YACW,IAAY;IACnB;;OAEG;IACI,iBAA0B,yBAAW,CAAC,QAAQ;QAErD,KAAK,CAAC,IAAI,CAAC,CAAC;QANL,SAAI,GAAJ,IAAI,CAAQ;QAIZ,mBAAc,GAAd,cAAc,CAAgC;QAKzC,SAAI,GAAG,yBAAW,CAAC,QAAQ,CAAC;IAF5C,CAAC;IAIM,gBAAgB,CAAC,UAAmB;QACvC,OAAO,CACH,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;YACxB,CAAC,IAAA,6BAAgB,EAAC,UAAU,CAAC,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,CAAC,WAAW,EAAE,MAAK,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CACnG,CAAC;IACN,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAEM,YAAY;QACf,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,OAAO,CAAC,UAAmB;QAC9B,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;AAjCD,4BAiCC;AAGD,MAAa,cAAe,SAAQ,iBAAO;IACvC,YACW,QAAgB,EAChB,UAAkB;IACzB;;OAEG;IACI,iBAA0B,yBAAW,CAAC,QAAQ;QAErD,KAAK,CAAC,GAAG,QAAQ,IAAI,UAAU,EAAE,CAAC,CAAC;QAP5B,aAAQ,GAAR,QAAQ,CAAQ;QAChB,eAAU,GAAV,UAAU,CAAQ;QAIlB,mBAAc,GAAd,cAAc,CAAgC;QAKzC,SAAI,GAAG,yBAAW,CAAC,cAAc,CAAC;IAFlD,CAAC;IAIM,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;YACxB,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,gBAAgB,CAAC,UAAmB;QACvC,OAAO,CACH,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC,CAC5B,CAAC;IACN,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAEM,YAAY;QACf,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,OAAO,CAAC,UAAmB;QAC9B,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;AA3CD,wCA2CC"}
|
package/dist/types/FloatType.js
CHANGED
|
@@ -12,6 +12,7 @@ class FloatType extends BscType_1.BscType {
|
|
|
12
12
|
}
|
|
13
13
|
isTypeCompatible(targetType) {
|
|
14
14
|
return ((0, reflection_1.isDynamicType)(targetType) ||
|
|
15
|
+
(0, reflection_1.isObjectType)(targetType) ||
|
|
15
16
|
(0, reflection_1.isIntegerType)(targetType) ||
|
|
16
17
|
(0, reflection_1.isFloatType)(targetType) ||
|
|
17
18
|
(0, reflection_1.isDoubleType)(targetType) ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FloatType.js","sourceRoot":"","sources":["../../src/types/FloatType.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"FloatType.js","sourceRoot":"","sources":["../../src/types/FloatType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAClI,uCAAoC;AACpC,+CAA4C;AAE5C,MAAa,SAAU,SAAQ,iBAAO;IAClC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,SAAS,CAAC;IAF7C,CAAC;IAMM,gBAAgB,CAAC,UAAmB;QACvC,OAAO,CACH,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,wBAAW,EAAC,UAAU,CAAC;YACvB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,8BAAiB,EAAC,UAAU,CAAC,CAChC,CAAC;IAEN,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,OAAO,CAAC,UAAmB;QAC9B,OAAO,IAAA,wBAAW,EAAC,UAAU,CAAC,CAAC;IACnC,CAAC;;AAjCL,8BAkCC;AAzBiB,kBAAQ,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC"}
|
|
@@ -1,24 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { BaseFunctionType } from './BaseFunctionType';
|
|
2
|
+
import type { BscType } from './BscType';
|
|
2
3
|
import { BscTypeKind } from './BscTypeKind';
|
|
3
|
-
export declare class FunctionType extends
|
|
4
|
-
|
|
5
|
-
constructor(
|
|
4
|
+
export declare class FunctionType extends BaseFunctionType {
|
|
5
|
+
typeText?: string;
|
|
6
|
+
constructor(typeText?: string);
|
|
6
7
|
readonly kind = BscTypeKind.FunctionType;
|
|
7
|
-
|
|
8
|
-
* The name of the function for this type. Can be null
|
|
9
|
-
*/
|
|
10
|
-
name: string;
|
|
11
|
-
/**
|
|
12
|
-
* Determines if this is a sub or not
|
|
13
|
-
*/
|
|
14
|
-
isSub: boolean;
|
|
15
|
-
params: {
|
|
16
|
-
name: string;
|
|
17
|
-
type: BscType;
|
|
18
|
-
isOptional: boolean;
|
|
19
|
-
}[];
|
|
20
|
-
setName(name: string): this;
|
|
21
|
-
addParameter(name: string, type: BscType, isOptional: boolean): this;
|
|
8
|
+
static instance: FunctionType;
|
|
22
9
|
isTypeCompatible(targetType: BscType): boolean;
|
|
23
10
|
toString(): string;
|
|
24
11
|
toTypeString(): string;
|
|
@@ -2,68 +2,36 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.FunctionType = void 0;
|
|
4
4
|
const reflection_1 = require("../astUtils/reflection");
|
|
5
|
-
const
|
|
5
|
+
const BaseFunctionType_1 = require("./BaseFunctionType");
|
|
6
6
|
const BscTypeKind_1 = require("./BscTypeKind");
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
constructor(returnType) {
|
|
7
|
+
class FunctionType extends BaseFunctionType_1.BaseFunctionType {
|
|
8
|
+
constructor(typeText) {
|
|
10
9
|
super();
|
|
11
|
-
this.
|
|
10
|
+
this.typeText = typeText;
|
|
12
11
|
this.kind = BscTypeKind_1.BscTypeKind.FunctionType;
|
|
13
|
-
/**
|
|
14
|
-
* Determines if this is a sub or not
|
|
15
|
-
*/
|
|
16
|
-
this.isSub = false;
|
|
17
|
-
this.params = [];
|
|
18
|
-
}
|
|
19
|
-
setName(name) {
|
|
20
|
-
this.name = name;
|
|
21
|
-
return this;
|
|
22
|
-
}
|
|
23
|
-
addParameter(name, type, isOptional) {
|
|
24
|
-
this.params.push({
|
|
25
|
-
name: name,
|
|
26
|
-
type: type,
|
|
27
|
-
isOptional: isOptional === true ? true : false
|
|
28
|
-
});
|
|
29
|
-
return this;
|
|
30
12
|
}
|
|
31
13
|
isTypeCompatible(targetType) {
|
|
32
|
-
if (
|
|
14
|
+
if ((0, reflection_1.isDynamicType)(targetType) ||
|
|
15
|
+
(0, reflection_1.isCallableType)(targetType) ||
|
|
16
|
+
(0, reflection_1.isObjectType)(targetType)) {
|
|
33
17
|
return true;
|
|
34
18
|
}
|
|
35
|
-
return
|
|
19
|
+
return false;
|
|
36
20
|
}
|
|
37
21
|
toString() {
|
|
38
|
-
|
|
39
|
-
for (let param of this.params) {
|
|
40
|
-
paramTexts.push(`${param.name}${param.isOptional ? '?' : ''} as ${param.type.toString()}`);
|
|
41
|
-
}
|
|
42
|
-
return `${this.isSub ? 'sub' : 'function'} ${this.name}(${paramTexts.join(', ')}) as ${this.returnType.toString()}`;
|
|
22
|
+
return this.toTypeString();
|
|
43
23
|
}
|
|
44
24
|
toTypeString() {
|
|
45
|
-
|
|
25
|
+
var _a;
|
|
26
|
+
return (_a = this.typeText) !== null && _a !== void 0 ? _a : 'function';
|
|
46
27
|
}
|
|
47
28
|
isEqual(targetType) {
|
|
48
29
|
if ((0, reflection_1.isFunctionType)(targetType)) {
|
|
49
|
-
//compare all parameters
|
|
50
|
-
let len = Math.max(this.params.length, targetType.params.length);
|
|
51
|
-
for (let i = 0; i < len; i++) {
|
|
52
|
-
let myParam = this.params[i];
|
|
53
|
-
let targetParam = targetType.params[i];
|
|
54
|
-
if (!myParam || !targetParam || !myParam.type.isAssignableTo(targetParam.type)) {
|
|
55
|
-
return false;
|
|
56
|
-
}
|
|
57
|
-
}
|
|
58
|
-
//compare return type
|
|
59
|
-
if (!this.returnType || !targetType.returnType || !this.returnType.isAssignableTo(targetType.returnType)) {
|
|
60
|
-
return false;
|
|
61
|
-
}
|
|
62
|
-
//made it here, all params and return type are equivalent
|
|
63
30
|
return true;
|
|
64
31
|
}
|
|
65
32
|
return false;
|
|
66
33
|
}
|
|
67
34
|
}
|
|
68
35
|
exports.FunctionType = FunctionType;
|
|
36
|
+
FunctionType.instance = new FunctionType('function');
|
|
69
37
|
//# sourceMappingURL=FunctionType.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FunctionType.js","sourceRoot":"","sources":["../../src/types/FunctionType.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"FunctionType.js","sourceRoot":"","sources":["../../src/types/FunctionType.ts"],"names":[],"mappings":";;;AAAA,uDAAqG;AACrG,yDAAsD;AAEtD,+CAA4C;AAE5C,MAAa,YAAa,SAAQ,mCAAgB;IAC9C,YAAmB,QAAiB;QAChC,KAAK,EAAE,CAAC;QADO,aAAQ,GAAR,QAAQ,CAAS;QAIpB,SAAI,GAAG,yBAAW,CAAC,YAAY,CAAC;IAFhD,CAAC;IAQM,gBAAgB,CAAC,UAAmB;QACvC,IACI,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,2BAAc,EAAC,UAAU,CAAC;YAC1B,IAAA,yBAAY,EAAC,UAAU,CAAC,EAC1B;YACE,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;IAE/B,CAAC;IAEM,YAAY;;QACf,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,UAAU,CAAC;IACvC,CAAC;IAED,OAAO,CAAC,UAAmB;QACvB,IAAI,IAAA,2BAAc,EAAC,UAAU,CAAC,EAAE;YAC5B,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;;AApCL,oCAqCC;AA7BiB,qBAAQ,GAAG,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC"}
|
|
@@ -12,6 +12,7 @@ class IntegerType extends BscType_1.BscType {
|
|
|
12
12
|
}
|
|
13
13
|
isTypeCompatible(targetType) {
|
|
14
14
|
return ((0, reflection_1.isDynamicType)(targetType) ||
|
|
15
|
+
(0, reflection_1.isObjectType)(targetType) ||
|
|
15
16
|
(0, reflection_1.isIntegerType)(targetType) ||
|
|
16
17
|
(0, reflection_1.isFloatType)(targetType) ||
|
|
17
18
|
(0, reflection_1.isDoubleType)(targetType) ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IntegerType.js","sourceRoot":"","sources":["../../src/types/IntegerType.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"IntegerType.js","sourceRoot":"","sources":["../../src/types/IntegerType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAClI,uCAAoC;AACpC,+CAA4C;AAE5C,MAAa,WAAY,SAAQ,iBAAO;IACpC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,WAAW,CAAC;IAF/C,CAAC;IAMM,gBAAgB,CAAC,UAAmB;QACvC,OAAO,CACH,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,wBAAW,EAAC,UAAU,CAAC;YACvB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,8BAAiB,EAAC,UAAU,CAAC,CAChC,CAAC;IACN,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;IAED,OAAO,CAAC,SAAkB;QACtB,OAAO,IAAA,0BAAa,EAAC,SAAS,CAAC,CAAC;IACpC,CAAC;;AAhCL,kCAiCC;AAxBiB,oBAAQ,GAAG,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC"}
|
|
@@ -13,11 +13,11 @@ class InterfaceType extends InheritableType_1.InheritableType {
|
|
|
13
13
|
this.kind = BscTypeKind_1.BscTypeKind.InterfaceType;
|
|
14
14
|
}
|
|
15
15
|
isTypeCompatible(targetType) {
|
|
16
|
-
|
|
17
|
-
if (this.isEqual(targetType)) {
|
|
16
|
+
if ((0, reflection_1.isDynamicType)(targetType) || (0, reflection_1.isObjectType)(targetType)) {
|
|
18
17
|
return true;
|
|
19
18
|
}
|
|
20
|
-
|
|
19
|
+
//TODO: We need to make sure that things don't get assigned to built-in types
|
|
20
|
+
if (this.isEqual(targetType)) {
|
|
21
21
|
return true;
|
|
22
22
|
}
|
|
23
23
|
const ancestorTypes = this.getAncestorTypeList();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InterfaceType.js","sourceRoot":"","sources":["../../src/types/InterfaceType.ts"],"names":[],"mappings":";;;AAAA,gDAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"InterfaceType.js","sourceRoot":"","sources":["../../src/types/InterfaceType.ts"],"names":[],"mappings":";;;AAAA,gDAAgD;AAChD,uDAAsH;AAEtH,+CAA4C;AAC5C,uDAAoD;AAEpD,MAAa,aAAc,SAAQ,iCAAe;IAC9C,YACW,IAAY,EACH,cAAwB;QAExC,KAAK,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAHrB,SAAI,GAAJ,IAAI,CAAQ;QACH,mBAAc,GAAd,cAAc,CAAU;QAK5B,SAAI,GAAG,yBAAW,CAAC,aAAa,CAAC;IAFjD,CAAC;IAIM,gBAAgB,CAAC,UAAmB;QACvC,IAAI,IAAA,0BAAa,EAAC,UAAU,CAAC,IAAI,IAAA,yBAAY,EAAC,UAAU,CAAC,EAAE;YACvD,OAAO,IAAI,CAAC;SACf;QACD,6EAA6E;QAC7E,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC1B,OAAO,IAAI,CAAC;SACf;QACD,MAAM,aAAa,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACjD,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE;YACvE,OAAO,IAAI,CAAC;SACf;QACD,IAAI,IAAA,8BAAiB,EAAC,UAAU,CAAC,IAAI,IAAA,wBAAW,EAAC,UAAU,CAAC,EAAE;YAC1D,OAAO,IAAI,CAAC,gCAAgC,CAAC,UAAU,EAAE,4BAAc,CAAC,OAAO,CAAC,CAAC;SACpF;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,UAAmB;QACvB,OAAO,IAAA,4BAAe,EAAC,UAAU,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IACpG,CAAC;CACJ;AAlCD,sCAkCC"}
|
|
@@ -4,6 +4,7 @@ export declare class InvalidType extends BscType {
|
|
|
4
4
|
typeText?: string;
|
|
5
5
|
constructor(typeText?: string);
|
|
6
6
|
readonly kind = BscTypeKind.InvalidType;
|
|
7
|
+
static instance: InvalidType;
|
|
7
8
|
isTypeCompatible(targetType: BscType): boolean;
|
|
8
9
|
toString(): string;
|
|
9
10
|
toTypeString(): string;
|
|
@@ -12,7 +12,8 @@ class InvalidType extends BscType_1.BscType {
|
|
|
12
12
|
}
|
|
13
13
|
isTypeCompatible(targetType) {
|
|
14
14
|
return ((0, reflection_1.isInvalidType)(targetType) ||
|
|
15
|
-
(0, reflection_1.isDynamicType)(targetType)
|
|
15
|
+
(0, reflection_1.isDynamicType)(targetType) ||
|
|
16
|
+
(0, reflection_1.isObjectType)(targetType));
|
|
16
17
|
}
|
|
17
18
|
toString() {
|
|
18
19
|
var _a;
|
|
@@ -26,4 +27,5 @@ class InvalidType extends BscType_1.BscType {
|
|
|
26
27
|
}
|
|
27
28
|
}
|
|
28
29
|
exports.InvalidType = InvalidType;
|
|
30
|
+
InvalidType.instance = new InvalidType('invalid');
|
|
29
31
|
//# sourceMappingURL=InvalidType.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InvalidType.js","sourceRoot":"","sources":["../../src/types/InvalidType.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"InvalidType.js","sourceRoot":"","sources":["../../src/types/InvalidType.ts"],"names":[],"mappings":";;;AAAA,uDAAoF;AACpF,uCAAoC;AACpC,+CAA4C;AAE5C,MAAa,WAAY,SAAQ,iBAAO;IACpC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,WAAW,CAAC;IAF/C,CAAC;IAMM,gBAAgB,CAAC,UAAmB;QACvC,OAAO,CACH,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC,CAC3B,CAAC;IACN,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;IAED,OAAO,CAAC,UAAmB;QACvB,OAAO,IAAA,0BAAa,EAAC,UAAU,CAAC,CAAC;IACrC,CAAC;;AA7BL,kCA8BC;AArBiB,oBAAQ,GAAG,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC"}
|
|
@@ -12,6 +12,7 @@ class LongIntegerType extends BscType_1.BscType {
|
|
|
12
12
|
}
|
|
13
13
|
isTypeCompatible(targetType) {
|
|
14
14
|
return ((0, reflection_1.isDynamicType)(targetType) ||
|
|
15
|
+
(0, reflection_1.isObjectType)(targetType) ||
|
|
15
16
|
(0, reflection_1.isIntegerType)(targetType) ||
|
|
16
17
|
(0, reflection_1.isFloatType)(targetType) ||
|
|
17
18
|
(0, reflection_1.isDoubleType)(targetType) ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LongIntegerType.js","sourceRoot":"","sources":["../../src/types/LongIntegerType.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"LongIntegerType.js","sourceRoot":"","sources":["../../src/types/LongIntegerType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAClI,uCAAoC;AACpC,+CAA4C;AAE5C,MAAa,eAAgB,SAAQ,iBAAO;IACxC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,eAAe,CAAC;IAFnD,CAAC;IAMM,gBAAgB,CAAC,UAAmB;QACvC,OAAO,CACH,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,wBAAW,EAAC,UAAU,CAAC;YACvB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,8BAAiB,EAAC,UAAU,CAAC,CAChC,CAAC;IACN,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,aAAa,CAAC;IAC1C,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAED,OAAO,CAAC,UAAmB;QACvB,OAAO,IAAA,8BAAiB,EAAC,UAAU,CAAC,CAAC;IACzC,CAAC;;AAhCL,0CAiCC;AAxBiB,wBAAQ,GAAG,IAAI,eAAe,CAAC,aAAa,CAAC,CAAC"}
|
package/dist/types/ObjectType.js
CHANGED
|
@@ -13,15 +13,8 @@ class ObjectType extends BscType_1.BscType {
|
|
|
13
13
|
this.kind = BscTypeKind_1.BscTypeKind.ObjectType;
|
|
14
14
|
}
|
|
15
15
|
isTypeCompatible(targetType) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
}
|
|
19
|
-
else if ((0, reflection_1.isObjectType)(targetType) ||
|
|
20
|
-
(0, reflection_1.isDynamicType)(targetType) ||
|
|
21
|
-
(0, reflection_1.isInheritableType)(targetType)) {
|
|
22
|
-
return true;
|
|
23
|
-
}
|
|
24
|
-
return false;
|
|
16
|
+
//Brightscript allows anything passed "as object", so as long as a type is provided, this is true
|
|
17
|
+
return !!targetType;
|
|
25
18
|
}
|
|
26
19
|
toString() {
|
|
27
20
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ObjectType.js","sourceRoot":"","sources":["../../src/types/ObjectType.ts"],"names":[],"mappings":";;;AAAA,gDAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"ObjectType.js","sourceRoot":"","sources":["../../src/types/ObjectType.ts"],"names":[],"mappings":";;;AAAA,gDAAgD;AAChD,uDAAsD;AAEtD,uCAAoC;AACpC,+CAA4C;AAC5C,+CAA4C;AAE5C,MAAa,UAAW,SAAQ,iBAAO;IACnC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,UAAU,CAAC;IAF9C,CAAC;IAIM,gBAAgB,CAAC,UAAmB;QACvC,iGAAiG;QACjG,OAAO,CAAC,CAAC,UAAU,CAAC;IACxB,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,QAAQ,CAAC;IACrC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAED,aAAa,CAAC,IAAY,EAAE,OAAuB;;QAC/C,gEAAgE;QAChE,mHAAmH;QACnH,OAAO,MAAA,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,mCAAI,yBAAW,CAAC,QAAQ,CAAC;IACtE,CAAC;IAED,OAAO,CAAC,SAAkB;QACtB,OAAO,IAAA,yBAAY,EAAC,SAAS,CAAC,IAAI,IAAI,CAAC,gCAAgC,CAAC,SAAS,EAAE,4BAAc,CAAC,OAAO,CAAC,CAAC;IAC/G,CAAC;CACJ;AA/BD,gCA+BC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import type { CacheVerifierProvider } from '../CacheVerifier';
|
|
2
1
|
import type { SymbolTypeGetterProvider } from '../SymbolTable';
|
|
3
2
|
import type { SymbolTypeFlag } from '../SymbolTable';
|
|
4
3
|
import { BscType } from './BscType';
|
|
@@ -9,7 +8,6 @@ export declare class ReferenceType extends BscType {
|
|
|
9
8
|
fullName: any;
|
|
10
9
|
flags: SymbolTypeFlag;
|
|
11
10
|
private tableProvider;
|
|
12
|
-
private cacheVerifierProvider?;
|
|
13
11
|
/**
|
|
14
12
|
* ReferenceTypes are used when the actual type may be resolved later from a Symbol table
|
|
15
13
|
* @param memberKey which key do we use to look up this type in the given table?
|
|
@@ -17,7 +15,7 @@ export declare class ReferenceType extends BscType {
|
|
|
17
15
|
* @param flags is this type available at typetime, runtime, etc.
|
|
18
16
|
* @param tableProvider function that returns a SymbolTable that we use for the lookup.
|
|
19
17
|
*/
|
|
20
|
-
constructor(memberKey: string, fullName: any, flags: SymbolTypeFlag, tableProvider: SymbolTypeGetterProvider
|
|
18
|
+
constructor(memberKey: string, fullName: any, flags: SymbolTypeFlag, tableProvider: SymbolTypeGetterProvider);
|
|
21
19
|
readonly kind = BscTypeKind.ReferenceType;
|
|
22
20
|
/**
|
|
23
21
|
* Resolves the type based on the original name and the table provider
|
|
@@ -17,13 +17,12 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
17
17
|
* @param flags is this type available at typetime, runtime, etc.
|
|
18
18
|
* @param tableProvider function that returns a SymbolTable that we use for the lookup.
|
|
19
19
|
*/
|
|
20
|
-
constructor(memberKey, fullName, flags, tableProvider
|
|
20
|
+
constructor(memberKey, fullName, flags, tableProvider) {
|
|
21
21
|
super(memberKey);
|
|
22
22
|
this.memberKey = memberKey;
|
|
23
23
|
this.fullName = fullName;
|
|
24
24
|
this.flags = flags;
|
|
25
25
|
this.tableProvider = tableProvider;
|
|
26
|
-
this.cacheVerifierProvider = cacheVerifierProvider;
|
|
27
26
|
this.kind = BscTypeKind_1.BscTypeKind.ReferenceType;
|
|
28
27
|
this.circRefCount = 0;
|
|
29
28
|
this.referenceChain = new Set();
|
|
@@ -36,6 +35,12 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
36
35
|
if (resolvedType) {
|
|
37
36
|
return resolvedType.getMemberType(innerName, innerOptions);
|
|
38
37
|
}
|
|
38
|
+
},
|
|
39
|
+
setCachedType: (innerName, innerResolvedType, options) => {
|
|
40
|
+
const resolvedType = this.resolve();
|
|
41
|
+
if (resolvedType) {
|
|
42
|
+
resolvedType.memberTable.setCachedType(innerName, innerResolvedType, options);
|
|
43
|
+
}
|
|
39
44
|
}
|
|
40
45
|
};
|
|
41
46
|
};
|
|
@@ -104,7 +109,7 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
104
109
|
if (memberTypeReference) {
|
|
105
110
|
return memberTypeReference;
|
|
106
111
|
}
|
|
107
|
-
memberTypeReference = new ReferenceType(memberName, this.makeMemberFullName(memberName), options.flags, this.futureMemberTableProvider
|
|
112
|
+
memberTypeReference = new ReferenceType(memberName, this.makeMemberFullName(memberName), options.flags, this.futureMemberTableProvider);
|
|
108
113
|
this.memberTypeReferences.set(refLookUp, memberTypeReference);
|
|
109
114
|
return memberTypeReference;
|
|
110
115
|
};
|
|
@@ -180,18 +185,23 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
180
185
|
return;
|
|
181
186
|
}
|
|
182
187
|
if ((0, reflection_1.isReferenceType)(resolvedType)) {
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
this.
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
188
|
+
// If this is a referenceType, keep digging down until we have a non reference Type.
|
|
189
|
+
while ((0, reflection_1.isReferenceType)(resolvedType)) {
|
|
190
|
+
if (this.referenceChain.has(resolvedType)) {
|
|
191
|
+
// this is a circular reference
|
|
192
|
+
this.circRefCount++;
|
|
193
|
+
}
|
|
194
|
+
if (this.circRefCount > 1) {
|
|
195
|
+
//It is possible that we could properly resolve the case that one reference points to itself
|
|
196
|
+
//see test: '[Scope][symbolTable lookups with enhanced typing][finds correct class field type with default value enums are used]
|
|
197
|
+
return;
|
|
198
|
+
}
|
|
199
|
+
this.referenceChain.add(resolvedType);
|
|
200
|
+
resolvedType = resolvedType.getTarget();
|
|
191
201
|
}
|
|
192
|
-
this.
|
|
202
|
+
this.tableProvider().setCachedType(this.memberKey, resolvedType, { flags: this.flags });
|
|
193
203
|
}
|
|
194
|
-
|
|
204
|
+
if (!(0, reflection_1.isReferenceType)(resolvedType)) {
|
|
195
205
|
this.circRefCount = 0;
|
|
196
206
|
this.referenceChain.clear();
|
|
197
207
|
}
|
|
@@ -239,6 +249,10 @@ class TypePropertyReferenceType extends BscType_1.BscType {
|
|
|
239
249
|
getSymbolType: (innerName, innerOptions) => {
|
|
240
250
|
var _a, _b;
|
|
241
251
|
return (_b = (_a = this.outerType) === null || _a === void 0 ? void 0 : _a[this.propertyName]) === null || _b === void 0 ? void 0 : _b.getMemberType(innerName, innerOptions);
|
|
252
|
+
},
|
|
253
|
+
setCachedType: (innerName, innerType, innerOptions) => {
|
|
254
|
+
var _a, _b;
|
|
255
|
+
return (_b = (_a = this.outerType) === null || _a === void 0 ? void 0 : _a[this.propertyName]) === null || _b === void 0 ? void 0 : _b.memberTable.setCachedType(innerName, innerType, innerOptions);
|
|
242
256
|
}
|
|
243
257
|
};
|
|
244
258
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReferenceType.js","sourceRoot":"","sources":["../../src/types/ReferenceType.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ReferenceType.js","sourceRoot":"","sources":["../../src/types/ReferenceType.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ const StringType_1 = require("./StringType");
|
|
|
11
11
|
const FloatType_1 = require("./FloatType");
|
|
12
12
|
const ClassType_1 = require("./ClassType");
|
|
13
13
|
const reflection_1 = require("../astUtils/reflection");
|
|
14
|
-
const
|
|
14
|
+
const TypedFunctionType_1 = require("./TypedFunctionType");
|
|
15
15
|
const NamespaceType_1 = require("./NamespaceType");
|
|
16
16
|
const runtimeFlag = SymbolTable_2.SymbolTypeFlag.runtime;
|
|
17
17
|
describe('ReferenceType', () => {
|
|
@@ -67,12 +67,12 @@ describe('ReferenceType', () => {
|
|
|
67
67
|
});
|
|
68
68
|
describe('PropertyReferenceType', () => {
|
|
69
69
|
it('can be checked with reflection', () => {
|
|
70
|
-
const func = new
|
|
70
|
+
const func = new TypedFunctionType_1.TypedFunctionType(StringType_1.StringType.instance);
|
|
71
71
|
const propRef = new ReferenceType_1.TypePropertyReferenceType(func, 'returnType');
|
|
72
72
|
(0, chai_1.expect)((0, reflection_1.isTypePropertyReferenceType)(propRef)).to.be.true;
|
|
73
73
|
});
|
|
74
74
|
it('can resolve a FunctionType.returnType', () => {
|
|
75
|
-
const func = new
|
|
75
|
+
const func = new TypedFunctionType_1.TypedFunctionType(StringType_1.StringType.instance);
|
|
76
76
|
const propRef = new ReferenceType_1.TypePropertyReferenceType(func, 'returnType');
|
|
77
77
|
(0, testHelpers_spec_1.expectTypeToBe)(propRef, StringType_1.StringType);
|
|
78
78
|
});
|
|
@@ -83,7 +83,7 @@ describe('PropertyReferenceType', () => {
|
|
|
83
83
|
// `ref` will resolve to DynamicType, and its returnType is DynamicType.Instance
|
|
84
84
|
(0, testHelpers_spec_1.expectTypeToBe)(propRef, DynamicType_1.DynamicType);
|
|
85
85
|
// Set ref to resolve to a function
|
|
86
|
-
table.addSymbol('someFunc', null, new
|
|
86
|
+
table.addSymbol('someFunc', null, new TypedFunctionType_1.TypedFunctionType(IntegerType_1.IntegerType.instance), SymbolTable_2.SymbolTypeFlag.runtime);
|
|
87
87
|
(0, testHelpers_spec_1.expectTypeToBe)(propRef, IntegerType_1.IntegerType);
|
|
88
88
|
});
|
|
89
89
|
it('resolves members of a property on a ReferenceType', () => {
|
|
@@ -96,9 +96,9 @@ describe('PropertyReferenceType', () => {
|
|
|
96
96
|
// Set fnRef to resolve to a function that returns a complex type
|
|
97
97
|
const klassType = new ClassType_1.ClassType('Klass');
|
|
98
98
|
klassType.addMember('myNum', null, IntegerType_1.IntegerType.instance, SymbolTable_2.SymbolTypeFlag.runtime);
|
|
99
|
-
table.addSymbol('someFunc', null, new
|
|
99
|
+
table.addSymbol('someFunc', null, new TypedFunctionType_1.TypedFunctionType(klassType), SymbolTable_2.SymbolTypeFlag.runtime);
|
|
100
100
|
// returnPropRef = someFunc().myNum
|
|
101
|
-
(0, testHelpers_spec_1.expectTypeToBe)(fnRef,
|
|
101
|
+
(0, testHelpers_spec_1.expectTypeToBe)(fnRef, TypedFunctionType_1.TypedFunctionType);
|
|
102
102
|
(0, testHelpers_spec_1.expectTypeToBe)(returnRef, ClassType_1.ClassType);
|
|
103
103
|
(0, testHelpers_spec_1.expectTypeToBe)(returnPropRef, IntegerType_1.IntegerType);
|
|
104
104
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReferenceType.spec.js","sourceRoot":"","sources":["../../src/types/ReferenceType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,gDAA6C;AAC7C,gDAAgD;AAChD,0DAAqD;AACrD,+CAA4C;AAC5C,+CAA4C;AAC5C,mDAA2E;AAC3E,6CAA0C;AAC1C,2CAAwC;AACxC,2CAAwC;AACxC,uDAAsF;AACtF,
|
|
1
|
+
{"version":3,"file":"ReferenceType.spec.js","sourceRoot":"","sources":["../../src/types/ReferenceType.spec.ts"],"names":[],"mappings":"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"}
|
package/dist/types/StringType.js
CHANGED
|
@@ -12,7 +12,10 @@ class StringType extends BscType_1.BscType {
|
|
|
12
12
|
}
|
|
13
13
|
isTypeCompatible(targetType) {
|
|
14
14
|
return ((0, reflection_1.isStringType)(targetType) ||
|
|
15
|
-
(0, reflection_1.isDynamicType)(targetType)
|
|
15
|
+
(0, reflection_1.isDynamicType)(targetType) ||
|
|
16
|
+
(0, reflection_1.isObjectType)(targetType) ||
|
|
17
|
+
//string enums are compatible with strings
|
|
18
|
+
(((0, reflection_1.isEnumType)(targetType) || (0, reflection_1.isEnumMemberType)(targetType)) && (0, reflection_1.isStringType)(targetType.underlyingType)));
|
|
16
19
|
}
|
|
17
20
|
toString() {
|
|
18
21
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StringType.js","sourceRoot":"","sources":["../../src/types/StringType.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"StringType.js","sourceRoot":"","sources":["../../src/types/StringType.ts"],"names":[],"mappings":";;;AAAA,uDAAiH;AACjH,uCAAoC;AACpC,+CAA4C;AAE5C,MAAa,UAAW,SAAQ,iBAAO;IACnC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,UAAU,CAAC;IAF9C,CAAC;IASM,gBAAgB,CAAC,UAAmB;QACvC,OAAO,CACH,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,0CAA0C;YAC1C,CACI,CAAC,IAAA,uBAAU,EAAC,UAAU,CAAC,IAAI,IAAA,6BAAgB,EAAC,UAAU,CAAC,CAAC,IAAI,IAAA,yBAAY,EAAC,UAAU,CAAC,cAAc,CAAC,CACtG,CACJ,CAAC;IACN,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,QAAQ,CAAC;IACrC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,OAAO,CAAC,UAAmB;QAC9B,OAAO,IAAA,yBAAY,EAAC,UAAU,CAAC,CAAC;IACpC,CAAC;;AApCL,gCAqCC;AA5BG;;GAEG;AACW,mBAAQ,GAAG,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC"}
|