codify-plugin-lib 1.0.41 → 1.0.42

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

@@ -18,7 +18,7 @@ export declare class ChangeSet<T extends StringIndexedObject> {
         parameterConfigurations?: Record<keyof T, ParameterConfiguration>;
     }): ParameterChange<T>[];
     static combineResourceOperations(prev: ResourceOperation, next: ResourceOperation): ResourceOperation;
-    static isSame(a: unknown, b: unknown, isEqual?: (a: unknown, b: unknown) => boolean): boolean;
+    static isSame(desired: unknown, current: unknown, configuration?: ParameterConfiguration): boolean;
     private static calculateStatefulModeChangeSet;
     private static calculateStatelessModeChangeSet;
 }

package/dist/entities/change-set.js

@@ -53,16 +53,22 @@ export class ChangeSet {
         const indexNext = orderOfOperations.indexOf(next);
         return orderOfOperations[Math.max(indexPrev, indexNext)];
     }
-    static isSame(a, b, isEqual) {
-        if (isEqual) {
-            return isEqual(a, b);
+    static isSame(desired, current, configuration) {
+        if (configuration?.isEqual) {
+            return configuration.isEqual(desired, current);
         }
-        if (Array.isArray(a) && Array.isArray(b)) {
-            const sortedPrev = a.map((x) => x).sort();
-            const sortedNext = b.map((x) => x).sort();
-            return JSON.stringify(sortedPrev) === JSON.stringify(sortedNext);
+        if (Array.isArray(desired) && Array.isArray(current)) {
+            const sortedDesired = desired.map((x) => x).sort();
+            const sortedCurrent = current.map((x) => x).sort();
+            if (sortedDesired.length !== sortedCurrent.length) {
+                return false;
+            }
+            if (configuration?.isElementEqual) {
+                return sortedDesired.every((value, index) => configuration.isElementEqual(value, sortedCurrent[index]));
+            }
+            return JSON.stringify(sortedDesired) === JSON.stringify(sortedCurrent);
         }
-        return a === b;
+        return desired === current;
     }
     static calculateStatefulModeChangeSet(desired, current, parameterConfigurations) {
         const parameterChangeSet = new Array();
@@ -79,7 +85,7 @@ export class ChangeSet {
                 delete _current[k];
                 continue;
             }
-            if (!ChangeSet.isSame(_desired[k], _current[k], parameterConfigurations?.[k]?.isEqual)) {
+            if (!ChangeSet.isSame(_desired[k], _current[k], parameterConfigurations?.[k])) {
                 parameterChangeSet.push({
                     name: k,
                     previousValue: v,
@@ -126,7 +132,7 @@ export class ChangeSet {
                 });
                 continue;
             }
-            if (!ChangeSet.isSame(_desired[k], _current[k], parameterConfigurations?.[k]?.isEqual)) {
+            if (!ChangeSet.isSame(_desired[k], _current[k], parameterConfigurations?.[k])) {
                 parameterChangeSet.push({
                     name: k,
                     previousValue: _current[k],

package/dist/entities/plan-types.d.ts

@@ -2,6 +2,7 @@ import { ResourceOperation } from 'codify-schemas';
 export interface ParameterConfiguration {
     planOperation?: ResourceOperation.MODIFY | ResourceOperation.RECREATE;
     isEqual?: (desired: any, current: any) => boolean;
+    isElementEqual?: (desired: any, current: any) => boolean;
     isStatefulParameter?: boolean;
 }
 export interface PlanConfiguration<T> {

package/dist/entities/stateful-parameter.d.ts

@@ -2,7 +2,11 @@ import { Plan } from './plan.js';
 import { StringIndexedObject } from 'codify-schemas';
 export interface StatefulParameterConfiguration<T> {
     name: keyof T;
-    isEqual?: (a: any, b: any) => boolean;
+    isEqual?: (desired: any, current: any) => boolean;
+}
+export interface ArrayStatefulParameterConfiguration<T> extends StatefulParameterConfiguration<T> {
+    isEqual?: (desired: any[], current: any[]) => boolean;
+    isElementEqual?: (desired: any, current: any) => boolean;
 }
 export declare abstract class StatefulParameter<T extends StringIndexedObject, V extends T[keyof T]> {
     readonly name: keyof T;
@@ -14,7 +18,7 @@ export declare abstract class StatefulParameter<T extends StringIndexedObject, V
     abstract applyRemove(valueToRemove: V, plan: Plan<T>): Promise<void>;
 }
 export declare abstract class ArrayStatefulParameter<T extends StringIndexedObject, V> extends StatefulParameter<T, any> {
-    protected constructor(configuration: StatefulParameterConfiguration<T>);
+    constructor(configuration: ArrayStatefulParameterConfiguration<T>);
     applyAdd(valuesToAdd: V[], plan: Plan<T>): Promise<void>;
     applyModify(newValues: V[], previousValues: V[], allowDeletes: boolean, plan: Plan<T>): Promise<void>;
     applyRemove(valuesToRemove: V[], plan: Plan<T>): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codify-plugin-lib",
-  "version": "1.0.41",
+  "version": "1.0.42",
   "description": "",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/entities/change-set.ts

@@ -86,22 +86,32 @@ export class ChangeSet<T extends StringIndexedObject> {
   }
 
   static isSame(
-    a: unknown,
-    b: unknown,
-    isEqual?: (a: unknown, b: unknown) => boolean,
+    desired: unknown,
+    current: unknown,
+    configuration?: ParameterConfiguration,
   ): boolean {
-    if (isEqual) {
-      return isEqual(a, b);
+    if (configuration?.isEqual) {
+      return configuration.isEqual(desired, current);
     }
 
-    if (Array.isArray(a) && Array.isArray(b)) {
-      const sortedPrev = a.map((x) => x).sort();
-      const sortedNext = b.map((x) => x).sort();
+    if (Array.isArray(desired) && Array.isArray(current)) {
+      const sortedDesired = desired.map((x) => x).sort();
+      const sortedCurrent = current.map((x) => x).sort();
 
-      return JSON.stringify(sortedPrev) === JSON.stringify(sortedNext);
+      if (sortedDesired.length !== sortedCurrent.length) {
+        return false;
+      }
+
+      if (configuration?.isElementEqual) {
+        return sortedDesired.every((value, index) =>
+          configuration.isElementEqual!(value, sortedCurrent[index])
+        );
+      }
+
+      return JSON.stringify(sortedDesired) === JSON.stringify(sortedCurrent);
     }
 
-    return a === b;
+    return desired === current;
   }
 
   // Explanation: Stateful mode means that codify maintains a stateful to keep track of resources it has added. 
@@ -130,7 +140,7 @@ export class ChangeSet<T extends StringIndexedObject> {
         continue;
       }
 
-      if (!ChangeSet.isSame(_desired[k], _current[k], parameterConfigurations?.[k]?.isEqual)) {
+      if (!ChangeSet.isSame(_desired[k], _current[k], parameterConfigurations?.[k])) {
         parameterChangeSet.push({
           name: k,
           previousValue: v,
@@ -194,7 +204,7 @@ export class ChangeSet<T extends StringIndexedObject> {
         continue;
       }
 
-      if (!ChangeSet.isSame(_desired[k], _current[k], parameterConfigurations?.[k]?.isEqual)) {
+      if (!ChangeSet.isSame(_desired[k], _current[k], parameterConfigurations?.[k])) {
         parameterChangeSet.push({
           name: k,
           previousValue: _current[k],

package/src/entities/plan-types.ts

@@ -15,6 +15,8 @@ export interface ParameterConfiguration {
    */
   isEqual?: (desired: any, current: any) => boolean;
 
+  isElementEqual?: (desired: any, current: any) => boolean;
+
   isStatefulParameter?: boolean;
 }
 

package/src/entities/stateful-parameter.ts

@@ -3,9 +3,15 @@ import { StringIndexedObject } from 'codify-schemas';
 
 export interface StatefulParameterConfiguration<T> {
   name: keyof T;
-  isEqual?: (a: any, b: any) => boolean;
+  isEqual?: (desired: any, current: any) => boolean;
 }
 
+export interface ArrayStatefulParameterConfiguration<T> extends StatefulParameterConfiguration<T> {
+  isEqual?: (desired: any[], current: any[]) => boolean;
+  isElementEqual?: (desired: any, current: any) => boolean;
+}
+
+
 export abstract class StatefulParameter<T extends StringIndexedObject, V extends T[keyof T]> {
   readonly name: keyof T;
   readonly configuration: StatefulParameterConfiguration<T>;
@@ -24,7 +30,8 @@ export abstract class StatefulParameter<T extends StringIndexedObject, V extends
 }
 
 export abstract class ArrayStatefulParameter<T extends StringIndexedObject, V> extends StatefulParameter<T, any>{
-  protected constructor(configuration: StatefulParameterConfiguration<T>) {
+
+  constructor(configuration: ArrayStatefulParameterConfiguration<T>) {
     super(configuration);
   }