brighterscript 0.65.1 → 0.66.0-alpha.1

package/dist/SymbolTable.js

@@ -1,6 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SymbolTable = void 0;
+exports.SymbolTable = exports.SymbolTypeFlag = void 0;
+const helpers_1 = require("./types/helpers");
+const reflection_1 = require("./astUtils/reflection");
+var SymbolTypeFlag;
+(function (SymbolTypeFlag) {
+    SymbolTypeFlag[SymbolTypeFlag["runtime"] = 1] = "runtime";
+    SymbolTypeFlag[SymbolTypeFlag["typetime"] = 2] = "typetime";
+})(SymbolTypeFlag = exports.SymbolTypeFlag || (exports.SymbolTypeFlag = {}));
 /**
  * Stores the types associated with variables and functions in the Brighterscript code
  * Can be part of a hierarchy, so lookups can reference parent scopes
@@ -15,6 +22,7 @@ class SymbolTable {
         this.symbolMap = new Map();
         this.parentProviders = [];
         this.siblings = new Set();
+        this.resetTypeCache();
         if (parentProvider) {
             this.pushParentProvider(parentProvider);
         }
@@ -42,7 +50,9 @@ class SymbolTable {
      * Add a sibling symbol table (which will be inspected first before walking upward to the parent
      */
     addSibling(sibling) {
-        this.siblings.add(sibling);
+        if (!this.siblings.has(sibling)) {
+            this.siblings.add(sibling);
+        }
     }
     /**
      * Remove a sibling symbol table
@@ -55,43 +65,70 @@ class SymbolTable {
      * If the identifier is not in this table, it will check the parent
      *
      * @param name the name to lookup
-     * @param searchParent should we look to our parent if we don't have the symbol?
+     * @param bitFlags flags to match (See SymbolTypeFlags)
      * @returns true if this symbol is in the symbol table
      */
