Merge pull request #1314 from ghiscoding/bugfix/trusted-types-exports…

…-types

fix: add ms-select-vanilla missing type & improve pkg exports

package.json

@@ -50,13 +50,13 @@
   },
   "dependencies": {
     "@ngx-translate/core": ">=15.0.0 <16.0.0",
-    "@slickgrid-universal/common": "~3.5.0",
-    "@slickgrid-universal/custom-footer-component": "~3.5.0",
-    "@slickgrid-universal/empty-warning-component": "~3.5.0",
-    "@slickgrid-universal/event-pub-sub": "~3.4.0",
-    "@slickgrid-universal/pagination-component": "~3.5.0",
-    "@slickgrid-universal/row-detail-view-plugin": "~3.5.0",
-    "@slickgrid-universal/rxjs-observable": "~3.5.0",
+    "@slickgrid-universal/common": "~3.5.1",
+    "@slickgrid-universal/custom-footer-component": "~3.5.1",
+    "@slickgrid-universal/empty-warning-component": "~3.5.1",
+    "@slickgrid-universal/event-pub-sub": "~3.5.1",
+    "@slickgrid-universal/pagination-component": "~3.5.1",
+    "@slickgrid-universal/row-detail-view-plugin": "~3.5.1",
+    "@slickgrid-universal/rxjs-observable": "~3.5.1",
     "dequal": "^2.0.3",
     "dompurify": "^3.0.6",
     "rxjs": "^7.8.1",
@@ -87,12 +87,12 @@
     "@ngx-translate/http-loader": "^8.0.0",
     "@popperjs/core": "^2.11.8",
     "@release-it/conventional-changelog": "^7.0.2",
-    "@slickgrid-universal/composite-editor-component": "~3.5.0",
-    "@slickgrid-universal/custom-tooltip-plugin": "~3.5.0",
-    "@slickgrid-universal/excel-export": "~3.5.0",
-    "@slickgrid-universal/graphql": "~3.5.0",
-    "@slickgrid-universal/odata": "~3.5.0",
-    "@slickgrid-universal/text-export": "~3.5.0",
+    "@slickgrid-universal/composite-editor-component": "~3.5.1",
+    "@slickgrid-universal/custom-tooltip-plugin": "~3.5.1",
+    "@slickgrid-universal/excel-export": "~3.5.1",
+    "@slickgrid-universal/graphql": "~3.5.1",
+    "@slickgrid-universal/odata": "~3.5.1",
+    "@slickgrid-universal/text-export": "~3.5.1",
     "@types/dompurify": "^3.0.5",
     "@types/flatpickr": "^3.1.2",
     "@types/fnando__sparkline": "^0.3.7",
@@ -110,12 +110,12 @@
     "font-awesome": "^4.7.0",
     "jest": "^29.7.0",
     "jest-extended": "^4.0.2",
-    "jest-preset-angular": "^13.1.3",
+    "jest-preset-angular": "^13.1.4",
     "moment-mini": "^2.29.4",
     "ng-packagr": "^16.2.3",
     "ngx-bootstrap": "^11.0.2",
     "npm-run-all2": "^6.1.1",
-    "release-it": "^16.2.1",
+    "release-it": "^17.0.0",
     "rimraf": "^5.0.5",
     "rxjs": "^7.8.1",
     "sass": "^1.69.5",

src/app/modules/angular-slickgrid/components/__tests__/angular-slickgrid.component.spec.ts

@@ -1,9 +1,9 @@
-jest.mock('@slickgrid-universal/common/dist/commonjs/formatters/formatterUtilities');
 import 'jest-extended';
 import { ApplicationRef, ChangeDetectorRef, ElementRef } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { TranslateService, TranslateModule } from '@ngx-translate/core';
 import {
+  autoAddEditorFormatterToColumnsWithEditor,
   BackendService,
   BackendServiceApi,
   BackendUtilityService,
@@ -39,7 +39,6 @@ import {
   TreeDataService,
   SlickGroupItemMetadataProvider
 } from '@slickgrid-universal/common';
-import * as formatterUtilities from '@slickgrid-universal/common/dist/commonjs/formatters/formatterUtilities';
 import { SlickFooterComponent } from '@slickgrid-universal/custom-footer-component';
 import { EventPubSubService } from '@slickgrid-universal/event-pub-sub';
 import { SlickEmptyWarningComponent } from '@slickgrid-universal/empty-warning-component';
@@ -54,6 +53,11 @@ import { GridOption } from '../../models';
 import { MockSlickEvent, MockSlickEventHandler } from '../../../../../../test/mockSlickEvent';
 import { RxJsResourceStub } from '../../../../../../test/rxjsResourceStub';
 
+jest.mock('@slickgrid-universal/common', () => ({
+  ...(jest.requireActual('@slickgrid-universal/common') as any),
+  autoAddEditorFormatterToColumnsWithEditor: jest.fn(),
+}));
+
 declare const Slick: any;
 const slickEventHandler = new MockSlickEventHandler();
 jest.mock('flatpickr', () => { });
@@ -538,7 +542,7 @@ describe('Angular-Slickgrid Custom Component instantiated via Constructor', () =
         component.ngAfterViewInit();
 
         expect(component).toBeTruthy();
-        // expect(formatterUtilities.autoAddEditorFormatterToColumnsWithEditor).toHaveBeenCalledWith([{ id: 'name', field: 'name', editor: undefined, internalColumnEditor: {} }], customEditableInputFormatter);
+        expect(autoAddEditorFormatterToColumnsWithEditor).toHaveBeenCalledWith([{ id: 'name', field: 'name', editor: undefined, internalColumnEditor: {} }], customEditableInputFormatter);
       });
     });
 
