Merge branch 'release/v0.8.0'

Author: miguel-rr

.travis.yml

@@ -1,3 +1,6 @@
+branches:
+  except:
+    - /^release/
 language: node_js
 node_js:
   - "12"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "watcher",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "API and model watcher",
   "engines": {
     "node": ">=12"

test/tests/validations/stressValidator.ts

@@ -46,7 +46,9 @@ test('Stress validator by writing several files at once', async (): Promise<
     onEvent = jest.fn((eventName, eventPath): void => {
       validator.addFileToQueue({ targetPath: eventPath, type: eventName });
     });
-    watcher.on('all', onEvent);
+    watcher.on('all', (eventName, eventPath): void => {
+      onEvent(eventName, eventPath);
+    });
   };
   const jestOnReady = jest.fn(onReady);
   const watcherOptions: WatcherOptions = {

test/tests/validations/validator.ts

@@ -38,7 +38,9 @@ test('Basic validator flow', async (): Promise<void> => {
     onEvent = jest.fn((eventName, eventPath): void => {
       validator.addFileToQueue({ targetPath: eventPath, type: eventName });
     });
-    watcher.on('all', onEvent);
+    watcher.on('all', (eventName, eventPath): void => {
+      onEvent(eventName, eventPath);
+    });
   };
   const jestOnReady = jest.fn(onReady);
   const watcherOptions: WatcherOptions = {

test/tests/watcher/initWatchers.ts

@@ -11,11 +11,13 @@ const serverApiPath = path.resolve(serverPath, apiPath);
 const serverModelPath = path.resolve(serverPath, modelPath);
 const mainPath = path.resolve(__dirname, '../../mocks');
 
-beforeEach(async (): Promise<void> => {
-  await emptyFolder(serverPath);
-  await ensureDir(serverApiPath);
-  await ensureDir(serverModelPath);
-});
+beforeEach(
+  async (): Promise<void> => {
+    await emptyFolder(serverPath);
+    await ensureDir(serverApiPath);
+    await ensureDir(serverModelPath);
+  },
+);
 
 const apiFileContent = `import { Data } from '../model/ok';
 
@@ -42,44 +44,47 @@ export interface Data {
  */
 test('Unexisting server path will throw exception', async (): Promise<void> => {
   const wrongPath = '/wrong/path/to/server';
-  await waitForExpect(async (): Promise<void> => {
-    expect(initWatchers(wrongPath, wrongPath)).rejects.toBeInstanceOf(Error);
-  });
+  await waitForExpect(
+    async (): Promise<void> => {
+      expect(initWatchers(wrongPath, wrongPath)).rejects.toBeInstanceOf(Error);
+    },
+  );
 });
 
 /**
  * Should work with existing server path and process files when added
  */
 test('Basic watchers flow', async (): Promise<void> => {
   const watchers = await initWatchers(serverPath, mainPath);
-  const handler = jest.fn((): void => {
+  const handler: (
+    eventName: 'add' | 'addDir' | 'change' | 'unlink' | 'unlinkDir',
+    eventPath: string,
+  ) => void = jest.fn((): void => {
     // Empty function to check event handler
   });
   watchers.forEach((watcher): void => {
+    watcher.on('all', (eventName, eventPath): void => {
+      handler(eventName, eventPath);
+    });
     watcher.on('all', handler);
   });
   const fileName = 'ok.ts';
   const serverApiFilePath = path.resolve(serverApiPath, fileName);
   const serverModelFilePath = path.resolve(serverModelPath, fileName);
   await writeFile(serverApiFilePath, apiFileContent);
   await writeFile(serverModelFilePath, modeFileContent);
-  await waitForExpect(async (): Promise<void> => {
-    expect(await exists(serverApiFilePath)).toBe(true);
-    expect(await exists(serverModelFilePath)).toBe(true);
-    expect(handler).toHaveBeenCalledWith(
-      'add',
-      serverApiFilePath,
-    );
-    expect(handler).toHaveBeenCalledWith(
-      'add',
-      serverModelFilePath,
-    );
-  });
+  await waitForExpect(
+    async (): Promise<void> => {
+      expect(await exists(serverApiFilePath)).toBe(true);
+      expect(await exists(serverModelFilePath)).toBe(true);
+      expect(handler).toHaveBeenCalledWith('add', serverApiFilePath);
+      expect(handler).toHaveBeenCalledWith('add', serverModelFilePath);
+    },
+  );
 
-  await Promise.all(watchers.map(w => w.close()));
+  await Promise.all(watchers.map((w) => w.close()));
 });
 
-
 /**
  * When disabling jest, watchers should process files when added
  */
@@ -91,19 +96,28 @@ test('Complete watchers flow', async (): Promise<void> => {
   const serverModelFilePath = path.resolve(serverModelPath, fileName);
   await writeFile(serverApiFilePath, apiFileContent);
   await writeFile(serverModelFilePath, modeFileContent);
-  await waitForExpect(async (): Promise<void> => {
-    expect(await exists(serverApiFilePath)).toBe(true);
-    expect(await exists(serverModelFilePath)).toBe(true);
-  });
+  await waitForExpect(
+    async (): Promise<void> => {
+      expect(await exists(serverApiFilePath)).toBe(true);
+      expect(await exists(serverModelFilePath)).toBe(true);
+    },
+  );
 
   const proxyIndexPath = path.resolve(mainPath, proxyPath, 'api', 'index.ts');
-  const modelResultingPath = path.resolve(mainPath, proxyPath, 'model', fileName);
+  const modelResultingPath = path.resolve(
+    mainPath,
+    proxyPath,
+    'model',
+    fileName,
+  );
 
-  await waitForExpect(async (): Promise<void> => {
-    expect(await exists(proxyIndexPath)).toBe(true);
-    expect(await exists(modelResultingPath)).toBe(true);
-  });
+  await waitForExpect(
+    async (): Promise<void> => {
+      expect(await exists(proxyIndexPath)).toBe(true);
+      expect(await exists(modelResultingPath)).toBe(true);
+    },
+  );
 
   setForceDisableJestDetection(false);
-  await Promise.all(watchers.map(w => w.close()));
+  await Promise.all(watchers.map((w) => w.close()));
 }, 10000);