underpost 3.2.21 → 3.2.28

package/src/cli/static.js

@@ -6,10 +6,10 @@
 import fs from 'fs-extra';
 import path from 'path';
 import express from 'express';
-import { ssrFactory } from '../server/ssr.js';
+import { ssrFactory } from '../client-builder/ssr.js';
 import { shellExec } from '../server/process.js';
 import Underpost from '../index.js';
-import { JSONweb } from '../server/client-formatted.js';
+import { JSONweb } from '../client-builder/client-formatted.js';
 import { loggerFactory, loggerMiddleware } from '../server/logger.js';
 const logger = loggerFactory(import.meta);
 /**

package/src/client/components/core/PanelForm.js

@@ -73,7 +73,7 @@ class PanelForm {
       parentIdModal: undefined,
       route: 'home',
       htmlFormHeader: async () => '',
-      firsUpdateEvent: async () => { },
+      firsUpdateEvent: async () => {},
       share: {
         copyLink: false,
         copySourceMd: false,
@@ -196,12 +196,12 @@ class PanelForm {
               <img
                 class="abs center"
                 style="${renderCssAttr({
-              style: {
-                width: '100px',
-                height: '100px',
-                opacity: 0.2,
-              },
-            })}"
+                  style: {
+                    width: '100px',
+                    height: '100px',
+                    opacity: 0.2,
+                  },
+                })}"
                 src="${defaultUrlImage}"
               />
             `,
@@ -382,15 +382,15 @@ class PanelForm {
             // It will be filtered from the tags array to keep visibility control separate from content tags
             const tags = data.tags
               ? uniqueArray(
-                data.tags
-                  .replaceAll('/', ',')
-                  .replaceAll('-', ',')
-                  .replaceAll(' ', ',')
-                  .split(',')
-                  .map((t) => t.trim())
-                  .filter((t) => t)
-                  .concat(prefixTags),
-              )
+                  data.tags
+                    .replaceAll('/', ',')
+                    .replaceAll('-', ',')
+                    .replaceAll(' ', ',')
+                    .split(',')
+                    .map((t) => t.trim())
+                    .filter((t) => t)
+                    .concat(prefixTags),
+                )
               : prefixTags;
             let originObj, originFileObj, indexOriginObj;
             if (editId) {
@@ -432,8 +432,8 @@ class PanelForm {
               // In edit mode, null means user cleared the file - we need to tell server to remove it
               const isFileCleared = data.fileId === null && editId;
               await (async () => {
-                // When file is null and not the first iteration or not in edit mode, skip upload
-                if (!file && !isFileCleared) return;
+                // When file is null, no markdown content, and not clearing a file, skip upload
+                if (!file && !isFileCleared && !hasMdContent) return;
                 // When user cleared file in edit mode, set fileId=null so server removes the reference
                 if (isFileCleared) {
                   fileId = null;
@@ -489,8 +489,8 @@ class PanelForm {
                 message: documentMessage,
                 data: documentData,
               } = originObj && indexFormDoc === 0
-                  ? await DocumentService.put({ id: originObj._id, body })
-                  : await DocumentService.post({
+                ? await DocumentService.put({ id: originObj._id, body })
+                : await DocumentService.post({
                     body,
                   });
               const newDoc = {
@@ -518,12 +518,12 @@ class PanelForm {
                 fileId: {
                   fileBlob: file
                     ? {
-                      data: {
-                        data: await getDataFromInputFile(file),
-                      },
-                      mimetype: file.type,
-                      name: file.name,
-                    }
+                        data: {
+                          data: await getDataFromInputFile(file),
+                        },
+                        mimetype: file.type,
+                        name: file.name,
+                      }
                     : undefined,
                   filePlain: undefined,
                 },
@@ -742,36 +742,36 @@ class PanelForm {
             <div
               class="in fll ssr-shimmer-search-box"
               style="${renderCssAttr({
-            style: {
-              width: '80%',
-              height: '30px',
-              top: '-13px',
-              left: '10px',
-            },
-          })}"
+                style: {
+                  width: '80%',
+                  height: '30px',
+                  top: '-13px',
+                  left: '10px',
+                },
+              })}"
             ></div>
           </div>`,
           createdAt: html`<div class="fl">
             <div
               class="in fll ssr-shimmer-search-box"
               style="${renderCssAttr({
-            style: {
-              width: '50%',
-              height: '30px',
-              left: '-5px',
-            },
-          })}"
+                style: {
+                  width: '50%',
+                  height: '30px',
+                  left: '-5px',
+                },
+              })}"
             ></div>
           </div>`,
           mdFileId: html`<div class="fl section-mp">
             <div
               class="in fll ssr-shimmer-search-box"
               style="${renderCssAttr({
-            style: {
-              width: '80%',
-              height: '30px',
-            },
-          })}"
+                style: {
+                  width: '80%',
+                  height: '30px',
+                },
+              })}"
             ></div>
           </div>`.repeat(random(2, 4)),
           ssr: true,

package/src/{server → client-builder}/client-build-docs.js

@@ -2,13 +2,13 @@
 
 /**
  * Module for building project documentation (JSDoc, Swagger, Coverage).
- * @module src/server/client-build-docs.js
+ * @module src/client-builder/client-build-docs.js
  * @namespace clientBuildDocs
  */
 
 import fs from 'fs-extra';
