@wavemaker/angular-codegen 11.10.0-next.24983 → 11.10.0-next.25079

package/angular-app/src/framework/services/customwidget-config-provider.service.ts

@@ -0,0 +1,13 @@
+import { Injectable } from '@angular/core';
+
+import { CustomwidgetConfigProvider } from '@wm/runtime/base';
+
+import { getCustomWidgetConfig } from '../util/page-util';
+
+@Injectable()
+export class CustomwidgetConfigProviderService extends CustomwidgetConfigProvider {
+
+    public getConfig(widgetname: string): Promise<any> {
+        return Promise.resolve(getCustomWidgetConfig(widgetname));
+    }
+}

package/angular-app/src/framework/util/page-util.ts

@@ -0,0 +1,7 @@
+const prefabConfigs = new Map<string, any>();
+const customWidgetConfigs = new Map<string, any>();
+
+export const registerPrefabConfig = (prefabName: string, config: any) => prefabConfigs.set(prefabName, config);
+export const getPrefabConfig = prefabName => prefabConfigs.get(prefabName);
+export const registerCustomWidgetConfig = (customWidget: string, config: any) => customWidgetConfigs.set(customWidget, config);
+export const getCustomWidgetConfig = customWidget => customWidgetConfigs.get(customWidget);

package/angular-app/src/main.ts

@@ -0,0 +1,67 @@
+import { ApplicationRef, enableProdMode, NgModuleRef } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app/app.module';
+import { environment } from './environments/environment';
+
+import initWmProjectProperties from './app/wm-project-properties';
+import { WMAppProperties } from './app/wmProperties';
+import * as fontConfig from './font.config';
+
+
+let formatAcceptHeader = (languages: any) => {
+  let result: string[] = [];
+  let addedLanguages = new Set<string>(); // To track already added languages
+  let qValue = 1.0;
+
+  languages.forEach((lang: any) => {
+    if (!addedLanguages.has(lang)) {
+      // Add the full language (e.g., en-US or en) if not already added
+      result.push(`${lang}${qValue === 1.0 ? '' : `;q=${qValue.toFixed(1)}`}`);
+      addedLanguages.add(lang);
+      // Decrease qValue for the next language
+      qValue = Math.max(0.1, qValue - 0.1); // Decrease qValue, minimum is 0.1
+    }
+
+    // If language has a region code (e.g., en-US), also add the base language (e.g., en)
+    if (lang.includes('-')) {
+      const baseLang = lang.split('-')[0];
+      if (!addedLanguages.has(baseLang)) {
+        result.push(`${baseLang};q=${qValue.toFixed(1)}`);
+        addedLanguages.add(baseLang);
+
+        // Decrease qValue for the next language
+        qValue = Math.max(0.1, qValue - 0.1);
+      }
+    }
+  });
+
+  return result.join(',');
+}
+WMAppProperties['preferredLanguage'] = formatAcceptHeader(navigator.languages);
+WMAppProperties['fontConfig'] = fontConfig;
+
+
+(window as any)._WM_APP_PROPERTIES  = WMAppProperties
+initWmProjectProperties();
+
+if (environment.production) {
+    enableProdMode();
+}
+
+document.addEventListener('DOMContentLoaded', () => {
+    new Promise<Event | void>( resolve => {
+        if (window['cordova']) {
+            document.addEventListener('deviceready', resolve);
+        } else {
+            resolve();
+        }
+    }).then(() => platformBrowserDynamic().bootstrapModule(AppModule))
+        .then((appModuleRef: NgModuleRef<AppModule>) => {
+            const applicationRef = appModuleRef.injector.get(ApplicationRef);
+            window.addEventListener('unload', () => {
+                applicationRef.components.map(c => c && c.destroy());
+            });
+            console.timeEnd('bootstrap'), err => console.log(err);
+        }, err => console.log(err));
+});

{angular-codegen → package}/angular-app/tsconfig.json

@@ -41,6 +41,9 @@
             "@wavemaker/variables": [
                 "node_modules/@wavemaker/variables/"
             ],
+            "@wavemaker/custom-widgets-m3": [
+                "node_modules/@wavemaker/custom-widgets-m3/"
+            ],
             "@wm/components/base": [
                 "node_modules/@wavemaker/app-ng-runtime/components/base"
             ],

{angular-codegen → package}/build-angular-app.js

@@ -17,6 +17,9 @@ const { downloadNPMPackage } = require('./download-packages');
 const archiver = require('archiver');
 const path = require("path");
 const { executeSyncCmd,  MSG_NG_RUNTIME_LOG, MSG_NG_RUNTIME_SUCCESS } = require('./build-util');
