brighterscript 1.0.0-alpha.21 → 1.0.0-alpha.22

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.
Files changed (73) hide show
  1. package/CHANGELOG.md +84 -0
  2. package/README.md +6 -3
  3. package/bsconfig.schema.json +10 -2
  4. package/dist/BsConfig.d.ts +5 -0
  5. package/dist/DependencyGraph.d.ts +2 -2
  6. package/dist/DependencyGraph.js +15 -3
  7. package/dist/DependencyGraph.js.map +1 -1
  8. package/dist/DiagnosticCollection.d.ts +3 -3
  9. package/dist/DiagnosticCollection.js +11 -11
  10. package/dist/DiagnosticCollection.js.map +1 -1
  11. package/dist/DiagnosticFilterer.js +4 -3
  12. package/dist/DiagnosticFilterer.js.map +1 -1
  13. package/dist/LanguageServer.d.ts +48 -26
  14. package/dist/LanguageServer.js +281 -211
  15. package/dist/LanguageServer.js.map +1 -1
  16. package/dist/Program.js +1 -1
  17. package/dist/Program.js.map +1 -1
  18. package/dist/ProgramBuilder.js +11 -11
  19. package/dist/ProgramBuilder.js.map +1 -1
  20. package/dist/Scope.js +6 -3
  21. package/dist/Scope.js.map +1 -1
  22. package/dist/astUtils/AstEditor.d.ts +32 -0
  23. package/dist/astUtils/AstEditor.js +132 -0
  24. package/dist/astUtils/AstEditor.js.map +1 -1
  25. package/dist/astUtils/AstEditor.spec.js +118 -34
  26. package/dist/astUtils/AstEditor.spec.js.map +1 -1
  27. package/dist/astUtils/creators.d.ts +6 -2
  28. package/dist/astUtils/creators.js +9 -2
  29. package/dist/astUtils/creators.js.map +1 -1
  30. package/dist/astUtils/reflection.d.ts +3 -3
  31. package/dist/astUtils/reflection.js +9 -7
  32. package/dist/astUtils/reflection.js.map +1 -1
  33. package/dist/astUtils/visitors.d.ts +74 -64
  34. package/dist/astUtils/visitors.js +30 -10
  35. package/dist/astUtils/visitors.js.map +1 -1
  36. package/dist/astUtils/visitors.spec.js +95 -3
  37. package/dist/astUtils/visitors.spec.js.map +1 -1
  38. package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js +36 -25
  39. package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js.map +1 -1
  40. package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.js +57 -0
  41. package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.js.map +1 -1
  42. package/dist/cli.js +1 -0
  43. package/dist/cli.js.map +1 -1
  44. package/dist/files/BrsFile.Class.spec.js +83 -2
  45. package/dist/files/BrsFile.Class.spec.js.map +1 -1
  46. package/dist/files/BrsFile.d.ts +8 -0
  47. package/dist/files/BrsFile.js +46 -28
  48. package/dist/files/BrsFile.js.map +1 -1
  49. package/dist/files/BrsFile.spec.js +83 -0
  50. package/dist/files/BrsFile.spec.js.map +1 -1
  51. package/dist/files/XmlFile.js +5 -4
  52. package/dist/files/XmlFile.js.map +1 -1
  53. package/dist/index.js +5 -1
  54. package/dist/index.js.map +1 -1
  55. package/dist/interfaces.d.ts +1 -1
  56. package/dist/parser/BrsTranspileState.d.ts +2 -0
  57. package/dist/parser/BrsTranspileState.js +5 -0
  58. package/dist/parser/BrsTranspileState.js.map +1 -1
  59. package/dist/parser/Expression.js +6 -23
  60. package/dist/parser/Expression.js.map +1 -1
  61. package/dist/parser/Parser.Class.spec.js.map +1 -1
  62. package/dist/parser/Parser.d.ts +3 -3
  63. package/dist/parser/Parser.js +6 -6
  64. package/dist/parser/Parser.js.map +1 -1
  65. package/dist/parser/Statement.d.ts +12 -16
  66. package/dist/parser/Statement.js +76 -69
  67. package/dist/parser/Statement.js.map +1 -1
  68. package/dist/util.d.ts +4 -5
  69. package/dist/util.js +26 -21
  70. package/dist/util.js.map +1 -1
  71. package/dist/validators/ClassValidator.js +6 -6
  72. package/dist/validators/ClassValidator.js.map +1 -1
  73. package/package.json +11 -11
