Merge pull request #225 from Auge19/strictBindCallApply

TS) Enable "strictBindCallApply"

Author: phillipc

packages/bind/spec/nodePreprocessingBehaviors.ts

@@ -36,15 +36,15 @@ describe('Node preprocessing', function () {
     options.bindingProviderInstance.preprocessNode = function (node) {
       // Example: replace <mySpecialNode /> with <span data-bind='text: someValue'></span>
       // This technique could be the basis for implementing custom element types that render templates
-      if (node.tagName && node.tagName.toLowerCase() === 'myspecialnode') {
+      if (node instanceof Element && node.tagName && node.tagName.toLowerCase() === 'myspecialnode') {
         const newNode = document.createElement('span')
         newNode.setAttribute('data-bind', 'text: someValue')
         expect(node.parentNode).not.toBe(null)
         node.parentNode?.insertBefore(newNode, node)
         node.parentNode?.removeChild(node)
         return [newNode]
       }
-      return undefined
+      return null
     }
     testNode.innerHTML = '<span>a</span><mySpecialNode></mySpecialNode><span>b</span>'
     const someValue = observable('hello')
@@ -77,7 +77,7 @@ describe('Node preprocessing', function () {
           node.parentNode.removeChild(node)
           return newNodes
         }
-        return undefined
+        return null
       }
     }
     options.bindingProviderInstance = new TestProvider()
@@ -104,7 +104,7 @@ describe('Node preprocessing', function () {
           node.parentNode.removeChild(node)
           return newNodes
         }
-        return undefined
+        return null
       }
     }
     const testProvider = new TestProvider()

packages/bind/src/applyBindings.ts

@@ -102,7 +102,7 @@ function applyBindingsToDescendantsInternal(
     return
   }
 
-  let currentChild: ChildNode | null
+  let currentChild: Node | null
   const provider = getBindingProvider()
   const preprocessNode = provider.preprocessNode
 

packages/bind/src/arrayToDomNodeChildren.ts

@@ -205,7 +205,7 @@ export function setDomNodeChildrenFromArrayMapping<T = any>(
                   itemsForBeforeRemoveCallbacks.push(mapData!)
                 }
               }
-              if (mapData) {
+              if (mapData?.mappedNodes) {
                 nodesToDelete.push.apply(nodesToDelete, mapData.mappedNodes)
               }
             }

packages/binding.template/spec/foreachBehaviors.ts

@@ -321,7 +321,7 @@ describe('Binding: Foreach', function () {
         node.parentNode?.removeChild(node)
         return newNodes
       }
-      return undefined
+      return null
     }
 
     // Now perform a foreach binding, and see that afterRender gets the output from the preprocessor and bindings
