fix: Fixed plugin resolution, path flag and bumped libraries

Author: kevinwang5658

package-lock.json

@@ -12,7 +12,7 @@
     "ajv": "^8.12.0",
     "ajv-formats": "^3.0.1",
     "chalk": "^5.3.0",
-    "codify-schemas": "^1.0.61",
+    "codify-schemas": "^1.0.63",
     "debug": "^4.3.4",
     "ink": "^5",
     "ink-form": "^2.0.1",
@@ -38,7 +38,7 @@
     "@types/semver": "^7.5.4",
     "@types/strip-ansi": "^5.2.1",
     "@typescript-eslint/eslint-plugin": "^8.16.0",
-    "codify-plugin-lib": "^1.0.130",
+    "codify-plugin-lib": "^1.0.132",
     "esbuild": "^0.24.0",
     "esbuild-plugin-copy": "^2.1.1",
     "eslint": "^8.51.0",
@@ -51,7 +51,7 @@
     "shx": "^0.3.3",
     "strip-ansi": "^7.1.0",
     "tsx": "^4.7.3",
-    "typescript": "^5",
+    "typescript": "5.3.3",
     "vitest": "^2.1.6"
   },
   "overrides": {
@@ -103,7 +103,7 @@
     "postpack": "shx rm -f oclif.manifest.json",
     "pretarball": "../../../scripts/codesign.sh",
     "pkg": "tsx ./scripts/pkg.ts",
-    "notorize": "./scripts/notarize.sh",
+    "notarize": "./scripts/notarize.sh",
     "upload": "./scripts/upload.sh",
     "posttest": "npm run lint",
     "prepack": "oclif manifest && oclif readme",

package.json

@@ -11,11 +11,6 @@ export default class Apply extends BaseCommand {
     '<%= config.bin %> <%= command.id %> --path ~',
   ]
 
-  static flags = {
-    // flag with a value (-p, --path=VALUE)
-    path: Flags.string({ char: 'p', description: 'path to project' }),
-  }
-
   async init(): Promise<void> {
     console.log('Running Codify apply...')
     return super.init();

src/commands/apply/index.ts

@@ -11,12 +11,6 @@ export default class Import extends BaseCommand {
     '<%= config.bin %> <%= command.id %> homebrew nvm',
   ]
 
-  static flags = {
-    // flag with a value (-p, --path=VALUE)
-    path: Flags.string({ char: 'p', description: 'path to project' }),
-  }
-
-
   public async run(): Promise<void> {
     const { raw, flags } = await this.parse(Import)
 

src/commands/import.ts

@@ -12,11 +12,6 @@ export default class Plan extends BaseCommand {
     '<%= config.bin %> <%= command.id %>',
   ]
 
-  static flags = {
-    // flag with a value (-p, --path=VALUE)
-    path: Flags.string({ char: 'p', description: 'path to project' }),
-  }
-
   async init(): Promise<void> {
     console.log('Running Codify plan...')
     return super.init();

src/commands/plan/index.ts

@@ -1,16 +1,16 @@
 import { Command, Flags } from '@oclif/core';
+import { OutputFlags } from '@oclif/core/interfaces';
 import chalk from 'chalk';
 import { SudoRequestData } from 'codify-schemas';
 import createDebug from 'debug';
 
 import { Event, ctx } from '../events/context.js';
 import { Reporter, ReporterFactory, ReporterType } from '../ui/reporters/reporter.js';
 import { prettyPrintError } from './errors.js';
-import { OutputFlags } from '@oclif/core/interfaces';
 
 export abstract class BaseCommand extends Command {
-
   static enableJsonFlag = true;
+
   static baseFlags = {
     'debug': Flags.boolean(),
     'output': Flags.option({
@@ -21,7 +21,8 @@ export abstract class BaseCommand extends Command {
     'secure': Flags.boolean({
       char: 's',
       default: false,
-    })
+    }),
+    path: Flags.string({ char: 'p', description: 'Path to codify.json file' }),
   }
 
   protected reporter!: Reporter;

src/common/base-command.ts

@@ -68,7 +68,7 @@ export class Plugin implements IPlugin {
     const result = await this.process!.sendMessageForResult('validate', { configs: jsonConfigs });
 
     if (!result.isSuccessful()) {
-      throw new Error(`Initialize error for plugin: "${this.name}" \n\n` + result.data);
+      throw new Error(`Validate error for plugin: "${this.name}" \n\n${JSON.stringify(result.data, null, 2)}`);
     }
 
     if (!this.validateValidateResponse(result.data)) {

src/plugins/plugin.ts

@@ -84,18 +84,18 @@ export class PluginResolver {
     }
 
     // Plugin already exists, then no need to download. OR couldn't fetch plugin info from online then just resolve local version. OR we already have the latest version
-    if ((version !== 'latest' && localPluginExists)
-      || (localPluginExists && !latestInfoFromNetwork)
-      || (resolvedVersion === latestInfoFromNetwork!.version)
+    if (resolvedVersion &&
+      ((localPluginExists && !latestInfoFromNetwork)
+      || (resolvedVersion === latestInfoFromNetwork!.version))
     ) {
-      return PluginResolver.resolveLocalPlugin(name, `${PLUGIN_CACHE_DIR}/${name}/${version}/index.js`);
+      return PluginResolver.resolveLocalPlugin(name, `${PLUGIN_CACHE_DIR}/${name}/${resolvedVersion}/index.js`);
     }
 
     return downloadFreshPlugin();
 
     // Set up folders and download plugin from the network.
     async function downloadFreshPlugin(): Promise<Plugin> {
-      const filePath = `${PLUGIN_CACHE_DIR}/${name}/${version}/index.js`;
+      const filePath = `${PLUGIN_CACHE_DIR}/${name}/${latestInfoFromNetwork?.version}/index.js`;
       await ApiClient.downloadPlugin(filePath, latestInfoFromNetwork!.downloadLink);
 
       return new Plugin(

src/plugins/resolver.ts

@@ -20,6 +20,19 @@ describe('Plugin resolver integration test', () => {
   it('resolves the default plugin', async () => {
     await PluginResolver.resolveAll({ 'default': 'latest' })
     expect(fs.existsSync(path.resolve(os.homedir(), '.codify/plugins/default'))).to.be.true;
+
+    const files = fs.readdirSync(path.resolve(os.homedir(), '.codify/plugins/default'));
+    expect(files.length).to.eq(1);
+
+    // The folder names are semver versions for the plugins (ex. 0.11.0, 0.12, etc)
+    const semverRegex = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
+    expect(semverRegex.test(files[0])).to.be.true;
+
+    const pluginPath = path.resolve(os.homedir(), '.codify/plugins/default', files[0])
+    const pluginFolder = fs.readdirSync(pluginPath)
+
+    expect(pluginFolder.length).to.eq(1);
+    expect(pluginFolder[0]).to.eq('index.js')
   })
 
   afterEach(() => {