@tko/utils 4.0.0-beta1.3 → 4.0.0

package/helpers/jasmine-13-helper.ts

@@ -1,207 +1,258 @@
+/// <reference types="jasmine" />
+
+import jQuery from 'jquery'
+window.jQuery = jQuery
+
 /*
  * Configure the Jasmine testing framework.
  */
- /* globals runs, waitsFor, jasmine */
-
-import {
-  arrayMap, arrayFilter, ieVersion, selectExtensions, hasOwnProperty
-} from '../dist/'
+/* globals runs, waitsFor, jasmine */
 
+import { arrayMap, arrayFilter, selectExtensions, hasOwnProperty, options } from '../dist/'
 
-window.DEBUG = true;
-window.amdRequire = window.require;
+window.DEBUG = true
+window.amdRequire = window.require
 
-// Use a different variable name (not 'jQuery') to avoid overwriting
-// window.jQuery with 'undefined' on IE < 9
-window.jQueryInstance = window.jQuery;
-
-// export var testNode;
-jasmine.updateInterval = 500;
+jasmine.updateInterval = 500
 
 /*
     Some helper functions for jasmine on the browser
  */
-jasmine.resolve = function (promise) {
+jasmine.resolve = function (promise: Promise<boolean>) {
   let complete = false
-  runs(() => promise.then((result) => { complete = result || true }))
+  runs(() =>
+    promise.then(result => {
+      complete = result || true
+    })
+  )
   waitsFor(() => complete)
 }
 
-jasmine.prepareTestNode = function() {
-    // The bindings specs make frequent use of this utility function to set up
-    // a clean new DOM node they can execute code against
-    var existingNode = document.getElementById("testNode");
-    if (existingNode !== null)
-        existingNode.parentNode.removeChild(existingNode);
-    window.testNode = document.createElement("div");
-    window.testNode.id = "testNode";
-    document.body.appendChild(window.testNode);
-};
+jasmine.prepareTestNode = function (): HTMLElement {
+  // The bindings specs make frequent use of this utility function to set up
+  // a clean new DOM node they can execute code against
+  const existingNode = document.getElementById('testNode')
+  if (existingNode !== null && existingNode.parentNode) existingNode.parentNode.removeChild(existingNode)
+  const testNode = document.createElement('div')
+  testNode.id = 'testNode'
+  document.body.appendChild(testNode)
 
-jasmine.Clock.mockScheduler = function (callback) {
-    setTimeout(callback, 0);
-};
+  return testNode
+}
 
+jasmine.Clock.mockScheduler = function (callback) {
+  setTimeout(callback, 0)
+}
 
 export function useMockForTasks(options) {
-    jasmine.Clock.useMock();
+  jasmine.Clock.useMock()
 
-    // Make sure tasks is using setTimeout so that it uses the mock clock
-    if (options.taskScheduler != jasmine.Clock.mockScheduler) {
-        jasmine.getEnv().currentSpec.restoreAfter(options, 'taskScheduler');
-        options.taskScheduler = jasmine.Clock.mockScheduler;
-    }
+  // Make sure tasks is using setTimeout so that it uses the mock clock
+  if (options.taskScheduler != jasmine.Clock.mockScheduler) {
+    jasmine.getEnv().currentSpec.restoreAfter(options, 'taskScheduler')
+    options.taskScheduler = jasmine.Clock.mockScheduler
+  }
+}
+
+jasmine.Spec.prototype.restoreAfter = function (object, propertyName) {
+  const originalValue = object[propertyName]
+  this.after(function () {
+    object[propertyName] = originalValue
+  })
 }
 
-jasmine.Spec.prototype.restoreAfter = function(object, propertyName) {
-    var originalValue = object[propertyName];
-    this.after(function() {
-        object[propertyName] = originalValue;
-    });
-};
+jasmine.nodeText = function (node) {
+  return node.nodeType === Node.TEXT_NODE ? node.data : 'textContent' in node ? node.textContent : node.innerText
+}
 
-jasmine.nodeText = function(node) {
-    return node.nodeType == 3 ? node.data : 'textContent' in node ? node.textContent : node.innerText;
-};
+jasmine.browserSupportsProtoAssignment = { __proto__: [] } instanceof Array
 
-jasmine.browserSupportsProtoAssignment = { __proto__: [] } instanceof Array;
+jasmine.setNodeText = function (node, text: string) {
+  if ('textContent' in node) {
+    node.textContent = text
+  } else {
+    node.innerText = text
+  }
+}
 
+function cleanedHtml(node) {
+  let cleanedHtml = node.innerHTML.toLowerCase().replace(/\r\n/g, '')
+  // IE < 9 strips whitespace immediately following comment nodes. Normalize by doing the same on all browsers.
+  cleanedHtml = cleanedHtml.replace(/(<!--.*?-->)\s*/g, '$1')
+  // Also remove __ko__ expando properties (for DOM data) - most browsers hide these anyway but IE < 9 includes them in innerHTML
+  cleanedHtml = cleanedHtml.replace(/ __ko__\d+=\"(ko\d+|null)\"/g, '')
+  return cleanedHtml
+}
 
-jasmine.ieVersion = ieVersion;
 /*
     Custom Matchers
     ~~~~~~~~~~~~~~~
  */
-var matchers = {
+const matchers = {
+  toHaveNodeTypes(expectedTypes) {
+    const values = arrayMap(this.actual, function (node) {
+      return node.nodeType
+    })
+    this.actual = values // Fix explanatory message
+    return this.env.equals_(values, expectedTypes)
+  },
 
-  toContainText (expectedText, ignoreSpaces) {
-      if (ignoreSpaces) {
-          expectedText = expectedText.replace(/\s/g, "");
-      }
+  toContainHtmlElementsAndText(expectedHtml) {
+    this.actual = cleanedHtml(this.actual).replace(/<!--.+?-->/g, '') // remove comments
+    return this.actual === expectedHtml
+  },
 
-      var actualText = jasmine.nodeText(this.actual);
-      var cleanedActualText = actualText.replace(/\r\n/g, "\n");
-      if (ignoreSpaces) {
-          cleanedActualText = cleanedActualText.replace(/\s/g, "");
-      }
+  toContainText(expectedText, ignoreSpaces) {
+    if (ignoreSpaces) {
+      expectedText = expectedText.replace(/\s/g, '')
+    }
 
-      this.actual = cleanedActualText;    // Fix explanatory message
-      return cleanedActualText === expectedText;
+    const actualText = jasmine.nodeText(this.actual)
+    let cleanedActualText = actualText.replace(/\r\n/g, '\n')
+    if (ignoreSpaces) {
+      cleanedActualText = cleanedActualText.replace(/\s/g, '')
+    }
+
+    this.actual = cleanedActualText // Fix explanatory message
+    return cleanedActualText === expectedText
   },
 
-  toHaveOwnProperties (expectedProperties) {
-      var ownProperties = [];
-      for (var prop in this.actual) {
-          if (hasOwnProperty(this.actual, prop)) {
-              ownProperties.push(prop);
-          }
+  toHaveOwnProperties(expectedProperties) {
+    const ownProperties = new Array()
+    for (const prop in this.actual) {
+      if (hasOwnProperty(this.actual, prop)) {
+        ownProperties.push(prop)
       }
-      return this.env.equals_(ownProperties, expectedProperties);
+    }
+    return this.env.equals_(ownProperties, expectedProperties)
   },
 
-  toHaveTexts (expectedTexts) {
-      var texts = arrayMap(this.actual.childNodes, jasmine.nodeText);
-      this.actual = texts;   // Fix explanatory message
-      return this.env.equals_(texts, expectedTexts);
+  toHaveTexts(expectedTexts) {
+    const texts = arrayMap(this.actual.childNodes, jasmine.nodeText)
+    this.actual = texts // Fix explanatory message
+    return this.env.equals_(texts, expectedTexts)
   },
 
-  toHaveValues (expectedValues) {
-      var values = arrayFilter(
-        arrayMap(this.actual.childNodes, node => node.value),
-        value => value !== undefined)
-      this.actual = values   // Fix explanatory message
-      return this.env.equals_(values, expectedValues)
+  toHaveValues(expectedValues) {
+    const values = arrayFilter(
+      arrayMap(this.actual.childNodes, node => node.value),
+      value => value !== undefined
+    )
+    this.actual = values // Fix explanatory message
+    return this.env.equals_(values, expectedValues)
   },
 
-
-  toHaveCheckedStates (expectedValues) {
-      const values = arrayMap(this.actual.childNodes, (node) =>  node.checked)
-      this.actual = values;   // Fix explanatory message
-     return this.env.equals_(values, expectedValues)
+  toHaveCheckedStates(expectedValues) {
+    const values = arrayMap(this.actual.childNodes, node => node.checked)
+    this.actual = values // Fix explanatory message
+    return this.env.equals_(values, expectedValues)
   },
 
   toThrowContaining(expected) {
-      var exception;
-      try {
-          this.actual();
-      } catch (e) {
-          exception = e;
-      }
-      var exceptionMessage = exception && (exception.message || exception);
-
-      this.message = function () {
-          var notText = this.isNot ? " not" : "";
-          var expectation = "Expected " + this.actual.toString() + notText + " to throw exception containing '" + expected + "'";
-          var result = exception ? (", but it threw '" + exceptionMessage + "'") : ", but it did not throw anything";
-          return expectation + result;
-      };
+    let exception
+    try {
+      this.actual()
+    } catch (e) {
+      exception = e
+    }
+    const exceptionMessage = exception && (exception.message || exception)
+
+    this.message = function () {
+      const notText = this.isNot ? ' not' : ''
+      const expectation =
+        'Expected ' + this.actual.toString() + notText + " to throw exception containing '" + expected + "'"
+      const result = exception ? ", but it threw '" + exceptionMessage + "'" : ', but it did not throw anything'
+      return expectation + result
+    }
 
-      return exception ? this.env.contains_(exceptionMessage, expected) : false;
+    return exception ? this.env.contains_(exceptionMessage, expected) : false
   },
 
-  toEqualOneOf (expectedPossibilities) {
-      for (var i = 0; i < expectedPossibilities.length; i++) {
-          if (this.env.equals_(this.actual, expectedPossibilities[i])) {
-              return true;
-          }
+  toEqualOneOf(expectedPossibilities) {
+    for (let i = 0; i < expectedPossibilities.length; i++) {
+      if (this.env.equals_(this.actual, expectedPossibilities[i])) {
+        return true
       }
-      return false;
+    }
+    return false
   },
 
-  toContainHtml (expectedHtml, postProcessCleanedHtml) {
-      var cleanedHtml = this.actual.innerHTML.toLowerCase().replace(/\r\n/g, "");
-      // IE < 9 strips whitespace immediately following comment nodes. Normalize by doing the same on all browsers.
-      cleanedHtml = cleanedHtml.replace(/(<!--.*?-->)\s*/g, "$1");
-      expectedHtml = expectedHtml.replace(/(<!--.*?-->)\s*/g, "$1");
-      // Also remove __ko__ expando properties (for DOM data) - most browsers hide these anyway but IE < 9 includes them in innerHTML
-      cleanedHtml = cleanedHtml.replace(/ __ko__\d+=\"(ko\d+|null)\"/g, "");
-      if (postProcessCleanedHtml) {
-          cleanedHtml = postProcessCleanedHtml(cleanedHtml);
-      }
-      this.actual = cleanedHtml;      // Fix explanatory message
-      return cleanedHtml === expectedHtml;
+  toContainHtml(expectedHtml, postProcessCleanedHtml) {
+    let cleanedHtml = this.actual.innerHTML.toLowerCase().replace(/\r\n/g, '')
+    // IE < 9 strips whitespace immediately following comment nodes. Normalize by doing the same on all browsers.
+    cleanedHtml = cleanedHtml.replace(/(<!--.*?-->)\s*/g, '$1')
+    expectedHtml = expectedHtml.replace(/(<!--.*?-->)\s*/g, '$1')
+    // Also remove __ko__ expando properties (for DOM data) - most browsers hide these anyway but IE < 9 includes them in innerHTML
+    cleanedHtml = cleanedHtml.replace(/ __ko__\d+=\"(ko\d+|null)\"/g, '')
+    if (postProcessCleanedHtml) {
+      cleanedHtml = postProcessCleanedHtml(cleanedHtml)
+    }
+    this.actual = cleanedHtml // Fix explanatory message
+    return cleanedHtml === expectedHtml
+  },
+
+  toHaveSelectedValues(expectedValues) {
+    const selectedNodes = arrayFilter(this.actual.childNodes, node => node.selected)
+    const selectedValues = arrayMap(selectedNodes, node => selectExtensions.readValue(node))
+    this.actual = selectedValues // Fix explanatory message
+    return this.env.equals_(selectedValues, expectedValues)
   }
 }
 
 //
 // bmh: Monkeypatch so we can catch errors in asynchronous functions.
 //
-jasmine.FakeTimer.prototype.runFunctionsWithinRange = function(oldMillis, nowMillis) {
-    var scheduledFunc;
-    var funcsToRun = [];
-    for (var timeoutKey in this.scheduledFunctions) {
-        scheduledFunc = this.scheduledFunctions[timeoutKey];
-        if (scheduledFunc != jasmine.undefined &&
-            scheduledFunc.runAtMillis >= oldMillis &&
-            scheduledFunc.runAtMillis <= nowMillis) {
-            funcsToRun.push(scheduledFunc);
-            this.scheduledFunctions[timeoutKey] = jasmine.undefined;
-        }
+jasmine.FakeTimer.prototype.runFunctionsWithinRange = function (oldMillis, nowMillis) {
+  let scheduledFunc
+  const funcsToRun = new Array()
+  for (const timeoutKey in this.scheduledFunctions) {
+    scheduledFunc = this.scheduledFunctions[timeoutKey]
+    if (
+      scheduledFunc != jasmine.undefined
+      && scheduledFunc.runAtMillis >= oldMillis
+      && scheduledFunc.runAtMillis <= nowMillis
+    ) {
+      funcsToRun.push(scheduledFunc)
+      this.scheduledFunctions[timeoutKey] = jasmine.undefined
     }
+  }
 
-    if (funcsToRun.length > 0) {
-        funcsToRun.sort(function(a, b) {
-            return a.runAtMillis - b.runAtMillis;
-        });
-
-        for (var i = 0; i < funcsToRun.length; ++i) {
-          //try {       // mbest: Removed so we can catch errors in asynchronous functions
-            var funcToRun = funcsToRun[i];
-            this.nowMillis = funcToRun.runAtMillis;
-            funcToRun.funcToCall();
-            if (funcToRun.recurring) {
-                this.scheduleFunction(funcToRun.timeoutKey,
-                  funcToRun.funcToCall,
-                  funcToRun.millis,
-                  true);
-            }
-          //} catch(e) {
-          //}
-        }
-        this.runFunctionsWithinRange(oldMillis, nowMillis);
+  if (funcsToRun.length > 0) {
+    funcsToRun.sort(function (a: any, b: any) {
+      return a.runAtMillis - b.runAtMillis
+    })
+
+    for (let i = 0; i < funcsToRun.length; ++i) {
+      //try {       // mbest: Removed so we can catch errors in asynchronous functions
+      const funcToRun = funcsToRun[i]
+      this.nowMillis = funcToRun.runAtMillis
+      funcToRun.funcToCall()
+      if (funcToRun.recurring) {
+        this.scheduleFunction(funcToRun.timeoutKey, funcToRun.funcToCall, funcToRun.millis, true)
+      }
+      //} catch(e) {
+      //}
     }
-};
+    this.runFunctionsWithinRange(oldMillis, nowMillis)
+  }
+}
 
-beforeEach(function() {
-    this.addMatchers(matchers);
-});
+beforeEach(function () {
+  this.addMatchers(matchers)
+
+  switchJQueryState()
+})
+
+afterEach(function () {
+  expect(disableJQueryUsage).toEqual(options.disableJQueryUsage)
+})
+
+const KARMA_STRING = '__karma__'
+let disableJQueryUsage = true
+function switchJQueryState() {
+  if (window[KARMA_STRING] && window[KARMA_STRING].config.args.includes('--noJQuery')) {
+    options.disableJQueryUsage = disableJQueryUsage = true
+  } else {
+    options.disableJQueryUsage = disableJQueryUsage = false
+  }
+}

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.0.0-beta1.3",
+  "version": "4.0.0",
   "name": "@tko/utils",
   "description": "TKO Utilities",
   "type": "module",
@@ -42,6 +42,5 @@
       "import": "./dist/index.js"
     },
     "./helpers/*": "./helpers/*"
-  },
-  "gitHead": "a8843acb8ae085915115e53a4e057b30731c635e"
+  }
 }

package/LICENSE

@@ -1,22 +0,0 @@
-The MIT License (MIT) - http://www.opensource.org/licenses/mit-license.php
-
-Copyright (c) Steven Sanderson, the Knockout.js team, and other contributors
-http://knockoutjs.com/
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

package/dist/bind-shim.js

@@ -1,18 +0,0 @@
-// @tko/utils 🥊 4.0.0-beta1.3 ESM
-if (!Function.prototype["bind"]) {
-  Function.prototype["bind"] = function(object) {
-    var originalFunction = this;
-    if (arguments.length === 1) {
-      return function() {
-        return originalFunction.apply(object, arguments);
-      };
-    } else {
-      var partialArgs = Array.prototype.slice.call(arguments, 1);
-      return function() {
-        var args = partialArgs.slice(0);
-        args.push.apply(args, arguments);
-        return originalFunction.apply(object, args);
-      };
-    }
-  };
-}

package/dist/bind-shim.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../src/bind-shim.ts"],
-  "sourcesContent": ["\nif (!Function.prototype['bind']) {\n    // Shim/polyfill JavaScript Function.bind.\n    // This implementation is based on the one in prototype.js\n  Function.prototype['bind'] = function (object) {\n    var originalFunction = this\n    if (arguments.length === 1) {\n      return function () {\n        return originalFunction.apply(object, arguments)\n      }\n    } else {\n      var partialArgs = Array.prototype.slice.call(arguments, 1)\n      return function () {\n        var args = partialArgs.slice(0)\n        args.push.apply(args, arguments)\n        return originalFunction.apply(object, args)\n      }\n    }\n  }\n}\n"],
-  "mappings": ";AACA,IAAI,CAAC,SAAS,UAAU,SAAS;AAG/B,WAAS,UAAU,UAAU,SAAU,QAAQ;AAC7C,QAAI,mBAAmB;AACvB,QAAI,UAAU,WAAW,GAAG;AAC1B,aAAO,WAAY;AACjB,eAAO,iBAAiB,MAAM,QAAQ,SAAS;AAAA,MACjD;AAAA,IACF,OAAO;AACL,UAAI,cAAc,MAAM,UAAU,MAAM,KAAK,WAAW,CAAC;AACzD,aAAO,WAAY;AACjB,YAAI,OAAO,YAAY,MAAM,CAAC;AAC9B,aAAK,KAAK,MAAM,MAAM,SAAS;AAC/B,eAAO,iBAAiB,MAAM,QAAQ,IAAI;AAAA,MAC5C;AAAA,IACF;AAAA,EACF;AACF;",
-  "names": []
-}

package/dist/ie.js

@@ -1,15 +0,0 @@
-// @tko/utils 🥊 4.0.0-beta1.3 ESM
-import options from "./options";
-const ieVersion = options.document && function() {
-  var version = 3, div = options.document.createElement("div"), iElems = div.getElementsByTagName("i");
-  while (div.innerHTML = "<!--[if gt IE " + ++version + "]><i></i><![endif]-->", iElems[0]) {
-  }
-  if (!version) {
-    const userAgent = window.navigator.userAgent;
-    return ua.match(/MSIE ([^ ]+)/) || ua.match(/rv:([^ )]+)/);
-  }
-  return version > 4 ? version : void 0;
-}();
-const isIe6 = ieVersion === 6;
-const isIe7 = ieVersion === 7;
-export { ieVersion, isIe6, isIe7 };

package/dist/ie.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../src/ie.ts"],
-  "sourcesContent": ["//\n// Detection and Workarounds for Internet Explorer\n//\nimport options from './options'\n\nconst ieVersion = options.document && (function () {\n  var version = 3, div = options.document.createElement('div'), iElems = div.getElementsByTagName('i')\n\n    // Keep constructing conditional HTML blocks until we hit one that resolves to an empty fragment\n  while (\n        div.innerHTML = '<!--[if gt IE ' + (++version) + ']><i></i><![endif]-->',\n        iElems[0]\n    ) {}\n\n  if (!version) {\n    const userAgent = window.navigator.userAgent\n    // Detect IE 10/11\n    return ua.match(/MSIE ([^ ]+)/) || ua.match(/rv:([^ )]+)/)\n  }\n  return version > 4 ? version : undefined\n}())\n\nconst isIe6 = ieVersion === 6\nconst isIe7 = ieVersion === 7\n\nexport { ieVersion, isIe6, isIe7 }\n"],
-  "mappings": ";AAGA;AAEA,MAAM,YAAY,QAAQ,YAAa,WAAY;AACjD,MAAI,UAAU,GAAG,MAAM,QAAQ,SAAS,cAAc,KAAK,GAAG,SAAS,IAAI,qBAAqB,GAAG;AAGnG,SACM,IAAI,YAAY,mBAAoB,EAAE,UAAW,yBACjD,OAAO,IACT;AAAA,EAAC;AAEL,MAAI,CAAC,SAAS;AACZ,UAAM,YAAY,OAAO,UAAU;AAEnC,WAAO,GAAG,MAAM,cAAc,KAAK,GAAG,MAAM,aAAa;AAAA,EAC3D;AACA,SAAO,UAAU,IAAI,UAAU;AACjC,EAAE;AAEF,MAAM,QAAQ,cAAc;AAC5B,MAAM,QAAQ,cAAc;AAE5B;",
-  "names": []
-}

package/dist/jquery.js

@@ -1,6 +0,0 @@
-// @tko/utils 🥊 4.0.0-beta1.3 ESM
-import options from "./options";
-export var jQueryInstance = options.global && options.global.jQuery;
-export function jQuerySetInstance(jquery) {
-  options.jQuery = jQueryInstance = jquery;
-}

package/dist/jquery.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../src/jquery.ts"],
-  "sourcesContent": ["//\n// jQuery\n//\n// TODO: deprecate in favour of options.$\n\nimport options from './options'\n\nexport var jQueryInstance = options.global && options.global.jQuery\n\nexport function jQuerySetInstance (jquery) {\n  options.jQuery = jQueryInstance = jquery\n}\n"],
-  "mappings": ";AAKA;AAEO,WAAI,iBAAiB,QAAQ,UAAU,QAAQ,OAAO;AAEtD,kCAA4B,QAAQ;AACzC,UAAQ,SAAS,iBAAiB;AACpC;",
-  "names": []
-}