codify-plugin-lib 1.0.182-beta42 → 1.0.182-beta43

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, version: string, resourceControllers: Map<string, ResourceController<ResourceConfig>>);
-    static create(): Promise<Plugin>;
+    constructor(name: string, resourceControllers: Map<string, ResourceController<ResourceConfig>>);
+    static create(name: string, resources: Resource<any>[]): Plugin;
     initialize(data: InitializeRequestData): Promise<InitializeResponseData>;
     getResourceInfo(data: GetResourceInfoRequestData): GetResourceInfoResponseData;
     match(data: MatchRequestData): Promise<MatchResponseData>;

package/dist/plugin/plugin.js

@@ -4,37 +4,23 @@ 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, version, resourceControllers) {
+    constructor(name, resourceControllers) {
         this.name = name;
-        this.version = version;
         this.resourceControllers = resourceControllers;
         this.planStorage = new Map();
     }
-    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).then((r) => r.default ?? r);
-        }))).map((Resource) => new Resource());
-        console.log(resources);
+    static create(name, resources) {
         const controllers = resources
             .map((resource) => new ResourceController(resource));
         const controllersMap = new Map(controllers.map((r) => [r.typeId, r]));
-        return new Plugin(name, version, controllersMap);
+        return new Plugin(name, controllersMap);
     }
     async initialize(data) {
         if (data.verbosityLevel) {

package/package.json

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

package/src/plugin/plugin.ts

@@ -22,12 +22,10 @@ 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 { findNearestPackageJson, readNearestPackageJson } from '../utils/package-json-utils.js';
 import { ptyLocalStorage } from '../utils/pty-local-storage.js';
 import { VerbosityLevel } from '../utils/verbosity-level.js';
-import path from 'node:path';
 
 export class Plugin {
   planStorage: Map<string, Plan<any>>;
@@ -35,27 +33,12 @@ export class Plugin {
 
   constructor(
     public name: string,
-    public version: string,
     public resourceControllers: Map<string, ResourceController<ResourceConfig>>
   ) {
     this.planStorage = new Map();
   }
 
-  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).then((r) => r.default ?? r);
-    }))).map((Resource) => new Resource());
-
-    console.log(resources);
-
+  static create(name: string, resources: Resource<any>[]) {
     const controllers = resources
       .map((resource) => new ResourceController(resource))
 
@@ -63,7 +46,7 @@ export class Plugin {
       controllers.map((r) => [r.typeId, r] as const)
     );
 
-    return new Plugin(name, version, controllersMap);
+    return new Plugin(name, controllersMap);
   }
 
   async initialize(data: InitializeRequestData): Promise<InitializeResponseData> {

package/src/utils/load-resources.ts

@@ -1,53 +0,0 @@
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import * as url from 'node:url';
-
-export const listAllResources = async (root = path.join(path.dirname(url.fileURLToPath(import.meta.url)), '..', '..', '..', '..')) => {
-  console.log('Dirname', root);
-
-  const resourcesPath = path.join(root, 'src', 'resources')
-
-  const resourceDir = await fs.readdir(resourcesPath);
-  const dedupSet = new Set();
-  const result = new Set<string>();
-
-  for (const folder of resourceDir) {
-    if (await fs.stat(path.join(resourcesPath, folder)).then(s => s.isDirectory()).catch(() => false)) {
-      for (const folderContents of await fs.readdir(path.join(resourcesPath, folder))) {
-        const isDirectory = await fs.stat(path.join(resourcesPath, folder, folderContents)).then(s => s.isDirectory());
-
-        // console.log(folderContents, isDirectory);
-        if (isDirectory) {
-          for (const innerContents of await fs.readdir(path.join(resourcesPath, folder, folderContents))) {
-            if (!dedupSet.has(path.join(resourcesPath, folder, folderContents))) {
-              dedupSet.add(path.join(resourcesPath, folder, folderContents));
-              addResourceFromDir(path.join(resourcesPath, folder,folderContents), result);
-            }
-          }
-        } else {
-          if (!dedupSet.has(path.join(resourcesPath, folder))) {
-            dedupSet.add(path.join(resourcesPath, folder));
-            addResourceFromDir(path.join(resourcesPath, 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

@@ -1,40 +0,0 @@
-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);
-}