-    hasSymbol(name, searchParent = true) {
-        return !!this.getSymbol(name, searchParent);
+    hasSymbol(name, bitFlags) {
+        let currentTable = this;
+        const key = name === null || name === void 0 ? void 0 : name.toLowerCase();
+        let result;
+        do {
+            // look in our map first
+            if ((result = currentTable.symbolMap.get(key))) {
+                // eslint-disable-next-line no-bitwise
+                if (result.find(symbol => symbol.flags & bitFlags)) {
+                    return true;
+                }
+            }
+            //look through any sibling maps next
+            for (let sibling of currentTable.siblings) {
+                if ((result = sibling.symbolMap.get(key))) {
+                    // eslint-disable-next-line no-bitwise
+                    if (result.find(symbol => symbol.flags & bitFlags)) {
+                        return true;
+                    }
+                }
+            }
+            currentTable = currentTable.parent;
+        } while (currentTable);
+        return false;
     }
     /**
      * Gets the name/type pair for a given named variable or function name
      * If the identifier is not in this table, it will check the parent
      *
      * @param  name the name to lookup
-     * @param searchParent should we look to our parent if we don't have the symbol?
+     * @param bitFlags flags to match
      * @returns An array of BscSymbols - one for each time this symbol had a type implicitly defined
      */
-    getSymbol(name, searchParent = true) {
-        var _a;
-        const key = name.toLowerCase();
+    getSymbol(name, bitFlags) {
+        let currentTable = this;
+        const key = name === null || name === void 0 ? void 0 : name.toLowerCase();
         let result;
-        // look in our map first
-        if ((result = this.symbolMap.get(key))) {
-            return result;
-        }
-        //look through any sibling maps next
-        for (let sibling of this.siblings) {
-            if ((result = sibling.symbolMap.get(key))) {
-                return result;
+        do {
+            // look in our map first
+            if ((result = currentTable.symbolMap.get(key))) {
+                // eslint-disable-next-line no-bitwise
+                result = result.filter(symbol => symbol.flags & bitFlags);
+                if (result.length > 0) {
+                    return result;
+                }
             }
-        }
-        // ask our parent for a symbol
-        if (searchParent && (result = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbol(key))) {
-            return result;
-        }
+            //look through any sibling maps next
+            for (let sibling of currentTable.siblings) {
+                if ((result = sibling.getSymbol(key, bitFlags))) {
+                    if (result.length > 0) {
+                        return result;
+                    }
+                }
+            }
+            currentTable = currentTable.parent;
+        } while (currentTable);
     }
     /**
      * Adds a new symbol to the table
      */
-    addSymbol(name, range, type) {
+    addSymbol(name, range, type, bitFlags) {
         const key = name.toLowerCase();
         if (!this.symbolMap.has(key)) {
             this.symbolMap.set(key, []);
@@ -99,9 +136,33 @@ class SymbolTable {
         this.symbolMap.get(key).push({
             name: name,
             range: range,
-            type: type
+            type: type,
+            flags: bitFlags
         });
     }
+    getSymbolTypes(name, bitFlags) {
+        const symbolArray = this.getSymbol(name, bitFlags);
+        if (!symbolArray) {
+            return undefined;
+        }
+        return symbolArray.map(symbol => symbol.type);
+    }
+    getSymbolType(name, options) {
+        let resolvedType = this.getCachedType(name, options);
+        const doSetCache = !resolvedType;
+        const originalIsReferenceType = (0, reflection_1.isReferenceType)(resolvedType);
+        if (!resolvedType || originalIsReferenceType) {
+            resolvedType = (0, helpers_1.getUniqueType)(this.getSymbolTypes(name, options.flags), SymbolTable.UnionTypeFactory);
+        }
+        if (!resolvedType && SymbolTable.ReferenceTypeFactory && options.fullName && options.tableProvider) {
+            resolvedType = SymbolTable.ReferenceTypeFactory(name, options.fullName, options.flags, options.tableProvider);
+        }
+        const newNonReferenceType = originalIsReferenceType && !(0, reflection_1.isReferenceType)(resolvedType);
+        if ((doSetCache || newNonReferenceType) && resolvedType) {
+            this.setCachedType(name, resolvedType, options);
+        }
+        return resolvedType;
+    }
     /**
      * Adds all the symbols from another table to this one
      * It will overwrite any existing symbols in this table
@@ -109,10 +170,73 @@ class SymbolTable {
     mergeSymbolTable(symbolTable) {
         for (let [, value] of symbolTable.symbolMap) {
             for (const symbol of value) {
-                this.addSymbol(symbol.name, symbol.range, symbol.type);
+                this.addSymbol(symbol.name, symbol.range, symbol.type, symbol.flags);
             }
         }
     }
+    /**
+     * Get list of symbols declared directly in this SymbolTable (excludes parent SymbolTable).
+     */
+    getOwnSymbols() {
+        return [].concat(...this.symbolMap.values());
+    }
+    /**
+     * Get list of all symbols declared in this SymbolTable (includes parent SymbolTable).
+     */
+    getAllSymbols(bitFlags) {
+        let symbols = this.getOwnSymbols();
+        //look through any sibling maps next
+        for (let sibling of this.siblings) {
+            symbols = symbols.concat(sibling.getAllSymbols(bitFlags));
+        }
+        if (this.parent) {
+            symbols = symbols.concat(this.parent.getAllSymbols(bitFlags));
+        }
+        // eslint-disable-next-line no-bitwise
+        return symbols.filter(symbol => symbol.flags & bitFlags);
+    }
+    resetTypeCache() {
+        var _a;
+        this.typeCache = [
+            undefined,
+            new Map(),
+            new Map(),
+            new Map() //SymbolTypeFlags.runtime & SymbolTypeFlags.typetime
+        ];
+        this.cacheToken = (_a = SymbolTable.cacheVerifier) === null || _a === void 0 ? void 0 : _a.getToken();
+    }
+    getCachedType(name, options) {
+        var _a, _b;
+        if (SymbolTable.cacheVerifier) {
+            if (!((_a = SymbolTable.cacheVerifier) === null || _a === void 0 ? void 0 : _a.checkToken(this.cacheToken))) {
+                // we have a bad token
+                this.resetTypeCache();
+                return;
+            }
+        }
+        else {
+            // no cache verifier
+            return;
+        }
+        return (_b = this.typeCache[options.flags]) === null || _b === void 0 ? void 0 : _b.get(name.toLowerCase());
+    }
+    setCachedType(name, type, options) {
+        var _a, _b;
+        if (!type) {
+            return;
+        }
+        if (SymbolTable.cacheVerifier) {
+            if (!((_a = SymbolTable.cacheVerifier) === null || _a === void 0 ? void 0 : _a.checkToken(this.cacheToken))) {
+                // we have a bad token - remove all other caches
+                this.resetTypeCache();
+            }
+        }
+        else {
+            // no cache verifier
+            return;
+        }
+        return (_b = this.typeCache[options.flags]) === null || _b === void 0 ? void 0 : _b.set(name.toLowerCase(), type);
+    }
     /**
      * Serialize this SymbolTable to JSON (useful for debugging reasons)
      */
@@ -120,10 +244,14 @@ class SymbolTable {
         var _a;
         return {
             name: this.name,
+            siblings: [...this.siblings].map(sibling => sibling.toJSON()),
             parent: (_a = this.parent) === null || _a === void 0 ? void 0 : _a.toJSON(),
             symbols: [
                 ...new Set([...this.symbolMap.entries()].map(([key, symbols]) => {
-                    return symbols.map(x => x.name);
+                    return symbols.map(x => {
+                        var _a;
+                        return { name: x.name, type: (_a = x.type) === null || _a === void 0 ? void 0 : _a.toString() };
+                    });
                 }).flat().sort())
             ]
         };

package/dist/SymbolTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"SymbolTable.js","sourceRoot":"","sources":["../src/SymbolTable.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SymbolTable.js","sourceRoot":"","sources":["../src/SymbolTable.ts"],"names":[],"mappings":"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"}

package/dist/XmlScope.js

@@ -45,22 +45,22 @@ class XmlScope extends Scope_1.Scope {
     }
     diagnosticValidateInterface(callableContainerMap) {
         var _a, _b;
-        if (!((_b = (_a = this.xmlFile.parser.ast) === null || _a === void 0 ? void 0 : _a.component) === null || _b === void 0 ? void 0 : _b.api)) {
+        if (!((_b = (_a = this.xmlFile.parser.ast) === null || _a === void 0 ? void 0 : _a.componentElement) === null || _b === void 0 ? void 0 : _b.interfaceElement)) {
             return;
         }
-        const { api } = this.xmlFile.parser.ast.component;
+        const iface = this.xmlFile.parser.ast.componentElement.interfaceElement;
         //validate functions
-        for (const fun of api.functions) {
-            const name = fun.name;
+        for (const func of iface.functions) {
+            const name = func.name;
             if (!name) {
-                this.diagnosticMissingAttribute(fun, 'name');
+                this.diagnosticMissingAttribute(func, 'name');
             }
             else if (!callableContainerMap.has(name.toLowerCase())) {
-                this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlFunctionNotFound(name)), { range: fun.getAttribute('name').value.range, file: this.xmlFile }));
+                this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlFunctionNotFound(name)), { range: func.getAttribute('name').tokens.value.range, file: this.xmlFile }));
             }
         }
         //validate fields
-        for (const field of api.fields) {
+        for (const field of iface.fields) {
             const { id, type } = field;
             if (!id) {
                 this.diagnosticMissingAttribute(field, 'id');
@@ -71,13 +71,12 @@ class XmlScope extends Scope_1.Scope {
                 }
             }
             else if (!SGTypes_1.SGFieldTypes.includes(type.toLowerCase())) {
-                this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlInvalidFieldType(type)), { range: field.getAttribute('type').value.range, file: this.xmlFile }));
+                this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlInvalidFieldType(type)), { range: field.getAttribute('type').tokens.value.range, file: this.xmlFile }));
             }
         }
     }
     diagnosticMissingAttribute(tag, name) {
-        const { text, range } = tag.tag;
-        this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlTagMissingAttribute(text, name)), { range: range, file: this.xmlFile }));
+        this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlTagMissingAttribute(tag.tokens.startTagName.text, name)), { range: tag.tokens.startTagName.range, file: this.xmlFile }));
     }
     /**
      * Detect when a child has imported a script that an ancestor also imported
@@ -122,8 +121,8 @@ class XmlScope extends Scope_1.Scope {
                 this.xmlFile
             ];
             let scriptPkgPaths = this.xmlFile.getOwnDependencies();
-            for (let scriptPkgPath of scriptPkgPaths) {
-                let file = this.program.getFileByPkgPath(scriptPkgPath);
+            for (const scriptPkgPath of scriptPkgPaths) {
+                let file = this.program.getFile(scriptPkgPath);
                 if (file) {
                     result.push(file);
                 }

package/dist/XmlScope.js.map

@@ -1 +1 @@
-{"version":3,"file":"XmlScope.js","sourceRoot":"","sources":["../src/XmlScope.ts"],"names":[],"mappings":";;;AACA,mCAAgC;AAChC,6DAA0D;AAI1D,iCAA0B;AAC1B,sDAAkD;AAClD,8CAAgD;AAGhD,MAAa,QAAS,SAAQ,aAAK;IAC/B,YACW,OAAgB,EAChB,OAAgB;QAEvB,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAHzB,YAAO,GAAP,OAAO,CAAS;QAChB,YAAO,GAAP,OAAO,CAAS;IAG3B,CAAC;IAED,IAAW,kBAAkB;QACzB,OAAO,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC;IAC3C,CAAC;IAED;;;OAGG;IACI,cAAc;QACjB,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;;YAC3C,IAAI,KAAY,CAAC;YACjB,IAAI,mBAAmB,GAAG,MAAA,IAAI,CAAC,OAAO,CAAC,mBAAmB,0CAAE,IAAI,CAAC;YACjE,IAAI,mBAAmB,EAAE;gBACrB,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;aAC/D;YACD,IAAI,KAAK,EAAE;gBACP,OAAO,KAAK,CAAC;aAChB;iBAAM;gBACH,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;aACnC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAES,SAAS,CAAC,oBAA0C;QAC1D,oBAAoB;QACpB,KAAK,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;QAEtC,uEAAuE;QACvE,IAAI,CAAC,8CAA8C,EAAE,CAAC;QAEtD,8BAA8B;QAC9B,IAAI,CAAC,2BAA2B,CAAC,oBAAoB,CAAC,CAAC;IAC3D,CAAC;IAEO,2BAA2B,CAAC,oBAA0C;;QAC1E,IAAI,CAAC,CAAA,MAAA,MAAA,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,0CAAE,SAAS,0CAAE,GAAG,CAAA,EAAE;YAC1C,OAAO;SACV;QACD,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC;QAClD,oBAAoB;QACpB,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,SAAS,EAAE;YAC7B,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YACtB,IAAI,CAAC,IAAI,EAAE;gBACP,IAAI,CAAC,0BAA0B,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;aAChD;iBAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE;gBACtD,IAAI,CAAC,WAAW,CAAC,IAAI,iCACd,uCAAkB,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAC/C,KAAK,EAAE,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,KAAK,EAC3C,IAAI,EAAE,IAAI,CAAC,OAAO,IACpB,CAAC;aACN;SACJ;QACD,iBAAiB;QACjB,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE;YAC5B,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;YAC3B,IAAI,CAAC,EAAE,EAAE;gBACL,IAAI,CAAC,0BAA0B,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;aAChD;YACD,IAAI,CAAC,IAAI,EAAE;gBACP,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;oBACd,IAAI,CAAC,0BAA0B,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;iBAClD;aACJ;iBAAM,IAAI,CAAC,sBAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE;gBACnD,IAAI,CAAC,WAAW,CAAC,IAAI,iCACd,uCAAkB,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAC/C,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,KAAK,EAC7C,IAAI,EAAE,IAAI,CAAC,OAAO,IACpB,CAAC;aACN;SACJ;IACL,CAAC;IAEO,0BAA0B,CAAC,GAAU,EAAE,IAAY;QACvD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,GAAG,CAAC;QAChC,IAAI,CAAC,WAAW,CAAC,IAAI,iCACd,uCAAkB,CAAC,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,KACxD,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,IAAI,CAAC,OAAO,IACpB,CAAC;IACP,CAAC;IAED;;OAEG;IACK,8CAA8C;;QAClD,IAAI,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC9B,uFAAuF;YACvF,IAAI,mBAAmB,GAAG,IAAI,CAAC,OAAO,CAAC,2BAA2B,EAAE,CAAC;YACrE,IAAI,MAAM,GAAG,EAAmC,CAAC;YACjD,KAAK,IAAI,kBAAkB,IAAI,mBAAmB,EAAE;gBAChD,8EAA8E;gBAC9E,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE;oBACrC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC;iBAC3D;aACJ;YAED,yEAAyE;YACzE,KAAK,IAAI,YAAY,IAAI,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE;gBACpD,IAAI,oBAAoB,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBACxD,IAAI,oBAAoB,EAAE;oBACtB,IAAI,iBAAiB,GAAG,oBAAoB,CAAC,UAAqB,CAAC;oBACnE,IAAI,qBAAqB,GAAG,MAAA,MAAA,iBAAiB,CAAC,aAAa,0CAAE,IAAI,mCAAI,iBAAiB,CAAC,OAAO,CAAC;oBAC/F,IAAI,CAAC,WAAW,CAAC,IAAI,iBACjB,IAAI,EAAE,IAAI,CAAC,OAAO,EAClB,KAAK,EAAE,YAAY,CAAC,aAAa,IAC9B,uCAAkB,CAAC,wCAAwC,CAAC,qBAAqB,CAAC,EACvF,CAAC;iBACN;aACJ;SACJ;IACL,CAAC;IAEM,WAAW;QACd,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;YACpD,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;YACrC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5B,OAAO,QAAQ,CAAC;QACpB,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;OAGG;IACI,WAAW;QACd,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;YAC3C,IAAI,MAAM,GAAG;gBACT,IAAI,CAAC,OAAO;aACF,CAAC;YACf,IAAI,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;YACvD,KAAK,IAAI,aAAa,IAAI,cAAc,EAAE;gBACtC,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;gBACxD,IAAI,IAAI,EAAE;oBACN,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACrB;aACJ;YACD,OAAO,MAAM,CAAC;QAClB,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACI,aAAa,CAAC,IAAa,EAAE,QAAkB;QAClD,IAAI,OAAO,GAAG,EAAgB,CAAC;QAC/B,4DAA4D;QAC5D,IACI,IAAA,sBAAS,EAAC,IAAI,CAAC;YACf,IAAI,CAAC,eAAe;YACpB,IAAI,CAAC,mBAAmB;YACxB,cAAI,CAAC,aAAa,CAAC,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,QAAQ,CAAC,EAC9D;YACE,OAAO,CAAC,IAAI,CAAC;gBACT,KAAK,EAAE,cAAI,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;gBACnC,GAAG,EAAE,cAAI,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;aACpD,CAAC,CAAC;SACN;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;CACJ;AAvKD,4BAuKC"}
+{"version":3,"file":"XmlScope.js","sourceRoot":"","sources":["../src/XmlScope.ts"],"names":[],"mappings":"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"}

package/dist/astUtils/creators.d.ts

@@ -1,9 +1,9 @@
 import type { Range } from 'vscode-languageserver';
 import type { Identifier, Token } from '../lexer/Token';
+import { SGAttribute, SGComponent, SGInterface, SGInterfaceField, SGInterfaceFunction, SGScript } from '../parser/SGTypes';
 import { TokenKind } from '../lexer/TokenKind';
 import type { Expression } from '../parser/AstNode';
-import { LiteralExpression, CallExpression, DottedGetExpression, VariableExpression, FunctionExpression } from '../parser/Expression';
-import type { SGAttribute } from '../parser/SGTypes';
+import { CallExpression, DottedGetExpression, FunctionExpression, LiteralExpression, VariableExpression } from '../parser/Expression';
 import { MethodStatement } from '../parser/Statement';
 /**
  * A range that points to the beginning of the file. Used to give non-null ranges to programmatically-added source code.
@@ -28,12 +28,22 @@ export declare function createInvalidLiteral(value?: string, range?: Range): Lit
 export declare function createBooleanLiteral(value: 'true' | 'false', range?: Range): LiteralExpression;
 export declare function createFunctionExpression(kind: TokenKind.Sub | TokenKind.Function): FunctionExpression;
 export declare function createMethodStatement(name: string, kind?: TokenKind.Sub | TokenKind.Function, modifiers?: Token[]): MethodStatement;
-/**
- * @deprecated use `createMethodStatement`
- */
-export declare function createClassMethodStatement(name: string, kind?: TokenKind.Sub | TokenKind.Function, accessModifier?: Token): MethodStatement;
 export declare function createCall(callee: Expression, args?: Expression[]): CallExpression;
 /**
  * Create an SGAttribute without any ranges
  */
 export declare function createSGAttribute(keyName: string, value: string): SGAttribute;
