@quenk/wml 2.13.10 → 2.14.0

package/lib/compile/index.d.ts

@@ -1,5 +1,5 @@
-import { Except } from '@quenk/noni/lib/control/error';
-import { CodeGeneratorOptions } from './codegen';
+import { Except } from "@quenk/noni/lib/control/error";
+import { CodeGeneratorOptions } from "./codegen";
 /**
  * TypeScript output.
  */

package/lib/compile/index.js

@@ -6,13 +6,13 @@ const record_1 = require("@quenk/noni/lib/data/record");
 const parse_1 = require("../parse");
 const codegen_1 = require("./codegen");
 const defaultOptions = {
-    module: '@quenk/wml',
-    dom: '@quenk/wml/lib/dom',
-    EOL: os.EOL
+    module: "@quenk/wml",
+    dom: "@quenk/wml/lib/dom",
+    EOL: os.EOL,
 };
 /**
  * compile a string of WML text directly into typescript.
  */
-const compile = (src, opts = {}) => (0, parse_1.parse)(src).map(m => codegen_1.CodeGenerator.create((0, record_1.merge)(defaultOptions, opts)).generate(m));
+const compile = (src, opts = {}) => (0, parse_1.parse)(src).map((m) => codegen_1.CodeGenerator.create((0, record_1.merge)(defaultOptions, opts)).generate(m));
 exports.compile = compile;
 //# sourceMappingURL=index.js.map

package/lib/compile/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AAEzB,wDAAoD;AAGpD,oCAAiC;AACjC,uCAAgE;AAkBhE,MAAM,cAAc,GAAG;IAEnB,MAAM,EAAE,YAAY;IAEpB,GAAG,EAAE,oBAAoB;IAEzB,GAAG,EAAE,EAAE,CAAC,GAAG;CAEd,CAAA;AAED;;GAEG;AACI,MAAM,OAAO,GAAG,CAAC,GAAW,EAAE,OAAgB,EAAE,EAAkB,EAAE,CACvE,IAAA,aAAK,EAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACf,uBAAa,CAAC,MAAM,CAAC,IAAA,cAAK,EAAC,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AAF1D,QAAA,OAAO,WAEmD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AAEzB,wDAAoD;AAGpD,oCAAiC;AACjC,uCAAgE;AAgBhE,MAAM,cAAc,GAAG;IACrB,MAAM,EAAE,YAAY;IAEpB,GAAG,EAAE,oBAAoB;IAEzB,GAAG,EAAE,EAAE,CAAC,GAAG;CACZ,CAAC;AAEF;;GAEG;AACI,MAAM,OAAO,GAAG,CAAC,GAAW,EAAE,OAAgB,EAAE,EAAkB,EAAE,CACzE,IAAA,aAAK,EAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,uBAAa,CAAC,MAAM,CAAC,IAAA,cAAK,EAAC,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAC9D,CAAC;AAHS,QAAA,OAAO,WAGhB"}

package/lib/compile/index.ts

@@ -1,10 +1,10 @@
-import * as os from 'os';
+import * as os from "os";
 
-import { merge } from '@quenk/noni/lib/data/record';
-import { Except } from '@quenk/noni/lib/control/error';
+import { merge } from "@quenk/noni/lib/data/record";
+import { Except } from "@quenk/noni/lib/control/error";
 
-import { parse } from '../parse';
-import { CodeGenerator, CodeGeneratorOptions } from './codegen';
+import { parse } from "../parse";
+import { CodeGenerator, CodeGeneratorOptions } from "./codegen";
 
 /**
  * TypeScript output.
@@ -15,26 +15,23 @@ export type TypeScript = string;
  * Options for changing the behaviour of compilation.
  */
 export interface Options extends Partial<CodeGeneratorOptions> {
+  debug?: boolean;
 
-    debug?: boolean,
-
-    main?: string,
-
+  main?: string;
 }
 
 const defaultOptions = {
+  module: "@quenk/wml",
 
-    module: '@quenk/wml',
-
-    dom: '@quenk/wml/lib/dom',
+  dom: "@quenk/wml/lib/dom",
 
-    EOL: os.EOL
-
-}
+  EOL: os.EOL,
+};
 
 /**
  * compile a string of WML text directly into typescript.
  */
 export const compile = (src: string, opts: Options = {}): Except<string> =>
