eolang 0.33.2 → 0.33.3

package/Formula/eolang.rb

@@ -7,9 +7,9 @@ require "language/node"
 class Eolang < Formula
   desc "Command-line Tool-Kit"
   homepage "https://github.com/objectionary/eoc"
-  url "https://github.com/objectionary/eoc/archive/refs/tags/0.33.1.tar.gz"
+  url "https://github.com/objectionary/eoc/archive/refs/tags/0.33.2.tar.gz"
   version "0.33.1"
-  sha256 "ba76c6b5e63db422777583bcf09020683ebfbe59b28bc949df5e178c1756a1f4"
+  sha256 "e795fba4fef808afffef01e0e17081ae135cfdc9115a36fbee76cfb56f203f9c"
   license "MIT"
 
   depends_on "node"

package/Formula/eolang@0.32.0.rb

@@ -7,9 +7,9 @@ require "language/node"
 class Eolang < Formula
   desc "Command-line Tool-Kit"
   homepage "https://github.com/objectionary/eoc"
-  url "https://github.com/objectionary/eoc/archive/refs/tags/0.33.1.tar.gz"
+  url "https://github.com/objectionary/eoc/archive/refs/tags/0.33.2.tar.gz"
   version "0.32.0"
-  sha256 "ba76c6b5e63db422777583bcf09020683ebfbe59b28bc949df5e178c1756a1f4"
+  sha256 "e795fba4fef808afffef01e0e17081ae135cfdc9115a36fbee76cfb56f203f9c"
   license "MIT"
 
   depends_on "node"

package/Formula/eolang@0.32.1.rb

@@ -7,9 +7,9 @@ require "language/node"
 class Eolang < Formula
   desc "Command-line Tool-Kit"
   homepage "https://github.com/objectionary/eoc"
-  url "https://github.com/objectionary/eoc/archive/refs/tags/0.33.1.tar.gz"
+  url "https://github.com/objectionary/eoc/archive/refs/tags/0.33.2.tar.gz"
   version "0.32.1"
-  sha256 "ba76c6b5e63db422777583bcf09020683ebfbe59b28bc949df5e178c1756a1f4"
+  sha256 "e795fba4fef808afffef01e0e17081ae135cfdc9115a36fbee76cfb56f203f9c"
   license "MIT"
 
   depends_on "node"

package/Formula/eolang@0.33.0.rb

@@ -7,9 +7,9 @@ require "language/node"
 class Eolang < Formula
   desc "Command-line Tool-Kit"
   homepage "https://github.com/objectionary/eoc"
-  url "https://github.com/objectionary/eoc/archive/refs/tags/0.33.1.tar.gz"
+  url "https://github.com/objectionary/eoc/archive/refs/tags/0.33.2.tar.gz"
   version "0.33.0"
-  sha256 "ba76c6b5e63db422777583bcf09020683ebfbe59b28bc949df5e178c1756a1f4"
+  sha256 "e795fba4fef808afffef01e0e17081ae135cfdc9115a36fbee76cfb56f203f9c"
   license "MIT"
 
   depends_on "node"

package/README.md

@@ -18,14 +18,14 @@ First, you install [npm][npm-install] and [Java SE][java-se].
 Then, you install [eolang][npm] package, using [npm][npm-install]:
 
 ```bash
-npm install -g eolang@0.33.1
+npm install -g eolang@0.33.2
 ```
 
 You can also use [Homebrew] (on macOS):
 
 ```bash
 brew tap objectionary/eoc https://github.com/objectionary/eoc
-brew install objectionary/eoc/eolang@0.33.1
+brew install objectionary/eoc/eolang@0.33.2
 ```
 
 Then, you write a simple [EO](https://www.eolang.org) program in `hello.eo` file

package/eo-version.txt

@@ -1 +1 @@
-0.58.6
+0.58.8

package/mvnw/dependency-reduced-pom.xml

@@ -121,6 +121,6 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <heap-size>undefined</heap-size>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jeo.version>0.14.12</jeo.version>
+    <jeo.version>0.14.14</jeo.version>
   </properties>
 </project>

package/mvnw/pom.xml

@@ -10,7 +10,7 @@
   <version>0.0.0</version>
   <packaging>jar</packaging>
   <properties>
-    <jeo.version>0.14.12</jeo.version>
+    <jeo.version>0.14.14</jeo.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <eo.version>undefined</eo.version>

package/package.json

@@ -10,6 +10,7 @@
     "commander": "^12.1.0",
     "eo2js": "^0.0.8",
     "fast-xml-parser": "^5.2.3",
+    "marked": "^4.3.0",
     "node": "^24.1.0",
     "relative": "^3.0.2",
     "semver": "^7.7.2",
@@ -57,5 +58,5 @@
     "postinstall": "node scripts/postinstall.js",
     "test": "mocha --timeout 1200000"
   },
