@joystick.js/cli-canary 0.0.0-canary.650 → 0.0.0-canary.652

package/dist/commands/create/index.js

@@ -1,2 +1,2 @@
-import s from"fs";import o from"chalk";import c from"child_process";import n from"util";import t from"replace-in-files";import m from"./build_package_json.js";import l from"../../lib/cli_log.js";import u from"../../lib/loader.js";import p from"../../lib/node_path_polyfills.js";import i from"../../lib/get_platform_safe_path.js";const{cp:d,writeFile:y,mkdir:r}=s.promises,f=n.promisify(c.exec),$=(e="")=>y(`./${e}/package.json`,m(e)),j=async(e={},a={})=>{process.loader=new u,process.loader.print("Creating app..."),a?.release&&!["production","canary"].includes(a.release)&&(l("Must pass either production or canary for --release.",{level:"danger",docs:"https://docs.cheatcode.co/joystick/cli/create"}),process.exit(0)),await d(`${p?.__package}/commands/create/template`,`./${e.name}`,{recursive:!0}),await $(e.name),await r(`./${e?.name}/.joystick`,{recursive:!0}),await r(`./${e?.name}/fixtures`,{recursive:!0}),await r(`./${e?.name}/indexes`,{recursive:!0}),await r(`./${e?.name}/lib`,{recursive:!0}),await r(`./${e?.name}/private`,{recursive:!0}),await r(`./${e?.name}/queues`,{recursive:!0}),await r(`./${e?.name}/routes`,{recursive:!0}),await r(`./${e?.name}/uploaders`,{recursive:!0}),await r(`./${e?.name}/tests`,{recursive:!0}),await r(`./${e?.name}/websockets`,{recursive:!0}),a?.release==="canary"&&(await t({files:[i(`${process.cwd()}/${e?.name}/**/*.js`)],from:/(@joystick.js\/node)(?!-)/g,to:"@joystick.js/node-canary",optionsForFiles:{ignore:["**/node_modules/**"]}}),await t({files:[i(`${process.cwd()}/${e?.name}/**/*.js`)],from:/(@joystick.js\/ui)(?!-)/g,to:"@joystick.js/ui-canary",optionsForFiles:{ignore:["**/node_modules/**"]}})),setTimeout(async()=>{process.loader.print("Installing dependencies..."),await f(`cd ./${e?.name} && npm install --save @joystick.js/ui${a?.release==="canary"?"-canary":""}@latest @joystick.js/node${a?.release==="canary"?"-canary":""}@latest @joystick.js/test${a?.release==="canary"?"-canary":""}@latest`),console.log(`${o.green("Project created! To get started, run:")}
-cd ${e?.name} && joystick${a?.release==="canary"?"-canary":""} start`)},1e3)};var q=j;export{q as default};
+import c from"fs";import i from"chalk";import s from"child_process";import o from"util";import n from"./build_package_json.js";import l from"../../lib/cli_log.js";import m from"../../lib/loader.js";import u from"../../lib/node_path_polyfills.js";import t from"../../lib/replace_in_files.js";const{cp:p,writeFile:d,mkdir:a}=c.promises,y=o.promisify(s.exec),$=(e="")=>d(`./${e}/package.json`,n(e)),j=async(e={},r={})=>{process.loader=new m,process.loader.print("Creating app..."),r?.release&&!["production","canary"].includes(r.release)&&(l("Must pass either production or canary for --release.",{level:"danger",docs:"https://docs.cheatcode.co/joystick/cli/create"}),process.exit(0)),await p(`${u?.__package}/commands/create/template`,`./${e.name}`,{recursive:!0}),await $(e.name),await a(`./${e?.name}/.joystick`,{recursive:!0}),await a(`./${e?.name}/fixtures`,{recursive:!0}),await a(`./${e?.name}/indexes`,{recursive:!0}),await a(`./${e?.name}/lib`,{recursive:!0}),await a(`./${e?.name}/private`,{recursive:!0}),await a(`./${e?.name}/queues`,{recursive:!0}),await a(`./${e?.name}/routes`,{recursive:!0}),await a(`./${e?.name}/uploaders`,{recursive:!0}),await a(`./${e?.name}/tests`,{recursive:!0}),await a(`./${e?.name}/websockets`,{recursive:!0}),r?.release==="canary"&&(await t(`${process.cwd()}/${e?.name}`,{match:[/\.js$/],exclude:[/node_modules/],replace_regex:/(@joystick.js\/node)(?!-)/g,replace_with:"@joystick.js/node-canary"}),await t(`${process.cwd()}/${e?.name}`,{match:[/\.js$/],exclude:[/node_modules/],replace_regex:/(@joystick.js\/ui)(?!-)/g,replace_with:"@joystick.js/ui-canary"})),setTimeout(async()=>{process.loader.print("Installing dependencies..."),await y(`cd ./${e?.name} && npm install --save @joystick.js/ui${r?.release==="canary"?"-canary":""}@latest @joystick.js/node${r?.release==="canary"?"-canary":""}@latest @joystick.js/test${r?.release==="canary"?"-canary":""}@latest`),console.log(`${i.green("Project created! To get started, run:")}
+cd ${e?.name} && joystick${r?.release==="canary"?"-canary":""} start`)},1e3)};var q=j;export{q as default};

