@quenk/wml 2.11.4 → 2.12.0

package/lib/compile/codegen.js

@@ -2,52 +2,43 @@
 /**
  * Typescript code generator.
  */
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.forOfStatement2TS = exports.forInStatement2TS = exports.ifStatement2TS = exports.interpolation2TS = exports.groupAttrs = exports.attrs2String = exports.attributeName2TS = exports.attributeValue2TS = exports.attribute2TS = exports.node2TS = exports.widget2TS = exports.tag2TS = exports.child2TS = exports.children2TS = exports.untypedParameter2TS = exports.typedParameter2TS = exports.parameter2TS = exports.parameters2TS = exports.typeMap2TS = exports.expandTypeMap = exports.typeMapFromRecordType = exports.typeMapFromMemberDecs = exports.memberDeclarations2TS = exports.recordType2Ts = exports.tupleType2TS = exports.listType2TS = exports.functionType2TS = exports.constructorType2TS = exports.type2TS = exports.typeParameter2TS = exports.typeParameters2TS = exports.viewStatement2TS = exports.funStatement2TS = exports.letStatement2TS = exports.contextStatement2TS = exports.aliasStatement2TS = exports.export2TS = exports.exports2TS = exports.compositeMember2TS = exports.aliasedMember2TS = exports.aggregateMember2TS = exports.importMember2TS = exports.importStatement2TS = exports.importStatements2TS = exports.CodeGenerator = exports.THIS = exports.DOCUMENT = exports.WML = exports.VIEW = exports.CONTEXT = void 0;
-exports.unqualifiedIdentifier2TS = exports.qualifiedIdentifier2TS = exports.identifier2TS = exports.qualifiedConstructor2TS = exports.unqualifiedConstructor2TS = exports.constructor2TS = exports.identifierOrConstructor2TS = exports.contextVariable2TS = exports.contextProperty2TS = exports.key2TS = exports.property2TS = exports.list2TS = exports.record2TS = exports.number2TS = exports.string2TS = exports.boolean2TS = exports.literal2TS = exports.functionExpression2TS = exports.memberExpression2TS = exports.args2TS = exports.typeArgs2TS = exports.callExpression2TS = exports.constructExpression2TS = exports.funApplication2TS = exports.viewConstruction2TS = exports.typeAssertion2TS = exports.unaryExpression2TS = exports.binaryExpression2TS = exports.ifThenExpression2TS = exports.expression2TS = exports.characters2TS = exports.forFromStatement2TS = void 0;
+exports.forFromStatement2TS = exports.forOfStatement2TS = exports.forInStatement2TS = exports.ifStatement2TS = exports.interpolation2TS = exports.attrs2String = exports.attributeName2TS = exports.attributeValue2TS = exports.attribute2TS = exports.node2TS = exports.widget2TS = exports.tag2TS = exports.child2TS = exports.children2TS = exports.untypedParameter2TS = exports.typedParameter2TS = exports.parameter2TS = exports.parameters2TS = exports.typeMap2TS = exports.expandTypeMap = exports.typeMapFromRecordType = exports.typeMapFromMemberDecs = exports.memberDeclarations2TS = exports.recordType2Ts = exports.tupleType2TS = exports.listType2TS = exports.functionType2TS = exports.constructorType2TS = exports.type2TS = exports.typeParameter2TS = exports.typeParameters2TS = exports.viewStatement2TS = exports.funStatement2TS = exports.letStatement2TS = exports.contextStatement2TS = exports.aliasStatement2TS = exports.export2TS = exports.exports2TS = exports.compositeMember2TS = exports.aliasedMember2TS = exports.aggregateMember2TS = exports.importMember2TS = exports.importStatement2TS = exports.importStatements2TS = exports.CodeGenerator = exports.THIS = exports.DOCUMENT = exports.WML = exports.VIEW = exports.CONTEXT = void 0;
+exports.unqualifiedIdentifier2TS = exports.qualifiedIdentifier2TS = exports.identifier2TS = exports.qualifiedConstructor2TS = exports.unqualifiedConstructor2TS = exports.constructor2TS = exports.identifierOrConstructor2TS = exports.contextVariable2TS = exports.contextProperty2TS = exports.key2TS = exports.property2TS = exports.list2TS = exports.record2TS = exports.number2TS = exports.string2TS = exports.boolean2TS = exports.literal2TS = exports.functionExpression2TS = exports.memberExpression2TS = exports.args2TS = exports.typeArgs2TS = exports.callExpression2TS = exports.constructExpression2TS = exports.funApplication2TS = exports.viewConstruction2TS = exports.typeAssertion2TS = exports.unaryExpression2TS = exports.binaryExpression2TS = exports.ifThenExpression2TS = exports.expression2TS = exports.characters2TS = void 0;
 /** imports */
-var ast = require("../parse/ast");
-var path_1 = require("@quenk/noni/lib/data/record/path");
-var record_1 = require("@quenk/noni/lib/data/record");
-var array_1 = require("@quenk/noni/lib/data/array");
-var transform_1 = require("./transform");
+const ast = require("../parse/ast");
+const path_1 = require("@quenk/noni/lib/data/record/path");
+const record_1 = require("@quenk/noni/lib/data/record");
+const array_1 = require("@quenk/noni/lib/data/array");
+const transform_1 = require("./transform");
 exports.CONTEXT = '__context';
 exports.VIEW = '__view';
 exports.WML = '__wml';
 exports.DOCUMENT = '__document';
 exports.THIS = '__this';
-var MAYBE = '__Maybe';
-var FROM_NULLABLE = '__fromNullable';
-var FROM_ARRAY = '__fromArray';
-var NODE_PARAMS = "tag:string, attrs:".concat(exports.WML, ".Attrs, ") +
-    "children: ".concat(exports.WML, ".Content[]");
-var WIDGET_PARAMS = "w: ".concat(exports.WML, ".Widget, attrs:").concat(exports.WML, ".Attrs");
-var REGISTER_VIEW_PARAMS = "v:".concat(exports.WML, ".View");
-var REGISTER_PARAMS = "e:".concat(exports.WML, ".WMLElement, ") +
-    "attrs:".concat(exports.WML, ".Attributes<any>");
-var THROW_CHILD_ERR = '         throw new TypeError(`Can not adopt ' +
+const MAYBE = '__Maybe';
+const FROM_NULLABLE = '__fromNullable';
+const FROM_ARRAY = '__fromArray';
+const NODE_PARAMS = `tag:string, attrs:${exports.WML}.Attrs, ` +
+    `children: ${exports.WML}.Content[]`;
+const WIDGET_PARAMS = `w: ${exports.WML}.Widget, attrs:${exports.WML}.Attrs`;
+const REGISTER_VIEW_PARAMS = `v:${exports.WML}.View`;
+const REGISTER_PARAMS = `e:${exports.WML}.WMLElement, ` +
+    `attrs:${exports.WML}.Attributes<any>`;
+const THROW_CHILD_ERR = '         throw new TypeError(`Can not adopt ' +
     'child ${c} of type \${typeof c}`);';