-    parse(src).map(m =>
-        CodeGenerator.create(merge(defaultOptions, opts)).generate(m));
+  parse(src).map((m) =>
+    CodeGenerator.create(merge(defaultOptions, opts)).generate(m),
+  );

package/lib/compile/transform.d.ts

@@ -1,4 +1,4 @@
-import * as ast from '../parse/ast';
+import * as ast from "../parse/ast";
 /**
  * rewriteViewContext normalizes the various forms of the context declaration
  * in a view statement.
@@ -7,14 +7,16 @@ import * as ast from '../parse/ast';
  * <view-type>Context, imports are included in the module's import list.
  */
 export declare const rewriteViewStatementContext: (tree: ast.Module, node: ast.ViewStatement) => ast.Export[];
+export declare const TAG_NAME_SVG = "svg";
 /**
- * tagXMLNamespaces detects the "xmlns" attribute on DOM nodes and copies them
- * to the `wml:ns` attribute recursively.
+ * tagSVGNodes traverses the tree to detect any embedded svg.
  *
- * This has the effect of ensuring nodes are created using createElementNS()
- * instead of createElement in the browser.
+ * If an svg parent tag is found, it and all its children will receive a
+ * wml:ns=svg attribute. This will cause the runtime to use createElementNS()
+ * instead of createElement, allowing the svg document to be treated as SVG
+ * and not HTML DOM.
  */
-export declare const tagXMLNamespaces: (tag: ast.Tag | ast.Widget, parentAttr?: ast.Attribute) => ast.Tag;
+export declare const tagSVGNodes: (tag: ast.Tag) => ast.Tag;
 /**
  * transformTree applies all the needed transforms to the AST before
  * compilation.

package/lib/compile/transform.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformTree = exports.tagXMLNamespaces = exports.rewriteViewStatementContext = void 0;
+exports.transformTree = exports.tagSVGNodes = exports.TAG_NAME_SVG = exports.rewriteViewStatementContext = void 0;
 const ast = require("../parse/ast");
+const codegen_1 = require("./codegen");
 /**
  * rewriteViewContext normalizes the various forms of the context declaration
  * in a view statement.
@@ -21,11 +22,9 @@ const rewriteViewStatementContext = (tree, node) => {
     else if (node.context instanceof ast.ContextFromStatement) {
         let { context } = node;
         let { location } = context;
-        tree.imports.push(new ast.ImportStatement(new ast.CompositeMember([
-            context.cons.id
-        ], location), context.module, location));
+        tree.imports.push(new ast.ImportStatement(new ast.CompositeMember([context.cons.id], location), context.module, location));
         return [
-            new ast.ViewStatement(node.id, node.typeParameters, context.cons, node.directives, node.root, node.location)
+            new ast.ViewStatement(node.id, node.typeParameters, context.cons, node.directives, node.root, node.location),
         ];
     }
     else {
@@ -33,24 +32,53 @@ const rewriteViewStatementContext = (tree, node) => {
     }
 };
 exports.rewriteViewStatementContext = rewriteViewStatementContext;
+exports.TAG_NAME_SVG = "svg";
 /**
- * tagXMLNamespaces detects the "xmlns" attribute on DOM nodes and copies them
- * to the `wml:ns` attribute recursively.
+ * tagSVGNodes traverses the tree to detect any embedded svg.
  *
- * This has the effect of ensuring nodes are created using createElementNS()
- * instead of createElement in the browser.
+ * If an svg parent tag is found, it and all its children will receive a
+ * wml:ns=svg attribute. This will cause the runtime to use createElementNS()
+ * instead of createElement, allowing the svg document to be treated as SVG
+ * and not HTML DOM.
  */
