@codifycli/plugin-core 1.1.0-beta15 → 1.1.0-beta17

package/dist/plugin/plugin.d.ts

@@ -8,8 +8,13 @@ export declare class Plugin {
     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;
+    minSupportedCliVersion: string | undefined;
+    constructor(name: string, resourceControllers: Map<string, ResourceController<ResourceConfig>>, options?: {
+        minSupportedCliVersion?: string;
+    });
+    static create(name: string, resources: Resource<any>[], options?: {
+        minSupportedCliVersion?: string;
+    }): Plugin;
     initialize(data: InitializeRequestData): Promise<InitializeResponseData>;
     getResourceInfo(data: GetResourceInfoRequestData): GetResourceInfoResponseData;
     match(data: MatchRequestData): Promise<MatchResponseData>;

package/dist/plugin/plugin.js

@@ -11,16 +11,18 @@ export class Plugin {
     resourceControllers;
     planStorage;
     planPty = new BackgroundPty();
-    constructor(name, resourceControllers) {
+    minSupportedCliVersion;
+    constructor(name, resourceControllers, options) {
         this.name = name;
         this.resourceControllers = resourceControllers;
         this.planStorage = new Map();
+        this.minSupportedCliVersion = options?.minSupportedCliVersion;
     }
-    static create(name, resources) {
+    static create(name, resources, options) {
         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, controllersMap, options);
     }
     async initialize(data) {
         if (data.verbosityLevel) {
@@ -30,6 +32,7 @@ export class Plugin {
             await controller.initialize();
         }
         return {
+            minSupportedCliVersion: this.minSupportedCliVersion,
             resourceDefinitions: [...this.resourceControllers.values()]
                 .map((r) => {
                 const sensitiveParameters = Object.entries(r.settings.parameterSettings ?? {})

package/dist/resource/parsed-resource-settings.js

@@ -28,7 +28,7 @@ export class ParsedResourceSettings {
                         if (ctx.path.length === 0) {
                             ctx.jsonSchema.title = settings.id;
                             ctx.jsonSchema.description = schema.description ?? settings.description ?? `${settings.id} resource. Can be used to manage ${settings.id}`;
-                            ctx.jsonSchema.$comment = schema.meta().$comment;
+                            ctx.jsonSchema.$comment = schema.meta()?.$comment;
                         }
                     }
                 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codifycli/plugin-core",
-  "version": "1.1.0-beta15",
+  "version": "1.1.0-beta17",
   "description": "TypeScript library for building Codify plugins to manage system resources (applications, CLI tools, settings) through infrastructure-as-code",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -35,7 +35,7 @@
   },
   "license": "ISC",
   "dependencies": {
-    "@codifycli/schemas": "1.1.0-beta5",
+    "@codifycli/schemas": "1.1.0-beta6",
     "@homebridge/node-pty-prebuilt-multiarch": "^0.13.1",
     "ajv": "^8.18.0",
     "ajv-formats": "^2.1.1",
@@ -43,7 +43,7 @@
     "lodash.isequal": "^4.5.0",
     "nanoid": "^5.0.9",
     "strip-ansi": "^7.1.0",
-    "uuid": "^10.0.0",
+    "uuid": "^14.0.0",
     "zod": "4.1.13"
   },
   "devDependencies": {

package/src/plan/change-set.test.ts

@@ -107,6 +107,7 @@ describe('Change set tests', () => {
 
     const parameterSettings = new ParsedResourceSettings({
       id: 'type',
+      operatingSystems: [],
       parameterSettings: {
         propA: { type: 'array' }
       }
@@ -129,6 +130,7 @@ describe('Change set tests', () => {
 
     const parameterSettings = new ParsedResourceSettings({
       id: 'type',
+      operatingSystems: [],
       parameterSettings: {
         propA: { type: 'array' }
       }
@@ -152,6 +154,7 @@ describe('Change set tests', () => {
 
     const parameterSettings = new ParsedResourceSettings({
       id: 'type',
+      operatingSystems: [],
       parameterSettings: {
         propA: { canModify: true }
       }
@@ -176,6 +179,7 @@ describe('Change set tests', () => {
 
     const parameterSettings = new ParsedResourceSettings({
       id: 'type',
+      operatingSystems: [],
       parameterSettings: {
         propA: { canModify: true },
         propB: { canModify: true }
@@ -196,6 +200,7 @@ describe('Change set tests', () => {
 
     const parameterSettings = new ParsedResourceSettings({
       id: 'type',
+      operatingSystems: [],
       parameterSettings: {
         propA: { type: 'array' }
       },
@@ -213,6 +218,7 @@ describe('Change set tests', () => {
 
     const parameterSettings = new ParsedResourceSettings({
       id: 'type',
+      operatingSystems: [],
       parameterSettings: {
         propA: { type: 'array' }
       },
@@ -229,6 +235,7 @@ describe('Change set tests', () => {
 
     const parameterSettings = new ParsedResourceSettings({
       id: 'type',
+      operatingSystems: [],
       parameterSettings: {
         propA: { type: 'array' }
       },
@@ -245,6 +252,7 @@ describe('Change set tests', () => {
 
     const parameterSettings = new ParsedResourceSettings({
       id: 'type',
+      operatingSystems: [],
       parameterSettings: {
         propA: {
           type: 'array',
@@ -259,12 +267,50 @@ describe('Change set tests', () => {
     expect(result.parameterChanges[0].operation).to.eq(ParameterOperation.MODIFY);
   })
 
+  it('excludes setting parameters from destroy change set', () => {
+    const settings = {
+      id: 'type',
+      operatingSystems: [],
+      parameterSettings: {
+        propA: {},
+        propB: { setting: true },
+      },
+    };
+
+    const cs = ChangeSet.destroy({ propA: 'val', propB: true }, settings as any);
+    expect(cs.parameterChanges.length).to.eq(1);
+    expect(cs.parameterChanges[0].name).to.eq('propA');
+    expect(cs.parameterChanges[0].operation).to.eq(ParameterOperation.REMOVE);
+    expect(cs.operation).to.eq(ResourceOperation.DESTROY);
+  })
+
+  it('excludes multiple setting parameters from destroy change set', () => {
+    const settings = {
+      id: 'type',
+      operatingSystems: [],
+      parameterSettings: {
+        skipAlreadyInstalledCasks: { type: 'boolean', default: true, setting: true },
+        onlyPlanUserInstalled: { type: 'boolean', default: true, setting: true },
+        directory: { type: 'directory' },
+      },
+    };
+
+    const cs = ChangeSet.destroy(
+      { skipAlreadyInstalledCasks: true, onlyPlanUserInstalled: true, directory: '/opt/homebrew' },
+      settings as any
+    );
+    expect(cs.parameterChanges.length).to.eq(1);
+    expect(cs.parameterChanges[0].name).to.eq('directory');
+    expect(cs.operation).to.eq(ResourceOperation.DESTROY);
+  })
+
   it('correctly determines array equality 5', () => {
     const arrA = [{ key1: 'b' }, { key1: 'a' }, { key1: 'a' }];
     const arrB = [{ key1: 'a' }, { key1: 'a' }, { key1: 'b' }];
 
     const parameterSettings = new ParsedResourceSettings({
       id: 'type',
+      operatingSystems: [],
       parameterSettings: {
         propA: {
           type: 'array',

package/src/plugin/plugin.ts

@@ -31,15 +31,22 @@ import { VerbosityLevel } from '../utils/verbosity-level.js';
 export class Plugin {
   planStorage: Map<string, Plan<any>>;
   planPty = new BackgroundPty();
+  minSupportedCliVersion: string | undefined;
 
   constructor(
     public name: string,
-    public resourceControllers: Map<string, ResourceController<ResourceConfig>>
+    public resourceControllers: Map<string, ResourceController<ResourceConfig>>,
+    options?: { minSupportedCliVersion?: string }
   ) {
     this.planStorage = new Map();
+    this.minSupportedCliVersion = options?.minSupportedCliVersion;
   }
 
-  static create(name: string, resources: Resource<any>[]) {
+  static create(
+    name: string,
+    resources: Resource<any>[],
+    options?: { minSupportedCliVersion?: string }
+  ) {
     const controllers = resources
       .map((resource) => new ResourceController(resource))
 
@@ -47,7 +54,7 @@ export class Plugin {
       controllers.map((r) => [r.typeId, r] as const)
     );
 
-    return new Plugin(name, controllersMap);
+    return new Plugin(name, controllersMap, options);
   }
 
   async initialize(data: InitializeRequestData): Promise<InitializeResponseData> {
@@ -60,6 +67,7 @@ export class Plugin {
     }
 
     return {
+      minSupportedCliVersion: this.minSupportedCliVersion,
       resourceDefinitions: [...this.resourceControllers.values()]
         .map((r) => {
           const sensitiveParameters = Object.entries(r.settings.parameterSettings ?? {})

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

@@ -76,7 +76,7 @@ export class ParsedResourceSettings<T extends StringIndexedObject> implements Re
             if (ctx.path.length === 0) {
               ctx.jsonSchema.title = settings.id;
               ctx.jsonSchema.description = schema.description ?? settings.description ?? `${settings.id} resource. Can be used to manage ${settings.id}`;
-              ctx.jsonSchema.$comment = (schema.meta() as Record<string, string | undefined>).$comment;
+              ctx.jsonSchema.$comment = (schema.meta() as Record<string, string | undefined> | undefined)?.$comment;
             }
           }
         }) as JSONSchemaType<T>