seperate metadata out and better management of metadata

Author: willwade

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+aac-metrics-node/
 obla-improvements/
 tmp/
 # Logs

src/core/baseProcessor.ts

@@ -84,7 +84,7 @@ export interface VocabPlacementMetadata {
 
 export interface VocabLocation {
   table: string;
-  id: number;
+  id: string | number;
   column: string;
   casing: StringCasing;
 }
@@ -263,7 +263,7 @@ abstract class BaseProcessor {
           const key = page.name.trim().toLowerCase();
           const vocabLocation: VocabLocation = {
             table: 'pages',
-            id: parseInt(page.id) || 0,
+            id: page.id,
             column: 'NAME',
             casing: detectCasing(page.name),
           };
@@ -277,7 +277,7 @@ abstract class BaseProcessor {
             const key = button.label.trim().toLowerCase();
             const vocabLocation: VocabLocation = {
               table: 'buttons',
-              id: parseInt(button.id) || 0,
+              id: button.id,
               column: 'LABEL',
               casing: detectCasing(button.label),
             };
@@ -295,7 +295,7 @@ abstract class BaseProcessor {
             const key = button.message.trim().toLowerCase();
             const vocabLocation: VocabLocation = {
               table: 'buttons',
-              id: parseInt(button.id) || 0,
+              id: button.id,
               column: 'MESSAGE',
               casing: detectCasing(button.message),
             };

src/core/treeStructure.ts

@@ -2,9 +2,16 @@ import {
   AACButton as IAACButton,
   AACPage as IAACPage,
   AACTree as IAACTree,
+  AACTreeMetadata,
+  SnapMetadata,
+  GridSetMetadata,
+  AstericsGridMetadata,
+  TouchChatMetadata,
   AACStyle,
 } from '../types/aac';
 
+export { AACTreeMetadata, SnapMetadata, GridSetMetadata, AstericsGridMetadata, TouchChatMetadata };
+
 // Semantic action categories for cross-platform compatibility
 export enum AACSemanticCategory {
   COMMUNICATION = 'communication', // Speech, text output
@@ -437,23 +444,37 @@ export class AACPage implements IAACPage {
 
 export class AACTree implements IAACTree {
   pages: { [key: string]: AACPage };
-  private _rootId: string | null;
+  metadata: AACTreeMetadata;
 
   public get rootId(): string | null {
-    return this._rootId;
+    return this.metadata.defaultHomePageId || null;
   }
   public set rootId(id: string | null) {
-    this._rootId = id;
+    this.metadata.defaultHomePageId = id || undefined;
+  }
+
+  public get toolbarId(): string | null {
+    return this.metadata.toolbarId || null;
+  }
+  public set toolbarId(id: string | null) {
+    this.metadata.toolbarId = id || undefined;
+  }
+
+  public get dashboardId(): string | null {
+    return this.metadata.dashboardId || null;
+  }
+  public set dashboardId(id: string | null) {
+    this.metadata.dashboardId = id || undefined;
   }
 
   constructor() {
     this.pages = {};
-    this._rootId = null;
+    this.metadata = {};
   }
 
   addPage(page: AACPage): void {
     this.pages[page.id] = page;
-    if (!this._rootId) this._rootId = page.id;
+    if (!this.rootId) this.rootId = page.id;
   }
 
   getPage(id: string): AACPage | undefined {

src/processors/applePanelsProcessor.ts

@@ -262,6 +262,7 @@ class ApplePanelsProcessor extends BaseProcessor {
 
     const data: ApplePanelsDocument = { panels: panelsData };
     const tree = new AACTree();
+    tree.metadata.format = 'applepanels';
 
     data.panels.forEach((panel) => {
       const page = new AACPage({
@@ -451,16 +452,18 @@ class ApplePanelsProcessor extends BaseProcessor {
 
       // Create Info.plist (bundle mode only)
       const infoPlist = {
-        ASCConfigurationDisplayName: 'AAC Processors Export',
+        ASCConfigurationDisplayName: tree.metadata?.name || 'AAC Processors Export',
         ASCConfigurationIdentifier: `com.aacprocessors.${Date.now()}`,
         ASCConfigurationProductSupportType: 'VirtualKeyboard',
-        ASCConfigurationVersion: '7.1',
-        CFBundleDevelopmentRegion: 'en',
+        ASCConfigurationVersion: tree.metadata?.version || '7.1',
+        CFBundleDevelopmentRegion: tree.metadata?.locale || 'en',
         CFBundleIdentifier: 'com.aacprocessors.panel.export',
-        CFBundleName: 'AAC Processors Panels',
-        CFBundleShortVersionString: '1.0',
+        CFBundleName: tree.metadata?.name || 'AAC Processors Panels',
+        CFBundleShortVersionString: tree.metadata?.version || '1.0',
         CFBundleVersion: '1',
-        NSHumanReadableCopyright: 'Generated by AAC Processors',
+        NSHumanReadableCopyright:
+          tree.metadata?.copyright ||
+          `Generated by AAC Processors${tree.metadata?.author ? ` - Author: ${tree.metadata.author}` : ''}`,
       };
       const infoPlistContent = plist.build(infoPlist);
       fs.writeFileSync(path.join(contentsPath, 'Info.plist'), infoPlistContent);

src/processors/astericsGridProcessor.ts

@@ -12,6 +12,7 @@ import {
   AACSemanticAction,
   AACSemanticCategory,
   AACSemanticIntent,
+  AstericsGridMetadata,
 } from '../core/treeStructure';
 import fs from 'fs';
 
@@ -932,6 +933,45 @@ class AstericsGridProcessor extends BaseProcessor {
       page.grid = gridLayout;
     });
 
+    // Set metadata for Asterics Grid files
+    const astericsMetadata: AstericsGridMetadata = {
+      format: 'asterics',
+      hasGlobalGrid: false, // Can be extended in the future
+    };
+
+    if (grdFile.grids && grdFile.grids.length > 0) {
+      astericsMetadata.name = this.getLocalizedLabel(grdFile.grids[0].label);
+
+      // Extract all unique languages from all grids and elements
+      const languages = new Set<string>();
+      grdFile.grids.forEach((grid) => {
+        if (grid.label) {
+          Object.keys(grid.label).forEach((lang) => languages.add(lang));
+        }
+        grid.gridElements?.forEach((element) => {
+          if (element.label) {
+            Object.keys(element.label).forEach((lang) => languages.add(lang));
+          }
+          // Also check word forms for languages
+          element.wordForms?.forEach((wf) => {
+            if (wf.lang) languages.add(wf.lang);
+          });
+        });
+      });
+
+      if (languages.size > 0) {
+        astericsMetadata.languages = Array.from(languages).sort();
+        // Set primary locale to English if available, otherwise the first language found
+        astericsMetadata.locale = languages.has('en')
+          ? 'en'
+          : languages.has('de')
+            ? 'de'
+            : astericsMetadata.languages[0];
+      }
+    }
+
+    tree.metadata = astericsMetadata;
+
     // Set the home page from metadata.homeGridId
     if (grdFile.metadata && grdFile.metadata.homeGridId) {
       tree.rootId = grdFile.metadata.homeGridId;
@@ -1523,6 +1563,8 @@ class AstericsGridProcessor extends BaseProcessor {
           });
         }
 
+        const locale = tree.metadata?.locale || 'en';
+
         return {
           id: button.id,
           modelName: 'GridElement',
@@ -1531,7 +1573,7 @@ class AstericsGridProcessor extends BaseProcessor {
           height: 1,
           x: calculatedX,
           y: calculatedY,
-          label: { en: button.label },
+          label: { [locale]: button.label },
           wordForms: [],
           image: {
             data: null,
@@ -1558,7 +1600,7 @@ class AstericsGridProcessor extends BaseProcessor {
         id: page.id,
         modelName: 'GridData',
         modelVersion: '{"major": 5, "minor": 0, "patch": 0}',
-        label: { en: page.name },
+        label: { [tree.metadata?.locale || 'en']: page.name },
         rowCount: calculatedRows,
         minColumnCount: calculatedCols,
         gridElements: gridElements,

src/processors/dotProcessor.ts

@@ -141,6 +141,7 @@ class DotProcessor extends BaseProcessor {
 
     const { nodes, edges } = this.parseDotFile(content);
     const tree = new AACTree();
+    tree.metadata.format = 'dot';
 
     // Create pages for each node and add a self button representing the node label
     for (const node of nodes) {
@@ -220,13 +221,17 @@ class DotProcessor extends BaseProcessor {
   }
 
   saveFromTree(tree: AACTree, _outputPath: string): void {
-    let dotContent = 'digraph AACBoard {\n';
+    let dotContent = `digraph "${tree.metadata?.name || 'AACBoard'}" {\n`;
 
     // Helper to escape DOT string
     const escapeDotString = (str: string): string => {
       return str.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
     };
 
+    if (tree.metadata?.name) {
+      dotContent += `  label="${escapeDotString(tree.metadata.name)}";\n`;
+    }
+
     // Add nodes
     for (const pageId in tree.pages) {
       const page = tree.pages[pageId];

src/processors/excelProcessor.ts

@@ -35,7 +35,9 @@ export class ExcelProcessor extends BaseProcessor {
    */
   loadIntoTree(_filePathOrBuffer: string | Buffer): AACTree {
     console.warn('ExcelProcessor.loadIntoTree is not implemented yet.');
-    return new AACTree();
+    const tree = new AACTree();
+    tree.metadata.format = 'excel';
+    return tree;
   }
 
   /**
@@ -556,12 +558,15 @@ export class ExcelProcessor extends BaseProcessor {
    */
   private async saveFromTreeAsync(tree: AACTree, outputPath: string): Promise<void> {
     const workbook = new ExcelJS.Workbook();
+    const metadata = tree.metadata;
 
-    // Set workbook properties
-    workbook.creator = 'AACProcessors';
+    // Set workbook properties from tree metadata
+    workbook.creator = metadata?.author || 'AACProcessors';
     workbook.lastModifiedBy = 'AACProcessors';
     workbook.created = new Date();
     workbook.modified = new Date();
+    workbook.title = metadata?.name || '';
+    workbook.subject = metadata?.description || '';
 
     // If no pages, create a default empty worksheet
     if (Object.keys(tree.pages).length === 0) {