-var THROW_INVALIDATE_ERR = "       throw new Error('invalidate(): cannot " +
-    "invalidate this view, it has no parent node!');";
-var IGNORE_UNUSED = '//@ts-ignore:6192';
-var RECORD = '__Record<A>';
-var IF = '__if';
-var IFARG = "__IfArg";
-var FOR_OF = '__forOf';
-var FOR_IN = '__forIn';
-var FOR_ALT_TYPE = '__ForAlt';
-var FOR_IN_BODY = '__ForInBody<A>';
-var FOR_OF_BODY = '__ForOfBody<A>';
-var prims = [
+const THROW_INVALIDATE_ERR = `       throw new Error('invalidate(): cannot ` +
+    `invalidate this view, it has no parent node!');`;
+const IGNORE_UNUSED = '//@ts-ignore:6192';
+const RECORD = '__Record<A>';
+const IF = '__if';
+const IFARG = `__IfArg`;
+const FOR_OF = '__forOf';
+const FOR_IN = '__forIn';
+const FOR_ALT_TYPE = '__ForAlt';
+const FOR_IN_BODY = '__ForInBody<A>';
+const FOR_OF_BODY = '__ForOfBody<A>';
+const prims = [
     'String',
     'Boolean',
     'Number',
@@ -58,8 +49,8 @@ var prims = [
     'Never',
     'Any'
 ];
-var casters = ['String', 'Boolean', 'Number', 'Object'];
-var operators = {
+const casters = ['String', 'Boolean', 'Number', 'Object'];
+const operators = {
     '==': '===',
     '!=': '!=='
 };
@@ -70,125 +61,120 @@ var operators = {
  * Given a parsed tree (starting at ast.Module), its generate method will
  * provide a typescript module.
  */
-var CodeGenerator = /** @class */ (function () {
-    function CodeGenerator(options) {
+class CodeGenerator {
+    constructor(options) {
         this.options = options;
     }
     /**
      * create a new CodeGenerator instance.
      */
-    CodeGenerator.create = function (opts) {
+    static create(opts) {
         return new CodeGenerator(opts);
-    };
+    }
     /**
      * generate a Typescript module from an WML AST.
      */
-    CodeGenerator.prototype.generate = function (tree) {
-        var newTree = (0, transform_1.transformTree)(tree);
+    generate(tree) {
+        let newTree = (0, transform_1.transformTree)(tree);
         return [
-            "import * as ".concat(exports.WML, " from '").concat(this.options.module, "';"),
-            "import * as ".concat(exports.DOCUMENT, " from '").concat(this.options.dom, "';"),
+            `import * as ${exports.WML} from '${this.options.module}';`,
+            `import * as ${exports.DOCUMENT} from '${this.options.dom}';`,
             imports(this),
             (0, exports.importStatements2TS)(this, newTree.imports),
             eol(this),
             typeDefinitions(this),
             eol(this),
-            "// @ts-ignore 6192",
-            "const text = ".concat(exports.DOCUMENT, ".text;"),
-            "// @ts-ignore 6192",
-            "const unsafe = ".concat(exports.DOCUMENT, ".unsafe"),
-            "// @ts-ignore 6192",
-            "const isSet = (value:any) => value != null",
+            `// @ts-ignore 6192`,
+            `const text = ${exports.DOCUMENT}.text;`,
+            `// @ts-ignore 6192`,
+            `const unsafe = ${exports.DOCUMENT}.unsafe`,
+            `// @ts-ignore 6192`,
+            `const isSet = (value:any) => value != null`,
             (0, exports.exports2TS)(this, newTree.exports)
         ].join(eol(this));
-    };
-    return CodeGenerator;
-}());
+    }
+}
 exports.CodeGenerator = CodeGenerator;
-var eol = function (ctx) { return "".concat(ctx.options.EOL); };
-var imports = function (ctx) { return [
-    "//@ts-ignore: 6192",
-    "import {",
-    "Maybe as ".concat(MAYBE, ","),
-    "fromNullable as ".concat(FROM_NULLABLE, ","),
-    "fromArray as ".concat(FROM_ARRAY),
-    "}",
-    "from '@quenk/noni/lib/data/maybe';"
-].join(eol(ctx)); };
-var typeDefinitions = function (ctx) { return [
-    "".concat(IGNORE_UNUSED),
-    "type ".concat(IFARG, " = ()=>").concat(exports.WML, ".Content[]"),
-    "",
-    "".concat(IGNORE_UNUSED),
-    "type ".concat(FOR_ALT_TYPE, " = ()=> ").concat(exports.WML, ".Content[]"),
-    "",
-    "".concat(IGNORE_UNUSED),
-    "type ".concat(FOR_IN_BODY, " =(val:A, idx:number, all:A[])=>") +
-        "".concat(exports.WML, ".Content[]"),
-    "",
-    "".concat(IGNORE_UNUSED),
-    "type ".concat(FOR_OF_BODY, " = (val:A, key:string, all:object) =>") +
-        "".concat(exports.WML, ".Content[]"),
-    "",
-    "".concat(IGNORE_UNUSED),
-    "interface ".concat(RECORD, " {"),
-    "",
-    " [key:string]: A",
-    "",
-    "}",
-    "",
-    "".concat(IGNORE_UNUSED),
-    "const ".concat(IF, " = (__expr:boolean, __conseq:").concat(IFARG, ",__alt?:").concat(IFARG, ") ") +
-        ": Content[]=>",
-    "(__expr) ? __conseq() :  __alt ? __alt() : [];",
-    "",
-    "".concat(IGNORE_UNUSED),
-    "const ".concat(FOR_IN, " = <A>(list:A[], f:").concat(FOR_IN_BODY, ", alt:") +
-        "".concat(FOR_ALT_TYPE, ") : ").concat(exports.WML, ".Content[] => {"),
-    "",
-    "   let ret:".concat(exports.WML, ".Content[] = [];"),
-    "",
-    "   for(let i=0; i<list.length; i++)",
-    "       ret = ret.concat(f(list[i], i, list));",
-    "",
-    "   return ret.length === 0 ? alt() : ret;",
-    "",
-    "}",
-    "".concat(IGNORE_UNUSED),
-    "const ".concat(FOR_OF, " = <A>(o:").concat(RECORD, ", f:").concat(FOR_OF_BODY, ",") +
-        "alt:".concat(FOR_ALT_TYPE, ") : ").concat(exports.WML, ".Content[] => {"),
-    "",
-    "    let ret:".concat(exports.WML, ".Content[] = [];"),
-    "",
-    "    for(let key in o)",
-    "  \t    if(o.hasOwnProperty(key)) ",
-    "\t        ret = ret.concat(f((o)[key], key, o));",
-    "",
-    "    return ret.length === 0 ? alt(): ret;",
-    "",
-    "}"
-].join(eol(ctx)); };
+const eol = (ctx) => `${ctx.options.EOL}`;
+const imports = (ctx) => [
+    `//@ts-ignore: 6192`,
+    `import {`,
+    `Maybe as ${MAYBE},`,
+    `fromNullable as ${FROM_NULLABLE},`,
+    `fromArray as ${FROM_ARRAY}`,
+    `}`,
+    `from '@quenk/noni/lib/data/maybe';`
+].join(eol(ctx));
+const typeDefinitions = (ctx) => [
+    `${IGNORE_UNUSED}`,
+    `type ${IFARG} = ()=>${exports.WML}.Content[]`,
+    ``,
+    `${IGNORE_UNUSED}`,
+    `type ${FOR_ALT_TYPE} = ()=> ${exports.WML}.Content[]`,
+    ``,
+    `${IGNORE_UNUSED}`,
+    `type ${FOR_IN_BODY} =(val:A, idx:number, all:A[])=>` +
+        `${exports.WML}.Content[]`,
+    ``,
+    `${IGNORE_UNUSED}`,
+    `type ${FOR_OF_BODY} = (val:A, key:string, all:object) =>` +
+        `${exports.WML}.Content[]`,
+    ``,
+    `${IGNORE_UNUSED}`,
+    `interface ${RECORD} {`,
+    ``,
+    ` [key:string]: A`,
+    ``,
+    `}`,
+    ``,
+    `${IGNORE_UNUSED}`,
+    `const ${IF} = (__expr:boolean, __conseq:${IFARG},__alt?:${IFARG}) ` +
+        `: Content[]=>`,
+    `(__expr) ? __conseq() :  __alt ? __alt() : [];`,
+    ``,
+    `${IGNORE_UNUSED}`,
+    `const ${FOR_IN} = <A>(list:A[], f:${FOR_IN_BODY}, alt:` +
+        `${FOR_ALT_TYPE}) : ${exports.WML}.Content[] => {`,
+    ``,
+    `   let ret:${exports.WML}.Content[] = [];`,
+    ``,
+    `   for(let i=0; i<list.length; i++)`,
+    `       ret = ret.concat(f(list[i], i, list));`,
+    ``,
+    `   return ret.length === 0 ? alt() : ret;`,
+    ``,
+    `}`,
+    `${IGNORE_UNUSED}`,
+    `const ${FOR_OF} = <A>(o:${RECORD}, f:${FOR_OF_BODY},` +
+        `alt:${FOR_ALT_TYPE}) : ${exports.WML}.Content[] => {`,
+    ``,
+    `    let ret:${exports.WML}.Content[] = [];`,
+    ``,
+    `    for(let key in o)`,
+    `  	    if(o.hasOwnProperty(key)) `,
+    `	        ret = ret.concat(f((o)[key], key, o));`,
+    ``,
+    `    return ret.length === 0 ? alt(): ret;`,
+    ``,
+    `}`
+].join(eol(ctx));
 /**
  * importStatements2TS converts a list of ImportStatements into typescript.
  */
-var importStatements2TS = function (ctx, list) {
-    return list
-        .map(exports.importStatement2TS)
-        .filter(function (stmt, idx, list) { return list.indexOf(stmt) == idx; })
-        .join(";".concat(eol(ctx)));
-};
+const importStatements2TS = (ctx, list) => list
+    .map(exports.importStatement2TS)
+    .filter((stmt, idx, list) => list.indexOf(stmt) == idx)
+    .join(`;${eol(ctx)}`);
 exports.importStatements2TS = importStatements2TS;
 /**
  * importStatement2TS
  */
-var importStatement2TS = function (n) {
-    return "import ".concat((0, exports.importMember2TS)(n.member), " from '").concat(n.module.value.trim(), "'; ");
-};
+const importStatement2TS = (n) => `import ${(0, exports.importMember2TS)(n.member)} from '${n.module.value.trim()}'; `;
 exports.importStatement2TS = importStatement2TS;
 /**
  * importMember2TS
  */
-var importMember2TS = function (n) {
+const importMember2TS = (n) => {
     if (n instanceof ast.AggregateMember)
         return (0, exports.aggregateMember2TS)(n);
     else if (n instanceof ast.AliasedMember)
@@ -202,38 +188,30 @@ exports.importMember2TS = importMember2TS;
 /**
  * aggregateMember2TS
  */
-var aggregateMember2TS = function (n) {
-    return "* as ".concat((0, exports.identifierOrConstructor2TS)(n.id), " ");
-};
+const aggregateMember2TS = (n) => `* as ${(0, exports.identifierOrConstructor2TS)(n.id)} `;
 exports.aggregateMember2TS = aggregateMember2TS;
 /**
  * aliasedMember2TS
  */
-var aliasedMember2TS = function (n) {
-    return "".concat((0, exports.identifierOrConstructor2TS)(n.member), " ") +
-        "as ".concat((0, exports.identifierOrConstructor2TS)(n.alias), " ");
-};
+const aliasedMember2TS = (n) => `${(0, exports.identifierOrConstructor2TS)(n.member)} ` +
+    `as ${(0, exports.identifierOrConstructor2TS)(n.alias)} `;
 exports.aliasedMember2TS = aliasedMember2TS;
 /**
  * compositeMember2TS
  */
-var compositeMember2TS = function (n) {
-    return '{' + (n.members.map(function (m) { return (m instanceof ast.AliasedMember) ?
-        (0, exports.aliasedMember2TS)(m) :
-        (0, exports.identifierOrConstructor2TS)(m); }).join(',')) + '}';
-};
+const compositeMember2TS = (n) => '{' + (n.members.map(m => (m instanceof ast.AliasedMember) ?
+    (0, exports.aliasedMember2TS)(m) :
+    (0, exports.identifierOrConstructor2TS)(m)).join(',')) + '}';
 exports.compositeMember2TS = compositeMember2TS;
 /**
  * exports2TS converts a list of exports to typescript.
  */
-var exports2TS = function (ctx, list) {
-    return list.map(function (e) { return (0, exports.export2TS)(ctx, e); }).join(';' + eol(ctx));
-};
+const exports2TS = (ctx, list) => list.map(e => (0, exports.export2TS)(ctx, e)).join(';' + eol(ctx));
 exports.exports2TS = exports2TS;
 /**
  * export2TS
  */
-var export2TS = function (ctx, n) {
+const export2TS = (ctx, n) => {
     if (n instanceof ast.AliasStatement)
         return (0, exports.aliasStatement2TS)(n);
     else if (n instanceof ast.ContextStatement)
@@ -253,27 +231,25 @@ exports.export2TS = export2TS;
 /**
  * aliasStatement2TS
  */
-var aliasStatement2TS = function (n) {
-    var typeArgs = (n.typeParameters.length > 0) ?
+const aliasStatement2TS = (n) => {
+    let typeArgs = (n.typeParameters.length > 0) ?
         (0, exports.typeParameters2TS)(n.typeParameters) : '';
-    var preamble = "export type ".concat(n.id.value).concat(typeArgs);
-    var members = n.members.map(function (m) { return (0, exports.type2TS)(m); }).join('|');
-    return "".concat(preamble, " = ").concat(members, ";");
+    let preamble = `export type ${n.id.value}${typeArgs}`;
+    let members = n.members.map(m => (0, exports.type2TS)(m)).join('|');
+    return `${preamble} = ${members};`;
 };
 exports.aliasStatement2TS = aliasStatement2TS;
 /**
  * contextStatement2TS
  */
-var contextStatement2TS = function (n) {
-    var preamble = "export interface ".concat(n.id.value);
-    var typeArgs = (n.typeParameters.length > 0) ?
+const contextStatement2TS = (n) => {
+    let preamble = `export interface ${n.id.value}`;
+    let typeArgs = (n.typeParameters.length > 0) ?
         (0, exports.typeParameters2TS)(n.typeParameters) : '';
-    var _a = (0, array_1.partition)(n.members, function (member) {
-        return member instanceof ast.ConstructorType;
-    }), parents = _a[0], members = _a[1];
-    var parentList = parents
+    let [parents, members] = (0, array_1.partition)(n.members, member => member instanceof ast.ConstructorType);
+    let parentList = parents
         .map(exports.constructorType2TS).join(',');
-    parentList = (parentList !== '') ? " extends ".concat(parentList) : '';
+    parentList = (parentList !== '') ? ` extends ${parentList}` : '';
     return [
         preamble,
         typeArgs,
@@ -287,16 +263,14 @@ exports.contextStatement2TS = contextStatement2TS;
 /**
  * letStatement2TS
  */
-var letStatement2TS = function (ctx, n) {
-    return _setStatement2TS(ctx, n, 'export const');
-};
+const letStatement2TS = (ctx, n) => _setStatement2TS(ctx, n, 'export const');
 exports.letStatement2TS = letStatement2TS;
-var _setStatement2TS = function (ctx, n, preamble) {
-    var id = (0, exports.identifier2TS)(n.id);
-    var cons = (0, exports.constructorType2TS)(n.cons);
-    preamble = "".concat(preamble, " ").concat(id, ":").concat(cons);
-    var value = (0, exports.expression2TS)(ctx, n.expression);
-    return "".concat(preamble, " = ").concat(value);
+const _setStatement2TS = (ctx, n, preamble) => {
+    let id = (0, exports.identifier2TS)(n.id);
+    let cons = (0, exports.constructorType2TS)(n.cons);
+    preamble = `${preamble} ${id}:${cons}`;
+    let value = (0, exports.expression2TS)(ctx, n.expression);
+    return `${preamble} = ${value}`;
 };
 /**
  * funStatement2TS generates Typescript output for fun statements.
@@ -304,20 +278,20 @@ var _setStatement2TS = function (ctx, n, preamble) {
  * This is a curried function that first accepts zero or more arguments then
  * a single Registry, finally the content.
  */
-var funStatement2TS = function (ctx, n) {
-    var id = (0, exports.unqualifiedIdentifier2TS)(n.id);
-    var typeParams = (0, exports.typeParameters2TS)(n.typeParameters);
-    var params = (0, exports.parameters2TS)(n.parameters);
-    var factory = "(".concat(exports.THIS, ":").concat(exports.WML, ".Registry) : ").concat(exports.WML, ".Content[] =>");
-    var body = (0, exports.children2TS)(ctx, n.body);
+const funStatement2TS = (ctx, n) => {
+    let id = (0, exports.unqualifiedIdentifier2TS)(n.id);
+    let typeParams = (0, exports.typeParameters2TS)(n.typeParameters);
+    let params = (0, exports.parameters2TS)(n.parameters);
+    let factory = `(${exports.THIS}:${exports.WML}.Registry) : ${exports.WML}.Content[] =>`;
+    let body = (0, exports.children2TS)(ctx, n.body);
     return [
-        "export const ".concat(id, " = "),
-        "",
-        "".concat(typeParams, "(").concat(params, ")=>").concat(factory, " {"),
-        "",
-        "   return ".concat(body, ";"),
-        "",
-        "};"
+        `export const ${id} = `,
+        ``,
+        `${typeParams}(${params})=>${factory} {`,
+        ``,
+        `   return ${body};`,
+        ``,
+        `};`
     ].join(eol(ctx));
 };
 exports.funStatement2TS = funStatement2TS;
@@ -326,199 +300,197 @@ exports.funStatement2TS = funStatement2TS;
  *
  * This is a class with template and various useful helpers.
  */
-var viewStatement2TS = function (ctx, n) {
-    var instances = n.directives.map(function (i) {
-        return _setStatement2TS(ctx, i, 'let');
-    }).join(";".concat(ctx.options.EOL));
-    var id = n.id ? (0, exports.constructor2TS)(n.id) : 'Main';
-    var typeParams = (0, exports.typeParameters2TS)(n.typeParameters);
-    var context = (0, exports.type2TS)((n.context instanceof ast.ContextFromStatement) ?
+const viewStatement2TS = (ctx, n) => {
+    let instances = n.directives.map(i => _setStatement2TS(ctx, i, 'let')).join(`;${ctx.options.EOL}`);
+    let id = n.id ? (0, exports.constructor2TS)(n.id) : 'Main';
+    let typeParams = (0, exports.typeParameters2TS)(n.typeParameters);
+    let context = (0, exports.type2TS)((n.context instanceof ast.ContextFromStatement) ?
         n.context.cons : n.context);
-    var template = (0, exports.tag2TS)(ctx, n.root);
+    let template = (0, exports.tag2TS)(ctx, n.root);
     return [
-        "export class ".concat(id, " ").concat(typeParams, " implements ").concat(exports.WML, ".View {"),
-        "",
-        "   constructor(".concat(exports.CONTEXT, ": ").concat(context, ") {"),
-        "",
-        "       this.template = (".concat(exports.THIS, ":").concat(exports.WML, ".Registry) => {"),
-        "",
-        "       ".concat(instances),
-        "",
-        "           return ".concat(template, ";"),
-        "",
-        "       }",
-        "",
-        "   }",
-        "",
-        "   ids: { [key: string]: ".concat(exports.WML, ".WMLElement } = {};"),
-        "",
-        "   groups: { [key: string]: ".concat(exports.WML, ".WMLElement[] } = {};"),
-        "",
-        "   views: ".concat(exports.WML, ".View[] = [];"),
-        "",
-        "   widgets: ".concat(exports.WML, ".Widget[] = [];"),
-        "",
-        "   tree: Node = <Node>".concat(exports.DOCUMENT, ".createElement('div');"),
-        "",
-        "   template: ".concat(exports.WML, ".Template;"),
-        "",
-        "   registerView(".concat(REGISTER_VIEW_PARAMS, ") : ").concat(exports.WML, ".View {"),
-        "",
-        "       this.views.push(v);",
-        "",
-        "       return v;",
-        "",
-        "}",
-        "   register(".concat(REGISTER_PARAMS, ") : ").concat(exports.WML, ".WMLElement {"),
-        "",
-        "       let attrsMap = (<".concat(exports.WML, ".Attrs><any>attrs)"),
-        "",
-        "       if(attrsMap.wml) {",
-        "",
-        "         let {id, group} = attrsMap.wml;",
-        "",
-        "         if(id != null) {",
-        "",
-        "             if (this.ids.hasOwnProperty(id))",
-        "               throw new Error(`Duplicate id '${id}' detected!`);",
-        "",
-        "             this.ids[id] = e;",
-        "",
-        "         }",
-        "",
-        "         if(group != null) {",
-        "",
-        "             this.groups[group] = this.groups[group] || [];",
-        "             this.groups[group].push(e);",
-        "",
-        "         }",
-        "",
-        "         }",
-        "       return e;",
-        "}",
-        "",
-        "   node(".concat(NODE_PARAMS, "): ").concat(exports.WML, ".Content {"),
-        "",
-        "       let e = ".concat(exports.DOCUMENT, ".createElement(tag);"),
-        "",
-        "       Object.keys(attrs).forEach(key => {",
-        "",
-        "           let value = (<any>attrs)[key];",
-        "",
-        "           if (typeof value === 'function') {",
-        "",
-        "           (<any>e)[key] = value;",
-        "",
-        "           } else if (typeof value === 'string') {",
-        "",
-        "               //prevent setting things like disabled=''",
-        "               if (value !== '')",
-        "               e.setAttribute(key, value);",
-        "",
-        "           } else if (typeof value === 'boolean') {",
-        "",
-        "             e.setAttribute(key, '');",
-        "",
-        "           } else if(!".concat(exports.DOCUMENT, ".isBrowser && "),
-        "                     value instanceof ".concat(exports.DOCUMENT, ".WMLDOMText) {"),
-        "",
-        "             e.setAttribute(key, <any>value);",
-        "",
-        "           }",
-        "",
-        "       });",
-        "",
-        "       children.forEach(c => {",
-        "",
-        "               switch (typeof c) {",
-        "",
-        "                   case 'string':",
-        "                   case 'number':",
-        "                   case 'boolean':",
-        "                     let tn = ".concat(exports.DOCUMENT, ".createTextNode(''+c);"),
-        "                     e.appendChild(<Node>tn)",
-        "                   case 'object':",
-        "                       e.appendChild(<Node>c);",
-        "                   break;",
-        "                   default:",
-        "                       ".concat(THROW_CHILD_ERR),
-        "",
-        "               }})",
-        "",
-        "       this.register(e, attrs);",
-        "",
-        "       return e;",
-        "",
-        "   }",
-        "",
-        "",
-        "   widget(".concat(WIDGET_PARAMS, ") : ").concat(exports.WML, ".Content {"),
-        "",
-        "       this.register(w, attrs);",
-        "",
-        "       this.widgets.push(w);",
-        "",
-        "       return w.render();",
-        "",
-        "   }",
-        "",
-        "   findById<E extends ".concat(exports.WML, ".WMLElement>(id: string): ").concat(MAYBE, "<E> {"),
-        "",
-        "       let mW:".concat(MAYBE, "<E> = ").concat(FROM_NULLABLE, "<E>(<E>this.ids[id])"),
-        "",
-        "       return this.views.reduce((p,c)=>",
-        "       p.isJust() ? p : c.findById(id), mW);",
-        "",
-        "   }",
-        "",
-        "   findByGroup<E extends ".concat(exports.WML, ".WMLElement>(name: string): ") +
-            "".concat(MAYBE, "<E[]> {"),
-        "",
-        "      let mGroup:".concat(MAYBE, "<E[]> ="),
-        "           ".concat(FROM_ARRAY, "(this.groups.hasOwnProperty(name) ?"),
-        "           <any>this.groups[name] : ",
-        "           []);",
-        "",
-        "      return this.views.reduce((p,c) =>",
-        "       p.isJust() ? p : c.findByGroup(name), mGroup);",
-        "",
-        "   }",
-        "",
-        "   invalidate() : void {",
-        "",
-        "       let {tree} = this;",
-        "       let parent = <Node>tree.parentNode;",
-        "",
-        "       if (tree == null)",
-        "           return console.warn('invalidate(): '+" +
-            "       'Missing DOM tree!');",
-        "",
-        "       if (tree.parentNode == null)",
-        "           ".concat(THROW_INVALIDATE_ERR),
-        "",
-        "       parent.replaceChild(<Node>this.render(), tree) ",
-        "",
-        "   }",
-        "",
-        "   render(): ".concat(exports.WML, ".Content {"),
-        "",
-        "       this.ids = {};",
-        "       this.widgets.forEach(w => w.removed());",
-        "       this.widgets = [];",
-        "       this.views = [];",
-        "       this.tree = <Node>this.template(this);",
-        "",
-        "       this.ids['root'] = (this.ids['root']) ?",
-        "       this.ids['root'] : ",
-        "       this.tree;",
-        "",
-        "       this.widgets.forEach(w => w.rendered());",
-        "",
-        "       return this.tree;",
-        "",
-        "   }",
-        "",
-        "}"
+        `export class ${id} ${typeParams} implements ${exports.WML}.View {`,
+        ``,
+        `   constructor(${exports.CONTEXT}: ${context}) {`,
+        ``,
+        `       this.template = (${exports.THIS}:${exports.WML}.Registry) => {`,
+        ``,
+        `       ${instances}`,
+        ``,
+        `           return ${template};`,
+        ``,
+        `       }`,
+        ``,
+        `   }`,
+        ``,
+        `   ids: { [key: string]: ${exports.WML}.WMLElement } = {};`,
+        ``,
+        `   groups: { [key: string]: ${exports.WML}.WMLElement[] } = {};`,
+        ``,
+        `   views: ${exports.WML}.View[] = [];`,
+        ``,
+        `   widgets: ${exports.WML}.Widget[] = [];`,
+        ``,
+        `   tree: Node = <Node>${exports.DOCUMENT}.createElement('div');`,
+        ``,
+        `   template: ${exports.WML}.Template;`,
+        ``,
+        `   registerView(${REGISTER_VIEW_PARAMS}) : ${exports.WML}.View {`,
+        ``,
+        `       this.views.push(v);`,
+        ``,
+        `       return v;`,
+        ``,
+        `}`,
+        `   register(${REGISTER_PARAMS}) : ${exports.WML}.WMLElement {`,
+        ``,
+        `       let attrsMap = (<${exports.WML}.Attrs><any>attrs)`,
+        ``,
+        `       if(attrsMap.wml) {`,
+        ``,
+        `         let {id, group} = attrsMap.wml;`,
+        ``,
+        `         if(id != null) {`,
+        ``,
+        `             if (this.ids.hasOwnProperty(id))`,
+        `               throw new Error(\`Duplicate id '\${id}' detected!\`);`,
+        ``,
+        `             this.ids[id] = e;`,
+        ``,
+        `         }`,
+        ``,
+        `         if(group != null) {`,
+        ``,
+        `             this.groups[group] = this.groups[group] || [];`,
+        `             this.groups[group].push(e);`,
+        ``,
+        `         }`,
+        ``,
+        `         }`,
+        `       return e;`,
+        `}`,
+        ``,
+        `   node(${NODE_PARAMS}): ${exports.WML}.Content {`,
+        ``,
+        `       let e = ${exports.DOCUMENT}.createElement(tag);`,
+        ``,
+        `       Object.keys(attrs).forEach(key => {`,
+        ``,
+        `           let value = (<any>attrs)[key];`,
+        ``,
+        `           if (typeof value === 'function') {`,
+        ``,
+        `           (<any>e)[key] = value;`,
+        ``,
+        `           } else if (typeof value === 'string') {`,
+        ``,
+        `               //prevent setting things like disabled=''`,
+        `               if (value !== '')`,
+        `               e.setAttribute(key, value);`,
+        ``,
+        `           } else if (typeof value === 'boolean') {`,
+        ``,
+        `             e.setAttribute(key, '');`,
+        ``,
+        `           } else if(!${exports.DOCUMENT}.isBrowser && `,
+        `                     value instanceof ${exports.DOCUMENT}.WMLDOMText) {`,
+        ``,
+        `             e.setAttribute(key, <any>value);`,
+        ``,
+        `           }`,
+        ``,
+        `       });`,
+        ``,
+        `       children.forEach(c => {`,
+        ``,
+        `               switch (typeof c) {`,
+        ``,
+        `                   case 'string':`,
+        `                   case 'number':`,
+        `                   case 'boolean':`,
+        `                     let tn = ${exports.DOCUMENT}.createTextNode(''+c);`,
+        `                     e.appendChild(<Node>tn)`,
+        `                   case 'object':`,
+        `                       e.appendChild(<Node>c);`,
+        `                   break;`,
+        `                   default:`,
+        `                       ${THROW_CHILD_ERR}`,
+        ``,
+        `               }})`,
+        ``,
+        `       this.register(e, attrs);`,
+        ``,
+        `       return e;`,
+        ``,
+        `   }`,
+        ``,
+        ``,
+        `   widget(${WIDGET_PARAMS}) : ${exports.WML}.Content {`,
+        ``,
+        `       this.register(w, attrs);`,
+        ``,
+        `       this.widgets.push(w);`,
+        ``,
+        `       return w.render();`,
+        ``,
+        `   }`,
+        ``,
+        `   findById<E extends ${exports.WML}.WMLElement>(id: string): ${MAYBE}<E> {`,
+        ``,
+        `       let mW:${MAYBE}<E> = ${FROM_NULLABLE}<E>(<E>this.ids[id])`,
+        ``,
+        `       return this.views.reduce((p,c)=>`,
+        `       p.isJust() ? p : c.findById(id), mW);`,
+        ``,
+        `   }`,
+        ``,
+        `   findByGroup<E extends ${exports.WML}.WMLElement>(name: string): ` +
+            `${MAYBE}<E[]> {`,
+        ``,
+        `      let mGroup:${MAYBE}<E[]> =`,
+        `           ${FROM_ARRAY}(this.groups.hasOwnProperty(name) ?`,
+        `           <any>this.groups[name] : `,
+        `           []);`,
+        ``,
+        `      return this.views.reduce((p,c) =>`,
+        `       p.isJust() ? p : c.findByGroup(name), mGroup);`,
+        ``,
+        `   }`,
+        ``,
+        `   invalidate() : void {`,
+        ``,
+        `       let {tree} = this;`,
+        `       let parent = <Node>tree.parentNode;`,
+        ``,
+        `       if (tree == null)`,
+        `           return console.warn('invalidate(): '+` +
+            `       'Missing DOM tree!');`,
+        ``,
+        `       if (tree.parentNode == null)`,
+        `           ${THROW_INVALIDATE_ERR}`,
+        ``,
+        `       parent.replaceChild(<Node>this.render(), tree) `,
+        ``,
+        `   }`,
+        ``,
+        `   render(): ${exports.WML}.Content {`,
+        ``,
+        `       this.ids = {};`,
+        `       this.widgets.forEach(w => w.removed());`,
+        `       this.widgets = [];`,
+        `       this.views = [];`,
+        `       this.tree = <Node>this.template(this);`,
+        ``,
+        `       this.ids['root'] = (this.ids['root']) ?`,
+        `       this.ids['root'] : `,
+        `       this.tree;`,
+        ``,
+        `       this.widgets.forEach(w => w.rendered());`,
+        ``,
+        `       return this.tree;`,
+        ``,
+        `   }`,
+        ``,
+        `}`
     ].join(eol(ctx));
 };
 exports.viewStatement2TS = viewStatement2TS;
@@ -526,22 +498,18 @@ exports.viewStatement2TS = viewStatement2TS;
  * typeParameters2TS converts a list of typeParameters2TS into the a list of
  * typescript typeParameters2TS.
  */
-var typeParameters2TS = function (ns) {
-    return (ns.length === 0) ? '' : "<".concat(ns.map(exports.typeParameter2TS).join(','), "> ");
-};
+const typeParameters2TS = (ns) => (ns.length === 0) ? '' : `<${ns.map(exports.typeParameter2TS).join(',')}> `;
 exports.typeParameters2TS = typeParameters2TS;
 /**
  * typeParameter2TS converts a type parameter into a typescript type parameter.
  */
-var typeParameter2TS = function (n) {
-    return "".concat(toPrim((0, exports.identifierOrConstructor2TS)(n.id)), " ") +
-        "".concat(n.constraint ? 'extends ' + (0, exports.type2TS)(n.constraint) : '', " ");
-};
+const typeParameter2TS = (n) => `${toPrim((0, exports.identifierOrConstructor2TS)(n.id))} ` +
+    `${n.constraint ? 'extends ' + (0, exports.type2TS)(n.constraint) : ''} `;
 exports.typeParameter2TS = typeParameter2TS;
 /**
  * type2TS
  */
-var type2TS = function (n) {
+const type2TS = (n) => {
     if (n instanceof ast.ConstructorType)
         return (0, exports.constructorType2TS)(n);
     else if (n instanceof ast.RecordType)
@@ -566,8 +534,8 @@ exports.type2TS = type2TS;
  *
  * If the node is generic, the type parameters will be generated as well.
  */
-var constructorType2TS = function (n) {
-    var id = toPrim((0, exports.identifierOrConstructor2TS)(n.id));
+const constructorType2TS = (n) => {
+    let id = toPrim((0, exports.identifierOrConstructor2TS)(n.id));
     return (n.typeParameters.length > 0) ?
         id + (0, exports.typeParameters2TS)(n.typeParameters) : id;
 };
@@ -575,33 +543,27 @@ exports.constructorType2TS = constructorType2TS;
 /**
  * functionType2TS
  */
-var functionType2TS = function (n) {
-    var params = n.parameters.map(function (t, k) { return "$".concat(k, ":").concat((0, exports.type2TS)(t)); }).join(',');
-    var ret = (0, exports.type2TS)(n.returnType);
-    return "(".concat(params, ") => ").concat(ret);
+const functionType2TS = (n) => {
+    let params = n.parameters.map((t, k) => `$${k}:${(0, exports.type2TS)(t)}`).join(',');
+    let ret = (0, exports.type2TS)(n.returnType);
+    return `(${params}) => ${ret}`;
 };
 exports.functionType2TS = functionType2TS;
 /**
  * listType2TS
  */
-var listType2TS = function (n) {
-    return "(".concat((0, exports.type2TS)(n.elementType), ")[]");
-};
+const listType2TS = (n) => `(${(0, exports.type2TS)(n.elementType)})[]`;
 exports.listType2TS = listType2TS;
 /**
  * tupleType2TS
  */
-var tupleType2TS = function (n) {
-    return "[".concat(n.members.map(exports.type2TS).join(','), "]");
-};
+const tupleType2TS = (n) => `[${n.members.map(exports.type2TS).join(',')}]`;
 exports.tupleType2TS = tupleType2TS;
 /**
  * recordType2TS converts the RecordType node to the body of a TypeScript
  * record interface.
  */
-var recordType2Ts = function (n) {
-    return '{' + (0, exports.memberDeclarations2TS)(n.members) + '}';
-};
+const recordType2Ts = (n) => '{' + (0, exports.memberDeclarations2TS)(n.members) + '}';
 exports.recordType2Ts = recordType2Ts;
 /**
  * memberDeclarations2TS converts a list of MemberDeclarations to TypeScript.
@@ -609,29 +571,25 @@ exports.recordType2Ts = recordType2Ts;
  * The paths of the MemberDeclarations are expanded so that paths
  * using the "<path1>.<path2>.<path3>" syntax occur as nested records.
  */
-var memberDeclarations2TS = function (n) {
-    return (0, exports.typeMap2TS)((0, exports.expandTypeMap)((0, exports.typeMapFromMemberDecs)(n)));
-};
+const memberDeclarations2TS = (n) => (0, exports.typeMap2TS)((0, exports.expandTypeMap)((0, exports.typeMapFromMemberDecs)(n)));
 exports.memberDeclarations2TS = memberDeclarations2TS;
 /**
  * typeMapFromMemberDecs creates a TypeMap from a list of memberDeclarations.
  *
  * This works recursively and any RecordTypes encountered will be flattened.
  */
-var typeMapFromMemberDecs = function (list) {
-    return list.reduce(function (p, m) {
-        var paths = m.path.map(function (p) { return p.value; });
-        if (m.kind instanceof ast.RecordType) {
-            return (0, exports.typeMapFromRecordType)(m.kind, p, paths);
-        }
-        else {
-            var path = paths2String(paths);
-            path = m.optional ? "".concat(path, "?") : path;
-            p[path] = m.kind;
-            return p;
-        }
-    }, {});
-};
+const typeMapFromMemberDecs = (list) => list.reduce((p, m) => {
+    let paths = m.path.map(p => p.value);
+    if (m.kind instanceof ast.RecordType) {
+        return (0, exports.typeMapFromRecordType)(m.kind, p, paths);
+    }
+    else {
+        let path = paths2String(paths);
+        path = m.optional ? `${path}?` : path;
+        p[path] = m.kind;
+        return p;
+    }
+}, {});
 exports.typeMapFromMemberDecs = typeMapFromMemberDecs;
 /**
  * typeMapFromRecordType produces a map of node.Type instances from
@@ -639,59 +597,47 @@ exports.typeMapFromMemberDecs = typeMapFromMemberDecs;
  *
  * Any encountered RecordTypes will be flattened.
  */
-var typeMapFromRecordType = function (n, init, prefix) {
-    return n.members.reduce(function (p, m) {
-        var path = __spreadArray(__spreadArray([], prefix, true), (m.path.map(function (p) { return p.value; })), true);
-        if (m.kind instanceof ast.RecordType) {
-            return (0, exports.typeMapFromRecordType)(m.kind, init, path);
-        }
-        else {
-            p[paths2String(path)] = m.kind;
-            return p;
-        }
-    }, init);
-};
+const typeMapFromRecordType = (n, init, prefix) => n.members.reduce((p, m) => {
+    let path = [...prefix, ...(m.path.map(p => p.value))];
+    if (m.kind instanceof ast.RecordType) {
+        return (0, exports.typeMapFromRecordType)(m.kind, init, path);
+    }
+    else {
+        p[paths2String(path)] = m.kind;
+        return p;
+    }
+}, init);
 exports.typeMapFromRecordType = typeMapFromRecordType;
-var paths2String = function (paths) { return paths.join('.'); };
+const paths2String = (paths) => paths.join('.');
 /**
  * expandTypeMap to an ExpandedTypeMap.
  */
-var expandTypeMap = function (m) {
-    return (0, record_1.reduce)(m, {}, function (p, c, k) {
-        return (0, path_1.set)(k, (0, exports.type2TS)(c), p);
-    });
-};
+const expandTypeMap = (m) => (0, record_1.reduce)(m, {}, (p, c, k) => (0, path_1.set)(k, (0, exports.type2TS)(c), p));
 exports.expandTypeMap = expandTypeMap;
 /**
  * typeMap2TS converts a map of type values to TypeScript.
  */
-var typeMap2TS = function (m) {
-    return (0, record_1.mapTo)(m, function (t, k) {
-        if ((0, record_1.isRecord)(t)) {
-            var key = isOptional(t) ? "".concat(k, "?") : "".concat(k);
-            return "".concat(key, ": {").concat((0, exports.typeMap2TS)(t), "}");
-        }
-        else {
-            return "".concat(k, " : ").concat(t);
-        }
-    }).join(',\n');
-};
+const typeMap2TS = (m) => (0, record_1.mapTo)(m, (t, k) => {
+    if ((0, record_1.isRecord)(t)) {
+        let key = isOptional(t) ? `${k}?` : `${k}`;
+        return `${key}: {${(0, exports.typeMap2TS)(t)}}`;
+    }
+    else {
+        return `${k} : ${t}`;
+    }
+}).join(',\n');
 exports.typeMap2TS = typeMap2TS;
-var isOptional = function (m) {
-    return (0, record_1.reduce)(m, false, function (p, _, k) { return p ? p : k.indexOf('?') > -1; });
-};
+const isOptional = (m) => (0, record_1.reduce)(m, false, (p, _, k) => p ? p : k.indexOf('?') > -1);
 /**
  * parameters2TS converts a list Parameter nodes into an parameter list
  * (without parens).
  */
-var parameters2TS = function (list) {
-    return list.map(function (p) { return (0, exports.parameter2TS)(p); }).join(',');
-};
+const parameters2TS = (list) => list.map(p => (0, exports.parameter2TS)(p)).join(',');
 exports.parameters2TS = parameters2TS;
 /**
  * parameter2TS
  */
-var parameter2TS = function (n) {
+const parameter2TS = (n) => {
     if (n instanceof ast.TypedParameter)
         return (0, exports.typedParameter2TS)(n);
     else if (n instanceof ast.UntypedParameter)
@@ -703,28 +649,24 @@ exports.parameter2TS = parameter2TS;
 /**
  * typedParameter2TS
  */
-var typedParameter2TS = function (n) {
-    return "".concat((0, exports.identifier2TS)(n.id), ": ").concat((0, exports.type2TS)(n.hint), " ");
-};
+const typedParameter2TS = (n) => `${(0, exports.identifier2TS)(n.id)}: ${(0, exports.type2TS)(n.hint)} `;
 exports.typedParameter2TS = typedParameter2TS;
 /**
  * untypedParameter2TS
  */
-var untypedParameter2TS = function (n) {
-    return "".concat((0, exports.identifier2TS)(n.id), " ");
-};
+const untypedParameter2TS = (n) => `${(0, exports.identifier2TS)(n.id)} `;
 exports.untypedParameter2TS = untypedParameter2TS;
 /**
  * children2TS
  */
-var children2TS = function (ctx, list) {
-    return "[".concat(ctx.options.EOL, "\n        ").concat(list.map(function (l) { return (0, exports.child2TS)(ctx, l); }).join(',' + ctx.options.EOL), "\n     ]");
-};
+const children2TS = (ctx, list) => `[${ctx.options.EOL}
+        ${list.map(l => (0, exports.child2TS)(ctx, l)).join(',' + ctx.options.EOL)}
+     ]`;
 exports.children2TS = children2TS;
 /**
  * child2TS converts children to typescript.
  */
-var child2TS = function (ctx, n) {
+const child2TS = (ctx, n) => {
     if ((n instanceof ast.Node) || (n instanceof ast.Widget))
         return (0, exports.tag2TS)(ctx, n);
     else if (n instanceof ast.Interpolation)
@@ -756,20 +698,20 @@ exports.child2TS = child2TS;
 /**
  * tag2TS converts a tag to typescript.
  */
-var tag2TS = function (ctx, n) { return (n.type === 'widget') ?
-    (0, exports.widget2TS)(ctx, n) : (0, exports.node2TS)(ctx, n); };
+const tag2TS = (ctx, n) => (n.type === 'widget') ?
+    (0, exports.widget2TS)(ctx, n) : (0, exports.node2TS)(ctx, n);
 exports.tag2TS = tag2TS;
 /**
  * widget2TS converts a Widget node into its typescript representation.
  *
  * This is simply a call to the View's widget method.
  */
-var widget2TS = function (ctx, n) {
-    var name = (0, exports.constructor2TS)(n.open);
-    var attrs = (0, exports.attrs2String)((0, exports.groupAttrs)(ctx, n.attributes));
-    var childs = (0, exports.children2TS)(ctx, n.children);
-    return "".concat(exports.THIS, ".widget(new ").concat(name, "(").concat(attrs, ", ").concat(childs, "),") +
-        "<".concat(exports.WML, ".Attrs>").concat(attrs, ")");
+const widget2TS = (ctx, n) => {
+    let name = (0, exports.constructor2TS)(n.open);
+    let attrs = (0, exports.attrs2String)(ctx, n.attributes);
+    let childs = (0, exports.children2TS)(ctx, n.children);
+    return `${exports.THIS}.widget(new ${name}(${attrs}, ${childs}),` +
+        `<${exports.WML}.Attrs>${attrs})`;
 };
 exports.widget2TS = widget2TS;
 /**
@@ -777,161 +719,140 @@ exports.widget2TS = widget2TS;
  *
  * This is simply a call to the View's node method.
  */
-var node2TS = function (ctx, n) {
-    var name = (0, exports.identifier2TS)(n.open);
-    var attrs = (0, exports.attrs2String)((0, exports.groupAttrs)(ctx, n.attributes));
-    var childs = (0, exports.children2TS)(ctx, n.children);
-    return "".concat(exports.THIS, ".node('").concat(name, "', <").concat(exports.WML, ".Attrs>").concat(attrs, ", ").concat(childs, ")");
+const node2TS = (ctx, n) => {
+    let name = (0, exports.identifier2TS)(n.open);
+    let attrs = (0, exports.attrs2String)(ctx, n.attributes);
+    let childs = (0, exports.children2TS)(ctx, n.children);
+    return `${exports.THIS}.node('${name}', <${exports.WML}.Attrs>${attrs}, ${childs})`;
 };
 exports.node2TS = node2TS;
 /**
  * attribute2Value
  */
-var attribute2TS = function (ctx, n) {
-    return "".concat((0, exports.attributeName2TS)(ctx, n), " : ").concat((0, exports.attributeValue2TS)(ctx, n), " ");
-};
+const attribute2TS = (ctx, n) => `${(0, exports.attributeName2TS)(ctx, n)} : ${(0, exports.attributeValue2TS)(ctx, n)} `;
 exports.attribute2TS = attribute2TS;
 /**
  * attributeValue2TS
  */
-var attributeValue2TS = function (ctx, n) {
-    return (n.value instanceof ast.Interpolation) ?
-        (0, exports.interpolation2TS)(ctx, n.value) :
-        (0, exports.literal2TS)(ctx, n.value);
-};
+const attributeValue2TS = (ctx, n) => (n.value instanceof ast.Interpolation) ?
+    (0, exports.interpolation2TS)(ctx, n.value) :
+    (0, exports.literal2TS)(ctx, n.value);
 exports.attributeValue2TS = attributeValue2TS;
 /**
  * attributeName2TS
  */
-var attributeName2TS = function (_, n) {
-    return "'".concat((0, exports.unqualifiedIdentifier2TS)(n.name), "'");
-};
+const attributeName2TS = (_, n) => `'${(0, exports.unqualifiedIdentifier2TS)(n.name)}'`;
 exports.attributeName2TS = attributeName2TS;
 /**
  * attrs2String
  */
-var attrs2String = function (attrs) {
-    return '{' +
-        Object.keys(attrs).map(function (name) {
-            return Array.isArray(attrs[name]) ?
-                "".concat(name, " : { ").concat(attrs[name].join(','), " }") :
-                "".concat(name, ": ").concat(attrs[name]);
-        }) +
-        '}';
+const attrs2String = (ctx, attrs) => {
+    // Check for the special wml:attrs attribute.
+    let mallAttrs = (0, array_1.find)(attrs, attr => ((attr.namespace.value === 'wml') &&
+        (attr.name.value === 'attrs')));
+    if (mallAttrs.isJust())
+        return (0, exports.attributeValue2TS)(ctx, mallAttrs.get());
+    let [nns, ns] = (0, array_1.partition)(attrs, a => (a.namespace.value === ''));
+    let nso = ns.reduce((p, n) => (0, record_1.merge)(p, {
+        [n.namespace.value]: (p[n.namespace.value] || []).concat((0, exports.attribute2TS)(ctx, n))
+    }), {});
+    return _attrs2String(nns.reduce((p, n) => (0, record_1.merge)(p, {
+        [(0, exports.attributeName2TS)(ctx, n)]: (0, exports.attributeValue2TS)(ctx, n)
+    }), nso));
 };
 exports.attrs2String = attrs2String;
-/**
- * groupAttrs
- */
-var groupAttrs = function (ctx, attrs) {
-    var _a = (0, array_1.partition)(attrs, function (a) { return (a.namespace.value === ''); }), nns = _a[0], ns = _a[1];
-    var nso = ns.reduce(function (p, n) {
-        var _a;
-        return (0, record_1.merge)(p, (_a = {},
-            _a[n.namespace.value] = (p[n.namespace.value] || []).concat((0, exports.attribute2TS)(ctx, n)),
-            _a));
-    }, {});
-    return nns.reduce(function (p, n) {
-        var _a;
-        return (0, record_1.merge)(p, (_a = {},
-            _a[(0, exports.attributeName2TS)(ctx, n)] = (0, exports.attributeValue2TS)(ctx, n),
-            _a));
-    }, nso);
-};
-exports.groupAttrs = groupAttrs;
+const _attrs2String = (attrs) => '{' +
+    Object.keys(attrs).map(name => Array.isArray(attrs[name]) ?
+        `${name} : { ${attrs[name].join(',')} }` :
+        `${name}: ${attrs[name]}`) +
+    '}';
 /**
  * interpolation2TS
  */
-var interpolation2TS = function (ctx, n) {
-    return n.filters.reduce(function (p, c) {
-        return "".concat((0, exports.expression2TS)(ctx, c), " (").concat(p, ")");
-    }, (0, exports.expression2TS)(ctx, n.expression));
-};
+const interpolation2TS = (ctx, n) => n.filters.reduce((p, c) => `${(0, exports.expression2TS)(ctx, c)} (${p})`, (0, exports.expression2TS)(ctx, n.expression));
 exports.interpolation2TS = interpolation2TS;
 /**
  * ifStatementTS converts an IfStatement to its typescript representation.
  */
-var ifStatement2TS = function (ctx, n) {
-    var condition = (0, exports.expression2TS)(ctx, n.condition);
-    var conseq = (0, exports.children2TS)(ctx, n.then);
-    var alt = (n.elseClause instanceof ast.ElseIfClause) ?
-        "[".concat((0, exports.ifStatement2TS)(ctx, n.elseClause), "]") :
+const ifStatement2TS = (ctx, n) => {
+    let condition = (0, exports.expression2TS)(ctx, n.condition);
+    let conseq = (0, exports.children2TS)(ctx, n.then);
+    let alt = (n.elseClause instanceof ast.ElseIfClause) ?
+        `[${(0, exports.ifStatement2TS)(ctx, n.elseClause)}]` :
         (n.elseClause instanceof ast.ElseClause) ?
             (0, exports.children2TS)(ctx, n.elseClause.children) :
             '[]';
     return [
-        "...((".concat(condition, ") ?"),
-        "(()=>(".concat(conseq, "))() :"),
-        "(()=>(".concat(alt, "))())")
+        `...((${condition}) ?`,
+        `(()=>(${conseq}))() :`,
+        `(()=>(${alt}))())`
     ].join(ctx.options.EOL);
 };
 exports.ifStatement2TS = ifStatement2TS;
 /**
  * forInStatement2TS converts a ForInStatement to its typescript representation.
  */
-var forInStatement2TS = function (ctx, n) {
-    var expr = (0, exports.expression2TS)(ctx, n.expression);
-    var value = (0, exports.parameter2TS)(n.variables[0]);
-    var key = n.variables.length > 1 ? (0, exports.parameter2TS)(n.variables[1]) : '_$$i';
-    var all = n.variables.length > 2 ? (0, exports.parameter2TS)(n.variables[2]) : '_$$all';
-    var body = (0, exports.children2TS)(ctx, n.body);
-    var alt = n.otherwise.length > 0 ? (0, exports.children2TS)(ctx, n.otherwise) : '[]';
+const forInStatement2TS = (ctx, n) => {
+    let expr = (0, exports.expression2TS)(ctx, n.expression);
+    let value = (0, exports.parameter2TS)(n.variables[0]);
+    let key = n.variables.length > 1 ? (0, exports.parameter2TS)(n.variables[1]) : '_$$i';
+    let all = n.variables.length > 2 ? (0, exports.parameter2TS)(n.variables[2]) : '_$$all';
+    let body = (0, exports.children2TS)(ctx, n.body);
+    let alt = n.otherwise.length > 0 ? (0, exports.children2TS)(ctx, n.otherwise) : '[]';
     return [
-        "...".concat(FOR_IN, " (").concat(expr, ", (").concat(value, ", ").concat(key, ", ").concat(all, ")=> "),
-        "(".concat(body, "), "),
-        "()=> (".concat(alt, "))")
+        `...${FOR_IN} (${expr}, (${value}, ${key}, ${all})=> `,
+        `(${body}), `,
+        `()=> (${alt}))`
     ].join(ctx.options.EOL);
 };
 exports.forInStatement2TS = forInStatement2TS;
 /**
  * forOfStatement2TS
  */
-var forOfStatement2TS = function (ctx, n) {
-    var expr = (0, exports.expression2TS)(ctx, n.expression);
-    var value = (0, exports.parameter2TS)(n.variables[0]);
-    var key = n.variables.length > 1 ? (0, exports.parameter2TS)(n.variables[1]) : '_$$k';
-    var all = n.variables.length > 2 ? (0, exports.parameter2TS)(n.variables[2]) : '_$$all';
-    var body = (0, exports.children2TS)(ctx, n.body);
-    var alt = n.otherwise.length > 0 ? (0, exports.children2TS)(ctx, n.otherwise) : '[]';
+const forOfStatement2TS = (ctx, n) => {
+    let expr = (0, exports.expression2TS)(ctx, n.expression);
+    let value = (0, exports.parameter2TS)(n.variables[0]);
+    let key = n.variables.length > 1 ? (0, exports.parameter2TS)(n.variables[1]) : '_$$k';
+    let all = n.variables.length > 2 ? (0, exports.parameter2TS)(n.variables[2]) : '_$$all';
+    let body = (0, exports.children2TS)(ctx, n.body);
+    let alt = n.otherwise.length > 0 ? (0, exports.children2TS)(ctx, n.otherwise) : '[]';
     return [
-        "...".concat(FOR_OF, " (").concat(expr, ", (").concat(value, ", ").concat(key, ", ").concat(all, ") => "),
-        "       (".concat(body, "), "),
-        "    ()=> (".concat(alt, "))")
+        `...${FOR_OF} (${expr}, (${value}, ${key}, ${all}) => `,
+        `       (${body}), `,
+        `    ()=> (${alt}))`
     ].join(eol(ctx));
 };
 exports.forOfStatement2TS = forOfStatement2TS;
 /**
  * forFromStatement2TS
  */
-var forFromStatement2TS = function (ctx, node) {
-    var value = (0, exports.parameter2TS)(node.variable);
-    var start = (0, exports.expression2TS)(ctx, node.start);
-    var end = (0, exports.expression2TS)(ctx, node.end);
-    var body = (0, exports.children2TS)(ctx, node.body);
+const forFromStatement2TS = (ctx, node) => {
+    let value = (0, exports.parameter2TS)(node.variable);
+    let start = (0, exports.expression2TS)(ctx, node.start);
+    let end = (0, exports.expression2TS)(ctx, node.end);
+    let body = (0, exports.children2TS)(ctx, node.body);
     return [
-        "...(function forFrom()  {",
-        "  let result:".concat(exports.WML, ".Content[] = [];"),
-        "  for(let ".concat(value, ":number=").concat(start, "; ").concat(value, "<=").concat(end, "; ").concat(value, "++)"),
-        "   result.push(",
-        "     ...".concat(body),
-        "   );",
-        "  return result;",
-        "})()"
+        `...(function forFrom()  {`,
+        `  let result:${exports.WML}.Content[] = [];`,
+        `  for(let ${value}:number=${start}; ${value}<=${end}; ${value}++)`,
+        `   result.push(`,
+        `     ...${body}`,
+        `   );`,
+        `  return result;`,
+        `})()`
     ].join(eol(ctx));
 };
 exports.forFromStatement2TS = forFromStatement2TS;
 /**
  * characters2TS converts character text to a typescript string.
  */
-var characters2TS = function (n) {
-    return "".concat(exports.DOCUMENT, ".createTextNode('").concat(breakLines(n.value), "')");
-};
+const characters2TS = (n) => `${exports.DOCUMENT}.createTextNode('${breakLines(n.value)}')`;
 exports.characters2TS = characters2TS;
-var breakLines = function (str) { return str.split('\n').join('\\u000a'); };
+const breakLines = (str) => str.split('\n').join('\\u000a');
 /**
  * expression2TS
  */
-var expression2TS = function (ctx, n) {
+const expression2TS = (ctx, n) => {
     if (n instanceof ast.IfThenExpression)
         return (0, exports.ifThenExpression2TS)(ctx, n);
     else if (n instanceof ast.BinaryExpression)
@@ -981,119 +902,109 @@ exports.expression2TS = expression2TS;
 /**
  * ifThenExpression2TS
  */
-var ifThenExpression2TS = function (ctx, n) {
-    var condition = (0, exports.expression2TS)(ctx, n.condition);
-    var conseq = (0, exports.expression2TS)(ctx, n.iftrue);
-    var alt = (0, exports.expression2TS)(ctx, n.iffalse);
-    return "(".concat(condition, ") ? ").concat(conseq, " :  ").concat(alt);
+const ifThenExpression2TS = (ctx, n) => {
+    let condition = (0, exports.expression2TS)(ctx, n.condition);
+    let conseq = (0, exports.expression2TS)(ctx, n.iftrue);
+    let alt = (0, exports.expression2TS)(ctx, n.iffalse);
+    return `(${condition}) ? ${conseq} :  ${alt}`;
 };
 exports.ifThenExpression2TS = ifThenExpression2TS;
 /**
  * binaryExpression2TS
  */
-var binaryExpression2TS = function (ctx, n) {
-    var left = (0, exports.expression2TS)(ctx, n.left);
-    var right = (0, exports.expression2TS)(ctx, n.right);
-    var op = operators.hasOwnProperty(n.operator) ?
+const binaryExpression2TS = (ctx, n) => {
+    let left = (0, exports.expression2TS)(ctx, n.left);
+    let right = (0, exports.expression2TS)(ctx, n.right);
+    let op = operators.hasOwnProperty(n.operator) ?
         operators[n.operator] :
         n.operator;
-    return "(".concat(left, " ").concat(op, " ").concat(right, ")");
+    return `(${left} ${op} ${right})`;
 };
 exports.binaryExpression2TS = binaryExpression2TS;
 /**
  * unaryExpression2TS
  */
-var unaryExpression2TS = function (ctx, n) {
-    var expr = (0, exports.expression2TS)(ctx, n.expression);
+const unaryExpression2TS = (ctx, n) => {
+    let expr = (0, exports.expression2TS)(ctx, n.expression);
     return (n.operator === '??') ?
-        "(".concat(expr, ") != null") :
-        "".concat(n.operator, "(").concat(expr, ")");
+        `(${expr}) != null` :
+        `${n.operator}(${expr})`;
 };
 exports.unaryExpression2TS = unaryExpression2TS;
 /**
  * typeAssertion2TS
  */
-var typeAssertion2TS = function (ctx, n) {
-    return "<".concat((0, exports.type2TS)(n.target), ">(").concat((0, exports.expression2TS)(ctx, n.expression), ")");
-};
+const typeAssertion2TS = (ctx, n) => `<${(0, exports.type2TS)(n.target)}>(${(0, exports.expression2TS)(ctx, n.expression)})`;
 exports.typeAssertion2TS = typeAssertion2TS;
 /**
  * viewConstruction2TS
  */
-var viewConstruction2TS = function (ctx, n) {
-    return "".concat(exports.THIS, ".registerView(").concat((0, exports.expression2TS)(ctx, n.expression), ").render()");
-};
+const viewConstruction2TS = (ctx, n) => `${exports.THIS}.registerView(${(0, exports.expression2TS)(ctx, n.expression)}).render()`;
 exports.viewConstruction2TS = viewConstruction2TS;
 /**
  * funApplication2TS
  */
-var funApplication2TS = function (ctx, n) {
-    return "".concat((0, exports.expression2TS)(ctx, n.target)).concat((0, exports.typeArgs2TS)(n.typeArgs), " ") +
-        "(".concat((0, exports.args2TS)(ctx, n.args), ")(").concat(exports.THIS, ")");
-};
+const funApplication2TS = (ctx, n) => `${(0, exports.expression2TS)(ctx, n.target)}${(0, exports.typeArgs2TS)(n.typeArgs)} ` +
+    `(${(0, exports.args2TS)(ctx, n.args)})(${exports.THIS})`;
 exports.funApplication2TS = funApplication2TS;
 /**
  * constructExpression2TS
  */
-var constructExpression2TS = function (ctx, n) {
-    var cons = (0, exports.constructor2TS)(n.cons);
-    var consOriginal = "".concat(cons[0].toUpperCase()).concat(cons.slice(1));
-    var args = (0, exports.args2TS)(ctx, n.args);
+const constructExpression2TS = (ctx, n) => {
+    let cons = (0, exports.constructor2TS)(n.cons);
+    let consOriginal = `${cons[0].toUpperCase()}${cons.slice(1)}`;
+    let args = (0, exports.args2TS)(ctx, n.args);
     if ((0, array_1.contains)(casters, consOriginal)) {
-        return "".concat(consOriginal, "(").concat(args, ")");
+        return `${consOriginal}(${args})`;
     }
     else {
-        return "new ".concat(cons, "(").concat(args, ")");
+        return `new ${cons}(${args})`;
     }
 };
 exports.constructExpression2TS = constructExpression2TS;
 /**
  * callExpression2TS
  */
-var callExpression2TS = function (ctx, n) {
-    var target = (0, exports.expression2TS)(ctx, n.target);
-    var typeArgs = (0, exports.typeArgs2TS)(n.typeArgs);
-    var args = (0, exports.args2TS)(ctx, n.args);
-    return "".concat(target).concat(typeArgs, "(").concat(args, ")");
+const callExpression2TS = (ctx, n) => {
+    let target = (0, exports.expression2TS)(ctx, n.target);
+    let typeArgs = (0, exports.typeArgs2TS)(n.typeArgs);
+    let args = (0, exports.args2TS)(ctx, n.args);
+    return `${target}${typeArgs}(${args})`;
 };
 exports.callExpression2TS = callExpression2TS;
 /**
  * typeArgs2TS
  */
-var typeArgs2TS = function (ns) {
-    return ns.length === 0 ? '' : "<".concat(ns.map(exports.type2TS).join(','), ">");
-};
+const typeArgs2TS = (ns) => ns.length === 0 ? '' : `<${ns.map(exports.type2TS).join(',')}>`;
 exports.typeArgs2TS = typeArgs2TS;
 /**
  * args2TS converts a list of arguments to a typescript argument tupple.
  */
-var args2TS = function (ctx, ns) {
-    return (ns.length === 0) ? '' : ns.map(function (e) { return (0, exports.expression2TS)(ctx, e); }).join(',');
-};
+const args2TS = (ctx, ns) => (ns.length === 0) ? '' : ns.map(e => (0, exports.expression2TS)(ctx, e)).join(',');
 exports.args2TS = args2TS;
 /**
  * memberExpression2TS
  */
-var memberExpression2TS = function (ctx, n) {
-    var target = (0, exports.expression2TS)(ctx, n.target);
-    return (n.member instanceof ast.StringLiteral) ?
-        "".concat(target, "[").concat((0, exports.string2TS)(n.member), "]") :
-        "".concat(target, ".").concat((0, exports.identifier2TS)(n.member));
+const memberExpression2TS = (ctx, n) => {
+    let target = (0, exports.expression2TS)(ctx, n.head);
+    return (n.tail instanceof ast.StringLiteral) ?
+        `${target}[${(0, exports.string2TS)(n.tail)}]` :
+        `${target}.${(0, exports.expression2TS)(ctx, n.tail)}`;
 };
 exports.memberExpression2TS = memberExpression2TS;
 /**
  * functionExpression2TS
  */
-var functionExpression2TS = function (ctx, n) {
-    var params = n.parameters.map(exports.parameter2TS).join(',');
-    var body = (0, exports.expression2TS)(ctx, n.body);
-    return "(".concat(params, ") => ").concat(body);
+const functionExpression2TS = (ctx, n) => {
+    let params = n.parameters.map(exports.parameter2TS).join(',');
+    let body = (0, exports.expression2TS)(ctx, n.body);
+    return `(${params}) => ${body}`;
 };
 exports.functionExpression2TS = functionExpression2TS;
 /**
  * literal2TS
  */
-var literal2TS = function (ctx, n) {
+const literal2TS = (ctx, n) => {
     if (n instanceof ast.BooleanLiteral)
         return (0, exports.boolean2TS)(n);
     else if (n instanceof ast.StringLiteral)
@@ -1111,66 +1022,64 @@ exports.literal2TS = literal2TS;
 /**
  * boolean2TS
  */
-var boolean2TS = function (n) { return "".concat(n.value, " "); };
+const boolean2TS = (n) => `${n.value} `;
 exports.boolean2TS = boolean2TS;
 /**
  * string2TS
  */
-var string2TS = function (n) { return "'".concat(n.value, "'"); };
+const string2TS = (n) => `'${n.value}'`;
 exports.string2TS = string2TS;
 /**
  * number2TS
  */
-var number2TS = function (n) { return "".concat(parseFloat(n.value)); };
+const number2TS = (n) => `${parseFloat(n.value)}`;
 exports.number2TS = number2TS;
 /**
  * record2TS
  */
-var record2TS = function (ctx, n) {
-    return "{".concat(ctx.options.EOL, " \n      ").concat(n.properties.map(function (p) { return (0, exports.property2TS)(ctx, p); }).join(',' + ctx.options.EOL), "\n     }");
-};
+const record2TS = (ctx, n) => `{${ctx.options.EOL} 
+      ${n.properties.map(p => (0, exports.property2TS)(ctx, p)).join(',' + ctx.options.EOL)}
+     }`;
 exports.record2TS = record2TS;
 /**
  * list2TS
  */
-var list2TS = function (ctx, n) {
-    var mems = n.members.map(function (e) { return (0, exports.expression2TS)(ctx, e); });
-    return "[".concat(ctx.options.EOL, "\n            ").concat(mems.join(',' + ctx.options.EOL), "\n            ]");
+const list2TS = (ctx, n) => {
+    let mems = n.members.map(e => (0, exports.expression2TS)(ctx, e));
+    return `[${ctx.options.EOL}
+            ${mems.join(',' + ctx.options.EOL)}
+            ]`;
 };
 exports.list2TS = list2TS;
 /**
  * property2TS
  */
-var property2TS = function (ctx, n) {
-    return "'".concat((0, exports.key2TS)(n.key), "' : ").concat((0, exports.expression2TS)(ctx, n.value));
-};
+const property2TS = (ctx, n) => `'${(0, exports.key2TS)(n.key)}' : ${(0, exports.expression2TS)(ctx, n.value)}`;
 exports.property2TS = property2TS;
 /**
  * key2TS
  */
-var key2TS = function (n) {
-    return (n instanceof ast.StringLiteral) ? (0, exports.string2TS)(n) : (0, exports.identifier2TS)(n);
-};
+const key2TS = (n) => (n instanceof ast.StringLiteral) ? (0, exports.string2TS)(n) : (0, exports.identifier2TS)(n);
 exports.key2TS = key2TS;
 /**
  * contextProperty2TS
  */
-var contextProperty2TS = function (n) {
-    var member = (n.member instanceof ast.StringLiteral) ?
+const contextProperty2TS = (n) => {
+    let member = (n.member instanceof ast.StringLiteral) ?
         n.member.value :
         (0, exports.identifier2TS)(n.member);
-    return "".concat(exports.CONTEXT, ".").concat(member);
+    return `${exports.CONTEXT}.${member}`;
 };
 exports.contextProperty2TS = contextProperty2TS;
 /**
  * contextVariable2TS
  */
-var contextVariable2TS = function (_) { return "".concat(exports.CONTEXT); };
+const contextVariable2TS = (_) => `${exports.CONTEXT}`;
 exports.contextVariable2TS = contextVariable2TS;
 /**
  * identifierOrConstructor2TS
  */
-var identifierOrConstructor2TS = function (n) {
+const identifierOrConstructor2TS = (n) => {
     if ((n instanceof ast.UnqualifiedIdentifier) ||
         (n instanceof ast.QualifiedIdentifier))
         return (0, exports.identifier2TS)(n);
@@ -1184,7 +1093,7 @@ exports.identifierOrConstructor2TS = identifierOrConstructor2TS;
 /**
  * constructor2TS
  */
-var constructor2TS = function (n) {
+const constructor2TS = (n) => {
     if (n instanceof ast.QualifiedConstructor)
         return (0, exports.qualifiedConstructor2TS)(n);
     else if (n instanceof ast.UnqualifiedConstructor)
@@ -1196,21 +1105,17 @@ exports.constructor2TS = constructor2TS;
 /**
  * unqualifiedConstructor2TS
  */
-var unqualifiedConstructor2TS = function (n) {
-    return toPrim(n.value);
-};
+const unqualifiedConstructor2TS = (n) => toPrim(n.value);
 exports.unqualifiedConstructor2TS = unqualifiedConstructor2TS;
 /**
  * qualifiedConstructor
  */
-var qualifiedConstructor2TS = function (n) {
-    return "".concat(n.qualifier, ".").concat(n.member);
-};
+const qualifiedConstructor2TS = (n) => `${n.qualifier}.${n.member}`;
 exports.qualifiedConstructor2TS = qualifiedConstructor2TS;
 /**
  * identifier2TS
  */
-var identifier2TS = function (n) {
+const identifier2TS = (n) => {
     if (n instanceof ast.QualifiedIdentifier)
         return (0, exports.qualifiedIdentifier2TS)(n);
     else if (n instanceof ast.UnqualifiedIdentifier)
@@ -1222,16 +1127,12 @@ exports.identifier2TS = identifier2TS;
 /**
  * qualifiedIdentifier2TS
  */
-var qualifiedIdentifier2TS = function (n) {
-    return "".concat(n.qualifier, ".").concat(n.member);
-};
+const qualifiedIdentifier2TS = (n) => `${n.qualifier}.${n.member}`;
 exports.qualifiedIdentifier2TS = qualifiedIdentifier2TS;
 /**
  * unqualifiedIdentifier2TS
  */
-var unqualifiedIdentifier2TS = function (n) {
-    return "".concat(toPrim(n.value));
-};
+const unqualifiedIdentifier2TS = (n) => `${toPrim(n.value)}`;
 exports.unqualifiedIdentifier2TS = unqualifiedIdentifier2TS;
-var toPrim = function (id) { return prims.indexOf(id) > -1 ? id.toLowerCase() : id; };
+const toPrim = (id) => prims.indexOf(id) > -1 ? id.toLowerCase() : id;
 //# sourceMappingURL=codegen.js.map