@@ -565,7 +569,6 @@ describe('Angular-Slickgrid Custom Component instantiated via Constructor', () =
         const autosizeSpy = jest.spyOn(mockGrid, 'autosizeColumns');
         const updateSpy = jest.spyOn(component, 'updateColumnDefinitionsList');
         const renderSpy = jest.spyOn(extensionServiceStub, 'renderColumnHeaders');
-        const autoAddFormatterSpy = jest.spyOn(formatterUtilities, 'autoAddEditorFormatterToColumnsWithEditor');
         const mockColDefs = [{ id: 'name', field: 'name', editor: undefined, internalColumnEditor: {} }];
 
         component.ngAfterViewInit();
@@ -577,7 +580,7 @@ describe('Angular-Slickgrid Custom Component instantiated via Constructor', () =
         expect(autosizeSpy).toHaveBeenCalled();
         expect(updateSpy).toHaveBeenCalledWith(mockColDefs);
         expect(renderSpy).toHaveBeenCalledWith(mockColDefs, true);
-        // expect(autoAddFormatterSpy).toHaveBeenCalledWith([{ id: 'name', field: 'name', editor: undefined, internalColumnEditor: {} }], customEditableInputFormatter);
+        expect(autoAddEditorFormatterToColumnsWithEditor).toHaveBeenCalledWith([{ id: 'name', field: 'name', editor: undefined, internalColumnEditor: {} }], customEditableInputFormatter);
       });
     });
 

src/app/modules/angular-slickgrid/extensions/__tests__/slickRowDetailView.spec.ts

@@ -1,7 +1,6 @@
 import { ApplicationRef, Component } from '@angular/core';
-import { Column, OnSelectedRowsChangedEventArgs, SharedService, SlickEventHandler, SlickGrid, SlickNamespace, } from '@slickgrid-universal/common';
+import { Column, OnSelectedRowsChangedEventArgs, SharedService, SlickEventHandler, SlickGrid, SlickNamespace, SlickRowSelectionModel, } from '@slickgrid-universal/common';
 import { EventPubSubService } from '@slickgrid-universal/event-pub-sub';
-import { SlickRowSelectionModel } from '@slickgrid-universal/common/dist/commonjs/extensions/slickRowSelectionModel';
 import { of } from 'rxjs';
 
 import { GridOption } from '../../models/gridOption.interface';
@@ -11,6 +10,21 @@ import { RxJsResourceStub } from '../../../../../../test/rxjsResourceStub';
 import { SlickRowDetailView } from '../slickRowDetailView';
 jest.mock('@slickgrid-universal/row-detail-view-plugin');
 
+jest.mock('@slickgrid-universal/common', () => ({
+  ...(jest.requireActual('@slickgrid-universal/common') as any),
+  SlickRowSelectionModel: jest.fn().mockImplementation(() => ({
+    constructor: jest.fn(),
+    init: jest.fn(),
+    destroy: jest.fn(),
+    dispose: jest.fn(),
+    getSelectedRows: jest.fn(),
+    setSelectedRows: jest.fn(),
+    getSelectedRanges: jest.fn(),
+    setSelectedRanges: jest.fn(),
+    onSelectedRangesChanged: new Slick.Event(),
+  })),
+}));
+
 declare const Slick: SlickNamespace;
 const ROW_DETAIL_CONTAINER_PREFIX = 'container_';
 const PRELOAD_CONTAINER_PREFIX = 'container_loading';
@@ -67,22 +81,6 @@ const gridStub = {
   onSort: new Slick.Event(),
 } as unknown as SlickGrid;
 
-const mockRowSelectionModel = {
-  constructor: jest.fn(),
-  init: jest.fn(),
-  destroy: jest.fn(),
-  dispose: jest.fn(),
-  getSelectedRows: jest.fn(),
-  setSelectedRows: jest.fn(),
-  getSelectedRanges: jest.fn(),
-  setSelectedRanges: jest.fn(),
-  onSelectedRangesChanged: new Slick.Event(),
-} as unknown as SlickRowSelectionModel;
-
-jest.mock('@slickgrid-universal/common/dist/commonjs/extensions/slickRowSelectionModel', () => ({
-  SlickRowSelectionModel: jest.fn().mockImplementation(() => mockRowSelectionModel),
-}));
-
 @Component({ template: `<h4>Loading...</h4>` })
 class TestPreloadComponent { }