codify-plugin-lib 1.0.182-beta25 → 1.0.182-beta27

package/dist/pty/background-pty.d.ts

@@ -10,8 +10,8 @@ export declare class BackgroundPty implements IPty {
     private basePty;
     private promiseQueue;
     constructor();
-    spawn(cmd: string, options?: SpawnOptions): Promise<SpawnResult>;
-    spawnSafe(cmd: string, options?: SpawnOptions): Promise<SpawnResult>;
+    spawn(cmd: string | string[], options?: SpawnOptions): Promise<SpawnResult>;
+    spawnSafe(cmd: string | string[], options?: SpawnOptions): Promise<SpawnResult>;
     kill(): Promise<{
         exitCode: number;
         signal?: number | undefined;

package/dist/pty/background-pty.js

@@ -30,11 +30,12 @@ export class BackgroundPty {
     async spawn(cmd, options) {
         const spawnResult = await this.spawnSafe(cmd, options);
         if (spawnResult.status !== 'success') {
-            throw new SpawnError(cmd, spawnResult.exitCode, spawnResult.data);
+            throw new SpawnError(Array.isArray(cmd) ? cmd.join('\n') : cmd, spawnResult.exitCode, spawnResult.data);
         }
         return spawnResult;
     }
     async spawnSafe(cmd, options) {
+        cmd = Array.isArray(cmd) ? cmd.join('\n') : cmd;
         // cid is command id
         const cid = nanoid(10);
         debugLog(cid);

package/dist/pty/index.d.ts

@@ -36,8 +36,8 @@ export declare class SpawnError extends Error {
     constructor(cmd: string, exitCode: number, data: string);
 }
 export interface IPty {
-    spawn(cmd: string, options?: SpawnOptions): Promise<SpawnResult>;
-    spawnSafe(cmd: string, options?: SpawnOptions): Promise<SpawnResult>;
+    spawn(cmd: string | string[], options?: SpawnOptions): Promise<SpawnResult>;
+    spawnSafe(cmd: string | string[], options?: SpawnOptions): Promise<SpawnResult>;
     kill(): Promise<{
         exitCode: number;
         signal?: number | undefined;

package/dist/pty/seqeuntial-pty.d.ts

@@ -6,8 +6,8 @@ import { IPty, SpawnOptions, SpawnResult } from './index.js';
  * without a tty (or even a stdin) attached so interactive commands will not work.
  */
 export declare class SequentialPty implements IPty {
-    spawn(cmd: string, options?: SpawnOptions): Promise<SpawnResult>;
-    spawnSafe(cmd: string, options?: SpawnOptions): Promise<SpawnResult>;
+    spawn(cmd: string | string[], options?: SpawnOptions): Promise<SpawnResult>;
+    spawnSafe(cmd: string | string[], options?: SpawnOptions): Promise<SpawnResult>;
     kill(): Promise<{
         exitCode: number;
         signal?: number | undefined;

package/dist/pty/seqeuntial-pty.js

@@ -22,11 +22,12 @@ export class SequentialPty {
     async spawn(cmd, options) {
         const spawnResult = await this.spawnSafe(cmd, options);
         if (spawnResult.status !== 'success') {
-            throw new SpawnError(cmd, spawnResult.exitCode, spawnResult.data);
+            throw new SpawnError(Array.isArray(cmd) ? cmd.join('\n') : cmd, spawnResult.exitCode, spawnResult.data);
         }
         return spawnResult;
     }
     async spawnSafe(cmd, options) {
+        cmd = Array.isArray(cmd) ? cmd.join(' ') : cmd;
         if (cmd.includes('sudo')) {
             throw new Error('Do not directly use sudo. Use the option { requiresRoot: true } instead');
         }
@@ -34,7 +35,7 @@ export class SequentialPty {
         if (options?.stdin || options?.requiresRoot) {
             return this.externalSpawn(cmd, options);
         }
-        console.log(`Running command: ${cmd}` + (options?.cwd ? `(${options?.cwd})` : ''));
+        console.log(`Running command: ${Array.isArray(cmd) ? cmd.join('\n') : cmd}` + (options?.cwd ? `(${options?.cwd})` : ''));
         return new Promise((resolve) => {
             const output = [];
             const historyIgnore = Utils.getShell() === Shell.ZSH ? { HISTORY_IGNORE: '*' } : { HISTIGNORE: '*' };

package/dist/utils/functions.js

@@ -25,7 +25,6 @@ export function tildify(pathWithTilde) {
     return homeDirectory ? pathWithTilde.replace(homeDirectory, '~') : pathWithTilde;
 }
 export function resolvePathWithVariables(pathWithVariables) {
-    // @ts-expect-error Ignore this for now
     return pathWithVariables.replace(/\$([A-Z_]+[A-Z0-9_]*)|\${([A-Z0-9_]*)}/ig, (_, a, b) => process.env[a || b]);
 }
 export function addVariablesToPath(pathWithoutVariables) {

package/dist/utils/index.d.ts

@@ -20,6 +20,9 @@ export declare const Utils: {
     };
     isMacOS(): boolean;
     isLinux(): boolean;
+    isArmArch(): Promise<boolean>;
+    isHomebrewInstalled(): Promise<boolean>;
+    isRosetta2Installed(): Promise<boolean>;
     getShell(): Shell | undefined;
     getPrimaryShellRc(): string;
     getShellRcFiles(): string[];

package/dist/utils/index.js

@@ -1,6 +1,6 @@
 import os from 'node:os';
 import path from 'node:path';
-import { 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
 }
@@ -29,6 +29,29 @@ export const Utils = {
     isLinux() {
         return os.platform() === 'linux';
     },
+    async isArmArch() {
+        const $ = getPty();
+        if (!Utils.isMacOS()) {
+            // On Linux, check uname -m
+            const query = await $.spawn('uname -m');
+            return query.data.trim() === 'aarch64' || query.data.trim() === 'arm64';
+        }
+        const query = await $.spawn('sysctl -n machdep.cpu.brand_string');
+        return /M(\d)/.test(query.data);
+    },
+    async isHomebrewInstalled() {
+        const $ = getPty();
+        const query = await $.spawnSafe('which brew', { interactive: true });
+        return query.status === SpawnStatus.SUCCESS;
+    },
+    async isRosetta2Installed() {
+        if (!Utils.isMacOS()) {
+            return false;
+        }
+        const $ = getPty();
+        const query = await $.spawnSafe('arch -x86_64 /usr/bin/true 2> /dev/null', { interactive: true });
+        return query.status === SpawnStatus.SUCCESS;
+    },
     getShell() {
         const shell = process.env.SHELL || '';
         if (shell.endsWith('bash')) {

package/package.json

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

package/src/pty/background-pty.ts

@@ -33,17 +33,19 @@ export class BackgroundPty implements IPty {
     this.initialize();
   }
 
-  async spawn(cmd: string, options?: SpawnOptions): Promise<SpawnResult> {
+  async spawn(cmd: string | string[], options?: SpawnOptions): Promise<SpawnResult> {
     const spawnResult = await this.spawnSafe(cmd, options);
 
     if (spawnResult.status !== 'success') {
-      throw new SpawnError(cmd, spawnResult.exitCode, spawnResult.data);
+      throw new SpawnError(Array.isArray(cmd) ? cmd.join('\n') : cmd, spawnResult.exitCode, spawnResult.data);
     }
 
     return spawnResult;
   }
 
-  async spawnSafe(cmd: string, options?: SpawnOptions): Promise<SpawnResult> {
+  async spawnSafe(cmd: string | string[], options?: SpawnOptions): Promise<SpawnResult> {
+    cmd = Array.isArray(cmd) ? cmd.join('\n') : cmd;
+
     // cid is command id
     const cid = nanoid(10);
     debugLog(cid);

package/src/pty/index.ts

@@ -50,9 +50,9 @@ export class SpawnError extends Error {
 }
 
 export interface IPty {
-  spawn(cmd: string, options?: SpawnOptions): Promise<SpawnResult>
+  spawn(cmd: string | string[], options?: SpawnOptions): Promise<SpawnResult>
 
-  spawnSafe(cmd: string, options?: SpawnOptions): Promise<SpawnResult>
+  spawnSafe(cmd: string | string[], options?: SpawnOptions): Promise<SpawnResult>
 
   kill(): Promise<{ exitCode: number, signal?: number | undefined }>
 }

package/src/pty/seqeuntial-pty.ts

@@ -23,17 +23,19 @@ const validateSudoRequestResponse = ajv.compile(CommandRequestResponseDataSchema
  * without a tty (or even a stdin) attached so interactive commands will not work.
  */
 export class SequentialPty implements IPty {
-  async spawn(cmd: string, options?: SpawnOptions): Promise<SpawnResult> {
+  async spawn(cmd: string | string[], options?: SpawnOptions): Promise<SpawnResult> {
     const spawnResult = await this.spawnSafe(cmd, options);
 
     if (spawnResult.status !== 'success') {
-      throw new SpawnError(cmd, spawnResult.exitCode, spawnResult.data);
+      throw new SpawnError(Array.isArray(cmd) ? cmd.join('\n') : cmd, spawnResult.exitCode, spawnResult.data);
     }
 
     return spawnResult;
   }
 
-  async spawnSafe(cmd: string, options?: SpawnOptions): Promise<SpawnResult> {
+  async spawnSafe(cmd: string | string[], options?: SpawnOptions): Promise<SpawnResult> {
+    cmd = Array.isArray(cmd) ? cmd.join(' ') : cmd;
+
     if (cmd.includes('sudo')) {
       throw new Error('Do not directly use sudo. Use the option { requiresRoot: true } instead')
     }
@@ -43,7 +45,7 @@ export class SequentialPty implements IPty {
       return this.externalSpawn(cmd, options);
     }
 
-    console.log(`Running command: ${cmd}` + (options?.cwd ? `(${options?.cwd})` : ''))
+    console.log(`Running command: ${Array.isArray(cmd) ? cmd.join('\n') : cmd}` + (options?.cwd ? `(${options?.cwd})` : ''))
 
     return new Promise((resolve) => {
       const output: string[] = [];

package/src/utils/functions.ts

@@ -36,8 +36,7 @@ export function tildify(pathWithTilde: string) {
 }
 
 export function resolvePathWithVariables(pathWithVariables: string) {
-  // @ts-expect-error Ignore this for now
-  return pathWithVariables.replace(/\$([A-Z_]+[A-Z0-9_]*)|\${([A-Z0-9_]*)}/ig, (_, a, b) => process.env[a || b])
+  return pathWithVariables.replace(/\$([A-Z_]+[A-Z0-9_]*)|\${([A-Z0-9_]*)}/ig, (_, a, b) => process.env[a || b]!)
 }
 
 export function addVariablesToPath(pathWithoutVariables: string) {

package/src/utils/index.ts

@@ -1,7 +1,8 @@
 import { OS } from 'codify-schemas';
 import os from 'node:os';
 import path from 'node:path';
-import { 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
@@ -41,6 +42,34 @@ export const Utils = {
     return os.platform() === 'linux';
   },
 
+  async isArmArch(): Promise<boolean> {
+    const $ = getPty();
+    if (!Utils.isMacOS()) {
+      // On Linux, check uname -m
+      const query = await $.spawn('uname -m');
+      return query.data.trim() === 'aarch64' || query.data.trim() === 'arm64';
+    }
+
+    const query = await $.spawn('sysctl -n machdep.cpu.brand_string');
+    return /M(\d)/.test(query.data);
+  },
+
+  async isHomebrewInstalled(): Promise<boolean> {
+    const $ = getPty();
+    const query = await $.spawnSafe('which brew', { interactive: true });
+    return query.status === SpawnStatus.SUCCESS;
+  },
+
+  async isRosetta2Installed(): Promise<boolean> {
+    if (!Utils.isMacOS()) {
+      return false;
+    }
+
+    const $ = getPty();
+    const query = await $.spawnSafe('arch -x86_64 /usr/bin/true 2> /dev/null', { interactive: true });
+    return query.status === SpawnStatus.SUCCESS;
+  },
+
   getShell(): Shell | undefined {
     const shell = process.env.SHELL || '';