@gmb/bitmark-parser-generator 5.9.0 → 5.9.1

package/dist/index.d.cts

@@ -6059,6 +6059,7 @@ declare class JsonGenerator extends AstWalkerGenerator<BitmarkAst, void> {
      * @returns
      */
     protected cleanBitJson(bitJson: Partial<BitJson>): Partial<BitJson>;
+    protected tableIsEmpty(table: TableJson | TableExtendedJson | undefined): boolean;
     /**
      * Convert any bitmark texts to strings.
      */

package/dist/index.d.ts

@@ -6059,6 +6059,7 @@ declare class JsonGenerator extends AstWalkerGenerator<BitmarkAst, void> {
      * @returns
      */
     protected cleanBitJson(bitJson: Partial<BitJson>): Partial<BitJson>;
+    protected tableIsEmpty(table: TableJson | TableExtendedJson | undefined): boolean;
     /**
      * Convert any bitmark texts to strings.
      */

package/dist/index.js

@@ -2463,27 +2463,6 @@ var CARDSETS = {
     ]
   },
   [CardSetConfigKey.table]: {
-    variants: [
-      // Side 1
-      [
-        // Variant 1..N
-        {
-          tags: [
-            {
-              key: ConfigKey.group_standardItemLeadInstructionHint,
-              description: "Standard tags for lead, instruction, and hint."
-            },
-            {
-              key: ConfigKey.tag_title,
-              description: "Title of the table."
-            }
-          ],
-          repeatCount: Count.infinity
-        }
-      ]
-    ]
-  },
-  [CardSetConfigKey.tableExtended]: {
     variants: [
       // Side 1
       [
@@ -7849,15 +7828,35 @@ var BITS = {
   },
   [BitType.tableImage]: {
     since: "1.5.15",
-    baseBitType: BitType.image,
+    baseBitType: BitType.table,
     description: "Table image bit, used to create images in tables in articles or books",
     tags: [
       {
         key: ConfigKey.property_caption,
         description: "Caption for the table image, used to provide a description for the image",
         format: TagFormat.bitmarkText
+      },
+      {
+        key: ConfigKey.resource_backgroundWallpaper,
+        description: "Background wallpaper for the image, used to set a background for the image",
+        chain: [
+          {
+            key: ConfigKey.group_resourceImageCommon,
+            description: "Common resource image tags for images"
+          }
+        ]
+      },
+      {
+        key: ConfigKey.group_resourceBitTags,
+        description: "Resource bit tags for images, used to define additional properties for images"
+      },
+      {
+        key: ConfigKey.group_resourceImage,
+        description: "Resource image tags for images, used to attach images to the bit",
+        minCount: 1
       }
-    ]
+    ],
+    resourceAttachmentAllowed: false
   },
   [BitType.tableImageAlt]: {
     since: "1.16.0",
@@ -9377,8 +9376,7 @@ var BITS = {
   [BitType.tableExtended]: {
     since: "4.14.0",
     baseBitType: BitType.table,
-    description: "Extended table bit, used to create complex tables with all HTML table features",
-    cardSet: CardSetConfigKey.tableExtended
+    description: "Extended table bit, used to create complex tables with all HTML table features"
   },
   [BitType.tableAlt]: {
     since: "1.16.0",
@@ -10402,7 +10400,7 @@ var instance2 = new Config();
 // src/generated/package_info.ts
 var PACKAGE_INFO = {
   "name": "@gmb/bitmark-parser-generator",
-  "version": "5.9.0",
+  "version": "5.9.1",
   "author": "Get More Brain Ltd",
   "license": "ISC",
   "description": "A bitmark parser and generator using Peggy.js"
@@ -12001,7 +11999,7 @@ function normalizeTableFormat(bitType, table) {
     delete t.columns;
     delete t.data;
   }
-  const isExtended = instance2.isOfBitType(bitType, BitType.tableExtended);
+  const isExtended = instance2.isOfBitType(bitType, BitType.tableExtended) || instance2.isOfBitType(bitType, BitType.tableImage);
   if (isExtended && isTableBasicFormat(table)) {
     return convertBasicToExtendedTableFormat(table);
   }
@@ -30618,7 +30616,7 @@ var JsonGenerator = class extends AstWalkerGenerator {
         if (bitJson.isTracked == null) bitJson.isTracked = true;
         if (bitJson.isInfoOnly == null) bitJson.isInfoOnly = false;
       }
-      if (instance2.isOfBitType(bitType, BitType.table)) {
+      if (instance2.isOfBitType(bitType, BitType.table) && !instance2.isOfBitType(bitType, BitType.tableImage)) {
         if (bitJson.tableFixedHeader == null) bitJson.tableFixedHeader = false;
         if (bitJson.tableHeaderWhitespaceNoWrap == null) {
           bitJson.tableHeaderWhitespaceNoWrap = false;
@@ -30633,6 +30631,11 @@ var JsonGenerator = class extends AstWalkerGenerator {
         if (bitJson.tableResizableColumns == null) bitJson.tableResizableColumns = false;
         if (bitJson.tableColumnMinWidth == null) bitJson.tableColumnMinWidth = 0;
       }
+      if (instance2.isOfBitType(bitType, BitType.tableImage)) {
+        if (this.tableIsEmpty(bitJson.table)) {
+          delete bitJson.table;
+        }
+      }
       if (instance2.isOfBitType(bitType, BitType.bookReference)) {
         if (bitJson.refAuthor == null) bitJson.refAuthor = [];
         if (bitJson.refBookTitle == null) bitJson.refBookTitle = "";
@@ -30773,6 +30776,19 @@ var JsonGenerator = class extends AstWalkerGenerator {
     }
     return bitJson;
   }
+  tableIsEmpty(table) {
+    if (!table) return true;
+    if (Object.keys(table).length === 0) return true;
+    const tableStandard = table;
+    if (tableStandard.columns?.length === 0 && tableStandard.data?.length) {
+      return true;
+    }
+    const tableExtended = table;
+    if (tableExtended.header?.rows.length === 0 && tableExtended.body?.rows.length === 0 && tableExtended.footer?.rows.length === 0) {
+      return true;
+    }
+    return false;
+  }
   /**
    * Convert any bitmark texts to strings.
    */