Handle attributes with hypens in

Author: NathanJPhillips

env-model-generator/src/parse-spring-xml.ts

@@ -3,7 +3,7 @@ import * as _ from "lodash";
 import * as spring from "../xmlns/www.springframework.org/schema/beans";
 import { ConfigParseError } from "./ConfigParseError";
 import * as model from "./model";
-import { parseXmlString } from "./utils";
+import { makeIdentifier, parseXmlString } from "./utils";
 
 export default async function parseSpringXmlConfigFile(fileNames: string[]) {
   // Avoid loading a file more than once or getting into a cyclic dependency loop
@@ -138,9 +138,11 @@ function flattenAttributes(obj: any) {
   // Now deal with $, which contains all the attributes
   if (obj.$) {
     for (const key in obj.$) {
-      if (obj.$.hasOwnProperty(key))
+      if (obj.$.hasOwnProperty(key)) {
         // Add the attributes as direct children of the object
-        result[key] = obj.$[key];
+        // If the name contains a hyphen, turn it into a valid identifier
+        result[makeIdentifier(key)] = obj.$[key];
+      }
     }
   }
   return result;