codify-plugin-lib 1.0.15 → 1.0.17

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

@@ -12,4 +12,5 @@ export declare class ChangeSet {
     static createForNullCurrentConfig(desiredConfig: ResourceConfig): ChangeSet;
     static calculateParameterChangeSet(prev: ResourceConfig, next: ResourceConfig): ParameterChange[];
     static combineResourceOperations(prev: ResourceOperation, next: ResourceOperation): ResourceOperation;
+    static isSame(a: unknown, b: unknown): boolean;
 }

package/dist/entities/change-set.js

@@ -39,7 +39,7 @@ class ChangeSet {
                 delete filteredPrev[k];
                 continue;
             }
-            if (filteredPrev[k] !== filteredNext[k]) {
+            if (!ChangeSet.isSame(filteredPrev[k], filteredNext[k])) {
                 parameterChangeSet.push({
                     name: k,
                     previousValue: v,
@@ -84,5 +84,13 @@ class ChangeSet {
         const indexNext = orderOfOperations.indexOf(next);
         return orderOfOperations[Math.max(indexPrev, indexNext)];
     }
+    static isSame(a, b) {
+        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);
+        }
+        return a === b;
+    }
 }
 exports.ChangeSet = ChangeSet;

package/dist/utils/utils.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import { SpawnOptions } from 'child_process';
 export declare enum SpawnStatus {
-    SUCCESS = 0,
-    ERROR = 1
+    SUCCESS = "success",
+    ERROR = "error"
 }
 export interface SpawnResult {
     status: SpawnStatus;

package/dist/utils/utils.js

@@ -7,13 +7,17 @@ exports.isDebug = exports.codifySpawn = exports.SpawnStatus = void 0;
 const promise_spawn_1 = __importDefault(require("@npmcli/promise-spawn"));
 var SpawnStatus;
 (function (SpawnStatus) {
-    SpawnStatus[SpawnStatus["SUCCESS"] = 0] = "SUCCESS";
-    SpawnStatus[SpawnStatus["ERROR"] = 1] = "ERROR";
+    SpawnStatus["SUCCESS"] = "success";
+    SpawnStatus["ERROR"] = "error";
 })(SpawnStatus || (exports.SpawnStatus = SpawnStatus = {}));
 async function codifySpawn(cmd, args, opts, extras) {
     try {
         const stdio = isDebug() ? 'inherit' : 'pipe';
         const result = await (0, promise_spawn_1.default)(cmd, args ?? [], { ...opts, stdio, stdioString: true, shell: true }, extras);
+        if (isDebug()) {
+            console.log(`codifySpawn result for: ${cmd}`);
+            console.log(JSON.stringify(result, null, 2));
+        }
         const status = (result.code === 0 && !result.stderr)
             ? SpawnStatus.SUCCESS
             : SpawnStatus.ERROR;

package/package.json

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

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

@@ -74,6 +74,38 @@ describe('Change set tests', () => {
     expect(cs[0].operation).to.eq(ParameterOperation.NOOP);
   })
 
+  it ('handles simple arrays', () => {
+    const before = {
+      type: 'config',
+      propA: ['a', 'b', 'c'],
+    }
+
+    const after = {
+      type: 'config',
+      propA: ['b', 'a', 'c'],
+    }
+
+    const cs = ChangeSet.calculateParameterChangeSet(before, after);
+    expect(cs.length).to.eq(1);
+    expect(cs[0].operation).to.eq(ParameterOperation.NOOP);
+  })
+
+  it ('handles simple arrays', () => {
+    const before = {
+      type: 'config',
+      propA: ['a', 'b'],
+    }
+
+    const after = {
+      type: 'config',
+      propA: ['b', 'a', 'c'],
+    }
+
+    const cs = ChangeSet.calculateParameterChangeSet(before, after);
+    expect(cs.length).to.eq(1);
+    expect(cs[0].operation).to.eq(ParameterOperation.MODIFY);
+  })
+
   it ('determines the order of operations 1', () => {
     const op1 = ResourceOperation.MODIFY;
     const op2 = ResourceOperation.CREATE
@@ -97,4 +129,39 @@ describe('Change set tests', () => {
     const opResult = ChangeSet.combineResourceOperations(op1, op2);
     expect(opResult).to.eq(ResourceOperation.MODIFY);
   })
+
+  it('correctly determines array equality', () => {
+    const arrA = ['a', 'b', 'd'];
+    const arrB = ['a', 'b', 'd'];
+
+    expect(ChangeSet.isSame(arrA, arrB)).to.be.true;
+  })
+
+  it('correctly determines array equality 2', () => {
+    const arrA = ['a', 'b'];
+    const arrB = ['a', 'b', 'd'];
+
+    expect(ChangeSet.isSame(arrA, arrB)).to.be.false;
+  })
+
+  it('correctly determines array equality 3', () => {
+    const arrA = ['b', 'a', 'd'];
+    const arrB = ['a', 'b', 'd'];
+
+    expect(ChangeSet.isSame(arrA, arrB)).to.be.true;
+  })
+
+  it('correctly determines array equality 4', () => {
+    const arrA = [{ key1: 'a' }, { key1: 'a' }, { key1: 'a' }];
+    const arrB = [{ key1: 'a' }, { key1: 'a' }, { key1: 'b' }];
+
+    expect(ChangeSet.isSame(arrA, arrB)).to.be.false;
+  })
+
+  it('correctly determines array equality 5', () => {
+    const arrA = [{ key1: 'b' }, { key1: 'a' }, { key1: 'a' }];
+    const arrB = [{ key1: 'a' }, { key1: 'a' }, { key1: 'b' }];
+
+    expect(ChangeSet.isSame(arrA, arrB)).to.be.false;
+  })
 })

package/src/entities/change-set.ts

@@ -60,7 +60,7 @@ export class ChangeSet {
         continue;
       }
 
-      if (filteredPrev[k] !== filteredNext[k]) {
+      if (!ChangeSet.isSame(filteredPrev[k], filteredNext[k])) {
         parameterChangeSet.push({
           name: k,
           previousValue: v,
@@ -114,4 +114,15 @@ export class ChangeSet {
 
     return orderOfOperations[Math.max(indexPrev, indexNext)];
   }
+
+  static isSame(a: unknown, b: unknown): boolean {
+    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);
+    }
+
+    return a === b;
+  }
 }

package/src/utils/utils.ts

@@ -2,8 +2,8 @@ import promiseSpawn from '@npmcli/promise-spawn';
 import { SpawnOptions } from 'child_process';
 
 export enum SpawnStatus {
-  SUCCESS,
-  ERROR,
+  SUCCESS = 'success',
+  ERROR = 'error',
 }
 
 export interface SpawnResult {
@@ -31,6 +31,11 @@ export async function codifySpawn(
       extras
     );
 
+    if (isDebug()) {
+      console.log(`codifySpawn result for: ${cmd}`);
+      console.log(JSON.stringify(result, null, 2))
+    }
+
     const status = (result.code === 0 && !result.stderr)
       ? SpawnStatus.SUCCESS
       : SpawnStatus.ERROR;
@@ -48,5 +53,5 @@ export async function codifySpawn(
 }
 
 export function isDebug(): boolean {
-  return process.env.DEBUG != null && process.env.DEBUG.includes('codify');
+  return process.env.DEBUG != null && process.env.DEBUG.includes('codify'); // TODO: replace with debug library
 }