codify-plugin-lib 1.0.85 → 1.0.87

package/dist/plugin/plugin.js

@@ -1,6 +1,5 @@
 import { Plan } from '../plan/plan.js';
 import { ResourceController } from '../resource/resource-controller.js';
-import { splitUserConfig } from '../utils/utils.js';
 export class Plugin {
     name;
     resourceControllers;
@@ -34,10 +33,9 @@ export class Plugin {
             if (!this.resourceControllers.has(config.type)) {
                 throw new Error(`Resource type not found: ${config.type}`);
             }
-            const { parameters, coreParameters } = splitUserConfig(config);
             const validation = await this.resourceControllers
                 .get(config.type)
-                .validate(parameters, coreParameters);
+                .validate(config);
             validationResults.push(validation);
         }
         await this.crossValidateResources(data.configs);

package/dist/resource/resource-controller.d.ts

@@ -14,7 +14,7 @@ export declare class ResourceController<T extends StringIndexedObject> {
     protected schemaValidator?: ValidateFunction;
     constructor(resource: Resource<T>);
     initialize(): Promise<void>;
-    validate(parameters: Partial<T>, resourceMetaData: ResourceConfig): Promise<ValidateResponseData['resourceValidations'][0]>;
+    validate(desiredConfig: Partial<T> & ResourceConfig): Promise<ValidateResponseData['resourceValidations'][0]>;
     plan(desiredConfig: Partial<T> & ResourceConfig | null, stateConfig?: Partial<T> & ResourceConfig | null, statefulMode?: boolean): Promise<Plan<T>>;
     apply(plan: Plan<T>): Promise<void>;
     private applyCreate;

package/dist/resource/resource-controller.js

@@ -31,14 +31,18 @@ export class ResourceController {
     async initialize() {
         return this.resource.initialize();
     }
-    async validate(parameters, resourceMetaData) {
+    async validate(desiredConfig) {
+        const configToValidate = { ...desiredConfig };
+        await this.applyTransformParameters(configToValidate);
+        const { parameters, coreParameters } = splitUserConfig(configToValidate);
+        this.addDefaultValues(parameters);
         if (this.schemaValidator) {
             const isValid = this.schemaValidator(parameters);
             if (!isValid) {
                 return {
                     isValid: false,
-                    resourceName: resourceMetaData.name,
-                    resourceType: resourceMetaData.type,
+                    resourceName: coreParameters.name,
+                    resourceType: coreParameters.type,
                     schemaValidationErrors: this.schemaValidator?.errors ?? [],
                 };
             }
@@ -56,15 +60,15 @@ export class ResourceController {
             return {
                 customValidationErrorMessage,
                 isValid: false,
-                resourceName: resourceMetaData.name,
-                resourceType: resourceMetaData.type,
+                resourceName: coreParameters.name,
+                resourceType: coreParameters.type,
                 schemaValidationErrors: this.schemaValidator?.errors ?? [],
             };
         }
         return {
             isValid: true,
-            resourceName: resourceMetaData.name,
-            resourceType: resourceMetaData.type,
+            resourceName: coreParameters.name,
+            resourceType: coreParameters.type,
             schemaValidationErrors: [],
         };
     }

package/package.json

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

package/src/plugin/plugin.ts

@@ -11,7 +11,6 @@ import {
 import { Plan } from '../plan/plan.js';
 import { Resource } from '../resource/resource.js';
 import { ResourceController } from '../resource/resource-controller.js';
-import { splitUserConfig } from '../utils/utils.js';
 
 export class Plugin {
   planStorage: Map<string, Plan<any>>;
@@ -55,10 +54,9 @@ export class Plugin {
         throw new Error(`Resource type not found: ${config.type}`);
       }
 
-      const { parameters, coreParameters } = splitUserConfig(config);
       const validation = await this.resourceControllers
         .get(config.type)!
-        .validate(parameters, coreParameters);
+        .validate(config);
 
       validationResults.push(validation);
     }

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

@@ -7,9 +7,38 @@ import { CreatePlan, DestroyPlan, ModifyPlan } from '../plan/plan-types.js';
 import { ParameterChange } from '../plan/change-set.js';
 import { ResourceController } from './resource-controller.js';
 import { TestConfig, testPlan, TestResource, TestStatefulParameter } from '../utils/test-utils.test.js';
+import { untildify } from '../utils/utils.js';
 
 describe('Resource tests', () => {
 
+  it('Validate applies transformations before validating', async () => {
+    const resource = new class extends TestResource {
+      getSettings(): ResourceSettings<TestConfig> {
+        return {
+          id: 'type',
+          dependencies: ['homebrew', 'python'],
+          parameterSettings: {
+            propA: { canModify: true, inputTransformation: (input) => untildify(input) },
+          },
+          inputTransformation: (config) => ({ propA: config.propA, propC: config.propB }),
+        }
+      }
+
+      async validate(parameters: Partial<TestConfig>): Promise<void> {
+        expect(parameters.propA).to.not.include('~');
+        expect(parameters.propB).to.not.exist;
+        expect(parameters.propC).to.equal(10);
+      }
+    }
+
+    const controller = new ResourceController(resource);
+    await controller.validate({
+      type: 'type',
+      propA: '~/.tool_versions',
+      propB: 10,
+    })
+  })
+
   it('Plans successfully', async () => {
     const resource = new class extends TestResource {
 

package/src/resource/resource-controller.ts

@@ -54,17 +54,22 @@ export class ResourceController<T extends StringIndexedObject> {
   }
 
   async validate(
-    parameters: Partial<T>,
-    resourceMetaData: ResourceConfig
+    desiredConfig: Partial<T> & ResourceConfig,
   ): Promise<ValidateResponseData['resourceValidations'][0]> {
+    const configToValidate = { ...desiredConfig };
+    await this.applyTransformParameters(configToValidate);
+
+    const { parameters, coreParameters } = splitUserConfig(configToValidate);
+    this.addDefaultValues(parameters);
+
     if (this.schemaValidator) {
       const isValid = this.schemaValidator(parameters);
 
       if (!isValid) {
         return {
           isValid: false,
-          resourceName: resourceMetaData.name,
-          resourceType: resourceMetaData.type,
+          resourceName: coreParameters.name,
+          resourceType: coreParameters.type,
           schemaValidationErrors: this.schemaValidator?.errors ?? [],
         }
       }
@@ -83,16 +88,16 @@ export class ResourceController<T extends StringIndexedObject> {
       return {
         customValidationErrorMessage,
         isValid: false,
-        resourceName: resourceMetaData.name,
-        resourceType: resourceMetaData.type,
+        resourceName: coreParameters.name,
+        resourceType: coreParameters.type,
         schemaValidationErrors: this.schemaValidator?.errors ?? [],
       }
     }
 
     return {
       isValid: true,
-      resourceName: resourceMetaData.name,
-      resourceType: resourceMetaData.type,
+      resourceName: coreParameters.name,
+      resourceType: coreParameters.type,
       schemaValidationErrors: [],
     }
   }