@commonpub/layer 0.7.26 → 0.7.27

package/components/editors/ArticleEditor.vue

@@ -174,7 +174,16 @@ const wordCount = computed(() => {
     const html = (block.content.html as string) || '';
     const text = (block.content.text as string) || '';
     const code = (block.content.code as string) || '';
-    const combined = html.replace(/<[^>]*>/g, ' ') + ' ' + text + ' ' + code;
+    let combined = html.replace(/<[^>]*>/g, ' ') + ' ' + text + ' ' + code;
+    const children = block.content.children;
+    if (Array.isArray(children)) {
+      for (const child of children) {
+        const [, childData] = child as [string, Record<string, unknown>];
+        const childHtml = (childData?.html as string) || '';
+        const childCode = (childData?.code as string) || '';
+        combined += ' ' + childHtml.replace(/<[^>]*>/g, ' ') + ' ' + childCode;
+      }
+    }
     count += combined.split(/\s+/).filter((w) => w.length > 0).length;
   }
   return count;

package/components/editors/BlogEditor.vue

@@ -108,7 +108,16 @@ const wordCount = computed(() => {
     const text = (block.content.text as string) || '';
     const code = (block.content.code as string) || '';
     const instructions = (block.content.instructions as string) || '';
-    const combined = html.replace(/<[^>]*>/g, ' ') + ' ' + text + ' ' + code + ' ' + instructions;
+    let combined = html.replace(/<[^>]*>/g, ' ') + ' ' + text + ' ' + code + ' ' + instructions;
+    const children = block.content.children;
+    if (Array.isArray(children)) {
+      for (const child of children) {
+        const [, childData] = child as [string, Record<string, unknown>];
+        const childHtml = (childData?.html as string) || '';
+        const childCode = (childData?.code as string) || '';
+        combined += ' ' + childHtml.replace(/<[^>]*>/g, ' ') + ' ' + childCode;
+      }
+    }
     count += combined.split(/\s+/).filter((w) => w.length > 0).length;
   }
   return count;

package/components/editors/ProjectEditor.vue

@@ -158,7 +158,17 @@ const wordCount = computed(() => {
     const text = (block.content.text as string) || '';
     const code = (block.content.code as string) || '';
     const instructions = (block.content.instructions as string) || '';
-    const combined = html.replace(/<[^>]*>/g, ' ') + ' ' + text + ' ' + code + ' ' + instructions;
+    let combined = html.replace(/<[^>]*>/g, ' ') + ' ' + text + ' ' + code + ' ' + instructions;
+    // Count words in nested children (build steps)
+    const children = block.content.children;
+    if (Array.isArray(children)) {
+      for (const child of children) {
+        const [, childData] = child as [string, Record<string, unknown>];
+        const childHtml = (childData?.html as string) || '';
+        const childCode = (childData?.code as string) || '';
+        combined += ' ' + childHtml.replace(/<[^>]*>/g, ' ') + ' ' + childCode;
+      }
+    }
     count += combined.split(/\s+/).filter((w) => w.length > 0).length;
   }
   return count;

package/components/views/ProjectView.vue

@@ -111,8 +111,7 @@ const partsFromBlocks = computed<PartItem[]>(() => {
 interface BuildStep {
   number: number;
   title: string;
-  instructions: string;
-  image?: string;
+  children: Array<[string, Record<string, unknown>]>;
   time?: string;
 }
 
@@ -125,11 +124,25 @@ const buildStepsFromBlocks = computed<BuildStep[]>(() => {
     const [type, data] = block as [string, Record<string, unknown>];
     if (type === 'buildStep') {
       stepNum++;
+      // Migrate old format (instructions + image) to children
+      let children: Array<[string, Record<string, unknown>]> = [];
+      if (data.children && Array.isArray(data.children) && data.children.length > 0) {
+        children = data.children as Array<[string, Record<string, unknown>]>;
+      } else {
+        const instructions = data.instructions as string | undefined;
+        if (instructions && instructions.trim()) {
+          const html = instructions.startsWith('<') ? instructions : `<p>${instructions}</p>`;
+          children.push(['paragraph', { html }]);
+        }
+        const image = data.image as string | undefined;
+        if (image && image.trim()) {
+          children.push(['image', { src: image, alt: `Step ${stepNum}`, caption: '' }]);
+        }
+      }
       steps.push({
         number: (data.stepNumber as number) || stepNum,
         title: (data.title as string) || `Step ${stepNum}`,
-        instructions: (data.instructions as string) || '',
-        image: data.image as string | undefined,
+        children,
         time: data.time as string | undefined,
       });
     }
@@ -495,9 +508,8 @@ async function handleBuild(): Promise<void> {
                     <h3 class="cpub-build-step-title">{{ step.title }}</h3>
                     <span v-if="step.time" class="cpub-build-step-time"><i class="fa-regular fa-clock"></i> {{ step.time }}</span>
                   </div>
-                  <div class="cpub-build-step-body">
-                    <p>{{ step.instructions }}</p>
-                    <img v-if="step.image" :src="step.image" :alt="`Step ${step.number}`" class="cpub-build-step-img" />
+                  <div v-if="step.children.length > 0" class="cpub-build-step-body">
+                    <BlockContentRenderer :blocks="step.children" />
                   </div>
                 </div>
               </div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commonpub/layer",
-  "version": "0.7.26",
+  "version": "0.7.27",
   "type": "module",
   "main": "./nuxt.config.ts",
   "files": [
@@ -51,15 +51,15 @@
     "vue-router": "^4.3.0",
     "zod": "^4.3.6",
     "@commonpub/auth": "0.5.0",
+    "@commonpub/config": "0.9.0",
     "@commonpub/docs": "0.6.2",
-    "@commonpub/editor": "0.7.9",
     "@commonpub/explainer": "0.7.6",
-    "@commonpub/config": "0.9.0",
+    "@commonpub/schema": "0.9.5",
     "@commonpub/protocol": "0.9.7",
     "@commonpub/learning": "0.5.0",
+    "@commonpub/editor": "0.7.9",
     "@commonpub/ui": "0.8.5",
-    "@commonpub/server": "2.27.7",
-    "@commonpub/schema": "0.9.5"
+    "@commonpub/server": "2.27.7"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.9.1",