fix: generated function names collision

Author: ivan-tymoshenko

index.js

@@ -297,11 +297,11 @@ function build (schema, options) {
   switch (schema.type) {
     case 'object':
       main = '$main'
-      code = buildObject(location, code, main)
+      code = buildObject(location, code, main, main)
       break
     case 'array':
       main = '$main'
-      code = buildArray(location, code, main)
+      code = buildArray(location, code, main, main)
       schema = location.schema
       break
     case 'string':
@@ -449,13 +449,13 @@ function addPatternProperties (location) {
     const ifPpKeyExists = `if (/${regex.replace(/\\*\//g, '\\/')}/.test(keys[i])) {`
 
     if (type === 'object') {
-      code += `${buildObject(ppLocation, '', 'buildObjectPP' + index)}
+      code += `${buildObject(ppLocation, '', 'buildObjectPP' + index, 'buildObjectPP' + index)}
           ${ifPpKeyExists}
           ${addComma}
           json += serializer.asString(keys[i]) + ':' + buildObjectPP${index}(obj[keys[i]])
       `
     } else if (type === 'array') {
-      code += `${buildArray(ppLocation, '', 'buildArrayPP' + index)}
+      code += `${buildArray(ppLocation, '', 'buildArrayPP' + index, 'buildArrayPP' + index)}
           ${ifPpKeyExists}
           ${addComma}
           json += serializer.asString(keys[i]) + ':' + buildArrayPP${index}(obj[keys[i]])
@@ -539,12 +539,12 @@ function additionalProperty (location) {
   const format = ap.format
   const stringSerializer = getStringSerializer(format)
   if (type === 'object') {
-    code += `${buildObject(apLocation, '', 'buildObjectAP')}
+    code += `${buildObject(apLocation, '', 'buildObjectAP', 'buildObjectAP')}
         ${addComma}
         json += serializer.asString(keys[i]) + ':' + buildObjectAP(obj[keys[i]])
     `
   } else if (type === 'array') {
-    code += `${buildArray(apLocation, '', 'buildArrayAP')}
+    code += `${buildArray(apLocation, '', 'buildArrayAP', 'buildArrayAP')}
         ${addComma}
         json += serializer.asString(keys[i]) + ':' + buildArrayAP(obj[keys[i]])
     `
@@ -893,13 +893,14 @@ function toJSON (variableName) {
   `
 }
 
-function buildObject (location, code, name) {
+function buildObject (location, code, functionName, name) {
   const schema = location.schema
   if (schema.$id !== undefined) {
     schemaReferenceMap.set(schema.$id, schema)
   }
   code += `
-    function ${name} (input) {
+    function ${functionName} (input) {
+      // ${name}
   `
   if (schema.nullable) {
     code += `
@@ -909,14 +910,14 @@ function buildObject (location, code, name) {
   `
   }
 
-  if (objectReferenceSerializersMap.has(schema) && objectReferenceSerializersMap.get(schema) !== name) {
+  if (objectReferenceSerializersMap.has(schema) && objectReferenceSerializersMap.get(schema) !== functionName) {
     code += `
       return ${objectReferenceSerializersMap.get(schema)}(input)
     }
     `
     return code
   }
-  objectReferenceSerializersMap.set(schema, name)
+  objectReferenceSerializersMap.set(schema, functionName)
 
   code += `
       var obj = ${toJSON('input')}
@@ -945,13 +946,14 @@ function buildObject (location, code, name) {
   return code
 }
 
-function buildArray (location, code, name, key = null) {
+function buildArray (location, code, functionName, name, key = null) {
   let schema = location.schema
   if (schema.$id !== undefined) {
     schemaReferenceMap.set(schema.$id, schema)
   }
   code += `
-    function ${name} (obj) {
+    function ${functionName} (obj) {
+      // ${name}
   `
   if (schema.nullable) {
     code += `
@@ -984,7 +986,7 @@ function buildArray (location, code, name, key = null) {
       `
       return code
     }
-    arrayItemsReferenceSerializersMap.set(schema.items, name)
+    arrayItemsReferenceSerializersMap.set(schema.items, functionName)
   }
 
   let result = { code: '', laterCode: '' }
@@ -1120,18 +1122,9 @@ function dereferenceOfRefs (location, type) {
   return locations
 }
 
-let strNameCounter = 0
-function asFuncName (str) {
-  // only allow chars that can work
-  let rep = str.replace(/[^a-zA-Z0-9$_]/g, '')
-
-  if (rep.length === 0) {
-    return 'anan' + strNameCounter++
-  } else if (rep !== str) {
-    rep += strNameCounter++
-  }
-
-  return rep
+let genFuncNameCounter = 0
+function generateFuncName () {
+  return 'anonymous' + genFuncNameCounter++
 }
 
 function nested (laterCode, name, key, location, subKey, isArray) {
@@ -1182,13 +1175,13 @@ function nested (laterCode, name, key, location, subKey, isArray) {
       code += `json += ${funcName}(obj${accessor})`
       break
     case 'object':
-      funcName = asFuncName(name + key + subKey)
-      laterCode = buildObject(location, laterCode, funcName)
+      funcName = generateFuncName()
+      laterCode = buildObject(location, laterCode, funcName, name + key + subKey)
       code += `json += ${funcName}(obj${accessor})`
       break
     case 'array':
-      funcName = asFuncName('$arr' + name + key + subKey) // eslint-disable-line
-      laterCode = buildArray(location, laterCode, funcName, key)
+      funcName = generateFuncName()
+      laterCode = buildArray(location, laterCode, funcName, name + key + subKey, key)
       code += `json += ${funcName}(obj${accessor})`
       break
     case undefined:

test/nestedObjects.test.js

@@ -30,3 +30,34 @@ test('nested objects with same properties', (t) => {
   })
   t.equal(value, '{"stringProperty":"string1","objectProperty":{"stringProperty":"string2","numberProperty":42}}')
 })
+
+test('names collision', (t) => {
+  t.plan(1)
+
+  const schema = {
+    title: 'nested objects with same properties',
+    type: 'object',
+    properties: {
+      test: {
+        type: 'object',
+        properties: {
+          a: { type: 'string' }
+        }
+      },
+      tes: {
+        type: 'object',
+        properties: {
+          b: { type: 'string' },
+          t: { type: 'object' }
+        }
+      }
+    }
+  }
+  const stringify = build(schema)
+  const data = {
+    test: { a: 'a' },
+    tes: { b: 'b', t: {} }
+  }
+
+  t.equal(stringify(data), JSON.stringify(data))
+})