protected null inputs

inelo · Nov 14, 2023 · 0267228 · 0267228
1 parent 70c6566
commit 0267228
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/libs/mapjet-core/src/lib/mapjet-core.spec.ts b/libs/mapjet-core/src/lib/mapjet-core.spec.ts
@@ -6,7 +6,17 @@ import { ContainerResizeObserverPlugin } from './util-plugins/container-resize-o
 import { Log } from './utils/log';
 import { ResourceLoader } from './utils/resource-loader/resource-loader';
 
-jest.mock('./util-plugins/container-resize-observer/container-resize-observer.plugin');
+jest.mock('./util-plugins/container-resize-observer/container-resize-observer.plugin', () => {
+  const originalModuleMock: any = jest.genMockFromModule('./util-plugins/container-resize-observer/container-resize-observer.plugin');
+
+  return {
+    ...originalModuleMock,
+    ContainerResizeObserverPlugin: class ContainerResizeObserverPlugin extends originalModuleMock.ContainerResizeObserverPlugin {
+      id = 'containerResizePlugin';
+    },
+  };
+});
+
 jest.mock('./utils/log');
 jest.mock('maplibre-gl', () => {
   const originalModuleMock: any = jest.genMockFromModule('maplibre-gl');
@@ -19,6 +29,7 @@ jest.mock('maplibre-gl', () => {
   };
 });
 
+
 const FakePlugin: MapJetPlugin = {
   id: '1234',
   onAdd(_mapjet) {},
@@ -46,7 +57,7 @@ describe('MapJet', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
-
+  
   it('should create MapLibre with correct default Options', () => {
     const { map } = createCore();
 
@@ -107,6 +118,13 @@ describe('MapJet', () => {
       expect(() => mapCore.addPlugin(plugin)).toThrowError(`Plugin with id ${plugin.id} already exists`);
     });
 
+    it('should throw error when provided incorrect plugin id', () => {
+      mapCore = createCore({ debug: true });
+      const plugin = { ...FakePlugin, id: undefined };
+
+      expect(() => mapCore.addPlugin(plugin)).toThrowError(`Invalid plugin id`);
+    });
+
     it('should call onAdd callback on plugin', () => {
       const plugin = { ...FakePlugin };
       jest.spyOn(plugin, 'onAdd');
@@ -174,6 +192,13 @@ describe('MapJet', () => {
       expect(() => mapCore.removePlugin(plugin)).toThrowError(`Plugin with id ${plugin.id} not exists`);
     });
 
+    it('should throw error when provided incorrect plugin id', () => {
+      mapCore = createCore({ debug: true });
+
+      expect(() => mapCore.removePlugin(null)).toThrowError(`Invalid input`);
+      expect(() => mapCore.removePlugin(undefined)).toThrowError(`Invalid input`);
+    });
+
     it('should call onRemove callback on plugin', () => {
       const plugin = { ...FakePlugin };
       jest.spyOn(plugin, 'onRemove');

diff --git a/libs/mapjet-core/src/lib/mapjet-core.ts b/libs/mapjet-core/src/lib/mapjet-core.ts
@@ -42,6 +42,10 @@ export class MapJet {
       return;
     }
 
+    if (typeof plugin.id !== 'string' && typeof plugin.id !== 'number') {
+      throw new Error(`Invalid plugin id`);
+    }
+
     if (this.hasPlugin(plugin)) {
       throw new Error(`Plugin with id ${plugin.id} already exists`);
     }
@@ -64,6 +68,10 @@ export class MapJet {
       return;
     }
 
+    if (plugin == null) {
+      throw new Error(`Invalid input`);
+    }
+
     const pluginId: string = typeof plugin === 'object' ? plugin.id : plugin;
     const pluginInstance: MapJetPlugin | undefined = this.plugins.get(pluginId);
 
@@ -121,6 +129,10 @@ export class MapJet {
   }
 
   public hasPlugin(plugin: string | MapJetPlugin): boolean {
+    if (plugin == null) {
+      return false;
+    }
+
     const pluginId: string = typeof plugin === 'object' ? plugin.id : plugin;
 
     return this.plugins.has(pluginId);