codify-plugin-lib 1.0.145 → 1.0.147

package/dist/plugin/plugin.js

@@ -64,6 +64,9 @@ export class Plugin {
         if (!resource) {
             throw new Error(`Resource of type ${resourceConfig.core.type} could not be found for match`);
         }
+        if (!resource.settings.allowMultiple) {
+            return { match: array.find((r) => r.core.type === resourceConfig.core.type) };
+        }
         const parameterMatcher = resource?.parsedSettings.matcher;
         const match = array.find((r) => {
             if (resourceConfig.core.type !== r.core.type) {

package/dist/resource/parsed-resource-settings.js

@@ -45,7 +45,6 @@ export class ParsedResourceSettings {
                         ...v,
                         controller: spController,
                         nestedSettings: spController?.parsedSettings,
-                        definition: undefined,
                     };
                     return [k, parsed];
                 }
@@ -114,10 +113,10 @@ export class ParsedResourceSettings {
                 this.validateParameterEqualsFn(v, k);
             }
         }
-        if (this.allowMultiple
-            && Object.values(this.parameterSettings).some((v) => v.type === 'stateful')) {
-            throw new Error(`Resource: ${this.id}. Stateful parameters are not allowed if multiples of a resource exist`);
-        }
+        // if (this.allowMultiple
+        //   && Object.values(this.parameterSettings).some((v) => v.type === 'stateful')) {
+        //   throw new Error(`Resource: ${this.id}. Stateful parameters are not allowed if multiples of a resource exist`)
+        // }
         const schema = this.settings.schema;
         if (!this.settings.importAndDestroy && (schema?.oneOf
             && Array.isArray(schema.oneOf)

package/dist/resource/resource-controller.js

@@ -172,6 +172,10 @@ export class ResourceController {
             || currentParametersArray === undefined
             || this.settings.allowMultiple // Stateful parameters are not supported currently if allowMultiple is true
             || currentParametersArray.filter(Boolean).length === 0) {
+            for (const result of currentParametersArray ?? []) {
+                await this.applyTransformParameters(result, true);
+                this.removeDefaultValues(result, parameters);
+            }
             return currentParametersArray
                 ?.map((r) => ({ core, parameters: r }))
                 ?? null;

package/dist/resource/resource-settings.js

@@ -91,6 +91,9 @@ export function resolveMatcher(settings) {
             if (!desired || !current) {
                 return false;
             }
+            if (!settings.allowMultiple) {
+                throw new Error(`Matching only works when allow multiple is enabled. Type: ${settings.id}`);
+            }
             const requiredParameters = typeof settings.allowMultiple === 'object'
                 ? settings.allowMultiple?.identifyingParameters ?? settings.schema?.required ?? []
                 : settings.schema?.required ?? [];

package/package.json

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

package/src/plugin/plugin.test.ts

@@ -5,7 +5,7 @@ import { Resource } from '../resource/resource.js';
 import { Plan } from '../plan/plan.js';
 import { spy } from 'sinon';
 import { ResourceSettings } from '../resource/resource-settings.js';
-import { TestConfig } from '../utils/test-utils.test.js';
+import { TestConfig, TestStatefulParameter } from '../utils/test-utils.test.js';
 import { getPty } from '../pty/index.js';
 
 interface TestConfig extends StringIndexedObject {
@@ -389,5 +389,63 @@ describe('Plugin tests', () => {
       parameters: { path: '/my/path', propA: 'hig' },
     })
 
+    const match2 = await testPlugin.match({
+      resource: {
+        core: { type: 'testResource' },
+        parameters: { path: '/my/path', propA: 'abc' },
+      },
+      array: []
+    })
+
+    expect(match2).toMatchObject({
+      match: undefined,
+    })
+  })
+
+  it('Can match resources together 2', { timeout: 3000000 }, async () => {
+    const resource = spy(new class extends TestResource {
+      getSettings(): ResourceSettings<TestConfig> {
+        return {
+          id: 'ssh-config',
+          parameterSettings: {
+            hosts: { type: 'stateful', definition: new TestStatefulParameter() }
+          },
+          importAndDestroy: {
+            refreshKeys: ['hosts'],
+            defaultRefreshValues: { hosts: [] },
+            requiredParameters: []
+          },
+          dependencies: ['ssh-key'],
+          allowMultiple: {
+            matcher: (a, b) => a.hosts === b.hosts
+          }
+        }
+      }
+    })
+
+    const testPlugin = Plugin.create('testPlugin', [resource as any]);
+
+    const { match } = await testPlugin.match({
+      resource: {
+        core: { type: 'ssh-config' },
+        parameters: { hosts: 'a' },
+      },
+      array: [
+        {
+          core: { type: 'ssh-config' },
+          parameters: { hosts: 'b' },
+        },
+        {
+          core: { type: 'ssh-config' },
+          parameters: { hosts: 'a' },
+        },
+        {
+          core: { type: 'ssh-config' },
+          parameters: { hosts: 'c' },
+        },
+      ]
+    })
+
+    console.log(match)
   })
 });

package/src/plugin/plugin.ts

@@ -101,6 +101,10 @@ export class Plugin {
       throw new Error(`Resource of type ${resourceConfig.core.type} could not be found for match`);
     }
 
+    if (!resource.settings.allowMultiple) {
+      return { match: array.find((r) => r.core.type === resourceConfig.core.type) }
+    }
+
     const parameterMatcher = resource?.parsedSettings.matcher;
     const match = array.find((r) => {
       if (resourceConfig.core.type !== r.core.type) {

package/src/resource/parsed-resource-settings.ts

@@ -92,7 +92,6 @@ export class ParsedResourceSettings<T extends StringIndexedObject> implements Re
               ...v,
               controller: spController,
               nestedSettings: spController?.parsedSettings,
-              definition: undefined,
             };
 
             return [k, parsed as ParsedStatefulParameterSetting];
@@ -189,10 +188,10 @@ export class ParsedResourceSettings<T extends StringIndexedObject> implements Re
       }
     }
 
-    if (this.allowMultiple
-      && Object.values(this.parameterSettings).some((v) => v.type === 'stateful')) {
-      throw new Error(`Resource: ${this.id}. Stateful parameters are not allowed if multiples of a resource exist`)
-    }
+    // if (this.allowMultiple
+    //   && Object.values(this.parameterSettings).some((v) => v.type === 'stateful')) {
+    //   throw new Error(`Resource: ${this.id}. Stateful parameters are not allowed if multiples of a resource exist`)
+    // }
 
     const schema = this.settings.schema as JSONSchemaType<any>;
     if (!this.settings.importAndDestroy && (schema?.oneOf

package/src/resource/resource-controller.ts

@@ -252,6 +252,11 @@ export class ResourceController<T extends StringIndexedObject> {
       || this.settings.allowMultiple // Stateful parameters are not supported currently if allowMultiple is true
       || currentParametersArray.filter(Boolean).length === 0
     ) {
+      for (const result of currentParametersArray ?? []) {
+        await this.applyTransformParameters(result, true);
+        this.removeDefaultValues(result, parameters)
+      }
+
       return currentParametersArray
           ?.map((r) => ({ core, parameters: r }))
         ?? null;

package/src/resource/resource-settings.ts

@@ -412,13 +412,16 @@ export function resolveParameterTransformFn(
 export function resolveMatcher<T extends StringIndexedObject>(
   settings: ResourceSettings<T>
 ): (desired: Partial<T>, current: Partial<T>) => boolean {
-
   return typeof settings.allowMultiple === 'boolean' || !settings.allowMultiple?.matcher
     ? ((desired: Partial<T>, current: Partial<T>) => {
       if (!desired || !current) {
         return false;
       }
 
+      if (!settings.allowMultiple) {
+        throw new Error(`Matching only works when allow multiple is enabled. Type: ${settings.id}`)
+      }
+
       const requiredParameters = typeof settings.allowMultiple === 'object'
         ? settings.allowMultiple?.identifyingParameters ?? (settings.schema?.required as string[]) ?? []
         : (settings.schema?.required as string[]) ?? []