@joystick.js/cli-canary 0.0.0-canary.581 → 0.0.0-canary.583

package/dist/lib/development_server/watch_for_changes/index.js

@@ -1 +1 @@
-import f from"chokidar";import h from"fs";import{dirname as m}from"path";import k from"../../build/build_files.js";import y from"../../debounce.js";import s from"./get_after_run_tasks.js";import g from"./get_file_codependencies.js";import l from"../../build/get_file_operation.js";import v from"../../build/get_path_platform.js";import w from"../../types.js";import b from"./watch_paths.js";const{mkdir:p,copyFile:$,rm:u}=h.promises,o=async(e={},i={})=>{const a=process.initial_build_complete?await g(e?.path):[];if(i?.is_build_file&&await k({files:[{path:e?.path,platform:v(e?.path)}]}).catch((t=[])=>{process.initial_build_complete?console.log(t):process.exit(0)}),a?.length>0)for(let t=0;t<a?.length;t+=1){const r=a[t];return o({path:r})}return Promise.resolve()},x=async(e={})=>{switch(e?.operation){case"add_directory":return p(`.joystick/build/${e?.path}`,{recursive:!0});case"build_file":return o(e,{is_build_file:!0});case"copy_file":return await p(m(`.joystick/build/${e?.path}`),{recursive:!0}),await $(e?.path,`.joystick/build/${e?.path}`),o(e,{is_build_file:!1});case"delete_directory":return u(`.joystick/build/${e?.path}`,{recursive:!0});case"delete_file":return await u(`.joystick/build/${e?.path}`,{recursive:!0}),o(e,{is_build_file:!1});default:return!0}},D=(e={})=>({operation:e?.event,path:e?.path,after_run_tasks:process.initial_build_complete?s(e?.path):["start_app_server","start_hmr_server"]}),A=(e={})=>({operation:e?.event,path:e?.path,after_run_tasks:process.initial_build_complete?s(e?.path):["start_app_server","start_hmr_server"]}),F=(e={})=>({operation:e?.event,path:e?.path,after_run_tasks:process.initial_build_complete?s(e?.path):["start_app_server","start_hmr_server"]}),P=(e={})=>({operation:l(e?.path),path:e?.path,after_run_tasks:process.initial_build_complete?s(e?.path):["start_app_server","start_hmr_server"]}),S=(e={})=>({operation:l(e?.path),path:e?.path,after_run_tasks:process.initial_build_complete?s(e?.path):["start_app_server","start_hmr_server"]}),q=(e={})=>{switch(e?.event){case"add_file":return S(e);case"change_file":return P(e);case"delete_file":return F(e);case"add_directory":return A(e);case"delete_directory":return D(e)}},z=async(e=[],i={})=>{const a=new Set([]);for(let r=0;r<e?.length;r+=1){const _=e[r],n=q(_);if(await x(n),n?.after_run_tasks)for(let c=0;c<n?.after_run_tasks?.length;c+=1){const d=n?.after_run_tasks[c];a.add(d)}}const t=Array.from(a);for(let r=0;r<t?.length;r+=1){const _=t[r];w.is_function(i[_])&&await i[_](e)}},B=(e="")=>{switch(e){case"add":return"add_file";case"change":return"change_file";case"unlink":return"delete_file";case"addDir":return"add_directory";case"unlinkDir":return"delete_directory"}},C=(e={})=>{const i=f.watch(b.map(({path:t})=>t),{ignored:".joystick"});let a=[];process.initial_build_complete=!1,i.on("error",t=>console.error(t)),i.on("all",(t,r)=>{a.push({event:B(t),path:r}),y(async()=>{await z(a,e),process.initial_build_complete=!0,a=[]},100)})};var R=C;export{R as default};
+import f from"chokidar";import h from"fs";import{dirname as m}from"path";import y from"../../build/build_files.js";import g from"../../debounce.js";import s from"./get_after_run_tasks.js";import k from"./get_file_codependencies.js";import l from"../../build/get_file_operation.js";import v from"../../build/get_path_platform.js";import w from"../../types.js";import b from"./watch_paths.js";const{mkdir:p,copyFile:R,rm:u}=h.promises,c=async(e={},i={})=>{const a=process.initial_build_complete?await k(e?.path):[];if(i?.is_build_file&&await y({files:[{path:e?.path,platform:v(e?.path)}]}).catch((t=[])=>{if(!process.initial_build_complete&&t?.length>0&&process.exit(0),process.initial_build_complete&&t?.length>0)throw process.app_server_process.send(JSON.stringify({type:"BUILD_ERROR",paths:t.filter(({success:r})=>!r)})),new Error("BUILD_ERROR")}),a?.length>0)for(let t=0;t<a?.length;t+=1){const r=a[t];return c({path:r})}return Promise.resolve()},$=async(e={})=>{switch(e?.operation){case"add_directory":return p(`.joystick/build/${e?.path}`,{recursive:!0});case"build_file":return c(e,{is_build_file:!0});case"copy_file":return await p(m(`.joystick/build/${e?.path}`),{recursive:!0}),await R(e?.path,`.joystick/build/${e?.path}`),c(e,{is_build_file:!1});case"delete_directory":return u(`.joystick/build/${e?.path}`,{recursive:!0});case"delete_file":return await u(`.joystick/build/${e?.path}`,{recursive:!0}),c(e,{is_build_file:!1});default:return!0}},D=(e={})=>({operation:e?.event,path:e?.path,after_run_tasks:process.initial_build_complete?s(e?.path):["start_app_server","start_hmr_server"]}),E=(e={})=>({operation:e?.event,path:e?.path,after_run_tasks:process.initial_build_complete?s(e?.path):["start_app_server","start_hmr_server"]}),O=(e={})=>({operation:e?.event,path:e?.path,after_run_tasks:process.initial_build_complete?s(e?.path):["start_app_server","start_hmr_server"]}),x=(e={})=>({operation:l(e?.path),path:e?.path,after_run_tasks:process.initial_build_complete?s(e?.path):["start_app_server","start_hmr_server"]}),B=(e={})=>({operation:l(e?.path),path:e?.path,after_run_tasks:process.initial_build_complete?s(e?.path):["start_app_server","start_hmr_server"]}),I=(e={})=>{switch(e?.event){case"add_file":return B(e);case"change_file":return x(e);case"delete_file":return O(e);case"add_directory":return E(e);case"delete_directory":return D(e)}},L=async(e=[],i={})=>{try{const a=new Set([]);for(let r=0;r<e?.length;r+=1){const _=e[r],n=I(_);if(await $(n),n?.after_run_tasks)for(let o=0;o<n?.after_run_tasks?.length;o+=1){const d=n?.after_run_tasks[o];a.add(d)}}const t=Array.from(a);for(let r=0;r<t?.length;r+=1){const _=t[r];w.is_function(i[_])&&await i[_](e)}}catch{}},S=(e="")=>{switch(e){case"add":return"add_file";case"change":return"change_file";case"unlink":return"delete_file";case"addDir":return"add_directory";case"unlinkDir":return"delete_directory"}},U=(e={})=>{const i=f.watch(b.map(({path:t})=>t),{ignored:".joystick"});let a=[];process.initial_build_complete=!1,i.on("error",t=>console.error(t)),i.on("all",(t,r)=>{a.push({event:S(t),path:r}),g(async()=>{await L(a,e),process.initial_build_complete=!0,a=[]},100)})};var M=U;export{M as default};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@joystick.js/cli-canary",
   "type": "module",
