fix: update import path for Collection type definition and refactor to use generics

Ref: bde4671

Author: kgryte

lib/node_modules/@stdlib/strided/base/mskunary-addon-dispatch/docs/types/index.d.ts

@@ -20,7 +20,7 @@
 
 /// <reference types="@stdlib/types"/>
 
-import { Collection } from '@stdlib/types/object';
+import { Collection } from '@stdlib/types/array';
 
 /**
 * Add-on function.
@@ -41,7 +41,7 @@ import { Collection } from '@stdlib/types/object';
 *     // Call into native add-on...
 * }
 */
-type AddonFcn = ( N: number, dtypeX: number, x: Collection, strideX: number, dtypeMask: number, mask: Collection, strideMask: number, dtypeY: number, y: Collection, strideY: number ) => any; // tslint:disable-line:max-line-length
+type AddonFcn<T, U, V> = ( N: number, dtypeX: number, x: Collection<T>, strideX: number, dtypeMask: number, mask: Collection<number>, strideMask: number, dtypeY: number, y: Collection<U>, strideY: number ) => V;
 
 /**
 * Fallback function.
@@ -62,7 +62,7 @@ type AddonFcn = ( N: number, dtypeX: number, x: Collection, strideX: number, dty
 *     // Fallback JavaScript implementation...
 * }
 */
-type FallbackFcn = ( N: number, dtypeX: any, x: Collection, strideX: number, dtypeMask: number, mask: Collection, strideMask: number, dtypeY: any, y: Collection, strideY: number ) => any; // tslint:disable-line:max-line-length
+type FallbackFcn<T, U, V> = ( N: number, dtypeX: any, x: Collection<T>, strideX: number, dtypeMask: number, mask: Collection<number>, strideMask: number, dtypeY: any, y: Collection<U>, strideY: number ) => V;
 
 /**
 * Fallback function supporting alternative indexing semantics.
@@ -86,7 +86,7 @@ type FallbackFcn = ( N: number, dtypeX: any, x: Collection, strideX: number, dty
 *     // Fallback JavaScript implementation...
 * }
 */
-type FallbackFcnWithOffsets = ( N: number, dtypeX: any, x: Collection, strideX: number, offsetX: number, dtypeMask: any, mask: Collection, strideMask: number, offsetMask: number, dtypeY: any, y: Collection, strideY: number, offsetY: number ) => any; // tslint:disable-line:max-line-length
+type FallbackFcnWithOffsets<T, U, V> = ( N: number, dtypeX: any, x: Collection<T>, strideX: number, offsetX: number, dtypeMask: any, mask: Collection<number>, strideMask: number, offsetMask: number, dtypeY: any, y: Collection<U>, strideY: number, offsetY: number ) => V;
 
 /**
 * Dispatches to a native add-on.
@@ -103,7 +103,7 @@ type FallbackFcnWithOffsets = ( N: number, dtypeX: any, x: Collection, strideX:
 * @param strideY - `y` stride length
 * @returns `y`
 */
-type Dispatcher = ( N: number, dtypeX: any, x: Collection, strideX: number, dtypeMask: any, mask: Collection, strideMask: number, dtypeY: any, y: Collection, strideY: number ) => Collection; // tslint:disable-line:max-line-length
+type Dispatcher<T, U> = ( N: number, dtypeX: any, x: Collection<T>, strideX: number, dtypeMask: any, mask: Collection<number>, strideMask: number, dtypeY: any, y: Collection<U>, strideY: number ) => Collection<U>;
 
 /**
 * Dispatches to a native add-on.
@@ -123,7 +123,7 @@ type Dispatcher = ( N: number, dtypeX: any, x: Collection, strideX: number, dtyp
 * @param offsetY - starting `y` index
 * @returns `y`
 */
-type DispatcherWithOffsets = ( N: number, dtypeX: any, x: Collection, strideX: number, offsetX: number, dtypeMask: any, mask: Collection, strideMask: number, offsetMask: number, dtypeY: any, y: Collection, strideY: number, offsetY: number ) => Collection; // tslint:disable-line:max-line-length
+type DispatcherWithOffsets<T, U> = ( N: number, dtypeX: any, x: Collection<T>, strideX: number, offsetX: number, dtypeMask: any, mask: Collection<number>, strideMask: number, offsetMask: number, dtypeY: any, y: Collection<U>, strideY: number, offsetY: number ) => Collection<U>;
 
 /**
 * Interface for creating a native add-on dispatcher.
@@ -153,7 +153,7 @@ interface Dispatch {
 	* // Invoke the dispatch function with strided array arguments:
 	* f( 2, 'generic', [ 1, 2 ], 1, 'generic', [ 0, 0 ], 1, 'generic', [ 0, 0 ], 1 );
 	*/
-	( addon: AddonFcn, fallback: FallbackFcn ): Dispatcher;
+	<T = unknown, U = unknown, V = unknown>( addon: AddonFcn<T, U, V>, fallback: FallbackFcn<T, U, V> ): Dispatcher<T, U>;
 
 	/**
 	* Returns a function which dispatches to a native add-on applying a unary function to an input strided array according to a mask strided array using alternative indexing semantics.
@@ -179,7 +179,7 @@ interface Dispatch {
 	* // Invoke the dispatch function with strided array arguments:
 	* f( 2, 'generic', [ 1, 2 ], 1, 0, 'generic', [ 0, 0 ], 1, 0, 'generic', [ 0, 0 ], 1, 0 );
 	*/