+const os = require("os");
+
+const NPM_PACKAGE_SCOPE = '@wavemaker';
 
 /**
  * @TODO: This is a temporary workaround to extract deploy-url from 'ngBuildParams', need to be replaced in future.
@@ -44,24 +47,42 @@ const updateDeployUrl = (args) => {
  * Run the ng build and post build for the project
  */
 const buildAngularApp = (args) => {
+    const HOME_DIR = os.homedir(), ANGULAR_APP_TEMPLATE_NAME = "angular-app";
+    const TARBALL_DOWNLOAD_PATH = (HOME_DIR + '/.wm/node_modules') + '/' + ANGULAR_APP_TEMPLATE_NAME + '/' + args.runtimeUIVersion;
+    const PACKAGE_NAME = NPM_PACKAGE_SCOPE + '/' + ANGULAR_APP_TEMPLATE_NAME + '@' + args.runtimeUIVersion;
+    const TARBALL_NAME = 'wavemaker' + '-' + ANGULAR_APP_TEMPLATE_NAME + '-' + args.runtimeUIVersion + '.tgz';
+
+    fs.mkdirSync(TARBALL_DOWNLOAD_PATH, { recursive: true });
+    //npm pack will download the given package as a tar file
+    executeSyncCmd('cd ' + TARBALL_DOWNLOAD_PATH + ` && npm pack ${PACKAGE_NAME}`, null, `Downloading tarball - ${PACKAGE_NAME} to the location - ${TARBALL_DOWNLOAD_PATH}`);
+    executeSyncCmd('cd ' + TARBALL_DOWNLOAD_PATH + ` && tar -xvf ${TARBALL_NAME}`, null, `Unzipping the tarball - ${TARBALL_NAME}`);
+
     let packageInfo = {
-        name: 'app-ng-runtime',
+        scope: NPM_PACKAGE_SCOPE,
+        name: ANGULAR_APP_TEMPLATE_NAME,
         version: args.runtimeUIVersion,
-        packageJsonFile: args.codegenPath + '/angular-app/package.json',
+        packageJsonFile: `${TARBALL_DOWNLOAD_PATH}/package/package.json`,
+        packageJsonLockFile: `${TARBALL_DOWNLOAD_PATH}/package/package-lock.json`,
         successMsg: MSG_NG_RUNTIME_SUCCESS,
         infoMsg: MSG_NG_RUNTIME_LOG
-
     }
 
     try {
-        // Symlink to reuse the existing node_modules
         if (args.optimizeUIBuild) {
-            // Download app-ng-runtime node modules
-            let pathNGRuntimePackage = downloadNPMPackage(packageInfo);
-            fs.symlinkSync(pathNGRuntimePackage + '/node_modules', args.appTarget + '/node_modules', 'dir');
+            fs.copyFileSync(TARBALL_DOWNLOAD_PATH + `/package/package.json`, TARBALL_DOWNLOAD_PATH + '/package.json');
+            fs.copyFileSync(TARBALL_DOWNLOAD_PATH + `/package/package-lock.json`, TARBALL_DOWNLOAD_PATH + '/package-lock.json');
+            fs.copyFileSync(TARBALL_DOWNLOAD_PATH + `/package/.npmrc`, TARBALL_DOWNLOAD_PATH + '/.npmrc');
+
+            // Download angular-app node_modules
+            executeSyncCmd('cd ' + TARBALL_DOWNLOAD_PATH + ' && npm install --prefix ' + TARBALL_DOWNLOAD_PATH, null, "Installing app dependencies...");
+
+            // Symlink to reuse the existing node_modules
+            fs.symlinkSync(TARBALL_DOWNLOAD_PATH + `/node_modules`, args.appTarget + '/node_modules', 'dir');
         } else {
-            fs.copyFileSync(packageInfo.packageJsonFile, args.appTarget + '/package.json');
-            executeSyncCmd('cd ' + args.appTarget + ' && npm install', null, MSG_NG_RUNTIME_LOG);
+            fs.copyFileSync(TARBALL_DOWNLOAD_PATH + `/package/package/package.json`, args.appTarget + '/package.json');
+            fs.copyFileSync(TARBALL_DOWNLOAD_PATH + `/package/package-lock.json`, args.appTarget + '/package-lock.json');
+            fs.copyFileSync(TARBALL_DOWNLOAD_PATH + `/package/.npmrc`, args.appTarget + '/.npmrc');
+            executeSyncCmd('cd ' + args.appTarget + ` && npm install `, null, MSG_NG_RUNTIME_LOG);
         }
     } catch (err) {
         console.log(MSG_NG_RUNTIME_LOG + 'FAILED the symlink for the node_modules', err);