underpost 2.95.3 → 2.95.8

package/src/cli/static.js

@@ -2,55 +2,6 @@
  * Static site generation module with enhanced customization capabilities
  * @module src/cli/static.js
  * @namespace UnderpostStatic
- *
- * @example
- * // Basic usage - generate a simple page
- * import UnderpostStatic from './static.js';
- *
- * await UnderpostStatic.API.callback({
- *   page: './src/client/ssr/body/DefaultSplashScreen.js',
- *   title: 'My App',
- *   outputPath: './dist/index.html'
- * });
- *
- * @example
- * // Advanced usage - full customization
- * await UnderpostStatic.API.callback({
- *   page: './src/client/ssr/body/CustomPage.js',
- *   outputPath: './dist/custom.html',
- *   metadata: {
- *     title: 'My Custom Page',
- *     description: 'A fully customized static page',
- *     keywords: ['static', 'generator', 'custom'],
- *     author: 'John Doe',
- *     themeColor: '#007bff',
- *     canonicalURL: 'https://example.com/custom',
- *     thumbnail: 'https://example.com/thumb.png'
- *   },
- *   scripts: {
- *     head: [
- *       { src: '/vendor/library.js', async: true },
- *       { content: 'console.log("Inline script");', type: 'module' }
- *     ],
- *     body: [
- *       { src: '/app.js', defer: true }
- *     ]
- *   },
- *   styles: [
- *     { href: '/custom.css' },
- *     { content: 'body { margin: 0; }' }
- *   ],
- *   headComponents: [
- *     './src/client/ssr/head/Seo.js',
- *     './src/client/ssr/head/Pwa.js'
- *   ],
- *   icons: {
- *     favicon: '/custom-favicon.ico',
- *     appleTouchIcon: '/apple-touch-icon.png'
- *   },
- *   env: 'production',
- *   minify: true
- * });
  */
 
 import fs from 'fs-extra';
@@ -140,6 +91,31 @@ const logger = loggerFactory(import.meta);
  * @property {Object} [microdata=[]] - Structured data (JSON-LD)
  */
 
