@sprig-and-prose/tutorial-svelte 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sprig-and-prose/tutorial-svelte",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "type": "module",
   "description": "A calm SvelteKit package that transforms markdown files into paged tutorial routes",
   "main": "src/index.js",
@@ -9,6 +9,7 @@
     ".": "./src/index.js",
     "./kit": {
       "types": "./src/kit/index.d.ts",
+      "import": "./src/kit/index.js",
       "default": "./src/kit/index.js"
     },
     "./kit/Tutorial.svelte": "./src/kit/Tutorial.svelte"

package/src/lib/createTutorialEntries.js

@@ -15,7 +15,32 @@ export function createTutorialEntries({ routeBase, modules, enableDirectoryIndex
 
 	return async () => {
 		const entries = generateEntries(modules, routeBase, enableDirectoryIndex);
-		return entries;
+		// Ensure we always return an array, even if empty
+		if (!Array.isArray(entries)) {
+			console.warn('[tutorial-svelte] generateEntries did not return an array:', entries);
+			return [];
+		}
+		// Ensure all entries have the correct structure
+		// For catch-all routes, SvelteKit expects { path: "..." } not { params: { path: "..." } }
+		const validEntries = entries.filter((entry) => {
+			if (!entry || typeof entry !== 'object') {
+				return false;
+			}
+			// CRITICAL: For catch-all routes, path must be directly on the entry object
+			if (!('path' in entry)) {
+				return false;
+			}
+			const path = entry.path;
+			if (typeof path !== 'string' || path.length === 0) {
+				return false;
+			}
+			// SvelteKit doesn't allow paths starting or ending with /
+			if (path.startsWith('/') || path.endsWith('/')) {
+				return false;
+			}
+			return true;
+		});
+		return validEntries;
 	};
 }
 

package/src/lib/routes.js

@@ -79,7 +79,7 @@ export function resolveRoute(pathArray, modules, routeBase) {
  * @param {Record<string, any>} modules - Modules from import.meta.glob()
  * @param {string} routeBase - Base route path
  * @param {boolean} enableDirectoryIndex - Whether to generate directory index entries
- * @returns {Array<{ path: string[] }>}
+ * @returns {Array<{ path: string }>}
  */
 export function generateEntries(modules, routeBase, enableDirectoryIndex) {
 	const entries = [];
@@ -87,6 +87,11 @@ export function generateEntries(modules, routeBase, enableDirectoryIndex) {
 
 	// Generate entries for all pages of all segments
 	for (const item of discovered) {
+		// Skip items with empty routePath
+		if (!item.routePath || item.routePath.trim() === '') {
+			continue;
+		}
+
 		// Get markdown content to count pages
 		const module = modules[item.filePath];
 		let content = '';
@@ -112,18 +117,25 @@ export function generateEntries(modules, routeBase, enableDirectoryIndex) {
 			continue;
 		}
 
-		const segmentPathParts = item.routePath.split('/');
+		const segmentPathParts = item.routePath.split('/').filter(Boolean);
+
+		// Skip if routePath is empty (shouldn't happen, but be safe)
+		if (segmentPathParts.length === 0) {
+			continue;
+		}
 
 		// Generate entry for each page
 		for (let pageNum = 1; pageNum <= pages.length; pageNum++) {
+			const pathString = [...segmentPathParts, String(pageNum)].join('/');
 			entries.push({
-				path: [...segmentPathParts, String(pageNum)],
+				path: pathString,
 			});
 		}
 
 		// Generate stub entry for segment root
+		const segmentPathString = segmentPathParts.join('/');
 		entries.push({
-			path: segmentPathParts,
+			path: segmentPathString,
 		});
 
 		// Generate directory index entries if enabled
@@ -135,18 +147,23 @@ export function generateEntries(modules, routeBase, enableDirectoryIndex) {
 
 				// Check if we've already added this directory
 				const exists = entries.some(
-					(e) => e.path.length === dirPath.length && e.path.join('/') === dirPathStr
+					(e) => e.path === dirPathStr
 				);
 
 				if (!exists) {
 					entries.push({
-						path: dirPath,
+						path: dirPathStr,
 					});
 				}
 			}
 		}
 	}
 
-	return entries;
+	// Filter out any entries with empty or invalid paths
+	// SvelteKit requires catch-all routes to have at least one segment
+	return entries.filter((entry) => {
+		const path = entry.path;
+		return typeof path === 'string' && path.length > 0 && !path.startsWith('/') && !path.endsWith('/');
+	});
 }