codify-plugin-lib 1.0.28 → 1.0.29

package/dist/entities/change-set.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChangeSet = void 0;
-const codify_schemas_1 = require("codify-schemas");
-class ChangeSet {
+import { ParameterOperation, ResourceOperation } from 'codify-schemas';
+export class ChangeSet {
     operation;
     parameterChanges;
     constructor(operation, parameterChanges) {
@@ -15,12 +12,12 @@ class ChangeSet {
             .map(([k, v]) => {
             return {
                 name: k,
-                operation: codify_schemas_1.ParameterOperation.ADD,
+                operation: ParameterOperation.ADD,
                 previousValue: null,
                 newValue: v,
             };
         });
-        return new ChangeSet(codify_schemas_1.ResourceOperation.CREATE, parameterChangeSet);
+        return new ChangeSet(ResourceOperation.CREATE, parameterChangeSet);
     }
     static calculateParameterChangeSet(prev, next) {
         const parameterChangeSet = new Array();
@@ -34,7 +31,7 @@ class ChangeSet {
                     name: k,
                     previousValue: v,
                     newValue: null,
-                    operation: codify_schemas_1.ParameterOperation.REMOVE,
+                    operation: ParameterOperation.REMOVE,
                 });
                 delete filteredPrev[k];
                 continue;
@@ -44,7 +41,7 @@ class ChangeSet {
                     name: k,
                     previousValue: v,
                     newValue: filteredNext[k],
-                    operation: codify_schemas_1.ParameterOperation.MODIFY,
+                    operation: ParameterOperation.MODIFY,
                 });
                 delete filteredPrev[k];
                 delete filteredNext[k];
@@ -54,7 +51,7 @@ class ChangeSet {
                 name: k,
                 previousValue: v,
                 newValue: filteredNext[k],
-                operation: codify_schemas_1.ParameterOperation.NOOP,
+                operation: ParameterOperation.NOOP,
             });
             delete filteredPrev[k];
             delete filteredNext[k];
@@ -67,18 +64,18 @@ class ChangeSet {
                 name: k,
                 previousValue: null,
                 newValue: v,
-                operation: codify_schemas_1.ParameterOperation.ADD,
+                operation: ParameterOperation.ADD,
             });
         }
         return parameterChangeSet;
     }
     static combineResourceOperations(prev, next) {
         const orderOfOperations = [
-            codify_schemas_1.ResourceOperation.NOOP,
-            codify_schemas_1.ResourceOperation.MODIFY,
-            codify_schemas_1.ResourceOperation.RECREATE,
-            codify_schemas_1.ResourceOperation.CREATE,
-            codify_schemas_1.ResourceOperation.DESTROY,
+            ResourceOperation.NOOP,
+            ResourceOperation.MODIFY,
+            ResourceOperation.RECREATE,
+            ResourceOperation.CREATE,
+            ResourceOperation.DESTROY,
         ];
         const indexPrev = orderOfOperations.indexOf(prev);
         const indexNext = orderOfOperations.indexOf(next);
@@ -93,4 +90,3 @@ class ChangeSet {
         return a === b;
     }
 }
-exports.ChangeSet = ChangeSet;

package/dist/entities/plan.d.ts