-import { shellExec } from './process.js';
-import { loggerFactory } from './logger.js';
+import { shellExec } from '../server/process.js';
+import { loggerFactory } from '../server/logger.js';
 import { JSONweb } from './client-formatted.js';
 import { ssrFactory } from './ssr.js';
 
@@ -396,10 +396,20 @@ const buildCoverage = async ({ docs, docsDestination }) => {
       const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
       if (pkg.scripts && pkg.scripts.coverage) {
         logger.info('generating coverage report', coveragePath);
-        shellExec(`cd ${coveragePath} && npm run coverage`, { silent: true });
+        try {
+          await shellExec(`cd ${coveragePath} && npm run coverage`, { silent: true });
+        } catch (err) {
+          logger.warn('coverage generation failed (non-fatal), skipping:', err.message);
+          return;
+        }
       } else if (pkg.scripts && pkg.scripts.test) {
         logger.info('generating coverage via test', coveragePath);
-        shellExec(`cd ${coveragePath} && npm test`, { silent: true, silentOnError: true });
+        try {
+          await shellExec(`cd ${coveragePath} && npm test`, { silent: true, silentOnError: true });
+        } catch (err) {
+          logger.warn('coverage generation failed (non-fatal), skipping:', err.message);
+          return;
+        }
       }
     }
   }

package/src/{server → client-builder}/client-build-live.js

@@ -1,12 +1,12 @@
 /**
  * Module for live building client-side code
- * @module src/server/client-build-live.js
+ * @module src/client-builder/client-build-live.js
  * @namespace clientLiveBuild
  */
 
 import fs from 'fs-extra';
-import { Config, loadConf, readConfJson } from './conf.js';
-import { loggerFactory } from './logger.js';
+import { Config, loadConf, readConfJson } from '../server/conf.js';
+import { loggerFactory } from '../server/logger.js';
 import { buildClient } from './client-build.js';
 
 const logger = loggerFactory(import.meta);

package/src/{server → client-builder}/client-build.js

@@ -1,6 +1,6 @@
 /**
  * Manages the client-side build process, including full builds and incremental builds.
- * @module server/client-build.js
+ * @module src/client-builder/client-build.js
  * @namespace clientBuild
  */
 
@@ -8,18 +8,18 @@
 
 import fs from 'fs-extra';
 import { transformClientJs, JSONweb } from './client-formatted.js';
-import { loggerFactory } from './logger.js';
+import { loggerFactory } from '../server/logger.js';
 import {
   getCapVariableName,
   newInstance,
   orderArrayFromAttrInt,
   uniqueArray,
 } from '../client/components/core/CommonJs.js';
-import { readConfJson } from './conf.js';
+import { readConfJson } from '../server/conf.js';
 import { minify } from 'html-minifier-terser';
 import AdmZip from 'adm-zip';
 import * as dir from 'path';
-import { shellExec } from './process.js';
+import { shellExec } from '../server/process.js';
 import { SitemapStream, streamToPromise } from 'sitemap';
 import { Readable } from 'stream';
 import { buildIcons } from './client-icons.js';
