madden-franchise 2.5.0 → 2.5.1

package/FranchiseSchema.js

@@ -46,6 +46,7 @@ class FranchiseSchema extends EventEmitter {
     this.meta = this.schema.meta;
     this.schemas = this.schema.schemas;
     this.schemaMap = {};
+    this.enumMap = {};
   
     for (let i = 0; i < this.schemas.length; i++) {
       const schema = this.schemas[i];
@@ -56,6 +57,7 @@ class FranchiseSchema extends EventEmitter {
   
         if (attribute.enum) {
           attribute.enum = new FranchiseEnum(attribute.enum);
+          this.enumMap[attribute.enum.name] = attribute.enum;
         } 
       }
     }
@@ -64,6 +66,11 @@ class FranchiseSchema extends EventEmitter {
     const extraSchemas = schemaGenerator.getExtraSchemas();
     extraSchemas.forEach((schema) => {
       if (!this.schemaMap[schema.name]) {
+        schema.attributes.forEach((attrib) => {
+          if (attrib.enum) {
+            attrib.enum = new FranchiseEnum(this.enumMap[attrib.enum]);
+          }
+        })
         this.schemas.unshift(schema);
         this.schemaMap[schema.name] = schema;
         addedExtraSchema = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "madden-franchise",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "Tools to read a madden franchise file and get data from it",
   "main": "FranchiseFile.js",
   "scripts": {

package/services/schemaGenerator.js

@@ -6,7 +6,6 @@ const utilService = require('./utilService');
 const FranchiseEnum = require('../FranchiseEnum');
 const XmlParser = require('node-xml-stream-parser');
 const EventEmitter = require('events').EventEmitter;
-const extraSchemas = JSON.parse(JSON.stringify(require(path.join(__dirname, '../data/schemas/extra-schemas.json'))));
 
 let schemaGenerator = {};
 schemaGenerator.eventEmitter = new EventEmitter();
@@ -22,6 +21,7 @@ schemaGenerator.generateFromStream = (stream, showOutput, outputFile) => {
   schemaGenerator.schemaMap = {};
   schemaGenerator.schemaMeta = {};
   schemaGenerator.enums = [];
+  const extraSchemas = schemaGenerator.getExtraSchemas();
 
   schemaGenerator.xml = new XmlParser();
 
@@ -33,7 +33,7 @@ schemaGenerator.generateFromStream = (stream, showOutput, outputFile) => {
         console.error(err);
         throw err;
       }
-
+      
       schemaGenerator.enums.forEach((theEnum) => {
         theEnum.setMemberLength();
       });
@@ -159,7 +159,7 @@ schemaGenerator.generateFromStream = (stream, showOutput, outputFile) => {
   function addExtraSchemas() {
     extraSchemas.forEach((schema) => {
       if (!schemaGenerator.schemaMap[schema.name]) {
-        schema.attributes.filter((attrib) => { 
+        schema.attributes.filter((attrib) => {
           return attrib.enum && !(attrib.enum instanceof FranchiseEnum);
         }).forEach((attrib) => {
           attrib.enum = getEnum(attrib.enum);
@@ -184,19 +184,7 @@ schemaGenerator.generateFromStream = (stream, showOutput, outputFile) => {
 };
 
 schemaGenerator.getExtraSchemas = () => {
-  let newSchemas = [];
-
-  extraSchemas.forEach((schema) => {
-    schema.attributes.filter((attrib) => { 
-      return attrib.enum && !(attrib.enum instanceof FranchiseEnum);
-    }).forEach((attrib) => {
-      attrib.enum = new FranchiseEnum(attrib.enum);
-    });
-
-    newSchemas.push(schema);
-  });
-
-  return newSchemas;
+  return JSON.parse(JSON.stringify(require(path.join(__dirname, '../data/schemas/extra-schemas.json'))));
 };
 
 schemaGenerator.calculateInheritedSchemas = (schemaList) => {