-  "version": "0.0.0-canary.581",
+  "version": "0.0.0-canary.583",
   "description": "The CLI for Joystick.",
   "main": "dist/index.js",
   "bin": {

package/src/lib/development_server/watch_for_changes/index.js

@@ -22,10 +22,19 @@ const handle_build_files = async (job = {}, options = {}) => {
 		await build_files({
 			files: [{ path: job?.path, platform: get_path_platform(job?.path) }],
 		}).catch((errors = []) => {
-			if (!process.initial_build_complete) {
+			if (!process.initial_build_complete && errors?.length > 0) {
 				process.exit(0);
-			} else {
-				console.log(errors);
+			}
+
+			if (process.initial_build_complete && errors?.length > 0) {
+				process.app_server_process.send(
+	        JSON.stringify({
+	          type: "BUILD_ERROR",
+	          paths: errors.filter(({ success }) => !success),
+	        })
+	      );
+				
+				throw new Error('BUILD_ERROR');
 			}
 		});
 	}
@@ -119,30 +128,36 @@ const get_job_to_be_done = (job = {}) => {
 };
 
 const process_file_watcher_jobs = async (jobs = [], after_run_functions = {}) => {
-	const after_run_tasks = new Set([]);
+	try {
+		const after_run_tasks = new Set([]);
 
-	for (let i = 0; i < jobs?.length; i += 1) {
-		const job_to_run = jobs[i];
-		const job = get_job_to_be_done(job_to_run);
+		for (let i = 0; i < jobs?.length; i += 1) {
+			const job_to_run = jobs[i];
+			const job = get_job_to_be_done(job_to_run);
 
-		await run_job(job);
+			await run_job(job);
 
-		if (job?.after_run_tasks) {
-			for (let i = 0; i < job?.after_run_tasks?.length; i += 1) {
-				const after_run_task = job?.after_run_tasks[i];
-				after_run_tasks.add(after_run_task);
+			if (job?.after_run_tasks) {
+				for (let i = 0; i < job?.after_run_tasks?.length; i += 1) {
+					const after_run_task = job?.after_run_tasks[i];
+					after_run_tasks.add(after_run_task);
+				}
 			}
 		}
-	}
 
-	const tasks_to_run = Array.from(after_run_tasks);
+		const tasks_to_run = Array.from(after_run_tasks);
 
-	for (let i = 0; i < tasks_to_run?.length; i += 1) {
-		const after_run_task = tasks_to_run[i];
+		for (let i = 0; i < tasks_to_run?.length; i += 1) {
+			const after_run_task = tasks_to_run[i];
 
-		if (types.is_function(after_run_functions[after_run_task])) {
-			await after_run_functions[after_run_task](jobs);
+			if (types.is_function(after_run_functions[after_run_task])) {
+				await after_run_functions[after_run_task](jobs);
+			}
 		}
+	} catch(error) {
+		// NOTE: Dead catch as we just want to avoid after_run_tasks from running. Actual
+		// errors are handled as part of run_job() (e.g., build errors are handled as a part
+		// of handle_build_files()).
 	}
 };