nodoku-core 0.1.1 → 0.1.4

package/{dist/esm → esm}/bin/mustache/component-resolver.ts.hbs

@@ -10,7 +10,7 @@ const components: Map<string, {compo: AsyncFunctionComponent, compoDef: NdCompon
 components.set("{{{name}}}", {compo: {{impl}}, compoDef: new NdComponentDefinition({{{numBlocks}}}, "{{{defaultThemeFile}}}")});
 {{/comps}}
 
-export function defaultComponentProvider(componentName: string): Promise<{compo: AsyncFunctionComponent, compoDef: NdComponentDefinition}> {
+export async function nodokuComponentResolver(componentName: string): Promise<{compo: AsyncFunctionComponent, compoDef: NdComponentDefinition}> {
     const f: {compo: AsyncFunctionComponent, compoDef: NdComponentDefinition} | undefined = components.get(componentName);
-    return Promise.resolve(f ? f : {compo: DummyComp, compoDef: new NdComponentDefinition(1)});
+    return f ? f : {compo: DummyComp, compoDef: new NdComponentDefinition(1)};
 }

package/{dist/esm → esm}/content/nd-content.js

@@ -3,7 +3,7 @@ export class NdContentImage {
     title;
     alt;
 }
-export class NdTranslatedText {
+export class NdTranslatableText {
     key = "";
     ns = "";
     text = "";
@@ -75,7 +75,7 @@ export class NdContentBlock {
 }
 function getPropertyFromObjectRecursively(obj, path) {
     // console.log(`getting path from obj >>${path}<<`, obj)
-    if (obj instanceof NdTranslatedText) {
+    if (obj instanceof NdTranslatableText) {
         return obj.text;
     }
     if (path.length == 0) {

package/{dist/esm → esm}/core/dummy-comp.jsx

@@ -1,4 +1,4 @@
-import { NdCode, NdTranslatedText } from "../content/nd-content";
+import { NdCode, NdTranslatableText } from "../content/nd-content";
 // import {CodeComp} from "./code-comp";
 export async function DummyComp(props) {
     // console.log("content dummy comp", props.theme)
@@ -33,7 +33,7 @@ async function render(rowIndex, componentIndex, block, t) {
 
                 paragraphs:
                 {await Promise.all(block.paragraphs.map(async (p, ip) => {
-            if (p instanceof NdTranslatedText) {
+            if (p instanceof NdTranslatableText) {
                 return (<div>
                                 {p && p.key}
                                 <p key={ip} className={"mb-3 font-normal text-gray-700 dark:text-gray-400"}>

package/esm/core/rendering-page-props.js

@@ -0,0 +1,35 @@
+export var RenderingPriority;
+(function (RenderingPriority) {
+    /*
+     * the content is rendered as it appears in the markdown file, sequentially, block by block, from top to bottom
+     * if a visual component is configured in the skin Yaml file, this visual component is used for rendering the content block.
+     * Otherwise a default visual component is used
+     */
+    RenderingPriority[RenderingPriority["content_first"] = 0] = "content_first";
+    /*
+     * the rendering is fully prescribed by the skin Yaml file
+     * The components are rendered in the order they appear in the Yaml file
+     * If a content block is not matched by any of the visual components in the skin Yaml file, it is not rendered at all
+     * If a content block matches more than one visual component, each visual component is rendered,
+     * and the same content block will appear several times on the page
+     */
+    RenderingPriority[RenderingPriority["skin_first"] = 1] = "skin_first";
+})(RenderingPriority || (RenderingPriority = {}));
+export class RenderingPageProps {
+    lng;
+    content;
+    skin = undefined;
+    renderingPriority = RenderingPriority.content_first;
+    componentResolver = undefined;
+    imageUrlProvider = undefined;
+    i18nextProvider = undefined;
+    constructor(lng, content, componentResolver, skin = undefined, renderingPriority = RenderingPriority.content_first, imageUrlProvider = undefined, i18nextProvider = undefined) {
+        this.lng = lng;
+        this.renderingPriority = renderingPriority;
+        this.content = content;
+        this.componentResolver = componentResolver;
+        this.skin = skin;
+        this.imageUrlProvider = imageUrlProvider;
+        this.i18nextProvider = i18nextProvider;
+    }
+}

package/{dist/esm → esm}/core/rendering-page.jsx

@@ -5,7 +5,7 @@ import { DummyComp } from "./dummy-comp";
 import yaml from "js-yaml";
 import fs from "node:fs";
 import { mergeTheme } from "../theme-utils/theme-merger";
-async function defaultComponentProvider() {
+async function defaultComponentResolver() {
     const compoDef = new NdComponentDefinition("unlimited", undefined, {});
     return { compo: DummyComp, compoDef: compoDef };
 }
@@ -13,11 +13,8 @@ async function defaultImageUrlProvider(imageUrl) {
     return imageUrl;
 }
 async function RenderingPage(props) {
-    const { lng, renderingPriority, content, componentProvider, skin, imageUrlProvider, i18nextProvider } = props;
-    const actualComponentProvider = componentProvider ? componentProvider : defaultComponentProvider;
-    // if (!componentProvider) {
-    //     componentProvider = defaultComponentProvider;
-    // }
+    const { lng, renderingPriority, content, componentResolver, skin, imageUrlProvider, i18nextProvider } = props;
+    const actualComponentResolver = componentResolver ? componentResolver : defaultComponentResolver;
     let l;
     if (skin) {
         let blockSkin = skin;
@@ -26,15 +23,11 @@ async function RenderingPage(props) {
         }
         // console.log(" >>> this is my content <<< ", content)
         // console.log(" >>> this is my skin <<< ", JSON.stringify(blockSkin))
-        l = await Promise.all(blockSkin.rows.map(async (row, iRow) => await createRow(row, iRow, content, lng, imageUrlProvider, i18nextProvider, actualComponentProvider)
-        // await createSubRows(row, iRow, content, lng, imageUrlProvider, i18nextProvider, actualComponentProvider)
-        ));
+        l = await Promise.all(blockSkin.rows.map(async (row, iRow) => await createRow(row, iRow, content, lng, imageUrlProvider, i18nextProvider, actualComponentResolver)));
     }
     else {
-        l = [await createRow(undefined, 0, content, lng, imageUrlProvider, i18nextProvider, actualComponentProvider)];
-        // l = [await createSubRows(undefined, 0, content, lng, imageUrlProvider, i18nextProvider, actualComponentProvider)];
+        l = [await createRow(undefined, 0, content, lng, imageUrlProvider, i18nextProvider, actualComponentResolver)];
     }
-    // const rows: JSX.Element[] = l.flatMap((a: JSX.Element[]) => a);
     return <div className={`${skin?.renderingPage?.base} ${skin?.renderingPage?.decoration}`}>{l}</div>;
 }
 function generateSkinByContentBlocks(blocks, skin) {
@@ -69,15 +62,18 @@ function generateSkinByContentBlocks(blocks, skin) {
     // console.log("generated skin", JSON.stringify(res))
     return res;
 }
-async function createRow(row, iRow, blocks, lng, imageUrlProvider, i18nProvider, componentProvider) {
+async function createRow(row, iRow, blocks, lng, imageUrlProvider, i18nProvider, componentResolver) {
     let l;
     if (row) {
-        l = await Promise.all(row.components.map(async (visualSection, iComp) => await createRowComponents(iRow, iComp, visualSection, blocks, lng, imageUrlProvider, i18nProvider, componentProvider)));
+        l = await Promise.all(row.components.map(async (visualSection, iComp) => await createRowComponents(iRow, iComp, visualSection, blocks, lng, imageUrlProvider, i18nProvider, componentResolver)));
     }
     else {
-        l = await Promise.all(blocks.map(async (block, iComp) => await createRowComponents(iRow, iComp, undefined, [block], lng, imageUrlProvider, i18nProvider, componentProvider)));
+        l = await Promise.all(blocks.map(async (block, iComp) => await createRowComponents(iRow, iComp, undefined, [block], lng, imageUrlProvider, i18nProvider, componentResolver)));
     }
     const rowComponents = l.flatMap((p) => p);
+    if (rowComponents.length == 0) {
+        return <></>;
+    }
     const numComponents = rowComponents.length;
     const rowEffectiveTheme = mergeTheme(row?.theme, NdRow.defaultRowTheme);
     const maxCols = row?.maxCols ? row.maxCols : 3;
@@ -111,9 +107,6 @@ async function createRow(row, iRow, blocks, lng, imageUrlProvider, i18nProvider,
         case 9:
             gridCols = "lg:grid-cols-9";
             break;
-        case 9:
-            gridCols = "lg:grid-cols-9";
-            break;
         case 10:
             gridCols = "lg:grid-cols-10";
             break;
@@ -124,28 +117,18 @@ async function createRow(row, iRow, blocks, lng, imageUrlProvider, i18nProvider,
             gridCols = "lg:grid-cols-12";
             break;
     }
-    // if (numComponents == 1) {
-    //     return [<div key={`row-${iRow}`} className={`${rowEffectiveTheme?.base} ${rowEffectiveTheme?.decoration} class-row-${iRow}`}>{rowComponents[0]}</div>];
-    // } else {
-    // const subRows: JSX.Element[] = [];
-    // for (var i = 0; i < numComponents / numCols; i++) {
-    //     subRows.push(
-    //         <div key={`row-${iRow}`} className={`grid ${gridCols} ${rowEffectiveTheme?.base} ${rowEffectiveTheme?.decoration} class-row-${iRow}`}>
-    //             {rowComponents.slice(numCols * i, Math.min((i + 1) * numCols, numComponents))}
-    //         </div>
-    //     )
-    //
-    // }
     return (<div key={`row-${iRow}`} className={`grid ${gridCols} ${rowEffectiveTheme?.base} ${rowEffectiveTheme?.decoration} class-row-${iRow}`}>
-                {rowComponents}
-            </div>);
-    // }
+            {rowComponents}
+        </div>);
 }
-async function createRowComponents(rowIndex, blockIndex, skinComponent, pageContent, lng, imageUrlProvide, i18nProvider, componentProvider) {
+async function createRowComponents(rowIndex, blockIndex, skinComponent, pageContent, lng, imageUrlProvide, i18nProvider, componentResolver) {
     // console.log("before component", skinComponent)
     const filteredBlocks = skinComponent ? skinComponent.selector.filterBlocks(pageContent) : pageContent;
+    if (filteredBlocks.length == 0) {
+        return [];
+    }
     // console.log("retrieving comp", rowIndex, blockIndex, filteredBlocks.map(fb => JSON.stringify(fb.attributes)).join(", "));
-    const { compo, compoDef } = await componentProvider(skinComponent ? skinComponent.componentName : "default");
+    const { compo, compoDef } = await componentResolver(skinComponent ? skinComponent.componentName : "default");
     // console.log("start rendering comp", rowIndex, blockIndex, skinComponent);
     if (!compoDef.defaultTheme && compoDef.defaultThemeYaml) {
         compoDef.defaultTheme = yaml.load(fs.readFileSync(compoDef.defaultThemeYaml).toString());

package/{dist/esm → esm}/index.js

@@ -1,11 +1,11 @@
-import { NdContentImage, NdTranslatedText, NdList, NdCode, NdContentBlock } from "./content/nd-content";
+import { NdContentImage, NdTranslatableText, NdList, NdCode, NdContentBlock } from "./content/nd-content";
 import { NdSkinComponent, NdRow, NdPageSkin, NdSkinComponentProps, NdContentSelector, NdComponentDefinition, NdThemeHierarchy } from "./skin/nd-skin";
 import { RenderingPageProps, RenderingPriority } from "./core/rendering-page-props";
 import { RenderingPage } from "./core/rendering-page";
 import { mergeTheme } from "./theme-utils/theme-merger";
 import { ThemeStyle } from "./theme-utils/theme-style";
 import { ExtendedThemeStyle } from "./theme-utils/extended-theme-style";
-export { NdContentImage, NdTranslatedText, NdList, NdCode, NdContentBlock, NdSkinComponent, NdRow, NdPageSkin, NdSkinComponentProps, NdContentSelector, NdComponentDefinition, NdThemeHierarchy };
+export { NdContentImage, NdTranslatableText, NdList, NdCode, NdContentBlock, NdSkinComponent, NdRow, NdPageSkin, NdSkinComponentProps, NdContentSelector, NdComponentDefinition, NdThemeHierarchy };
 export { RenderingPageProps, RenderingPriority, RenderingPage };
 export { mergeTheme, ThemeStyle, ExtendedThemeStyle };
 export { DummyComp } from "./core/dummy-comp";

package/{dist/esm → esm}/providers/content/content-markdown-provider.js

@@ -1,4 +1,4 @@
-import { NdTranslatedText, NdList, NdContentBlock, NdContentImage, NdCode } from "nodoku-core";
+import { NdTranslatableText, NdList, NdContentBlock, NdContentImage, NdCode } from "nodoku-core";
 import { Marked } from '@ts-stack/markdown';
 import { parse } from 'node-html-parser';
 import yaml from "js-yaml";
@@ -171,27 +171,27 @@ class BlockHolder {
         this.blockContent.htmlStream.forEach((htmlElem, i) => {
             let text = undefined;
             if (i === this.blockContent.titleIndex) {
-                newBlock.title = new NdTranslatedText(this.ns, `${blockId}.title`, htmlElem.innerHTML);
+                newBlock.title = new NdTranslatableText(this.ns, `${blockId}.title`, htmlElem.innerHTML);
                 text = newBlock.title;
             }
             else if (i === this.blockContent.subTitleIndex) {
-                newBlock.subTitle = new NdTranslatedText(this.ns, `${blockId}.subTitle`, htmlElem.innerHTML);
+                newBlock.subTitle = new NdTranslatableText(this.ns, `${blockId}.subTitle`, htmlElem.innerHTML);
                 text = newBlock.subTitle;
             }
             else if (i === this.blockContent.h3Index) {
-                newBlock.h3 = new NdTranslatedText(this.ns, `${blockId}.h3`, htmlElem.innerHTML);
+                newBlock.h3 = new NdTranslatableText(this.ns, `${blockId}.h3`, htmlElem.innerHTML);
                 text = newBlock.h3;
             }
             else if (i === this.blockContent.h4Index) {
-                newBlock.h4 = new NdTranslatedText(this.ns, `${blockId}.h4`, htmlElem.innerHTML);
+                newBlock.h4 = new NdTranslatableText(this.ns, `${blockId}.h4`, htmlElem.innerHTML);
                 text = newBlock.h4;
             }
             else if (i === this.blockContent.h5Index) {
-                newBlock.h5 = new NdTranslatedText(this.ns, `${blockId}.h5`, htmlElem.innerHTML);
+                newBlock.h5 = new NdTranslatableText(this.ns, `${blockId}.h5`, htmlElem.innerHTML);
                 text = newBlock.h5;
             }
             else if (i === this.blockContent.h6Index) {
-                newBlock.h6 = new NdTranslatedText(this.ns, `${blockId}.h6`, htmlElem.innerHTML);
+                newBlock.h6 = new NdTranslatableText(this.ns, `${blockId}.h6`, htmlElem.innerHTML);
                 text = newBlock.h6;
             }
             else if (this.blockContent.paragraphsIndex.indexOf(i) >= 0) {
@@ -213,16 +213,16 @@ class BlockHolder {
                         const imgHtmlElem = cn;
                         if (imgHtmlElem.rawTagName == "img") {
                             img = new NdContentImage();
-                            img.url = new NdTranslatedText(this.ns, `${blockId}.images.${imi}.url`, imgHtmlElem.attributes["src"], true);
-                            img.alt = new NdTranslatedText(this.ns, `${blockId}.images.${imi}.alt`, imgHtmlElem.attributes["alt"]);
-                            img.title = new NdTranslatedText(this.ns, `${blockId}.images.${imi}.title`, imgHtmlElem.attributes["title"]);
+                            img.url = new NdTranslatableText(this.ns, `${blockId}.images.${imi}.url`, imgHtmlElem.attributes["src"], true);
+                            img.alt = new NdTranslatableText(this.ns, `${blockId}.images.${imi}.alt`, imgHtmlElem.attributes["alt"]);
+                            img.title = new NdTranslatableText(this.ns, `${blockId}.images.${imi}.title`, imgHtmlElem.attributes["title"]);
                         }
                     });
                     if (img) {
                         htmlElem.childNodes
                             .forEach((cn) => {
                             if (cn.rawTagName == "figcaption") {
-                                img.title = new NdTranslatedText(this.ns, `${blockId}.images.${imi}.title`, cn.innerHTML);
+                                img.title = new NdTranslatableText(this.ns, `${blockId}.images.${imi}.title`, cn.innerHTML);
                             }
                         });
                     }
@@ -232,9 +232,9 @@ class BlockHolder {
                      * extract image from <img>
                      */
                     img = new NdContentImage();
-                    img.url = new NdTranslatedText(this.ns, `${blockId}.images.${imi}.url`, htmlElem.attributes["src"], true);
-                    img.alt = new NdTranslatedText(this.ns, `${blockId}.images.${imi}.alt`, htmlElem.attributes["alt"]);
-                    img.title = new NdTranslatedText(this.ns, `${blockId}.images.${imi}.title`, htmlElem.attributes["title"]);
+                    img.url = new NdTranslatableText(this.ns, `${blockId}.images.${imi}.url`, htmlElem.attributes["src"], true);
+                    img.alt = new NdTranslatableText(this.ns, `${blockId}.images.${imi}.alt`, htmlElem.attributes["alt"]);
+                    img.title = new NdTranslatableText(this.ns, `${blockId}.images.${imi}.title`, htmlElem.attributes["title"]);
                 }
                 if (img) {
                     newBlock.images.push(img);
@@ -243,22 +243,22 @@ class BlockHolder {
                 }
             }
             else {
-                text = new NdTranslatedText(this.ns, `${blockId}.htmlElements.${newBlock.htmlElements.length}`, "");
+                text = new NdTranslatableText(this.ns, `${blockId}.htmlElements.${newBlock.htmlElements.length}`, "");
             }
             newBlock.htmlElements.push({ htmlElem: htmlElem, translatedText: text });
         });
         if (this.blockContent.footer && this.blockContent.footer.trim().length > 0) {
-            newBlock.footer = new NdTranslatedText(this.ns, `${blockId}.footer`, this.blockContent.footer);
+            newBlock.footer = new NdTranslatableText(this.ns, `${blockId}.footer`, this.blockContent.footer);
         }
         if (this.blockContent.bgImage && this.blockContent.bgImage.getAttribute("src")) {
-            newBlock.bgImageUrl = new NdTranslatedText(this.ns, `${blockId}.bgImageUrl`, this.blockContent.bgImage.getAttribute("src"), true);
+            newBlock.bgImageUrl = new NdTranslatableText(this.ns, `${blockId}.bgImageUrl`, this.blockContent.bgImage.getAttribute("src"), true);
         }
         // console.log("added block", newBlock)
         return newBlock;
     }
     parseParagraph(blockId, p, pi) {
         if (p.rawTagName === "p" || p.rawTagName === "blockquote") {
-            return new NdTranslatedText(this.ns, `${blockId}.paragraphs.${pi}`, p.innerHTML);
+            return new NdTranslatableText(this.ns, `${blockId}.paragraphs.${pi}`, p.innerHTML);
         }
         else if (p.rawTagName === "pre") {
             const codeHtml = p.childNodes[0];
@@ -276,7 +276,7 @@ class BlockHolder {
                 .filter(lin => lin.innerText && lin.innerText.trim().length > 0)
                 .map((lin, k) => {
                 const li = lin;
-                return new NdTranslatedText(this.ns, `${blockId}.paragraphs.${pi}.items.${k}`, li.innerHTML);
+                return new NdTranslatableText(this.ns, `${blockId}.paragraphs.${pi}.items.${k}`, li.innerHTML);
             }));
         }
         else if (p.rawTagName === "ul") {
@@ -284,7 +284,7 @@ class BlockHolder {
                 .filter(lin => lin.innerText && lin.innerText.trim().length > 0)
                 .map((lin, k) => {
                 const li = lin;
-                return new NdTranslatedText(this.ns, `${blockId}.paragraphs.${pi}.items.${k}`, li.innerHTML);
+                return new NdTranslatableText(this.ns, `${blockId}.paragraphs.${pi}.items.${k}`, li.innerHTML);
             }));
         }
         console.log("couldn't parse paragraph: ", p);

package/{dist/esm → esm}/providers/skin/skin-yaml-provider.js

@@ -1,5 +1,5 @@
 import yaml from "js-yaml";
-import { NdContentSelector, NdRow, NdSkinComponent, NdThemeHierarchy } from "../../skin/nd-skin";
+import { NdContentSelector, NdPageSkin, NdRow, NdSkinComponent, NdThemeHierarchy } from "../../skin/nd-skin";
 export async function skinYamlProvider(yamlFileUrl) {
     return await fetch(yamlFileUrl)
         .then(response => response.text())
@@ -7,6 +7,9 @@ export async function skinYamlProvider(yamlFileUrl) {
 }
 export function parseYamlContentAsSkin(fileContents) {
     const data = yaml.load(fileContents);
+    if (!data) {
+        return new NdPageSkin();
+    }
     let defaultThemeName = "light";
     let globalTheme = {};
     let globalThemes = [];

package/package.json

@@ -1,25 +1,22 @@
 {
   "name": "nodoku-core",
-  "version": "0.1.1",
+  "version": "0.1.4",
   "description": "basic foundation for nodoku static site generator",
   "exports": {
     ".": {
-      "types": "./dist/types/index.d.ts",
-      "import": "./dist/esm/index.js"
+      "types": "./types/index.d.ts",
+      "import": "./esm/index.js"
     },
     "./package.json": "./package.json"
   },
-  "module": "dist/esm/index.js",
-  "types": "dist/types/index.d.ts",
-  "files": [
-    "dist"
-  ],
+  "module": "esm/index.js",
+  "types": "types/index.d.ts",
   "type": "module",
   "bin": {
-    "nodoku-gen-component-resolver": "./dist/esm/bin/generate-component-resolver.js",
-    "nodoku-gen-content-schema": "./dist/esm/bin/generate-content-schema.js",
-    "nodoku-gen-skin-schema": "./dist/esm/bin/generate-skin-schema.js",
-    "nodoku-gen-component-default-theme": "./dist/esm/bin/generate-component-default-theme.js"
+    "nodoku-gen-component-resolver": "./esm/bin/generate-component-resolver.js",
+    "nodoku-gen-content-schema": "./esm/bin/generate-content-schema.js",
+    "nodoku-gen-skin-schema": "./esm/bin/generate-skin-schema.js",
+    "nodoku-gen-component-default-theme": "./esm/bin/generate-component-default-theme.js"
   },
   "dependencies": {
   },
@@ -47,8 +44,5 @@
     "react-dom": "^18.3.1",
     "typescript": "^5.5.3",
     "shx": "^0.3.4"
-  },
-  "scripts": {
-    "dist": "shx rm -rf dist && tsc && shx cp -r src/bin/mustache dist/esm/bin/ && shx cp -r schemas dist"
   }
 }

package/schemas/md-content-block-delimiter.json

@@ -0,0 +1,26 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "string"
+    },
+    "namespace": {
+      "type": "string"
+    },
+    "tags": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "attributes": {
+      "type": "object",
+      "additionalProperties": {
+        "type": "string"
+      }
+    }
+  },
+  "additionalProperties": false,
+  "additionalItems": false
+}

package/{dist/types → types}/content/nd-content.d.ts

@@ -1,10 +1,10 @@
 import HTMLElement from "node-html-parser/dist/nodes/html";
 export declare class NdContentImage {
-    url: NdTranslatedText;
-    title?: NdTranslatedText;
-    alt?: NdTranslatedText;
+    url: NdTranslatableText;
+    title?: NdTranslatableText;
+    alt?: NdTranslatableText;
 }
-export declare class NdTranslatedText {
+export declare class NdTranslatableText {
     key: string;
     ns: string;
     text: string;
@@ -12,11 +12,11 @@ export declare class NdTranslatedText {
     constructor(ns: string, key?: string, text?: string, excludeFromTranslation?: boolean);
 }
 export declare class NdList {
-    items: NdTranslatedText[];
+    items: NdTranslatableText[];
     ordered: boolean;
     private constructor();
-    static createOrdered(items: NdTranslatedText[]): NdList;
-    static createUnOrdered(items: NdTranslatedText[]): NdList;
+    static createOrdered(items: NdTranslatableText[]): NdList;
+    static createUnOrdered(items: NdTranslatableText[]): NdList;
 }
 export declare class NdCode {
     lang: string;
@@ -32,19 +32,19 @@ export declare class NdContentBlock {
     }[];
     tags: string[];
     namespace: string;
-    title?: NdTranslatedText;
-    subTitle?: NdTranslatedText;
-    h3?: NdTranslatedText;
-    h4?: NdTranslatedText;
-    h5?: NdTranslatedText;
-    h6?: NdTranslatedText;
-    footer?: NdTranslatedText;
-    paragraphs: (NdTranslatedText | NdList | NdCode)[];
-    bgImageUrl?: NdTranslatedText;
+    title?: NdTranslatableText;
+    subTitle?: NdTranslatableText;
+    h3?: NdTranslatableText;
+    h4?: NdTranslatableText;
+    h5?: NdTranslatableText;
+    h6?: NdTranslatableText;
+    footer?: NdTranslatableText;
+    paragraphs: (NdTranslatableText | NdList | NdCode)[];
+    bgImageUrl?: NdTranslatableText;
     images: NdContentImage[];
     htmlElements: {
         htmlElem: HTMLElement;
-        translatedText: (NdTranslatedText | NdContentImage | NdList | NdCode);
+        translatedText: (NdTranslatableText | NdContentImage | NdList | NdCode);
     }[];
     constructor(id: string, ns: string, lng: string);
     getByKey(key: string, ns: string): string | undefined;

package/{dist/types → types}/core/providers.d.ts

@@ -1,12 +1,12 @@
 import { JSX } from "react";
 import { NdComponentDefinition, NdSkinComponentProps } from "../skin/nd-skin";
-import { NdTranslatedText } from "../content/nd-content";
+import { NdTranslatableText } from "../content/nd-content";
 export type AsyncFunctionComponent = (props: NdSkinComponentProps) => Promise<JSX.Element>;
-export type ComponentProvider = (componentName: string) => Promise<{
+export type ComponentResolver = (componentName: string) => Promise<{
     compo: AsyncFunctionComponent;
     compoDef: NdComponentDefinition;
 }>;
 export type I18nextProvider = (lng: string) => Promise<{
-    t: (text: NdTranslatedText) => string;
+    t: (text: NdTranslatableText) => string;
 }>;
 export type ImageUrlProvider = (imageUrl: string) => Promise<string>;

package/{dist/types → types}/core/rendering-page-props.d.ts

@@ -1,4 +1,4 @@
-import { ComponentProvider, I18nextProvider, ImageUrlProvider } from "./providers";
+import { ComponentResolver, I18nextProvider, ImageUrlProvider } from "./providers";
 import { NdContentBlock } from "../content/nd-content";
 import { NdPageSkin } from "../skin/nd-skin";
 export declare enum RenderingPriority {
@@ -7,11 +7,11 @@ export declare enum RenderingPriority {
 }
 export declare class RenderingPageProps {
     lng: string;
-    renderingPriority: RenderingPriority;
     content: NdContentBlock[];
-    componentProvider: ComponentProvider | undefined;
     skin: NdPageSkin | undefined;
+    renderingPriority: RenderingPriority;
+    componentResolver: ComponentResolver | undefined;
     imageUrlProvider: ImageUrlProvider | undefined;
     i18nextProvider: I18nextProvider | undefined;
-    constructor(lng: string, renderingPriority: RenderingPriority | undefined, content: NdContentBlock[], componentProvider: ComponentProvider | undefined, skin: NdPageSkin | undefined, imageUrlProvider: ImageUrlProvider | undefined, i18nextProvider: I18nextProvider | undefined);
+    constructor(lng: string, content: NdContentBlock[], componentResolver: ComponentResolver | undefined, skin?: NdPageSkin | undefined, renderingPriority?: RenderingPriority, imageUrlProvider?: ImageUrlProvider | undefined, i18nextProvider?: I18nextProvider | undefined);
 }

package/{dist/types → types}/index.d.ts

@@ -1,4 +1,4 @@
-import { NdContentImage, NdTranslatedText, NdList, NdCode, NdContentBlock } from "./content/nd-content";
+import { NdContentImage, NdTranslatableText, NdList, NdCode, NdContentBlock } from "./content/nd-content";
 import { NdSkinComponent, NdRow, NdPageSkin, NdSkinComponentProps, NdContentSelector, NdComponentDefinition, NdThemeHierarchy, NdDefaultThemeName } from "./skin/nd-skin";
 import { RenderingPageProps, RenderingPriority } from "./core/rendering-page-props";
 import { RenderingPage } from "./core/rendering-page";
@@ -6,7 +6,7 @@ import { I18nextProvider, AsyncFunctionComponent, ImageUrlProvider } from "./cor
 import { mergeTheme } from "./theme-utils/theme-merger";
 import { ThemeStyle } from "./theme-utils/theme-style";
 import { ExtendedThemeStyle } from "./theme-utils/extended-theme-style";
-export { NdContentImage, NdTranslatedText, NdList, NdCode, NdContentBlock, NdSkinComponent, NdRow, NdPageSkin, NdSkinComponentProps, NdContentSelector, NdComponentDefinition, NdThemeHierarchy, type NdDefaultThemeName };
+export { NdContentImage, NdTranslatableText, NdList, NdCode, NdContentBlock, NdSkinComponent, NdRow, NdPageSkin, NdSkinComponentProps, NdContentSelector, NdComponentDefinition, NdThemeHierarchy, type NdDefaultThemeName };
 export { RenderingPageProps, RenderingPriority, RenderingPage };
 export { mergeTheme, ThemeStyle, ExtendedThemeStyle };
 export type { I18nextProvider, AsyncFunctionComponent, ImageUrlProvider };

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024 nodoku
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/README.MD

@@ -1,46 +0,0 @@
-nodoku-core is a foundation library for the nodoku static site generator, 
-a Node JS - React based framework for fast page prototyping using yaml files as content and page config
-The site in Nodoku is composed of two yaml files - visual and content.
-
-# getting started
-
-in order to use nodoku one needs to install the nodoku-core library (this one)
-and at least one component library for nodoku (for example, nodoku-flowbite)
-
-
-```shell
-npm install nodoku-core nodoku-flowbite
-```
-
-Then the rendering component would be as follows:
-
-```tsx
-<RenderingPage 
-    pageName={"main"}
-    lng={lng}
-    contentYamlProvider={contentYamlProvider}
-    visualYamlProvider={visualYamlProvider}
-    i18nextProvider={i18nextProvider}
-    componentProvider={defaultComponentProvider}
-    />
-```
-
-where:
-- **_pageName_**: the name of the page to be rendered. This name is given to the visualYamlProvider funtion to fetch the required page layout yaml file
-
-- **_lng_**: the page language for localization. This parameter is given further to the contentYamlProvider to fetch the content on the given language
-
-- **_contentYamlProvider_**: function providing the textual content for the page. This function is expected to fetch the content yaml file and return its content as text for the further processing. the function signature is the following: ```(lng: string, ns: string) => Promise<string>```
-
-- **_visualYamlProvider_**: function providing the content of a yaml file that is used to render the page - the page structure yaml file. This function is expected to fetch the content yaml file and return its content as text for the further processing. the function signature is the following: ```(pageName: string) => Promise<string>```
-
-- **_i18nextProvider_**: the page localization provider. The signature is the following: ```(lng: string) => Promise<{t: (key: string, ns: string) => string}>```. For a given language the localization provider is supposed to return a function, that would provide the value for a given key and namespace
-
-- **_componentProvider_**: the function returning an actual implementation of the component, given its name, as specified in the page structure - visual yaml file. The signature is as follows: ```(componentName: string) => Promise<AsyncFunctionComponent>```, where AsyncFunctionComponent is the following function: ```(props: LbComponentProps) => Promise<JSX.Element>```
-
-# generation scripts
-to simplify the development, the nodoku-core provides the following scripts, that are used to generate component resolver, content schema and visual schema, by scanning the **node_modules** folder of the project
-- **nodoku-gen-component-resolver**: generates the component resolver by scanning node_modules and searching for nodoku component libraries - the libraries providing the nodoku.manifest.json file
-- **nodoku-gen-content-schema**: generates the json schema file that can be used to validate the **content** yaml file
-- **nodoku-gen-visual-schema**: generates the json schema file thate can be used to validate the **visual** page yaml file 
-

package/dist/esm/core/rendering-page-props.js

@@ -1,23 +0,0 @@
-export var RenderingPriority;
-(function (RenderingPriority) {
-    RenderingPriority[RenderingPriority["content_first"] = 0] = "content_first";
-    RenderingPriority[RenderingPriority["skin_first"] = 1] = "skin_first";
-})(RenderingPriority || (RenderingPriority = {}));
-export class RenderingPageProps {
-    lng;
-    renderingPriority;
-    content;
-    componentProvider;
-    skin;
-    imageUrlProvider = undefined;
-    i18nextProvider = undefined;
-    constructor(lng, renderingPriority = RenderingPriority.content_first, content, componentProvider, skin, imageUrlProvider, i18nextProvider) {
-        this.lng = lng;
-        this.renderingPriority = renderingPriority;
-        this.content = content;
-        this.componentProvider = componentProvider;
-        this.skin = skin;
-        this.imageUrlProvider = imageUrlProvider;
-        this.i18nextProvider = i18nextProvider;
-    }
-}