@@ -1,4 +1,4 @@
-import { ChangeSet } from './change-set';
+import { ChangeSet } from './change-set.js';
 import { PlanResponseData, ResourceConfig } from 'codify-schemas';
 export declare class Plan<T extends ResourceConfig> {
     id: string;

package/dist/entities/plan.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Plan = void 0;
-const crypto_1 = require("crypto");
-class Plan {
+import { randomUUID } from 'crypto';
+export class Plan {
     id;
     changeSet;
     resourceConfig;
@@ -12,7 +9,7 @@ class Plan {
         this.resourceConfig = resourceConfig;
     }
     static create(changeSet, resourceConfig) {
-        return new Plan((0, crypto_1.randomUUID)(), changeSet, resourceConfig);
+        return new Plan(randomUUID(), changeSet, resourceConfig);
     }
     getResourceType() {
         return this.resourceConfig.type;
@@ -27,4 +24,3 @@ class Plan {
         };
     }
 }
-exports.Plan = Plan;

package/dist/entities/plugin.d.ts

@@ -1,6 +1,6 @@
-import { Resource } from './resource';
+import { Resource } from './resource.js';
 import { ApplyRequestData, PlanRequestData, PlanResponseData, ResourceConfig, ValidateRequestData, ValidateResponseData } from 'codify-schemas';
-import { Plan } from './plan';
+import { Plan } from './plan.js';
 export declare class Plugin {
     resources: Map<string, Resource<ResourceConfig>>;
     planStorage: Map<string, Plan<ResourceConfig>>;

package/dist/entities/plugin.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Plugin = void 0;
-class Plugin {
+export class Plugin {
     resources;
     planStorage;
     constructor(resources) {
@@ -42,4 +39,3 @@ class Plugin {
     }
     async crossValidateResources(configs) { }
 }
-exports.Plugin = Plugin;

package/dist/entities/resource.d.ts

@@ -1,7 +1,7 @@
 import { ResourceConfig, ResourceOperation } from 'codify-schemas';
-import { ParameterChange } from './change-set';
-import { Plan } from './plan';
-import { StatefulParameter } from './stateful-parameter';
+import { ParameterChange } from './change-set.js';
+import { Plan } from './plan.js';
+import { StatefulParameter } from './stateful-parameter.js';
 export declare abstract class Resource<T extends ResourceConfig> {
     private dependencies;
     private statefulParameters;

package/dist/entities/resource.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Resource = void 0;
-const codify_schemas_1 = require("codify-schemas");
-const change_set_1 = require("./change-set");
-const plan_1 = require("./plan");
-class Resource {
+import { ParameterOperation, ResourceOperation } from 'codify-schemas';
+import { ChangeSet } from './change-set.js';
+import { Plan } from './plan.js';
+export class Resource {
     dependencies;
     statefulParameters = new Map();
     constructor(dependencies = []) {
@@ -15,7 +12,7 @@ class Resource {
         await this.validate(desiredConfig);
         const currentConfig = await this.getCurrentConfig(desiredConfig);
         if (!currentConfig) {
-            return plan_1.Plan.create(change_set_1.ChangeSet.createForNullCurrentConfig(desiredConfig), desiredConfig);
+            return Plan.create(ChangeSet.createForNullCurrentConfig(desiredConfig), desiredConfig);
         }
         const desiredConfigStatefulParameters = [...this.statefulParameters.values()]
             .filter((sp) => desiredConfig[sp.name] !== undefined);
@@ -25,25 +22,25 @@ class Resource {
                 currentConfig[statefulParameter.name] = parameterCurrentStatus;
             }
         }
-        const parameterChangeSet = change_set_1.ChangeSet.calculateParameterChangeSet(currentConfig, desiredConfig);
+        const parameterChangeSet = ChangeSet.calculateParameterChangeSet(currentConfig, desiredConfig);
         const resourceOperation = parameterChangeSet
-            .filter((change) => change.operation !== codify_schemas_1.ParameterOperation.NOOP)
+            .filter((change) => change.operation !== ParameterOperation.NOOP)
             .reduce((operation, curr) => {
             const newOperation = !this.statefulParameters.has(curr.name)
                 ? this.calculateOperation(curr)
-                : codify_schemas_1.ResourceOperation.MODIFY;
-            return change_set_1.ChangeSet.combineResourceOperations(operation, newOperation);
-        }, codify_schemas_1.ResourceOperation.NOOP);
-        return plan_1.Plan.create(new change_set_1.ChangeSet(resourceOperation, parameterChangeSet), desiredConfig);
+                : ResourceOperation.MODIFY;
+            return ChangeSet.combineResourceOperations(operation, newOperation);
+        }, ResourceOperation.NOOP);
+        return Plan.create(new ChangeSet(resourceOperation, parameterChangeSet), desiredConfig);
     }
     async apply(plan) {
         if (plan.getResourceType() !== this.getTypeId()) {
             throw new Error(`Internal error: Plan set to wrong resource during apply. Expected ${this.getTypeId()} but got: ${plan.getResourceType()}`);
         }
         switch (plan.changeSet.operation) {
-            case codify_schemas_1.ResourceOperation.MODIFY: {
+            case ResourceOperation.MODIFY: {
                 const parameterChanges = plan.changeSet.parameterChanges
-                    .filter((c) => c.operation !== codify_schemas_1.ParameterOperation.NOOP);
+                    .filter((c) => c.operation !== ParameterOperation.NOOP);
                 const statelessParameterChanges = parameterChanges.filter((pc) => !this.statefulParameters.has(pc.name));
                 if (statelessParameterChanges.length > 0) {
                     await this.applyModify(plan);
@@ -52,15 +49,15 @@ class Resource {
                 for (const parameterChange of statefulParameterChanges) {
                     const statefulParameter = this.statefulParameters.get(parameterChange.name);
                     switch (parameterChange.operation) {
-                        case codify_schemas_1.ParameterOperation.ADD: {
+                        case ParameterOperation.ADD: {
                             await statefulParameter.applyAdd(parameterChange, plan);
                             break;
                         }
-                        case codify_schemas_1.ParameterOperation.MODIFY: {
+                        case ParameterOperation.MODIFY: {
                             await statefulParameter.applyModify(parameterChange, plan);
                             break;
                         }
-                        case codify_schemas_1.ParameterOperation.REMOVE: {
+                        case ParameterOperation.REMOVE: {
                             await statefulParameter.applyRemove(parameterChange, plan);
                             break;
                         }
@@ -68,7 +65,7 @@ class Resource {
                 }
                 return;
             }
-            case codify_schemas_1.ResourceOperation.CREATE: {
+            case ResourceOperation.CREATE: {
                 await this.applyCreate(plan);
                 const statefulParameterChanges = plan.changeSet.parameterChanges
                     .filter((pc) => this.statefulParameters.has(pc.name));
@@ -78,12 +75,11 @@ class Resource {
                 }
                 return;
             }
-            case codify_schemas_1.ResourceOperation.RECREATE: return this.applyRecreate(plan);
-            case codify_schemas_1.ResourceOperation.DESTROY: return this.applyDestroy(plan);
+            case ResourceOperation.RECREATE: return this.applyRecreate(plan);
+            case ResourceOperation.DESTROY: return this.applyDestroy(plan);
         }
     }
     registerStatefulParameter(parameter) {
         this.statefulParameters.set(parameter.name, parameter);
     }
 }
-exports.Resource = Resource;

package/dist/entities/stateful-parameter.d.ts

@@ -1,5 +1,5 @@
-import { ParameterChange } from './change-set';
-import { Plan } from './plan';
+import { ParameterChange } from './change-set.js';
+import { Plan } from './plan.js';
 import { ResourceConfig } from 'codify-schemas';
 export declare abstract class StatefulParameter<T extends ResourceConfig, K extends keyof T> {
     abstract get name(): K;

package/dist/entities/stateful-parameter.js

@@ -1,6 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.StatefulParameter = void 0;
-class StatefulParameter {
+export class StatefulParameter {
 }
-exports.StatefulParameter = StatefulParameter;

package/dist/index.d.ts

@@ -1,8 +1,9 @@
-import { Plugin } from './entities/plugin';
-export * from './entities/resource';
-export * from './entities/plugin';
-export * from './entities/change-set';
-export * from './entities/plan';
-export * from './utils/test-utils';
-export * from './utils/utils';
+import { Plugin } from './entities/plugin.js';
+export * from './entities/resource.js';
+export * from './entities/plugin.js';
+export * from './entities/change-set.js';
+export * from './entities/plan.js';
+export * from './entities/stateful-parameter.js';
+export * from './utils/test-utils.js';
+export * from './utils/utils.js';
 export declare function runPlugin(plugin: Plugin): Promise<void>;

package/dist/index.js

@@ -1,30 +1,13 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runPlugin = void 0;
-const handlers_1 = require("./messages/handlers");
-__exportStar(require("./entities/resource"), exports);
-__exportStar(require("./entities/plugin"), exports);
-__exportStar(require("./entities/change-set"), exports);
-__exportStar(require("./entities/plan"), exports);
-__exportStar(require("./utils/test-utils"), exports);
-__exportStar(require("./utils/utils"), exports);
-async function runPlugin(plugin) {
+import { MessageHandler } from './messages/handlers.js';
+export * from './entities/resource.js';
+export * from './entities/plugin.js';
+export * from './entities/change-set.js';
+export * from './entities/plan.js';
+export * from './entities/stateful-parameter.js';
+export * from './utils/test-utils.js';
+export * from './utils/utils.js';
+export async function runPlugin(plugin) {
     await plugin.onInitialize();
-    const messageHandler = new handlers_1.MessageHandler(plugin);
+    const messageHandler = new MessageHandler(plugin);
     process.on('message', (message) => messageHandler.onMessage(message));
 }
-exports.runPlugin = runPlugin;

package/dist/messages/handlers.d.ts

@@ -1,4 +1,4 @@
-import { Plugin } from '../entities/plugin';
+import { Plugin } from '../entities/plugin.js';
 export declare class MessageHandler {
     private ajv;
     private readonly plugin;

package/dist/messages/handlers.js

@@ -1,44 +1,38 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MessageHandler = void 0;
-const _2020_1 = __importDefault(require("ajv/dist/2020"));
-const ajv_formats_1 = __importDefault(require("ajv-formats"));
-const codify_schemas_1 = require("codify-schemas");
+import Ajv from 'ajv';
+import addFormats from 'ajv-formats';
+import { IpcMessageSchema, ResourceSchema, ValidateRequestDataSchema, ValidateResponseDataSchema, MessageStatus, PlanRequestDataSchema, PlanResponseDataSchema, ApplyRequestDataSchema, ApplyResponseDataSchema } from 'codify-schemas';
 const SupportedRequests = {
     'validate': {
-        requestValidator: codify_schemas_1.ValidateRequestDataSchema,
-        responseValidator: codify_schemas_1.ValidateResponseDataSchema,
+        requestValidator: ValidateRequestDataSchema,
+        responseValidator: ValidateResponseDataSchema,
         handler: async (plugin, data) => plugin.validate(data)
     },
     'plan': {
-        requestValidator: codify_schemas_1.PlanRequestDataSchema,
-        responseValidator: codify_schemas_1.PlanResponseDataSchema,
+        requestValidator: PlanRequestDataSchema,
+        responseValidator: PlanResponseDataSchema,
         handler: async (plugin, data) => plugin.plan(data)
     },
     'apply': {
-        requestValidator: codify_schemas_1.ApplyRequestDataSchema,
-        responseValidator: codify_schemas_1.ApplyResponseDataSchema,
+        requestValidator: ApplyRequestDataSchema,
+        responseValidator: ApplyResponseDataSchema,
         handler: async (plugin, data) => {
             await plugin.apply(data);
             return null;
         }
     }
 };
-class MessageHandler {
+export class MessageHandler {
     ajv;
     plugin;
     messageSchemaValidator;
     requestValidators;
     responseValidators;
     constructor(plugin) {
-        this.ajv = new _2020_1.default({ strict: true });
-        (0, ajv_formats_1.default)(this.ajv);
-        this.ajv.addSchema(codify_schemas_1.ResourceSchema);
+        this.ajv = new Ajv.default({ strict: true, code: { esm: true } });
+        addFormats.default(this.ajv);
+        this.ajv.addSchema(ResourceSchema);
         this.plugin = plugin;
-        this.messageSchemaValidator = this.ajv.compile(codify_schemas_1.IpcMessageSchema);
+        this.messageSchemaValidator = this.ajv.compile(IpcMessageSchema);
         this.requestValidators = new Map(Object.entries(SupportedRequests)
             .map(([k, v]) => [k, this.ajv.compile(v.requestValidator)]));
         this.responseValidators = new Map(Object.entries(SupportedRequests)
@@ -62,7 +56,7 @@ class MessageHandler {
         catch (e) {
             process.send({
                 cmd: message.cmd + '_Response',
-                status: codify_schemas_1.MessageStatus.ERROR,
+                status: MessageStatus.ERROR,
                 data: e.message,
             });
             return;
@@ -73,7 +67,7 @@ class MessageHandler {
         }
         process.send({
             cmd: message.cmd + '_Response',
-            status: codify_schemas_1.MessageStatus.SUCCESS,
+            status: MessageStatus.SUCCESS,
             data: result,
         });
     }
@@ -81,4 +75,3 @@ class MessageHandler {
         return this.messageSchemaValidator(message);
     }
 }
-exports.MessageHandler = MessageHandler;

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

@@ -1,4 +1,4 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import { ChildProcess } from 'child_process';
 export declare class CodifyTestUtils {
     static sendMessageToProcessAwaitResponse(process: ChildProcess, message: any): Promise<any>;

package/dist/utils/test-utils.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CodifyTestUtils = void 0;
-class CodifyTestUtils {
+export class CodifyTestUtils {
     static sendMessageToProcessAwaitResponse(process, message) {
         return new Promise((resolve, reject) => {
             process.on('message', (response) => {
@@ -18,4 +15,3 @@ class CodifyTestUtils {
         });
     }
 }
-exports.CodifyTestUtils = CodifyTestUtils;

package/dist/utils/utils.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import { SpawnOptions } from 'child_process';
 export declare enum SpawnStatus {
     SUCCESS = "success",
@@ -12,8 +12,6 @@ type CodifySpawnOptions = {
     cwd?: string;
     stdioString?: boolean;
 } & SpawnOptions;
-export declare function codifySpawn(cmd: string, args?: string[], opts?: Omit<CodifySpawnOptions, 'stdio' | 'stdioString'> & {
-    throws?: boolean;
-}, extras?: Record<any, any>): Promise<SpawnResult>;
+export declare function codifySpawn(cmd: string, args?: string[], opts?: Omit<CodifySpawnOptions, 'stdio' | 'stdioString' | 'shell'>, extras?: Record<any, any>): Promise<SpawnResult>;
 export declare function isDebug(): boolean;
 export {};

package/dist/utils/utils.js

@@ -1,18 +1,12 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDebug = exports.codifySpawn = exports.SpawnStatus = void 0;
-const promise_spawn_1 = __importDefault(require("@npmcli/promise-spawn"));
-var SpawnStatus;
+import promiseSpawn from '@npmcli/promise-spawn';
+export var SpawnStatus;
 (function (SpawnStatus) {
     SpawnStatus["SUCCESS"] = "success";
     SpawnStatus["ERROR"] = "error";
-})(SpawnStatus || (exports.SpawnStatus = SpawnStatus = {}));
-async function codifySpawn(cmd, args, opts, extras) {
+})(SpawnStatus || (SpawnStatus = {}));
+export async function codifySpawn(cmd, args, opts, extras) {
     try {
-        const result = await (0, promise_spawn_1.default)(cmd, args ?? [], { ...opts, stdio: 'pipe', stdioString: true, shell: opts?.shell ?? process.env.SHELL }, extras);
+        const result = await promiseSpawn(cmd, args ?? [], { ...opts, stdio: 'pipe', stdioString: true, shell: true }, extras);
         if (isDebug()) {
             console.log(`codifySpawn result for: ${cmd}`);
             console.log(JSON.stringify(result, null, 2));
@@ -25,22 +19,13 @@ async function codifySpawn(cmd, args, opts, extras) {
             data: status === SpawnStatus.SUCCESS ? result.stdout : result.stderr
         };
     }
-    catch (error) {
-        const shouldThrow = opts?.throws ?? true;
-        if (isDebug() || shouldThrow) {
-            console.error(`CodifySpawn Error for command ${cmd} ${args}`, error);
-        }
-        if (shouldThrow) {
-            throw error;
-        }
+    catch (e) {
         return {
             status: SpawnStatus.ERROR,
-            data: error,
+            data: e,
         };
     }
 }
-exports.codifySpawn = codifySpawn;
-function isDebug() {
+export function isDebug() {
     return process.env.DEBUG != null && process.env.DEBUG.includes('codify');
 }
-exports.isDebug = isDebug;

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "codify-plugin-lib",
-  "version": "1.0.28",
+  "version": "1.0.29",
   "description": "",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
+  "type": "module",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "vitest",
     "prepublish": "tsc"
   },
   "keywords": [],
@@ -14,30 +15,23 @@
   "dependencies": {
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
-    "codify-schemas": "1.0.8",
+    "codify-schemas": "../codify-schemas",
     "@npmcli/promise-spawn": "^7.0.1"
   },
   "devDependencies": {
     "@oclif/prettier-config": "^0.2.1",
     "@oclif/test": "^3",
     "@types/npmcli__promise-spawn": "^6.0.3",
-    "@types/chai": "^4",
-    "@types/chai-as-promised": "^7.1.7",
-    "@types/mocha": "^9.0.0",
     "@types/node": "^18",
     "@types/semver": "^7.5.4",
     "@types/sinon": "^17.0.3",
-    "@types/sinon-chai": "^3.2.12",
-    "chai": "^4",
     "chai-as-promised": "^7.1.1",
+    "vitest": "^1.4.0",
+    "vitest-mock-extended": "^1.3.1",
+    "sinon": "^17.0.1",
     "eslint": "^8.51.0",
     "eslint-config-oclif": "^5",
     "eslint-config-oclif-typescript": "^3",
-    "mocha": "^10",
-    "mock-fs": "^5.2.0",
-    "sinon": "^17.0.1",
-    "sinon-chai": "^3.7.0",
-    "oclif": "^4.0.0",
     "shx": "^0.3.3",
     "ts-node": "^10.9.1",
     "tsc-watch": "^6.0.4",

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

@@ -1,6 +1,6 @@
 import { ChangeSet } from './change-set';
-import { expect } from 'chai';
 import { ParameterOperation, ResourceOperation } from 'codify-schemas';
+import { describe, it, expect } from 'vitest';
 
 describe('Change set tests', () => {
   it ('Correctly diffs two resource configs (modify)', () => {

package/src/entities/plan.ts

@@ -1,4 +1,4 @@
-import { ChangeSet } from './change-set';
+import { ChangeSet } from './change-set.js';
 import {
   PlanResponseData,
   ResourceConfig,

package/src/entities/plugin.ts

@@ -1,4 +1,4 @@
-import { Resource } from './resource';
+import { Resource } from './resource.js';
 import {
   ApplyRequestData,
   PlanRequestData,
@@ -7,7 +7,7 @@ import {
   ValidateRequestData,
   ValidateResponseData
 } from 'codify-schemas';
-import { Plan } from './plan';
+import { Plan } from './plan.js';
 
 export class Plugin {
   planStorage: Map<string, Plan<ResourceConfig>>;

package/src/entities/resource.test.ts

@@ -1,11 +1,10 @@
-import { describe } from 'mocha';
 import { Resource } from './resource';
 import { ParameterOperation, ResourceConfig, ResourceOperation } from 'codify-schemas';
 import { ChangeSet, ParameterChange } from './change-set';
 import { spy } from 'sinon';
-import { expect } from 'chai';
 import { Plan } from './plan';
 import { StatefulParameter } from './stateful-parameter';
+import { describe, it, expect } from 'vitest'
 
 class TestResource extends Resource<TestConfig> {
   applyCreate(plan: Plan<TestConfig>): Promise<void> {

package/src/entities/resource.ts

@@ -1,7 +1,7 @@
 import { ParameterOperation, ResourceConfig, ResourceOperation } from 'codify-schemas';
-import { ChangeSet, ParameterChange } from './change-set';
-import { Plan } from './plan';
-import { StatefulParameter } from './stateful-parameter';
+import { ChangeSet, ParameterChange } from './change-set.js';
+import { Plan } from './plan.js';
+import { StatefulParameter } from './stateful-parameter.js';
 
 export abstract class Resource<T extends ResourceConfig> {
 
@@ -65,14 +65,14 @@ export abstract class Resource<T extends ResourceConfig> {
     switch (plan.changeSet.operation) {
       case ResourceOperation.MODIFY: {
         const parameterChanges = plan.changeSet.parameterChanges
-          .filter((c) => c.operation !== ParameterOperation.NOOP);
+          .filter((c: ParameterChange) => c.operation !== ParameterOperation.NOOP);
 
-        const statelessParameterChanges = parameterChanges.filter((pc) => !this.statefulParameters.has(pc.name))
+        const statelessParameterChanges = parameterChanges.filter((pc: ParameterChange) => !this.statefulParameters.has(pc.name))
         if (statelessParameterChanges.length > 0) {
           await this.applyModify(plan);
         }
 
-        const statefulParameterChanges = parameterChanges.filter((pc) => this.statefulParameters.has(pc.name))
+        const statefulParameterChanges = parameterChanges.filter((pc: ParameterChange) => this.statefulParameters.has(pc.name))
         for (const parameterChange of statefulParameterChanges) {
           const statefulParameter = this.statefulParameters.get(parameterChange.name)!;
           switch (parameterChange.operation) {
@@ -96,7 +96,7 @@ export abstract class Resource<T extends ResourceConfig> {
       case ResourceOperation.CREATE: {
         await this.applyCreate(plan);
         const statefulParameterChanges = plan.changeSet.parameterChanges
-          .filter((pc) => this.statefulParameters.has(pc.name))
+          .filter((pc: ParameterChange) => this.statefulParameters.has(pc.name))
 
         for (const parameterChange of statefulParameterChanges) {
           const statefulParameter = this.statefulParameters.get(parameterChange.name)!;

package/src/entities/stateful-parameter.ts

@@ -1,5 +1,5 @@
-import { ParameterChange } from './change-set';
-import { Plan } from './plan';
+import { ParameterChange } from './change-set.js';
+import { Plan } from './plan.js';
 import { ResourceConfig } from 'codify-schemas';
 
 export abstract class StatefulParameter<T extends ResourceConfig, K extends keyof T> {

package/src/index.test.ts

@@ -1,4 +1,4 @@
-import { describe } from 'mocha';
+import { describe, it } from 'vitest';
 
 describe('Library integration tests', () => {
   it('does something', async () => {

package/src/index.ts

@@ -1,13 +1,14 @@
-import { Plugin } from './entities/plugin';
-import { MessageHandler } from './messages/handlers';
+import { Plugin } from './entities/plugin.js';
+import { MessageHandler } from './messages/handlers.js';
 
-export * from './entities/resource'
-export * from './entities/plugin'
-export * from './entities/change-set'
-export * from './entities/plan'
-export * from './utils/test-utils'
-export * from './utils/utils'
+export * from './entities/resource.js'
+export * from './entities/plugin.js'
+export * from './entities/change-set.js'
+export * from './entities/plan.js'
+export * from './entities/stateful-parameter.js'
 
+export * from './utils/test-utils.js'
+export * from './utils/utils.js'
 
 export async function runPlugin(plugin: Plugin) {
   await plugin.onInitialize();

package/src/messages/handlers.test.ts

@@ -1,7 +1,7 @@
 import { MessageHandler } from './handlers';
-import { createStubInstance } from 'sinon';
 import { Plugin } from '../entities/plugin';
-import { expect } from 'chai';
+import { describe, it, expect } from 'vitest';
+import { createStubInstance } from 'sinon';
 
 describe('Message handler tests', () => {
   it('handles plan requests', async () => {

package/src/messages/handlers.ts

@@ -1,5 +1,5 @@
-import Ajv2020, { SchemaObject, ValidateFunction } from 'ajv/dist/2020';
-import { Plugin } from '../entities/plugin';
+import Ajv, { SchemaObject, ValidateFunction } from 'ajv';
+import { Plugin } from '../entities/plugin.js';
 import addFormats from 'ajv-formats';
 import {
   IpcMessage,
@@ -10,7 +10,8 @@ import {
   MessageStatus,
   PlanRequestDataSchema,
   PlanResponseDataSchema,
-  ApplyRequestDataSchema, ApplyResponseDataSchema
+  ApplyRequestDataSchema,
+  ApplyResponseDataSchema
 } from 'codify-schemas';
 
 const SupportedRequests: Record<string, { requestValidator: SchemaObject; responseValidator: SchemaObject; handler: (plugin: Plugin, data: any) => Promise<unknown> }> = {
@@ -35,15 +36,15 @@ const SupportedRequests: Record<string, { requestValidator: SchemaObject; respon
 }
 
 export class MessageHandler {
-  private ajv: Ajv2020;
+  private ajv: any;
   private readonly plugin: Plugin;
   private messageSchemaValidator: ValidateFunction;
   private requestValidators: Map<string, ValidateFunction>;
   private responseValidators: Map<string, ValidateFunction>;
 
   constructor(plugin: Plugin) {
-    this.ajv = new Ajv2020({ strict: true });
-    addFormats(this.ajv);
+    this.ajv = new Ajv.default({ strict: true, code: { esm: true } });
+    addFormats.default(this.ajv);
     this.ajv.addSchema(ResourceSchema);
     this.plugin = plugin;
 

package/src/utils/test-utils.test.ts

@@ -1,21 +1,13 @@
-import { describe, it } from 'mocha';
 import { EventEmitter } from 'node:events';
 import { ChildProcess } from 'node:child_process';
-
 import { Readable } from 'stream';
 import { mock } from 'node:test';
-import { expect } from '@oclif/test';
 import { AssertionError } from 'chai';
 import { CodifyTestUtils } from './test-utils';
-import chai = require('chai');
-import chaiAsPromised = require('chai-as-promised');
+import { describe, it, expect } from 'vitest';
 
 describe('Test Utils tests', async () => {
 
-  before(() => {
-    chai.use(chaiAsPromised);
-  })
-
   const mockChildProcess = () => {
     const process = new ChildProcess();
     process.stdout = new EventEmitter() as Readable;
@@ -39,14 +31,22 @@ describe('Test Utils tests', async () => {
     const process = mockChildProcess();
 
     try {
-      await Promise.all([
-        expect(CodifyTestUtils.sendMessageToProcessAwaitResponse(process, { cmd: 'message', data: 'data' }))
-          .to.eventually.deep.eq({ cmd: 'messageResult', data: 'data' }),
-        process.emit('message', { cmd: 'messageResult', data: 'data' }),
+      const result = await Promise.all([
+        (async () => {
+          await sleep(30);
+          process.emit('message', { cmd: 'messageResult', data: 'data' })
+        })(),
+        CodifyTestUtils.sendMessageToProcessAwaitResponse(process, { cmd: 'message', data: 'data' }),
       ]);
+
+      expect(result[1]).to.deep.eq({ cmd: 'messageResult', data: 'data' })
     } catch (e) {
       console.log(e);
       throw new AssertionError('Failed to receive message');
     }
   });
 });
+
+async function sleep(ms: number) {
+  return new Promise((resolve, reject) => setTimeout(resolve, ms))
+}

package/src/utils/utils.ts

@@ -16,32 +16,17 @@ type CodifySpawnOptions = {
   stdioString?: boolean;
 } & SpawnOptions
 
-/**
- *
- * @param cmd Command to run. Ex: `rm -rf`
- * @param args Optional additional arguments to append
- * @param opts Standard options for node spawn. Additional argument:
- * throws determines if a shell will throw a JS error. Defaults to true
- * @param extras From PromiseSpawn
- *
- * @see promiseSpawn
- * @see spawn
- *
- * @returns SpawnResult { status: SUCCESS | ERROR; data: string }
- */
 export async function codifySpawn(
   cmd: string,
   args?: string[],
-  opts?: Omit<CodifySpawnOptions, 'stdio' | 'stdioString'> & { throws?: boolean },
+  opts?: Omit<CodifySpawnOptions, 'stdio' | 'stdioString' | 'shell'>,
   extras?: Record<any, any>,
 ): Promise<SpawnResult> {
   try {
-    // TODO: Need to benchmark the effects of using sh vs zsh for shell.
-    //  Seems like zsh shells run slower
     const result = await promiseSpawn(
       cmd,
       args ?? [],
-      { ...opts, stdio: 'pipe', stdioString: true, shell: opts?.shell ?? process.env.SHELL },
+      { ...opts, stdio: 'pipe', stdioString: true, shell: true },
       extras,
     );
 
@@ -58,19 +43,10 @@ export async function codifySpawn(
       status,
       data: status === SpawnStatus.SUCCESS ? result.stdout : result.stderr
     }
-  } catch (error) {
-    const shouldThrow = opts?.throws ?? true;
-    if (isDebug() || shouldThrow) {
-      console.error(`CodifySpawn Error for command ${cmd} ${args}`, error);
-    }
-
-    if (shouldThrow) {
-      throw error;
-    }
-
+  } catch (e) {
     return {
       status: SpawnStatus.ERROR,
-      data: error as string,
+      data: e as string,
     }
   }
 }

package/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "declaration": true,
-    "module": "commonjs",
+    "module": "Node16",
     "alwaysStrict": true,
     "noImplicitAny": true,
     "resolveJsonModule": true,

package/.mocharc.json

@@ -1,11 +0,0 @@
-{
-  "require": [
-    "ts-node/register/transpile-only"
-  ],
-  "watch-extensions": [
-    "ts"
-  ],
-  "recursive": true,
-  "reporter": "spec",
-  "timeout": 60000
-}