@@ -751,8 +751,9 @@ const buildClient = async (
           )
         )
           for (const view of views) {
-            const buildPath = `${rootClientPath[rootClientPath.length - 1] === '/' ? rootClientPath.slice(0, -1) : rootClientPath
-              }${view.path === '/' ? view.path : `${view.path}/`}`;
+            const buildPath = `${
+              rootClientPath[rootClientPath.length - 1] === '/' ? rootClientPath.slice(0, -1) : rootClientPath
+            }${view.path === '/' ? view.path : `${view.path}/`}`;
 
             if (!fs.existsSync(buildPath)) fs.mkdirSync(buildPath, { recursive: true });
 
@@ -768,8 +769,9 @@ const buildClient = async (
             fs.writeFileSync(`${buildPath}${buildId}.js`, jsSrc, 'utf8');
             const title = metadata.title ? metadata.title : title;
 
-            const canonicalURL = `https://${host}${path}${view.path === '/' ? (path === '/' ? '' : '/') : path === '/' ? `${view.path.slice(1)}/` : `${view.path}/`
-              }`;
+            const canonicalURL = `https://${host}${path}${
+              view.path === '/' ? (path === '/' ? '' : '/') : path === '/' ? `${view.path.slice(1)}/` : `${view.path}/`
+            }`;
 
             let ssrHeadComponents = ``;
             let ssrBodyComponents = ``;
@@ -903,12 +905,12 @@ const buildClient = async (
               `${buildPath}index.html`,
               minifyBuild
                 ? await minify(htmlSrc, {
-                  minifyCSS: true,
-                  minifyJS: true,
-                  collapseBooleanAttributes: true,
-                  collapseInlineTagWhitespace: true,
-                  collapseWhitespace: true,
-                })
+                    minifyCSS: true,
+                    minifyJS: true,
+                    collapseBooleanAttributes: true,
+                    collapseInlineTagWhitespace: true,
+                    collapseWhitespace: true,
+                  })
                 : htmlSrc,
               'utf8',
             );
@@ -997,8 +999,9 @@ Sitemap: ${sitemapBaseUrl}/sitemap.xml`,
             renderApi: { JSONweb },
           });
 
-          const buildPath = `${rootClientPath[rootClientPath.length - 1] === '/' ? rootClientPath.slice(0, -1) : rootClientPath
-            }${view.path === '/' ? view.path : `${view.path}/`}`;
+          const buildPath = `${
+            rootClientPath[rootClientPath.length - 1] === '/' ? rootClientPath.slice(0, -1) : rootClientPath
+          }${view.path === '/' ? view.path : `${view.path}/`}`;
 
           const indexUrl = buildIndexUrl(view.path);
           if (view.offlineDefault) {
@@ -1018,12 +1021,12 @@ Sitemap: ${sitemapBaseUrl}/sitemap.xml`,
             buildHtmlPath,
             minifyBuild
               ? await minify(htmlSrc, {
-                minifyCSS: true,
-                minifyJS: true,
-                collapseBooleanAttributes: true,
-                collapseInlineTagWhitespace: true,
-                collapseWhitespace: true,
-              })
+                  minifyCSS: true,
+                  minifyJS: true,
+                  collapseBooleanAttributes: true,
+                  collapseInlineTagWhitespace: true,
+                  collapseWhitespace: true,
+                })
               : htmlSrc,
             'utf8',
           );

package/src/{server → client-builder}/client-dev-server.js

@@ -1,13 +1,13 @@
 /**
  * Module for creating a client-side development server
- * @module src/server/client-dev-server.js
+ * @module src/client-builder/client-dev-server.js
  * @namespace clientDevServer
  */
 import fs from 'fs-extra';
 import nodemon from 'nodemon';
 import dotenv from 'dotenv';
-import { shellExec } from './process.js';
-import { loggerFactory } from './logger.js';
+import { shellExec } from '../server/process.js';
+import { loggerFactory } from '../server/logger.js';
 import Underpost from '../index.js';
 
 const logger = loggerFactory(import.meta);

package/src/{server → client-builder}/client-icons.js

@@ -1,10 +1,10 @@
 /**
  * Module for building client-side icons
- * @module src/server/client-icons.js
+ * @module src/client-builder/client-icons.js
  * @namespace clientIcons
  */
 import { favicons } from 'favicons';
-import { loggerFactory } from './logger.js';
+import { loggerFactory } from '../server/logger.js';
 import fs from 'fs-extra';
 import { getCapVariableName } from '../client/components/core/CommonJs.js';
 

package/src/{server → client-builder}/ssr.js

@@ -1,6 +1,6 @@
 /**
  * Module for managing server side rendering
- * @module src/server/ssr.js
+ * @module src/client-builder/ssr.js
  * @namespace ServerSideRendering
  */
 
@@ -10,19 +10,19 @@ import vm from 'node:vm';
 import Underpost from '../index.js';
 
 import { srcFormatted, JSONweb } from './client-formatted.js';
-import { loggerFactory } from './logger.js';
-import { getRootDirectory } from './process.js';
+import { loggerFactory } from '../server/logger.js';
+import { getRootDirectory } from '../server/process.js';
 
 const logger = loggerFactory(import.meta);
 
 /**
  * Creates a server-side rendering component function from a given file path.
  * It reads the component file, formats it, and executes it in a sandboxed Node.js VM context to extract the component.
- * @param {string} [componentPath='./src/client/ssr/Render.js'] - The path to the SSR component file.
+ * @param {string} [componentPath='./src/client/ssr/RootDocument.js'] - The path to the SSR component file.
  * @returns {Promise<Function>} A promise that resolves to the SSR component function.
  * @memberof ServerSideRendering
  */