@@ -944,6 +944,10 @@ describe('Binding: Foreach', function () {
   it('Can modify the set of top-level nodes in a foreach loop', function () {
     options.bindingProviderInstance.preprocessNode = function (node) {
       // Replace <data /> with <span data-bind="text: $data"></span>
+      if (!(node instanceof Element)) {
+        return null
+      }
+
       if (node.tagName && node.tagName.toLowerCase() === 'data') {
         const newNode = document.createElement('span')
         newNode.setAttribute('data-bind', 'text: $data')
@@ -957,7 +961,7 @@ describe('Binding: Foreach', function () {
         node.parentNode?.removeChild(node)
         return []
       }
-      return undefined
+      return null
     }
     testNode.innerHTML =
       "<div data-bind='foreach: items'>"

packages/binding.template/spec/nativeTemplateEngineBehaviors.ts

@@ -1,7 +1,7 @@
 /* global testNode */
 import { applyBindings } from '@tko/bind'
 
-import { observable, observableArray } from '@tko/observable'
+import { observable, ObservableArray, observableArray } from '@tko/observable'
 
 import { DataBindProvider } from '@tko/provider.databind'
 
@@ -141,17 +141,25 @@ describe('Native template engine', function () {
         + "(Val: <span data-bind='text: $data'></span>, Invocations: <span data-bind='text: $root.invocationCount()'></span>, Parents: <span data-bind='text: $parents.length'></span>)"
         + '</div>'
         + '</div>'
-      const viewModel = {
-        invocations: 0, // Verifying # invocations to be sure we're not rendering anything multiple times and discarding the results
-        items: observableArray([
-          { children: observableArray(['A1', 'A2', 'A3']) },
-          { children: observableArray(['B1', 'B2']) }
-        ]),
-        invocationCount: undefined
+
+      class myViewModel {
+        invocations: number = 0 // Verifying # invocations to be sure we're not rendering anything multiple times and discarding the results
+        items: ObservableArray<any>
+
+        constructor() {
+          this.items = observableArray([
+            { children: observableArray(['A1', 'A2', 'A3']) },
+            { children: observableArray(['B1', 'B2']) }
+          ])
+        }
+
+        invocationCount() {
+          return ++this.invocations
+        }
       }
-      viewModel.invocationCount = function () {
-        return ++this.invocations
-      }.bind(viewModel)
+
+      const viewModel = new myViewModel()
+
       applyBindings(viewModel, testNode)
 
       expect(testNode.childNodes[0].childNodes[0]).toContainText(

packages/binding.template/spec/templatingBehaviors.ts

@@ -539,10 +539,15 @@ describe('Templating', function () {
         return [1, 3, 8]
       }
 
-      override nodeHasBindings(node: Element, bindingContext?: BindingContext) {
-        return node.tagName == 'EM' || originalBindingProvider.nodeHasBindings(node, bindingContext)
+      override nodeHasBindings(node: Node, bindingContext?: BindingContext) {
+        if (node instanceof Element) {
+          return node.tagName == 'EM' || originalBindingProvider.nodeHasBindings(node, bindingContext)
+        }
+        return false
       }
-      override getBindingAccessors(node: Element, bindingContext?: BindingContext) {
+      override getBindingAccessors(node: Node, bindingContext?: BindingContext) {
+        if (!(node instanceof Element)) return {}
+
         if (node.tagName == 'EM') {
           return { text: ++model.numExternalBindings }
         }

packages/computed/src/computed.ts

@@ -141,7 +141,7 @@ export function computed(
     if (arguments.length > 0) {
       if (typeof writeFunction === 'function') {
         // Writing a value
-        writeFunction.apply(state.evaluatorFunctionTarget, arguments)
+        writeFunction.apply(state.evaluatorFunctionTarget, arguments as any)
       } else {
         throw new Error(
           "Cannot write a value to a computed unless you specify a 'write' option. If you wish to read the current value, don't pass any parameters."

packages/observable/src/Subscription.ts

@@ -5,7 +5,7 @@ export default class Subscription {
   private _target: any
   private _callback: any
   private _isDisposed: boolean
-  private _domNodeDisposalCallback: null
+  private _domNodeDisposalCallback: ((node: Node) => void) | null
   private _node: Node
 
   constructor(target, observer, disposeCallback) {

packages/provider.attr/src/AttributeProvider.ts

@@ -15,29 +15,33 @@ export default class AttrProvider extends Provider {
     return 'ko-'
   }
 
-  getBindingAttributesList(node: Element) {
+  getBindingAttributesList(node: Node) {
+    if (!(node instanceof Element)) {
+      return []
+    }
+
     if (!node.hasAttributes()) {
       return []
     }
     return Array.from(node.attributes).filter(attr => attr.name.startsWith(this.PREFIX))
   }
 
-  override nodeHasBindings(node: Element) {
+  override nodeHasBindings(node: Node) {
     return this.getBindingAttributesList(node).length > 0
   }
 
-  override getBindingAccessors(node: Element, context) {
+  override getBindingAccessors(node: Node, context) {
     return Object.assign({}, ...this.handlersFromAttributes(node, context))
   }
 
-  *handlersFromAttributes(node: Element, context) {
+  *handlersFromAttributes(node: Node, context) {
     for (const attr of this.getBindingAttributesList(node)) {
-      const name = attr.name.substr(this.PREFIX.length)
+      const name = attr.name.substring(this.PREFIX.length)
       yield { [name]: () => this.getValue(attr.value, context, node) }
     }
   }
 
-  getValue(token, $context, node: Element) {
+  getValue(token, $context, node: Node) {
     /* FIXME: This duplicates Identifier.prototype.lookup_value; it should
        be refactored into e.g. a BindingContext method */
     if (!token) {

packages/provider.bindingstring/src/BindingStringProvider.ts

@@ -53,7 +53,7 @@ export default class BindingStringProvider extends Provider {
     return new Parser().parse(processed, context, this.globals, node)
   }
 
-  getBindingString(node: Node): string | null | undefined {
+  getBindingString(node: Node): string | null {
     throw new Error('Overload getBindingString.')
   }
 }