@wavemaker/app-ng-runtime 11.5.0-next.141081 → 11.5.0-next.141083

app-ng-runtime/runtime/base/fesm2020/index.mjs

@@ -21,6 +21,7 @@ import * as i1$5 from '@angular/common/http';
 import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
 import * as i1$4 from '@angular/platform-browser';
 import { ɵDomSharedStylesHost, ɵDomRendererFactory2 } from '@angular/platform-browser';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import * as i1$3 from 'ngx-toastr';
 import { Toast, ToastrModule } from 'ngx-toastr';
 import { DialogModule } from '@wm/components/dialogs';
@@ -711,12 +712,12 @@ class BasePartialComponent extends FragmentMonitor {
         return this.containerWidget.inj || this.containerWidget.injector;
     }
     init() {
-        this.App = inject(App);
+        this.App = this.injector ? this.injector.get(App) : inject(App);
         //making the code compatible in both the JIT and AOT modes
         this.containerWidget = this.injector ? this.injector.get(WidgetRef) : inject(WidgetRef);
-        this.i18nService = inject(AbstractI18nService);
-        this.scriptLoaderService = inject(ScriptLoaderService);
-        this.Viewport = inject(Viewport);
+        this.i18nService = this.injector ? this.injector.get(AbstractI18nService) : inject(AbstractI18nService);
+        this.scriptLoaderService = this.injector ? this.injector.get(ScriptLoaderService) : inject(ScriptLoaderService);
+        this.Viewport = this.injector ? this.injector.get(Viewport) : inject(Viewport);
         // this.viewContainerRef = this.getContainerWidgetInjector().get(ViewContainerRef);
         // Replacing this.getContainerWidgetInjector().view.component as viewParent
         // this.viewParent = (this.viewContainerRef as any).parentInjector._lView[8];
@@ -736,10 +737,10 @@ class BasePartialComponent extends FragmentMonitor {
             this.pageParams = this.containerWidget.partialParams;
         });
         if (this.spa) {
-            this.pageDirective = inject(SpaPageDirective);
+            this.pageDirective = this.injector ? this.injector.get(SpaPageDirective) : inject(SpaPageDirective);
         }
         else {
-            this.pageDirective = inject(PageDirective);
+            this.pageDirective = this.injector ? this.injector.get(PageDirective) : inject(PageDirective);
         }
         if (this.pageDirective) {
             this.registerDestroyListener(this.pageDirective.subscribe('attach', data => this.ngOnAttach(data.refreshData)));
@@ -771,14 +772,14 @@ class BasePartialComponent extends FragmentMonitor {
                     this.Prefab = this.viewParent;
                 }
             }
