@willwade/aac-processors 0.2.16 → 0.2.17

package/dist/browser/processors/gridset/commands.js

@@ -909,6 +909,61 @@ export function getAllPluginIds() {
     const plugins = new Set(Object.values(GRID3_COMMANDS).map((cmd) => cmd.pluginId));
     return Array.from(plugins).sort();
 }
+function textOfStructured(val) {
+    if (!val || typeof val !== 'object')
+        return undefined;
+    const parts = [];
+    const processS = (s) => {
+        if (!s)
+            return;
+        if (s.r !== undefined) {
+            const rElements = Array.isArray(s.r) ? s.r : [s.r];
+            for (const r of rElements) {
+                if (typeof r === 'number') {
+                    if (r !== 0)
+                        parts.push(String(r));
+                    continue;
+                }
+                if (typeof r === 'object' && r !== null) {
+                    if ('#text' in r)
+                        parts.push(String(r['#text']));
+                    else if ('#cdata' in r)
+                        parts.push(String(r['#cdata']));
+                    else
+                        parts.push(String(r));
+                }
+                else {
+                    parts.push(String(r));
+                }
+            }
+        }
+    };
+    if (val.p) {
+        const sElements = Array.isArray(val.p.s) ? val.p.s : val.p.s ? [val.p.s] : [];
+        sElements.forEach(processS);
+    }
+    else if (val.s) {
+        const sElements = Array.isArray(val.s) ? val.s : [val.s];
+        sElements.forEach(processS);
+    }
+    else if (val.r !== undefined) {
+        processS(val);
+    }
+    return parts.length > 0 ? parts.join('').trim() : undefined;
+}
+function extractParamValue(param) {
+    if (typeof param === 'string')
+        return param;
+    if (param.p || param.s || (param.r !== undefined && typeof param.r !== 'string')) {
+        const structured = textOfStructured(param);
+        if (structured !== undefined)
+            return structured;
+    }
+    const simple = param['#text'] ?? param.text ?? param.value;
+    if (simple !== undefined)
+        return simple;
+    return textOfStructured(param);
+}
 export function extractCommandParameters(command) {
     const parameters = {};
     const params = command.Parameter || command.parameter;
@@ -917,7 +972,7 @@ export function extractCommandParameters(command) {
     const paramArray = Array.isArray(params) ? params : [params];
     for (const param of paramArray) {
         const key = param['@_Key'] || param.Key || param.key;
-        let value = param['#text'] ?? param.text ?? param.value;
+        let value = extractParamValue(param);
         if (key && value !== undefined) {
             // Try to convert to number if it looks numeric
             if (typeof value === 'string' && /^\d+$/.test(value)) {

package/dist/browser/processors/gridsetProcessor.js

@@ -700,6 +700,13 @@ class GridsetProcessor extends BaseProcessor {
                             }
                         }
                     }
+                    if (pageWordListItems.length > 0) {
+                        page.wordListItems = pageWordListItems.map((item) => ({
+                            text: item.text,
+                            image: item.image,
+                            partOfSpeech: item.partOfSpeech,
+                        }));
+                    }
                     // Track WordList AutoContent cells and their positions for "more" button placement
                     const wordListAutoContentCells = [];
                     let wordListCellIndex = 0;
@@ -1032,6 +1039,15 @@ class GridsetProcessor extends BaseProcessor {
                                     const param = getRawParam(key);
                                     if (param === undefined)
                                         return undefined;
+                                    if (typeof param === 'string')
+                                        return param;
+                                    if (param.p ||
+                                        param.s ||
+                                        (param.r !== undefined && typeof param.r !== 'string')) {
+                                        const structuredValue = this.textOf(param);
+                                        if (structuredValue !== undefined)
+                                            return structuredValue;
+                                    }
                                     const simpleValue = param['#text'] ?? param.text ?? param.value;
                                     if (typeof simpleValue === 'string')
                                         return simpleValue;
@@ -1040,8 +1056,6 @@ class GridsetProcessor extends BaseProcessor {
                                     const structuredValue = this.textOf(param);
                                     if (structuredValue !== undefined)
                                         return structuredValue;
-                                    if (typeof param === 'string')
-                                        return param;
                                     return undefined;
                                 };
                                 // Skip PredictThis in primary action loop as it was handled in pre-pass

package/dist/core/treeStructure.d.ts

@@ -222,6 +222,7 @@ export declare class AACPage {
     descriptionHtml?: string;
     images?: any[];
     sounds?: any[];
+    wordListItems?: import('../types/aac').AACWordListItem[];
     semantic_ids?: string[];
     clone_ids?: string[];
     scanningConfig?: import('../types/aac').ScanningConfig;

package/dist/processors/gridset/commands.js

@@ -920,6 +920,61 @@ function getAllPluginIds() {
     const plugins = new Set(Object.values(exports.GRID3_COMMANDS).map((cmd) => cmd.pluginId));
     return Array.from(plugins).sort();
 }
+function textOfStructured(val) {
+    if (!val || typeof val !== 'object')
+        return undefined;
+    const parts = [];
+    const processS = (s) => {
+        if (!s)
+            return;
+        if (s.r !== undefined) {
+            const rElements = Array.isArray(s.r) ? s.r : [s.r];
+            for (const r of rElements) {
+                if (typeof r === 'number') {
+                    if (r !== 0)
+                        parts.push(String(r));
+                    continue;
+                }
+                if (typeof r === 'object' && r !== null) {
+                    if ('#text' in r)
+                        parts.push(String(r['#text']));
+                    else if ('#cdata' in r)
+                        parts.push(String(r['#cdata']));
+                    else
+                        parts.push(String(r));
+                }
+                else {
+                    parts.push(String(r));
+                }
+            }
+        }
+    };
+    if (val.p) {
+        const sElements = Array.isArray(val.p.s) ? val.p.s : val.p.s ? [val.p.s] : [];
+        sElements.forEach(processS);
+    }
+    else if (val.s) {
+        const sElements = Array.isArray(val.s) ? val.s : [val.s];
+        sElements.forEach(processS);
+    }
+    else if (val.r !== undefined) {
+        processS(val);
+    }
+    return parts.length > 0 ? parts.join('').trim() : undefined;
+}
+function extractParamValue(param) {
+    if (typeof param === 'string')
+        return param;
+    if (param.p || param.s || (param.r !== undefined && typeof param.r !== 'string')) {
+        const structured = textOfStructured(param);
+        if (structured !== undefined)
+            return structured;
+    }
+    const simple = param['#text'] ?? param.text ?? param.value;
+    if (simple !== undefined)
+        return simple;
+    return textOfStructured(param);
+}
 function extractCommandParameters(command) {
     const parameters = {};
     const params = command.Parameter || command.parameter;
@@ -928,7 +983,7 @@ function extractCommandParameters(command) {
     const paramArray = Array.isArray(params) ? params : [params];
     for (const param of paramArray) {
         const key = param['@_Key'] || param.Key || param.key;
-        let value = param['#text'] ?? param.text ?? param.value;
+        let value = extractParamValue(param);
         if (key && value !== undefined) {
             // Try to convert to number if it looks numeric
             if (typeof value === 'string' && /^\d+$/.test(value)) {

package/dist/processors/gridsetProcessor.js

@@ -703,6 +703,13 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
                             }
                         }
                     }
+                    if (pageWordListItems.length > 0) {
+                        page.wordListItems = pageWordListItems.map((item) => ({
+                            text: item.text,
+                            image: item.image,
+                            partOfSpeech: item.partOfSpeech,
+                        }));
+                    }
                     // Track WordList AutoContent cells and their positions for "more" button placement
                     const wordListAutoContentCells = [];
                     let wordListCellIndex = 0;
@@ -1035,6 +1042,15 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
                                     const param = getRawParam(key);
                                     if (param === undefined)
                                         return undefined;
+                                    if (typeof param === 'string')
+                                        return param;
+                                    if (param.p ||
+                                        param.s ||
+                                        (param.r !== undefined && typeof param.r !== 'string')) {
+                                        const structuredValue = this.textOf(param);
+                                        if (structuredValue !== undefined)
+                                            return structuredValue;
+                                    }
                                     const simpleValue = param['#text'] ?? param.text ?? param.value;
                                     if (typeof simpleValue === 'string')
                                         return simpleValue;
@@ -1043,8 +1059,6 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
                                     const structuredValue = this.textOf(param);
                                     if (structuredValue !== undefined)
                                         return structuredValue;
-                                    if (typeof param === 'string')
-                                        return param;
                                     return undefined;
                                 };
                                 // Skip PredictThis in primary action loop as it was handled in pre-pass

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willwade/aac-processors",
-  "version": "0.2.16",
+  "version": "0.2.17",
   "description": "A comprehensive TypeScript library for processing AAC (Augmentative and Alternative Communication) file formats with translation support",
   "main": "dist/index.js",
   "browser": "dist/browser/index.browser.js",
@@ -131,7 +131,7 @@
   ],
   "author": {
     "name": "Will Wade",
-    "email": "wwade@acecentre.org.uk",
+    "email": "will@aactools.co.uk",
     "url": "https://github.com/willwade"
   },
   "license": "MIT",
@@ -140,12 +140,12 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/willwade/AACProcessors-nodejs.git"
+    "url": "https://github.com/AACTools/AACProcessors-nodejs.git"
   },
   "bugs": {
-    "url": "https://github.com/willwade/AACProcessors-nodejs/issues"
+    "url": "https://github.com/AACTools/AACProcessors-nodejs/issues"
   },
-  "homepage": "https://github.com/willwade/AACProcessors-nodejs#readme",
+  "homepage": "https://github.com/AACTools/AACProcessors-nodejs#readme",
   "engines": {
     "node": ">=20.0.0",
     "npm": ">=9.0.0"