+const DefaultStaticGenerationOptions = {
+  page: '',
+  title: '',
+  outputPath: '',
+  deployId: '',
+  buildHost: '',
+  buildPath: '/',
+  env: 'production',
+  build: false,
+  dev: false,
+  minify: true,
+  metadata: {},
+  scripts: {},
+  styles: [],
+  headComponents: [],
+  bodyComponents: [],
+  icons: {},
+  customPayload: {},
+  templateHelpers: {},
+  configFile: '',
+  lang: 'en',
+  dir: 'ltr',
+  microdata: [],
+};
+
 /**
  * Template helper functions for common SSR patterns
  * @namespace TemplateHelpers
@@ -150,19 +126,6 @@ const TemplateHelpers = {
    * @param {ScriptOptions} options - Script options
    * @returns {string} HTML script tag
    * @memberof TemplateHelpers
-   *
-   * @example
-   * // External script with async
-   * TemplateHelpers.createScriptTag({ src: '/app.js', async: true })
-   * // Returns: <script async src="/app.js"></script>
-   *
-   * @example
-   * // Inline module script
-   * TemplateHelpers.createScriptTag({
-   *   content: 'console.log("Hello");',
-   *   type: 'module'
-   * })
-   * // Returns: <script type="module">console.log("Hello");</script>
    */
   createScriptTag(options) {
     const attrs = [];
@@ -194,16 +157,6 @@ const TemplateHelpers = {
    * @param {StyleOptions} options - Style options
    * @returns {string} HTML link or style tag
    * @memberof TemplateHelpers
-   *
-   * @example
-   * // External stylesheet
-   * TemplateHelpers.createStyleTag({ href: '/styles.css' })
-   * // Returns: <link rel="stylesheet" href="/styles.css" media="all">
-   *
-   * @example
-   * // Inline styles
-   * TemplateHelpers.createStyleTag({ content: 'body { margin: 0; }' })
-   * // Returns: <style>body { margin: 0; }</style>
    */
   createStyleTag(options) {
     if (options.content) {
@@ -224,13 +177,6 @@ const TemplateHelpers = {
    * @param {IconOptions} icons - Icon options
    * @returns {string} HTML icon link tags
    * @memberof TemplateHelpers
-   *
-   * @example
-   * TemplateHelpers.createIconTags({
-   *   favicon: '/favicon.ico',
-   *   appleTouchIcon: '/apple-touch-icon.png',
-   *   manifest: '/manifest.json'
-   * })
    */
   createIconTags(icons) {
     const tags = [];
@@ -261,13 +207,6 @@ const TemplateHelpers = {
    * @param {MetadataOptions} metadata - Metadata options
    * @returns {string} HTML meta tags
    * @memberof TemplateHelpers
-   *
-   * @example
-   * TemplateHelpers.createMetaTags({
-   *   description: 'My page description',
-   *   keywords: ['web', 'app'],
-   *   author: 'John Doe'
-   * })
    */
   createMetaTags(metadata) {
     const tags = [];
@@ -329,16 +268,6 @@ const TemplateHelpers = {
    * @param {Object[]} microdata - Array of structured data objects
    * @returns {string} HTML script tags with JSON-LD
    * @memberof TemplateHelpers
-   *
-   * @example
-   * TemplateHelpers.createMicrodataTags([
-   *   {
-   *     '@context': 'https://schema.org',
-   *     '@type': 'WebSite',
-   *     'name': 'My Site',
-   *     'url': 'https://example.com'
-   *   }
-   * ])
    */
   createMicrodataTags(microdata) {
     if (!microdata || !Array.isArray(microdata) || microdata.length === 0) {
@@ -410,19 +339,6 @@ const ConfigLoader = {
    * @param {string} configPath - Path to config file
    * @returns {Object} Configuration object
    * @memberof ConfigLoader
-   *
-   * @example
-   * // static-config.json
-   * {
-   *   "metadata": {
-   *     "title": "My App",
-   *     "description": "My application description"
-   *   },
-   *   "env": "production"
-   * }
-   *
-   * // Usage
-   * const config = ConfigLoader.load('./static-config.json');
    */
   load(configPath) {
     try {
@@ -466,90 +382,83 @@ class UnderpostStatic {
      * Generate static HTML file with enhanced customization options
      *
      * @param {StaticGenerationOptions} options - Options for static generation
+     * @param {string} [options.page] - Path to the SSR component to render
+     * @param {string} [options.title] - Page title (deprecated: use metadata.title)
+     * @param {string} [options.outputPath] - Output file path
+     * @param {string} [options.deployId] - Deployment identifier
+     * @param {string} [options.buildHost] - Build host URL
+     * @param {string} [options.buildPath='/'] - Build path
+     * @param {string} [options.env='production'] - Environment (development/production)
+     * @param {boolean} [options.build=false] - Whether to trigger build
+     * @param {boolean} [options.minify=true] - Minify HTML output
+     * @param {MetadataOptions} [options.metadata={}] - Comprehensive metadata options
+     * @param {Object} [options.scripts={}] - Script injection options
+     * @param {ScriptOptions[]} [options.scripts.head=[]] - Scripts for
+     * head section
+     * @param {ScriptOptions[]} [options.scripts.body=[]] - Scripts for body section
+     * @param {StyleOptions[]} [options.styles=[]] - Stylesheet options
+     * @param {string[]} [options.headComponents=[]] - Array of SSR head component paths
+     * @param {string[]} [options.bodyComponents=[]] - Array of SSR body component paths
+     * @param {IconOptions} [options.icons={}] - Icon configuration
+     * @param {Object} [options.customPayload={}] - Custom data to inject into renderPayload
+     * @param {string} [options.configFile=''] - Path to JSON config file
+     * @param {string} [options.lang='en'] - HTML lang attribute
+     * @param {string} [options.dir='ltr'] - HTML dir attribute
+     * @param {Object} [options.microdata=[]] - Structured data (JSON-LD)
      * @returns {Promise<void>}
      * @memberof UnderpostStatic
-     *
-     * @example
-     * // Minimal usage
-     * await UnderpostStatic.API.callback({
-     *   page: './src/client/ssr/body/DefaultSplashScreen.js',
-     *   outputPath: './dist/index.html'
-     * });
-     *
-     * @example
-     * // Full customization with metadata and scripts
-     * await UnderpostStatic.API.callback({
-     *   page: './src/client/ssr/body/CustomPage.js',
-     *   outputPath: './dist/page.html',
-     *   metadata: {
-     *     title: 'My Custom Page',
-     *     description: 'A fully customized page',
-     *     keywords: ['custom', 'static', 'page'],
-     *     author: 'Jane Developer',
-     *     themeColor: '#4CAF50',
-     *     canonicalURL: 'https://example.com/page',
-     *     thumbnail: 'https://example.com/images/thumbnail.png',
-     *     locale: 'en-US',
-     *     siteName: 'My Website'
-     *   },
-     *   scripts: {
-     *     head: [
-     *       { src: 'https://cdn.example.com/analytics.js', async: true },
-     *       { content: 'window.config = { apiUrl: "https://api.example.com" };' }
-     *     ],
-     *     body: [
-     *       { src: '/app.js', type: 'module', defer: true }
-     *     ]
-     *   },
-     *   styles: [
-     *     { href: '/main.css' },
-     *     { content: 'body { font-family: sans-serif; }' }
-     *   ],
-     *   icons: {
-     *     favicon: '/favicon.ico',
-     *     appleTouchIcon: '/apple-touch-icon.png',
-     *     manifest: '/manifest.json'
-     *   },
-     *   headComponents: [
-     *     './src/client/ssr/head/Seo.js',
-     *     './src/client/ssr/head/Pwa.js'
-     *   ],
-     *   microdata: [
-     *     {
-     *       '@context': 'https://schema.org',
-     *       '@type': 'WebPage',
-     *       'name': 'My Custom Page',
-     *       'url': 'https://example.com/page'
-     *     }
-     *   ],
-     *   customPayload: {
-     *     apiEndpoint: 'https://api.example.com',
-     *     features: ['feature1', 'feature2']
-     *   },
-     *   env: 'production',
-     *   minify: true
-     * });
-     *
-     * @example
-     * // Using a config file
-     * await UnderpostStatic.API.callback({
-     *   configFile: './static-config.json',
-     *   outputPath: './dist/index.html'
-     * });
-     *
-     * @example
-     * // Generate with build trigger
-     * await UnderpostStatic.API.callback({
-     *   page: './src/client/ssr/body/DefaultSplashScreen.js',
-     *   outputPath: './public/index.html',
-     *   deployId: 'production-v1',
-     *   buildHost: 'example.com',
-     *   buildPath: '/',
-     *   build: true,
-     *   env: 'production'
-     * });
      */
-    async callback(options = {}) {
+    async callback(options = DefaultStaticGenerationOptions) {
+      // Handle config template generation
+      if (options.generateConfig) {
+        const configPath = typeof options.generateConfig === 'string' ? options.generateConfig : './static-config.json';
+        return UnderpostStatic.API.generateConfigTemplate(configPath);
+      }
+
+      // Parse comma-separated options
+      if (options.keywords) {
+        options.keywords = options.keywords.split(',').map((k) => k.trim());
+      }
+      if (options.headScripts) {
+        options.scripts = options.scripts || {};
+        options.scripts.head = options.headScripts.split(',').map((s) => ({ src: s.trim() }));
+      }
+      if (options.bodyScripts) {
+        options.scripts = options.scripts || {};
+        options.scripts.body = options.bodyScripts.split(',').map((s) => ({ src: s.trim() }));
+      }
+      if (options.styles) {
+        options.styles = options.styles.split(',').map((s) => ({ href: s.trim() }));
+      }
+      if (options.headComponents) {
+        options.headComponents = options.headComponents.split(',').map((c) => c.trim());
+      }
+      if (options.bodyComponents) {
+        options.bodyComponents = options.bodyComponents.split(',').map((c) => c.trim());
+      }
+
+      // Build metadata object from individual options
+      options.metadata = {
+        ...(options.title && { title: options.title }),
+        ...(options.description && { description: options.description }),
+        ...(options.keywords && { keywords: options.keywords }),
+        ...(options.author && { author: options.author }),
+        ...(options.themeColor && { themeColor: options.themeColor }),
+        ...(options.canonicalUrl && { canonicalURL: options.canonicalUrl }),
+        ...(options.thumbnail && { thumbnail: options.thumbnail }),
+        ...(options.locale && { locale: options.locale }),
+        ...(options.siteName && { siteName: options.siteName }),
+      };
+
+      // Build icons object
+      if (options.favicon || options.appleTouchIcon || options.manifest) {
+        options.icons = {
+          ...(options.favicon && { favicon: options.favicon }),
+          ...(options.appleTouchIcon && { appleTouchIcon: options.appleTouchIcon }),
+          ...(options.manifest && { manifest: options.manifest }),
+        };
+      }
+
       // Load config from file if specified
       if (options.configFile) {
         const fileConfig = ConfigLoader.load(options.configFile);
@@ -717,10 +626,6 @@ class UnderpostStatic {
      * @param {string} outputPath - Where to save the template config
      * @returns {void}
      * @memberof UnderpostStatic
-     *
-     * @example
-     * // Generate a template configuration file
-     * UnderpostStatic.API.generateConfigTemplate('./my-static-config.json');
      */
     generateConfigTemplate(outputPath = './static-config.json') {
       const template = {

package/src/client/services/default/default.management.js

@@ -465,6 +465,13 @@ const DefaultManagement = {
               const selectedRows = AgGrid.grids[gridId].getSelectedRows();
               logger.info('selectedRows', selectedRows);
             },
+            onRowEditingStarted: async (...args) => {
+              // Show only save button when editing starts
+              s(`.management-table-btn-save-${id}`).classList.remove('hide');
+              if (permissions.add) s(`.management-table-btn-add-${id}`).classList.add('hide');
+              if (permissions.remove) s(`.management-table-btn-clean-${id}`).classList.add('hide');
+              if (permissions.reload) s(`.management-table-btn-reload-${id}`).classList.add('hide');
+            },
             onRowValueChanged: async (...args) => {
               const [event] = args;
               logger.info('onRowValueChanged', args);

package/src/index.js

@@ -36,7 +36,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.95.3';
+  static version = 'v2.95.8';
   /**
    * Repository cli API
    * @static

package/src/server/backup.js

@@ -7,7 +7,6 @@
 import fs from 'fs-extra';
 import { loggerFactory } from './logger.js';
 import { shellExec } from './process.js';
-import { getCronBackUpFolder } from './conf.js';
 import dotenv from 'dotenv';
 
 dotenv.config();
@@ -25,70 +24,22 @@ class BackUp {
    * @description Initiates a backup operation for the specified deployment list.
    * @param {string} deployList - The list of deployments to backup.
    * @param {Object} options - The options for the backup operation.
-   * @param {boolean} options.itc - Whether to backup inside container data.
    * @param {boolean} options.git - Whether to backup data using Git.
    * @memberof BackUp
    */
-  static callback = async function (deployList, options = { itc: false, git: false }) {
+  static callback = async function (deployList, options = { git: false }) {
     if ((!deployList || deployList === 'dd') && fs.existsSync(`./engine-private/deploy/dd.router`))
-      deployList = fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8');
+      deployList = fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').trim();
 
     logger.info('init backups callback', deployList);
     await logger.setUpInfo();
-    const currentDate = new Date().getTime();
-    const maxBackupRetention = 5;
-
-    if (!fs.existsSync('./engine-private/cron-backups'))
-      fs.mkdirSync('./engine-private/cron-backups', { recursive: true });
 
     for (const _deployId of deployList.split(',')) {
       const deployId = _deployId.trim();
       if (!deployId) continue;
 
-      if (!(options.itc === true)) {
-        shellExec(`node bin db ${options.git ? '--git ' : ''}--export ${deployId}`);
-        continue;
-      }
-
-      const confServer = JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'));
-
-      for (const host of Object.keys(confServer))
-        for (const path of Object.keys(confServer[host])) {
-          // retention policy
-          const { db } = confServer[host][path];
-          if (!db) continue;
-          logger.info('Init backup', { host, path, db });
-
-          const backUpPath = `${process.cwd()}/engine-private/cron-backups/${getCronBackUpFolder(host, path)}`;
-          if (!fs.existsSync(backUpPath)) fs.mkdirSync(`${backUpPath}`, { recursive: true });
-          // .isDirectory()
-          const files = await fs.readdir(backUpPath, { withFileTypes: true });
-
-          const currentBackupsDirs = files
-            .map((fileObj) => parseInt(fileObj.name))
-            .sort((a, b) => a - b)
-            .reverse();
-
-          for (const retentionPath of currentBackupsDirs.filter((t, i) => i >= maxBackupRetention - 1)) {
-            const removePathRetention = `${backUpPath}/${retentionPath}`;
-            logger.info('Remove backup folder', removePathRetention);
-            fs.removeSync(removePathRetention);
-          }
-
-          fs.mkdirSync(`${backUpPath}/${currentDate}`, { recursive: true });
-
-          shellExec(`node bin/db ${host}${path} export ${deployId} ${backUpPath}/${currentDate}`);
-        }
-      shellExec(
-        `cd ./engine-private/cron-backups` +
-          ` && underpost pull . ${process.env.GITHUB_USERNAME}/cron-backups` +
-          ` && git add .` +
-          ` && underpost cmt . backup cron-job '${new Date().toLocaleDateString()}'` +
-          ` && underpost push . ${process.env.GITHUB_USERNAME}/cron-backups`,
-        {
-          silent: true,
-        },
-      );
+      logger.info('Executing database export for', deployId);
+      shellExec(`node bin db ${options.git ? '--git ' : ''}--export ${deployId}`);
     }
   };
 }

package/src/server/conf.js

@@ -1227,13 +1227,12 @@ const Cmd = {
    * @param {string} name - The name.
    * @param {string} expression - The expression.
    * @param {object} options - The options.
+   * @param {number} instances - The number of PM2 instances (default: 1).
    * @returns {string} - The cron command.
    * @memberof Cmd
    */
-  cron: (deployList, jobList, name, expression, options) =>
-    `pm2 start ./bin/index.js --no-autorestart --instances 1 --cron "${expression}" --name ${name} -- cron ${
-      options?.itc ? `--itc ` : ''
-    }${options?.git ? `--git ` : ''}${deployList} ${jobList}`,
+  cron: (deployList, jobList, name, expression, options, instances = 1) =>
+    `pm2 start ./bin/index.js --no-autorestart --instances ${instances} --cron "${expression}" --name ${name} -- cron ${options?.git ? `--git ` : ''}${deployList} ${jobList}`,
 };
 
 /**

package/examples/static-config-example.json

@@ -1,183 +0,0 @@
-{
-  "_comment": "Example static site configuration file for Underpost Static Generator",
-  "_usage": "Use with: underpost static --config-file ./static-config-example.json",
-
-  "page": "./src/client/ssr/body/DefaultSplashScreen.js",
-  "outputPath": "./dist/index.html",
-  "env": "production",
-  "minify": true,
-  "lang": "en",
-  "dir": "ltr",
-
-  "metadata": {
-    "_comment": "SEO and social media metadata",
-    "title": "My Awesome Application",
-    "description": "A comprehensive example of a static site with full metadata customization",
-    "keywords": ["static site", "generator", "underpost", "seo", "progressive web app"],
-    "author": "Your Name or Company",
-    "themeColor": "#4CAF50",
-    "canonicalURL": "https://example.com",
-    "thumbnail": "https://example.com/images/og-thumbnail.png",
-    "locale": "en-US",
-    "siteName": "My Awesome Site",
-    "openGraph": {
-      "_comment": "Additional Open Graph properties",
-      "type": "website",
-      "image:width": "1200",
-      "image:height": "630"
-    },
-    "twitter": {
-      "_comment": "Twitter card specific metadata",
-      "site": "@yourhandle",
-      "creator": "@creatorhandle"
-    }
-  },
-
-  "scripts": {
-    "_comment": "Scripts to inject into head and body sections",
-    "head": [
-      {
-        "_comment": "External analytics script with async loading",
-        "src": "https://www.googletagmanager.com/gtag/js?id=GA_MEASUREMENT_ID",
-        "async": true
-      },
-      {
-        "_comment": "Inline configuration script",
-        "content": "window.dataLayer = window.dataLayer || []; function gtag(){dataLayer.push(arguments);} gtag('js', new Date()); gtag('config', 'GA_MEASUREMENT_ID');",
-        "type": "text/javascript"
-      },
-      {
-        "_comment": "App configuration as inline script",
-        "content": "window.appConfig = { apiUrl: 'https://api.example.com', version: '1.0.0', features: { analytics: true, debugging: false } };",
-        "type": "text/javascript"
-      }
-    ],
-    "body": [
-      {
-        "_comment": "Main application bundle as ES module",
-        "src": "/dist/app.js",
-        "type": "module",
-        "defer": true
-      },
-      {
-        "_comment": "Service worker registration",
-        "content": "if ('serviceWorker' in navigator) { navigator.serviceWorker.register('/sw.js').then(reg => console.log('SW registered', reg)).catch(err => console.log('SW error', err)); }",
-        "type": "text/javascript"
-      }
-    ]
-  },
-
-  "styles": [
-    {
-      "_comment": "Main stylesheet",
-      "href": "/styles/main.css"
-    },
-    {
-      "_comment": "External font",
-      "href": "https://fonts.googleapis.com/css2?family=Inter:wght@400;600;700&display=swap"
-    },
-    {
-      "_comment": "Critical inline CSS for faster rendering",
-      "content": "body { margin: 0; padding: 0; font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; } * { box-sizing: border-box; }"
-    },
-    {
-      "_comment": "Print stylesheet",
-      "href": "/styles/print.css",
-      "media": "print"
-    }
-  ],
-
-  "icons": {
-    "_comment": "Icon configuration for various platforms",
-    "favicon": "/favicon.ico",
-    "appleTouchIcon": "/apple-touch-icon.png",
-    "manifest": "/manifest.json",
-    "additional": [
-      {
-        "rel": "icon",
-        "type": "image/png",
-        "sizes": "32x32",
-        "href": "/favicon-32x32.png"
-      },
-      {
-        "rel": "icon",
-        "type": "image/png",
-        "sizes": "16x16",
-        "href": "/favicon-16x16.png"
-      },
-      {
-        "rel": "mask-icon",
-        "href": "/safari-pinned-tab.svg",
-        "color": "#4CAF50"
-      }
-    ]
-  },
-
-  "_headComponents_comment": "SSR components disabled in this example - they require specific data structures",
-  "headComponents": [],
-
-  "_bodyComponents_comment": "Additional SSR components to include in body section",
-  "bodyComponents": [],
-
-  "microdata": [
-    {
-      "_comment": "Organization schema for better SEO",
-      "@context": "https://schema.org",
-      "@type": "Organization",
-      "name": "My Organization",
-      "url": "https://example.com",
-      "logo": "https://example.com/logo.png",
-      "contactPoint": {
-        "@type": "ContactPoint",
-        "telephone": "+1-555-123-4567",
-        "contactType": "Customer Service"
-      },
-      "sameAs": [
-        "https://twitter.com/yourhandle",
-        "https://linkedin.com/company/yourcompany",
-        "https://github.com/yourorg"
-      ]
-    },
-    {
-      "_comment": "WebSite schema",
-      "@context": "https://schema.org",
-      "@type": "WebSite",
-      "name": "My Awesome Site",
-      "url": "https://example.com",
-      "potentialAction": {
-        "@type": "SearchAction",
-        "target": "https://example.com/search?q={search_term_string}",
-        "query-input": "required name=search_term_string"
-      }
-    },
-    {
-      "_comment": "WebPage schema",
-      "@context": "https://schema.org",
-      "@type": "WebPage",
-      "name": "Home Page",
-      "description": "Welcome to our awesome site",
-      "url": "https://example.com"
-    }
-  ],
-
-  "customPayload": {
-    "_comment": "Custom data injected into window.renderPayload",
-    "apiEndpoint": "https://api.example.com",
-    "cdnUrl": "https://cdn.example.com",
-    "features": {
-      "chat": true,
-      "notifications": true,
-      "darkMode": true
-    },
-    "externalServices": {
-      "analytics": "GA_MEASUREMENT_ID",
-      "maps": "GOOGLE_MAPS_API_KEY"
-    }
-  },
-
-  "buildPath": "/",
-  "deployId": "",
-  "buildHost": "",
-  "build": false,
-  "dev": false
-}