refactor(core): adjust typings

nartc · Jul 2, 2021 · 23f1fa0 · 23f1fa0
1 parent 04f5755
commit 23f1fa0
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 11 deletions.
diff --git a/packages/classes/src/lib/storages/class-instance.storage.ts b/packages/classes/src/lib/storages/class-instance.storage.ts
@@ -89,12 +89,12 @@ export class ClassInstanceStorage {
     value: number
   ): void {
     if (!storage.has(parent)) {
-      storage.set(parent, arrayMapSet(new Map(), member, value));
+      storage.set(parent, arrayMapSet(new Map(), member, value)!);
       return;
     }
 
     if (!this.hasInternal(storage, parent, member)) {
-      arrayMapSet(storage.get(parent), member, value);
+      arrayMapSet(storage.get(parent)!, member, value);
     }
   }
 
@@ -144,7 +144,7 @@ function arrayMapHas(root: ArrayKeyedMap, path: string[]): boolean {
 function arrayMapGet(root: ArrayKeyedMap, path: string[]): number | undefined {
   let map = root;
   for (const item of path) {
-    map = (map as PathMap).get(item);
+    map = (map as PathMap).get(item)!;
     if (!map) return undefined;
   }
   return (map as DataMap).get(DATA_SYMBOL);

diff --git a/packages/core/src/lib/create-mapper/create-mapper.ts b/packages/core/src/lib/create-mapper/create-mapper.ts
@@ -66,7 +66,7 @@ export function createMapper<TKey = unknown>({
         : [];
 
       // get mapping between Source and Destination
-      const mapping: Mapping = this.getMapping(source, destination);
+      const mapping: Mapping | undefined = this.getMapping(source, destination);
 
       // check mutate or return
 

diff --git a/packages/core/src/lib/create-mapper/get-member-path.util.ts b/packages/core/src/lib/create-mapper/get-member-path.util.ts
@@ -9,7 +9,7 @@ const PROXY_OBJECT = createProxy(PROXY_TARGET);
  * @returns `null` if the given `fnSelector` doesn't match with anything.
  */
 export function getMembers(
-  fnSelector: Selector<unknown, unknown | (() => string[])>
+  fnSelector: Selector<any, any | (() => string[])>
 ): string[] | null {
   const resultProxy = fnSelector(PROXY_OBJECT) as () => string[];
   if (typeof resultProxy !== 'function') {

diff --git a/packages/core/src/lib/initialize-utils/create-initial-mapping.util.ts b/packages/core/src/lib/initialize-utils/create-initial-mapping.util.ts
@@ -132,7 +132,9 @@ export function createInitialMapping(
   }
 
   // Inherit base mappings
-  extendMappings(bases, mapping);
+  if (bases.length) {
+    extendMappings(bases as Mapping[], mapping!);
+  }
 
   saveMapping(mapping);
 

diff --git a/packages/core/src/lib/initialize-utils/get-flattening-source-paths.util.ts b/packages/core/src/lib/initialize-utils/get-flattening-source-paths.util.ts
@@ -6,7 +6,7 @@ export function getFlatteningSourcePaths(
   namingConventions: [NamingConvention, NamingConvention]
 ): string[] | undefined {
   const [sourceNamingConvention] = namingConventions;
-  const splitSourcePaths: string[] = [].concat(
+  const splitSourcePaths: string[] = ([] as string[]).concat(
     ...srcPath.map((s) =>
       s.split(sourceNamingConvention.splittingExpression).filter(Boolean)
     )
@@ -38,7 +38,7 @@ export function getFlatteningSourcePaths(
     return;
   }
 
-  return [].concat(
+  return ([] as string[]).concat(
     trueFirstPartOfSource,
     sourceNamingConvention.transformPropertyName(
       splitSourcePaths.slice(stopIndex + 1, splitSourcePaths.length + 1)

diff --git a/packages/core/src/lib/initialize-utils/get-path-recursive.util.ts b/packages/core/src/lib/initialize-utils/get-path-recursive.util.ts
@@ -22,7 +22,7 @@ export function getPathRecursive(
   const keys = Object.getOwnPropertyNames(node);
   for (let i = 0, len = keys.length; i < len; i++) {
     const key = keys[i];
-    const path: string[] = [].concat(...prefix, key);
+    const path: string[] = ([] as string[]).concat(...prefix, key);
     result.push(path);
 
     const child = node[key];

diff --git a/packages/core/src/lib/utils/get.util.ts b/packages/core/src/lib/utils/get.util.ts
@@ -7,7 +7,7 @@ export function get<T>(object: T, path: (string | symbol)[] = []): unknown {
   const length = path.length;
 
   for (index = 0; index < length && object != null; index++) {
-    object = object[path[index]];
+    object = (object as Record<string, unknown>)[path[index] as string] as T;
   }
 
   return index && index == length ? object : undefined;

diff --git a/packages/core/src/lib/utils/set.util.ts b/packages/core/src/lib/utils/set.util.ts
@@ -56,7 +56,7 @@ function decomposePath(path: string[]): {
   base: string;
 } {
   if (path.length < 1) {
-    return { base: undefined, decomposedPath: undefined };
+    return { base: '', decomposedPath: [] };
   }
   const decomposedPath = path;
   const base = path[0];