Expanding attributes finished

src/drafter.coffee

@@ -69,8 +69,8 @@ class Drafter
                 @dataStructures[subElement.name.literal] = subElement
               when 'resource'
 
-                for resourceElement in subElement.content
-                  @dataStructures[resourceElement.name.literal] = resourceElement if resourceElement.element is 'dataStructure'
+                for resourceSubElement in subElement.content
+                  @dataStructures[resourceSubElement.name.literal] = resourceSubElement if resourceSubElement.element is 'dataStructure'
 
       # Expand the gathered data structures
       for rule in rules

src/rules/mson-inheritance.coffee

@@ -6,6 +6,18 @@ module.exports =
   expanded: {}
   dataStructures: {}
 
+  # Expand dataStructure element
+  dataStructure: (element) ->
+    superType = element.typeDefinition.name
+    typeName = element.name
+
+    if not typeName
+      typeName =
+        literal: ''
+
+    @expandInheritance typeName.literal, element
+    delete @expanded['']
+
   # Given a data structure, expand its inheritance recursively
   #
   # @param name [String] Name of the data structure

src/rules/mson-member-type-name.coffee

@@ -6,6 +6,18 @@ module.exports =
   expanded: {}
   dataStructures: {}
 
+  # Expand dataStructure element
+  dataStructure: (element) ->
+    superType = element.typeDefinition.name
+    typeName = element.name
+
+    if not typeName
+      typeName =
+        literal: ''
+
+    @expandMember typeName.literal, element
+    delete @expanded['']
+
   # Given a list of elements, recursively expand member type name contained
   # in a group of elements inside the initial group of elements
   #

src/rules/mson-mixin.coffee

@@ -6,6 +6,18 @@ module.exports =
   expanded: {}
   dataStructures: {}
 
+  # Expand dataStructure element
+  dataStructure: (element) ->
+    superType = element.typeDefinition.name
+    typeName = element.name
+
+    if not typeName
+      typeName =
+        literal: ''
+
+    @expandMixin typeName.literal, element
+    delete @expanded['']
+
   # Given a list of elements, recursively expand mixins contained
   # in a group of elements inside the initial group of elements
   #