fix(guards): object array types

Author: vmasek

src/parser.ts

@@ -380,11 +380,19 @@ function parseInterfaceProperties(
               name,
             )}.every((item: unknown) => ${
               prop.isPrimitiveType || isPrimitiveType
-                ? `typeof item === '${type}'`
+                ? `typeof item === '${
+                    (prop.type || type) === '{ [key: string]: any }'
+                      ? 'object'
+                      : prop.type || type
+                  }'`
                 : (prop.typescriptType || typescriptType).endsWith('[]') // checks if item is nested array type
                 ? `(Array.isArray(item) && item.every((itemItem: unknown) => ${(prop.isPrimitiveType ||
                   isPrimitiveType
-                    ? `typeof itemItem === '${type}'`
+                    ? `typeof itemItem === '${
+                        (prop.type || type) === '{ [key: string]: any }'
+                          ? 'object'
+                          : prop.type || type
+                      }'`
                     : `is${prop.typescriptType || typescriptType}(itemItem)`
                   ).replace('[]', '')}))`
                 : `is${prop.typescriptType || typescriptType}(item)`

tests/gcloud-firestore/api/guards/index.ts

@@ -647,7 +647,7 @@ export function isStatus(arg: any): arg is models.Status {
     // code?: number
     ( typeof arg.code === 'undefined' || typeof arg.code === 'number' ) &&
     // details?: { [key: string]: any }[]
-    ( typeof arg.details === 'undefined' || (Array.isArray(arg.details) && arg.details.every((item: unknown) => typeof item === '{ [key: string]: any }')) ) &&
+    ( typeof arg.details === 'undefined' || (Array.isArray(arg.details) && arg.details.every((item: unknown) => typeof item === 'object')) ) &&
     // message?: string
     ( typeof arg.message === 'undefined' || typeof arg.message === 'string' ) &&
 

tests/github/api/guards/index.ts

@@ -199,9 +199,9 @@ export function isCommit(arg: any): arg is models.Commit {
     // committer?: { [key: string]: any }
     ( typeof arg.committer === 'undefined' || typeof arg.committer === 'object' ) &&
     // files?: { [key: string]: any }[]
-    ( typeof arg.files === 'undefined' || (Array.isArray(arg.files) && arg.files.every((item: unknown) => typeof item === '{ [key: string]: any }')) ) &&
+    ( typeof arg.files === 'undefined' || (Array.isArray(arg.files) && arg.files.every((item: unknown) => typeof item === 'object')) ) &&
     // parents?: { [key: string]: any }[]
-    ( typeof arg.parents === 'undefined' || (Array.isArray(arg.parents) && arg.parents.every((item: unknown) => typeof item === '{ [key: string]: any }')) ) &&
+    ( typeof arg.parents === 'undefined' || (Array.isArray(arg.parents) && arg.parents.every((item: unknown) => typeof item === 'object')) ) &&
     // sha?: string
     ( typeof arg.sha === 'undefined' || typeof arg.sha === 'string' ) &&
     // stats?: { [key: string]: any }
@@ -294,11 +294,11 @@ export function isCompareCommits(arg: any): arg is models.CompareCommits {
     // behind_by?: number
     ( typeof arg.behind_by === 'undefined' || typeof arg.behind_by === 'number' ) &&
     // commits?: { [key: string]: any }[]
-    ( typeof arg.commits === 'undefined' || (Array.isArray(arg.commits) && arg.commits.every((item: unknown) => typeof item === '{ [key: string]: any }')) ) &&
+    ( typeof arg.commits === 'undefined' || (Array.isArray(arg.commits) && arg.commits.every((item: unknown) => typeof item === 'object')) ) &&
     // diff_url?: string
     ( typeof arg.diff_url === 'undefined' || typeof arg.diff_url === 'string' ) &&
     // files?: { [key: string]: any }[]
-    ( typeof arg.files === 'undefined' || (Array.isArray(arg.files) && arg.files.every((item: unknown) => typeof item === '{ [key: string]: any }')) ) &&
+    ( typeof arg.files === 'undefined' || (Array.isArray(arg.files) && arg.files.every((item: unknown) => typeof item === 'object')) ) &&
     // html_url?: string
     ( typeof arg.html_url === 'undefined' || typeof arg.html_url === 'string' ) &&
     // patch_url?: string
@@ -724,13 +724,13 @@ export function isGist(arg: any): arg is models.Gist {
     // files?: { [key: string]: any }
     ( typeof arg.files === 'undefined' || typeof arg.files === 'object' ) &&
     // forks?: { [key: string]: any }[]
-    ( typeof arg.forks === 'undefined' || (Array.isArray(arg.forks) && arg.forks.every((item: unknown) => typeof item === '{ [key: string]: any }')) ) &&
+    ( typeof arg.forks === 'undefined' || (Array.isArray(arg.forks) && arg.forks.every((item: unknown) => typeof item === 'object')) ) &&
     // git_pull_url?: string
     ( typeof arg.git_pull_url === 'undefined' || typeof arg.git_pull_url === 'string' ) &&
     // git_push_url?: string
     ( typeof arg.git_push_url === 'undefined' || typeof arg.git_push_url === 'string' ) &&
     // history?: { [key: string]: any }[]
-    ( typeof arg.history === 'undefined' || (Array.isArray(arg.history) && arg.history.every((item: unknown) => typeof item === '{ [key: string]: any }')) ) &&
+    ( typeof arg.history === 'undefined' || (Array.isArray(arg.history) && arg.history.every((item: unknown) => typeof item === 'object')) ) &&
     // html_url?: string
     ( typeof arg.html_url === 'undefined' || typeof arg.html_url === 'string' ) &&
     // id?: string
@@ -1021,7 +1021,7 @@ export function isMergesSuccessful(arg: any): arg is models.MergesSuccessful {
     // message?: string
     ( typeof arg.message === 'undefined' || typeof arg.message === 'string' ) &&
     // parents?: { [key: string]: any }[]
-    ( typeof arg.parents === 'undefined' || (Array.isArray(arg.parents) && arg.parents.every((item: unknown) => typeof item === '{ [key: string]: any }')) ) &&
+    ( typeof arg.parents === 'undefined' || (Array.isArray(arg.parents) && arg.parents.every((item: unknown) => typeof item === 'object')) ) &&
     // sha?: string
     ( typeof arg.sha === 'undefined' || typeof arg.sha === 'string' ) &&
     // url?: string
@@ -1496,7 +1496,7 @@ export function isRelease(arg: any): arg is models.Release {
   arg != null &&
   typeof arg === 'object' &&
     // assets?: { [key: string]: any }[]
-    ( typeof arg.assets === 'undefined' || (Array.isArray(arg.assets) && arg.assets.every((item: unknown) => typeof item === '{ [key: string]: any }')) ) &&
+    ( typeof arg.assets === 'undefined' || (Array.isArray(arg.assets) && arg.assets.every((item: unknown) => typeof item === 'object')) ) &&
     // assets_url?: string
     ( typeof arg.assets_url === 'undefined' || typeof arg.assets_url === 'string' ) &&
     // author?: { [key: string]: any }
@@ -1659,7 +1659,7 @@ export function isRepoCommit(arg: any): arg is models.RepoCommit {
     // message?: string
     ( typeof arg.message === 'undefined' || typeof arg.message === 'string' ) &&
     // parents?: { [key: string]: any }[]
-    ( typeof arg.parents === 'undefined' || (Array.isArray(arg.parents) && arg.parents.every((item: unknown) => typeof item === '{ [key: string]: any }')) ) &&
+    ( typeof arg.parents === 'undefined' || (Array.isArray(arg.parents) && arg.parents.every((item: unknown) => typeof item === 'object')) ) &&
     // sha?: string
     ( typeof arg.sha === 'undefined' || typeof arg.sha === 'string' ) &&
     // tree?: { [key: string]: any }
@@ -1743,7 +1743,7 @@ export function isSearchCode(arg: any): arg is models.SearchCode {
   arg != null &&
   typeof arg === 'object' &&
     // items?: { [key: string]: any }[]
-    ( typeof arg.items === 'undefined' || (Array.isArray(arg.items) && arg.items.every((item: unknown) => typeof item === '{ [key: string]: any }')) ) &&
+    ( typeof arg.items === 'undefined' || (Array.isArray(arg.items) && arg.items.every((item: unknown) => typeof item === 'object')) ) &&
     // total_count?: number
     ( typeof arg.total_count === 'undefined' || typeof arg.total_count === 'number' ) &&
 
@@ -1756,7 +1756,7 @@ export function isSearchIssues(arg: any): arg is models.SearchIssues {
   arg != null &&
   typeof arg === 'object' &&
     // items?: { [key: string]: any }[]
-    ( typeof arg.items === 'undefined' || (Array.isArray(arg.items) && arg.items.every((item: unknown) => typeof item === '{ [key: string]: any }')) ) &&
+    ( typeof arg.items === 'undefined' || (Array.isArray(arg.items) && arg.items.every((item: unknown) => typeof item === 'object')) ) &&
     // total_count?: number
     ( typeof arg.total_count === 'undefined' || typeof arg.total_count === 'number' ) &&
 
@@ -1769,7 +1769,7 @@ export function isSearchIssuesByKeyword(arg: any): arg is models.SearchIssuesByK
   arg != null &&
   typeof arg === 'object' &&
     // issues?: { [key: string]: any }[]
-    ( typeof arg.issues === 'undefined' || (Array.isArray(arg.issues) && arg.issues.every((item: unknown) => typeof item === '{ [key: string]: any }')) ) &&
+    ( typeof arg.issues === 'undefined' || (Array.isArray(arg.issues) && arg.issues.every((item: unknown) => typeof item === 'object')) ) &&
 
   true
   );
@@ -1780,7 +1780,7 @@ export function isSearchRepositories(arg: any): arg is models.SearchRepositories
   arg != null &&
   typeof arg === 'object' &&
     // items?: { [key: string]: any }[]
-    ( typeof arg.items === 'undefined' || (Array.isArray(arg.items) && arg.items.every((item: unknown) => typeof item === '{ [key: string]: any }')) ) &&
+    ( typeof arg.items === 'undefined' || (Array.isArray(arg.items) && arg.items.every((item: unknown) => typeof item === 'object')) ) &&
     // total_count?: number
     ( typeof arg.total_count === 'undefined' || typeof arg.total_count === 'number' ) &&
 
@@ -1793,7 +1793,7 @@ export function isSearchRepositoriesByKeyword(arg: any): arg is models.SearchRep
   arg != null &&
   typeof arg === 'object' &&
     // repositories?: { [key: string]: any }[]
-    ( typeof arg.repositories === 'undefined' || (Array.isArray(arg.repositories) && arg.repositories.every((item: unknown) => typeof item === '{ [key: string]: any }')) ) &&
+    ( typeof arg.repositories === 'undefined' || (Array.isArray(arg.repositories) && arg.repositories.every((item: unknown) => typeof item === 'object')) ) &&
 
   true
   );
@@ -1815,7 +1815,7 @@ export function isSearchUsers(arg: any): arg is models.SearchUsers {
   arg != null &&
   typeof arg === 'object' &&
     // items?: { [key: string]: any }[]
-    ( typeof arg.items === 'undefined' || (Array.isArray(arg.items) && arg.items.every((item: unknown) => typeof item === '{ [key: string]: any }')) ) &&
+    ( typeof arg.items === 'undefined' || (Array.isArray(arg.items) && arg.items.every((item: unknown) => typeof item === 'object')) ) &&
     // total_count?: number
     ( typeof arg.total_count === 'undefined' || typeof arg.total_count === 'number' ) &&
 
@@ -1828,7 +1828,7 @@ export function isSearchUsersByKeyword(arg: any): arg is models.SearchUsersByKey
   arg != null &&
   typeof arg === 'object' &&
     // users?: { [key: string]: any }[]
-    ( typeof arg.users === 'undefined' || (Array.isArray(arg.users) && arg.users.every((item: unknown) => typeof item === '{ [key: string]: any }')) ) &&
+    ( typeof arg.users === 'undefined' || (Array.isArray(arg.users) && arg.users.every((item: unknown) => typeof item === 'object')) ) &&
 
   true
   );
@@ -1997,7 +1997,7 @@ export function isTree(arg: any): arg is models.Tree {
     // sha?: string
     ( typeof arg.sha === 'undefined' || typeof arg.sha === 'string' ) &&
     // tree?: { [key: string]: any }[]
-    ( typeof arg.tree === 'undefined' || (Array.isArray(arg.tree) && arg.tree.every((item: unknown) => typeof item === '{ [key: string]: any }')) ) &&
+    ( typeof arg.tree === 'undefined' || (Array.isArray(arg.tree) && arg.tree.every((item: unknown) => typeof item === 'object')) ) &&
     // url?: string
     ( typeof arg.url === 'undefined' || typeof arg.url === 'string' ) &&
 
@@ -2014,7 +2014,7 @@ export function isTrees(arg: any): arg is models.Trees {
     // sha?: string
     ( typeof arg.sha === 'undefined' || typeof arg.sha === 'string' ) &&
     // tree?: { [key: string]: any }[]
-    ( typeof arg.tree === 'undefined' || (Array.isArray(arg.tree) && arg.tree.every((item: unknown) => typeof item === '{ [key: string]: any }')) ) &&
+    ( typeof arg.tree === 'undefined' || (Array.isArray(arg.tree) && arg.tree.every((item: unknown) => typeof item === 'object')) ) &&
     // url?: string
     ( typeof arg.url === 'undefined' || typeof arg.url === 'string' ) &&