codify-plugin-lib 1.0.155 → 1.0.156

package/dist/resource/resource-controller.js

@@ -198,6 +198,11 @@ export class ResourceController {
                 ...Object.fromEntries(this.settings.importAndDestroy?.refreshKeys.map((k) => [k, null])),
                 ...this.settings.importAndDestroy?.defaultRefreshValues,
                 ...parameters,
+                ...(Object.fromEntries(// If a default value was used, but it was also declared in the defaultRefreshValues, prefer the defaultRefreshValue instead
+                Object.entries(parameters).filter(([k, v]) => this.parsedSettings.defaultValues[k] !== undefined
+                    && v === this.parsedSettings.defaultValues[k]
+                    && context.originalDesiredConfig?.[k] === undefined
+                    && this.settings.importAndDestroy?.defaultRefreshValues?.[k] !== undefined).map(([k]) => [k, this.settings.importAndDestroy.defaultRefreshValues[k]])))
             }
             : {
                 ...Object.fromEntries(this.getAllParameterKeys().map((k) => [k, null])),

package/package.json

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

package/src/resource/resource-controller.test.ts

@@ -767,10 +767,6 @@ describe('Resource tests', () => {
           },
           allowMultiple: {
             matcher: (desired, current) => {
-              // console.log('Matcher');
-              // console.log(desired);
-              // console.log(current);
-
               if (desired.path) {
                 return desired.path === current.path;
               }
@@ -791,6 +787,47 @@ describe('Resource tests', () => {
     const plan = await controller.plan({ type: 'path' }, { path: '$HOME/.bun/bin' }, null, false);
 
     expect(plan.requiresChanges()).to.be.false;
-    console.log(JSON.stringify(plan, null, 2));
+  })
+
+  it('Can import with the correct default parameters', async () => {
+    const resource = new class extends TestResource {
+      getSettings(): ResourceSettings<any> {
+        return {
+          id: 'path',
+          parameterSettings: {
+            path: { type: 'string', isEqual: 'directory' },
+            paths: { canModify: true, type: 'array', isElementEqual: 'directory' },
+            prepend: { default: false, setting: true },
+            declarationsOnly: { default: false, setting: true },
+          },
+          importAndDestroy: {
+            refreshKeys: ['paths', 'declarationsOnly'],
+            defaultRefreshValues: {
+              paths: [],
+              declarationsOnly: true,
+            }
+          },
+          allowMultiple: {
+            matcher: (desired, current) => {
+              if (desired.path) {
+                return desired.path === current.path;
+              }
+
+              const currentPaths = new Set(current.paths)
+              return desired.paths?.some((p) => currentPaths.has(p));
+            }
+          }
+        }
+      }
+
+      async refresh(parameters: Partial<TestConfig>): Promise<Partial<TestConfig> | null> {
+        expect(parameters.declarationsOnly).to.be.true;
+
+        return null;
+      }
+    }
+
+    const controller = new ResourceController(resource);
+    const plan = await controller.import({ type: 'path' }, {});
   })
 });

package/src/resource/resource-controller.ts

@@ -281,6 +281,14 @@ export class ResourceController<T extends StringIndexedObject> {
         ),
         ...this.settings.importAndDestroy?.defaultRefreshValues,
         ...parameters,
+        ...(Object.fromEntries( // If a default value was used, but it was also declared in the defaultRefreshValues, prefer the defaultRefreshValue instead
+          Object.entries(parameters).filter(([k, v]) =>
+            this.parsedSettings.defaultValues[k] !== undefined
+            && v === this.parsedSettings.defaultValues[k]
+            && context.originalDesiredConfig?.[k] === undefined
+            && this.settings.importAndDestroy?.defaultRefreshValues?.[k] !== undefined
+          ).map(([k]) => [k, this.settings.importAndDestroy!.defaultRefreshValues![k]])
+        ))
       }
       : {
         ...Object.fromEntries(