@codifycli/plugin-core 1.1.0-beta6 → 1.1.0-beta9

package/dist/pty/seqeuntial-pty.js

@@ -74,10 +74,11 @@ export class SequentialPty {
             process.stdout.on('resize', resizeListener);
             mPty.onExit((result) => {
                 process.stdout.off('resize', resizeListener);
+                const raw = stripAnsi(output.join('')).replace(/\r\n/g, '\n').replace(/\r/g, '\n').trim();
                 resolve({
                     status: result.exitCode === 0 ? SpawnStatus.SUCCESS : SpawnStatus.ERROR,
                     exitCode: result.exitCode,
-                    data: stripAnsi(output.join('\n').trim()),
+                    data: raw,
                 });
             });
         });

package/dist/utils/file-utils.d.ts

@@ -20,4 +20,5 @@ export declare class FileUtils {
     static checkDirExistsOrThrowIfFile(path: string): Promise<boolean>;
     static createDirIfNotExists(path: string): Promise<void>;
     private static calculateEndingNewLines;
+    static createShellRcIfNotExists(): Promise<void>;
 }

package/dist/utils/file-utils.js

@@ -19,6 +19,7 @@ export class FileUtils {
         console.log(`Finished downloading to ${destination}`);
     }
     static async addToShellRc(line) {
+        await FileUtils.createShellRcIfNotExists();
         const lineToInsert = addLeadingSpacer(addTrailingSpacer(line));
         await fs.appendFile(Utils.getPrimaryShellRc(), lineToInsert);
         function addLeadingSpacer(line) {
@@ -33,6 +34,7 @@ export class FileUtils {
         }
     }
     static async addAllToShellRc(lines) {
+        await FileUtils.createShellRcIfNotExists();
         const formattedLines = '\n' + lines.join('\n') + '\n';
         const shellRc = Utils.getPrimaryShellRc();
         console.log(`Adding to ${path.basename(shellRc)}:
@@ -46,6 +48,7 @@ ${lines.join('\n')}`);
      * @param prepend - Whether to prepend the path to the existing PATH variable.
      */
     static async addPathToShellRc(value, prepend) {
+        await FileUtils.createShellRcIfNotExists();
         if (await Utils.isDirectoryOnPath(value)) {
             return;
         }
@@ -183,4 +186,10 @@ ${lines.join('\n')}`);
             }
         }
     }
+    static async createShellRcIfNotExists() {
+        const shellRc = Utils.getPrimaryShellRc();
+        if (!await FileUtils.fileExists(shellRc)) {
+            await fs.writeFile(shellRc, '', 'utf8');
+        }
+    }
 }

package/dist/utils/index.js

@@ -3,7 +3,7 @@ import * as fsSync from 'node:fs';
 import * as fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
-import { SpawnStatus, getPty } from '../pty/index.js';
+import { getPty, SpawnStatus } from '../pty/index.js';
 export function isDebug() {
     return process.env.DEBUG != null && process.env.DEBUG.includes('codify'); // TODO: replace with debug library
 }
@@ -56,7 +56,7 @@ export const Utils = {
         return query.status === SpawnStatus.SUCCESS;
     },
     getShell() {
-        const shell = process.env.SHELL || '';
+        const shell = process.env.SHELL || os.userInfo().shell || '';
         if (shell.endsWith('bash')) {
             return Shell.BASH;
         }
@@ -81,7 +81,7 @@ export const Utils = {
         return this.getShellRcFiles()[0];
     },
     getShellRcFiles() {
-        const shell = process.env.SHELL || '';
+        const shell = process.env.SHELL || os.userInfo().shell || '';
         const homeDir = os.homedir();
         if (shell.endsWith('bash')) {
             // Linux typically uses .bashrc, macOS uses .bash_profile

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codifycli/plugin-core",
-  "version": "1.1.0-beta6",
+  "version": "1.1.0-beta9",
   "description": "TypeScript library for building Codify plugins to manage system resources (applications, CLI tools, settings) through infrastructure-as-code",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/pty/seqeuntial-pty.ts

@@ -100,10 +100,12 @@ export class SequentialPty implements IPty {
       mPty.onExit((result) => {
         process.stdout.off('resize', resizeListener);
 
+        const raw = stripAnsi(output.join('')).replace(/\r\n/g, '\n').replace(/\r/g, '\n').trim();
+        
         resolve({
           status: result.exitCode === 0 ? SpawnStatus.SUCCESS : SpawnStatus.ERROR,
           exitCode: result.exitCode,
-          data: stripAnsi(output.join('\n').trim()),
+          data: raw,
         })
       })
     })

package/src/utils/file-utils.ts

@@ -26,6 +26,8 @@ export class FileUtils {
   }
 
   static async addToShellRc(line: string): Promise<void> {
+    await FileUtils.createShellRcIfNotExists();
+
     const lineToInsert = addLeadingSpacer(
       addTrailingSpacer(line)
     );
@@ -46,6 +48,8 @@ export class FileUtils {
   }
 
   static async addAllToShellRc(lines: string[]): Promise<void> {
+    await FileUtils.createShellRcIfNotExists();
+
     const formattedLines = '\n' + lines.join('\n') + '\n';
     const shellRc = Utils.getPrimaryShellRc();
 
@@ -62,6 +66,8 @@ ${lines.join('\n')}`)
    * @param prepend - Whether to prepend the path to the existing PATH variable.
    */
   static async addPathToShellRc(value: string, prepend: boolean): Promise<void> {
+    await FileUtils.createShellRcIfNotExists();
+
     if (await Utils.isDirectoryOnPath(value)) {
       return;
     }
@@ -228,4 +234,11 @@ ${lines.join('\n')}`)
       }
     }
   }
+
+  static async createShellRcIfNotExists(): Promise<void> {
+    const shellRc = Utils.getPrimaryShellRc();
+    if (!await FileUtils.fileExists(shellRc)) {
+      await fs.writeFile(shellRc, '', 'utf8');
+    }
+  }
 }

package/src/utils/index.ts

@@ -4,7 +4,7 @@ import * as fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 
-import { SpawnStatus, getPty } from '../pty/index.js';
+import { getPty, SpawnStatus } from '../pty/index.js';
 
 export function isDebug(): boolean {
   return process.env.DEBUG != null && process.env.DEBUG.includes('codify'); // TODO: replace with debug library
@@ -73,7 +73,7 @@ export const Utils = {
   },
 
   getShell(): Shell | undefined {
-    const shell = process.env.SHELL || '';
+    const shell = process.env.SHELL || os.userInfo().shell || '';
 
     if (shell.endsWith('bash')) {
       return Shell.BASH
@@ -108,7 +108,7 @@ export const Utils = {
   },
 
   getShellRcFiles(): string[] {
-    const shell = process.env.SHELL || '';
+    const shell = process.env.SHELL || os.userInfo().shell || '';
     const homeDir = os.homedir();
 
     if (shell.endsWith('bash')) {