@paroicms/site-generator-plugin 0.24.2 → 0.24.3

package/backend/dist/generator/fake-content-generator/create-node-contents.js

@@ -150,13 +150,24 @@ function getDefaultStringValueForField(fieldName) {
     return undefined;
 }
 export function generateLocalizedFooterMention(siteSchema) {
-    const { languages, languageLabels } = siteSchema;
+    const { languages } = siteSchema;
     return Object.fromEntries(languages.map((language) => [
         language,
         {
             j: {
-                ops: markdownToDelta(`Powered by ParoiCMS in ${languageLabels[language]}`),
+                ops: markdownToDelta(getPoweredByLabel(language)),
             },
         },
     ]));
 }
+function getPoweredByLabel(language) {
+    const translations = {
+        en: "Powered by ParoiCMS",
+        fr: "Propulsé par ParoiCMS",
+        es: "Desarrollado por ParoiCMS",
+        de: "Betrieben von ParoiCMS",
+        it: "Alimentato da ParoiCMS",
+        pt: "Desenvolvido por ParoiCMS",
+    };
+    return translations[language] ?? translations.en;
+}

package/backend/dist/generator/fake-content-generator/generate-fake-content.js

@@ -1,3 +1,4 @@
+import { isDef, } from "@paroicms/public-anywhere-lib";
 import { camelToKebabCase, camelToTitleCase } from "../lib/utils.js";
 import { createNodeContents } from "./create-node-contents.js";
 import { invokeGenerateFakeContent, } from "./invoke-generate-fake-content.js";
