nodoku-core 0.2.2 → 0.2.3

package/esm/bin/generate-component-resolver.js

@@ -12,16 +12,12 @@ register('./import-load-hooks.js', import.meta.url);
  */
 // @ts-ignore
 const template = (await import("./mustache/component-resolver.ts.hbs")).default;
-class TemplateView {
-    modules = [];
-    comps = [];
-}
 function calculateTemplateView(dirNodeModules = undefined) {
     if (!dirNodeModules) {
         dirNodeModules = `${path.resolve()}/node_modules`;
     }
     const manifests = loadManifestsFromFolder(dirNodeModules);
-    const view = new TemplateView();
+    const view = { modules: [], comps: [] };
     manifests.forEach((m, k) => {
         let prefix = "";
         if (m.namespace) {

package/esm/bin/generate-skin-schema.js

@@ -12,15 +12,12 @@ register('./import-load-hooks.js', import.meta.url);
  */
 // @ts-ignore
 const template = (await import("./mustache/visual-schema.json.hbs")).default;
-class TemplateView {
-    components = new Map();
-}
 function calculateTemplateView(schemaDestinationDir, dirNodeModules = undefined) {
     if (!dirNodeModules) {
         dirNodeModules = path.resolve("./node_modules");
     }
     const components = loadManifestsFromFolder(dirNodeModules);
-    const tv = new TemplateView();
+    const tv = { components: new Map() };
     components.forEach((m) => {
         m.components.forEach((cd, cn) => {
             const moduleDir = `${dirNodeModules}/${m.moduleName}`;

package/esm/bin/manifest-loader.js

@@ -1,4 +1,3 @@
-import { ComponentDef, Manifest } from "./manifest.js";
 import fs from "node:fs";
 import path from "path";
 export function loadManifestsFromFolder(dir) {
@@ -23,7 +22,11 @@ function loadComponentsByManifest(dir, moduleName) {
         const stat = fs.statSync(moduleDir);
         if (stat.isFile()) {
             if (f == "nodoku.manifest.json") {
-                const manifest = new Manifest(moduleName, moduleDir);
+                const manifest = {
+                    moduleName: moduleName,
+                    moduleDir: moduleDir,
+                    components: new Map()
+                };
                 console.log("found manifest ", `${dir}/${f}`, "reading...");
                 let json;
                 if (stat.isSymbolicLink()) {
@@ -39,7 +42,14 @@ function loadComponentsByManifest(dir, moduleName) {
                     const v = json.components[k];
                     console.log("adding ", k, v);
                     // comps.set(k, Manifest.from(k, moduleName, v));
-                    manifest.components.set(k, new ComponentDef(v.implementation, v.schemaFile, v.optionsFile, v.defaultThemeFile, v.numBlocks));
+                    // manifest.components.set(k, new ComponentDef(v.implementation, v.schemaFile, v.optionsFile, v.defaultThemeFile, v.numBlocks))
+                    manifest.components.set(k, {
+                        implementation: v.implementation,
+                        themeSchema: v.schemaFile,
+                        optionsSchema: v.optionsFile,
+                        defaultThemeFile: v.defaultThemeFile,
+                        numBlocks: v.numBlocks
+                    });
                 });
                 return manifest;
             }

package/esm/bin/manifest.js

@@ -1,24 +1 @@
-export class ComponentDef {
-    implementation;
-    themeSchema;
-    optionsSchema;
-    defaultThemeFile;
-    numBlocks;
-    constructor(componentImplementation, componentSchema, optionsSchema, defaultThemeFile, numBlocks) {
-        this.implementation = componentImplementation;
-        this.themeSchema = componentSchema;
-        this.optionsSchema = optionsSchema;
-        this.defaultThemeFile = defaultThemeFile;
-        this.numBlocks = numBlocks;
-    }
-}
-export class Manifest {
-    moduleName;
-    moduleDir;
-    namespace = undefined;
-    components = new Map();
-    constructor(moduleName, moduleDir) {
-        this.moduleName = moduleName;
-        this.moduleDir = moduleDir;
-    }
-}
+export {};

package/esm/core/dummy-comp.jsx

@@ -8,12 +8,10 @@ export async function DummyComp(props) {
 async function render(rowIndex, componentIndex, block, t) {
     console.log("this is my block", block.callToActions.map(cta => `${cta.ctaUrl.key}`));
     return (<div className={"w-full w-full flex flex-col items-left justify-left  border border-4 border-red-200 relative pb-10"}>
-            {/*<div className={"top-0 bottom-0 left-0 right-0 absolute bg-cover bg-no-repeat"}*/}
-            {/*     style={{...style, zIndex: -11}}>*/}
-            {/*</div>*/}
-            <div className={"top-0 bottom-0 left-0 right-0 absolute bg-white "} style={{ zIndex: -5, opacity: 0.7 }}>
+            <div className={"top-0 bottom-0 left-0 right-0 absolute bg-white "} style={{ zIndex: -5, opacity: 0.7 }}></div>
+            <div className={"p-5 w-full bg-red-400 text-center"}>
+                dummy component<h3><b>{`ns-${block.namespace}-row-${rowIndex}-i-${componentIndex}`}</b></h3>
             </div>
-            <div className={"p-5 w-full bg-red-400 text-center"}>dummy component<h3><b>{`ns-${block.namespace}-row-${rowIndex}-i-${componentIndex}`}</b></h3></div>
 
 
             <div className="p-5">

package/esm/core/rendering-page.jsx

@@ -31,7 +31,8 @@ async function RenderingPage(props) {
     else {
         l = [await createRow(undefined, 0, content, lng, imageProvider, i18nextProvider, actualComponentResolver)];
     }
-    return <div className={`${skin?.renderingPage?.base} ${skin?.renderingPage?.decoration}`}>{l}</div>;
+    const actualSkin = mergeTheme(skin, { renderingPage: { base: "", decoration: "" }, rows: [] });
+    return <div className={`rows-container ${ts(actualSkin, "renderingPage")}`}>{l}</div>;
 }
 function generateSkinByContentBlocks(blocks, skin) {
     const rendered = new Set();
@@ -75,7 +76,7 @@ async function createRow(row, iRow, blocks, lng, imageProvider, i18nProvider, co
     }
     const rowComponents = l.flatMap((p) => p);
     if (rowComponents.length == 0) {
-        return <></>;
+        return <div key={`row-${iRow}`}></div>;
     }
     const numComponents = rowComponents.length;
     const rowEffectiveTheme = mergeTheme(row?.theme, defaultRowThemeImpl);
@@ -137,8 +138,8 @@ async function createRow(row, iRow, blocks, lng, imageProvider, i18nProvider, co
     if (rowEffectiveTheme.rowDisplay == "flex") {
         rowDisplay = "flex flex-row justify-center flex-wrap flex-1";
     }
-    return (<div key={`row-${iRow}`} className={`${rowDisplay} ${rowEffectiveTheme?.base} ${rowEffectiveTheme?.decoration} class-row-${iRow}`}>
-            {rowComponents.map((c) => <div className={`nd-component-holder ${flexBasis} ${ts(rowEffectiveTheme, "componentHolder")} ${rowEffectiveTheme.componentHolder?.base} ${rowEffectiveTheme.componentHolder?.decoration}`}>
+    return (<div key={`row-${iRow}`} className={`row-${iRow} ${rowDisplay} ${rowEffectiveTheme?.base} ${rowEffectiveTheme?.decoration} class-row-${iRow}`}>
+            {rowComponents.map((c, i) => <div key={`row-${iRow}-component-${i}`} className={`row-${iRow}-component-${i} nd-component-holder ${flexBasis} ${ts(rowEffectiveTheme, "componentHolder")}`}>
                         {c}
                     </div>)}
         </div>);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodoku-core",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "basic foundation for nodoku static site generator",
   "exports": {
     ".": {

package/types/bin/manifest.d.ts

@@ -1,15 +1,13 @@
-export declare class ComponentDef {
+export type ComponentDef = {
     implementation: string;
     themeSchema: string;
     optionsSchema: string;
     defaultThemeFile: string;
     numBlocks: string | number;
-    constructor(componentImplementation: string, componentSchema: string, optionsSchema: string, defaultThemeFile: string, numBlocks: string | number);
-}
-export declare class Manifest {
+};
+export type Manifest = {
     moduleName: string;
     moduleDir: string;
-    namespace: string | undefined;
+    namespace?: string;
     components: Map<string, ComponentDef>;
-    constructor(moduleName: string, moduleDir: string);
-}
+};