Fix patterns are not sorted, when there is a nested pattern (#1283)

* Fix patterns are not sorted, when there is a nested pattern

* #1283 Add order test cases

Author: JosefBredereck

packages/core/src/lib/readDocumentation.js

@@ -83,9 +83,10 @@ module.exports = function(pattern, patternlab, isVariant) {
   // Read Documentation for Pattern-Group
   // Use this approach, since pattern lab is a pattern driven software
   try {
+    const groupRelPath = pattern.relPath.split(path.sep);
     const markdownFileNameGroup = path.resolve(
       patternlab.config.paths.source.patterns,
-      path.parse(pattern.subdir).dir || pattern.subdir,
+      groupRelPath[0] || pattern.subdir,
       GROUP_DOC_PREFIX + pattern.patternGroup + FILE_EXTENSION
     );
     const markdownFileContentsGroup = fs.readFileSync(
@@ -115,10 +116,11 @@ module.exports = function(pattern, patternlab, isVariant) {
 
   // Read Documentation for Pattern-Subgroup
   try {
+    const subgroupRelPath = pattern.relPath.split(path.sep);
     const markdownFileNameSubgroup = path.resolve(
       patternlab.config.paths.source.patterns,
-      path.parse(pattern.subdir).dir,
-      path.parse(pattern.subdir).base,
+      subgroupRelPath[0],
+      subgroupRelPath[1],
       GROUP_DOC_PREFIX + pattern.patternSubgroup + FILE_EXTENSION
     );
     const markdownFileContentsSubgroup = fs.readFileSync(

packages/core/test/files/_patterns/orderTest/_orderTest.md

@@ -0,0 +1,3 @@
+---
+order: 1
+---

packages/core/test/files/_patterns/orderTest/a/a-test.mustache

@@ -0,0 +1,3 @@
+---
+order: 2
+---

packages/core/test/files/_patterns/orderTest/b/_b.md

@@ -0,0 +1,3 @@
+---
+order: -1
+---

packages/core/test/files/_patterns/orderTest/b/b-test.mustache

@@ -0,0 +1,3 @@
+---
+order: 1
+---

packages/core/test/files/_patterns/orderTest/c/_c.md

@@ -111,3 +111,65 @@ tap.test(
     test.end();
   }
 );
+
+tap.test(
+  'loadPattern - group and subgroup ordering will be taken from markdown files',
+  test => {
+    //arrange
+    const patternlab = util.fakePatternLab(patterns_dir);
+
+    const basePatternAPath = path.join('orderTest', 'a', 'a-test.mustache');
+    const basePatternBPath = path.join('orderTest', 'b', 'b-test.mustache');
+    const basePatternCPath = path.join(
+      'orderTest',
+      'c',
+      'subfolder',
+      'subfolder.mustache'
+    );
+
+    //act
+    const resultPatternA = loadPattern(basePatternAPath, patternlab);
+    const resultPatternB = loadPattern(basePatternBPath, patternlab);
+    const resultPatternC = loadPattern(basePatternCPath, patternlab);
+
+    //assert
+    console.log(resultPatternA.patternGroupData.order);
+    test.same(
+      resultPatternA.patternGroupData.order,
+      1,
+      'Pattern group should be loaded as 1'
+    );
+    console.log(resultPatternA.patternSubgroupData.order || 0);
+    test.same(
+      resultPatternA.patternSubgroupData.order || 0,
+      0,
+      'Pattern Subgroup not be availabe and default to 0'
+    );
+
+    console.log(resultPatternB.patternGroupData.order);
+    test.same(
+      resultPatternB.patternGroupData.order,
+      1,
+      'Pattern group should be loaded as 1'
+    );
+    console.log(resultPatternB.patternSubgroupData.order);
+    test.same(
+      resultPatternB.patternSubgroupData.order,
+      2,
+      'Pattern Subgroup should be loaded as 2'
+    );
+
+    test.same(
+      resultPatternC.patternGroupData.order,
+      1,
+      'Pattern group should be loaded as 1'
+    );
+    test.same(
+      resultPatternC.patternSubgroupData.order,
+      -1,
+      'Pattern Subgroup should be loaded as -1'
+    );
+
+    test.end();
+  }
+);