@arsedizioni/ars-utils 22.5.11 → 22.5.12

package/README.md

@@ -48,7 +48,7 @@ di vita proprio vive nel suo entry point. Importare sempre dal path specifico.
 | L2 | `ui.tinymce` | `TinymceEditorDirective`, `TinymceLoaderService`, `TinymceUtils`, `TinyMceEditorComponent`, `langs/it.js` | `tinymce` (caricato a runtime) |
 | L2 | `ui.notifications` | `NotificationsBrowserComponent` (ex `support.ui`) | - |
 | L2 | `clipper.common` | `ClipperService`, documents, login, canali e contatori non letti, interceptor auth | solo il necessario a consultare i documenti |
-| L4 | `clipper.ui` | browser, document, references, search-* e `ClipperDocumentsUtils` | `clipper.scss` |
+| L4 | `clipper.ui` | browser, document, references, search-* e `ClipperDocumentUtilsService` | `clipper.scss` |
 
 I peer dependency opzionali (`@azure/msal-*`, `tinymce`) servono
 solo a chi importa rispettivamente `ui.oauth` e `ui.tinymce`: sono dichiarati in

package/fesm2022/arsedizioni-ars-utils-clipper.ui.mjs

@@ -2,7 +2,7 @@ import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
 import * as i6 from '@angular/cdk/scrolling';
 import { ScrollDispatcher, ScrollingModule } from '@angular/cdk/scrolling';
 import * as i0 from '@angular/core';
-import { viewChild, inject, Renderer2, input, computed, ChangeDetectionStrategy, Component, output, ChangeDetectorRef, signal, runInInjectionContext, DestroyRef, Injector, model, afterNextRender, effect, untracked } from '@angular/core';
+import { viewChild, inject, Renderer2, input, computed, ChangeDetectionStrategy, Component, output, ChangeDetectorRef, signal, Service, DestroyRef, model, afterNextRender, effect, untracked } from '@angular/core';
 import { toSignal, toObservable, takeUntilDestroyed, outputToObservable } from '@angular/core/rxjs-interop';
 import * as i1$2 from '@angular/forms';
 import { FormsModule } from '@angular/forms';
@@ -958,10 +958,23 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.3", ngImpor
                 }]
         }], propDecorators: { populateContacts: [{ type: i0.Output, args: ["populateContacts"] }] } });
 