-            this.evalUserScript(this, this.App, inject(UtilsService));
+            this.evalUserScript(this, this.App, this.injector ? this.injector.get(UtilsService) : inject(UtilsService));
         }
         catch (e) {
             console.error(`Error in evaluating partial (${this.partialName}) script\n`, e);
         }
     }
     initVariables() {
-        const variablesService = inject(VariablesService);
+        const variablesService = this.injector ? this.injector.get(VariablesService) : inject(VariablesService);
         // get variables and actions instances for the page
         const variableCollection = variablesService.register(this.partialName, this.getVariables(), this);
         // create namespace for Variables nad Actions on page/partial, which inherits the Variables and Actions from App instance
@@ -1077,14 +1078,14 @@ class BasePageComponent extends FragmentMonitor {
     }
     init() {
         muteWatchers();
-        this.App = inject(App);
-        this.route = inject(ActivatedRoute);
-        this.appManager = inject(AppManagerService);
-        this.navigationService = inject(AbstractNavigationService);
-        this.scriptLoaderService = inject(ScriptLoaderService);
-        this.i18nService = inject(AbstractI18nService);
-        this.router = inject(Router);
-        this.Viewport = inject(Viewport);
+        this.App = this.injector ? this.injector.get(App) : inject(App);
+        this.route = this.injector ? this.injector.get(ActivatedRoute) : inject(ActivatedRoute);
+        this.appManager = this.injector ? this.injector.get(AppManagerService) : inject(AppManagerService);
+        this.navigationService = this.injector ? this.injector.get(AbstractNavigationService) : inject(AbstractNavigationService);
+        this.scriptLoaderService = this.injector ? this.injector.get(ScriptLoaderService) : inject(ScriptLoaderService);
+        this.i18nService = this.injector ? this.injector.get(AbstractI18nService) : inject(AbstractI18nService);
+        this.router = this.injector ? this.injector.get(Router) : inject(Router);
+        this.Viewport = this.injector ? this.injector.get(Viewport) : inject(Viewport);
         // register functions for binding evaluation
         this.registerExpressions();
         this.initUserScript();
@@ -1106,7 +1107,7 @@ class BasePageComponent extends FragmentMonitor {
     }
     initUserScript() {
         try {
-            this.evalUserScript(this, this.App, inject(UtilsService));
+            this.evalUserScript(this, this.App, this.injector ? this.injector.get(UtilsService) : inject(UtilsService));
         }
         catch (e) {
             console.error(`Error in evaluating page (${this.pageName}) script\n`, e);
@@ -1123,7 +1124,7 @@ class BasePageComponent extends FragmentMonitor {
         this.appLocale = this.i18nService.getAppLocale();
     }
     initVariables() {
-        const variablesService = inject(VariablesService);
+        const variablesService = this.injector ? this.injector.get(VariablesService) : inject(VariablesService);
         // get variables and actions instances for the page
         const variableCollection = variablesService.register(this.pageName, this.getVariables(), this);
         // create namespace for Variables nad Actions on page/partial, which inherits the Variables and Actions from App instance
@@ -1411,20 +1412,19 @@ class BasePrefabComponent extends FragmentMonitor {
         this.App = this.injector.get(App);
         //making the code compatible in both the JIT and AOT modes
         this.containerWidget = this.injector ? this.injector.get(WidgetRef) : inject(WidgetRef);
-        ;
-        this.prefabMngr = inject(PrefabManagerService);
-        this.i18nService = inject(AbstractI18nService);
-        this.scriptLoaderService = inject(ScriptLoaderService);
-        this.Viewport = inject(Viewport);
+        this.prefabMngr = this.injector ? this.injector.get(PrefabManagerService) : inject(PrefabManagerService);
+        this.i18nService = this.injector ? this.injector.get(AbstractI18nService) : inject(AbstractI18nService);
+        this.scriptLoaderService = this.injector ? this.injector.get(ScriptLoaderService) : inject(ScriptLoaderService);
+        this.Viewport = this.injector ? this.injector.get(Viewport) : inject(Viewport);
         this.viewParent = this.containerWidget.viewParent;
         if (this.viewParent.registerFragment) {
             this.viewParent.registerFragment();
         }
         if (this.spa) {
-            this.pageDirective = inject(SpaPageDirective);
+            this.pageDirective = this.injector ? this.injector.get(SpaPageDirective) : inject(SpaPageDirective);
         }
         else {
-            this.pageDirective = inject(PageDirective);
+            this.pageDirective = this.injector ? this.injector.get(PageDirective) : inject(PageDirective);
         }
         if (this.pageDirective) {
             this.registerDestroyListener(this.pageDirective.subscribe('attach', data => this.ngOnAttach(data.refreshData)));
@@ -1701,15 +1701,15 @@ class BaseSpaPageComponent extends FragmentMonitor {
     }
     init() {
         muteWatchers();
-        this.App = inject(App);
-        this.route = inject(ActivatedRoute);
-        this.appManager = inject(AppManagerService);
-        this.navigationService = inject(AbstractNavigationService);
-        this.scriptLoaderService = inject(ScriptLoaderService);
-        this.i18nService = inject(AbstractI18nService);
-        this.router = inject(Router);
-        this.Viewport = inject(Viewport);
-        this.layoutDirective = inject(LayoutDirective);
+        this.App = this.injector ? this.injector.get(App) : inject(App);
+        this.route = this.injector ? this.injector.get(ActivatedRoute) : inject(ActivatedRoute);
+        this.appManager = this.injector ? this.injector.get(AppManagerService) : inject(AppManagerService);
+        this.navigationService = this.injector ? this.injector.get(AbstractNavigationService) : inject(AbstractNavigationService);
+        this.scriptLoaderService = this.injector ? this.injector.get(ScriptLoaderService) : inject(ScriptLoaderService);
+        this.i18nService = this.injector ? this.injector.get(AbstractI18nService) : inject(AbstractI18nService);
+        this.router = this.injector ? this.injector.get(Router) : inject(Router);
+        this.Viewport = this.injector ? this.injector.get(Viewport) : inject(Viewport);
+        this.layoutDirective = this.injector ? this.injector.get(LayoutDirective) : inject(LayoutDirective);
         // register functions for binding evaluation
         this.registerExpressions();
         this.initUserScript();
@@ -1731,7 +1731,7 @@ class BaseSpaPageComponent extends FragmentMonitor {
     }
     initUserScript() {
         try {
-            this.evalUserScript(this, this.App, inject(UtilsService));
+            this.evalUserScript(this, this.App, this.injector ? this.injector.get(UtilsService) : inject(UtilsService));
         }
         catch (e) {
             console.error(`Error in evaluating page (${this.pageName}) script\n`, e);
@@ -1748,7 +1748,7 @@ class BaseSpaPageComponent extends FragmentMonitor {
         this.appLocale = this.i18nService.getAppLocale();
     }
     initVariables() {
-        const variablesService = inject(VariablesService);
+        const variablesService = this.injector ? this.injector.get(VariablesService) : inject(VariablesService);
         // get variables and actions instances for the page
         const variableCollection = variablesService.register(this.pageName, this.getVariables(), this);
         // create namespace for Variables nad Actions on page/partial, which inherits the Variables and Actions from App instance
@@ -3999,11 +3999,9 @@ initComponentsBuildTask();
 const componentFactoryRefCache = new Map();
 const getDynamicModule = (componentRef) => {
     return NgModule({
-        declarations: [
-            componentRef
-        ],
+        declarations: [componentRef],
         imports: [
-            RuntimeBaseModule
+            RuntimeBaseModule,
         ],
         schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA]
     })(class DynamicModule {
@@ -4011,14 +4009,13 @@ const getDynamicModule = (componentRef) => {
 };
 const getDynamicComponent = (selector, template, css = '') => {
     // @ts-ignore
-    const component = Component({
+    return Component({
         template,
         styles: [css],
         encapsulation: ViewEncapsulation.None,
         selector
     })(class DynamicComponent {
     });
-    return component;
 };
 class DynamicComponentRefProviderService {
     constructor(app, appManager, compiler) {
@@ -4630,7 +4627,8 @@ const REQUIRED_MODULES_FOR_DYNAMIC_COMPONENTS = [
     HeaderModule,
     LeftPanelModule,
     RightPanelModule,
-    TopNavModule
+    TopNavModule,
+    PrefabModule
 ];
 // setting parseExpr as exprEvaluator for swipeAnimation
 $.fn.swipeAnimation.expressionEvaluator = $parseExpr;
@@ -4737,16 +4735,21 @@ RuntimeBaseModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [
     ], imports: [CommonModule,
         RouterModule,
         HttpClientModule,
+        FormsModule,
+        ReactiveFormsModule,
         ToastrModule,
         WmComponentsModule,
-        PrefabModule,
         MobileRuntimeModule,
         CoreModule,
         SecurityModule,
         OAuthModule,
         VariablesModule,
-        HttpServiceModule,
-        REQUIRED_MODULES_FOR_DYNAMIC_COMPONENTS, CommonModule,
+        HttpServiceModule, REQUIRED_MODULES_FOR_DYNAMIC_COMPONENTS, FormsModule,
+        ReactiveFormsModule,
+        CommonModule,
+        RouterModule,
+        HttpClientModule,
+        ToastrModule,
         WmComponentsModule,
         MobileRuntimeModule,
         CoreModule,
@@ -4819,29 +4822,36 @@ RuntimeBaseModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [
         HeaderModule,
         LeftPanelModule,
         RightPanelModule,
-        TopNavModule] });
+        TopNavModule,
+        PrefabModule] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(RuntimeBaseModule, [{
         type: NgModule,
         args: [{
-                declarations: definitions,
+                declarations: [...definitions],
                 imports: [
                     CommonModule,
                     RouterModule,
                     HttpClientModule,
+                    FormsModule,
+                    ReactiveFormsModule,
                     ToastrModule,
                     WmComponentsModule,
-                    PrefabModule,
                     MobileRuntimeModule,
                     CoreModule,
                     SecurityModule,
                     OAuthModule,
                     VariablesModule,
                     HttpServiceModule,
-                    REQUIRED_MODULES_FOR_DYNAMIC_COMPONENTS
+                    ...REQUIRED_MODULES_FOR_DYNAMIC_COMPONENTS
                 ],
                 exports: [
-                    definitions,
+                    FormsModule,
+                    ReactiveFormsModule,
+                    ...definitions,
                     CommonModule,
+                    RouterModule,
+                    HttpClientModule,
+                    ToastrModule,
                     WmComponentsModule,
                     MobileRuntimeModule,
                     CoreModule,
@@ -4849,7 +4859,7 @@ RuntimeBaseModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [
                     OAuthModule,
                     VariablesModule,
                     HttpServiceModule,
-                    REQUIRED_MODULES_FOR_DYNAMIC_COMPONENTS
+                    ...REQUIRED_MODULES_FOR_DYNAMIC_COMPONENTS
                 ],
                 providers: [
                     { provide: ɵDomSharedStylesHost, useClass: WMDomSharedStylesHost },
@@ -4866,9 +4876,10 @@ RuntimeBaseModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [
         EmptyPageComponent], imports: [CommonModule,
         RouterModule,
         HttpClientModule,
+        FormsModule,
+        ReactiveFormsModule,
         ToastrModule,
         WmComponentsModule,
-        PrefabModule,
         MobileRuntimeModule,
         CoreModule,
         SecurityModule,
@@ -4940,13 +4951,18 @@ RuntimeBaseModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [
         HeaderModule,
         LeftPanelModule,
         RightPanelModule,
-        TopNavModule], exports: [AccessrolesDirective,
+        TopNavModule,
+        PrefabModule], exports: [FormsModule,
+        ReactiveFormsModule, AccessrolesDirective,
         AppSpinnerComponent,
         CustomToasterComponent,
         PrefabDirective,
         AppComponent,
         PrefabPreviewComponent,
         EmptyPageComponent, CommonModule,
+        RouterModule,
+        HttpClientModule,
+        ToastrModule,
         WmComponentsModule,
         MobileRuntimeModule,
         CoreModule,
@@ -5019,7 +5035,8 @@ RuntimeBaseModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [
         HeaderModule,
         LeftPanelModule,
         RightPanelModule,
-        TopNavModule] }); })();
+        TopNavModule,
+        PrefabModule] }); })();
 const WM_MODULES_FOR_ROOT = [
     WmComponentsModule.forRoot(),
     MobileRuntimeModule.forRoot(),