+export declare function createSGInterfaceField(id: string, attributes?: {
+    type?: string;
+    alias?: string;
+    value?: string;
+    onChange?: string;
+    alwaysNotify?: string;
+}): SGInterfaceField;
+export declare function createSGComponent(name: string, parentName?: string): SGComponent;
+export declare function createSGInterfaceFunction(functionName: string): SGInterfaceFunction;
+export declare function createSGInterface(): SGInterface;
+export declare function createSGScript(attributes: {
+    type?: string;
+    uri?: string;
+}): SGScript;

package/dist/astUtils/creators.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSGAttribute = exports.createCall = exports.createClassMethodStatement = exports.createMethodStatement = exports.createFunctionExpression = exports.createBooleanLiteral = exports.createInvalidLiteral = exports.createFloatLiteral = exports.createIntegerLiteral = exports.createStringLiteral = exports.createDottedIdentifier = exports.createVariableExpression = exports.createIdentifier = exports.createToken = exports.interpolatedRange = void 0;
+exports.createSGScript = exports.createSGInterface = exports.createSGInterfaceFunction = exports.createSGComponent = exports.createSGInterfaceField = exports.createSGAttribute = exports.createCall = exports.createMethodStatement = exports.createFunctionExpression = exports.createBooleanLiteral = exports.createInvalidLiteral = exports.createFloatLiteral = exports.createIntegerLiteral = exports.createStringLiteral = exports.createDottedIdentifier = exports.createVariableExpression = exports.createIdentifier = exports.createToken = exports.interpolatedRange = void 0;
+const SGTypes_1 = require("../parser/SGTypes");
 const TokenKind_1 = require("../lexer/TokenKind");
 const Expression_1 = require("../parser/Expression");
 const Statement_1 = require("../parser/Statement");
