@microtronics/studio-cli 0.58.0 → 0.60.0

package/out/dde/fileGenerators/dloLocalData.js

@@ -9,23 +9,28 @@ const PAWN_SZTEMP_DECL = '\tnew szTemp{64};';
 const PAWN_STRCAT_RETURN = '\treturn strcat(aData, szTemp, sizeof(szTemp));';
 /**
  * Determines if a field type can use a format helper function, and which one.
- * Returns null if the field type needs inline code (packed types, memtostr, wstring, etc.)
+ * Returns null if the field type needs inline code (packed types, wstring, etc.)
  */
 function getHelperFormatType(tdefPwn) {
+    // Binary (memtostr) fields - check before printf since printf is null for binary
+    if (!tdefPwn.printf && tdefPwn.printfFormat === 'memtostr') {
+        return 'bin';
+    }
     if (!tdefPwn.printf) {
         return null;
     }
     const rwp = tdefPwn.rwp || '%n';
     const hasCellArray = rwp.includes('[');
     const hasPackedArray = rwp.includes('{');
+    const isComplex = hasPackedArray || hasCellArray;
     if (tdefPwn.printfFormat === 'stampToISOString') {
-        return hasPackedArray || hasCellArray ? null : 'stamp';
+        return isComplex ? null : 'stamp';
     }
     switch (tdefPwn.printf) {
         case '%d':
-            return hasPackedArray || hasCellArray ? null : 'd';
+            return isComplex ? null : 'd';
         case '%f':
-            return hasPackedArray || hasCellArray ? null : 'f';
+            return isComplex ? null : 'f';
         case '%s':
             return hasCellArray ? null : 's';
         default:
@@ -212,6 +217,13 @@ function buildHelperFunctions(pawnSource, usedFormats) {
         pawnSource(PAWN_STRCAT_RETURN);
         pawnSource('}');
     }
+    if (usedFormats.has('bin')) {
+        pawnSource('');
+        pawnSource('stock _DDE_fmt_bin(aData{}, mem{}, dim) {');
+        pawnSource('\tmemtostr(aData, mem, 0, dim);');
+        pawnSource('\treturn dim;');
+        pawnSource('}');
+    }
 }
 /**
  * Builds the Pawn index expression for accessing an array element by byte offset.
@@ -241,7 +253,13 @@ function buildArrayGroupBlock(pawnSource, group) {
     const indexExpr = buildIndexExpression(startOffset, step);
     const condition = buildConditionExpression(startOffset, endOffset, step);
     pawnSource(`\tif (${condition}) {`);
-    pawnSource(`\t\treturn _DDE_fmt_${formatType}(aData, ${pawnVarBase}[${indexExpr}]${subField});`);
+    if (formatType === 'bin') {
+        const fieldAccess = `${pawnVarBase}[${indexExpr}]${subField}`;
+        pawnSource(`\t\treturn _DDE_fmt_bin(aData, ${fieldAccess}, ${fieldAccess}_dim);`);
+    }
+    else {
+        pawnSource(`\t\treturn _DDE_fmt_${formatType}(aData, ${pawnVarBase}[${indexExpr}]${subField});`);
+    }
     pawnSource(`\t}`);
 }
 /**
@@ -260,12 +278,16 @@ function buildOptimizedCaseForField(pawnSource, containerTitle, field) {
     const fieldNamePrefix = field.library ? `_${helper_1.Helper.generateHashForLibraryName(field.library)}` : 'DDE_';
     const ddeFieldName = `${fieldNamePrefix}${containerTitle}_${field.name}`;
     const formatType = getHelperFormatType(tdefPwn);
-    if (formatType) {
+    if (formatType === 'bin') {
+        // Compact single-line case using binary helper function
+        pawnSource(`\t\tcase ${field.byteOffset}: return _DDE_fmt_bin(aData, ${ddeFieldName}, ${ddeFieldName}_dim);`);
+    }
+    else if (formatType) {
         // Compact single-line case using helper function
         pawnSource(`\t\tcase ${field.byteOffset}: return _DDE_fmt_${formatType}(aData, ${ddeFieldName});`);
     }
     else {
-        // Fall back to inline code (memtostr, packed types, wstring, etc.)
+        // Fall back to inline code (packed types, wstring, etc.)
         pawnSource(`\t\tcase ${field.byteOffset}: {`);
         if (tdefPwn.printf) {
             let printfInsert = ddeFieldName;
@@ -275,10 +297,6 @@ function buildOptimizedCaseForField(pawnSource, containerTitle, field) {
             pawnSource(`\t\t\tsprintf(szTemp, _, "${tdefPwn.printf}", ${printfInsert});`);
             pawnSource(`\t\t\treturn (strcat(aData, szTemp, sizeof(szTemp)));`);
         }
-        else if (tdefPwn.printfFormat === 'memtostr') {
-            pawnSource(`\t\t\tmemtostr(szTemp, ${ddeFieldName}, 0, ${ddeFieldName}_dim);`);
-            pawnSource(`\t\t\treturn ${ddeFieldName}_dim;`);
-        }
         pawnSource(`\t\t}`);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@microtronics/studio-cli",
-	"version": "0.58.0",
+	"version": "0.60.0",
 	"description": "Microtronics Studio CLI Tool",
 	"main": "./out/api.js",
 	"typings": "./dist/studio-cli.d.ts",