fix(generators): improve identifier checking

OliverDudgeon · Aug 31, 2021 · 8b0e079 · 8b0e079
1 parent 45ff8fb
commit 8b0e079
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/core/getters/keys.ts b/src/core/getters/keys.ts
@@ -1,3 +1,5 @@
+import { keyword } from 'esutils';
+
 export const getKey = (key: string) => {
- return key.match(/[^\w\s]/g) !== null ? `'${key}'` : key;
+ return keyword.isIdentifierNameES5(key) ? key : `'${key}'`;
 };
diff --git a/src/core/getters/object.mock.ts b/src/core/getters/object.mock.ts
@@ -1,13 +1,13 @@
 import cuid from 'cuid';
 import { ReferenceObject, SchemaObject } from 'openapi3-ts';
-import { keyword } from 'esutils';
 import { ContextSpecs, MockOptions } from '../../types';
 import { GeneratorImport } from '../../types/generator';
 import { MockDefinition } from '../../types/mocks';
 import { isBoolean, isReference } from '../../utils/is';
 import { count } from '../../utils/occurrence';
 import { resolveMockValue } from '../resolvers/value.mock';
 import { combineSchemasMock } from './combine.mock';
+import { getKey } from './keys';
 
 export const getMockObject = async ({
  item,
@@ -87,9 +87,7 @@ export const getMockObject = async ({
  imports = [...imports, ...resolvedValue.imports];
  properties = [...properties, key];
 
- const keyDefinition = keyword.isIdentifierNameES5(key)
- ? key
- : `'${key}'`;
+ const keyDefinition = getKey(key);
  if (!isRequired && !resolvedValue.overrided) {
  return `${keyDefinition}: faker.helpers.randomize([${resolvedValue.value}, undefined])`;
  }