underpost 2.90.1 → 2.90.4

package/examples/static-config-example.json

@@ -0,0 +1,183 @@
+{
+  "_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
+}

package/examples/static-config-simple.json

@@ -0,0 +1,57 @@
+{
+  "page": "./examples/ssr-components/CustomPage.js",
+  "outputPath": "./public/default.net/example.html",
+  "env": "production",
+  "minify": true,
+  "lang": "en",
+  "dir": "ltr",
+
+  "metadata": {
+    "title": "Simple Example Page",
+    "description": "A simple working example of the static site generator",
+    "keywords": ["example", "static", "generator"],
+    "author": "Underpost",
+    "themeColor": "#667eea",
+    "canonicalURL": "https://example.com",
+    "thumbnail": "https://example.com/images/thumbnail.png",
+    "locale": "en-US",
+    "siteName": "Example Site"
+  },
+
+  "scripts": {
+    "head": [
+      {
+        "content": "console.log('Page loaded successfully');"
+      }
+    ],
+    "body": []
+  },
+
+  "styles": [
+    {
+      "content": "/* Additional custom styles can go here */"
+    }
+  ],
+
+  "icons": {
+    "favicon": "/favicon.ico"
+  },
+
+  "headComponents": [],
+  "bodyComponents": [],
+
+  "microdata": [
+    {
+      "@context": "https://schema.org",
+      "@type": "WebPage",
+      "name": "Simple Example Page",
+      "description": "A simple working example",
+      "url": "https://example.com"
+    }
+  ],
+
+  "customPayload": {
+    "example": true,
+    "message": "This is a simple working example"
+  }
+}

package/manifests/deployment/dd-default-development/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-blue
-          image: localhost/rockylinux9-underpost:v2.90.1
+          image: localhost/rockylinux9-underpost:v2.90.4
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-green
-          image: localhost/rockylinux9-underpost:v2.90.1
+          image: localhost/rockylinux9-underpost:v2.90.4
           #          resources:
           #            requests:
           #              memory: "124Ki"

package/manifests/deployment/dd-test-development/deployment.yaml

@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: dd-test-development-blue
-          image: localhost/rockylinux9-underpost:v2.90.1
+          image: localhost/rockylinux9-underpost:v2.90.4
 
           command:
             - /bin/sh
@@ -103,7 +103,7 @@ spec:
     spec:
       containers:
         - name: dd-test-development-green
-          image: localhost/rockylinux9-underpost:v2.90.1
+          image: localhost/rockylinux9-underpost:v2.90.4
 
           command:
             - /bin/sh

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.90.1",
+    "version": "2.90.4",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",

package/src/api/document/document.model.js

@@ -38,6 +38,13 @@ const DocumentDto = {
         select: '_id name mimetype',
       };
     },
