fix(guards): array nested in additionalProperties

Author: vmasek

src/helper.ts

@@ -90,8 +90,14 @@ export function toTypescriptType(type: string | undefined): string {
   return typeName(type);
 }
 
+const PARENT_PROP_PLACEHOLDER = '<-';
+
 export function accessProp(arg: string): string {
-  return arg.startsWith("'") ? `arg[${arg}]` : `arg.${arg}`;
+  return arg.startsWith(PARENT_PROP_PLACEHOLDER)
+    ? arg.replace(PARENT_PROP_PLACEHOLDER, '')
+    : arg.startsWith("'")
+    ? `arg[${arg}]`
+    : `arg.${arg}`;
 }
 
 function guardArray(prop: Property): string {
@@ -121,10 +127,15 @@ export function guardFn(fn: () => string, prop: Property): string {
       }
       ${
         prop.name === ADDITIONAL_PROPERTIES_KEY
-          ? `Object.values(arg).every((item: unknown) => ${
-              prop.isPrimitiveType
-                ? `typeof item === '${prop.type}'`
-                : `is${prop.typescriptType}(item)`
+          ? `Object.values(arg).every((value: unknown) => ${
+              prop.isArray
+                ? guardArray({
+                    ...prop,
+                    name: `${PARENT_PROP_PLACEHOLDER}value`,
+                  })
+                : prop.isPrimitiveType
+                ? `typeof value === '${prop.type}'`
+                : `is${prop.typescriptType}(value)`
             })`
           : prop.isArray
           ? guardArray(prop)

tests/custom/api/guards/index.ts

@@ -99,7 +99,7 @@ export function isDictionary(arg: any): arg is models.Dictionary {
   arg != null &&
   typeof arg === 'object' &&
     // [key: string]: DictionaryItem
-    ( Object.values(arg).every((item: unknown) => isDictionaryItem(item)) ) &&
+    ( Object.values(arg).every((value: unknown) => isDictionaryItem(value)) ) &&
 
   true
   );
@@ -110,7 +110,7 @@ export function isDictionaryItem(arg: any): arg is models.DictionaryItem {
   arg != null &&
   typeof arg === 'object' &&
     // [key: string]: number
-    ( Object.values(arg).every((item: unknown) => typeof item === 'number') ) &&
+    ( Object.values(arg).every((value: unknown) => typeof value === 'number') ) &&
 
   true
   );
@@ -200,6 +200,28 @@ export function isMyInterface(arg: any): arg is models.MyInterface {
   );
   }
 
+export function isPageData(arg: any): arg is models.PageData {
+  return (
+  arg != null &&
+  typeof arg === 'object' &&
+    // appliedIf?: PageDataRules
+    ( typeof arg.appliedIf === 'undefined' || isPageDataRules(arg.appliedIf) ) &&
+
+  true
+  );
+  }
+
+export function isPageDataRules(arg: any): arg is models.PageDataRules {
+  return (
+  arg != null &&
+  typeof arg === 'object' &&
+    // [key: string]: string[]
+    ( Object.values(arg).every((value: unknown) => (Array.isArray(value) && value.every((item: unknown) => typeof item === 'string'))) ) &&
+
+  true
+  );
+  }
+
 export function isPet(arg: any): arg is models.Pet {
   return (
   arg != null &&

tests/custom/api/models/index.ts

@@ -12,6 +12,8 @@ export { ItemModelList } from './item-model-list.model';
 export { Model } from './model.model';
 export { Mouse } from './mouse.model';
 export { MyInterface } from './my-interface.model';
+export { PageData } from './page-data.model';
+export { PageDataRules } from './page-data-rules.model';
 export { Pet } from './pet.model';
 export { Possition } from './possition.enum';
 export { Right } from './right.enum';

tests/custom/api/models/page-data-rules.model.ts

@@ -0,0 +1,5 @@
+/* tslint:disable */
+
+export interface PageDataRules {
+  [key: string]: string[];
+}

tests/custom/api/models/page-data.model.ts

@@ -0,0 +1,8 @@
+/* tslint:disable */
+import {
+  PageDataRules,
+} from '.';
+
+export interface PageData {
+  appliedIf?: PageDataRules;
+}

tests/custom/swagger.yaml

@@ -342,3 +342,15 @@ definitions:
     type: object
     additionalProperties:
       type: number
+
+  PageDataRules:
+    type: object
+    additionalProperties:
+      type: array
+      items:
+        type: string
+  PageData:
+    type: object
+    properties:
+      appliedIf:
+        $ref: '#/definitions/PageDataRules'

tests/github/api/guards/index.ts

@@ -922,7 +922,7 @@ export function isLanguages(arg: any): arg is models.Languages {
   arg != null &&
   typeof arg === 'object' &&
     // [key: string]: number
-    ( Object.values(arg).every((item: unknown) => typeof item === 'number') ) &&
+    ( Object.values(arg).every((value: unknown) => typeof value === 'number') ) &&
 
   true
   );