codify-plugin-lib 1.0.182-beta71 → 1.0.182-beta73

package/dist/plan/plan.js

@@ -187,7 +187,6 @@ export class Plan {
      *  or wants to set. If a parameter is not specified then it's not managed by Codify.
      */
     static filterCurrentParams(params) {
-        console.log('Filter current params', params.desired, params.current, params.state, params.settings, params.isStateful);
         const { desired, current, state, settings, isStateful } = params;
         if (!current) {
             return null;
@@ -196,7 +195,6 @@ export class Plan {
         if (!filteredCurrent) {
             return null;
         }
-        console.log('Before exit', isStateful, desired);
         // For stateful mode, we're done after filtering by the keys of desired + state. Stateless mode
         // requires additional filtering for stateful parameter arrays and objects.
         if (isStateful && desired) {
@@ -210,7 +208,6 @@ export class Plan {
                 .map(([k, v]) => [k, filterArrayParameterForDeletes(k, v)]));
             return { ...filteredCurrent, ...arrayStatefulParameters };
         }
-        console.log('Post exit', isStateful, desired);
         // TODO: Add object handling here in addition to arrays in the future
         const arrayStatefulParameters = Object.fromEntries(Object.entries(filteredCurrent)
             .filter(([k, v]) => isArrayParameterWithFiltering(k, v))
@@ -257,7 +254,7 @@ export class Plan {
         }
         // For stateless mode, we must filter the current array so that the diff algorithm will not detect any deletes
         function filterArrayParameterForStatelessMode(k, v) {
-            console.log('Attempting to filter (key, value)', k, v);
+            console.log('Attempting to filter stateless (key, value)', k, v);
             const desiredArray = desired[k];
             const matcher = settings.parameterSettings[k].type === 'stateful'
                 ? settings.parameterSettings[k]
@@ -281,12 +278,13 @@ export class Plan {
                 return result;
             });
             const filterParameter = getFilterParameter(k);
-            return typeof filterParameter === 'function'
+            const result = typeof filterParameter === 'function'
                 ? filterParameter(desiredCopy, currentCopy)
                 : defaultFilterMethod(desiredCopy, currentCopy);
+            return result.length === 0 ? null : result;
         }
         function filterArrayParameterForDeletes(k, v) {
-            console.log('Attempting to filter (key, value)', k, v);
+            console.log('Attempting to filter deletes (key, value)', k, v);
             const stateArray = state[k];
             const matcher = settings.parameterSettings[k].type === 'stateful'
                 ? settings.parameterSettings[k]
@@ -310,9 +308,10 @@ export class Plan {
                 return result;
             });
             const filterParameter = getFilterParameter(k);
-            return typeof filterParameter === 'function'
+            const result = typeof filterParameter === 'function'
                 ? filterParameter(stateCopy, currentCopy)
                 : defaultFilterMethod(stateCopy, currentCopy);
+            return result.length === 0 ? null : result;
         }
     }
     // TODO: This needs to be revisited. I don't think this is valid anymore.

package/package.json

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

package/src/plan/plan.ts

@@ -307,8 +307,6 @@ export class Plan<T extends StringIndexedObject> {
     settings: ResourceSettings<T>,
     isStateful: boolean,
   }): Partial<T> | null {
-    console.log('Filter current params', params.desired, params.current, params.state, params.settings, params.isStateful)
-
     const {
       desired,
       current,
@@ -326,8 +324,6 @@ export class Plan<T extends StringIndexedObject> {
       return null
     }
 
-    console.log('Before exit', isStateful, desired);
-
     // For stateful mode, we're done after filtering by the keys of desired + state. Stateless mode
     // requires additional filtering for stateful parameter arrays and objects.
     if (isStateful && desired) {
@@ -346,8 +342,6 @@ export class Plan<T extends StringIndexedObject> {
       return { ...filteredCurrent, ...arrayStatefulParameters }
     }
 
-    console.log('Post exit', isStateful, desired);
-
     // TODO: Add object handling here in addition to arrays in the future
     const arrayStatefulParameters = Object.fromEntries(
       Object.entries(filteredCurrent)
@@ -412,8 +406,8 @@ export class Plan<T extends StringIndexedObject> {
     }
 
     // For stateless mode, we must filter the current array so that the diff algorithm will not detect any deletes
-    function filterArrayParameterForStatelessMode(k: string, v: unknown[]): unknown[] {
-      console.log('Attempting to filter (key, value)', k, v);
+    function filterArrayParameterForStatelessMode(k: string, v: unknown[]): unknown[] | null {
+      console.log('Attempting to filter stateless (key, value)', k, v);
 
       const desiredArray = desired![k] as unknown[];
       const matcher = settings.parameterSettings![k]!.type === 'stateful'
@@ -445,13 +439,15 @@ export class Plan<T extends StringIndexedObject> {
       })
 
       const filterParameter = getFilterParameter(k);
-      return typeof filterParameter === 'function'
+      const result = typeof filterParameter === 'function'
         ? filterParameter(desiredCopy, currentCopy)
         : defaultFilterMethod(desiredCopy, currentCopy);
+
+      return result.length === 0 ? null : result;
     }
 
-    function filterArrayParameterForDeletes(k: string, v: unknown[]): unknown[] {
-      console.log('Attempting to filter (key, value)', k, v);
+    function filterArrayParameterForDeletes(k: string, v: unknown[]): unknown[] | null {
+      console.log('Attempting to filter deletes (key, value)', k, v);
 
       const stateArray = state![k] as unknown[];
       const matcher = settings.parameterSettings![k]!.type === 'stateful'
@@ -484,9 +480,11 @@ export class Plan<T extends StringIndexedObject> {
 
 
       const filterParameter = getFilterParameter(k);
-      return typeof filterParameter === 'function'
+      const result = typeof filterParameter === 'function'
         ? filterParameter(stateCopy, currentCopy)
         : defaultFilterMethod(stateCopy, currentCopy);
+
+      return result.length === 0 ? null : result;
     }
   }
 

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

@@ -66,7 +66,7 @@ describe('SequentialPty tests', () => {
   });
 
 
-  it('It can launch a command in interactive mode', async () => {
+  it('It can launch a command in interactive mode', { timeout: 30_000}, async () => {
     const originalSend = process.send;
     process.send = (req: IpcMessageV2) => {
       expect(req).toMatchObject({