+    mdFile: () => {
+      return {
+        path: 'mdFileId',
+        model: 'File',
+        select: '_id name mimetype',
+      };
+    },
     user: () => {
       return {
         path: 'userId',

package/src/api/document/document.service.js

@@ -58,6 +58,7 @@ const DocumentService = {
         .limit(limit)
         .skip(skip)
         .populate(DocumentDto.populate.file())
+        .populate(DocumentDto.populate.mdFile())
         .populate(user && user.role !== 'guest' ? DocumentDto.populate.user() : null);
 
       const lastDoc = await Document.findOne(queryPayload, '_id').sort({ createdAt: 1 });
@@ -74,7 +75,9 @@ const DocumentService = {
         return await Document.find({
           userId: req.auth.user._id,
           ...(req.params.id ? { _id: req.params.id } : undefined),
-        }).populate(DocumentDto.populate.file());
+        })
+          .populate(DocumentDto.populate.file())
+          .populate(DocumentDto.populate.mdFile());
     }
   },
   delete: async (req, res, options) => {

package/src/cli/index.js

@@ -120,17 +120,105 @@ program
 program
   .command('static')
   .option('--page <ssr-component-path>', 'Build custom static pages.')
-  .option('--title <title>', 'Sets a custom title for the static page.')
+  .option('--title <title>', 'Sets a custom title for the static page (deprecated: use --config-file).')
   .option('--output-path <output-path>', 'Sets the output path for the generated static page.')
 
+  // Metadata options
+  .option('--description <description>', 'Page description for SEO.')
+  .option('--keywords <keywords>', 'Comma-separated keywords for SEO.')
+  .option('--author <author>', 'Page author.')
+  .option('--theme-color <color>', 'Theme color for mobile browsers.')
+  .option('--canonical-url <url>', 'Canonical URL for SEO.')
+  .option('--thumbnail <url>', 'Open Graph thumbnail image URL.')
+  .option('--locale <locale>', 'Page locale (default: en-US).')
+  .option('--site-name <name>', 'Site name for Open Graph.')
+
+  // Script and style options
+  .option('--head-scripts <paths>', 'Comma-separated paths to scripts for head section.')
+  .option('--body-scripts <paths>', 'Comma-separated paths to scripts for body section.')
+  .option('--styles <paths>', 'Comma-separated paths to stylesheets.')
+
+  // Icon options
+  .option('--favicon <path>', 'Favicon path.')
+  .option('--apple-touch-icon <path>', 'Apple touch icon path.')
+  .option('--manifest <path>', 'Web manifest path.')
+
+  // Component options
+  .option('--head-components <paths>', 'Comma-separated SSR head component paths.')
+  .option('--body-components <paths>', 'Comma-separated SSR body component paths.')
+
+  // Build options
   .option('--deploy-id <deploy-id>', 'Build static assets for a specific deployment ID.')
   .option('--build', 'Triggers the static build process for the specified deployment ID.')
   .option('--build-host <build-host>', 'Sets a custom build host for static documents or assets.')
   .option('--build-path <build-path>', 'Sets a custom build path for static documents or assets.')
   .option('--env <env>', 'Sets the environment for the static build (e.g., "development", "production").')
+  .option('--minify', 'Minify HTML output (default: true for production).')
+  .option('--no-minify', 'Disable HTML minification.')
+
+  // Config file options
+  .option('--config-file <path>', 'Path to JSON configuration file.')
+  .option('--generate-config [path]', 'Generate a template configuration file.')
+
+  // Other options
+  .option('--lang <lang>', 'HTML lang attribute (default: en).')
+  .option('--dir <dir>', 'HTML dir attribute (default: ltr).')
   .option('--dev', 'Sets the development cli context')
-  .description(`Manages static build of page, bundles, and documentation.`)
-  .action(UnderpostStatic.API.callback);
+
+  .description(`Manages static build of page, bundles, and documentation with comprehensive customization options.`)
+  .action((options) => {
+    // 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 }),
+      };
+    }
+
+    return UnderpostStatic.API.callback(options);
+  });
 
 // 'config' command: Manage Underpost configurations
 program
@@ -462,7 +550,6 @@ program
     '--resource-template-id <resource-template-id >',
     'Specifies a resource template ID for the runner execution.',
   )
-  .option('--etcHosts', 'Enables /etc/hosts management for the runner execution.')
   .option('--expose', 'Enables service exposure for the runner execution.')
   .option('--conf-server-path <conf-server-path>', 'Sets a custom configuration server path.')
   .option('--underpost-root <underpost-root>', 'Sets a custom Underpost root path.')

package/src/cli/run.js

@@ -767,7 +767,7 @@ EOF
      * @memberof UnderpostRun
      */
     'ls-deployments': async (path, options = UnderpostRun.DEFAULT_OPTION) => {
-      console.table(await UnderpostDeploy.API.get(path, 'deployments'));
+      console.table(await UnderpostDeploy.API.get(path, 'deployments', options.namespace));
     },
     /**
      * @method ls-images