codify-plugin-lib 1.0.182-beta76 → 1.0.182-beta77
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/plan/plan.js +2 -8
- package/package.json +1 -1
- package/src/plan/plan.ts +4 -16
package/dist/plan/plan.js
CHANGED
|
@@ -206,14 +206,12 @@ export class Plan {
|
|
|
206
206
|
const arrayStatefulParameters = Object.fromEntries(Object.entries(filteredCurrent)
|
|
207
207
|
.filter(([k, v]) => isArrayParameterWithFiltering(k, v))
|
|
208
208
|
.map(([k, v]) => [k, filterArrayParameterForDeletes(k, v)]));
|
|
209
|
-
console.log('Result for destroy filtering', { ...filteredCurrent, ...arrayStatefulParameters });
|
|
210
209
|
return { ...filteredCurrent, ...arrayStatefulParameters };
|
|
211
210
|
}
|
|
212
211
|
// TODO: Add object handling here in addition to arrays in the future
|
|
213
212
|
const arrayStatefulParameters = Object.fromEntries(Object.entries(filteredCurrent)
|
|
214
213
|
.filter(([k, v]) => isArrayParameterWithFiltering(k, v))
|
|
215
214
|
.map(([k, v]) => [k, filterArrayParameterForStatelessMode(k, v)]));
|
|
216
|
-
console.log('Result', { ...filteredCurrent, ...arrayStatefulParameters });
|
|
217
215
|
return { ...filteredCurrent, ...arrayStatefulParameters };
|
|
218
216
|
function filterCurrent() {
|
|
219
217
|
if (!current) {
|
|
@@ -255,7 +253,6 @@ export class Plan {
|
|
|
255
253
|
}
|
|
256
254
|
// For stateless mode, we must filter the current array so that the diff algorithm will not detect any deletes
|
|
257
255
|
function filterArrayParameterForStatelessMode(k, v) {
|
|
258
|
-
console.log('Attempting to filter stateless (key, value)', k, v);
|
|
259
256
|
const desiredArray = desired[k];
|
|
260
257
|
const matcher = settings.parameterSettings[k].type === 'stateful'
|
|
261
258
|
? settings.parameterSettings[k]
|
|
@@ -279,13 +276,11 @@ export class Plan {
|
|
|
279
276
|
return result;
|
|
280
277
|
});
|
|
281
278
|
const filterParameter = getFilterParameter(k);
|
|
282
|
-
|
|
279
|
+
return typeof filterParameter === 'function'
|
|
283
280
|
? filterParameter(desiredCopy, currentCopy)
|
|
284
281
|
: defaultFilterMethod(desiredCopy, currentCopy);
|
|
285
|
-
return result.length === 0 ? null : result;
|
|
286
282
|
}
|
|
287
283
|
function filterArrayParameterForDeletes(k, v) {
|
|
288
|
-
console.log('Attempting to filter deletes (key, value)', k, v);
|
|
289
284
|
const stateArray = state[k];
|
|
290
285
|
const matcher = settings.parameterSettings[k].type === 'stateful'
|
|
291
286
|
? settings.parameterSettings[k]
|
|
@@ -309,10 +304,9 @@ export class Plan {
|
|
|
309
304
|
return result;
|
|
310
305
|
});
|
|
311
306
|
const filterParameter = getFilterParameter(k);
|
|
312
|
-
|
|
307
|
+
return typeof filterParameter === 'function'
|
|
313
308
|
? filterParameter(stateCopy, currentCopy)
|
|
314
309
|
: defaultFilterMethod(stateCopy, currentCopy);
|
|
315
|
-
return result.length === 0 ? null : result;
|
|
316
310
|
}
|
|
317
311
|
}
|
|
318
312
|
// TODO: This needs to be revisited. I don't think this is valid anymore.
|
package/package.json
CHANGED
package/src/plan/plan.ts
CHANGED
|
@@ -339,8 +339,6 @@ export class Plan<T extends StringIndexedObject> {
|
|
|
339
339
|
.map(([k, v]) => [k, filterArrayParameterForDeletes(k, v)])
|
|
340
340
|
)
|
|
341
341
|
|
|
342
|
-
console.log('Result for destroy filtering', { ...filteredCurrent, ...arrayStatefulParameters });
|
|
343
|
-
|
|
344
342
|
return { ...filteredCurrent, ...arrayStatefulParameters }
|
|
345
343
|
}
|
|
346
344
|
|
|
@@ -351,8 +349,6 @@ export class Plan<T extends StringIndexedObject> {
|
|
|
351
349
|
.map(([k, v]) => [k, filterArrayParameterForStatelessMode(k, v)])
|
|
352
350
|
)
|
|
353
351
|
|
|
354
|
-
console.log('Result', { ...filteredCurrent, ...arrayStatefulParameters });
|
|
355
|
-
|
|
356
352
|
return { ...filteredCurrent, ...arrayStatefulParameters }
|
|
357
353
|
|
|
358
354
|
function filterCurrent(): Partial<T> | null {
|
|
@@ -408,9 +404,7 @@ export class Plan<T extends StringIndexedObject> {
|
|
|
408
404
|
}
|
|
409
405
|
|
|
410
406
|
// For stateless mode, we must filter the current array so that the diff algorithm will not detect any deletes
|
|
411
|
-
function filterArrayParameterForStatelessMode(k: string, v: unknown[]):
|
|
412
|
-
console.log('Attempting to filter stateless (key, value)', k, v);
|
|
413
|
-
|
|
407
|
+
function filterArrayParameterForStatelessMode(k: string, v: unknown[]): unknown[] {
|
|
414
408
|
const desiredArray = desired![k] as unknown[];
|
|
415
409
|
const matcher = settings.parameterSettings![k]!.type === 'stateful'
|
|
416
410
|
? ((settings.parameterSettings![k] as ParsedStatefulParameterSetting)
|
|
@@ -441,16 +435,12 @@ export class Plan<T extends StringIndexedObject> {
|
|
|
441
435
|
})
|
|
442
436
|
|
|
443
437
|
const filterParameter = getFilterParameter(k);
|
|
444
|
-
|
|
438
|
+
return typeof filterParameter === 'function'
|
|
445
439
|
? filterParameter(desiredCopy, currentCopy)
|
|
446
440
|
: defaultFilterMethod(desiredCopy, currentCopy);
|
|
447
|
-
|
|
448
|
-
return result.length === 0 ? null : result;
|
|
449
441
|
}
|
|
450
442
|
|
|
451
|
-
function filterArrayParameterForDeletes(k: string, v: unknown[]):
|
|
452
|
-
console.log('Attempting to filter deletes (key, value)', k, v);
|
|
453
|
-
|
|
443
|
+
function filterArrayParameterForDeletes(k: string, v: unknown[]): unknown[] {
|
|
454
444
|
const stateArray = state![k] as unknown[];
|
|
455
445
|
const matcher = settings.parameterSettings![k]!.type === 'stateful'
|
|
456
446
|
? ((settings.parameterSettings![k] as ParsedStatefulParameterSetting)
|
|
@@ -482,11 +472,9 @@ export class Plan<T extends StringIndexedObject> {
|
|
|
482
472
|
|
|
483
473
|
|
|
484
474
|
const filterParameter = getFilterParameter(k);
|
|
485
|
-
|
|
475
|
+
return typeof filterParameter === 'function'
|
|
486
476
|
? filterParameter(stateCopy, currentCopy)
|
|
487
477
|
: defaultFilterMethod(stateCopy, currentCopy);
|
|
488
|
-
|
|
489
|
-
return result.length === 0 ? null : result;
|
|
490
478
|
}
|
|
491
479
|
}
|
|
492
480
|
|