fix: RPG symbol name using name or label. Remove non-alphanum chars

Author: janfh

package-lock.json

@@ -1,7 +1,20 @@
 import { assert, expect, test } from 'vitest'
-import { columnToRpgDefinition, queryResultToRpgDs } from './codegen';
+import { columnToRpgDefinition, columnToRpgFieldName, queryResultToRpgDs } from './codegen';
 import { QueryResult } from '@ibm/mapepire-js';
 
+test('Column to RPG symbol', () => {
+    let name;
+    
+    name = columnToRpgFieldName({display_size: 0, label: 'änderungs-          benutzer             ', name: 'ANDBEN', type: 'CHAR', precision: 10, scale: 0}, 'Label');
+    expect(name).toBe('anderungs_benutzer');
+
+    name = columnToRpgFieldName({display_size: 0, label: 'änderungs-          benutzer             ', name: 'ANDBEN', type: 'CHAR', precision: 10, scale: 0}, 'Name');
+    expect(name).toBe('andben');
+
+    name = columnToRpgFieldName({display_size: 0, label: '', name: '0001', type: 'INTEGER', precision: 0, scale: 0}, 'Name');
+    expect(name).toBe('col0001');
+});
+
 test('Column to RPG definition', () => {
     let rpgdef;
 

src/views/results/codegen.test.ts

@@ -1,15 +1,28 @@
 import { ColumnMetaData, QueryResult } from "@ibm/mapepire-js";
 
-export function queryResultToRpgDs(result: QueryResult<any>) : string {
+export function queryResultToRpgDs(result: QueryResult<any>, source: string = 'Name') : string {
   let content = `dcl-ds row_t qualified template;\n`;
   for (let i = 0; i < result.metadata.column_count; i++) {
-    const name = `${isNaN(+result.metadata.columns[i].label.charAt(0)) ? '' : 'col'}${result.metadata.columns[i].label.toLowerCase()}`
+    const name = columnToRpgFieldName(result.metadata.columns[i], source);
     content += `  ${name} ${columnToRpgDefinition(result.metadata.columns[i])};\n`;
   }
   content += `end-ds;\n`;
   return content;
 }
 
+export function columnToRpgFieldName(column: ColumnMetaData, source: string = 'Name') : string {
+  let name = source === 'Label' ? column.label.toLowerCase().trim() : column.name.toLowerCase().trim();
+  name = name.replace(/\u00fc/g, "u");  // ü
+  name = name.replace(/\u00e4/g, "a");  // ä
+  name = name.replace(/\u00e4/g, "o");  // ö
+  name = name.replace(/\u00df/g, "s");  // sharp s/Eszett
+  name = name.replace(/\s+/g, "_").replace(/[^a-zA-Z0-9_]/g, '').trim();  // space to underscore and remove non-alphanumeric chars
+  if (!isNaN(+name.charAt(0))) {
+    name = `col` + name;
+  }
+  return name;
+}
+
 export function columnToRpgDefinition(column: ColumnMetaData) : string {
   switch (column.type) {
     case `NUMERIC`:

src/views/results/codegen.ts

@@ -18,6 +18,7 @@ import { updateStatusBar } from "../jobManager/statusBar";
 import { DbCache } from "../../language/providers/logic/cache";
 import { ExplainType } from "../../connection/types";
 import { queryResultToRpgDs } from "./codegen";
+import Configuration from "../../configuration";
 
 export type StatementQualifier = "statement" | "update" | "explain" | "onlyexplain" | "json" | "csv" | "cl" | "sql" | "rpg";
 
@@ -390,7 +391,7 @@ async function runHandler(options?: StatementInfo) {
             let content = `**free\n\n`
               + `// statement: ${statementDetail.content}\n\n`
               + `// Row data structure\n`
-              + queryResultToRpgDs(result);
+              + queryResultToRpgDs(result, Configuration.get(`resultsets.columnHeadings`));
             const textDoc = await vscode.workspace.openTextDocument({ language: 'rpgle', content });
             await vscode.window.showTextDocument(textDoc);
             chosenView.setLoadingText(`RPG data structure generated.`, false);