-const ssrFactory = async (componentPath = `./src/client/ssr/Render.js`) => {
+const ssrFactory = async (componentPath = `./src/client/ssr/RootDocument.js`) => {
   const context = { SrrComponent: () => {}, npm_package_version: Underpost.version };
   vm.createContext(context);
   vm.runInContext(await srcFormatted(fs.readFileSync(componentPath, 'utf8')), context);

package/src/client.build.js

@@ -6,7 +6,7 @@
 import { loggerFactory } from './server/logger.js';
 import { Config } from './server/conf.js';
 import { ProcessController } from './server/process.js';
-import { clientLiveBuild } from './server/client-build-live.js';
+import { clientLiveBuild } from './client-builder/client-build-live.js';
 
 await Config.build();
 

package/src/client.dev.js

@@ -6,7 +6,7 @@
 import { loggerFactory } from './server/logger.js';
 import { ProcessController } from './server/process.js';
 import { Config, buildClientStaticConf } from './server/conf.js';
-import { createClientDevServer } from './server/client-dev-server.js';
+import { createClientDevServer } from './client-builder/client-dev-server.js';
 
 const logger = loggerFactory(import.meta);
 

package/src/index.js

@@ -10,6 +10,7 @@ import UnderpostKickStart from './cli/kickstart.js';
 import UnderpostCluster from './cli/cluster.js';
 import UnderpostDB from './cli/db.js';
 import UnderpostDeploy from './cli/deploy.js';
+import UnderpostDockerCompose from './cli/docker-compose.js';
 import UnderpostKubectl from './cli/kubectl.js';
 import UnderpostRootEnv from './cli/env.js';
 import UnderpostFileStorage from './cli/fs.js';
@@ -44,7 +45,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v3.2.21';
+  static version = 'v3.2.28';
 
   /**
    * Required Node.js major version
@@ -146,6 +147,15 @@ class Underpost {
   static get deploy() {
     return UnderpostDeploy.API;
   }
+  /**
+   * Docker Compose pipeline cli API
+   * @static
+   * @type {UnderpostDockerCompose.API}
+   * @memberof Underpost
+   */
+  static get dockerCompose() {
+    return UnderpostDockerCompose.API;
+  }
   /**
    * File Storage cli API
    * @static
@@ -321,6 +331,7 @@ export {
   UnderpostCluster,
   UnderpostDB,
   UnderpostDeploy,
+  UnderpostDockerCompose,
   UnderpostKubectl,
   UnderpostRootEnv,
   UnderpostFileStorage,

package/src/mailer/EmailRender.js

@@ -1,4 +1,4 @@
-import { ssrFactory } from '../server/ssr.js';
+import { ssrFactory } from '../client-builder/ssr.js';
 
 /**
  * Module for handling the rendering and styling of HTML emails using SSR components.

package/src/{server → projects/underpost}/catalog-underpost.js

@@ -1,7 +1,7 @@
 /**
  * Underpost platform content catalog — the base `pwa-microservices-template`.
  *
- * @module src/server/catalog-underpost.js
+ * @module src/projects/underpost/catalog-underpost.js
  * @namespace UnderpostCatalog
  */
 
@@ -11,7 +11,6 @@
  * @memberof UnderpostCatalog
  */
 const TEMPLATE_RESTORE_PATHS = [
-  `./src/server/catalog-underpost.js`,
   `./.github/workflows/pwa-microservices-template-page.cd.yml`,
   `./.github/workflows/pwa-microservices-template-test.ci.yml`,
   `./.github/workflows/npmpkg.ci.yml`,

package/src/runtime/express/Express.js

@@ -19,8 +19,8 @@ import { DataBaseProviderService } from '../../db/DataBaseProvider.js';
 import { createPeerServer } from '../../server/peer.js';
 import { createValkeyConnection } from '../../server/valkey.js';
 import { applySecurity, authMiddlewareFactory } from '../../server/auth.js';
-import { ssrMiddlewareFactory } from '../../server/ssr.js';
-import { buildSwaggerUiOptions } from '../../server/client-build-docs.js';
+import { ssrMiddlewareFactory } from '../../client-builder/ssr.js';
+import { buildSwaggerUiOptions } from '../../client-builder/client-build-docs.js';
 
 import { shellExec } from '../../server/process.js';
 import { devProxyHostFactory, isDevProxyContext, isTlsDevProxy } from '../../server/conf.js';