@@ -10,6 +10,8 @@ const visitors_1 = require("./visitors");
10
10
  const reflection_1 = require("./reflection");
11
11
  const creators_1 = require("./creators");
12
12
  const stackedVisitor_1 = require("./stackedVisitor");
13
+ const AstEditor_1 = require("./AstEditor");
14
+ const Parser_1 = require("../parser/Parser");
13
15
  describe('astUtils visitors', () => {
14
16
  const rootDir = process.cwd();
15
17
  let program;
@@ -229,6 +231,27 @@ describe('astUtils visitors', () => {
229
231
  (0, visitors_1.walkStatements)(block, visitor);
230
232
  (0, chai_1.expect)(block.statements[0]).to.equal(printStatement2);
231
233
  });
234
+ it('uses the AstEditor for replacement when provided', () => {
235
+ const editor = new AstEditor_1.AstEditor();
236
+ const printStatement1 = new Statement_1.PrintStatement({
237
+ print: (0, creators_1.createToken)(TokenKind_1.TokenKind.Print)
238
+ }, []);
239
+ const printStatement2 = new Statement_1.PrintStatement({
240
+ print: (0, creators_1.createToken)(TokenKind_1.TokenKind.Print)
241
+ }, []);
242
+ const block = new Statement_1.Block([
243
+ printStatement1
244
+ ], vscode_languageserver_1.Range.create(0, 0, 0, 0));
245
+ block.walk((0, visitors_1.createVisitor)({
246
+ PrintStatement: () => printStatement2
247
+ }), {
248
+ walkMode: visitors_1.WalkMode.visitAll,
249
+ editor: editor
250
+ });
251
+ (0, chai_1.expect)(block.statements[0]).to.equal(printStatement2);
252
+ editor.undoAll();
253
+ (0, chai_1.expect)(block.statements[0]).to.equal(printStatement1);
254
+ });
232
255
  });