@@ -20,7 +21,7 @@ export async function generateMultipleFieldSetContents(ctx, options, report) {
         ? [{ tagName: "title", key: "title", format: "text", tagDescription: "Write the title here" }]
         : [];
     if (nodeType.fields) {
-        outputTags.push(...nodeType.fields.map(toFakeContentOutputTag).filter(Boolean));
+        outputTags.push(...nodeType.fields.map(toFakeContentOutputTag).filter(isDef));
     }
     const defaultLanguage = siteSchema.languages?.[0];
     const typeLabel = translateText(schemaI18n, `nodeTypes.${nodeType.typeName}.label`, {

package/backend/dist/generator/lib/calling-llm-mistral.js

@@ -1,11 +1,11 @@
-import { messageOf } from "@paroicms/public-anywhere-lib";
+import { isDef, messageOf } from "@paroicms/public-anywhere-lib";
 let seq = 0;
 export async function batchInvokeMinistral(ctx, prompts, options) {
     const startTime = Date.now();
     const responses = await execBatchInvokeMinistral(ctx, prompts, options);
     const llmMessages = responses
         .map((msg) => msg.response.body.choices[0]?.message.content)
-        .filter(Boolean);
+        .filter(isDef);
     const llmReport = {
         llmTaskName: options.llmTaskName,
         modelName: ctx.mistralModelName,

package/backend/dist/generator/lib/debug-utils.js

@@ -1,5 +1,5 @@
 import { ensureDirectory } from "@paroicms/internal-server-lib";
-import { isObj, messageOf } from "@paroicms/public-anywhere-lib";
+import { isDef, isObj, messageOf } from "@paroicms/public-anywhere-lib";
 import { readFile, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { estimateTokenCount } from "./llm-tokens.js";
@@ -112,7 +112,7 @@ async function writeDebugLlmInputOutputs(ctx, stepHandle, list, llmReport, start
         stepHandle?.stepNumber,
         llmReport.llmTaskName,
         llmReport.errorMessage ? "ERROR" : undefined,
-    ].filter(Boolean);
+    ].filter(isDef);
     const baseName = nameParts.join("-");
     const header = [
         `Model: ${llmReport.modelName}`,

package/backend/dist/generator/llm-queries/invoke-new-site-analysis.js

@@ -1,3 +1,4 @@
+import { isDef } from "@paroicms/public-anywhere-lib";
 import { loadStep } from "../../db/db-read.queries.js";
 import { insertStep, saveCompletedSchemaStep, updateStep, } from "../../db/db-write.queries.js";
 import { reorderObjectKeys } from "../helpers/js-utils.js";
@@ -210,7 +211,7 @@ function createUnusedInformationPrompt(unusedInformation, analysis) {
         .map(([typeName, entry]) => {
         return entry.prompt ? `${typeName}: ${entry.prompt}` : undefined;
     })
-        .filter(Boolean);
+        .filter(isDef);
     if (prompts.length > 0) {
         const nodeTypePrompts = `To do:\n\n- ${prompts.join("- \n")}`;
         return unusedInformation ? `${nodeTypePrompts}\n\n${unusedInformation}` : nodeTypePrompts;

package/backend/dist/generator/site-generator/common-template-creator.js

@@ -1,3 +1,4 @@
+import { isDef } from "@paroicms/public-anywhere-lib";
 import { getJtHomeType, getJtSiteType, isMultilingual } from "./jt-site-schema-helpers.js";
 import { indent } from "./template-helpers.js";
 export function templateOfDocumentBreadcrumb() {
@@ -24,7 +25,7 @@ export function templateOfSiteHeader(ctx) {
     ];
     return `<div class="_bg2">
   <header class="Container Header">
-    ${indent(content.filter(Boolean).join("\n"), 2, { skipFirst: true })}
+    ${indent(content.filter(isDef).join("\n"), 2, { skipFirst: true })}
   </header>
 </div>
 <div
@@ -57,7 +58,7 @@ function templateOfSiteLogoTitle(ctx) {
   class="Header-logo"
   href="{{ site.home.url }}"
   data-mobile-menu-part="logo">
-  ${indent(content.filter(Boolean).join("\n"), 1, { skipFirst: true })}
+  ${indent(content.filter(isDef).join("\n"), 1, { skipFirst: true })}
 </a>`;
 }
 function templateOfMainMenu(ctx) {
@@ -102,7 +103,7 @@ export function templateOfSiteFooter(ctx) {
     const content = [templateOfSiteFooterMention(ctx), templateOfLanguageSelector(ctx)];
     return `<div class="_bg2">
   <footer class="Container">
-    ${indent(content.filter(Boolean).join("\n"), 2, { skipFirst: true })}
+    ${indent(content.filter(isDef).join("\n"), 2, { skipFirst: true })}
   </footer>
 </div>`;
 }
@@ -120,10 +121,11 @@ function templateOfLanguageSelector(ctx) {
     return `<ul class="LanguageSelector">
   {% for translation in doc.translations %}
     <li>
-      <a
-        class="{% if translation.active %}active{% endif %}"
-        href="{{ translation.url }}"
-        title="{{ translation.languageLabel }}">{{ translation.language }}</a>
+      {% if translation.active %}
+        <span>{{ translation.languageLabel }}</span>
+      {% else %}
+        <a href="{{ translation.url }}">{{ translation.languageLabel }}</a>
+      {% endif %}
     </li>
   {% endfor %}
 </ul>`;

package/backend/dist/generator/site-generator/document-template-creator.js

@@ -1,7 +1,8 @@
+import { isDef } from "@paroicms/public-anywhere-lib";
 import { camelToKebabCase } from "../lib/utils.js";
 import { templateOfDocumentBreadcrumb } from "./common-template-creator.js";
 import { createIdKeyProvider } from "./id-key-provider.js";
-import { getJtPartType, getJtRoutingDocumentType, hasTemporalChildren, } from "./jt-site-schema-helpers.js";
+import { getJtPartType, getJtRegularDocumentType, getJtRoutingDocumentType, getPossibleJtLabelingFieldTypes, hasTemporalChildren, } from "./jt-site-schema-helpers.js";
 import { getPredefinedDataType, indent, localizedLabelTemplate } from "./template-helpers.js";
 export function templateOfDocumentType(ctx, documentType) {
     const childrenTemplate = templateOfDocumentChildren(ctx, documentType, createIdKeyProvider());
@@ -11,7 +12,9 @@ export function templateOfDocumentType(ctx, documentType) {
         })
         : undefined;
     const titleFieldsTemplate = templateOfTitleAndFields(ctx, documentType);
-    const listTemplates = documentType.lists?.map((list) => templateOfList(ctx, list, { listKey: `doc.list.${list.listName}`, nested: false })) ?? [];
+    const listTemplates = documentType.lists
+        ?.map((list) => templateOfList(ctx, list, { listKey: `doc.list.${list.listName}`, nested: false }))
+        .filter(isDef) ?? [];
     const specialTemplate = templateOfSpecialDocument(ctx, documentType);
     ctx.addLiquidFile("partials", "breadcrumb.liquid", templateOfDocumentBreadcrumb(), {
         skipIfExists: true,
@@ -23,7 +26,15 @@ export function templateOfDocumentType(ctx, documentType) {
         childrenTemplate,
         specialTemplate,
         ...listTemplates,
-    ].filter(Boolean);
+    ].filter(isDef);
+    const notOK = blocks.filter((f) => typeof f !== "string" || f === "false");
+    if (notOK.length > 0) {
+        console.log("......................BUG", notOK);
+        console.log("......................titleFieldsTemplate", titleFieldsTemplate);
+        console.log("......................childrenTemplate", childrenTemplate);
+        console.log("......................specialTemplate", specialTemplate);
+        console.log("......................listTemplates", listTemplates);
+    }
     return `{% layout "layouts/main-layout.liquid" doc: doc site: site %}
 {% block %}
 ${blocks.join("\n\n")}
@@ -39,7 +50,7 @@ function templateOfTitleAndFields(ctx, documentType) {
   ${indent(blocks1.join("\n"), 1, { skipFirst: true })}
 </div>`;
     const siblingsTemplate = documentType.documentKind === "regular" && templateOfSiblingLinks(ctx);
-    const blocks2 = [textBlock, siblingsTemplate].filter(Boolean);
+    const blocks2 = [textBlock, siblingsTemplate].filter(isDef);
     return `<div class="_bg2">
   <div class="Container">
     <div class="Page">
@@ -51,7 +62,7 @@ function templateOfTitleAndFields(ctx, documentType) {
 function templateOfSpecialDocument(ctx, documentType) {
     const { addLiquidFile } = ctx;
     if (documentType.typeName === "search" || documentType.typeName === "searchPage") {
-        addLiquidFile("partials", "result-item.public.liquid", templateOfDocumentTile("doc"));
+        addLiquidFile("partials", "result-item.public.liquid", templateOfDocumentCard(ctx, "doc"));
         return `<div
   class="Container"
   data-effect="paSearchApp"
@@ -63,19 +74,20 @@ function templateOfSpecialDocument(ctx, documentType) {
   <div class="TextWidth Pt">
     <div
       data-effect="paContactForm"
-      data-home-url="{{ site.home.url }}"></div>
+      data-home-url="{{ site.home.url }}"
+    ></div>
   </div>
 </div>`;
     }
 }
 function templateOfDocumentChildren(ctx, parentType, parentIdKeyProvider) {
     const routingBlocks = templateOfRoutingChildren(ctx, parentType, parentIdKeyProvider);
-    const regularBlocks = parentType.documentKind === "routing" &&
-        parentType.regularChildren &&
-        templateOfRegularDocumentTiles(ctx, parentType, parentIdKeyProvider, {
+    const regularBlocks = parentType.documentKind === "routing" && parentType.regularChildren
+        ? templateOfRegularDocumentCards(ctx, parentType, parentIdKeyProvider, {
             mode: "all",
-        });
-    return [routingBlocks, regularBlocks].filter(Boolean).join("\n\n") || undefined;
+        })
+        : undefined;
+    return [routingBlocks, regularBlocks].filter(isDef).join("\n\n") || undefined;
 }
 function templateOfRoutingChildren(ctx, parentType, parentIdKeyProvider) {
     const { siteSchema } = ctx;
@@ -87,7 +99,7 @@ function templateOfRoutingChildren(ctx, parentType, parentIdKeyProvider) {
         }
         return templateOfRoutingChild(ctx, child, parentIdKeyProvider);
     })
-        .filter(Boolean);
+        .filter(isDef);
     if (routingBlocks.length === 0)
         return;
     return `<div class="Container">
@@ -107,20 +119,20 @@ function templateOfRoutingChild(ctx, child, parentIdKeyProvider) {
 {% endif %}`;
         return buttonTemplate;
     }
-    const tilesTemplate = templateOfRegularDocumentTiles(ctx, child, idKeyProvider, {
+    const cardsTemplate = templateOfRegularDocumentCards(ctx, child, idKeyProvider, {
         mode: "sampleOnly",
     });
     return `{% if ${key} %}
-{% assign ${variableName} = ${key}.doc %}
-<div class="Pt">
-  <h2>
-    <a class="TextLink" href="{{ ${variableName}.url }}">{{ ${variableName}.title }}</a>
-  </h2>
-  ${indent(tilesTemplate, 1, { skipFirst: true })}
-</div>
+  {% assign ${variableName} = ${key}.doc %}
+  <div class="Pt">
+    <h2>
+      <a class="TextLink" href="{{ ${variableName}.url }}">{{ ${variableName}.title }}</a>
+    </h2>
+    ${indent(cardsTemplate, 2, { skipFirst: true })}
+  </div>
 {% endif %}`;
 }
-function templateOfRegularDocumentTiles(ctx, parentType, parentIdKeyProvider, { mode }) {
+function templateOfRegularDocumentCards(ctx, parentType, parentIdKeyProvider, { mode }) {
     const { siteSchema, addLiquidFile } = ctx;
     const { typeName: parentTypeName } = parentType;
     const childrenVariableName = `${parentTypeName}Children`;
@@ -130,7 +142,7 @@ function templateOfRegularDocumentTiles(ctx, parentType, parentIdKeyProvider, {
         return `{% getDocs ${childrenVariableName} parentId: ${idKey} limit: 4 %}
 <div class="List">
   {% for ${childVariableName} in ${childrenVariableName} %}
-    ${indent(templateOfDocumentTile(childVariableName), 2, { skipFirst: true })}
+    ${indent(templateOfDocumentCard(ctx, childVariableName, { parentType }), 2, { skipFirst: true })}
   {% endfor %}
 </div>`;
     }
@@ -138,12 +150,12 @@ function templateOfRegularDocumentTiles(ctx, parentType, parentIdKeyProvider, {
         return `{% getDocs ${childrenVariableName} parentId: ${idKey} %}
   <div class="Container List Pt Pb">
   {% for ${childVariableName} in ${childrenVariableName} %}
-    ${indent(templateOfDocumentTile(childVariableName), 2, { skipFirst: true })}
+    ${indent(templateOfDocumentCard(ctx, childVariableName, { parentType }), 2, { skipFirst: true })}
   {% endfor %}
 </div>`;
     }
-    const tileTemplateName = `${camelToKebabCase(parentTypeName)}-tile`;
-    addLiquidFile("partials", `${tileTemplateName}.public.liquid`, templateOfDocumentTile("doc"));
+    const cardTemplateName = `${camelToKebabCase(parentTypeName)}-card`;
+    addLiquidFile("partials", `${cardTemplateName}.public.liquid`, templateOfDocumentCard(ctx, "doc", { parentType }));
     return `{% getPaginatedDocs ${childrenVariableName} parentId: ${idKey} pageSize: 10 %}
 <div class="Container">
   <div
@@ -153,9 +165,10 @@ function templateOfRegularDocumentTiles(ctx, parentType, parentIdKeyProvider, {
     data-start="{{ ${childrenVariableName}.pageSize }}"
     data-limit="{{ ${childrenVariableName}.pageSize }}"
     data-total="{{ ${childrenVariableName}.total }}"
-    data-template="${tileTemplateName}">
+    data-template="${cardTemplateName}"
+  >
     {% for ${childrenVariableName} in ${childrenVariableName}.items %}
-      {% render "partials/${tileTemplateName}.public.liquid" doc: ${childrenVariableName} %}
+      {% render "partials/${cardTemplateName}.public.liquid" doc: ${childrenVariableName} %}
     {% endfor %}
   </div>
 </div>`;
@@ -178,9 +191,9 @@ function templateOfField(ctx, fieldOrName, parentKey) {
   <div class="Field">
     {% for tag in ${parentKey}.${fieldName} %}
       {% if tag.inRightLanguage %}
-        <a href="{{ tag.url }}">{{ tag.title }}</a>
+        <a class="Label" href="{{ tag.url }}">{{ tag.title }}</a>
       {% else %}
-        <span>{{ tag.title }}</span>
+        <span class="Label">{{ tag.title }}</span>
       {% endif %}
     {% endfor %}
   </div>
@@ -244,13 +257,15 @@ function templateOfPicture({ imageKey }) {
         srcset="{{ largeIm.url }}"
         width="{{ largeIm.width }}"
         height="{{ largeIm.height }}"
-        media="(min-width: 361px)">
+        media="(min-width: 361px)"
+      >
       <img
         src="{{ smallIm.url }}"
         width="{{ smallIm.width }}"
         height="{{ smallIm.height }}"
         loading="lazy"
-        alt="">
+        alt=""
+      >
     </picture>
   </div>
 {% endif %}`;
@@ -273,7 +288,7 @@ function templateOfList(ctx, list, { listKey, nested }) {
         return `{% ${ifOrElsif} part.type == "${partType.typeName}" %}
   {% render "partials/${partTemplateName}.liquid" part: part %}`;
     })
-        .filter(Boolean);
+        .filter(isDef);
     partTemplates.push("{% endif %}");
     if (nested) {
         return `{% if ${listKey} %}
@@ -303,7 +318,7 @@ function templateOfPart(ctx, part, partKey) {
                 nested: true,
             })
             : undefined,
-    ].filter(Boolean);
+    ].filter(isDef);
     return `<section class="TextWidth">
   ${indent(templates.join("\n\n"), 1, { skipFirst: true })}
 </section>`;
@@ -328,7 +343,22 @@ function templateOfSiblingLinks(ctx) {
   {% endif %}
 </div>`;
 }
-function templateOfDocumentTile(docVariableName) {
+function templateOfDocumentCard(ctx, docVariableName, { parentType } = {}) {
+    const { siteSchema } = ctx;
+    const possibleTypes = parentType
+        ? (parentType.regularChildren ?? []).map((childName) => getJtRegularDocumentType(siteSchema, childName))
+        : undefined;
+    const labelingFields = getPossibleJtLabelingFieldTypes(siteSchema, possibleTypes);
+    const labelingTemplates = labelingFields.map((field) => {
+        const fieldName = ` ${docVariableName}.field.${field.name}`;
+        return `{% if ${fieldName} %}
+  <ul class="FlexWrap">
+    {% for labelDoc in ${fieldName} %}
+      <li class="Label">{{ labelDoc.title }}</li>
+    {% endfor %}
+  </ul>
+{% endif %}`;
+    });
     return `<a href="{{ ${docVariableName}.url }}">
   <article>
     {% if ${docVariableName}.defaultImage %}
@@ -339,12 +369,14 @@ function templateOfDocumentTile(docVariableName) {
           width="{{ im.width }}"
           height="{{ im.height }}"
           loading="lazy"
-          alt="">
+          alt=""
+        >
       </div>
     {% endif %}
     <div>
       <h3>{{ ${docVariableName}.title }}</h3>
       <p>{{ ${docVariableName}.excerpt | makeExcerpt: 40 }}</p>
+      ${indent(labelingTemplates.join("\n"), 3, { skipFirst: true })}
     </div>
   </article>
 </a>`;

package/backend/dist/generator/site-generator/jt-site-schema-helpers.js

@@ -53,3 +53,19 @@ export function getFirstSiteLanguage(siteSchema) {
         throw new Error("Missing language in site schema");
     return siteSchema.languages[0];
 }
+export function getPossibleJtLabelingFieldTypes(siteSchema, possibleTypes) {
+    const searchInTypes = possibleTypes ??
+        siteSchema.nodeTypes?.filter((type) => type.kind === "document" && type.documentKind === "regular") ??
+        [];
+    const result = [];
+    for (const documentType of searchInTypes) {
+        for (const fieldType of documentType.fields ?? []) {
+            if (typeof fieldType !== "string" &&
+                fieldType.storedAs === "labeling" &&
+                !result.find((alreadyThere) => alreadyThere.name === fieldType.name)) {
+                result.push(fieldType);
+            }
+        }
+    }
+    return result;
+}

package/backend/dist/generator/site-generator/theme-css.js

@@ -69,7 +69,7 @@ footer {
   text-align: center;
 }
 
-/* Tile */
+/* Card */
 
 a > article {
   background-color: #fff;
@@ -270,6 +270,10 @@ nav a.active::after {
 
 .Field {
   margin: 20px 0;
+
+  a {
+    text-decoration: underline;
+  }
 }
 
 .Field:has(> .Field-img) {
@@ -300,5 +304,58 @@ nav a.active::after {
 .Row.center {
   align-items: center;
 }
+
+.LanguageSelector {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+
+  li {
+    display: inline-block;
+    margin: 0 5px;
+  }
+
+  li:not(:last-child)::after {
+    content: " - ";
+    margin-left: 5px;
+  }
+
+  a {
+    text-decoration: underline;
+  }
+
+  span {
+    font-weight: bold;
+  }
+}
+
+.FlexWrap {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 5px;
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+.Label {
+  background-color: #e9ecef;
+  border: 1px solid #dee2e6;
+  border-radius: 12px;
+  color: #495057;
+  display: inline-block;
+  font-size: 12px;
+  font-weight: 500;
+  margin: 0;
+  padding: 4px 8px;
+}
+
+a.Label {
+  background-color: #bedefeff;
+}
+
+a.Label:hover {
+  background-color: #8bc0f5ff;
+}
 `;
 }

package/backend/prompts/message-guard.md

@@ -24,7 +24,6 @@ These messages are invalid because they are malicious: the purpose is obviously
 The list of technical limits:
 
 - We can't do an online shop.
-- We can't implement taxonomies in the generator right now.
 
 # Guidelines