Fixing issues before release 0.10.22

rokucommunity · Mar 1, 2024 · a5f3ed2 · a5f3ed2
1 parent 82dc41e
commit a5f3ed2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/prefixer/File.ts b/src/prefixer/File.ts
@@ -306,13 +306,14 @@ export class File {
             },
             //track class declarations (.bs and .d.bs only)
             ClassStatement: (cls) => {
+                const annotations = cls.annotations ?? [];
                 this.classDeclarations.push({
                     name: cls.name.text,
                     nameOffset: this.positionToOffset(cls.name.range.start),
                     hasNamespace: !!cls.namespaceName,
                     //Use annotation start position if available, otherwise use class keyword
                     startOffset: this.positionToOffset(
-                        (cls.annotations?.length > 0 ? cls.annotations[0] : cls.classKeyword).range.start
+                        (annotations?.length > 0 ? annotations[0] : cls.classKeyword).range.start
                     ),
                     endOffset: this.positionToOffset(cls.end.range.end)
                 });
@@ -346,13 +347,14 @@ export class File {
                 }
             },
             FunctionStatement: (func) => {
+                const annotations = func.annotations ?? [];
                 this.functionDefinitions.push({
                     name: func.name.text,
                     nameOffset: this.positionToOffset(func.name.range.start),
                     hasNamespace: !!func.namespaceName,
                     //Use annotation start position if available, otherwise use keyword
                     startOffset: this.positionToOffset(
-                        (func.annotations?.length > 0 ? func.annotations[0] : func.func.functionType)!.range.start
+                        (annotations?.length > 0 ? annotations[0] : func.func.functionType)!.range.start
                     ),
                     endOffset: this.positionToOffset(func.func.end.range.end)
                 });

diff --git a/src/prefixer/RopmModule.ts b/src/prefixer/RopmModule.ts
@@ -228,7 +228,7 @@ export class RopmModule {
                 '!**/node_modules/**/*'
             ]
         });
-        this.program = builder.program;
+        this.program = builder.program!;
 
         //load all files
         for (const obj of this.fileMaps) {