233
256
  describe('Expressions', () => {
234
257
  it('Walks through all expressions', () => {
@@ -799,12 +822,12 @@ describe('astUtils visitors', () => {
799
822
  end class
800
823
  `, [
801
824
  'ClassStatement',
802
- 'ClassFieldStatement',
825
+ 'FieldStatement',
803
826
  'TypeExpression',
804
- 'ClassFieldStatement',
827
+ 'FieldStatement',
805
828
  'TypeExpression',
806
829
  'LiteralExpression',
807
- 'ClassMethodStatement',
830
+ 'MethodStatement',
808
831
  'FunctionExpression',
809
832
  'Block',
810
833
  'ReturnStatement',
@@ -851,6 +874,75 @@ describe('astUtils visitors', () => {
851
874
  'LiteralExpression'
852
875
  ], visitors_1.WalkMode.visitExpressionsRecursive);
853
876
  });
877
+ it('provides owner and key', () => {
878
+ const items = [];
879
+ const { ast } = Parser_1.Parser.parse(`
880
+ sub main()
881
+ log = sub(message)
882
+ print "hello " + message
883
+ end sub
884
+ log("hello" + " world")
885
+ end sub
886
+ `);
887
+ ast.walk((astNode, parent, owner, key) => {
888
+ items.push(astNode);
889
+ (0, chai_1.expect)(owner[key]).to.equal(astNode);
890
+ }, {
891
+ walkMode: visitors_1.WalkMode.visitAllRecursive
892
+ });
893
+ (0, chai_1.expect)(items).to.be.length(17);
894
+ });
895
+ it('can be used to delete statements', () => {
896
+ const { ast } = Parser_1.Parser.parse(`
897
+ sub main()
898
+ print 1
899
+ print 2
900
+ print 3
901
+ end sub
902
+ `);
903
+ let callCount = 0;
904
+ ast.walk((astNode, parent, owner, key) => {
905
+ if ((0, reflection_1.isPrintStatement)(astNode)) {
906
+ callCount++;
907
+ //delete the print statement (we know owner is an array based on this specific test)
908
+ owner.splice(key, 1);
909
+ }
910
+ }, {
911
+ walkMode: visitors_1.WalkMode.visitAllRecursive
912
+ });
913
+ //the visitor should have been called for every statement
914
+ (0, chai_1.expect)(callCount).to.eql(3);
915
+ (0, chai_1.expect)(ast.statements[0].func.body.statements).to.be.lengthOf(0);
916
+ });
917
+ it('can be used to insert statements', () => {
918
+ const { ast } = Parser_1.Parser.parse(`
919
+ sub main()
920
+ print 1
921
+ print 2
922
+ print 3
923
+ end sub
924
+ `);
925
+ let printStatementCount = 0;
926
+ let callExpressionCount = 0;
927
+ const calls = [];
928
+ ast.walk((0, visitors_1.createVisitor)({
929
+ PrintStatement: (astNode, parent, owner, key) => {
930
+ printStatementCount++;
931
+ //add another expression to the list every time. This should result in 1 the first time, 2 the second, 3 the third.
932
+ calls.push(new Statement_1.ExpressionStatement((0, creators_1.createCall)((0, creators_1.createVariableExpression)('doSomethingBeforePrint'))));
933
+ owner.splice(key, 0, ...calls);
934
+ },
935
+ CallExpression: () => {
936
+ callExpressionCount++;
937
+ }
938
+ }), {
939
+ walkMode: visitors_1.WalkMode.visitAllRecursive
940
+ });
941
+ //the visitor should have been called for every statement
942
+ (0, chai_1.expect)(printStatementCount).to.eql(3);
943
+ (0, chai_1.expect)(callExpressionCount).to.eql(0);
944
+ (0, chai_1.expect)(ast.statements[0].func.body.statements).to.be.lengthOf(9);
945
+ });
854
946
  });
855
947
  });
856
948
  //# sourceMappingURL=visitors.spec.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"visitors.spec.js","sourceRoot":"","sources":["../../src/astUtils/visitors.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"visitors.spec.js","sourceRoot":"","sources":["../../src/astUtils/visitors.spec.ts"],"names":[],"mappings":"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"}
@@ -60,33 +60,44 @@ class BrsFileSemanticTokensProcessor {
60
60
  handleEnums() {
61
61
  var _a, _b, _c;
62
62
  const enumLookup = (_a = this.event.file.program.getFirstScopeForFile(this.event.file)) === null || _a === void 0 ? void 0 : _a.getEnumMap();
63
- for (const expression of this.event.file.parser.references.expressions) {
64
- const parts = (_b = util_1.default.getAllDottedGetParts(expression)) === null || _b === void 0 ? void 0 : _b.map(x => x.toLowerCase());
65
- if (parts) {
66
- //discard the enum member name
67
- const memberName = parts.pop();
68
- //get the name of the enum (including leading namespace if applicable)
69
- const enumName = parts.join('.');
70
- const lowerEnumName = enumName.toLowerCase();
71
- const theEnum = (_c = enumLookup.get(lowerEnumName)) === null || _c === void 0 ? void 0 : _c.item;
72
- if (theEnum) {
73
- const tokens = util_1.default.splitGetRange('.', lowerEnumName + '.' + memberName, expression.range);
74
- //enum member name
75
- this.event.semanticTokens.push({
76
- range: tokens.pop().range,
77
- tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enumMember
78
- });
79
- //enum name
80
- this.event.semanticTokens.push({
81
- range: tokens.pop().range,
82
- tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enum
83
- });
84
- //namespace parts
85
- for (const token of tokens) {
63
+ for (const referenceExpression of this.event.file.parser.references.expressions) {
64
+ const actualExpressions = [];
65
+ //binary expressions actually have two expressions (left and right), so handle them independently
66
+ if ((0, reflection_1.isBinaryExpression)(referenceExpression)) {
67
+ actualExpressions.push(referenceExpression.left, referenceExpression.right);
68
+ }
69
+ else {
70
+ //assume all other expressions are a single chain
71
+ actualExpressions.push(referenceExpression);
72
+ }
73
+ for (const expression of actualExpressions) {
74
+ const parts = (_b = util_1.default.getAllDottedGetParts(expression)) === null || _b === void 0 ? void 0 : _b.map(x => x.toLowerCase());
75
+ if (parts) {
76
+ //discard the enum member name
77
+ const memberName = parts.pop();
78
+ //get the name of the enum (including leading namespace if applicable)
79
+ const enumName = parts.join('.');
80
+ const lowerEnumName = enumName.toLowerCase();
81
+ const theEnum = (_c = enumLookup.get(lowerEnumName)) === null || _c === void 0 ? void 0 : _c.item;
82
+ if (theEnum) {
83
+ const tokens = util_1.default.splitGetRange('.', lowerEnumName + '.' + memberName, expression.range);
84
+ //enum member name
85
+ this.event.semanticTokens.push({
86
+ range: tokens.pop().range,
87
+ tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enumMember
88
+ });
89
+ //enum name
86
90
  this.event.semanticTokens.push({
87
- range: token.range,
88
- tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
91
+ range: tokens.pop().range,
92
+ tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enum
89
93
  });
94
+ //namespace parts
95
+ for (const token of tokens) {
96
+ this.event.semanticTokens.push({
97
+ range: token.range,
98
+ tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
99
+ });
100
+ }
90
101
  }
91
102
  }
92
103
  }
@@ -1 +1 @@
1
- {"version":3,"file":"BrsFileSemanticTokensProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BrsFileSemanticTokensProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.ts"],"names":[],"mappings":"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"}
@@ -69,5 +69,62 @@ describe('BrsFileSemanticTokensProcessor', () => {
69
69
  tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enumMember
70
70
  }]);
71
71
  });
72
+ it('matches each namespace section for enum', () => {
73
+ const file = program.setFile('source/main.bs', `
74
+ sub main()
75
+ print Sentients.Humanoids.HumanoidType.Cylon
76
+ end sub
77
+ namespace Sentients.Humanoids
78
+ enum HumanoidType
79
+ Human
80
+ Alien
81
+ Cylon
82
+ end enum
83
+ end namespace
84
+ `);
85
+ program.validate();
86
+ (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
87
+ (0, chai_1.expect)(util_1.util.sortByRange(program.getSemanticTokens(file.srcPath))).to.eql([{
88
+ range: util_1.util.createRange(2, 22, 2, 31),
89
+ tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
90
+ }, {
91
+ range: util_1.util.createRange(2, 32, 2, 41),
92
+ tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
93
+ }, {
94
+ range: util_1.util.createRange(2, 42, 2, 54),
95
+ tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enum
96
+ }, {
97
+ range: util_1.util.createRange(2, 55, 2, 60),
98
+ tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enumMember
99
+ }]);
100
+ });
101
+ it('matches enums in if statements', () => {
102
+ const file = program.setFile('source/main.bs', `
103
+ sub main()
104
+ if Humanoids.HumanoidType.Cylon = "Cylon" then
105
+ print true
106
+ end if
107
+ end sub
108
+ namespace Humanoids
109
+ enum HumanoidType
110
+ Human = "Human"
111
+ Alien = "Alien"
112
+ Cylon = "Cylon"
113
+ end enum
114
+ end namespace
115
+ `);
116
+ program.validate();
117
+ (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
118
+ (0, chai_1.expect)(util_1.util.sortByRange(program.getSemanticTokens(file.srcPath))).to.eql([{
119
+ range: util_1.util.createRange(2, 19, 2, 28),
120
+ tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
121
+ }, {
122
+ range: util_1.util.createRange(2, 29, 2, 41),
123
+ tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enum
124
+ }, {
125
+ range: util_1.util.createRange(2, 42, 2, 47),
126
+ tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enumMember
127
+ }]);
128
+ });
72
129
  });
73
130
  //# sourceMappingURL=BrsFileSemanticTokensProcessor.spec.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"BrsFileSemanticTokensProcessor.spec.js","sourceRoot":"","sources":["../../../src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,mFAAoE;AAEpE,2CAAwC;AACxC,6DAA+D;AAC/D,qCAAwD;AAExD,MAAM,OAAO,GAAG,IAAA,sBAAC,EAAA,GAAG,OAAO,CAAC,GAAG,EAAE,eAAe,CAAC;AAEjD,QAAQ,CAAC,gCAAgC,EAAE,GAAG,EAAE;IAC5C,IAAI,OAAgB,CAAC;IACrB,UAAU,CAAC,GAAG,EAAE;QACZ,OAAO,GAAG,IAAI,iBAAO,CAAC;YAClB,OAAO,EAAE,OAAO;SACnB,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IACH,SAAS,CAAC,GAAG,EAAE;QACX,OAAO,CAAC,OAAO,EAAE,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,gBAAgB,EAAE;;;;;;;;;;SAUvD,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,EAAE,CAAC;QACnB,IAAA,wCAAqB,EAAC,OAAO,CAAC,CAAC;QAC/B,IAAA,aAAM,EACF,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAC1C,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;gBACN,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,KAAK;aACtC,CAAC,CAAC,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,gBAAgB,EAAE;;;;;;;;;;SAUvD,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,EAAE,CAAC;QACnB,IAAA,wCAAqB,EAAC,OAAO,CAAC,CAAC;QAC/B,IAAA,aAAM,EACF,WAAI,CAAC,WAAW,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAC5D,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;gBACN,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,IAAI;aACrC,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,UAAU;aAC3C,CAAC,CAAC,CAAC;IACR,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"BrsFileSemanticTokensProcessor.spec.js","sourceRoot":"","sources":["../../../src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.ts"],"names":[],"mappings":"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"}
package/dist/cli.js CHANGED
@@ -11,6 +11,7 @@ let options = yargs
11
11
  .help('help', 'View help information about this tool.')
12
12
  .option('create-package', { type: 'boolean', defaultDescription: 'true', description: 'Creates a zip package. This setting is ignored when deploy is enabled.' })
13
13
  .option('source-map', { type: 'boolean', defaultDescription: 'false', description: 'Enables generating sourcemap files, which allow debugging tools to show the original source code while running the emitted files.' })
14
+ .option('allow-brighterscript-in-brightscript', { alias: 'allow-brighter-script-in-bright-script', type: 'boolean', defaultDescription: 'false', description: 'Allow brighterscript features (classes, interfaces, etc...) to be included in BrightScript (`.brs`) files, and force those files to be transpiled..' })
14
15
  .option('cwd', { type: 'string', description: 'Override the current working directory.' })
15
16
  .option('copy-to-staging', { type: 'boolean', defaultDescription: 'true', description: 'Copy project files into the staging folder, ready to be packaged.' })
16
17
  .option('diagnostic-level', { type: 'string', defaultDescription: '"warn"', description: 'Specify what diagnostic types should be printed to the console. Value can be "error", "warn", "hint", "info".' })
package/dist/cli.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;AACA,+BAA+B;AAC/B,6BAA6B;AAC7B,qDAAkD;AAClD,iEAA2D;AAC3D,iCAA0B;AAE1B,IAAI,OAAO,GAAG,KAAK;KACd,KAAK,CAAC,IAAI,EAAE,6DAA6D,CAAC;KAC1E,IAAI,CAAC,MAAM,EAAE,wCAAwC,CAAC;KACtD,MAAM,CAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,EAAE,WAAW,EAAE,wEAAwE,EAAE,CAAC;KAChK,MAAM,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,mIAAmI,EAAE,CAAC;KACxN,MAAM,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,yCAAyC,EAAE,CAAC;KACzF,MAAM,CAAC,iBAAiB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,EAAE,WAAW,EAAE,mEAAmE,EAAE,CAAC;KAC5J,MAAM,CAAC,kBAAkB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,kBAAkB,EAAE,QAAQ,EAAE,WAAW,EAAE,+GAA+G,EAAE,CAAC;KAC1M,MAAM,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,6EAA6E,EAAE,CAAC;KACjJ,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,wGAAwG,EAAE,CAAC;KACzL,MAAM,CAAC,iBAAiB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,yDAAyD,EAAE,CAAC;KACnJ,MAAM,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,mHAAmH,EAAE,CAAC;KACpK,MAAM,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,yCAAyC,EAAE,CAAC;KAC1F,MAAM,CAAC,oBAAoB,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,+EAA+E,EAAE,CAAC;KAC7I,MAAM,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,sEAAsE,EAAE,CAAC;KACzJ,MAAM,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,uGAAuG,EAAE,CAAC;KAC5J,MAAM,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,uCAAuC,EAAE,CAAC;KAC5F,MAAM,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,uCAAuC,EAAE,CAAC;KAC3F,MAAM,CAAC,uBAAuB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,2EAA2E,EAAE,CAAC;KAC3K,MAAM,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,mGAAmG,EAAE,CAAC;KACxJ,MAAM,CAAC,qBAAqB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,2EAA2E,EAAE,CAAC;KAC3I,MAAM,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,kBAAkB,EAAE,WAAW,EAAE,WAAW,EAAE,uCAAuC,EAAE,CAAC;KAC7H,MAAM,CAAC,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,8WAA8W,EAAE,CAAC;KACta,MAAM,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;KACpG,MAAM,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,+FAA+F,EAAE,CAAC;KAClJ,KAAK,CAAC,IAAI,CAAC,EAAE;;IACV,MAAM,eAAe,GAAG,IAAI,CAAC,eAAyB,CAAC;IACvD,uEAAuE;IACvE,IAAI,eAAe,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,KAAK,KAAK,EAAE;QAC1F,MAAM,IAAI,KAAK,CAAC,6BAA6B,eAAe,kDAAkD,CAAC,CAAC;KACnH;IACD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAA,IAAI,CAAC,GAAG,mCAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACnE,qDAAqD;IACrD,cAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;IAClD,sDAAsD;IACtD,cAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;IAClD,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;KACD,IAAI,CAAC;AAEV,IAAI,OAAO,GAAG,IAAI,+BAAc,EAAE,CAAC;AACnC,OAAO,CAAC,GAAG,CAAM,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;IAChC,qGAAqG;IACrG,MAAM,QAAQ,GAAG,CAAC,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,0CAAkB,CAAC,KAAK,CAAC,CAAC;IAC/F,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,KAAK,KAAK,IAAI,QAAQ,EAAE;QAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACnB;AACL,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;IACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
@@ -16,12 +16,13 @@ let sinon = sinonImport.createSandbox();
16
16
  describe('BrsFile BrighterScript classes', () => {
17
17
  let tmpPath = (0, util_1.standardizePath) `${process.cwd()}/.tmp`;
18
18
  let rootDir = (0, util_1.standardizePath) `${tmpPath}/rootDir`;
19
+ const stagingDir = (0, util_1.standardizePath) `${tmpPath}/staging`;
19
20
  let program;
20
21
  let testTranspile = (0, testHelpers_spec_1.getTestTranspile)(() => [program, rootDir]);
21
22
  beforeEach(() => {
22
23
  fsExtra.ensureDirSync(rootDir);
23
24
  fsExtra.emptyDirSync(tmpPath);
24
- program = new Program_1.Program({ rootDir: rootDir });
25
+ program = new Program_1.Program({ rootDir: rootDir, stagingFolderPath: stagingDir });
25
26
  });
26
27
  afterEach(() => {
27
28
  sinon.restore();
@@ -174,6 +175,21 @@ describe('BrsFile BrighterScript classes', () => {
174
175
  });
175
176
  });
176
177
  describe('transpile', () => {
178
+ it('does not mess with AST when injecting `super()` call', async () => {
179
+ const file = program.setFile('source/classes.bs', `
180
+ class Parent
181
+ end class
182
+
183
+ class Child extends parent
184
+ sub new()
185
+ super()
186
+ end sub
187
+ end class
188
+ `);
189
+ (0, chai_1.expect)(file.ast.statements[1].body[0].func.body.statements[0].expression.callee.name.text).to.eql('super');
190
+ await program.transpile([], stagingDir);
191
+ (0, chai_1.expect)(file.ast.statements[1].body[0].func.body.statements[0].expression.callee.name.text).to.eql('super');
192
+ });
177
193
  it('follows correct sequence for property initializers', () => {
178
194
  testTranspile(`
179
195
  class Animal
@@ -501,6 +517,71 @@ describe('BrsFile BrighterScript classes', () => {
501
517
  end sub
502
518
  `, undefined, 'source/main.bs');
503
519
  });
520
+ it('calls super ', () => {
521
+ const { file } = testTranspile(`
522
+ class Parent
523
+ sub new()
524
+ end sub
525
+ end class
526
+ class Child extends Parent
527
+ sub new()
528
+ end sub
529
+ end class
530
+ `, `
531
+ function __Parent_builder()
532
+ instance = {}
533
+ instance.new = sub()
534
+ end sub
535
+ return instance
536
+ end function
537
+ function Parent()
538
+ instance = __Parent_builder()
539
+ instance.new()
540
+ return instance
541
+ end function
542
+ function __Child_builder()
543
+ instance = __Parent_builder()
544
+ instance.super0_new = instance.new
545
+ instance.new = sub()
546
+ m.super0_new()
547
+ end sub
548
+ return instance
549
+ end function
550
+ function Child()
551
+ instance = __Child_builder()
552
+ instance.new()
553
+ return instance
554
+ end function
555
+ `, undefined, undefined, false);
556
+ //the AST should not be permanently modified
557
+ const constructor = file.ast.statements[0].body[0];
558
+ (0, chai_1.expect)(constructor.func.body.statements).to.be.lengthOf(0);
559
+ });
560
+ it('adds field initializers', () => {
561
+ const { file } = testTranspile(`
562
+ class Person
563
+ sub new()
564
+ end sub
565
+ name = "Bob"
566
+ end class
567
+ `, `
568
+ function __Person_builder()
569
+ instance = {}
570
+ instance.new = sub()
571
+ m.name = "Bob"
572
+ end sub
573
+ return instance
574
+ end function
575
+ function Person()
576
+ instance = __Person_builder()
577
+ instance.new()
578
+ return instance
579
+ end function
580
+ `);
581
+ //the AST should not be permanently modified
582
+ const constructor = file.ast.statements[0].body[0];
583
+ (0, chai_1.expect)(constructor.func.body.statements).to.be.lengthOf(0);
584
+ });
504
585
  it('does not screw up local variable references', () => {
505
586
  testTranspile(`
506
587
  class Animal
@@ -1157,7 +1238,7 @@ describe('BrsFile BrighterScript classes', () => {
1157
1238
  end class
1158
1239
  `);
1159
1240
  (0, assert_1.doesNotThrow)(() => {
1160
- file.parser.references.classStatements[0].getParentClassIndex(new BrsTranspileState_1.BrsTranspileState(file));
1241
+ file.parser.references.classStatements[0]['getParentClassIndex'](new BrsTranspileState_1.BrsTranspileState(file));
1161
1242
  });
1162
1243
  });
1163
1244
  describe('getHover', () => {