-	ndarray( addon: AddonFcn, fallback: FallbackFcnWithOffsets ): DispatcherWithOffsets; // tslint:disable-line:max-line-length
+	ndarray<T = unknown, U = unknown, V = unknown>( addon: AddonFcn<T, U, V>, fallback: FallbackFcnWithOffsets<T, U, V> ): DispatcherWithOffsets<T, U>;
 }
 
 /**

lib/node_modules/@stdlib/strided/base/mskunary-addon-dispatch/docs/types/test.ts

@@ -18,7 +18,7 @@
 
 /// <reference types="@stdlib/types"/>
 
-import { Collection } from '@stdlib/types/object';
+import { Collection } from '@stdlib/types/array';
 import dispatch = require( './index' );
 
 
@@ -38,7 +38,7 @@ import dispatch = require( './index' );
 * @param y - output array
 * @param strideY - `y` stride length
 */
-function addon( N: number, dtypeX: number, x: Collection, strideX: number, dtypeMask: number, mask: Collection, strideMask: number, dtypeY: number, y: Collection, strideY: number ): void { // tslint:disable-line:max-line-length
+function addon( N: number, dtypeX: number, x: Collection<number>, strideX: number, dtypeMask: number, mask: Collection<number>, strideMask: number, dtypeY: number, y: Collection<number>, strideY: number ): void {
 	let i;
 	if ( dtypeX !== dtypeY || dtypeMask === 0 ) {
 		throw new Error( 'beep' );
@@ -64,7 +64,7 @@ function addon( N: number, dtypeX: number, x: Collection, strideX: number, dtype
 * @param y - output array
 * @param strideY - `y` stride length
 */
-function fallback( N: number, dtypeX: any, x: Collection, strideX: number, dtypeMask: number, mask: Collection, strideMask: number, dtypeY: any, y: Collection, strideY: number ): void { // tslint:disable-line:max-line-length
+function fallback( N: number, dtypeX: any, x: Collection<number>, strideX: number, dtypeMask: number, mask: Collection<number>, strideMask: number, dtypeY: any, y: Collection<number>, strideY: number ): void {
 	let i;
 	if ( dtypeX !== dtypeY || dtypeMask === 0 ) {
 		throw new Error( 'beep' );
@@ -93,7 +93,7 @@ function fallback( N: number, dtypeX: any, x: Collection, strideX: number, dtype
 * @param strideY - `y` stride length
 * @param offsetY - starting `y` index
 */
-function fallbackWithOffsets( N: number, dtypeX: any, x: Collection, strideX: number, offsetX: number, dtypeMask: any, mask: Collection, strideMask: number, offsetMask: number, dtypeY: any, y: Collection, strideY: number, offsetY: number ): void { // tslint:disable-line:max-line-length
+function fallbackWithOffsets( N: number, dtypeX: any, x: Collection<number>, strideX: number, offsetX: number, dtypeMask: any, mask: Collection<number>, strideMask: number, offsetMask: number, dtypeY: any, y: Collection<number>, strideY: number, offsetY: number ): void {
 	let i;
 	if ( dtypeX !== dtypeY || dtypeMask === 0 ) {
 		throw new Error( 'beep' );
@@ -110,7 +110,7 @@ function fallbackWithOffsets( N: number, dtypeX: any, x: Collection, strideX: nu
 
 // The function returns a dispatch function...
 {
-	dispatch( addon, fallback ); // $ExpectType Dispatcher
+	dispatch( addon, fallback ); // $ExpectType Dispatcher<number, number>
 }
 
 // The compiler throws an error if not provided a first argument which is an add-on function...
@@ -147,7 +147,7 @@ function fallbackWithOffsets( N: number, dtypeX: any, x: Collection, strideX: nu
 
 	const f = dispatch( addon, fallback );
 
-	f( x.length, 'float64', x, 1, 'uint8', m, 1, 'float64', y, 1 ); // $ExpectType Collection
+	f( x.length, 'float64', x, 1, 'uint8', m, 1, 'float64', y, 1 ); // $ExpectType Collection<number>
 }
 
 // The compiler throws an error if the returned function is not provided a first argument which is a number...
@@ -269,7 +269,7 @@ function fallbackWithOffsets( N: number, dtypeX: any, x: Collection, strideX: nu
 
 // Attached to the main export is an `ndarray` method which returns a dispatch function...
 {
-	dispatch.ndarray( addon, fallbackWithOffsets ); // $ExpectType DispatcherWithOffsets
+	dispatch.ndarray( addon, fallbackWithOffsets ); // $ExpectType DispatcherWithOffsets<number, number>
 }
 
 // The compiler throws an error if the `ndarray` method is not provided a first argument which is an add-on function...
@@ -306,7 +306,7 @@ function fallbackWithOffsets( N: number, dtypeX: any, x: Collection, strideX: nu
 
 	const f = dispatch.ndarray( addon, fallbackWithOffsets );
 
-	f( x.length, 'float64', x, 1, 0, 'uint8', m, 1, 0, 'float64', y, 1, 0 ); // $ExpectType Collection
+	f( x.length, 'float64', x, 1, 0, 'uint8', m, 1, 0, 'float64', y, 1, 0 ); // $ExpectType Collection<number>
 }
 
 // The compiler throws an error if the returned function is not provided a first argument which is a number...