codify-plugin-lib 1.0.162 → 1.0.164

package/dist/resource/resource-settings.js

@@ -4,9 +4,19 @@ import { addVariablesToPath, areArraysEqual, resolvePathWithVariables, tildify,
 const ParameterEqualsDefaults = {
     'boolean': (a, b) => Boolean(a) === Boolean(b),
     'directory': (a, b) => {
+        let transformedA = resolvePathWithVariables(untildify(String(a)));
+        let transformedB = resolvePathWithVariables(untildify(String(b)));
+        if (transformedA.startsWith('.')) { // Only relative paths start with '.'
+            transformedA = path.resolve(transformedA);
+        }
+        if (transformedB.startsWith('.')) { // Only relative paths start with '.'
+            transformedB = path.resolve(transformedB);
+        }
         const notCaseSensitive = process.platform === 'darwin';
-        const transformedA = path.resolve(resolvePathWithVariables(untildify(notCaseSensitive ? String(a).toLowerCase() : String(a))));
-        const transformedB = path.resolve(resolvePathWithVariables(untildify(notCaseSensitive ? String(b).toLowerCase() : String(b))));
+        if (notCaseSensitive) {
+            transformedA = transformedA.toLowerCase();
+            transformedB = transformedB.toLowerCase();
+        }
         return transformedA === transformedB;
     },
     'number': (a, b) => Number(a) === Number(b),
@@ -89,7 +99,12 @@ export function resolveParameterTransformFn(parameter) {
                 return input.map((i) => itemTransformation.to(i));
             },
             from(input, original) {
-                return input.map((i) => itemTransformation.from(i, original));
+                return input.map((i, idx) => {
+                    const originalElement = Array.isArray(original)
+                        ? original.find((o) => resolveEqualsFn(parameter)(o, i)) ?? original[idx]
+                        : original;
+                    return itemTransformation.from(i, originalElement);
+                });
             }
         };
     }

package/package.json

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

package/src/resource/resource-controller.ts

@@ -381,7 +381,9 @@ ${JSON.stringify(refresh, null, 2)}
     }
   }
 
-  private async applyTransformParameters(config: Partial<T> | null, reverse?: { original: Partial<T> | null }): Promise<void> {
+  private async applyTransformParameters(config: Partial<T> | null, reverse?: {
+    original: Partial<T> | null
+  }): Promise<void> {
     if (!config) {
       return;
     }

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

@@ -1119,4 +1119,30 @@ describe('Resource parameter tests', () => {
       propB: 'random2',
     })).to.be.false;
   })
+
+  it('Can match directories 1', async () => {
+    const resource = new class extends TestResource {
+      getSettings(): ResourceSettings<TestConfig> {
+        return {
+          id: 'resourceType',
+          parameterSettings: {
+            propA: { type: 'directory' }
+          },
+        }
+      }
+    };
+
+    const controller = new ResourceController(resource);
+    const transformations = controller.parsedSettings.inputTransformations.propA;
+
+    const to = transformations!.to('$HOME/abc/def')
+    expect(to).to.eq(os.homedir() + '/abc/def')
+
+    const from = transformations!.from(os.homedir() + '/abc/def')
+    expect(from).to.eq('~/abc/def')
+
+    const from2 = transformations!.from(os.homedir() + '/abc/def', '$HOME/abc/def')
+    expect(from2).to.eq('$HOME/abc/def')
+
+  })
 })

package/src/resource/resource-settings.ts

@@ -313,9 +313,22 @@ export interface StatefulParameterSetting extends DefaultParameterSetting {
 const ParameterEqualsDefaults: Partial<Record<ParameterSettingType, (a: unknown, b: unknown) => boolean>> = {
   'boolean': (a: unknown, b: unknown) => Boolean(a) === Boolean(b),
   'directory': (a: unknown, b: unknown) => {
+    let transformedA = resolvePathWithVariables(untildify(String(a)))
+    let transformedB = resolvePathWithVariables(untildify(String(b)))
+
+    if (transformedA.startsWith('.')) { // Only relative paths start with '.'
+      transformedA = path.resolve(transformedA)
+    }
+
+    if (transformedB.startsWith('.')) { // Only relative paths start with '.'
+      transformedB = path.resolve(transformedB)
+    }
+
     const notCaseSensitive = process.platform === 'darwin';
-    const transformedA = path.resolve(resolvePathWithVariables(untildify(notCaseSensitive ? String(a).toLowerCase() : String(a))))
-    const transformedB = path.resolve(resolvePathWithVariables(untildify(notCaseSensitive ? String(b).toLowerCase() : String(b))))
+    if (notCaseSensitive) {
+      transformedA = transformedA.toLowerCase();
+      transformedB = transformedB.toLowerCase();
+    }
 
     return transformedA === transformedB;
   },
@@ -423,7 +436,13 @@ export function resolveParameterTransformFn(
         return input.map((i) => itemTransformation.to(i))
       },
       from(input: unknown[], original) {
-        return input.map((i) => itemTransformation.from(i, original))
+        return input.map((i, idx) => {
+          const originalElement = Array.isArray(original)
+            ? original.find((o) => resolveEqualsFn(parameter)(o, i)) ?? original[idx]
+            : original;
+
+          return itemTransformation.from(i, originalElement);
+        })
       }
     }
   }