-class ClipperDocumentsUtils {
+/**
+ * Opens the Clipper document viewer.
+ *
+ * It used to be a static method taking an `Injector` and resolving its dependencies through
+ * `runInInjectionContext`. That is the escape hatch for code that cannot do DI, and both callers
+ * here are components — they were injecting an `Injector` for the sole purpose of handing it over.
+ * As a service the dependencies are resolved at field level, which also removes a trap: the
+ * asynchronous continuation after the dynamic `import()` is outside the injection context, so an
+ * `inject()` added in there would have failed at runtime.
+ */
+class ClipperDocumentUtilsService {
+    constructor() {
+        this.dialogService = inject(DialogService);
+        this.clipperService = inject(ClipperService);
+    }
     /**
      * Opens the Clipper document viewer dialog for the given document.
-     * @param injector - The Angular injector used to resolve `DialogService` and `ClipperService`.
      * @param documentId - The ID of the document to open.
      * @param query - The search query string used for term highlighting.
      * @param queryChunks - Pipe-separated highlight chunks (e.g. "|1|2|3...").
@@ -971,54 +984,67 @@ class ClipperDocumentsUtils {
      * @param canHandleTooManyResults - When `true`, the component handles oversized result sets.
      * @param replaceUrl - When provided, after the dialog closes the method calls `window.close()`
      *   if the page was opened by another window, or navigates to this URL otherwise.
+     * @returns void
      */
-    static openDocument(injector, documentId, query, queryChunks, selectionMode, selectableModules, theme, canHandleTooManyResults, replaceUrl) {
-        runInInjectionContext(injector, () => {
-            const dialogService = inject(DialogService);
-            const clipperService = inject(ClipperService);
-            if (!clipperService.loggedIn()) {
-                dialogService.error("Clipper non è disponibile in questo momento. Verifica la connessione.");
-                return;
-            }
-            if (!documentId) {
-                dialogService.error("Documento non valido.");
-                return;
-            }
-            Promise.resolve().then(function () { return document_component; }).then(({ ClipperDocumentComponent }) => {
-                const ref = dialogService.open(ClipperDocumentComponent, {
-                    ariaLabel: 'documento',
-                    autoFocus: 'dialog',
-                    restoreFocus: false,
-                    disableClose: false,
-                    data: {
-                        id: documentId,
-                        query: query,
-                        queryChunks: queryChunks,
-                        selectionMode: selectionMode,
-                        selectableModules: selectableModules,
-                        theme: theme,
-                        canHandleTooManyResults: canHandleTooManyResults
-                    },
-                    minWidth: '375px',
-                    maxWidth: '1400px',
-                    width: '100%',
-                    height: '100%'
-                });
-                if (replaceUrl && ref) {
-                    ref.beforeClosed().subscribe(() => {
-                        setTimeout(() => {
-                            if (window.opener !== null) {
-                                window.close();
-                            }
-                            else {
-                                window.location.replace(replaceUrl);
-                            }
-                        }, 500);
-                    });
-                }
+    openDocument(documentId, query, queryChunks, selectionMode, selectableModules, theme, canHandleTooManyResults, replaceUrl) {
+        if (!this.clipperService.loggedIn()) {
+            this.dialogService.error("Clipper non è disponibile in questo momento. Verifica la connessione.");
+            return;
+        }
+        if (!documentId) {
+            this.dialogService.error("Documento non valido.");
+            return;
+        }
+        // NB: `import()` here does NOT make the viewer lazy. ng-packagr flattens every file of an
+        // entry point into one FESM module, so a dynamic import of a sibling is inlined at build time
+        // (the cross-entry-point ones in `ui.application` are the ones that survive). It stays as an
+        // import() only because it keeps the module graph honest; to load the viewer on demand for
+        // real it would have to live in an entry point of its own.
+        Promise.resolve().then(function () { return document_component; }).then(({ ClipperDocumentComponent }) => {
+            const ref = this.dialogService.open(ClipperDocumentComponent, {
+                ariaLabel: 'documento',
+                autoFocus: 'dialog',
+                restoreFocus: false,
+                disableClose: false,
+                data: {
+                    id: documentId,
+                    query: query,
+                    queryChunks: queryChunks,
+                    selectionMode: selectionMode,
+                    selectableModules: selectableModules,
+                    theme: theme,
+                    canHandleTooManyResults: canHandleTooManyResults
+                },
+                minWidth: '375px',
+                maxWidth: '1400px',
+                width: '100%',
+                height: '100%'
             });
+            if (replaceUrl && ref) {
+                ref.beforeClosed().subscribe(() => {
+                    setTimeout(() => {
+                        if (window.opener !== null) {
+                            window.close();
+                        }
+                        else {
+                            window.location.replace(replaceUrl);
+                        }
+                    }, 500);
+                });
+            }
         });
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.1.3", ngImport: i0, type: ClipperDocumentUtilsService, deps: [], target: i0.ɵɵFactoryTarget.Service }); }
+    static { this.ɵprov = i0.ɵɵngDeclareService({ minVersion: "22.0.0", version: "22.1.3", ngImport: i0, type: ClipperDocumentUtilsService }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.3", ngImport: i0, type: ClipperDocumentUtilsService, decorators: [{
+            type: Service
+        }] });
+/**
+ * Pure helpers on document data. Deliberately NOT a service: there is nothing to inject, and a
+ * string function that needs an injector to be called is a function nobody can call from a test.
+ */
+class ClipperDocumentsUtils {
     /**
      * Extracts the display title from a full document title by stripping any trailing `[...]` suffix.
      * @param title - The full document title, which may contain a bracketed qualifier.
@@ -1044,7 +1070,7 @@ class ClipperSearchResultManager extends ClipperDocumentManager {
         this.destroyRef = inject(DestroyRef);
         this.changeDetector = inject(ChangeDetectorRef);
         this.breakpointObserver = inject(BreakpointObserver);
-        this.injector = inject(Injector);
+        this.documentUtils = inject(ClipperDocumentUtilsService);
         this.themeService = inject(ThemeService);
         this.screenService = inject(ScreenService);
         this.selectionMode = signal(ClipperSelectionMode.None, /* @ts-ignore */
@@ -1518,7 +1544,7 @@ class ClipperSearchResultManager extends ClipperDocumentManager {
         if (((this.filterParams.flags ?? 0) & ClipperQueryDocumentFlags.UseSemanticSearch) > 0) {
             query = '$' + query;
         }
-        ClipperDocumentsUtils.openDocument(this.injector, documentId, query, queryChunks, this.selectionMode(), undefined, this.themeService.getTheme(), this.canHandleTooManyResults());
+        this.documentUtils.openDocument(documentId, query, queryChunks, this.selectionMode(), undefined, this.themeService.getTheme(), this.canHandleTooManyResults());
     }
     ///
     // Restorable
@@ -3058,7 +3084,7 @@ class ClipperDocumentComponent extends ClipperDocumentManager {
         this.closing = output();
         this.opening = output();
         this.destroyRef = inject(DestroyRef);
-        this.injector = inject(Injector);
+        this.documentUtils = inject(ClipperDocumentUtilsService);
         this.breakpointObserver = inject(BreakpointObserver);
         this.renderer = inject(Renderer2);
         this.router = inject(Router);
@@ -3702,7 +3728,7 @@ class ClipperDocumentComponent extends ClipperDocumentManager {
         }
     }
     /**
-     * Opens a document inline via the {@link ClipperDocumentsUtils} helper.
+     * Opens a document inline via the {@link ClipperDocumentUtilsService}.
      * @param documentId - The id of the document to open.
      * @param query - Optional free-text query for highlight.
      * @param queryChunks - Optional chunk offsets for semantic highlight.
@@ -3710,7 +3736,7 @@ class ClipperDocumentComponent extends ClipperDocumentManager {
     openDocument(documentId, query, queryChunks) {
         if (!documentId)
             return;
-        ClipperDocumentsUtils.openDocument(this.injector, documentId, query, queryChunks, this.dialogData.selectionMode, this.dialogData.selectableModules, this.dialogData.theme, this.dialogData.canHandleTooManyResults);
+        this.documentUtils.openDocument(documentId, query, queryChunks, this.dialogData.selectionMode, this.dialogData.selectableModules, this.dialogData.theme, this.dialogData.canHandleTooManyResults);
     }
     /**
      * Opens the references panel for the given document.
@@ -4497,5 +4523,5 @@ var searchFreeTextQueryBuilder_component = /*#__PURE__*/Object.freeze({
  * Generated bundle index. Do not edit.
  */
 
-export { ClipperBrowserComponent, ClipperBrowserDialogComponent, ClipperDocumentComponent, ClipperDocumentIndexComponent, ClipperDocumentManager, ClipperDocumentMenuComponent, ClipperDocumentsUtils, ClipperReferencesComponent, ClipperSearchCalendarComponent, ClipperSearchFacetsComponent, ClipperSearchFreeTextHelpComponent, ClipperSearchFreeTextQueryBuilderComponent, ClipperSearchResultItemComponent, ClipperSearchResultItemDisplayMode, ClipperSearchResultManager };
+export { ClipperBrowserComponent, ClipperBrowserDialogComponent, ClipperDocumentComponent, ClipperDocumentIndexComponent, ClipperDocumentManager, ClipperDocumentMenuComponent, ClipperDocumentUtilsService, ClipperDocumentsUtils, ClipperReferencesComponent, ClipperSearchCalendarComponent, ClipperSearchFacetsComponent, ClipperSearchFreeTextHelpComponent, ClipperSearchFreeTextQueryBuilderComponent, ClipperSearchResultItemComponent, ClipperSearchResultItemDisplayMode, ClipperSearchResultManager };
 //# sourceMappingURL=arsedizioni-ars-utils-clipper.ui.mjs.map