codify-plugin-lib 1.0.182-beta30 → 1.0.182-beta32

package/dist/plugin/plugin.d.ts

@@ -1,15 +1,15 @@
 import { ApplyRequestData, GetResourceInfoRequestData, GetResourceInfoResponseData, ImportRequestData, ImportResponseData, InitializeRequestData, InitializeResponseData, MatchRequestData, MatchResponseData, PlanRequestData, PlanResponseData, ResourceConfig, ResourceJson, ValidateRequestData, ValidateResponseData } from 'codify-schemas';
 import { Plan } from '../plan/plan.js';
 import { BackgroundPty } from '../pty/background-pty.js';
-import { Resource } from '../resource/resource.js';
 import { ResourceController } from '../resource/resource-controller.js';
 export declare class Plugin {
     name: string;
+    version: string;
     resourceControllers: Map<string, ResourceController<ResourceConfig>>;
     planStorage: Map<string, Plan<any>>;
     planPty: BackgroundPty;
-    constructor(name: string, resourceControllers: Map<string, ResourceController<ResourceConfig>>);
-    static create(name: string, resources: Resource<any>[]): Plugin;
+    constructor(name: string, version: string, resourceControllers: Map<string, ResourceController<ResourceConfig>>);
+    static create(): Promise<Plugin>;
     initialize(data: InitializeRequestData): Promise<InitializeResponseData>;
     getResourceInfo(data: GetResourceInfoRequestData): GetResourceInfoResponseData;
     match(data: MatchRequestData): Promise<MatchResponseData>;

package/dist/plugin/plugin.js

@@ -4,23 +4,37 @@ import { BackgroundPty } from '../pty/background-pty.js';
 import { getPty } from '../pty/index.js';
 import { SequentialPty } from '../pty/seqeuntial-pty.js';
 import { ResourceController } from '../resource/resource-controller.js';
+import { listAllResources } from '../utils/load-resources.js';
+import { readNearestPackageJson } from '../utils/package-json-utils.js';
 import { ptyLocalStorage } from '../utils/pty-local-storage.js';
 import { VerbosityLevel } from '../utils/verbosity-level.js';
 export class Plugin {
     name;
+    version;
     resourceControllers;
     planStorage;
     planPty = new BackgroundPty();
-    constructor(name, resourceControllers) {
+    constructor(name, version, resourceControllers) {
         this.name = name;
+        this.version = version;
         this.resourceControllers = resourceControllers;
         this.planStorage = new Map();
     }
-    static create(name, resources) {
+    static async create() {
+        const packageJson = readNearestPackageJson();
+        if (!packageJson) {
+            throw new Error('Failed to read nearest package.json');
+        }
+        const { name, version } = packageJson;
+        const resourceLocations = await listAllResources();
+        const resources = await Promise.all(resourceLocations.map((l) => {
+            return import(l);
+        }));
+        console.log(resources);
         const controllers = resources
             .map((resource) => new ResourceController(resource));
         const controllersMap = new Map(controllers.map((r) => [r.typeId, r]));
-        return new Plugin(name, controllersMap);
+        return new Plugin(name, version, controllersMap);
     }
     async initialize(data) {
         if (data.verbosityLevel) {

package/dist/resource/resource-controller.js

@@ -374,8 +374,8 @@ ${JSON.stringify(refresh, null, 2)}
             .sort((a, b) => this.parsedSettings.statefulParameterOrder.get(a.name) - this.parsedSettings.statefulParameterOrder.get(b.name));
     }
     getAllParameterKeys() {
-        return this.settings.schema
-            ? Object.keys(this.settings.schema?.properties)
+        return this.parsedSettings.schema
+            ? Object.keys(this.parsedSettings.schema?.properties)
             : Object.keys(this.parsedSettings.parameterSettings);
     }
     getParametersToRefreshForImport(parameters, context) {

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

@@ -2,8 +2,8 @@ import { JSONSchemaType } from 'ajv';
 import { OS, StringIndexedObject } from 'codify-schemas';
 import { ZodObject } from 'zod';
 import { ArrayStatefulParameter, StatefulParameter } from '../stateful-parameter/stateful-parameter.js';
-import { RefreshContext } from './resource.js';
 import { ParsedResourceSettings } from './parsed-resource-settings.js';
+import { RefreshContext } from './resource.js';
 export interface InputTransformation {
     to: (input: any) => Promise<any> | any;
     from: (current: any, original: any) => Promise<any> | any;

package/dist/resource/resource-settings.js

@@ -3,7 +3,7 @@ import path from 'node:path';
 import { addVariablesToPath, areArraysEqual, resolvePathWithVariables, tildify, untildify } from '../utils/functions.js';
 const ParameterEqualsDefaults = {
     'boolean': (a, b) => Boolean(a) === Boolean(b),
-    'directory': (a, b) => {
+    'directory'(a, b) {
         let transformedA = resolvePathWithVariables(untildify(String(a)));
         let transformedB = resolvePathWithVariables(untildify(String(b)));
         if (transformedA.startsWith('.')) { // Only relative paths start with '.'
@@ -65,7 +65,7 @@ export function resolveFnFromEqualsFnOrString(fnOrString) {
 const ParameterTransformationDefaults = {
     'directory': {
         to: (a) => resolvePathWithVariables((untildify(String(a)))),
-        from: (a, original) => {
+        from(a, original) {
             if (ParameterEqualsDefaults.directory(a, original)) {
                 return original;
             }

package/dist/utils/load-resources.d.ts

@@ -0,0 +1 @@
+export declare const listAllResources: () => Promise<string[]>;

package/dist/utils/load-resources.js

@@ -0,0 +1,43 @@
+import fs from 'node:fs/promises';
+import path from 'node:path';
+export const listAllResources = async () => {
+    const resourceDir = await fs.readdir('./src/resources');
+    const dedupSet = new Set();
+    const result = new Set();
+    for (const folder of resourceDir) {
+        if (await fs.stat(path.join('./src/resources', folder)).then(s => s.isDirectory()).catch(() => false)) {
+            for (const folderContents of await fs.readdir(path.join('./src/resources', folder))) {
+                const isDirectory = await fs.stat(path.join('./src/resources', folder, folderContents)).then(s => s.isDirectory());
+                // console.log(folderContents, isDirectory);
+                if (isDirectory) {
+                    for (const innerContents of await fs.readdir(path.join('./src/resources', folder, folderContents))) {
+                        if (!dedupSet.has(path.join('./src/resources', folder, folderContents))) {
+                            dedupSet.add(path.join('./src/resources', folder, folderContents));
+                            addResourceFromDir(path.join('./src/resources', folder, folderContents), result);
+                        }
+                    }
+                }
+                else {
+                    if (!dedupSet.has(path.join('./src/resources', folder))) {
+                        dedupSet.add(path.join('./src/resources', folder));
+                        addResourceFromDir(path.join('./src/resources', folder), result);
+                    }
+                }
+            }
+        }
+        else {
+            throw new Error('Only directories are allowed in resources folder');
+        }
+    }
+    return [...result];
+};
+function addResourceFromDir(dir, result) {
+    try {
+        const resourceFile = path.resolve(path.join(dir, 'resource.ts'));
+        if (!(fs.stat(resourceFile).then((s) => s.isFile())).catch(() => false)) {
+            return;
+        }
+        result.add(resourceFile);
+    }
+    catch { }
+}

package/dist/utils/package-json-utils.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Find the nearest package.json starting from a directory and walking upward.
+ * @param {string} startDir - Directory to start searching from
+ * @returns {string|null} Absolute path to package.json or null if not found
+ */
+export declare function findNearestPackageJson(startDir?: string): string | null;
+/**
+ * Read and parse the nearest package.json
+ * @param {string} startDir
+ * @returns {object|null}
+ */
+export declare function readNearestPackageJson(startDir?: string): any;

package/dist/utils/package-json-utils.js

@@ -0,0 +1,34 @@
+import * as fs from 'node:fs';
+import path from 'node:path';
+/**
+ * Find the nearest package.json starting from a directory and walking upward.
+ * @param {string} startDir - Directory to start searching from
+ * @returns {string|null} Absolute path to package.json or null if not found
+ */
+export function findNearestPackageJson(startDir = process.cwd()) {
+    let currentDir = path.resolve(startDir);
+    while (true) {
+        const pkgPath = path.join(currentDir, "package.json");
+        if (fs.existsSync(pkgPath)) {
+            return pkgPath;
+        }
+        const parentDir = path.dirname(currentDir);
+        if (parentDir === currentDir) {
+            // Reached filesystem root
+            return null;
+        }
+        currentDir = parentDir;
+    }
+}
+/**
+ * Read and parse the nearest package.json
+ * @param {string} startDir
+ * @returns {object|null}
+ */
+export function readNearestPackageJson(startDir = process.cwd()) {
+    const pkgPath = findNearestPackageJson(startDir);
+    if (!pkgPath)
+        return null;
+    const contents = fs.readFileSync(pkgPath, 'utf8');
+    return JSON.parse(contents);
+}

package/package.json

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

package/src/plugin/plugin.test.ts

@@ -177,7 +177,7 @@ describe('Plugin tests', () => {
         plugins: z
           .array(z.string())
           .describe(
-            "Asdf plugins to install. See: https://github.com/asdf-community for a full list"
+            'Asdf plugins to install. See: https://github.com/asdf-community for a full list'
           )
       })
       .strict()

package/src/plugin/plugin.ts

@@ -22,8 +22,9 @@ import { Plan } from '../plan/plan.js';
 import { BackgroundPty } from '../pty/background-pty.js';
 import { getPty } from '../pty/index.js';
 import { SequentialPty } from '../pty/seqeuntial-pty.js';
-import { Resource } from '../resource/resource.js';
 import { ResourceController } from '../resource/resource-controller.js';
+import { listAllResources } from '../utils/load-resources.js';
+import { readNearestPackageJson } from '../utils/package-json-utils.js';
 import { ptyLocalStorage } from '../utils/pty-local-storage.js';
 import { VerbosityLevel } from '../utils/verbosity-level.js';
 
@@ -33,12 +34,27 @@ export class Plugin {
 
   constructor(
     public name: string,
+    public version: string,
     public resourceControllers: Map<string, ResourceController<ResourceConfig>>
   ) {
     this.planStorage = new Map();
   }
 
-  static create(name: string, resources: Resource<any>[]) {
+  static async create() {
+    const packageJson = readNearestPackageJson();
+    if (!packageJson) {
+      throw new Error('Failed to read nearest package.json');
+    }
+
+    const { name, version } = packageJson;
+
+    const resourceLocations = await listAllResources();
+    const resources = await Promise.all(resourceLocations.map((l) => {
+      return import(l);
+    }))
+    console.log(resources);
+
+
     const controllers = resources
       .map((resource) => new ResourceController(resource))
 
@@ -46,7 +62,7 @@ export class Plugin {
       controllers.map((r) => [r.typeId, r] as const)
     );
 
-    return new Plugin(name, controllersMap);
+    return new Plugin(name, version, controllersMap);
   }
 
   async initialize(data: InitializeRequestData): Promise<InitializeResponseData> {

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

@@ -3,7 +3,7 @@ import { ResourceSettings } from './resource-settings.js';
 import { ParsedResourceSettings } from './parsed-resource-settings.js';
 import { TestConfig } from '../utils/test-utils.test.js';
 import { z } from 'zod';
-import { OS, ResourceConfig, ResourceSchema } from 'codify-schemas';
+import { OS } from 'codify-schemas';
 
 describe('Resource options parser tests', () => {
   it('Parses default values from options', () => {

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

@@ -15,7 +15,6 @@ import {
   resolveMatcher,
   resolveParameterTransformFn
 } from './resource-settings.js';
-import { JSONSchema } from '@apidevtools/json-schema-ref-parser';
 
 export interface ParsedStatefulParameterSetting extends DefaultParameterSetting {
   type: 'stateful',

package/src/resource/resource-controller.ts

@@ -525,8 +525,8 @@ ${JSON.stringify(refresh, null, 2)}
   }
 
   private getAllParameterKeys(): string[] {
-    return this.settings.schema
-      ? Object.keys((this.settings.schema as any)?.properties)
+    return this.parsedSettings.schema
+      ? Object.keys((this.parsedSettings.schema as any)?.properties)
       : Object.keys(this.parsedSettings.parameterSettings);
   }
 

package/src/resource/resource-settings.ts

@@ -12,8 +12,8 @@ import {
   tildify,
   untildify
 } from '../utils/functions.js';
-import { RefreshContext } from './resource.js';
 import { ParsedResourceSettings } from './parsed-resource-settings.js';
+import { RefreshContext } from './resource.js';
 
 export interface InputTransformation {
   to: (input: any) => Promise<any> | any;
@@ -356,7 +356,7 @@ 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) => {
+  'directory'(a: unknown, b: unknown) {
     let transformedA = resolvePathWithVariables(untildify(String(a)))
     let transformedB = resolvePathWithVariables(untildify(String(b)))
 
@@ -437,7 +437,7 @@ export function resolveFnFromEqualsFnOrString(
 const ParameterTransformationDefaults: Partial<Record<ParameterSettingType, InputTransformation>> = {
   'directory': {
     to: (a: unknown) => resolvePathWithVariables((untildify(String(a)))),
-    from: (a: unknown, original) => {
+    from(a: unknown, original) {
       if (ParameterEqualsDefaults.directory!(a, original)) {
         return original;
       }

package/src/utils/load-resources.ts

@@ -0,0 +1,48 @@
+import fs from 'node:fs/promises';
+import path from 'node:path';
+
+export const listAllResources = async () => {
+  const resourceDir = await fs.readdir('./src/resources');
+  const dedupSet = new Set();
+  const result = new Set<string>();
+
+  for (const folder of resourceDir) {
+    if (await fs.stat(path.join('./src/resources', folder)).then(s => s.isDirectory()).catch(() => false)) {
+      for (const folderContents of await fs.readdir(path.join('./src/resources', folder))) {
+        const isDirectory = await fs.stat(path.join('./src/resources', folder, folderContents)).then(s => s.isDirectory());
+
+        // console.log(folderContents, isDirectory);
+        if (isDirectory) {
+          for (const innerContents of await fs.readdir(path.join('./src/resources', folder, folderContents))) {
+            if (!dedupSet.has(path.join('./src/resources', folder, folderContents))) {
+              dedupSet.add(path.join('./src/resources', folder, folderContents));
+              addResourceFromDir(path.join('./src/resources', folder,folderContents), result);
+            }
+          }
+        } else {
+          if (!dedupSet.has(path.join('./src/resources', folder))) {
+            dedupSet.add(path.join('./src/resources', folder));
+            addResourceFromDir(path.join('./src/resources', folder), result);
+          }
+        }
+      }
+    } else {
+      throw new Error('Only directories are allowed in resources folder')
+    }
+  }
+
+  return [...result];
+}
+
+
+
+function addResourceFromDir(dir: string, result: Set<string>): void {
+  try {
+    const resourceFile = path.resolve(path.join(dir, 'resource.ts'));
+    if (!(fs.stat(resourceFile).then((s) => s.isFile())).catch(() => false)) {
+      return;
+    }
+
+    result.add(resourceFile);
+  } catch {}
+}

package/src/utils/package-json-utils.ts

@@ -0,0 +1,40 @@
+import * as fs from 'node:fs';
+import path from 'node:path';
+
+/**
+ * Find the nearest package.json starting from a directory and walking upward.
+ * @param {string} startDir - Directory to start searching from
+ * @returns {string|null} Absolute path to package.json or null if not found
+ */
+export function findNearestPackageJson(startDir = process.cwd()) {
+  let currentDir = path.resolve(startDir);
+
+  while (true) {
+    const pkgPath = path.join(currentDir, "package.json");
+
+    if (fs.existsSync(pkgPath)) {
+      return pkgPath;
+    }
+
+    const parentDir = path.dirname(currentDir);
+    if (parentDir === currentDir) {
+      // Reached filesystem root
+      return null;
+    }
+
+    currentDir = parentDir;
+  }
+}
+
+/**
+ * Read and parse the nearest package.json
+ * @param {string} startDir
+ * @returns {object|null}
+ */
+export function readNearestPackageJson(startDir: string = process.cwd()) {
+  const pkgPath = findNearestPackageJson(startDir);
+  if (!pkgPath) return null;
+
+  const contents = fs.readFileSync(pkgPath, 'utf8');
+  return JSON.parse(contents);
+}