codify-plugin-lib 1.0.30 → 1.0.31

package/dist/messages/handlers.js

@@ -1,6 +1,6 @@
-import Ajv from 'ajv';
 import addFormats from 'ajv-formats';
 import { IpcMessageSchema, ResourceSchema, ValidateRequestDataSchema, ValidateResponseDataSchema, MessageStatus, PlanRequestDataSchema, PlanResponseDataSchema, ApplyRequestDataSchema, ApplyResponseDataSchema } from 'codify-schemas';
+import Ajv2020 from 'ajv/dist/2020.js';
 const SupportedRequests = {
     'validate': {
         requestValidator: ValidateRequestDataSchema,
@@ -28,7 +28,7 @@ export class MessageHandler {
     requestValidators;
     responseValidators;
     constructor(plugin) {
-        this.ajv = new Ajv.default({ strict: true, code: { esm: true } });
+        this.ajv = new Ajv2020.default({ strict: true });
         addFormats.default(this.ajv);
         this.ajv.addSchema(ResourceSchema);
         this.plugin = plugin;

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "codify-plugin-lib",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "description": "",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "type": "module",
   "scripts": {
-    "test": "vitest",
-    "prepublish": "tsc"
+    "test": "vitest"
   },
   "keywords": [],
   "author": "",
@@ -15,7 +14,7 @@
   "dependencies": {
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
-    "codify-schemas": "../codify-schemas",
+    "codify-schemas": "1.0.21",
     "@npmcli/promise-spawn": "^7.0.1"
   },
   "devDependencies": {

package/src/messages/handlers.test.ts

@@ -1,11 +1,12 @@
-import { MessageHandler } from './handlers';
-import { Plugin } from '../entities/plugin';
+import { MessageHandler } from './handlers.js';
+import { Plugin } from '../entities/plugin.js';
 import { describe, it, expect } from 'vitest';
-import { createStubInstance } from 'sinon';
+import { vi } from 'vitest'
+import { mock } from 'vitest-mock-extended'
 
 describe('Message handler tests', () => {
   it('handles plan requests', async () => {
-    const plugin = createStubInstance(Plugin);
+    const plugin = mock<Plugin>();
     const handler = new MessageHandler(plugin);
 
     // Message handler also validates the response. That part does not need to be tested
@@ -21,11 +22,11 @@ describe('Message handler tests', () => {
       })
     } catch (e) {}
 
-    expect(plugin.plan.calledOnce).to.be.true;
+    expect(plugin.plan.mock.calls.length).to.eq(1);
   })
 
   it('rejects bad plan requests', async () => {
-    const plugin = createStubInstance(Plugin);
+    const plugin = mock<Plugin>();
     const handler = new MessageHandler(plugin);
 
     // Message handler also validates the response. That part does not need to be tested
@@ -33,7 +34,6 @@ describe('Message handler tests', () => {
       await handler.onMessage({
         cmd: 'plan',
         data: {
-          type: 'resourceType',
           name: '1name',
           prop1: 'A',
           prop2: 'B',
@@ -41,11 +41,11 @@ describe('Message handler tests', () => {
       })
     } catch (e) {}
 
-    expect(plugin.plan.called).to.be.false;
+    expect(plugin.plan.mock.calls.length).to.eq(0);
   })
 
   it('handles apply requests', async () => {
-    const plugin = createStubInstance(Plugin);
+    const plugin = mock<Plugin>();
     const handler = new MessageHandler(plugin);
 
     // Message handler also validates the response. That part does not need to be tested
@@ -58,11 +58,11 @@ describe('Message handler tests', () => {
       })
     } catch (e) {}
 
-    expect(plugin.apply.calledOnce).to.be.true;
+    expect(plugin.apply.mock.calls.length).to.be.eq(1);
   })
 
-  it('rejects bad plan requests', async () => {
-    const plugin = createStubInstance(Plugin);
+  it('rejects bad apply requests', async () => {
+    const plugin = mock<Plugin>();
     const handler = new MessageHandler(plugin);
 
     // Message handler also validates the response. That part does not need to be tested
@@ -73,11 +73,11 @@ describe('Message handler tests', () => {
       })
     } catch (e) {}
 
-    expect(plugin.apply.called).to.be.false;
+    expect(plugin.apply.mock.calls.length).to.be.eq(0);
   })
 
   it('handles validate requests', async () => {
-    const plugin = createStubInstance(Plugin);
+    const plugin = mock<Plugin>();
     const handler = new MessageHandler(plugin);
 
     // Message handler also validates the response. That part does not need to be tested
@@ -103,11 +103,11 @@ describe('Message handler tests', () => {
       })
     } catch (e) {}
 
-    expect(plugin.validate.calledOnce).to.be.true;
+    expect(plugin.validate.mock.calls.length).to.eq(1);
   })
 
   it('rejects bad validate requests', async () => {
-    const plugin = createStubInstance(Plugin);
+    const plugin = mock<Plugin>();
     const handler = new MessageHandler(plugin);
 
     // Message handler also validates the response. That part does not need to be tested
@@ -118,7 +118,7 @@ describe('Message handler tests', () => {
       })
     } catch (e) {}
 
-    expect(plugin.apply.called).to.be.false;
+    expect(plugin.apply.mock.calls.length).to.be.eq(0);
   })
 
 });

package/src/messages/handlers.ts

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

package/tsconfig.json

@@ -2,6 +2,7 @@
   "compilerOptions": {
     "declaration": true,
     "module": "Node16",
+    "moduleResolution": "Node16",
     "alwaysStrict": true,
     "noImplicitAny": true,
     "resolveJsonModule": true,