@codifycli/plugin-core 1.2.3-beta.1 → 1.2.3

package/dist/messages/sender.d.ts

@@ -4,7 +4,7 @@
 declare class CodifyCliSenderImpl {
     private readonly validateIpcMessageV2;
     requestPressKeyToContinuePrompt(message?: string): Promise<void>;
-    sendApplyNote(message: string, resourceType?: string): Promise<void>;
+    sendApplyNote(message: string, resourceType?: string): void;
     getCodifyCliCredentials(): Promise<string>;
     private sendAndWaitForResponse;
 }

package/dist/messages/sender.js

@@ -17,16 +17,17 @@ class CodifyCliSenderImpl {
             }
         });
     }
-    async sendApplyNote(message, resourceType) {
+    sendApplyNote(message, resourceType) {
         if (!process.send || !process.connected) {
             return;
         }
-        await this.sendAndWaitForResponse({
+        process.send({
             cmd: MessageCmd.APPLY_NOTE_REQUEST,
             data: {
                 message,
                 ...(resourceType && { resourceType }),
-            }
+            },
+            requestId: nanoid(8),
         });
     }
     async getCodifyCliCredentials() {

package/dist/plan/change-set.d.ts

@@ -49,5 +49,6 @@ export declare class ChangeSet<T extends StringIndexedObject> {
      */
     private static calculateParameterChanges;
     private static combineResourceOperations;
+    private static isAbsent;
     private static isSame;
 }

package/dist/plan/change-set.js

@@ -92,9 +92,9 @@ export class ChangeSet {
      */
     static calculateParameterChanges(desiredParameters, currentParameters, parameterOptions) {
         const parameterChangeSet = new Array();
-        // Filter out null and undefined values or else the diff below will not work
-        const desired = Object.fromEntries(Object.entries(desiredParameters).filter(([, v]) => v !== null && v !== undefined));
-        const current = Object.fromEntries(Object.entries(currentParameters).filter(([, v]) => v !== null && v !== undefined));
+        // Filter out null, undefined, [], and {} — all treated as "no value"
+        const desired = Object.fromEntries(Object.entries(desiredParameters).filter(([, v]) => !ChangeSet.isAbsent(v)));
+        const current = Object.fromEntries(Object.entries(currentParameters).filter(([, v]) => !ChangeSet.isAbsent(v)));
         for (const k of new Set([...Object.keys(current), ...Object.keys(desired)])) {
             if (ChangeSet.isSame(desired[k], current[k], parameterOptions?.[k])) {
                 parameterChangeSet.push({
@@ -148,6 +148,15 @@ export class ChangeSet {
         const indexNext = orderOfOperations.indexOf(next);
         return orderOfOperations[Math.max(indexPrev, indexNext)];
     }
+    static isAbsent(v) {
+        if (v === null || v === undefined)
+            return true;
+        if (Array.isArray(v))
+            return v.length === 0;
+        if (typeof v === 'object')
+            return Object.keys(v).length === 0;
+        return false;
+    }
     static isSame(desired, current, setting) {
         return (setting?.isEqual ?? ((a, b) => a === b))(desired, current);
     }

package/dist/pty/background-pty.js

@@ -110,6 +110,8 @@ export class BackgroundPty {
             return new Promise(resolve => {
                 this.basePty.write(' unset PS1;\n');
                 this.basePty.write(' unset PS0;\n');
+                // zsh autocorrect prompts (e.g. "zsh: correct 'config' to '.config' [nyae]?") will hang
+                // the pty waiting for interactive input. Can't be disabled via env var; must unset the options explicitly.
                 this.basePty.write(' unsetopt CORRECT CORRECT_ALL 2>/dev/null; true;\n');
                 this.basePty.write(' echo setup complete\\"\n');
                 const listener = this.basePty.onData((data) => {

package/dist/pty/seqeuntial-pty.js

@@ -66,6 +66,8 @@ export class SequentialPty {
             // Set to a really large value to prevent wrapping
             const initialCols = options?.disableWrapping ? 10_000 : process.stdout.columns ?? 80;
             const initialRows = process.stdout.rows ?? 24;
+            // zsh autocorrect prompts (e.g. "zsh: correct 'config' to '.config' [nyae]?") will hang
+            // the pty waiting for interactive input. Can't be disabled via env var; must unset the options explicitly.
             const disableAutocorrect = Utils.getShell() === Shell.ZSH ? 'unsetopt CORRECT CORRECT_ALL 2>/dev/null; ' : '';
             const wrappedCmd = `${disableAutocorrect}${cmd}`;
             const args = options?.interactive ? ['-i', '-c', wrappedCmd] : ['-c', wrappedCmd];

package/dist/utils/file-utils.js

@@ -24,7 +24,7 @@ export class FileUtils {
         await FileUtils.createShellRcIfNotExists();
         const lineToInsert = addLeadingSpacer(addTrailingSpacer(line));
         await fs.appendFile(Utils.getPrimaryShellRc(), lineToInsert);
-        await CodifyCliSender.sendApplyNote(ApplyNotes.sourceShellRc());
+        CodifyCliSender.sendApplyNote(ApplyNotes.sourceShellRc());
         function addLeadingSpacer(line) {
             return line.startsWith('\n')
                 ? line
@@ -43,7 +43,7 @@ export class FileUtils {
         console.log(`Adding to ${path.basename(shellRc)}:
 ${lines.join('\n')}`);
         await fs.appendFile(shellRc, formattedLines);
-        await CodifyCliSender.sendApplyNote(ApplyNotes.sourceShellRc());
+        CodifyCliSender.sendApplyNote(ApplyNotes.sourceShellRc());
     }
     /**
      * This method adds a directory path to the shell rc file if it doesn't already exist.
@@ -64,7 +64,7 @@ ${lines.join('\n')}`);
         else {
             await fs.appendFile(shellRc, `\nexport PATH=${value}:$PATH;`, { encoding: 'utf8' });
         }
-        await CodifyCliSender.sendApplyNote(ApplyNotes.sourceShellRc());
+        CodifyCliSender.sendApplyNote(ApplyNotes.sourceShellRc());
     }
     static async removeFromFile(filePath, search) {
         const contents = await fs.readFile(filePath, 'utf8');

package/dist/utils/functions.js

@@ -31,7 +31,7 @@ export function resolvePathWithVariables(pathWithVariables) {
 export function addVariablesToPath(pathWithoutVariables) {
     let result = pathWithoutVariables;
     for (const [key, value] of Object.entries(process.env)) {
-        if (!value || !path.isAbsolute(value) || value === '/' || key === 'HOME' || key === 'PATH' || key === 'SHELL' || key === 'PWD') {
+        if (!value || !path.isAbsolute(value) || value === '/' || value === homeDirectory || key === 'HOME' || key === 'PATH' || key === 'SHELL' || key === 'PWD') {
             continue;
         }
         result = result.replaceAll(value, `$${key}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codifycli/plugin-core",
-  "version": "1.2.3-beta.1",
+  "version": "1.2.3",
   "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/messages/sender.ts

@@ -27,17 +27,18 @@ class CodifyCliSenderImpl {
     })
   }
 
-  async sendApplyNote(message: string, resourceType?: string): Promise<void> {
+  sendApplyNote(message: string, resourceType?: string): void {
     if (!process.send || !process.connected) {
       return;
     }
 
-    await this.sendAndWaitForResponse(<IpcMessageV2>{
+    process.send(<IpcMessageV2>{
       cmd: MessageCmd.APPLY_NOTE_REQUEST,
       data: <ApplyNoteRequestData>{
         message,
         ...(resourceType && { resourceType }),
-      }
+      },
+      requestId: nanoid(8),
     });
   }
 

package/src/plan/change-set.test.ts

@@ -304,6 +304,33 @@ describe('Change set tests', () => {
     expect(cs.operation).to.eq(ResourceOperation.DESTROY);
   })
 
+  it('treats empty objects {} as no-op', () => {
+    const desired = {
+      keyboard: {},
+      dock: {},
+    }
+
+    const current = {
+      keyboard: {},
+      dock: {},
+    }
+
+    const cs = ChangeSet.calculateModification(desired, current);
+    expect(cs.parameterChanges.length).to.eq(0);
+    expect(cs.operation).to.eq(ResourceOperation.NOOP);
+  })
+
+  it('treats empty object {} as absent when current has no value', () => {
+    const desired = {
+      keyboard: {},
+      dock: {},
+    }
+
+    const cs = ChangeSet.calculateModification(desired, {});
+    expect(cs.parameterChanges.length).to.eq(0);
+    expect(cs.operation).to.eq(ResourceOperation.NOOP);
+  })
+
   it('correctly determines array equality 5', () => {
     const arrA = [{ key1: 'b' }, { key1: 'a' }, { key1: 'a' }];
     const arrB = [{ key1: 'a' }, { key1: 'a' }, { key1: 'b' }];

package/src/plan/change-set.ts

@@ -154,13 +154,13 @@ export class ChangeSet<T extends StringIndexedObject> {
   ): ParameterChange<T>[] {
     const parameterChangeSet = new Array<ParameterChange<T>>();
 
-    // Filter out null and undefined values or else the diff below will not work
+    // Filter out null, undefined, [], and {} — all treated as "no value"
     const desired = Object.fromEntries(
-      Object.entries(desiredParameters).filter(([, v]) => v !== null && v !== undefined)
+      Object.entries(desiredParameters).filter(([, v]) => !ChangeSet.isAbsent(v))
     ) as Partial<T>
 
     const current = Object.fromEntries(
-      Object.entries(currentParameters).filter(([, v]) => v !== null && v !== undefined)
+      Object.entries(currentParameters).filter(([, v]) => !ChangeSet.isAbsent(v))
     ) as Partial<T>
 
     for (const k of new Set([...Object.keys(current), ...Object.keys(desired)])) {
@@ -227,6 +227,13 @@ export class ChangeSet<T extends StringIndexedObject> {
     return orderOfOperations[Math.max(indexPrev, indexNext)];
   }
 
+  private static isAbsent(v: unknown): boolean {
+    if (v === null || v === undefined) return true;
+    if (Array.isArray(v)) return v.length === 0;
+    if (typeof v === 'object') return Object.keys(v as object).length === 0;
+    return false;
+  }
+
   private static isSame(
     desired: unknown,
     current: unknown,

package/src/pty/background-pty.ts

@@ -135,6 +135,8 @@ export class BackgroundPty implements IPty {
       return new Promise(resolve => {
         this.basePty.write(' unset PS1;\n');
         this.basePty.write(' unset PS0;\n')
+        // zsh autocorrect prompts (e.g. "zsh: correct 'config' to '.config' [nyae]?") will hang
+        // the pty waiting for interactive input. Can't be disabled via env var; must unset the options explicitly.
         this.basePty.write(' unsetopt CORRECT CORRECT_ALL 2>/dev/null; true;\n')
         this.basePty.write(' echo setup complete\\"\n')
 

package/src/pty/seqeuntial-pty.ts

@@ -88,6 +88,8 @@ export class SequentialPty implements IPty {
       const initialCols = options?.disableWrapping ? 10_000 : process.stdout.columns ?? 80
       const initialRows = process.stdout.rows ?? 24;
 
+      // zsh autocorrect prompts (e.g. "zsh: correct 'config' to '.config' [nyae]?") will hang
+      // the pty waiting for interactive input. Can't be disabled via env var; must unset the options explicitly.
       const disableAutocorrect = Utils.getShell() === Shell.ZSH ? 'unsetopt CORRECT CORRECT_ALL 2>/dev/null; ' : '';
       const wrappedCmd = `${disableAutocorrect}${cmd}`;
       const args = options?.interactive ? ['-i', '-c', wrappedCmd] : ['-c', wrappedCmd]

package/src/utils/file-utils.ts

@@ -35,7 +35,7 @@ export class FileUtils {
     );
 
     await fs.appendFile(Utils.getPrimaryShellRc(), lineToInsert)
-    await CodifyCliSender.sendApplyNote(ApplyNotes.sourceShellRc());
+    CodifyCliSender.sendApplyNote(ApplyNotes.sourceShellRc());
 
     function addLeadingSpacer(line: string): string {
       return line.startsWith('\n')
@@ -60,7 +60,7 @@ export class FileUtils {
 ${lines.join('\n')}`)
 
     await fs.appendFile(shellRc, formattedLines)
-    await CodifyCliSender.sendApplyNote(ApplyNotes.sourceShellRc());
+    CodifyCliSender.sendApplyNote(ApplyNotes.sourceShellRc());
   }
 
   /**
@@ -85,7 +85,7 @@ ${lines.join('\n')}`)
       await fs.appendFile(shellRc, `\nexport PATH=${value}:$PATH;`, { encoding: 'utf8' });
     }
 
-    await CodifyCliSender.sendApplyNote(ApplyNotes.sourceShellRc());
+    CodifyCliSender.sendApplyNote(ApplyNotes.sourceShellRc());
   }
 
   static async removeFromFile(filePath: string, search: string): Promise<void> {

package/src/utils/functions.ts

@@ -43,7 +43,7 @@ export function resolvePathWithVariables(pathWithVariables: string) {
 export function addVariablesToPath(pathWithoutVariables: string) {
   let result = pathWithoutVariables;
   for (const [key, value] of Object.entries(process.env)) {
-    if (!value || !path.isAbsolute(value) || value === '/' || key === 'HOME' || key === 'PATH' || key === 'SHELL' || key === 'PWD') {
+    if (!value || !path.isAbsolute(value) || value === '/' || value === homeDirectory || key === 'HOME' || key === 'PATH' || key === 'SHELL' || key === 'PWD') {
       continue;
     }