@angular-wave/angular.ts 0.0.45 → 0.0.46

package/src/shared/jqlite/jqlite.js

@@ -10,7 +10,7 @@ import {
   isString,
   isUndefined,
   lowercase,
-  nodeName_,
+  getNodeName,
   shallowCopy,
 } from "../../shared/utils";
 import { CACHE, EXPANDO } from "../../core/cache/cache";
@@ -261,7 +261,7 @@ JQLite.prototype.injector = function () {
  */
 JQLite.prototype.on = function (type, fn) {
   // Do not add event handlers to non-elements because they will not be cleaned up.
-  for (let i = 0, ii = this.length; i < ii; i++) {
+  for (let i = 0; i < this.length; i++) {
     const element = this[i];
     if (!elementAcceptsData(element)) {
       return;
@@ -311,7 +311,7 @@ JQLite.prototype.on = function (type, fn) {
  * @returns {JQLite}
  */
 JQLite.prototype.off = function (type, fn) {
-  for (let i = 0, ii = this.length; i < ii; i++) {
+  for (let i = 0; i < this.length; i++) {
     const element = this[i];
     const expandoStore = getExpando(element);
     const events = expandoStore && expandoStore.events;
@@ -357,7 +357,7 @@ JQLite.prototype.off = function (type, fn) {
  * @returns {JQLite}
  */
 JQLite.prototype.removeData = function (name) {
-  for (let i = 0, ii = this.length; i < ii; i++) {
+  for (let i = 0; i < this.length; i++) {
     const element = this[i];
     removeElementData(element, name);
   }
@@ -371,7 +371,7 @@ JQLite.prototype.removeData = function (name) {
  * @returns {JQLite|any}
  */
 JQLite.prototype.inheritedData = function (name, value) {
-  for (let i = 0, ii = this.length; i < ii; i++) {
+  for (let i = 0; i < this.length; i++) {
     const element = this[0];
     let res = getInheritedData(element, name, value);
     if (value) {
@@ -398,124 +398,145 @@ JQLite.prototype.html = function (value) {
   return this;
 };
 
-/// ///////////////////////////////////////
-// Functions iterating getter/setters.
-// these functions return self on setter and
-// value on get.
-/// ///////////////////////////////////////
-forEach(
-  {
-    data: getOrSetCacheData,
-    attr(element, name, value) {
-      let ret;
+/**
+ * Get the combined text contents of each element in the JQLite collection
+ * or set the text contents of all elements.
+ * @param {string} [value]
+ * @returns {JQLite|string}
+ */
+JQLite.prototype.text = function (value) {
+  let res = "";
+  for (let i = 0; i < this.length; i++) {
+    const element = this[i];
+    if (isUndefined(value)) {
+      // read
       const { nodeType } = element;
-      if (
-        nodeType === Node.TEXT_NODE ||
-        nodeType === Node.ATTRIBUTE_NODE ||
-        nodeType === Node.COMMENT_NODE ||
-        !element.getAttribute
-      ) {
-        return;
-      }
+      res +=
+        nodeType === Node.ELEMENT_NODE || nodeType === Node.TEXT_NODE
+          ? element.textContent
+          : "";
+    } else {
+      // write
+      element.textContent = value;
+    }
+  }
 
-      const lowercasedName = lowercase(name);
-      const isBooleanAttr = BOOLEAN_ATTR[lowercasedName];
+  if (isUndefined(value)) {
+    return res;
+  } else {
+    return this;
+  }
+};
 
-      if (isDefined(value)) {
-        // setter
+/**
+ * Gets or sets the values of form elements such as input, select and textarea in a JQLite collection.
+ * @param {any} value
+ * @returns {JQLite|any}
+ */
+JQLite.prototype.val = function (value) {
+  // We can only get or set a value of
+  for (let i = 0; i < this.length; i++) {
+    const element = this[i];
+    if (isUndefined(value)) {
+      // read
+      if (element.multiple && getNodeName(element) === "select") {
+        const result = [];
+        forEach(element.options, (option) => {
+          if (option.selected) {
+            result.push(option.value || option.text);
+          }
+        });
+        return result;
+      }
+      return element.value;
+    } else {
+      // write
+      element.value = value;
+      return this;
+    }
+  }
+};
 
-        if (value === null || (value === false && isBooleanAttr)) {
-          element.removeAttribute(name);
-        } else {
-          element.setAttribute(name, isBooleanAttr ? lowercasedName : value);
-        }
-      } else {
-        // getter
+/**
+ * @param {string|Object} name
+ * @param {any} value
+ * @returns
+ */
+JQLite.prototype.attr = function (name, value) {
+  for (let i = 0; i < this.length; i++) {
+    const element = this[i];
+    let ret;
+    const { nodeType } = element;
+    if (
+      nodeType === Node.TEXT_NODE ||
+      nodeType === Node.ATTRIBUTE_NODE ||
+      nodeType === Node.COMMENT_NODE ||
+      !element.getAttribute
+    ) {
+      continue;
+    }
 
-        ret = element.getAttribute(name);
+    const lowercasedName = lowercase(name);
+    const isBooleanAttr = BOOLEAN_ATTR[lowercasedName];
 
-        if (isBooleanAttr && ret !== null) {
-          ret = lowercasedName;
-        }
-        // Normalize non-existing attributes to undefined (as jQuery).
-        return ret === null ? undefined : ret;
+    if (isObject(name)) {
+      for (let key in name) {
+        element.setAttribute(key, isBooleanAttr ? lowercasedName : name[key]);
       }
-    },
-    text: (function () {
-      getText.$dv = "";
-      return getText;
+    } else if (isDefined(value)) {
+      // setter
 
-      function getText(element, value) {
-        if (isUndefined(value)) {
-          const { nodeType } = element;
-          return nodeType === Node.ELEMENT_NODE || nodeType === Node.TEXT_NODE
-            ? element.textContent
-            : "";
-        }
-        element.textContent = value;
-      }
-    })(),
-    val(element, value) {
-      if (isUndefined(value)) {
-        if (element.multiple && nodeName_(element) === "select") {
-          const result = [];
-          forEach(element.options, (option) => {
-            if (option.selected) {
-              result.push(option.value || option.text);
-            }
-          });
-          return result;
-        }
-        return element.value;
+      if (value === null || (value === false && isBooleanAttr)) {
+        element.removeAttribute(name);
+      } else {
+        element.setAttribute(name, isBooleanAttr ? lowercasedName : value);
       }
-      element.value = value;
-    },
-  },
-  (fn, name) => {
-    /**
-     * Properties: writes return selection, reads return first value
-     */
-    JQLite.prototype[name] = function (arg1, arg2) {
-      let i;
-      let key;
-      const nodeCount = this.length;
-
-      // JQLiteEmpty takes no arguments but is a setter.
-      if (isUndefined(fn.length === 2 && fn !== getController ? arg1 : arg2)) {
-        if (isObject(arg1)) {
-          // we are a write, but the object properties are the key/values
-          for (i = 0; i < nodeCount; i++) {
-            if (fn === getOrSetCacheData) {
-              fn(this[i], arg1);
-            } else {
-              for (key in arg1) {
-                fn(this[i], key, arg1[key]);
-              }
-            }
-          }
-          // return self for chaining
-          return this;
-        }
-        // we are a read, so read the first child.
-        // TODO: do we still need this?
-        let value = fn.$dv;
-        // Only if we have $dv do we iterate over all, otherwise it is just the first element.
-        const jj = isUndefined(value) ? Math.min(nodeCount, 1) : nodeCount;
-        for (let j = 0; j < jj; j++) {
-          const nodeValue = fn(this[j], arg1, arg2);
-          value = value ? value + nodeValue : nodeValue;
-        }
-        return value;
+    } else {
+      // getter
+      ret = element.getAttribute(name);
+      if (isBooleanAttr && ret !== null) {
+        ret = lowercasedName;
       }
-      // we are a write, so apply to all children
+      // Normalize non-existing attributes to undefined (as jQuery).
+      return ret === null ? undefined : ret;
+    }
+  }
+
+  if (isDefined(value) || isObject(name)) {
+    return this;
+  }
+};
+
+/**
+ * @param {string|any} key - The key (as a string) to get/set or an object for mass-setting.
+ * @param {any} [value] - The value to set. If not provided, the function acts as a getter.
+ * @returns {JQLite|any} - The retrieved data if acting as a getter. Otherwise, returns undefined.
+ */
+JQLite.prototype.data = function (key, value) {
+  let i;
+  const nodeCount = this.length;
+  if (isUndefined(value)) {
+    if (isObject(key)) {
+      // we are a write, but the object properties are the key/values
       for (i = 0; i < nodeCount; i++) {
-        fn(this[i], arg1, arg2);
+        getOrSetCacheData(this[i], key);
       }
-      // return self for chaining
       return this;
-    };
-  },
-);
+    }
+    // we are a read, so read the first child.
+    const jj = isUndefined(value) ? Math.min(nodeCount, 1) : nodeCount;
+    for (let j = 0; j < jj; j++) {
+      const nodeValue = getOrSetCacheData(this[j], key, value);
+      value = value ? value + nodeValue : nodeValue;
+    }
+    return value;
+  }
+  // we are a write, so apply to all children
+  for (i = 0; i < nodeCount; i++) {
+    getOrSetCacheData(this[i], key, value);
+  }
+  return this;
+};
 
 /// ///////////////////////////////////////
 // Functions iterating traversal.
@@ -955,7 +976,7 @@ function getController(element, name) {
 /**
  *
  * @param {Element} element
- * @param {string} name
+ * @param {string|string[]} name
  * @param {any} [value]
  * @returns
  */
@@ -1136,13 +1157,13 @@ export function getBooleanAttrName(element, name) {
   const booleanAttr = BOOLEAN_ATTR[name.toLowerCase()];
 
   // booleanAttr is here twice to minimize DOM access
-  return booleanAttr && BOOLEAN_ELEMENTS[nodeName_(element)] && booleanAttr;
+  return booleanAttr && BOOLEAN_ELEMENTS[getNodeName(element)] && booleanAttr;
 }
 
 /**
  * Takes an array of elements, calls any `$destroy` event handlers, removes any data in cache, and finally removes any
  * listeners.
- * @param {NodeListOf<Element>} nodes
+ * @param {NodeListOf<Element>|Element[]} nodes
  */
 export function cleanElementData(nodes) {
   for (let i = 0, ii = nodes.length; i < ii; i++) {

package/src/shared/jqlite/jqlite.spec.js

@@ -757,7 +757,6 @@ describe("jqLite", () => {
       expect(selector.attr("prop", "value")).toEqual(selector);
       expect(JQLite(a).attr("prop")).toEqual("value");
       expect(JQLite(b).attr("prop")).toEqual("value");
-
       expect(selector.attr({ prop: "new value" })).toEqual(selector);
       expect(JQLite(a).attr("prop")).toEqual("new value");
       expect(JQLite(b).attr("prop")).toEqual("new value");

package/src/shared/utils.js

@@ -594,8 +594,19 @@ export function isElement(node) {
   ); // We have an on and find method part of jQuery API.
 }
 
-export function nodeName_(element) {
-  return lowercase(element.nodeName || (element[0] && element[0].nodeName));
+/**
+ * Returns a string appropriate for the type of node.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Node/nodeName)
+ *
+ * @param {JQLite|Element} element
+ * @returns
+ */
+export function getNodeName(element) {
+  return lowercase(
+    /** @type {Element} */ (element).nodeName ||
+      (element[0] && element[0].nodeName),
+  );
 }
 
 export function includes(array, obj) {

package/types/shared/jqlite/jqlite.d.ts

@@ -76,6 +76,31 @@ export class JQLite {
      * @returns {JQLite|any|undefined}
      */
     html(value: string): JQLite | any | undefined;
+    /**
+     * Get the combined text contents of each element in the JQLite collection
+     * or set the text contents of all elements.
+     * @param {string} [value]
+     * @returns {JQLite|string}
+     */
+    text(value?: string): JQLite | string;
+    /**
+     * Gets or sets the values of form elements such as input, select and textarea in a JQLite collection.
+     * @param {any} value
+     * @returns {JQLite|any}
+     */
+    val(value: any): JQLite | any;
+    /**
+     * @param {string|Object} name
+     * @param {any} value
+     * @returns
+     */
+    attr(name: string | any, value: any): any;
+    /**
+     * @param {string|any} key - The key (as a string) to get/set or an object for mass-setting.
+     * @param {any} [value] - The value to set. If not provided, the function acts as a getter.
+     * @returns {JQLite|any} - The retrieved data if acting as a getter. Otherwise, returns undefined.
+     */
+    data(key: string | any, value?: any): JQLite | any;
     toString(): string;
     eq(index: any): JQLite;
     length: number;
@@ -147,7 +172,7 @@ export function getBooleanAttrName(element: any, name: any): any;
 /**
  * Takes an array of elements, calls any `$destroy` event handlers, removes any data in cache, and finally removes any
  * listeners.
- * @param {NodeListOf<Element>} nodes
+ * @param {NodeListOf<Element>|Element[]} nodes
  */
-export function cleanElementData(nodes: NodeListOf<Element>): void;
+export function cleanElementData(nodes: NodeListOf<Element> | Element[]): void;
 export const BOOLEAN_ATTR: {};

package/types/shared/utils.d.ts

@@ -344,7 +344,15 @@ export function hasCustomToString(obj: any): boolean;
  * @returns {boolean} True if `value` is a DOM element (or wrapped jQuery element).
  */
 export function isElement(node: any): boolean;
-export function nodeName_(element: any): string;
+/**
+ * Returns a string appropriate for the type of node.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Node/nodeName)
+ *
+ * @param {JQLite|Element} element
+ * @returns
+ */
+export function getNodeName(element: JQLite | Element): string;
 export function includes(array: any, obj: any): boolean;
 /**
  * Removes the first occurrence of a specified value from an array.