package/dist/lib/replace_in_files.js

@@ -0,0 +1 @@
+import f from"fs";const{readdir:u,readFile:s,writeFile:d}=f.promises,h=(a="",t={})=>u(a,{recursive:!0}).then(async n=>{let r=n;if(t?.exclude?.length)for(let e=0;e<t?.exclude?.length;e+=1){const l=t?.exclude[e];r=r?.filter(c=>!c.match(new RegExp(l)))}r=r.filter(e=>t?.match?.length?t?.match?.some(l=>e.match(new RegExp(l))):!0);for(let e=0;e<r?.length;e+=1){const l=r[e],c=`${a}/${l}`,i=(await s(c,"utf-8"))?.replace(new RegExp(t.replace_regex),t.replace_with);await d(c,i)}}).catch(n=>{console.warn(n)});var g=h;export{g as default};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@joystick.js/cli-canary",
   "type": "module",
-  "version": "0.0.0-canary.650",
+  "version": "0.0.0-canary.652",
   "description": "The CLI for Joystick.",
   "main": "dist/index.js",
   "bin": {
@@ -30,7 +30,6 @@
     "node-fetch": "^3.3.2",
     "pg": "^8.11.3",
     "query-string": "^8.1.0",
-    "replace-in-files": "^3.0.0",
     "ws": "^8.15.1"
   }
 }

package/src/commands/create/index.js

@@ -2,12 +2,11 @@ import fs from 'fs';
 import chalk from 'chalk';
 import child_process from 'child_process';
 import util from 'util';
-import replace_in_files from 'replace-in-files';
 import build_package_json from "./build_package_json.js";
 import cli_log from '../../lib/cli_log.js';
 import Loader from "../../lib/loader.js";
 import node_path_polyfills from '../../lib/node_path_polyfills.js';
-import get_platform_safe_path from '../../lib/get_platform_safe_path.js';
+import replace_in_files from '../../lib/replace_in_files.js';
 
 const { cp: copy_directory, writeFile, mkdir } = fs.promises;
 const exec = util.promisify(child_process.exec);
@@ -43,26 +42,18 @@ const create = async (args = {}, options = {}) => {
   await mkdir(`./${args?.name}/websockets`, { recursive: true });
 
   if (options?.release === 'canary') {
-    await replace_in_files({
-      files: [get_platform_safe_path(`${process.cwd()}/${args?.name}/**/*.js`)],
-      from: /(@joystick.js\/node)(?!-)/g,
-      to: '@joystick.js/node-canary',
-      optionsForFiles: {
-        "ignore": [
-          "**/node_modules/**"
-        ]
-      }
+    await replace_in_files(`${process.cwd()}/${args?.name}`, {
+      match: [/\.js$/],
+      exclude: [/node_modules/],
+      replace_regex: /(@joystick.js\/node)(?!-)/g,
+      replace_with: '@joystick.js/node-canary',
     });
-    
-    await replace_in_files({
-      files: [get_platform_safe_path(`${process.cwd()}/${args?.name}/**/*.js`)],
-      from: /(@joystick.js\/ui)(?!-)/g,
-      to: '@joystick.js/ui-canary',
-      optionsForFiles: {
-        "ignore": [
-          "**/node_modules/**"
-        ]
-      }
+
+    await replace_in_files(`${process.cwd()}/${args?.name}`, {
+      match: [/\.js$/],
+      exclude: [/node_modules/],
+      replace_regex: /(@joystick.js\/ui)(?!-)/g,
+      replace_with: '@joystick.js/ui-canary',
     });
   }
 

package/src/lib/replace_in_files.js

@@ -0,0 +1,40 @@
+import fs from 'fs';
+
+const { readdir, readFile, writeFile } = fs.promises;
+
+const replace_in_files = (root_path = '', options = {}) => {
+  return readdir(root_path, { recursive: true }).then(async (files) => {
+    let filtered_files = files;
+
+    if (options?.exclude?.length) {
+      for (let i = 0; i < options?.exclude?.length; i += 1) {
+        const exclude_regex = options?.exclude[i];
+        filtered_files = filtered_files?.filter((file) => {
+          return !file.match(new RegExp(exclude_regex));
+        });
+      }
+    }
+
+    filtered_files = filtered_files.filter((file) => {
+      return options?.match?.length ? options?.match?.some((match_regex) => {
+        return file.match(new RegExp(match_regex));
+      }) : true;
+    });
+
+    for (let i = 0; i < filtered_files?.length; i += 1) {
+      const file = filtered_files[i];
+      const file_path = `${root_path}/${file}`;
+      const file_contents = await readFile(file_path, 'utf-8');
+      const updated_file_contents = file_contents?.replace(
+        new RegExp(options.replace_regex),
+        options.replace_with
+      );
+
+      await writeFile(file_path, updated_file_contents);
+    }
+  }).catch((error) => {
+    console.warn(error);
+  });  
+};
+
+export default replace_in_files;