brighterscript 1.0.0-alpha.5 → 1.0.0-alpha.51

package/dist/parser/TranspileState.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TranspileState = void 0;
 const source_map_1 = require("source-map");
+const TokenKind_1 = require("../lexer/TokenKind");
+const util_1 = require("../util");
 /**
  * Holds the state of a transpile operation as it works its way through the transpile process
  */
@@ -9,8 +11,9 @@ class TranspileState {
     constructor(
     /**
      * The absolute path to the source location of this file. If sourceRoot is specified,
-     * this path will be full path to the file in sourceRoot instead of rootDir.
+     * this path will be the full path to the file under sourceRoot instead of rootDir.
      * If the file resides outside of rootDir, then no changes will be made to this path.
+     * Used for runtime source literals (SOURCE_FILE_PATH, SOURCE_LOCATION).
      */
     srcPath, options) {
         this.srcPath = srcPath;
@@ -18,8 +21,7 @@ class TranspileState {
         this.indentText = '';
         this._blockDepth = 0;
         this.newline = '\n';
-        this.srcPath = srcPath;
-        //if a sourceRoot is specified, use that instead of the rootDir
+        //if a sourceRoot is specified, swap rootDir for sourceRoot in the path for runtime literals
         if (this.options.sourceRoot) {
             this.srcPath = this.srcPath.replace(this.options.rootDir, this.options.sourceRoot);
         }
@@ -42,20 +44,31 @@ class TranspileState {
         this._blockDepth = value;
         this.indentText = value === 0 ? '' : '    '.repeat(value);
     }
+    getSource(locatable) {
+        var _a, _b;
+        let srcPath = (_b = (_a = locatable === null || locatable === void 0 ? void 0 : locatable.location) === null || _a === void 0 ? void 0 : _a.uri) !== null && _b !== void 0 ? _b : locatable.uri;
+        if (srcPath) {
+            srcPath = util_1.util.uriToPath(srcPath);
+            //if a sourceRoot is specified, use that instead of the rootDir
+            if (this.options.sourceRoot) {
+                srcPath = srcPath.replace(this.options.rootDir, this.options.sourceRoot);
+            }
+            return srcPath;
+        }
+        else {
+            return this.srcPath;
+        }
+    }
     /**
      * Shorthand for creating a new source node
      */
     sourceNode(locatable, code) {
-        if (locatable.range) {
-            return new source_map_1.SourceNode(
-            //convert 0-based range line to 1-based SourceNode line
-            locatable.range.start.line + 1, 
-            //range and SourceNode character are both 0-based, so no conversion necessary
-            locatable.range.start.character, this.srcPath, code);
-        }
-        else {
-            return new source_map_1.SourceNode(null, null, this.srcPath, code);
-        }
+        let range = util_1.util.extractRange(locatable);
+        return util_1.util.sourceNodeFromTranspileResult(
+        //convert 0-based range line to 1-based SourceNode line
+        range ? range.start.line + 1 : null, 
+        //range and SourceNode character are both 0-based, so no conversion necessary
+        range ? range.start.character : null, this.getSource(locatable), code);
     }
     /**
      * Create a SourceNode from a token. This is more efficient than the above `sourceNode` function
@@ -63,40 +76,124 @@ class TranspileState {
      * only to then be copied again for the SourceNode constructor
      */
     tokenToSourceNode(token) {
+        var _a, _b;
         return new source_map_1.SourceNode(
         //convert 0-based range line to 1-based SourceNode line
-        token.range.start.line + 1, 
+        ((_a = token.location) === null || _a === void 0 ? void 0 : _a.range) ? token.location.range.start.line + 1 : null, 
         //range and SourceNode character are both 0-based, so no conversion necessary
-        token.range.start.character, this.srcPath, token.text);
+        ((_b = token.location) === null || _b === void 0 ? void 0 : _b.range) ? token.location.range.start.character : null, this.getSource(token), token.text);
+    }
+    transpileLeadingCommentsForAstNode(node) {
+        var _a;
+        const leadingTrivia = (_a = node === null || node === void 0 ? void 0 : node.leadingTrivia) !== null && _a !== void 0 ? _a : [];
+        if (!leadingTrivia || leadingTrivia.length === 0) {
+            return [];
+        }
+        const leadingCommentsSourceNodes = this.transpileComments(leadingTrivia);
+        if (leadingCommentsSourceNodes.length > 0) {
+            // indent in preparation for next text
+            leadingCommentsSourceNodes.push(this.indent());
+        }
+        return leadingCommentsSourceNodes;
+    }
+    transpileLeadingComments(token) {
+        var _a;
+        const leadingTrivia = (_a = token === null || token === void 0 ? void 0 : token.leadingTrivia) !== null && _a !== void 0 ? _a : [];
+        if (!leadingTrivia || leadingTrivia.length === 0) {
+            return [];
+        }
+        const leadingCommentsSourceNodes = this.transpileComments(leadingTrivia);
+        if (leadingCommentsSourceNodes.length > 0 && token.text) {
+            // indent in preparation for next text
+            leadingCommentsSourceNodes.push(this.indent());
+        }
+        return leadingCommentsSourceNodes;
+    }
+    transpileComments(tokens, prepNextLine = false) {
+        const leadingCommentsSourceNodes = [];
+        const justComments = tokens.filter(t => t.kind === TokenKind_1.TokenKind.Comment || t.kind === TokenKind_1.TokenKind.Newline);
+        let newLinesSinceComment = 0;
+        let transpiledCommentAlready = false;
+        for (const commentToken of justComments) {
+            if (commentToken.kind === TokenKind_1.TokenKind.Newline && !transpiledCommentAlready) {
+                continue;
+            }
+            if (commentToken.kind === TokenKind_1.TokenKind.Comment) {
+                if (leadingCommentsSourceNodes.length > 0) {
+                    leadingCommentsSourceNodes.push(this.indent());
+                }
+                leadingCommentsSourceNodes.push(this.tokenToSourceNode(commentToken));
+                newLinesSinceComment = 0;
+            }
+            else {
+                newLinesSinceComment++;
+            }
+            if (newLinesSinceComment === 1 || newLinesSinceComment === 2) {
+                //new line that is not touching a previous new line
+                leadingCommentsSourceNodes.push(this.newline);
+            }
+            transpiledCommentAlready = true;
+        }
+        //if we should prepare for the next line, add an indent (only if applicable)
+        if (prepNextLine && transpiledCommentAlready) {
+            leadingCommentsSourceNodes.push(this.indent());
+        }
+        return leadingCommentsSourceNodes;
     }
     /**
      * Create a SourceNode from a token, accounting for missing range and multi-line text
+     * Adds all leading trivia for the token
      */
-    transpileToken(token, defaultValue) {
-        if (!token && defaultValue !== undefined) {
-            return new source_map_1.SourceNode(null, null, null, defaultValue);
+    transpileToken(token, defaultValue, commentOut = false, skipLeadingComments = false) {
+        var _a;
+        const leadingCommentsSourceNodes = skipLeadingComments ? [] : this.transpileLeadingComments(token);
+        const commentIfCommentedOut = commentOut ? `'` : '';
+        if (!(token === null || token === void 0 ? void 0 : token.text) && defaultValue !== undefined) {
+            return [new source_map_1.SourceNode(null, null, null, [...leadingCommentsSourceNodes, commentIfCommentedOut, defaultValue])];
         }
-        if (!token.range) {
-            return new source_map_1.SourceNode(null, null, null, token.text);
+        if (!((_a = token === null || token === void 0 ? void 0 : token.location) === null || _a === void 0 ? void 0 : _a.range)) {
+            return [new source_map_1.SourceNode(null, null, null, [...leadingCommentsSourceNodes, commentIfCommentedOut, token.text])];
         }
         //split multi-line text
-        if (token.range.end.line > token.range.start.line) {
+        if (token.location.range.end.line > token.location.range.start.line) {
             const lines = token.text.split(/\r?\n/g);
             const code = [
-                this.sourceNode(token, lines[0])
+                this.sourceNode(token, [...leadingCommentsSourceNodes, commentIfCommentedOut, lines[0]])
             ];
             for (let i = 1; i < lines.length; i++) {
-                code.push(this.newline, new source_map_1.SourceNode(
+                code.push(this.newline, commentIfCommentedOut, new source_map_1.SourceNode(
                 //convert 0-based range line to 1-based SourceNode line
-                token.range.start.line + i + 1, 
+                token.location.range.start.line + i + 1, 
                 //SourceNode column is 0-based, and this starts at the beginning of the line
-                0, this.srcPath, lines[i]));
+                0, this.getSource(token), lines[i]));
             }
-            return new source_map_1.SourceNode(null, null, null, code);
+            return [new source_map_1.SourceNode(null, null, null, code)];
         }
         else {
-            return this.tokenToSourceNode(token);
+            return [...leadingCommentsSourceNodes, commentIfCommentedOut, this.tokenToSourceNode(token)];
+        }
+    }
+    transpileEndBlockToken(previousLocatable, endToken, defaultValue, alwaysAddNewlineBeforeEndToken = true) {
+        const result = [];
+        if (util_1.util.hasLeadingComments(endToken)) {
+            // add comments before `end token` - they should be indented
+            if (util_1.util.isLeadingCommentOnSameLine(previousLocatable === null || previousLocatable === void 0 ? void 0 : previousLocatable.location, endToken)) {
+                this.blockDepth++;
+                result.push(' ');
+            }
+            else {
+                result.push(this.newline);
+                result.push(this.indent(1));
+            }
+            result.push(...this.transpileToken(Object.assign(Object.assign({}, endToken), { text: '' })));
+            this.blockDepth--;
+            result.push(this.indent());
+        }
+        else if (alwaysAddNewlineBeforeEndToken) {
+            result.push(this.newline, this.indent());
         }
+        result.push(this.transpileToken(Object.assign(Object.assign({}, endToken), { leadingTrivia: [] }), defaultValue));
+        return result;
     }
 }
 exports.TranspileState = TranspileState;

package/dist/parser/TranspileState.js.map

@@ -1 +1 @@
-{"version":3,"file":"TranspileState.js","sourceRoot":"","sources":["../../src/parser/TranspileState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TranspileState.js","sourceRoot":"","sources":["../../src/parser/TranspileState.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AAGxC,kDAA+C;AAG/C,kCAA+B;AAW/B;;GAEG;AACH,MAAa,cAAc;IACvB;IACI;;;;;OAKG;IACI,OAAe,EACf,OAAiB;QADjB,YAAO,GAAP,OAAO,CAAQ;QACf,YAAO,GAAP,OAAO,CAAU;QAWrB,eAAU,GAAG,EAAE,CAAC;QAqBf,gBAAW,GAAG,CAAC,CAAC;QAEjB,YAAO,GAAG,IAAI,CAAC;QAhClB,4FAA4F;QAC5F,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACzB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAC/B,IAAI,CAAC,OAAO,CAAC,OAAO,EACpB,IAAI,CAAC,OAAO,CAAC,UAAU,CAC1B,CAAC;SACL;IACL,CAAC;IAID;;;OAGG;IACI,MAAM,CAAC,gBAAgB,GAAG,CAAC;QAC9B,IAAI,CAAC,UAAU,IAAI,gBAAgB,CAAC;QACpC,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IACD,IAAI,UAAU,CAAC,KAAa;QACxB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9D,CAAC;IAKO,SAAS,CAAC,SAAoB;;QAClC,IAAI,OAAO,GAAG,MAAA,MAAC,SAAoC,aAApC,SAAS,uBAAT,SAAS,CAA6B,QAAQ,0CAAE,GAAG,mCAAK,SAAsB,CAAC,GAAG,CAAC;QAClG,IAAI,OAAO,EAAE;YACT,OAAO,GAAG,WAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAClC,+DAA+D;YAC/D,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;gBACzB,OAAO,GAAG,OAAO,CAAC,OAAO,CACrB,IAAI,CAAC,OAAO,CAAC,OAAO,EACpB,IAAI,CAAC,OAAO,CAAC,UAAU,CAC1B,CAAC;aACL;YACD,OAAO,OAAO,CAAC;SAClB;aAAM;YACH,OAAO,IAAI,CAAC,OAAO,CAAC;SACvB;IACL,CAAC;IAED;;OAEG;IACI,UAAU,CAAC,SAAoB,EAAE,IAA2C;QAC/E,IAAI,KAAK,GAAG,WAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACzC,OAAO,WAAI,CAAC,6BAA6B;QACrC,uDAAuD;QACvD,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI;QACnC,6EAA6E;QAC7E,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,EACpC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EACzB,IAAI,CACP,CAAC;IACN,CAAC;IAED;;;;OAIG;IACI,iBAAiB,CAAC,KAAqB;;QAC1C,OAAO,IAAI,uBAAU;QACjB,uDAAuD;QACvD,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,KAAK,EAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI;QAClE,6EAA6E;QAC7E,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,KAAK,EAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,EACnE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EACrB,KAAK,CAAC,IAAI,CACb,CAAC;IACN,CAAC;IAEM,kCAAkC,CAAC,IAAiC;;QACvE,MAAM,aAAa,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,aAAa,mCAAI,EAAE,CAAC;QAChD,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9C,OAAO,EAAE,CAAC;SACb;QACD,MAAM,0BAA0B,GAAG,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;QACzE,IAAI,0BAA0B,CAAC,MAAM,GAAG,CAAC,EAAE;YACvC,sCAAsC;YACtC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;SAClD;QAED,OAAO,0BAA0B,CAAC;IACtC,CAAC;IAEM,wBAAwB,CAAC,KAAqB;;QACjD,MAAM,aAAa,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa,mCAAI,EAAE,CAAC;QACjD,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9C,OAAO,EAAE,CAAC;SACb;QACD,MAAM,0BAA0B,GAAG,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;QACzE,IAAI,0BAA0B,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,IAAI,EAAE;YACrD,sCAAsC;YACtC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;SAClD;QAED,OAAO,0BAA0B,CAAC;IACtC,CAAC;IAEM,iBAAiB,CAAC,MAAwB,EAAE,YAAY,GAAG,KAAK;QACnE,MAAM,0BAA0B,GAAG,EAAE,CAAC;QACtC,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,qBAAS,CAAC,OAAO,IAAI,CAAC,CAAC,IAAI,KAAK,qBAAS,CAAC,OAAO,CAAC,CAAC;QACtG,IAAI,oBAAoB,GAAG,CAAC,CAAC;QAE7B,IAAI,wBAAwB,GAAG,KAAK,CAAC;QACrC,KAAK,MAAM,YAAY,IAAI,YAAY,EAAE;YACrC,IAAI,YAAY,CAAC,IAAI,KAAK,qBAAS,CAAC,OAAO,IAAI,CAAC,wBAAwB,EAAE;gBACtE,SAAS;aACZ;YACD,IAAI,YAAY,CAAC,IAAI,KAAK,qBAAS,CAAC,OAAO,EAAE;gBACzC,IAAI,0BAA0B,CAAC,MAAM,GAAG,CAAC,EAAE;oBACvC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;iBAClD;gBACD,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,CAAC;gBACtE,oBAAoB,GAAG,CAAC,CAAC;aAC5B;iBAAM;gBACH,oBAAoB,EAAE,CAAC;aAC1B;YAED,IAAI,oBAAoB,KAAK,CAAC,IAAI,oBAAoB,KAAK,CAAC,EAAE;gBAC1D,mDAAmD;gBACnD,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACjD;YACD,wBAAwB,GAAG,IAAI,CAAC;SACnC;QACD,4EAA4E;QAC5E,IAAI,YAAY,IAAI,wBAAwB,EAAE;YAC1C,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;SAClD;QACD,OAAO,0BAA0B,CAAC;IACtC,CAAC;IAED;;;OAGG;IACI,cAAc,CAAC,KAAqB,EAAE,YAAqB,EAAE,UAAU,GAAG,KAAK,EAAE,mBAAmB,GAAG,KAAK;;QAC/G,MAAM,0BAA0B,GAAG,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC;QACnG,MAAM,qBAAqB,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAEpD,IAAI,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,CAAA,IAAI,YAAY,KAAK,SAAS,EAAE;YAC5C,OAAO,CAAC,IAAI,uBAAU,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,0BAA0B,EAAE,qBAAqB,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;SACnH;QAED,IAAI,CAAC,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,0CAAE,KAAK,CAAA,EAAE;YACzB,OAAO,CAAC,IAAI,uBAAU,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,0BAA0B,EAAE,qBAAqB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjH;QACD,uBAAuB;QACvB,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE;YACjE,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACzC,MAAM,IAAI,GAAG;gBACT,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,GAAG,0BAA0B,EAAE,qBAAqB,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;aAC7D,CAAC;YAChC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACnC,IAAI,CAAC,IAAI,CACL,IAAI,CAAC,OAAO,EACZ,qBAAqB,EACrB,IAAI,uBAAU;gBACV,uDAAuD;gBACvD,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC;gBACvC,4EAA4E;gBAC5E,CAAC,EACD,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EACrB,KAAK,CAAC,CAAC,CAAC,CACX,CACJ,CAAC;aACL;YACD,OAAO,CAAC,IAAI,uBAAU,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;SACnD;aAAM;YACH,OAAO,CAAC,GAAG,0BAA0B,EAAE,qBAAqB,EAAE,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;SAChG;IACL,CAAC;IAEM,sBAAsB,CAAC,iBAA0C,EAAE,QAAe,EAAE,YAAoB,EAAE,8BAA8B,GAAG,IAAI;QAClJ,MAAM,MAAM,GAAG,EAAE,CAAC;QAElB,IAAI,WAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE;YACnC,4DAA4D;YAC5D,IAAI,WAAI,CAAC,0BAA0B,CAAC,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE;gBACxE,IAAI,CAAC,UAAU,EAAE,CAAC;gBAClB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACpB;iBAAM;gBACH,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC1B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;aAC/B;YACD,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,cAAc,iCAAM,QAAQ,KAAE,IAAI,EAAE,EAAE,IAAG,CAAC,CAAC;YAC/D,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;SAC9B;aAAM,IAAI,8BAA8B,EAAE;YACvC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;SAC5C;QACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,iCAAM,QAAQ,KAAE,aAAa,EAAE,EAAE,KAAI,YAAY,CAAC,CAAC,CAAC;QACnF,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAxND,wCAwNC"}

package/dist/preprocessor/Manifest.d.ts

@@ -1,7 +1,7 @@
-/** The set of possible value types in a `manifest` file's `key=value` pair. */
-export declare type ManifestValue = number | string | boolean;
-/** A map containing the data from a `manifest` file. */
-export declare type Manifest = Map<string, ManifestValue>;
+/**
+ * A map containing the data from a `manifest` file.
+ */
+export declare type Manifest = Map<string, string>;
 /**
  * Attempts to read a `manifest` file, parsing its contents into a map of string to JavaScript
  * number, string, or boolean.
@@ -17,11 +17,11 @@ export declare function getManifest(rootDir: string): Promise<Manifest>;
  * @returns a Promise that resolves to a map of string to JavaScript number, string, or boolean,
  *          representing the manifest file's contents
  */
-export declare function parseManifest(contents: string): Map<string, string | number | boolean>;
+export declare function parseManifest(contents: string): Map<string, string>;
 /**
  * Parses a 'manifest' file's `bs_const` property into a map of key to boolean value.
  * @param manifest the internal representation of the 'manifest' file to extract `bs_const` from
  * @returns a map of key to boolean value representing the `bs_const` attribute, or an empty map if
  *          no `bs_const` attribute is found.
  */
-export declare function getBsConst(manifest: Manifest): Map<string, boolean>;
+export declare function getBsConst(manifest: Manifest, toLowerKeys?: boolean): Map<string, boolean>;

package/dist/preprocessor/Manifest.js

@@ -30,44 +30,23 @@ exports.getManifest = getManifest;
  *          representing the manifest file's contents
  */
 function parseManifest(contents) {
-    let keyValuePairs = contents
-        // for each line
-        .split('\n')
-        // remove leading/trailing whitespace
-        .map(line => line.trim())
-        // separate keys and values
-        .map((line, index) => {
+    const lines = contents.split(/\r?\n/g);
+    const result = new Map();
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
         // skip empty lines and comments
-        if (line === '' || line.startsWith('#')) {
-            return ['', ''];
-        }
-        let equals = line.indexOf('=');
-        if (equals === -1) {
-            throw new Error(`[manifest:${index +
-                1}] No '=' detected.  Manifest attributes must be of the form 'key=value'.`);
-        }
-        return [line.slice(0, equals), line.slice(equals + 1)];
-    })
-        // keep only non-empty keys and values
-        .filter(([key, value]) => key && value)
-        // remove leading/trailing whitespace from keys and values
-        .map(([key, value]) => [key.trim(), value.trim()])
-        // convert value to boolean, integer, or leave as string
-        .map(([key, value]) => {
-        if (value.toLowerCase() === 'true') {
-            return [key, true];
-        }
-        if (value.toLowerCase() === 'false') {
-            return [key, false];
+        if (line.trim() === '' || line.trim().startsWith('#')) {
+            continue;
         }
-        let maybeNumber = Number.parseInt(value);
-        // if it's not a number, it's just a string
-        if (Number.isNaN(maybeNumber)) {
-            return [key, value];
+        let equalIndex = line.indexOf('=');
+        if (equalIndex === -1) {
+            throw new Error(`[manifest:${i + 1}] No '=' detected.  Manifest attributes must be of the form 'key=value'.`);
         }
-        return [key, maybeNumber];
-    });
-    return new Map(keyValuePairs);
+        const key = line.slice(0, equalIndex);
+        const value = line.slice(equalIndex + 1);
+        result.set(key, value);
+    }
+    return result;
 }
 exports.parseManifest = parseManifest;
 /**
@@ -76,7 +55,7 @@ exports.parseManifest = parseManifest;
  * @returns a map of key to boolean value representing the `bs_const` attribute, or an empty map if
  *          no `bs_const` attribute is found.
  */
-function getBsConst(manifest) {
+function getBsConst(manifest, toLowerKeys = true) {
     if (!manifest.has('bs_const')) {
         return new Map();
     }
@@ -97,8 +76,8 @@ function getBsConst(manifest) {
         }
         return [keyValuePair.slice(0, equals), keyValuePair.slice(equals + 1)];
     })
-        // remove leading/trailing whitespace from keys and values
-        .map(([key, value]) => [key.trim(), value.trim()])
+        // remove leading/trailing whitespace from keys and values, and force everything to lower case
+        .map(([key, value]) => [toLowerKeys ? key.trim().toLowerCase() : key.trim(), value.trim().toLowerCase()])
         // convert value to boolean or throw
         .map(([key, value]) => {
         if (value.toLowerCase() === 'true') {

package/dist/preprocessor/Manifest.js.map

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