@quenk/wml 2.13.3 → 2.13.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/dom.d.ts CHANGED
@@ -116,10 +116,6 @@ export declare class WMLDOMElement extends WMLDOMNode {
116
116
  * isBrowser is set to true if we detect a window and document global variable.
117
117
  */
118
118
  export declare const isBrowser: boolean;
119
- /**
120
- * escapeAttrs escapes each key value pair of a WMLDOMAttrs.
121
- */
122
- export declare const escapeAttrs: (attrs: WMLDOMAttrs) => Record<string | (<A, B>(a: A) => B)>;
123
119
  /**
124
120
  * escapeAttrValue for safe browser display.
125
121
  */
package/lib/dom.js CHANGED
@@ -8,7 +8,7 @@
8
8
  * suite.
9
9
  */
10
10
  Object.defineProperty(exports, "__esModule", { value: true });
11
- exports.createElement = exports.unsafe = exports.text = exports.createUnsafeNode = exports.createTextNode = exports.escapeHTML = exports.escapeAttrValue = exports.escapeAttrs = exports.isBrowser = exports.WMLDOMElement = exports.WMLDOMText = exports.WMLDOMNode = exports.WMLNodeList = void 0;
11
+ exports.createElement = exports.unsafe = exports.text = exports.createUnsafeNode = exports.createTextNode = exports.escapeHTML = exports.escapeAttrValue = exports.isBrowser = exports.WMLDOMElement = exports.WMLDOMText = exports.WMLDOMNode = exports.WMLNodeList = void 0;
12
12
  const record_1 = require("@quenk/noni/lib/data/record");
13
13
  const type_1 = require("@quenk/noni/lib/data/type");
14
14
  // Declared so isBrowser works on node.js.
@@ -199,8 +199,14 @@ class WMLDOMElement extends WMLDOMNode {
199
199
  get outerHTML() {
200
200
  let { tag } = this;
201
201
  let content = this.innerHTML;
202
- let attrs = (0, record_1.mapTo)((0, exports.escapeAttrs)(this.attrs), (value, name) => !value ?
203
- name : `${name}="${value}"`).join(' ');
202
+ let attrs = (0, record_1.mapTo)(this.attrs, (value, name) => {
203
+ if ((0, type_1.isObject)(value) && (value instanceof WMLDOMText))
204
+ return value.textContent;
205
+ else if ((0, type_1.isFunction)(value) || (0, type_1.isObject)(value) || (value == null))
206
+ return '';
207
+ else
208
+ return `${name}="${(0, exports.escapeAttrValue)(String(value))}"`;
209
+ }).join(' ');
204
210
  attrs = (attrs.trim() != '') ? ` ${attrs}` : '';
205
211
  let open = `<${tag}${attrs}>`;
206
212
  if (tag === "html")
@@ -221,13 +227,6 @@ exports.WMLDOMElement = WMLDOMElement;
221
227
  * isBrowser is set to true if we detect a window and document global variable.
222
228
  */
223
229
  exports.isBrowser = ((window != null) && (document != null));
224
- /**
225
- * escapeAttrs escapes each key value pair of a WMLDOMAttrs.
226
- */
227
- const escapeAttrs = (attrs) => (0, record_1.map)(attrs, value => (0, type_1.isFunction)(value) ? value :
228
- (value instanceof WMLDOMText) ? value.textContent :
229
- (0, exports.escapeAttrValue)(String(value)));
230
- exports.escapeAttrs = escapeAttrs;
231
230
  /**
232
231
  * escapeAttrValue for safe browser display.
233
232
  */
package/lib/dom.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dom.js","sourceRoot":"","sources":["dom.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dom.js","sourceRoot":"","sources":["dom.ts"],"names":[],"mappings":"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"}
package/lib/dom.ts CHANGED
@@ -7,8 +7,8 @@
7
7
  * suite.
8
8
  */
9
9
 
10
- import { Record, map, mapTo, forEach } from '@quenk/noni/lib/data/record';
11
- import { Type, isFunction } from '@quenk/noni/lib/data/type';
10
+ import { Record, mapTo, forEach } from '@quenk/noni/lib/data/record';
11
+ import { Type, isFunction, isObject } from '@quenk/noni/lib/data/type';
12
12
 
13
13
  // Declared so isBrowser works on node.js.
14
14
  let window: Type = global;
@@ -326,8 +326,16 @@ export class WMLDOMElement extends WMLDOMNode {
326
326
  let { tag } = this;
327
327
  let content = this.innerHTML;
328
328
 
329
- let attrs = mapTo(escapeAttrs(this.attrs), (value, name) => !value ?
330
- name : `${name}="${value}"`).join(' ');
329
+ let attrs = mapTo(this.attrs, (value, name) => {
330
+
331
+ if (isObject(value) && (value instanceof WMLDOMText))
332
+ return value.textContent;
333
+ else if (isFunction(value) || isObject(value) || (value == null))
334
+ return '';
335
+ else
336
+ return `${name}="${escapeAttrValue(String(value))}"`
337
+
338
+ }).join(' ');
331
339
 
332
340
  attrs = (attrs.trim() != '') ? ` ${attrs}` : '';
333
341
 
@@ -361,14 +369,6 @@ export class WMLDOMElement extends WMLDOMNode {
361
369
  */
362
370
  export const isBrowser = ((window != null) && (document != null));
363
371
 
364
- /**
365
- * escapeAttrs escapes each key value pair of a WMLDOMAttrs.
366
- */
367
- export const escapeAttrs = (attrs: WMLDOMAttrs) => map(attrs, value =>
368
- isFunction(value) ? value :
369
- (value instanceof WMLDOMText) ? value.textContent :
370
- escapeAttrValue(String(value)));
371
-
372
372
  /**
373
373
  * escapeAttrValue for safe browser display.
374
374
  */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@quenk/wml",
3
- "version": "2.13.3",
3
+ "version": "2.13.4",
4
4
  "description": "(WML) is a DSL for describing user interfaces in web applications.",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {