@epic-web/workshop-utils 6.51.1 → 6.52.0

package/dist/apps.server.js

@@ -416,7 +416,12 @@ async function _getApps({ timings, request, } = {}) {
                 }
             }
             // at this point, we know that a and b are different types...
-            if (isProblemApp(a)) {
+            // Both should be problem or solution apps at this point
+            const aIsProblem = isProblemApp(a);
+            const aIsSolution = isSolutionApp(a);
+            const bIsProblem = isProblemApp(b);
+            const bIsSolution = isSolutionApp(b);
+            if (aIsProblem && bIsSolution) {
                 if (a.exerciseNumber === b.exerciseNumber) {
                     return a.stepNumber <= b.stepNumber ? 1 : -1;
                 }
@@ -424,7 +429,7 @@ async function _getApps({ timings, request, } = {}) {
                     return a.exerciseNumber <= b.exerciseNumber ? 1 : -1;
                 }
             }
-            if (isSolutionApp(a)) {
+            if (aIsSolution && bIsProblem) {
                 if (a.exerciseNumber === b.exerciseNumber) {
                     return a.stepNumber < b.stepNumber ? -1 : 1;
                 }
@@ -432,7 +437,10 @@ async function _getApps({ timings, request, } = {}) {
                     return a.exerciseNumber < b.exerciseNumber ? -1 : 1;
                 }
             }
-            console.error('unhandled sorting case', a, b);
+            console.error('unhandled sorting case', {
+                a: { type: a.type, name: a.name, isProblem: aIsProblem, isSolution: aIsSolution },
+                b: { type: b.type, name: b.name, isProblem: bIsProblem, isSolution: bIsSolution },
+            });
             return 0;
         });
         return sortedApps;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@epic-web/workshop-utils",
-  "version": "6.51.1",
+  "version": "6.52.0",
   "publishConfig": {
     "access": "public"
   },