@@ -147,13 +148,6 @@ function createMethodStatement(name, kind = TokenKind_1.TokenKind.Function, modi
     return new Statement_1.MethodStatement(modifiers, createIdentifier(name), createFunctionExpression(kind), null);
 }
 exports.createMethodStatement = createMethodStatement;
-/**
- * @deprecated use `createMethodStatement`
- */
-function createClassMethodStatement(name, kind = TokenKind_1.TokenKind.Function, accessModifier) {
-    return createMethodStatement(name, kind, [accessModifier]);
-}
-exports.createClassMethodStatement = createClassMethodStatement;
 function createCall(callee, args) {
     return new Expression_1.CallExpression(callee, createToken(TokenKind_1.TokenKind.LeftParen, '('), createToken(TokenKind_1.TokenKind.RightParen, ')'), args || []);
 }
@@ -162,14 +156,43 @@ exports.createCall = createCall;
  * Create an SGAttribute without any ranges
  */
 function createSGAttribute(keyName, value) {
-    return {
-        key: {
-            text: keyName
-        },
-        value: {
-            text: value
-        }
-    };
+    return new SGTypes_1.SGAttribute({ text: keyName }, { text: '=' }, { text: '"' }, { text: value }, { text: '"' });
 }
 exports.createSGAttribute = createSGAttribute;
