fixes error handling

debitoor · Jul 12, 2017 · f506738 · f506738
1 parent 72cef14
commit f506738
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/packages/nocms/lib/server.js b/packages/nocms/lib/server.js
@@ -35,6 +35,11 @@ function createServer({ resolveOutputPath, resourceProvider, commandSender, port
 				const resource = resources.find(function (resource) {
 					return resource.id === resourceId;
 				});
+
+				if (!resource) {
+					throw new Error('Resource Not Found');
+				}
+
 				const variant = parseInt(req.query.variant) || 0;
 				let outFile = resource.outFile;
 
@@ -44,10 +49,6 @@ function createServer({ resolveOutputPath, resourceProvider, commandSender, port
 					outFile = parts.filter(Boolean).join('.');
 				}
 
-				if (!resource) {
-					throw new Error('Resource Not Found');
-				}
-
 				yield commandSender.sendCommand({
 					id: ++count,
 					name: 'compileResource',

diff --git a/packages/nocms/src/lib/server.js b/packages/nocms/src/lib/server.js
@@ -15,6 +15,11 @@ export function createServer ({resolveOutputPath, resourceProvider, commandSende
 			const resourceId = url.parse(req.url).pathname;
 			const resources = await resourceProvider.getResources();
 			const resource = resources.find(resource => resource.id === resourceId);
+
+			if (!resource) {
+				throw new Error('Resource Not Found');
+			}
+
 			const variant = parseInt(req.query.variant) || 0;
 			let outFile = resource.outFile;
 
@@ -23,11 +28,7 @@ export function createServer ({resolveOutputPath, resourceProvider, commandSende
 				parts.splice(-1, 0, variant);
 				outFile = parts.filter(Boolean).join('.');
 			}
-
-			if (!resource) {
-				throw new Error('Resource Not Found');
-			}
-
+
 			await commandSender.sendCommand({
 				id: ++count,
 				name: 'compileResource',