codify-plugin-lib 1.0.182-beta4 → 1.0.182-beta6

package/dist/index.d.ts

@@ -10,7 +10,7 @@ export * from './resource/parsed-resource-settings.js';
 export * from './resource/resource.js';
 export * from './resource/resource-settings.js';
 export * from './stateful-parameter/stateful-parameter.js';
+export * from './utils/functions.js';
 export * from './utils/index.js';
 export * from './utils/verbosity-level.js';
-export * from './utils/functions.js';
 export declare function runPlugin(plugin: Plugin): Promise<void>;

package/dist/index.js

@@ -10,9 +10,9 @@ export * from './resource/parsed-resource-settings.js';
 export * from './resource/resource.js';
 export * from './resource/resource-settings.js';
 export * from './stateful-parameter/stateful-parameter.js';
+export * from './utils/functions.js';
 export * from './utils/index.js';
 export * from './utils/verbosity-level.js';
-export * from './utils/functions.js';
 export async function runPlugin(plugin) {
     const messageHandler = new MessageHandler(plugin);
     process.on('message', (message) => messageHandler.onMessage(message));

package/dist/pty/seqeuntial-pty.js

@@ -35,7 +35,7 @@ export class SequentialPty {
             // Initial terminal dimensions
             const initialCols = process.stdout.columns ?? 80;
             const initialRows = process.stdout.rows ?? 24;
-            const args = (options?.interactive ?? false) ? ['-i', '-c', `"${cmd}"`] : ['-c', `"${cmd}"`];
+            const args = (options?.interactive ?? false) ? ['-i', '-c', cmd] : ['-c', cmd];
             // Run the command in a pty for interactivity
             const mPty = pty.spawn(this.getDefaultShell(), args, {
                 ...options,

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

@@ -0,0 +1,16 @@
+export declare class FileUtils {
+    static downloadFile(url: string, destination: string): Promise<void>;
+    static addToStartupFile(line: string): Promise<void>;
+    static addAllToStartupFile(lines: string[]): Promise<void>;
+    static addPathToPrimaryShellRc(value: string, prepend: boolean): Promise<void>;
+    static dirExists(path: string): Promise<boolean>;
+    static fileExists(path: string): Promise<boolean>;
+    static exists(path: string): Promise<boolean>;
+    static checkDirExistsOrThrowIfFile(path: string): Promise<boolean>;
+    static createDirIfNotExists(path: string): Promise<void>;
+    static removeFromFile(filePath: string, search: string): Promise<void>;
+    static removeLineFromFile(filePath: string, search: RegExp | string): Promise<void>;
+    static removeLineFromPrimaryShellRc(search: RegExp | string): Promise<void>;
+    static appendToFileWithSpacing(file: string, textToInsert: string): string;
+    private static calculateEndingNewLines;
+}

package/dist/utils/file-utils.js

@@ -0,0 +1,172 @@
+import * as fsSync from 'node:fs';
+import * as fs from 'node:fs/promises';
+import path from 'node:path';
+import { Readable } from 'node:stream';
+import { finished } from 'node:stream/promises';
+import { Utils } from './index.js';
+const SPACE_REGEX = /^\s*$/;
+export class FileUtils {
+    static async downloadFile(url, destination) {
+        console.log(`Downloading file from ${url} to ${destination}`);
+        const { body } = await fetch(url);
+        const dirname = path.dirname(destination);
+        if (!await fs.stat(dirname).then((s) => s.isDirectory()).catch(() => false)) {
+            await fs.mkdir(dirname, { recursive: true });
+        }
+        const ws = fsSync.createWriteStream(destination);
+        // Different type definitions here for readable stream (NodeJS vs DOM). Small hack to fix that
+        await finished(Readable.fromWeb(body).pipe(ws));
+        console.log(`Finished downloading to ${destination}`);
+    }
+    static async addToStartupFile(line) {
+        const lineToInsert = addLeadingSpacer(addTrailingSpacer(line));
+        await fs.appendFile(Utils.getPrimaryShellRc(), lineToInsert);
+        function addLeadingSpacer(line) {
+            return line.startsWith('\n')
+                ? line
+                : '\n' + line;
+        }
+        function addTrailingSpacer(line) {
+            return line.endsWith('\n')
+                ? line
+                : line + '\n';
+        }
+    }
+    static async addAllToStartupFile(lines) {
+        const formattedLines = '\n' + lines.join('\n') + '\n';
+        const shellRc = Utils.getPrimaryShellRc();
+        console.log(`Adding to ${path.basename(shellRc)}:
+${lines.join('\n')}`);
+        await fs.appendFile(shellRc, formattedLines);
+    }
+    static async addPathToPrimaryShellRc(value, prepend) {
+        const shellRc = Utils.getPrimaryShellRc();
+        console.log(`Saving path: ${value} to ${shellRc}`);
+        if (prepend) {
+            await fs.appendFile(shellRc, `\nexport PATH=$PATH:${value};`, { encoding: 'utf8' });
+            return;
+        }
+        await fs.appendFile(shellRc, `\nexport PATH=${value}:$PATH;`, { encoding: 'utf8' });
+    }
+    static async dirExists(path) {
+        let stat;
+        try {
+            stat = await fs.stat(path);
+            return stat.isDirectory();
+        }
+        catch {
+            return false;
+        }
+    }
+    static async fileExists(path) {
+        let stat;
+        try {
+            stat = await fs.stat(path);
+            return stat.isFile();
+        }
+        catch {
+            return false;
+        }
+    }
+    static async exists(path) {
+        try {
+            await fs.stat(path);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    static async checkDirExistsOrThrowIfFile(path) {
+        let stat;
+        try {
+            stat = await fs.stat(path);
+        }
+        catch {
+            return false;
+        }
+        if (stat.isDirectory()) {
+            return true;
+        }
+        throw new Error(`Directory ${path} already exists and is a file`);
+    }
+    static async createDirIfNotExists(path) {
+        if (!fsSync.existsSync(path)) {
+            await fs.mkdir(path, { recursive: true });
+        }
+    }
+    static async removeFromFile(filePath, search) {
+        const contents = await fs.readFile(filePath, 'utf8');
+        const newContents = contents.replaceAll(search, '');
+        await fs.writeFile(filePath, newContents, 'utf8');
+    }
+    static async removeLineFromFile(filePath, search) {
+        const file = await fs.readFile(filePath, 'utf8');
+        const lines = file.split('\n');
+        let searchRegex;
+        let searchString;
+        if (typeof search === 'object') {
+            const startRegex = /^([\t ]*)?/;
+            const endRegex = /([\t ]*)?/;
+            // Augment regex with spaces criteria to make sure this function is not deleting lines that are comments or has other content.
+            searchRegex = search
+                ? new RegExp(startRegex.source + search.source + endRegex.source, search.flags)
+                : search;
+        }
+        if (typeof search === 'string') {
+            searchString = search;
+        }
+        for (let counter = lines.length; counter >= 0; counter--) {
+            if (!lines[counter]) {
+                continue;
+            }
+            if (searchString && lines[counter].includes(searchString)) {
+                lines.splice(counter, 1);
+                continue;
+            }
+            if (searchRegex && lines[counter].search(searchRegex) !== -1) {
+                lines.splice(counter, 1);
+            }
+        }
+        await fs.writeFile(filePath, lines.join('\n'));
+        console.log(`Removed line: ${search} from ${filePath}`);
+    }
+    static async removeLineFromPrimaryShellRc(search) {
+        return FileUtils.removeLineFromFile(Utils.getPrimaryShellRc(), search);
+    }
+    // Append the string to the end of a file ensuring at least 1 lines of space between.
+    // Ex result:
+    // something something;
+    //
+    // newline;
+    static appendToFileWithSpacing(file, textToInsert) {
+        const lines = file.trimEnd().split(/\n/);
+        if (lines.length === 0) {
+            return textToInsert;
+        }
+        const endingNewLines = FileUtils.calculateEndingNewLines(lines);
+        const numNewLines = endingNewLines === -1
+            ? 0
+            : Math.max(0, 2 - endingNewLines);
+        return lines.join('\n') + '\n'.repeat(numNewLines) + textToInsert;
+    }
+    // This is overly complicated but it can be used to insert into any
+    // position in the future
+    static calculateEndingNewLines(lines) {
+        let counter = 0;
+        while (true) {
+            const line = lines.at(-counter - 1);
+            if (!line) {
+                return -1;
+            }
+            if (!SPACE_REGEX.test(line)) {
+                return counter;
+            }
+            counter++;
+            // Short circuit here because we don't need to check over 2;
+            if (counter > 2) {
+                return counter;
+            }
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codify-plugin-lib",
-  "version": "1.0.182-beta4",
+  "version": "1.0.182-beta6",
   "description": "Library plugin library",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/index.ts

@@ -12,9 +12,9 @@ export * from './resource/parsed-resource-settings.js';
 export * from './resource/resource.js'
 export * from './resource/resource-settings.js'
 export * from './stateful-parameter/stateful-parameter.js'
+export * from './utils/functions.js'
 export * from './utils/index.js'
 export * from './utils/verbosity-level.js'
-export * from './utils/functions.js'
 
 export async function runPlugin(plugin: Plugin) {
   const messageHandler = new MessageHandler(plugin);

package/src/pty/seqeuntial-pty.ts

@@ -46,7 +46,7 @@ export class SequentialPty implements IPty {
       const initialCols = process.stdout.columns ?? 80;
       const initialRows = process.stdout.rows ?? 24;
 
-      const args = (options?.interactive ?? false) ? ['-i', '-c', `"${cmd}"`] : ['-c', `"${cmd}"`]
+      const args = (options?.interactive ?? false) ? ['-i', '-c', cmd] : ['-c', cmd]
 
       // Run the command in a pty for interactivity
       const mPty = pty.spawn(this.getDefaultShell(), args, {

package/src/pty/sequential-pty.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import { SequentialPty } from './seqeuntial-pty.js';
-import { VerbosityLevel } from '../utils/functions.js';
+import { VerbosityLevel } from '../utils/verbosity-level.js';
 
 describe('SequentialPty tests', () => {
   it('Can launch a simple command', async () => {
@@ -52,7 +52,7 @@ describe('SequentialPty tests', () => {
   it('It can launch a command in interactive mode', async () => {
     const pty = new SequentialPty();
 
-    const resultSuccess = await pty.spawnSafe('ls', { interactive: false });
+    const resultSuccess = await pty.spawnSafe('ls', { interactive: true });
     expect(resultSuccess).toMatchObject({
       status: 'success',
       exitCode: 0,

package/src/utils/file-utils.ts

@@ -0,0 +1,216 @@
+import * as fsSync from 'node:fs';
+import * as fs from 'node:fs/promises';
+import path from 'node:path';
+import { Readable } from 'node:stream';
+import { finished } from 'node:stream/promises';
+
+import { Utils } from './index.js';
+
+const SPACE_REGEX = /^\s*$/
+
+export class FileUtils {
+  static async downloadFile(url: string, destination: string): Promise<void> {
+    console.log(`Downloading file from ${url} to ${destination}`);
+    const { body } = await fetch(url)
+
+    const dirname = path.dirname(destination);
+    if (!await fs.stat(dirname).then((s) => s.isDirectory()).catch(() => false)) {
+      await fs.mkdir(dirname, { recursive: true });
+    }
+
+    const ws = fsSync.createWriteStream(destination)
+    // Different type definitions here for readable stream (NodeJS vs DOM). Small hack to fix that
+    await finished(Readable.fromWeb(body as never).pipe(ws));
+
+    console.log(`Finished downloading to ${destination}`);
+  }
+
+  static async addToStartupFile(line: string): Promise<void> {
+    const lineToInsert = addLeadingSpacer(
+      addTrailingSpacer(line)
+    );
+
+    await fs.appendFile(Utils.getPrimaryShellRc(), lineToInsert)
+
+    function addLeadingSpacer(line: string): string {
+      return line.startsWith('\n')
+        ? line
+        : '\n' + line;
+    }
+
+    function addTrailingSpacer(line: string): string {
+      return line.endsWith('\n')
+        ? line
+        : line + '\n';
+    }
+  }
+
+  static async addAllToStartupFile(lines: string[]): Promise<void> {
+    const formattedLines = '\n' + lines.join('\n') + '\n';
+    const shellRc = Utils.getPrimaryShellRc();
+
+    console.log(`Adding to ${path.basename(shellRc)}:
+${lines.join('\n')}`)
+
+    await fs.appendFile(shellRc, formattedLines)
+  }
+
+  static async addPathToPrimaryShellRc(value: string, prepend: boolean): Promise<void> {
+    const shellRc = Utils.getPrimaryShellRc();
+    console.log(`Saving path: ${value} to ${shellRc}`);
+
+    if (prepend) {
+      await fs.appendFile(shellRc, `\nexport PATH=$PATH:${value};`, { encoding: 'utf8' });
+      return;
+    }
+
+    await fs.appendFile(shellRc, `\nexport PATH=${value}:$PATH;`, { encoding: 'utf8' });
+  }
+
+  static async dirExists(path: string): Promise<boolean> {
+    let stat;
+    try {
+      stat = await fs.stat(path);
+      return stat.isDirectory();
+    } catch {
+      return false;
+    }
+  }
+
+  static async fileExists(path: string): Promise<boolean> {
+    let stat;
+    try {
+      stat = await fs.stat(path);
+      return stat.isFile();
+    } catch {
+      return false;
+    }
+  }
+
+  static async exists(path: string): Promise<boolean> {
+    try {
+      await fs.stat(path);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
+  static async checkDirExistsOrThrowIfFile(path: string): Promise<boolean> {
+    let stat;
+    try {
+      stat = await fs.stat(path);
+    } catch {
+      return false;
+    }
+
+    if (stat.isDirectory()) {
+      return true;
+    }
+
+    throw new Error(`Directory ${path} already exists and is a file`);
+  }
+
+  static async createDirIfNotExists(path: string): Promise<void> {
+    if (!fsSync.existsSync(path)) {
+      await fs.mkdir(path, { recursive: true });
+    }
+  }
+
+  static async removeFromFile(filePath: string, search: string): Promise<void> {
+    const contents = await fs.readFile(filePath, 'utf8');
+    const newContents = contents.replaceAll(search, '');
+
+    await fs.writeFile(filePath, newContents, 'utf8');
+  }
+
+
+  static async removeLineFromFile(filePath: string, search: RegExp | string): Promise<void> {
+    const file = await fs.readFile(filePath, 'utf8')
+    const lines = file.split('\n');
+
+    let searchRegex;
+    let searchString;
+
+    if (typeof search === 'object') {
+      const startRegex = /^([\t ]*)?/;
+      const endRegex = /([\t ]*)?/;
+
+      // Augment regex with spaces criteria to make sure this function is not deleting lines that are comments or has other content.
+      searchRegex = search
+        ? new RegExp(
+          startRegex.source + search.source + endRegex.source,
+          search.flags
+        )
+        : search;
+    }
+
+    if (typeof search === 'string') {
+      searchString = search;
+    }
+
+    for (let counter = lines.length; counter >= 0; counter--) {
+      if (!lines[counter]) {
+        continue;
+      }
+
+      if (searchString && lines[counter].includes(searchString)) {
+        lines.splice(counter, 1);
+        continue;
+      }
+
+      if (searchRegex && lines[counter].search(searchRegex) !== -1) {
+        lines.splice(counter, 1);
+      }
+    }
+
+    await fs.writeFile(filePath, lines.join('\n'));
+    console.log(`Removed line: ${search} from ${filePath}`)
+  }
+
+  static async removeLineFromPrimaryShellRc(search: RegExp | string): Promise<void> {
+    return FileUtils.removeLineFromFile(Utils.getPrimaryShellRc(), search);
+  }
+
+  // Append the string to the end of a file ensuring at least 1 lines of space between.
+  // Ex result:
+  // something something;
+  //
+  // newline;
+  static appendToFileWithSpacing(file: string, textToInsert: string): string {
+    const lines = file.trimEnd().split(/\n/);
+    if (lines.length === 0) {
+      return textToInsert;
+    }
+
+    const endingNewLines = FileUtils.calculateEndingNewLines(lines);
+    const numNewLines = endingNewLines === -1
+      ? 0
+      : Math.max(0, 2 - endingNewLines);
+    return lines.join('\n') + '\n'.repeat(numNewLines) + textToInsert
+  }
+
+  // This is overly complicated but it can be used to insert into any
+  // position in the future
+  private static calculateEndingNewLines(lines: string[]): number {
+    let counter = 0;
+    while (true) {
+      const line = lines.at(-counter - 1);
+
+      if (!line) {
+        return -1
+      }
+
+      if (!SPACE_REGEX.test(line)) {
+        return counter;
+      }
+
+      counter++;
+
+      // Short circuit here because we don't need to check over 2;
+      if (counter > 2) {
+        return counter;
+      }
+    }
+  }
+}