fix(guards): escaped property names accessed via brackets

Author: vmasek

src/parser.ts

@@ -365,15 +365,20 @@ function parseInterfaceProperties(
           : `'${propName}'`;
       const isRequired = requiredProps.includes(propName);
 
+      const accessProp = (arg: string): string =>
+        arg.startsWith("'") ? `arg[${arg}]` : `arg.${arg}`;
+
       const guardFn = (fn: () => string, prop: Property = {}) => `
       ${
         prop.hasOwnProperty('isRequired') || isRequired
           ? ''
-          : `typeof arg.${name} === 'undefined' ||`
+          : `typeof ${accessProp(name)} === 'undefined' ||`
       }
       ${
         prop.isArray || isArray
-          ? `(Array.isArray(arg.${name}) && arg.${name}.every((item: unknown) => ${
+          ? `(Array.isArray(${accessProp(name)}) && ${accessProp(
+              name,
+            )}.every((item: unknown) => ${
               prop.isPrimitiveType || isPrimitiveType
                 ? `typeof item === '${type}'`
                 : `is${prop.typescriptType || typescriptType}(item)`
@@ -386,7 +391,7 @@ function parseInterfaceProperties(
             })`
           : `${
               prop.isPrimitiveType || isPrimitiveType
-                ? `typeof arg.${prop.name || name} === '${
+                ? `typeof ${accessProp(prop.name || name)} === '${
                     (prop.type || type) === '{ [key: string]: any }'
                       ? 'object'
                       : prop.type || type
@@ -400,15 +405,18 @@ function parseInterfaceProperties(
         propertyAllOf.length
           ? `(${propertyAllOf
               .map(prop =>
-                guardFn(() => `is${prop.typescriptType}(arg.${name})`, prop),
+                guardFn(
+                  () => `is${prop.typescriptType}(${accessProp(name)})`,
+                  prop,
+                ),
               )
               .join(' && ')})`
           : / \| /.test(typescriptType)
           ? `[${(typescriptType || '').replace(
               / \| /g,
               ', ',
-            )}].includes(arg.${name})`
-          : `is${typescriptType}(arg.${name})`,
+            )}].includes(${accessProp(name)})`
+          : `is${typescriptType}(${accessProp(name)})`,
       ).replace(/\s+/g, ' ')}) &&`;
 
       return {

tests/custom/api/guards/index.ts

@@ -264,13 +264,13 @@ export function isTestModel(arg: any): arg is models.TestModel {
   arg != null &&
   typeof arg === 'object' &&
     // '42test'?: string
-    ( typeof arg.'42test' === 'undefined' || typeof arg.'42test' === 'string' ) &&
+    ( typeof arg['42test'] === 'undefined' || typeof arg['42test'] === 'string' ) &&
     // 'anotherKey@'?: string
-    ( typeof arg.'anotherKey@' === 'undefined' || typeof arg.'anotherKey@' === 'string' ) &&
+    ( typeof arg['anotherKey@'] === 'undefined' || typeof arg['anotherKey@'] === 'string' ) &&
     // 'some-key'?: string
-    ( typeof arg.'some-key' === 'undefined' || typeof arg.'some-key' === 'string' ) &&
+    ( typeof arg['some-key'] === 'undefined' || typeof arg['some-key'] === 'string' ) &&
     // 'yet@notherKey'?: string
-    ( typeof arg.'yet@notherKey' === 'undefined' || typeof arg.'yet@notherKey' === 'string' ) &&
+    ( typeof arg['yet@notherKey'] === 'undefined' || typeof arg['yet@notherKey'] === 'string' ) &&
     // count?: number
     ( typeof arg.count === 'undefined' || typeof arg.count === 'number' ) &&
 

tests/esquare/api/guards/index.ts

@@ -585,7 +585,7 @@ export function isRestoreForm(arg: any): arg is models.RestoreForm {
   arg != null &&
   typeof arg === 'object' &&
     // 'passwordСonfirm': string
-    ( typeof arg.'passwordСonfirm' === 'string' ) &&
+    ( typeof arg['passwordСonfirm'] === 'string' ) &&
     // guid?: string
     ( typeof arg.guid === 'undefined' || typeof arg.guid === 'string' ) &&
     // password: string

tests/github/api/guards/index.ts

@@ -539,15 +539,15 @@ export function isEmojis(arg: any): arg is models.Emojis {
   arg != null &&
   typeof arg === 'object' &&
     // '-1'?: string
-    ( typeof arg.'-1' === 'undefined' || typeof arg.'-1' === 'string' ) &&
+    ( typeof arg['-1'] === 'undefined' || typeof arg['-1'] === 'string' ) &&
     // '+1'?: string
-    ( typeof arg.'+1' === 'undefined' || typeof arg.'+1' === 'string' ) &&
+    ( typeof arg['+1'] === 'undefined' || typeof arg['+1'] === 'string' ) &&
     // '100'?: string
-    ( typeof arg.'100' === 'undefined' || typeof arg.'100' === 'string' ) &&
+    ( typeof arg['100'] === 'undefined' || typeof arg['100'] === 'string' ) &&
     // '1234'?: string
-    ( typeof arg.'1234' === 'undefined' || typeof arg.'1234' === 'string' ) &&
+    ( typeof arg['1234'] === 'undefined' || typeof arg['1234'] === 'string' ) &&
     // '8ball'?: string
-    ( typeof arg.'8ball' === 'undefined' || typeof arg.'8ball' === 'string' ) &&
+    ( typeof arg['8ball'] === 'undefined' || typeof arg['8ball'] === 'string' ) &&
     // a?: string
     ( typeof arg.a === 'undefined' || typeof arg.a === 'string' ) &&
     // ab?: string