@joystick.js/cli-canary 0.0.0-canary.1005 → 0.0.0-canary.1007

package/dist/lib/build/index.js

@@ -1,3 +1,3 @@
-import h from"chalk";import w from"child_process";import s from"fs";import{dirname as y}from"path";import $ from"util";import x from"./build_files.js";import z from"./get_files_to_build.js";import v from"./get_file_operation.js";import k from"./get_path_platform.js";import F from"./get_tar_ignore_list.js";import P from"../load_settings.js";import j from"../loader.js";import _ from"../path_exists.js";import B from"../../lib/encrypt_buffer.js";const{mkdir:M,copyFile:S,readFile:A,writeFile:D,readdir:L}=s.promises,n=$.promisify(w.exec),q=(r=[])=>r?.map(l=>({path:l,operation:v(l),platform:k(l)})),C=async(r={})=>{const l=new j,o=r?.type||"tar",c=r?.environment||"production";l.print(`Building app to ${o} for ${c}...`);const e=await P(c),u=e?.config?.build?.excluded_paths||e?.config?.build?.excludedPaths,m=await z(u),i=o==="tar"?".build/.tar":".build",p=q(m);await _(".build")&&await n("rm -rf .build"),console.log(e?.config?.build?.copy_paths);const d=e?.config?.build?.copy_paths?.length>0?await Promise.all(e?.config?.build?.copy_paths?.filter(t=>s.existsSync(t))?.flatMap(async(t="")=>(s.lstatSync(t).isDirectory()?await L(t,{recursive:!0}):[t])?.flatMap(g=>({path:g})))):[];console.log({custom_copy_paths:d});const f=[...p?.filter(t=>t?.operation==="copy_file"),...d||[]],b=p?.filter(t=>t?.operation==="build_file");for(let t=0;t<f?.length;t+=1){const a=f[t];await M(y(`${i}/${a?.path}`),{recursive:!0}),await S(a?.path,`${i}/${a?.path}`)}if(await x({files:b,environment:c,output_path:i}).catch(t=>{console.warn(t)}),o==="tar"){const t=F(e?.config?.build?.excludedPaths);await n(`cd ${i} && tar --exclude=${t} -czf ../build.tar.gz .`),await n(`rm -rf ${i}`)}if(o==="tar"&&r?.encrypt_build){const t=i?.replace("/.tar","/build.tar.gz"),a=B(await A(t),r?.encryption_key);await D(".build/build.encrypted.tar.gz",a)}r?.silence_confirmation||console.log(h.greenBright(`
-\u2714 App built as ${o} to ${o==="tar"?i?.replace("/.tar","/build.tar.gz"):i}!
-`)),await _(".build/component_id_cache.json")&&await n("rm -rf .build/component_id_cache.json")};var Y=C;export{Y as default};
+import y from"chalk";import w from"child_process";import s from"fs";import{dirname as $}from"path";import x from"util";import z from"./build_files.js";import v from"./get_files_to_build.js";import k from"./get_file_operation.js";import F from"./get_path_platform.js";import j from"./get_tar_ignore_list.js";import B from"../load_settings.js";import P from"../loader.js";import f from"../path_exists.js";import S from"../../lib/encrypt_buffer.js";const{mkdir:A,copyFile:D,readFile:L,writeFile:q,readdir:C}=s.promises,l=x.promisify(w.exec),E=(r=[])=>r?.map(a=>({path:a,operation:k(a),platform:F(a)})),G=async(r={})=>{const a=new P,e=r?.type||"tar",p=r?.environment||"production";a.print(`Building app to ${e} for ${p}...`);const n=await B(p),u=n?.config?.build?.excluded_paths||n?.config?.build?.excludedPaths,m=await v(u),o=e==="tar"?".build/.tar":".build",_=E(m);await f(".build")&&await l("rm -rf .build");const c=[];for(let t=0;t<n?.config?.build?.copy_paths?.length;t+=1){const i=n?.config?.build?.copy_paths[t];if(s.existsSync(i))if(s.lstatSync(i).isDirectory()){const h=await C(i,{recursive:!0});c.push(...(h||[])?.map(g=>`${i}/${g}`))}else c.push(i)}console.log(c);const d=[..._?.filter(t=>t?.operation==="copy_file"),...(c||[])?.map(t=>({path:t}))],b=_?.filter(t=>t?.operation==="build_file");for(let t=0;t<d?.length;t+=1){const i=d[t];await A($(`${o}/${i?.path}`),{recursive:!0}),await D(i?.path,`${o}/${i?.path}`)}if(await z({files:b,environment:p,output_path:o}).catch(t=>{console.warn(t)}),e==="tar"){const t=j(n?.config?.build?.excludedPaths);await l(`cd ${o} && tar --exclude=${t} -czf ../build.tar.gz .`),await l(`rm -rf ${o}`)}if(e==="tar"&&r?.encrypt_build){const t=o?.replace("/.tar","/build.tar.gz"),i=S(await L(t),r?.encryption_key);await q(".build/build.encrypted.tar.gz",i)}r?.silence_confirmation||console.log(y.greenBright(`
+\u2714 App built as ${e} to ${e==="tar"?o?.replace("/.tar","/build.tar.gz"):o}!
+`)),await f(".build/component_id_cache.json")&&await l("rm -rf .build/component_id_cache.json")};var Z=G;export{Z as default};

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@joystick.js/cli-canary",
   "type": "module",
-  "version": "0.0.0-canary.1005",
-  "canary_version": "0.0.0-canary.1004",
+  "version": "0.0.0-canary.1007",
+  "canary_version": "0.0.0-canary.1006",
   "description": "The CLI for Joystick.",
   "main": "dist/index.js",
   "bin": {

package/src/lib/build/index.js

@@ -44,27 +44,36 @@ const build = async (options = {}) => {
     await exec(`rm -rf .build`);
   }
 
-  console.log(settings?.config?.build?.copy_paths);
+  const custom_copy_paths = [];
 
-  const custom_copy_paths = settings?.config?.build?.copy_paths?.length > 0 ? await Promise.all(
-    settings?.config?.build?.copy_paths?.filter((custom_copy_path) => {
-      return fs.existsSync(custom_copy_path);
-    })?.flatMap(async (custom_copy_path = '') => {
+  for (let i = 0; i < settings?.config?.build?.copy_paths?.length; i += 1) {
+    const custom_copy_path = settings?.config?.build?.copy_paths[i];
+
+    if (fs.existsSync(custom_copy_path)) {
       const stat = fs.lstatSync(custom_copy_path);
-      const paths = stat.isDirectory() ? await readdir(custom_copy_path, { recursive: true }) : [custom_copy_path];
-      return paths?.flatMap((path) => {
-        return { path };
-      });
-    })
-  ) : [];
 
-  console.log({ custom_copy_paths });
+      if (stat.isDirectory()) {
+        const paths = await readdir(custom_copy_path, { recursive: true });
+        custom_copy_paths.push(
+          ...(paths || [])?.map((path) => {
+            return `${custom_copy_path}/${path}`;
+          })
+        );
+      } else {
+        custom_copy_paths.push(custom_copy_path);
+      }
+    }
+  }
+
+  console.log(custom_copy_paths);
 
   const files_to_copy = [
     ...files_to_build_with_operation_and_platform?.filter((file) => {
       return file?.operation === 'copy_file';
     }),
-    ...(custom_copy_paths || [])
+    ...(custom_copy_paths || [])?.map((custom_copy_path) => {
+      return { path: custom_copy_path };
+    }),
   ];
 
   const files_to_build = files_to_build_with_operation_and_platform?.filter((file) => {