From 5f559159fc1cd509bccf9834f5ac0ee76b430d48 Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Wed, 29 Nov 2023 23:17:13 -0400
Subject: [PATCH 01/23] Adds the template children and field attributes to the
 component

---
 .../ComponentStatementProvider.ts             | 48 +++++++++++++++++--
 1 file changed, 43 insertions(+), 5 deletions(-)

diff --git a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
index 6321bc2f7..0dbdff47c 100644
--- a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
+++ b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
@@ -7,7 +7,7 @@ import { Cache } from '../../Cache';
 import * as path from 'path';
 import { util } from '../../util';
 import type { ProvideFileEvent } from '../../interfaces';
-import { isDottedGetExpression, isFieldStatement, isMethodStatement, isVariableExpression } from '../../astUtils/reflection';
+import { isDottedGetExpression, isFieldStatement, isMethodStatement, isVariableExpression, isLiteralExpression, isTemplateStringExpression } from '../../astUtils/reflection';
 import { createFunctionStatement, createFunctionExpression, createDottedSetStatement, createVariableExpression } from '../../astUtils/creators';
 import type { Statement } from '../../parser/AstNode';
 import { TokenKind } from '../../lexer/TokenKind';
@@ -27,7 +27,7 @@ export class ComponentStatementProvider {
         const cache = new Cache<string, string>();
         file.ast.walk(createVisitor({
             ComponentStatement: (node) => {
-                //force the desetPath for this component to be within the `pkg:/components` folder
+                //force the destPath for this component to be within the `pkg:/components` folder
                 const destDir = cache.getOrAdd(file.srcPath, () => {
                     return path.dirname(file.destPath).replace(/^(.+?)(?=[\/\\]|$)/, (match: string, firstDirName: string) => {
                         return 'components';
@@ -56,12 +56,24 @@ export class ComponentStatementProvider {
 
                 //declare interface field
             } else if (isFieldStatement(member) && member.accessModifier?.text.toLowerCase() === 'public') {
-                return `<field id="${member.name.text}" type="${member.typeExpression.getName()}" />`;
+                return `<field
+                    id="${member.name.text}"
+                    type="${member.typeExpression.getName()}"
+                    alias="${this.getAnnotationValue(member.annotations?.filter(x => x.name.toLowerCase() === 'alias'))}"
+                    onChange="${this.getAnnotationValue(member.annotations?.filter(x => x.name.toLowerCase() === 'onchange'))}"
+                    alwaysNotify="${this.getAnnotationValue(member.annotations?.filter(x => x.name.toLowerCase() === 'alwaysnotify')) === 'true'}"
+                />`;
             } else {
                 return '';
             }
         }).filter(x => !!x);
 
+        let componentChildren = '';
+        const template = statement.annotations?.find(x => x.name.toLowerCase() === 'template');
+        if (template) {
+            componentChildren = `<children>${this.getAnnotationValue([template])}</children>`;
+        }
+
         xmlFile.parse(undent`
             <component name="${name}" extends="${statement.getParentName(ParseMode.BrightScript) ?? 'Group'}">
                 <script uri="${util.sanitizePkgPath(file.destPath)}" />
@@ -69,13 +81,39 @@ export class ComponentStatementProvider {
                 ${interfaceMembers.length > 0 ? '<interface>' : ''}
                     ${interfaceMembers.join('\n                    ')}
                 ${interfaceMembers.length > 0 ? '</interface>' : ''}
+                ${componentChildren}
             </component>
         `);
 
-
         this.event.files.push(xmlFile);
     }
 
+    private getAnnotationValue(annotations: any) {
+        let response = [];
+        annotations.forEach(a => {
+            let args = a?.call?.args[0];
+            if (isVariableExpression(args) || isDottedGetExpression(args)) {
+                response.push(args.name.text);
+            } else if (isLiteralExpression(args)) {
+                let values = args?.token?.text.replaceAll('\"', '').replaceAll(' ', '').split(',');
+                response = response.concat(values);
+            } else if (isTemplateStringExpression(args)) {
+                let textOutput = '';
+                args.quasis[0]?.expressions?.forEach((a: { token: { text: string } }) => {
+                    if (!a.token.text.includes('component>') && !a.token.text.includes('children>')) {
+                        textOutput += a.token.text;
+                    }
+                });
+                response.push(textOutput);
+            }
+        });
+
+        response = response.filter((item, index) => {
+            return response.indexOf(item) === index;
+        });
+        return response.join(', ');
+    }
+
     private registerCodebehind(name: string, statement: ComponentStatement, destDir: string) {
         //create the codebehind file
         const file = this.event.fileFactory.BrsFile({
@@ -120,7 +158,7 @@ export class ComponentStatementProvider {
             initFunc.func.body.statements.unshift(...initStatements);
         }
 
-        //TODO these are hacks that we need until scope has been refactored to leverate the AST directly
+        //TODO these are hacks that we need until scope has been refactored to leverage the AST directly
         file.parser.invalidateReferences();
         // eslint-disable-next-line @typescript-eslint/dot-notation
         file['findCallables']();

From 086e26710b61dae9070ec6cd78feaa3eee55527a Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Thu, 30 Nov 2023 00:05:18 -0400
Subject: [PATCH 02/23] Validate annotations being send to getAnnotationValue,
 omit empty field attributes

---
 .../ComponentStatementProvider.ts             | 66 +++++++++++--------
 1 file changed, 39 insertions(+), 27 deletions(-)

diff --git a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
index 0dbdff47c..e5eed4810 100644
--- a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
+++ b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
@@ -56,13 +56,24 @@ export class ComponentStatementProvider {
 
                 //declare interface field
             } else if (isFieldStatement(member) && member.accessModifier?.text.toLowerCase() === 'public') {
-                return `<field
-                    id="${member.name.text}"
-                    type="${member.typeExpression.getName()}"
-                    alias="${this.getAnnotationValue(member.annotations?.filter(x => x.name.toLowerCase() === 'alias'))}"
-                    onChange="${this.getAnnotationValue(member.annotations?.filter(x => x.name.toLowerCase() === 'onchange'))}"
-                    alwaysNotify="${this.getAnnotationValue(member.annotations?.filter(x => x.name.toLowerCase() === 'alwaysnotify')) === 'true'}"
-                />`;
+                let fieldAttributes = {
+                    id: member.name.text,
+                    type: member.typeExpression.getName(),
+                    alias: this.getAnnotationValue(member.annotations?.filter(x => x.name.toLowerCase() === 'alias')),
+                    onChange: this.getAnnotationValue(member.annotations?.filter(x => x.name.toLowerCase() === 'onchange')),
+                    alwaysNotify: this.getAnnotationValue(member.annotations?.filter(x => x.name.toLowerCase() === 'alwaysnotify')) === 'true' ? 'true' : ''
+                };
+
+                let field = '<field';
+                Object.keys(fieldAttributes).forEach(attribute => {
+                    let value = fieldAttributes[attribute];
+                    // Only add a attribute if the value is not empty.
+                    if (value !== '') {
+                        field += ` ${attribute}="${fieldAttributes[attribute]}"`;
+                    }
+                });
+                field += ' />';
+                return field;
             } else {
                 return '';
             }
@@ -71,7 +82,8 @@ export class ComponentStatementProvider {
         let componentChildren = '';
         const template = statement.annotations?.find(x => x.name.toLowerCase() === 'template');
         if (template) {
-            componentChildren = `<children>${this.getAnnotationValue([template])}</children>`;
+            // TODO: Better strip of component and children elements.
+            componentChildren = `<children>${this.getAnnotationValue([template]).replaceAll('<component>', '').replaceAll('</component>', '').replaceAll('<children>', '').replaceAll('</children>', '')}</children>`;
         }
 
         xmlFile.parse(undent`
@@ -90,27 +102,27 @@ export class ComponentStatementProvider {
 
     private getAnnotationValue(annotations: any) {
         let response = [];
-        annotations.forEach(a => {
-            let args = a?.call?.args[0];
-            if (isVariableExpression(args) || isDottedGetExpression(args)) {
-                response.push(args.name.text);
-            } else if (isLiteralExpression(args)) {
-                let values = args?.token?.text.replaceAll('\"', '').replaceAll(' ', '').split(',');
-                response = response.concat(values);
-            } else if (isTemplateStringExpression(args)) {
-                let textOutput = '';
-                args.quasis[0]?.expressions?.forEach((a: { token: { text: string } }) => {
-                    if (!a.token.text.includes('component>') && !a.token.text.includes('children>')) {
+        if (annotations !== undefined) {
+            annotations.forEach(a => {
+                let args = a?.call?.args[0];
+                if (isVariableExpression(args) || isDottedGetExpression(args)) {
+                    response.push(args.name.text);
+                } else if (isLiteralExpression(args)) {
+                    let values = args?.token?.text.replaceAll('\"', '').replaceAll(' ', '').split(',');
+                    response = response.concat(values);
+                } else if (isTemplateStringExpression(args)) {
+                    let textOutput = '';
+                    args.quasis[0]?.expressions?.forEach((a: { token: { text: string } }) => {
                         textOutput += a.token.text;
-                    }
-                });
-                response.push(textOutput);
-            }
-        });
+                    });
+                    response.push(textOutput);
+                }
+            });
 
-        response = response.filter((item, index) => {
-            return response.indexOf(item) === index;
-        });
+            response = response.filter((item, index) => {
+                return response.indexOf(item) === index;
+            });
+        }
         return response.join(', ');
     }
 

From 4366da9fa42269682e79f380e1efb211968a1edc Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Thu, 30 Nov 2023 09:30:40 -0400
Subject: [PATCH 03/23] Update
 src/bscPlugin/fileProviders/ComponentStatementProvider.ts

Co-authored-by: Bronley Plumb <bronley@gmail.com>
---
 src/bscPlugin/fileProviders/ComponentStatementProvider.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
index e5eed4810..4245e0e09 100644
--- a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
+++ b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
@@ -100,7 +100,7 @@ export class ComponentStatementProvider {
         this.event.files.push(xmlFile);
     }
 
-    private getAnnotationValue(annotations: any) {
+    private getAnnotationValue(annotations: AnnotationExpression[]) {
         let response = [];
         if (annotations !== undefined) {
             annotations.forEach(a => {

From af6859225229422efeaae16de8c00dfbd548811c Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Thu, 30 Nov 2023 09:30:59 -0400
Subject: [PATCH 04/23] Update
 src/bscPlugin/fileProviders/ComponentStatementProvider.ts

Co-authored-by: Bronley Plumb <bronley@gmail.com>
---
 src/bscPlugin/fileProviders/ComponentStatementProvider.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
index 4245e0e09..ff0b04755 100644
--- a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
+++ b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
@@ -103,8 +103,8 @@ export class ComponentStatementProvider {
     private getAnnotationValue(annotations: AnnotationExpression[]) {
         let response = [];
         if (annotations !== undefined) {
-            annotations.forEach(a => {
-                let args = a?.call?.args[0];
+           for (const annotation of annotations) {
+                let args = annotation?.call?.args[0];
                 if (isVariableExpression(args) || isDottedGetExpression(args)) {
                     response.push(args.name.text);
                 } else if (isLiteralExpression(args)) {

From 03fc57905ac0ab446f21168ad9a9077a8be4472e Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Thu, 30 Nov 2023 09:38:19 -0400
Subject: [PATCH 05/23] Update
 src/bscPlugin/fileProviders/ComponentStatementProvider.ts

---
 src/bscPlugin/fileProviders/ComponentStatementProvider.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
index ff0b04755..f9620cc10 100644
--- a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
+++ b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
@@ -117,7 +117,7 @@ export class ComponentStatementProvider {
                     });
                     response.push(textOutput);
                 }
-            });
+            };
 
             response = response.filter((item, index) => {
                 return response.indexOf(item) === index;

From a1630c4656734711476f871daac4c12ddd2538de Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Thu, 30 Nov 2023 13:42:51 -0400
Subject: [PATCH 06/23] Add AnnotaionExpression type

---
 src/bscPlugin/fileProviders/ComponentStatementProvider.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
index f9620cc10..6475c99b2 100644
--- a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
+++ b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
@@ -12,6 +12,7 @@ import { createFunctionStatement, createFunctionExpression, createDottedSetState
 import type { Statement } from '../../parser/AstNode';
 import { TokenKind } from '../../lexer/TokenKind';
 import { VariableExpression } from '../../parser/Expression';
+import type { AnnotationExpression } from '../../parser/Expression';
 
 export class ComponentStatementProvider {
     constructor(

From b397e896b1c09854b6e897f88fb18652c31e9b2d Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Thu, 30 Nov 2023 14:05:32 -0400
Subject: [PATCH 07/23] initialFocus

---
 .../ComponentStatementProvider.ts             | 47 ++++++++++++-------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
index 6475c99b2..eb1bdbd6e 100644
--- a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
+++ b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
@@ -7,7 +7,7 @@ import { Cache } from '../../Cache';
 import * as path from 'path';
 import { util } from '../../util';
 import type { ProvideFileEvent } from '../../interfaces';
-import { isDottedGetExpression, isFieldStatement, isMethodStatement, isVariableExpression, isLiteralExpression, isTemplateStringExpression } from '../../astUtils/reflection';
+import { isDottedGetExpression, isFieldStatement, isMethodStatement, isVariableExpression, isLiteralExpression, isTemplateStringExpression, isAnnotationExpression } from '../../astUtils/reflection';
 import { createFunctionStatement, createFunctionExpression, createDottedSetStatement, createVariableExpression } from '../../astUtils/creators';
 import type { Statement } from '../../parser/AstNode';
 import { TokenKind } from '../../lexer/TokenKind';
@@ -57,24 +57,13 @@ export class ComponentStatementProvider {
 
                 //declare interface field
             } else if (isFieldStatement(member) && member.accessModifier?.text.toLowerCase() === 'public') {
-                let fieldAttributes = {
+                return this.generateTagWithAttributes('field', {
                     id: member.name.text,
                     type: member.typeExpression.getName(),
                     alias: this.getAnnotationValue(member.annotations?.filter(x => x.name.toLowerCase() === 'alias')),
                     onChange: this.getAnnotationValue(member.annotations?.filter(x => x.name.toLowerCase() === 'onchange')),
                     alwaysNotify: this.getAnnotationValue(member.annotations?.filter(x => x.name.toLowerCase() === 'alwaysnotify')) === 'true' ? 'true' : ''
-                };
-
-                let field = '<field';
-                Object.keys(fieldAttributes).forEach(attribute => {
-                    let value = fieldAttributes[attribute];
-                    // Only add a attribute if the value is not empty.
-                    if (value !== '') {
-                        field += ` ${attribute}="${fieldAttributes[attribute]}"`;
-                    }
-                });
-                field += ' />';
-                return field;
+                }, true);
             } else {
                 return '';
             }
@@ -82,13 +71,23 @@ export class ComponentStatementProvider {
 
         let componentChildren = '';
         const template = statement.annotations?.find(x => x.name.toLowerCase() === 'template');
-        if (template) {
+        if (isAnnotationExpression(template)) {
             // TODO: Better strip of component and children elements.
             componentChildren = `<children>${this.getAnnotationValue([template]).replaceAll('<component>', '').replaceAll('</component>', '').replaceAll('<children>', '').replaceAll('</children>', '')}</children>`;
         }
 
+        let componentAttributes = {
+            name: name,
+            extends: statement.getParentName(ParseMode.BrightScript) ?? 'Group',
+            initialFocus: ''
+        };
+        const initialFocus = statement.annotations?.find(x => x.name.toLowerCase() === 'initialfocus');
+        if (isAnnotationExpression(initialFocus)) {
+            console.log(initialFocus);
+            componentAttributes.initialFocus = this.getAnnotationValue([initialFocus]);
+        }
         xmlFile.parse(undent`
-            <component name="${name}" extends="${statement.getParentName(ParseMode.BrightScript) ?? 'Group'}">
+            ${this.generateTagWithAttributes('component', componentAttributes)};
                 <script uri="${util.sanitizePkgPath(file.destPath)}" />
                 <script uri="${util.sanitizePkgPath(codebehindFile.destPath)}" />
                 ${interfaceMembers.length > 0 ? '<interface>' : ''}
@@ -101,10 +100,24 @@ export class ComponentStatementProvider {
         this.event.files.push(xmlFile);
     }
 
+    private generateTagWithAttributes(identifier = '' as string, attributes = {} as Record<string, any>, closeEnd = false as boolean) {
+        let tag = `<${identifier}`;
+        Object.keys(attributes).forEach(attribute => {
+            let value = attributes[attribute];
+            // Only add a attribute if the value is not empty.
+            if (value !== '') {
+                tag += ` ${attribute}="${attributes[attribute]}"`;
+            }
+        });
+        tag += closeEnd ? ' />': ' >';
+        return tag;
+    }
+
     private getAnnotationValue(annotations: AnnotationExpression[]) {
         let response = [];
         if (annotations !== undefined) {
-           for (const annotation of annotations) {
+            for (const annotation of annotations) {
+                // console.log(annotation);
                 let args = annotation?.call?.args[0];
                 if (isVariableExpression(args) || isDottedGetExpression(args)) {
                     response.push(args.name.text);

From 5325d9e032db980857fccf07c0ccc6dd8ff50377 Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Thu, 30 Nov 2023 14:40:24 -0400
Subject: [PATCH 08/23] Update component-statement.md to indicate requirement
 of method access

---
 docs/component-statement.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/component-statement.md b/docs/component-statement.md
index 89300dada..70a6e2409 100644
--- a/docs/component-statement.md
+++ b/docs/component-statement.md
@@ -4,7 +4,7 @@ You can define a component in code, similar to how you would define a class.
 ## Basic usage
 ```vb
 component MoviePoster extends "Poster"
-    sub init()
+    private sub init()
         print "MoviePoster init()"
     end sub
 end component
@@ -102,7 +102,7 @@ end component
 Private properties are written to `m`. Private functions are transpiled to scope-level functions (i.e. not written to m) and we will remove the `m.` when calling those functions.
 ```vb
 component MoviePoster extends "Poster"
-    sub init()
+    private sub init()
         m.toggleSubtitles()
     end sub
     private areSubtitlesEnabled as boolean = true
@@ -347,7 +347,7 @@ XML component templates can also be loaded from another file by using the `@Temp
 ```vb
 @TemplateUrl("./MoviePoster.xml")
 component MoviePoster extends "Poster"
-    sub init()
+    private sub init()
         print "MoviePoster"
     end sub
 end component

From fd613b6050a507af06567925d5dadcecab89bd0c Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Thu, 30 Nov 2023 14:41:17 -0400
Subject: [PATCH 09/23] Remove space

---
 src/bscPlugin/fileProviders/ComponentStatementProvider.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
index eb1bdbd6e..d1d566c8f 100644
--- a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
+++ b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
@@ -20,7 +20,6 @@ export class ComponentStatementProvider {
     ) {
     }
 
-
     /**
      * Create virtual files for every component statement found in this physical file
      */

From fe05c8a6b37f1be1571c98e162fdabc3bbdaf642 Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Thu, 30 Nov 2023 14:58:50 -0400
Subject: [PATCH 10/23] Remove comments

---
 src/bscPlugin/fileProviders/ComponentStatementProvider.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
index d1d566c8f..ea5c83030 100644
--- a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
+++ b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
@@ -82,7 +82,6 @@ export class ComponentStatementProvider {
         };
         const initialFocus = statement.annotations?.find(x => x.name.toLowerCase() === 'initialfocus');
         if (isAnnotationExpression(initialFocus)) {
-            console.log(initialFocus);
             componentAttributes.initialFocus = this.getAnnotationValue([initialFocus]);
         }
         xmlFile.parse(undent`
@@ -116,7 +115,6 @@ export class ComponentStatementProvider {
         let response = [];
         if (annotations !== undefined) {
             for (const annotation of annotations) {
-                // console.log(annotation);
                 let args = annotation?.call?.args[0];
                 if (isVariableExpression(args) || isDottedGetExpression(args)) {
                     response.push(args.name.text);

From a14a35f53176f6edf4f94ac8039548d0f27f0447 Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Thu, 30 Nov 2023 15:47:30 -0400
Subject: [PATCH 11/23] Add tests

---
 .../ComponentStatementProvider.ts             |   8 +-
 .../statement/ComponentStatement.spec.ts      | 126 ++++++++++++++++++
 2 files changed, 133 insertions(+), 1 deletion(-)

diff --git a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
index ea5c83030..80c8e6e10 100644
--- a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
+++ b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
@@ -117,7 +117,13 @@ export class ComponentStatementProvider {
             for (const annotation of annotations) {
                 let args = annotation?.call?.args[0];
                 if (isVariableExpression(args) || isDottedGetExpression(args)) {
-                    response.push(args.name.text);
+                    let value = '';
+                    let objText = args.obj.name.text;
+                    if (isDottedGetExpression(args) && objText !== 'm') {
+                        value += `${objText}.`;
+                    }
+                    value += args.name.text;
+                    response.push(value);
                 } else if (isLiteralExpression(args)) {
                     let values = args?.token?.text.replaceAll('\"', '').replaceAll(' ', '').split(',');
                     response = response.concat(values);
diff --git a/src/parser/tests/statement/ComponentStatement.spec.ts b/src/parser/tests/statement/ComponentStatement.spec.ts
index 2d978d2cf..3ea2a5f01 100644
--- a/src/parser/tests/statement/ComponentStatement.spec.ts
+++ b/src/parser/tests/statement/ComponentStatement.spec.ts
@@ -369,4 +369,130 @@ describe('ComponentStatement', () => {
             end sub
         `);
     });
+
+    it('includes xml template', async () => {
+        program.setFile('components/ZombieKeyboard.bs', `
+            @template(\`
+                <label />
+            \`)
+            component ZombieKeyboard
+            end component
+        `);
+
+        await testTranspile(program.getFile('components/ZombieKeyboard.xml'), `
+            <component name="ZombieKeyboard" extends="Group">
+                <script uri="pkg:/components/ZombieKeyboard.brs" type="text/brightscript" />
+                <script uri="pkg:/components/ZombieKeyboard.codebehind.brs" type="text/brightscript" />
+                <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
+                <children>
+                    <label />
+                </children>
+            </component>
+        `);
+    });
+
+    it('support initialFocus annotation', async () => {
+        program.setFile('components/ZombieKeyboard.bs', `
+            @template(\`
+                <label id="theLabel" />
+            \`)
+            @initialFocus(m.theLabel)
+            component ZombieKeyboard
+            end component
+        `);
+
+
+        await testTranspile(program.getFile('components/ZombieKeyboard.xml'), `
+            <component name="ZombieKeyboard" extends="Group" initialFocus="theLabel">
+                <script uri="pkg:/components/ZombieKeyboard.brs" type="text/brightscript" />
+                <script uri="pkg:/components/ZombieKeyboard.codebehind.brs" type="text/brightscript" />
+                <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
+                <children>
+                    <label id="theLabel" />
+                </children>
+            </component>
+        `);
+    });
+
+    it('support alwaysNotify annotations on interface fields', async () => {
+        program.setFile('components/ZombieKeyboard.bs', `
+            component ZombieKeyboard
+                @alwaysNotify(true)
+                public testField as string
+            end component
+        `);
+
+        await testTranspile(program.getFile('components/ZombieKeyboard.xml'), `
+            <component name="ZombieKeyboard" extends="Group">
+                <script uri="pkg:/components/ZombieKeyboard.brs" type="text/brightscript" />
+                <script uri="pkg:/components/ZombieKeyboard.codebehind.brs" type="text/brightscript" />
+                <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
+                <interface>
+                    <field id="testField" type="string" alwaysNotify="true" />
+                </interface>
+            </component>
+        `);
+    });
+
+    it('support alias annotations on interface fields', async () => {
+        program.setFile('components/ZombieKeyboard.bs', `
+            @template(\`
+                <label id="theLabel" />
+                <label id="theOtherLabel" />
+            \`)
+            component ZombieKeyboard
+                @alias("theLabel.text")
+                @alias(theLabel.text)
+                @alias("theOtherLabel.text")
+                @alias("theOtherLabel.text", "theLabel.text")
+                @alias("theLabel.text", "theOtherLabel.text")
+                public testField as string
+            end component
+        `);
+
+        await testTranspile(program.getFile('components/ZombieKeyboard.xml'), `
+            <component name="ZombieKeyboard" extends="Group">
+                <script uri="pkg:/components/ZombieKeyboard.brs" type="text/brightscript" />
+                <script uri="pkg:/components/ZombieKeyboard.codebehind.brs" type="text/brightscript" />
+                <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
+                <interface>
+                    <field id="testField" type="string" alias="theLabel.text, theOtherLabel.text" />
+                </interface>
+                <children>
+                    <label id="theLabel" />
+                    <label id="theOtherLabel" />
+                </children>
+            </component>
+        `);
+    });
+
+    it('support onChange annotations on interface fields', async () => {
+        program.setFile('components/ZombieKeyboard.bs', `
+            component ZombieKeyboard
+                @onChange(m.doSomething)
+                public testField as string
+
+                private sub doSomething()
+                    print "do something"
+                end sub
+            end component
+        `);
+
+        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.brs'), `
+            sub doSomething()
+                print "do something"
+            end sub
+        `);
+
+        await testTranspile(program.getFile('components/ZombieKeyboard.xml'), `
+            <component name="ZombieKeyboard" extends="Group">
+                <script uri="pkg:/components/ZombieKeyboard.brs" type="text/brightscript" />
+                <script uri="pkg:/components/ZombieKeyboard.codebehind.brs" type="text/brightscript" />
+                <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
+                <interface>
+                    <field id="testField" type="string" onChange="doSomething" />
+                </interface>
+            </component>
+        `);
+    });
 });

From 6f1377873b63ebf616f11b0b3f4278c9e1911013 Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Thu, 30 Nov 2023 16:04:20 -0400
Subject: [PATCH 12/23] remove obj lookup in annotation lookup

---
 src/bscPlugin/fileProviders/ComponentStatementProvider.ts | 8 +-------
 src/parser/tests/statement/ComponentStatement.spec.ts     | 5 ++---
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
index 80c8e6e10..ea5c83030 100644
--- a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
+++ b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
@@ -117,13 +117,7 @@ export class ComponentStatementProvider {
             for (const annotation of annotations) {
                 let args = annotation?.call?.args[0];
                 if (isVariableExpression(args) || isDottedGetExpression(args)) {
-                    let value = '';
-                    let objText = args.obj.name.text;
-                    if (isDottedGetExpression(args) && objText !== 'm') {
-                        value += `${objText}.`;
-                    }
-                    value += args.name.text;
-                    response.push(value);
+                    response.push(args.name.text);
                 } else if (isLiteralExpression(args)) {
                     let values = args?.token?.text.replaceAll('\"', '').replaceAll(' ', '').split(',');
                     response = response.concat(values);
diff --git a/src/parser/tests/statement/ComponentStatement.spec.ts b/src/parser/tests/statement/ComponentStatement.spec.ts
index 21f4fbb28..f5f2b9135 100644
--- a/src/parser/tests/statement/ComponentStatement.spec.ts
+++ b/src/parser/tests/statement/ComponentStatement.spec.ts
@@ -10,7 +10,7 @@ import { ParseMode } from '../../Parser';
 import * as fsExtra from 'fs-extra';
 import { TypeExpression } from '../../..';
 
-describe('ComponentStatement', () => {
+describe.only('ComponentStatement', () => {
     const rootDir = s`${process.cwd()}/.tmp/rootDir`;
     let program: Program;
     let testTranspile = getTestTranspile(() => [program, rootDir]);
@@ -284,7 +284,7 @@ describe('ComponentStatement', () => {
         `);
     });
 
-    it.only('adds private member to m and creates init function if missing', async () => {
+    it.skip('adds private member to m and creates init function if missing', async () => {
         program.setFile('components/ZombieKeyboard.bs', `
             component ZombieKeyboard
                 private isEnabled = true
@@ -442,7 +442,6 @@ describe('ComponentStatement', () => {
             \`)
             component ZombieKeyboard
                 @alias("theLabel.text")
-                @alias(theLabel.text)
                 @alias("theOtherLabel.text")
                 @alias("theOtherLabel.text", "theLabel.text")
                 @alias("theLabel.text", "theOtherLabel.text")

From f58c40badd144c4d6b4ce1b3aa7ad7e05a429b51 Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Thu, 30 Nov 2023 16:25:23 -0400
Subject: [PATCH 13/23] remove describe.only

---
 src/parser/tests/statement/ComponentStatement.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/parser/tests/statement/ComponentStatement.spec.ts b/src/parser/tests/statement/ComponentStatement.spec.ts
index f5f2b9135..32881d648 100644
--- a/src/parser/tests/statement/ComponentStatement.spec.ts
+++ b/src/parser/tests/statement/ComponentStatement.spec.ts
@@ -10,7 +10,7 @@ import { ParseMode } from '../../Parser';
 import * as fsExtra from 'fs-extra';
 import { TypeExpression } from '../../..';
 
-describe.only('ComponentStatement', () => {
+describe('ComponentStatement', () => {
     const rootDir = s`${process.cwd()}/.tmp/rootDir`;
     let program: Program;
     let testTranspile = getTestTranspile(() => [program, rootDir]);

From 7c98830e20bd803c49a530b0f05ec44f076b82f0 Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Thu, 30 Nov 2023 16:26:00 -0400
Subject: [PATCH 14/23] remove semicolon

---
 src/bscPlugin/fileProviders/ComponentStatementProvider.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
index ea5c83030..0bab728eb 100644
--- a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
+++ b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
@@ -128,7 +128,7 @@ export class ComponentStatementProvider {
                     });
                     response.push(textOutput);
                 }
-            };
+            }
 
             response = response.filter((item, index) => {
                 return response.indexOf(item) === index;

From cfc105a80174349ac8cf0970c7c2fc99d675823e Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Thu, 30 Nov 2023 20:58:53 -0400
Subject: [PATCH 15/23] Update
 src/parser/tests/statement/ComponentStatement.spec.ts

---
 src/parser/tests/statement/ComponentStatement.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/parser/tests/statement/ComponentStatement.spec.ts b/src/parser/tests/statement/ComponentStatement.spec.ts
index 32881d648..167bf4b6f 100644
--- a/src/parser/tests/statement/ComponentStatement.spec.ts
+++ b/src/parser/tests/statement/ComponentStatement.spec.ts
@@ -284,7 +284,7 @@ describe('ComponentStatement', () => {
         `);
     });
 
-    it.skip('adds private member to m and creates init function if missing', async () => {
+    it.only('adds private member to m and creates init function if missing', async () => {
         program.setFile('components/ZombieKeyboard.bs', `
             component ZombieKeyboard
                 private isEnabled = true

From b411e00474e558bfb76393ee6ea32a1e9e275700 Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Thu, 30 Nov 2023 21:02:48 -0400
Subject: [PATCH 16/23] readd skip

---
 src/parser/tests/statement/ComponentStatement.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/parser/tests/statement/ComponentStatement.spec.ts b/src/parser/tests/statement/ComponentStatement.spec.ts
index 167bf4b6f..32881d648 100644
--- a/src/parser/tests/statement/ComponentStatement.spec.ts
+++ b/src/parser/tests/statement/ComponentStatement.spec.ts
@@ -284,7 +284,7 @@ describe('ComponentStatement', () => {
         `);
     });
 
-    it.only('adds private member to m and creates init function if missing', async () => {
+    it.skip('adds private member to m and creates init function if missing', async () => {
         program.setFile('components/ZombieKeyboard.bs', `
             component ZombieKeyboard
                 private isEnabled = true

From 4508c432c7447cf426c3778c5276b81c415baaab Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Fri, 1 Dec 2023 10:57:01 -0400
Subject: [PATCH 17/23] Add pkgPath

---
 src/bscPlugin/fileProviders/ComponentStatementProvider.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
index 0bab728eb..416360a4b 100644
--- a/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
+++ b/src/bscPlugin/fileProviders/ComponentStatementProvider.ts
@@ -130,9 +130,7 @@ export class ComponentStatementProvider {
                 }
             }
 
-            response = response.filter((item, index) => {
-                return response.indexOf(item) === index;
-            });
+            response = response.filter((item, index) => response.indexOf(item) === index);
         }
         return response.join(', ');
     }
@@ -141,7 +139,8 @@ export class ComponentStatementProvider {
         //create the codebehind file
         const file = this.event.fileFactory.BrsFile({
             srcPath: `virtual:/${destDir}/${name}.codebehind.bs`,
-            destPath: `${destDir}/${name}.codebehind.brs`
+            destPath: `${destDir}/${name}.codebehind.bs`,
+            pkgPath: `${destDir}/${name}.codebehind.brs`
         });
         const initStatements: Statement[] = [];
         let initFunc: FunctionStatement;

From b79f96378d4fb445688331f12f4df5027c204b32 Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Fri, 1 Dec 2023 12:27:43 -0400
Subject: [PATCH 18/23] Fix tests

---
 .../tests/statement/ComponentStatement.spec.ts     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/parser/tests/statement/ComponentStatement.spec.ts b/src/parser/tests/statement/ComponentStatement.spec.ts
index 32881d648..edb48515c 100644
--- a/src/parser/tests/statement/ComponentStatement.spec.ts
+++ b/src/parser/tests/statement/ComponentStatement.spec.ts
@@ -277,7 +277,7 @@ describe('ComponentStatement', () => {
             </component>
         `);
 
-        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.brs'), `
+        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.bs'), `
             sub EnableVoiceMode(isEnabled as boolean)
                 m.top.voiceModeEnabled = isEnabled
             end sub
@@ -299,7 +299,7 @@ describe('ComponentStatement', () => {
             </component>
         `);
 
-        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.brs'), `
+        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.bs'), `
             sub init()
                 m.isEnabled = true
             end sub
@@ -316,7 +316,7 @@ describe('ComponentStatement', () => {
             end component
         `);
 
-        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.brs'), `
+        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.bs'), `
             sub init()
                 m.isEnabled = true
                 'test
@@ -336,7 +336,7 @@ describe('ComponentStatement', () => {
             end component
         `);
 
-        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.brs'), `
+        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.bs'), `
             sub init()
                 'test
             end sub
@@ -359,7 +359,7 @@ describe('ComponentStatement', () => {
             end component
         `);
 
-        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.brs'), `
+        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.bs'), `
             sub init()
                 doSomething()
             end sub
@@ -382,7 +382,7 @@ describe('ComponentStatement', () => {
         await testTranspile(program.getFile('components/ZombieKeyboard.xml'), `
             <component name="ZombieKeyboard" extends="Group">
                 <script uri="pkg:/components/ZombieKeyboard.brs" type="text/brightscript" />
-                <script uri="pkg:/components/ZombieKeyboard.codebehind.brs" type="text/brightscript" />
+                <script uri="pkg:/components/ZombieKeyboard.codebehind.bs" type="text/brightscript" />
                 <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
                 <children>
                     <label />
@@ -405,7 +405,7 @@ describe('ComponentStatement', () => {
         await testTranspile(program.getFile('components/ZombieKeyboard.xml'), `
             <component name="ZombieKeyboard" extends="Group" initialFocus="theLabel">
                 <script uri="pkg:/components/ZombieKeyboard.brs" type="text/brightscript" />
-                <script uri="pkg:/components/ZombieKeyboard.codebehind.brs" type="text/brightscript" />
+                <script uri="pkg:/components/ZombieKeyboard.codebehind.bs" type="text/brightscript" />
                 <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
                 <children>
                     <label id="theLabel" />

From 6dc246d103739b2b965c5ef2a922e117704982c1 Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Fri, 1 Dec 2023 12:49:34 -0400
Subject: [PATCH 19/23] Fix tests part 2

---
 src/parser/tests/statement/ComponentStatement.spec.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/parser/tests/statement/ComponentStatement.spec.ts b/src/parser/tests/statement/ComponentStatement.spec.ts
index edb48515c..1d58484cf 100644
--- a/src/parser/tests/statement/ComponentStatement.spec.ts
+++ b/src/parser/tests/statement/ComponentStatement.spec.ts
@@ -6,7 +6,6 @@ import type { BrsFile } from '../../../files/BrsFile';
 import { DiagnosticMessages } from '../../../DiagnosticMessages';
 import { createVisitor, WalkMode } from '../../../astUtils/visitors';
 import * as sinon from 'sinon';
-import { ParseMode } from '../../Parser';
 import * as fsExtra from 'fs-extra';
 import { TypeExpression } from '../../..';
 
@@ -245,7 +244,7 @@ describe('ComponentStatement', () => {
             </component>
         `);
 
-        await testTranspile(program.getFile('components/MainScene.codebehind.brs'), `
+        await testTranspile(program.getFile('components/MainScene.codebehind.bs'), `
             sub init()
                 print "MainScene"
             end sub
@@ -382,7 +381,7 @@ describe('ComponentStatement', () => {
         await testTranspile(program.getFile('components/ZombieKeyboard.xml'), `
             <component name="ZombieKeyboard" extends="Group">
                 <script uri="pkg:/components/ZombieKeyboard.brs" type="text/brightscript" />
-                <script uri="pkg:/components/ZombieKeyboard.codebehind.bs" type="text/brightscript" />
+                <script uri="pkg:/components/ZombieKeyboard.codebehind.brs" type="text/brightscript" />
                 <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
                 <children>
                     <label />
@@ -405,7 +404,7 @@ describe('ComponentStatement', () => {
         await testTranspile(program.getFile('components/ZombieKeyboard.xml'), `
             <component name="ZombieKeyboard" extends="Group" initialFocus="theLabel">
                 <script uri="pkg:/components/ZombieKeyboard.brs" type="text/brightscript" />
-                <script uri="pkg:/components/ZombieKeyboard.codebehind.bs" type="text/brightscript" />
+                <script uri="pkg:/components/ZombieKeyboard.codebehind.brs" type="text/brightscript" />
                 <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
                 <children>
                     <label id="theLabel" />
@@ -477,7 +476,7 @@ describe('ComponentStatement', () => {
             end component
         `);
 
-        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.brs'), `
+        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.bs'), `
             sub doSomething()
                 print "do something"
             end sub

From 8e04a6ef7e6d2d9c1c49499f2e7cd0385a1fbbe5 Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Mon, 4 Dec 2023 10:08:48 -0400
Subject: [PATCH 20/23] update spec

---
 src/parser/tests/statement/ComponentStatement.spec.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/parser/tests/statement/ComponentStatement.spec.ts b/src/parser/tests/statement/ComponentStatement.spec.ts
index 1d58484cf..ac7dac881 100644
--- a/src/parser/tests/statement/ComponentStatement.spec.ts
+++ b/src/parser/tests/statement/ComponentStatement.spec.ts
@@ -6,6 +6,7 @@ import type { BrsFile } from '../../../files/BrsFile';
 import { DiagnosticMessages } from '../../../DiagnosticMessages';
 import { createVisitor, WalkMode } from '../../../astUtils/visitors';
 import * as sinon from 'sinon';
+import { ParseMode } from '../../Parser';
 import * as fsExtra from 'fs-extra';
 import { TypeExpression } from '../../..';
 

From 2011c026619d17399ecce74f101acd42389ade46 Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Mon, 4 Dec 2023 12:49:39 -0400
Subject: [PATCH 21/23] Confirm bs files are also generated

---
 src/parser/tests/statement/ComponentStatement.spec.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/parser/tests/statement/ComponentStatement.spec.ts b/src/parser/tests/statement/ComponentStatement.spec.ts
index ac7dac881..ceec237db 100644
--- a/src/parser/tests/statement/ComponentStatement.spec.ts
+++ b/src/parser/tests/statement/ComponentStatement.spec.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/await-thenable */
 import util, { standardizePath as s } from '../../../util';
 import { Program } from '../../../Program';
 import { expectDiagnostics, expectZeroDiagnostics, getTestTranspile, stagingDir, tempDir } from '../../../testHelpers.spec';
@@ -193,6 +194,7 @@ describe('ComponentStatement', () => {
             end component
         `);
 
+        // eslint-disable-next-line @typescript-eslint/await-thenable
         await testTranspile(program.getFile('components/MainScene.xml'), `
             <component name="MainScene" extends="Group">
                 <script uri="pkg:/components/MainScene.brs" type="text/brightscript" />
@@ -389,6 +391,9 @@ describe('ComponentStatement', () => {
                 </children>
             </component>
         `);
+
+        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.bs'), `
+        `);
     });
 
     it('support initialFocus annotation', async () => {
@@ -412,6 +417,9 @@ describe('ComponentStatement', () => {
                 </children>
             </component>
         `);
+
+        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.bs'), `
+        `);
     });
 
     it('support alwaysNotify annotations on interface fields', async () => {

From 6972a4e5b06a5cf9b8ae2f50899de64c1d33dbb3 Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Mon, 4 Dec 2023 12:58:08 -0400
Subject: [PATCH 22/23] Confirm bs files are also generated

---
 src/parser/tests/statement/ComponentStatement.spec.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/parser/tests/statement/ComponentStatement.spec.ts b/src/parser/tests/statement/ComponentStatement.spec.ts
index ceec237db..7ca80028b 100644
--- a/src/parser/tests/statement/ComponentStatement.spec.ts
+++ b/src/parser/tests/statement/ComponentStatement.spec.ts
@@ -392,8 +392,7 @@ describe('ComponentStatement', () => {
             </component>
         `);
 
-        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.bs'), `
-        `);
+        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.bs'), ``);
     });
 
     it('support initialFocus annotation', async () => {
@@ -418,8 +417,7 @@ describe('ComponentStatement', () => {
             </component>
         `);
 
-        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.bs'), `
-        `);
+        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.bs'), ``);
     });
 
     it('support alwaysNotify annotations on interface fields', async () => {
@@ -440,6 +438,8 @@ describe('ComponentStatement', () => {
                 </interface>
             </component>
         `);
+
+        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.bs'), ``);
     });
 
     it('support alias annotations on interface fields', async () => {
@@ -471,6 +471,8 @@ describe('ComponentStatement', () => {
                 </children>
             </component>
         `);
+
+        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.bs'), ``);
     });
 
     it('support onChange annotations on interface fields', async () => {

From dd48bb227789ae8ec1bfe5991c809dfad0999408 Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler@tksssoftware.com>
Date: Mon, 4 Dec 2023 13:04:16 -0400
Subject: [PATCH 23/23] Update xml template test

---
 src/parser/tests/statement/ComponentStatement.spec.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/parser/tests/statement/ComponentStatement.spec.ts b/src/parser/tests/statement/ComponentStatement.spec.ts
index 7ca80028b..b28f7d056 100644
--- a/src/parser/tests/statement/ComponentStatement.spec.ts
+++ b/src/parser/tests/statement/ComponentStatement.spec.ts
@@ -380,6 +380,11 @@ describe('ComponentStatement', () => {
             component ZombieKeyboard
             end component
         `);
+        expectZeroDiagnostics(program);
+
+        expect(
+            program.getFile('components/ZombieKeyboard.codebehind.bs')
+        ).to.exist;
 
         await testTranspile(program.getFile('components/ZombieKeyboard.xml'), `
             <component name="ZombieKeyboard" extends="Group">
@@ -391,8 +396,6 @@ describe('ComponentStatement', () => {
                 </children>
             </component>
         `);
-
-        await testTranspile(program.getFile('components/ZombieKeyboard.codebehind.bs'), ``);
     });
 
     it('support initialFocus annotation', async () => {