-  "version": "0.33.2"
+  "version": "0.33.3"
 }

package/src/commands/docs.js

@@ -6,6 +6,7 @@
 const fs = require('fs');
 const path = require('path');
 const SaxonJS = require('saxon-js');
+const { marked } = require('marked');
 
 /**
  * Recursively reads all .xmir files from a directory.
@@ -52,16 +53,27 @@ function transformDocument(xmir, xsl) {
   return html;
 }
 
+/**
+ * Converts Markdown blocks in documentation to HTML
+ * @param {String} html - text of HTML file
+ * @return {String} HTML document
+ */
+function convertMarkdownToHtml(html) {
+  const regex = /(?<opening_tag><div\s+class\s*=\s*["']object-desc["'][^>]*>)(?<content>[\s\S]*?)(?<closing_tag><\/div>)/gi;
+  const converted_html = html.replace(regex, (match, opening_tag, content, closing_tag) => `${opening_tag}${marked.parse(content)}${closing_tag}`);
+  return converted_html;
+}
+
 /**
  * Creates documentation block from given XMIR
- * @param {String} xmir_path - path of XMIR
+ * @param {String} filepath - path of XMIR
  * @return {String} HTML block
  */
-function createXmirHtmlBlock(xmir_path) {
+function createXmirHtmlBlock(filepath) {
   try {
-    const xmir = fs.readFileSync(xmir_path).toString();
+    const xmir = fs.readFileSync(filepath).toString();
     const xsl = fs.readFileSync(path.join(__dirname, '..', 'resources', 'xmir-transformer.xsl')).toString();
-    return transformDocument(xmir, xsl);
+    return convertMarkdownToHtml(transformDocument(xmir, xsl));
   } catch(error) {
     throw new Error(`Error while applying XSL to XMIR: ${error.message}`, error);
   }
@@ -70,42 +82,43 @@ function createXmirHtmlBlock(xmir_path) {
 /**
  * Generates Package HTML
  * @param {String} name - Package name
- * @param {String[]} xmir_htmls - Array of xmirs htmls
- * @param {String} css_path - CSS file path
+ * @param {String[]} htmls - Array of xmirs htmls
+ * @param {String} css - CSS file path
  * @return {String} HTML of the package
  */
-function generatePackageHtml(name, xmir_htmls, css_path) {
-  const title = `<h1 class="package-title">Package ${name} documentation</h1>`;
+function generatePackageHtml(name, htmls, css) {
+  htmls = htmls.filter(item => item !== '<article class="app-block"></article>');
+  const date = new Date();
   return `<!DOCTYPE html>
     <html>
       <head>
-        <link href="${css_path}" rel="stylesheet" type="text/css">
-        ${title}
+        <link href="${css}" rel="stylesheet" type="text/css">
+        <link rel="stylesheet"
+          href="https://cdn.jsdelivr.net/npm/tacit-css@1.9.1/dist/tacit-css.min.css"/>
       </head>
       <body>
-        ${xmir_htmls.join('\n')}
+        <section>
+          <header>
+            <nav>
+              <h1>${name} documentation</h1>
+              <p>Creation date: ${date.toUTCString()}</p>
+            </nav>
+          </header>
+          ${htmls.join('\n')}
+        </section>
       </body>
     </html>`;
 }
 
 /**
  * Wraps given html body
+ * @param {String} name - File name
  * @param {String} html - HTML body
- * @param {String} css_path - CSS file path
+ * @param {String} css - CSS file path
  * @return {String} Ready HTML
  */
-function wrapHtml(html, css_path) {
-  return `
-    <!DOCTYPE html>
-    <html>
-      <head>
-        <link href="${css_path}" rel="stylesheet" type="text/css">
-      </head>
-      <body>
-        ${html}
-      </body>
-    </html>
-  `;
+function wrapHtml(name, html, css) {
+  return generatePackageHtml(name, [html], css);
 }
 
 /**
@@ -128,7 +141,7 @@ module.exports = async function(opts) {
       const xmir_html = createXmirHtmlBlock(xmir);
       const html_app = path.join(output, path.dirname(relative),`${name}.html`);
       fs.mkdirSync(path.dirname(html_app), {recursive: true});
-      fs.writeFileSync(html_app, wrapHtml(xmir_html, css));
+      fs.writeFileSync(html_app, wrapHtml(name, xmir_html, css));
       const packages = path.dirname(relative).split(path.sep).join('.');
       const html_package = path.join(output, `package_${packages}.html`);
       if (!(packages in packages_info)) {
@@ -143,10 +156,10 @@ module.exports = async function(opts) {
     for (const package_name of Object.keys(packages_info)) {
       fs.mkdirSync(path.dirname(packages_info[package_name].path), {recursive: true});
       fs.writeFileSync(packages_info[package_name].path,
-        generatePackageHtml(package_name, packages_info[package_name].xmir_htmls, css));
+        generatePackageHtml(`${package_name} package`, packages_info[package_name].xmir_htmls, css));
     }
     const packages = path.join(output, 'packages.html');
-    fs.writeFileSync(packages, generatePackageHtml('', all_xmir_htmls, css));
+    fs.writeFileSync(packages, generatePackageHtml('overall package', all_xmir_htmls, css));
     console.info('Documentation generation completed in the %s directory', output);
   } catch (error) {
     console.error('Error generating documentation:', error);

package/src/resources/xmir-transformer.xsl

@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: MIT
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="html"/>
   <xsl:template match="/">
-    <div class="app-block">
-      <xsl:for-each select="//o[(@name and @name != 'φ') and (not(@base) or (@base != '∅' and @base != 'ξ'))]">
+    <article class="app-block">
+      <xsl:for-each select="//o[(@name and (@name != 'φ' and @name != 'λ' and not(starts-with(@name, '+')))) and (not(@base) or (@base != '∅' and @base != 'ξ'))]">
         <xsl:if test="//comments/comment[@line = current()/@line]">
           <div class="object-block">
             <xsl:variable name="fullname">
@@ -17,7 +18,7 @@
                 </xsl:choose>
               </xsl:for-each>
             </xsl:variable>
-            <h2 class="object-title"><xsl:value-of select="$fullname"/></h2>
+            <h1 class="object-title"><xsl:value-of select="$fullname"/></h1>
             <p class="object-sign">
               <xsl:value-of select="$fullname"/>(<xsl:for-each select="current()/o[@base and @base = '∅']">
                 <xsl:value-of select="@name"/>
@@ -25,15 +26,15 @@
                   <xsl:when test="position() != last()">, </xsl:when>
                 </xsl:choose>
               </xsl:for-each>)</p>
-            <p class="object-desc">
+            <div class="object-desc">
               <xsl:call-template name="break">
                 <xsl:with-param name="text" select="//comments/comment[@line = current()/@line]"/>
               </xsl:call-template>
-            </p>
+            </div>
           </div>
         </xsl:if>
       </xsl:for-each>
-    </div>
+    </article>
   </xsl:template>
   <xsl:template name="break">
     <xsl:param name="text" select="string(.)"/>

package/src/version.js

@@ -6,6 +6,6 @@
 // The values here are replaced automatically by the .rultor.yml script,
 // at the "release" pipeline:
 module.exports = {
-  what: '0.33.2',
-  when: '2025-10-07'
+  what: '0.33.3',
+  when: '2025-10-12'
 };