+function createSGInterfaceField(id, attributes = {}) {
+    const attrs = [
+        createSGAttribute('id', id)
+    ];
+    for (let key in attributes) {
+        attrs.push(createSGAttribute(key, attributes[key]));
+    }
+    return new SGTypes_1.SGInterfaceField({ text: '<' }, { text: 'field' }, attrs, { text: '/>' });
+}
+exports.createSGInterfaceField = createSGInterfaceField;
+function createSGComponent(name, parentName) {
+    const attributes = [
+        createSGAttribute('name', name)
+    ];
+    if (parentName) {
+        attributes.push(createSGAttribute('extends', parentName));
+    }
+    return new SGTypes_1.SGComponent({ text: '<' }, { text: 'component' }, attributes, { text: '>' }, [], { text: '</' }, { text: 'component' }, { text: '>' });
+}
+exports.createSGComponent = createSGComponent;
+function createSGInterfaceFunction(functionName) {
+    return new SGTypes_1.SGInterfaceFunction({ text: '<' }, { text: 'function' }, [createSGAttribute('name', functionName)], { text: '/>' });
+}
+exports.createSGInterfaceFunction = createSGInterfaceFunction;
+function createSGInterface() {
+    return new SGTypes_1.SGInterface({ text: '<' }, { text: 'interface' }, [], { text: '>' }, [], { text: '</' }, { text: 'interface' }, { text: '>' });
+}
+exports.createSGInterface = createSGInterface;
+function createSGScript(attributes) {
+    const attrs = [];
+    for (let key in attributes) {
+        attrs.push(createSGAttribute(key, attributes[key]));
+    }
+    return new SGTypes_1.SGScript({ text: '<' }, { text: 'script' }, attrs, { text: '/>' });
+}
+exports.createSGScript = createSGScript;
 //# sourceMappingURL=creators.js.map

package/dist/astUtils/creators.js.map

@@ -1 +1 @@
-{"version":3,"file":"creators.js","sourceRoot":"","sources":["../../src/astUtils/creators.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"creators.js","sourceRoot":"","sources":["../../src/astUtils/creators.ts"],"names":[],"mappings":"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"}