@code-pushup/js-packages-plugin 0.46.0 → 0.48.0

package/bin.js

@@ -67,7 +67,7 @@ function missingRefsForCategoriesErrorMsg(categories, plugins) {
 }
 
 // packages/models/src/lib/implementation/schemas.ts
-var primitiveValueSchema = z.union([z.string(), z.number()]);
+var tableCellValueSchema = z.union([z.string(), z.number(), z.boolean(), z.null()]).default(null);
 function executionMetaSchema(options = {
   descriptionDate: "Execution start date and time",
   descriptionDuration: "Execution duration in ms"
@@ -231,10 +231,10 @@ var tableColumnObjectSchema = z4.object({
   label: z4.string().optional(),
   align: tableAlignmentSchema.optional()
 });
-var tableRowObjectSchema = z4.record(primitiveValueSchema, {
+var tableRowObjectSchema = z4.record(tableCellValueSchema, {
   description: "Object row"
 });
-var tableRowPrimitiveSchema = z4.array(primitiveValueSchema, {
+var tableRowPrimitiveSchema = z4.array(tableCellValueSchema, {
   description: "Primitive row"
 });
 var tableSharedSchema = z4.object({
@@ -834,7 +834,7 @@ function code(text) {
 
 // packages/utils/src/lib/text-formats/html/link.ts
 function link(href, text) {
-  return `<a href="${href}">${text || href}"</a>`;
+  return `<a href="${href}">${text || href}</a>`;
 }
 
 // packages/utils/src/lib/transform.ts
@@ -866,7 +866,7 @@ function apostrophize(text, upperCase) {
   return `${text}'${lastChar.toLocaleLowerCase() === "s" ? "" : upperCase ? "S" : "s"}`;
 }
 
-// packages/utils/src/lib/table.ts
+// packages/utils/src/lib/text-formats/table.ts
 function rowToStringArray({ rows, columns = [] }) {
   if (Array.isArray(rows.at(0)) && typeof columns.at(0) === "object") {
     throw new TypeError(
@@ -879,14 +879,19 @@ function rowToStringArray({ rows, columns = [] }) {
     }
     const objectRow = row;
     if (columns.length === 0 || typeof columns.at(0) === "string") {
-      return Object.values(objectRow).map(String);
+      return Object.values(objectRow).map(
+        (value) => value == null ? "" : String(value)
+      );
     }
     return columns.map(
-      ({ key }) => String(objectRow[key])
+      ({ key }) => objectRow[key] == null ? "" : String(objectRow[key])
     );
   });
 }
-function columnsToStringArray({ rows, columns = [] }) {
+function columnsToStringArray({
+  rows,
+  columns = []
+}) {
   const firstRow = rows.at(0);
   const primitiveRows = Array.isArray(firstRow);
   if (typeof columns.at(0) === "string" && !primitiveRows) {
@@ -926,10 +931,8 @@ function getColumnAlignmentForIndex(targetIdx, columns = []) {
     return "center";
   }
 }
-function getColumnAlignments({
-  rows,
-  columns = []
-}) {
+function getColumnAlignments(tableData) {
+  const { rows, columns = [] } = tableData;
   if (rows.at(0) == null) {
     throw new Error("first row can`t be undefined.");
   }
@@ -939,10 +942,17 @@ function getColumnAlignments({
       (_, idx) => getColumnAlignmentForIndex(idx, columns)
     );
   }
-  const firstObject = rows.at(0);
-  return Object.keys(firstObject).map(
-    (key, idx) => getColumnAlignmentForKeyAndIndex(key, idx, columns)
-  );
+  const biggestRow = [...rows].sort((a, b) => Object.keys(a).length - Object.keys(b).length).at(-1);
+  if (columns.length > 0) {
+    return columns.map(
+      (column, idx) => typeof column === "string" ? column : getColumnAlignmentForKeyAndIndex(
+        column.key,
+        idx,
+        columns
+      )
+    );
+  }
+  return Object.keys(biggestRow ?? {}).map((_) => "center");
 }
 
 // packages/utils/src/lib/text-formats/html/table.ts
@@ -1039,7 +1049,10 @@ function section(...contents) {
   return `${lines(...contents)}${NEW_LINE}`;
 }
 function lines(...contents) {
-  return `${contents.filter(Boolean).join(NEW_LINE)}`;
+  const filteredContent = contents.filter(
+    (value) => value != null && value !== "" && value !== false
+  );
+  return `${filteredContent.join(NEW_LINE)}`;
 }
 
 // packages/utils/src/lib/text-formats/md/table.ts

package/index.js

@@ -4,7 +4,7 @@ import { fileURLToPath } from "node:url";
 
 // packages/plugin-js-packages/package.json
 var name = "@code-pushup/js-packages-plugin";
-var version = "0.46.0";
+var version = "0.48.0";
 
 // packages/plugin-js-packages/src/lib/config.ts
 import { z as z16 } from "zod";
@@ -74,7 +74,7 @@ function missingRefsForCategoriesErrorMsg(categories, plugins) {
 }
 
 // packages/models/src/lib/implementation/schemas.ts
-var primitiveValueSchema = z.union([z.string(), z.number()]);
+var tableCellValueSchema = z.union([z.string(), z.number(), z.boolean(), z.null()]).default(null);
 function executionMetaSchema(options = {
   descriptionDate: "Execution start date and time",
   descriptionDuration: "Execution duration in ms"
@@ -238,10 +238,10 @@ var tableColumnObjectSchema = z4.object({
   label: z4.string().optional(),
   align: tableAlignmentSchema.optional()
 });
-var tableRowObjectSchema = z4.record(primitiveValueSchema, {
+var tableRowObjectSchema = z4.record(tableCellValueSchema, {
   description: "Object row"
 });
-var tableRowPrimitiveSchema = z4.array(primitiveValueSchema, {
+var tableRowPrimitiveSchema = z4.array(tableCellValueSchema, {
   description: "Primitive row"
 });
 var tableSharedSchema = z4.object({
@@ -861,7 +861,7 @@ function code(text) {
 
 // packages/utils/src/lib/text-formats/html/link.ts
 function link(href, text) {
-  return `<a href="${href}">${text || href}"</a>`;
+  return `<a href="${href}">${text || href}</a>`;
 }
 
 // packages/utils/src/lib/transform.ts
@@ -888,7 +888,7 @@ function capitalize(text) {
   )}`;
 }
 
-// packages/utils/src/lib/table.ts
+// packages/utils/src/lib/text-formats/table.ts
 function rowToStringArray({ rows, columns = [] }) {
   if (Array.isArray(rows.at(0)) && typeof columns.at(0) === "object") {
     throw new TypeError(
@@ -901,14 +901,19 @@ function rowToStringArray({ rows, columns = [] }) {
     }
     const objectRow = row;
     if (columns.length === 0 || typeof columns.at(0) === "string") {
-      return Object.values(objectRow).map(String);
+      return Object.values(objectRow).map(
+        (value) => value == null ? "" : String(value)
+      );
     }
     return columns.map(
-      ({ key }) => String(objectRow[key])
+      ({ key }) => objectRow[key] == null ? "" : String(objectRow[key])
     );
   });
 }
-function columnsToStringArray({ rows, columns = [] }) {
+function columnsToStringArray({
+  rows,
+  columns = []
+}) {
   const firstRow = rows.at(0);
   const primitiveRows = Array.isArray(firstRow);
   if (typeof columns.at(0) === "string" && !primitiveRows) {
@@ -948,10 +953,8 @@ function getColumnAlignmentForIndex(targetIdx, columns = []) {
     return "center";
   }
 }
-function getColumnAlignments({
-  rows,
-  columns = []
-}) {
+function getColumnAlignments(tableData) {
+  const { rows, columns = [] } = tableData;
   if (rows.at(0) == null) {
     throw new Error("first row can`t be undefined.");
   }
@@ -961,10 +964,17 @@ function getColumnAlignments({
       (_, idx) => getColumnAlignmentForIndex(idx, columns)
     );
   }
-  const firstObject = rows.at(0);
-  return Object.keys(firstObject).map(
-    (key, idx) => getColumnAlignmentForKeyAndIndex(key, idx, columns)
-  );
+  const biggestRow = [...rows].sort((a, b) => Object.keys(a).length - Object.keys(b).length).at(-1);
+  if (columns.length > 0) {
+    return columns.map(
+      (column, idx) => typeof column === "string" ? column : getColumnAlignmentForKeyAndIndex(
+        column.key,
+        idx,
+        columns
+      )
+    );
+  }
+  return Object.keys(biggestRow ?? {}).map((_) => "center");
 }
 
 // packages/utils/src/lib/text-formats/html/table.ts
@@ -1061,7 +1071,10 @@ function section(...contents) {
   return `${lines(...contents)}${NEW_LINE}`;
 }
 function lines(...contents) {
-  return `${contents.filter(Boolean).join(NEW_LINE)}`;
+  const filteredContent = contents.filter(
+    (value) => value != null && value !== "" && value !== false
+  );
+  return `${filteredContent.join(NEW_LINE)}`;
 }
 
 // packages/utils/src/lib/text-formats/md/table.ts

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@code-pushup/js-packages-plugin",
-  "version": "0.46.0",
+  "version": "0.48.0",
   "dependencies": {
-    "@code-pushup/models": "0.46.0",
-    "@code-pushup/utils": "0.46.0",
+    "@code-pushup/models": "0.48.0",
+    "@code-pushup/utils": "0.48.0",
     "semver": "^7.6.0",
     "zod": "^3.22.4"
   },