-const tagXMLNamespaces = (tag, parentAttr) => {
-    let attr = (tag.attributes.find(attr => (attr.namespace.value == '') && (attr.name.value === 'xmlns'))) ||
-        parentAttr;
-    if (attr) {
-        tag.attributes.push(new ast.Attribute(new ast.UnqualifiedIdentifier('wml', attr.location), new ast.UnqualifiedIdentifier('ns', attr.location), attr.value, attr.location));
+const tagSVGNodes = (tag) => {
+    let pending = [[false, [tag]]];
+    while (pending.length) {
+        let [isSvg, stack] = pending.pop();
+        while (stack.length) {
+            let next = stack.pop();
+            if (next instanceof ast.Node &&
+                (0, codegen_1.identifierOrConstructor2TS)(next.open) === exports.TAG_NAME_SVG &&
+                !isSvg) {
+                pending.push([true, [next]]);
+                break;
+            }
+            let childrens = [];
+            if (next instanceof ast.Node) {
+                if (isSvg)
+                    next.attributes.push(new ast.Attribute(new ast.UnqualifiedIdentifier("wml", {}), new ast.UnqualifiedIdentifier("ns", {}), new ast.StringLiteral("svg", {}), {}));
+                childrens.push(next.children);
+            }
+            else if (next instanceof ast.Widget || next instanceof ast.ElseClause) {
+                childrens.push(next.children);
+            }
+            else if (next instanceof ast.ForOfStatement) {
+                childrens.push(next.body, next.otherwise);
+            }
+            else if (next instanceof ast.IfStatement ||
+                next instanceof ast.ElseIfClause) {
+                childrens.push(next.then);
+                if (next.elseClause)
+                    childrens.push([next.elseClause]);
+            }
+            for (let children of childrens)
+                for (let child of children)
+                    stack.push(child);
+        }
     }
-    tag.children = tag.children.map(child => ((child instanceof ast.Node) || (child instanceof ast.Widget)) ?
-        (0, exports.tagXMLNamespaces)(child, attr) : child);
     return tag;
 };
-exports.tagXMLNamespaces = tagXMLNamespaces;
+exports.tagSVGNodes = tagSVGNodes;
 /**
  * transformTree applies all the needed transforms to the AST before
  * compilation.
@@ -59,7 +87,7 @@ const transformTree = (tree) => {
     let newTree = tree.clone(); // Try not to modify what we don't own.
     newTree.exports = tree.exports.reduce((prev, next) => {
         if (next instanceof ast.ViewStatement) {
-            next.root = (0, exports.tagXMLNamespaces)(next.root);
+            next.root = (0, exports.tagSVGNodes)(next.root);
             return [...prev, ...(0, exports.rewriteViewStatementContext)(newTree, next)];
         }
         else {

package/lib/compile/transform.js.map

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

package/lib/compile/transform.ts

@@ -1,133 +1,156 @@
-import * as ast from '../parse/ast';
+import * as ast from "../parse/ast";
+import { identifierOrConstructor2TS } from "./codegen";
 
 /**
  * rewriteViewContext normalizes the various forms of the context declaration
  * in a view statement.
  *
- * "where" clauses are turned into context declarations with id 
+ * "where" clauses are turned into context declarations with id
  * <view-type>Context, imports are included in the module's import list.
  */
-export const rewriteViewStatementContext =
-    (tree: ast.Module, node: ast.ViewStatement): ast.Export[] => {
-
-        if (Array.isArray(node.context)) {
-
-            // TODO: Is this branch still needed?
-
-            let contextName = `${node.id.value}Context`;
-
-            let context = new ast.ContextStatement(
-                new ast.UnqualifiedIdentifier(contextName, node.id.location),
-                node.typeParameters,
-                node.context,
-                node.location
-            );
-
-            let consType = new ast.ConstructorType(
-                context.id,
-                context.typeParameters,
-                context.location
-            );
-
-            let view = new ast.ViewStatement(
-                node.id,
-                node.typeParameters,
-                consType,
-                node.directives,
-                node.root,
-                node.location
-            );
-
-            return [context, view];
-
-        } else if (node.context instanceof ast.ContextFromStatement) {
-
-            let { context } = node;
-
-            let { location } = context;
-
-            tree.imports.push(new ast.ImportStatement(
-                new ast.CompositeMember([
-                    <ast.UnqualifiedConstructor>context.cons.id], location),
-                context.module,
-                location
-            ));
-
-            return [
-                new ast.ViewStatement(
-                    node.id,
-                    node.typeParameters,
-                    context.cons,
-                    node.directives,
-                    node.root,
-                    node.location
-                )
-            ];
-
-        } else {
-
-            return [node];
-
-        }
-
-    }
+export const rewriteViewStatementContext = (
+  tree: ast.Module,
+  node: ast.ViewStatement,
+): ast.Export[] => {
+  if (Array.isArray(node.context)) {
+    // TODO: Is this branch still needed?
+
+    let contextName = `${node.id.value}Context`;
+
+    let context = new ast.ContextStatement(
+      new ast.UnqualifiedIdentifier(contextName, node.id.location),
+      node.typeParameters,
+      node.context,
+      node.location,
+    );
+
+    let consType = new ast.ConstructorType(
+      context.id,
+      context.typeParameters,
+      context.location,
+    );
+
+    let view = new ast.ViewStatement(
+      node.id,
+      node.typeParameters,
+      consType,
+      node.directives,
+      node.root,
+      node.location,
+    );
+
+    return [context, view];
+  } else if (node.context instanceof ast.ContextFromStatement) {
+    let { context } = node;
+
+    let { location } = context;
+
+    tree.imports.push(
+      new ast.ImportStatement(
+        new ast.CompositeMember(
+          [<ast.UnqualifiedConstructor>context.cons.id],
+          location,
+        ),
+        context.module,
+        location,
+      ),
+    );
+
+    return [
+      new ast.ViewStatement(
+        node.id,
+        node.typeParameters,
+        context.cons,
+        node.directives,
+        node.root,
+        node.location,
+      ),
+    ];
+  } else {
+    return [node];
+  }
+};
+
+export const TAG_NAME_SVG = "svg";
 
 /**
- * tagXMLNamespaces detects the "xmlns" attribute on DOM nodes and copies them
- * to the `wml:ns` attribute recursively.
+ * tagSVGNodes traverses the tree to detect any embedded svg.
  *
- * This has the effect of ensuring nodes are created using createElementNS()
- * instead of createElement in the browser.
+ * If an svg parent tag is found, it and all its children will receive a
+ * wml:ns=svg attribute. This will cause the runtime to use createElementNS()
+ * instead of createElement, allowing the svg document to be treated as SVG
+ * and not HTML DOM.
  */
-export const tagXMLNamespaces =
-    (tag: ast.Tag | ast.Widget, parentAttr?: ast.Attribute) => {
-
-        let attr = (tag.attributes.find(attr =>
-            (attr.namespace.value == '') && (attr.name.value === 'xmlns'))) ||
-            parentAttr;
-
-        if (attr) {
-
-            tag.attributes.push(new ast.Attribute(
-                new ast.UnqualifiedIdentifier('wml', attr.location),
-                new ast.UnqualifiedIdentifier('ns', attr.location),
-                attr.value,
-                attr.location
-            ));
-
-        }
-
-        tag.children = tag.children.map(child =>
-            ((child instanceof ast.Node) || (child instanceof ast.Widget)) ?
-                tagXMLNamespaces(child, attr) : child);
-
-        return tag;
-
+export const tagSVGNodes = (tag: ast.Tag) => {
+  let pending: [boolean, object[]][] = [[false, [tag]]];
+
+  while (pending.length) {
+    let [isSvg, stack] = <[boolean, object[]]>pending.pop();
+
+    while (stack.length) {
+      let next = stack.pop();
+
+      if (
+        next instanceof ast.Node &&
+        identifierOrConstructor2TS(next.open) === TAG_NAME_SVG &&
+        !isSvg
+      ) {
+        pending.push([true, [next]]);
+        break;
+      }
+
+      let childrens = [];
+      if (next instanceof ast.Node) {
+        if (isSvg)
+          next.attributes.push(
+            new ast.Attribute(
+              new ast.UnqualifiedIdentifier("wml", {}),
+              new ast.UnqualifiedIdentifier("ns", {}),
+              new ast.StringLiteral("svg", {}),
+              {},
+            ),
+          );
+
+        childrens.push(next.children);
+      } else if (next instanceof ast.Widget || next instanceof ast.ElseClause) {
+        childrens.push(next.children);
+      } else if (next instanceof ast.ForOfStatement) {
+        childrens.push(next.body, next.otherwise);
+      } else if (
+        next instanceof ast.IfStatement ||
+        next instanceof ast.ElseIfClause
+      ) {
+        childrens.push(next.then);
+        if (next.elseClause) childrens.push([next.elseClause]);
+      }
+
+      for (let children of childrens)
+        for (let child of children) stack.push(child);
     }
+  }
+
+  return tag;
+};
 
 /**
- * transformTree applies all the needed transforms to the AST before 
+ * transformTree applies all the needed transforms to the AST before
  * compilation.
  */
 export const transformTree = (tree: ast.Module) => {
-
-    let newTree = tree.clone(); // Try not to modify what we don't own.
-
-    newTree.exports = tree.exports.reduce((prev, next) => {
-
-        if (next instanceof ast.ViewStatement) {
-
-            next.root = tagXMLNamespaces(next.root);
-
-            return [...prev, ...rewriteViewStatementContext(newTree, next)]
-
-        } else {
-
-            return [...prev, next]
-
-        }
-    }, <ast.Export[]>[]);
-
-    return newTree;
-
-}
+  let newTree = tree.clone(); // Try not to modify what we don't own.
+
+  newTree.exports = tree.exports.reduce(
+    (prev, next) => {
+      if (next instanceof ast.ViewStatement) {
+        next.root = tagSVGNodes(next.root);
+
+        return [...prev, ...rewriteViewStatementContext(newTree, next)];
+      } else {
+        return [...prev, next];
+      }
+    },
+    <ast.Export[]>[],
+  );
+
+  return newTree;
+};

package/lib/{dom.d.ts → dom/index.d.ts}

@@ -6,8 +6,8 @@
  * we can detect whether we are in a browser or elsewhere and adjust to
  * suite.
  */
-import { Record } from '@quenk/noni/lib/data/record';
-import { Type } from '@quenk/noni/lib/data/type';
+import { Record } from "@quenk/noni/lib/data/record";
+import { Type } from "@quenk/noni/lib/data/type";
 /**
  * WMLDOMAttrs is a record of attributes bound for a WMLDOMElement.
  */
@@ -18,6 +18,11 @@ export interface WMLDOMAttrs extends Record<string | number | Function> {
  * @private
  */
 export declare class WMLNodeList implements NodeListOf<WMLDOMNode> {
+    entries(): ArrayIterator<[number, WMLDOMNode]>;
+    keys(): ArrayIterator<number>;
+    values(): ArrayIterator<WMLDOMNode>;
+    [Symbol.iterator](): ArrayIterator<WMLDOMNode>;
+    [Symbol.dispose](): void;
     [index: number]: WMLDOMNode;
     length: number;
     item(): WMLDOMNode;
@@ -65,6 +70,7 @@ export declare class WMLDOMNode implements Node {
     parentNode: null;
     previousSibling: null;
     get textContent(): string;
+    [Symbol.dispose](): void;
     addEventListener(): void;
     dispatchEvent(): boolean;
     removeEventListener(): void;