codify-plugin-lib 1.0.163 → 1.0.165

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),
@@ -91,7 +101,7 @@ export function resolveParameterTransformFn(parameter) {
             from(input, original) {
                 return input.map((i, idx) => {
                     const originalElement = Array.isArray(original)
-                        ? original.find((o) => resolveEqualsFn(parameter)(o, i)) ?? original[idx]
+                        ? original.find((o) => resolveElementEqualsFn(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.163",
+  "version": "1.0.165",
   "description": "Library plugin library",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

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

@@ -10,6 +10,7 @@ import { TestConfig, testPlan, TestResource, TestStatefulParameter } from '../ut
 import { tildify, untildify } from '../utils/utils.js';
 import { ArrayStatefulParameter, StatefulParameter } from '../stateful-parameter/stateful-parameter.js';
 import { Plan } from '../plan/plan.js';
+import os from 'node:os';
 
 describe('Resource tests', () => {
 
@@ -828,6 +829,107 @@ describe('Resource tests', () => {
     }
 
     const controller = new ResourceController(resource);
-    const plan = await controller.import({ type: 'path' }, {});
+    await controller.import({ type: 'path' }, {});
+    ;
+  })
+
+  it('Can import and return all of the imported parameters', async () => {
+    const resource = new class extends TestResource {
+      getSettings(): ResourceSettings<any> {
+        return {
+          id: 'path',
+          parameterSettings: {
+            path: { type: 'directory' },
+            paths: { canModify: true, type: 'array', itemType: 'directory' },
+            prepend: { default: false, setting: true },
+            declarationsOnly: { default: false, setting: true },
+          },
+          importAndDestroy: {
+            refreshMapper: (input, context) => {
+              if (Object.keys(input).length === 0) {
+                return { paths: [], declarationsOnly: true };
+              }
+
+              return input;
+            }
+          },
+          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> {
+        return {
+          paths: [
+            `${os.homedir()}/.pyenv/bin`,
+            `${os.homedir()}/.bun/bin`,
+            `${os.homedir()}/.deno/bin`,
+            `${os.homedir()}/.jenv/bin`,
+            `${os.homedir()}/a/random/path`,
+            `${os.homedir()}/.nvm/.bin/2`,
+            `${os.homedir()}/.nvm/.bin/3`
+          ]
+        }
+      }
+    }
+
+    const oldProcessEnv = structuredClone(process.env);
+
+    process.env['PYENV_ROOT'] = `${os.homedir()}/.pyenv`
+    process.env['BUN_INSTALL'] = `${os.homedir()}/.bun`
+    process.env['DENO_INSTALL'] = `${os.homedir()}/.deno`
+    process.env['JENV'] = `${os.homedir()}/.jenv`
+    process.env['NVM_DIR'] = `${os.homedir()}/.nvm`
+
+    const controller = new ResourceController(resource);
+    const importResult1 = await controller.import({ type: 'path' }, {});
+    expect(importResult1).toMatchObject([
+      {
+        'core': {
+          'type': 'path'
+        },
+        'parameters': {
+          'paths': [
+            '$PYENV_ROOT/bin',
+            '$BUN_INSTALL/bin',
+            '$DENO_INSTALL/bin',
+            '$JENV/bin',
+            '~/a/random/path',
+            '$NVM_DIR/.bin/2',
+            '$NVM_DIR/.bin/3'
+          ]
+        }
+      }
+    ])
+
+    const importResult2 = await controller.import({ type: 'path' }, { paths: ['$PYENV_ROOT/bin', '$BUN_INSTALL/bin'] });
+    expect(importResult2).toMatchObject([
+      {
+        'core': {
+          'type': 'path'
+        },
+        'parameters': {
+          'paths': [
+            '$PYENV_ROOT/bin',
+            '$BUN_INSTALL/bin',
+            '$DENO_INSTALL/bin',
+            '$JENV/bin',
+            '~/a/random/path',
+            '$NVM_DIR/.bin/2',
+            '$NVM_DIR/.bin/3'
+          ]
+        }
+      }
+    ])
+
+    process.env = oldProcessEnv;
   })
 });

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;
   },
@@ -425,7 +438,7 @@ export function resolveParameterTransformFn(
       from(input: unknown[], original) {
         return input.map((i, idx) => {
           const originalElement = Array.isArray(original)
-            ? original.find((o) => resolveEqualsFn(parameter)(o, i)) ?? original[idx]
+            ? original.find((o) => resolveElementEqualsFn(parameter as ArrayParameterSetting)(o, i)) ?? original[idx]
             : original;
 
           return itemTransformation.from(i, originalElement);

package/src/utils/utils.test.ts

@@ -41,11 +41,11 @@ describe('Utils tests', () => {
     expect(result2).to.eq('/var' + home + '/my/path');
   })
 
-  it('Can add variables to a path', () => {
+  it('Can add variables to a path (ignores home)', () => {
     const testPath1 = os.homedir() + '/my/path';
     const result1 = addVariablesToPath(testPath1);
 
     const home = os.homedir();
-    expect(result1).to.eq('$HOME/my/path');
+    expect(result1).to.eq(home + '/my/path');
   })
 })