add more manufacturer ids, add comment i18n ignore pattern, add optional fields mark, skip empty ns

Author: john30

package.json

@@ -3,9 +3,9 @@
   "version": "0.1.0",
   "description": "utilities for converting ebusd-configuration files",
   "scripts": {
-    "csv2tsp": "tsx ./utils/src/index.ts",
-    "csv2tsp-combine": "tsx ./utils/src/index.ts -b latest/de -L de -m outtsp/i18n.yaml -p src/i18n.yaml -s outtsp -o outtsp.de",
-    "maintsp": "find outtsp/ -name '*.tsp' -not -type l|grep -v 'main.tsp'|sort|grep -v '_inc.'|sed -e 's#outtsp/##' -e 's#^#import \"./#' -e 's#$#\";#' > outtsp/main.tsp",
+    "csv2tsp": "tsx ./utils/src/index.ts -I '^\\['",
+    "csv2tsp-combine": "tsx ./utils/src/index.ts -b latest/de -L de -m outtsp/i18n.yaml -p src/i18n.yaml -s outtsp -o outtsp.de -I '^\\['",
+    "maintsp": "find outtsp/ -name '*.tsp' -not -type l|grep -Ev 'main.tsp|_templates.tsp'|sort|grep -v '_inc.'|sed -e 's#outtsp/##' -e 's#^#import \"./#' -e 's#$#\";#' > outtsp/main.tsp",
     "format": "npx tsp format outtsp/*.tsp outtsp/**/*.tsp outtsp.de/*.tsp outtsp.de/**/*.tsp",
     "lint": "npx tsp compile outtsp/main.tsp --import @typespec/library-linter --emit @ebusd/ebus-typespec --no-emit",
     "csvall": "./csvall.sh",

utils/src/csv2tsp.ts

@@ -302,7 +302,12 @@ const addI18n = (location: string, str?: string): string|undefined => {
   i18n.set(key, {...add, first, [i18nLang]: str, locations});
   return first;
 };
-const normComment = (location: string, str?: string) => str && addI18n(location, str.replace(/@/g, 'at').replaceAll('**', '^'));
+const normComment = (location: string, str?: string) => {
+  if (!str || commentI18nIgnore && commentI18nIgnore.test(str)) {
+    return str;
+  }
+  return addI18n(location, str.replace(/@/g, 'at').replaceAll('**', '^'));
+};
 const templateTrans: Trans<TemplateLine> = (location, line, header, additions): OptStrs => {
   if (header) return templateHeader;
   if (header===false) {
@@ -346,7 +351,12 @@ const templateTrans: Trans<TemplateLine> = (location, line, header, additions):
   ]
 }
 const knownManufacturers = new Map<string, [number, string]>([
+  ['tem', [0x10, 'TEM']],
+  ['wolf', [0x19, 'Wolf']], // actually under kromschroeder below
+  ['encon', [0x40, 'ENCON']],
+  ['kromschroeder', [0x50, 'Kromschröder']],
   ['vaillant', [0xb5, 'Vaillant']],
+  ['weishaupt', [0xc5, 'Weishaupt']],
 ])
 const setSubdirManuf = (subdir: string): string|undefined => {
   const [id, name] = knownManufacturers.get(subdir)||[];
@@ -466,7 +476,7 @@ const isSimpleField = (line: FieldOfLine, singleField?: string): {comm?: string,
   }
   return {comm: line[5], typ};
 }
-const fieldTrans = (location: string, line: FieldOfLine|undefined, seen: Map<string, number>, additions: Additions, singleField?: string): OptStrs => {
+const fieldTrans = (location: string, line: FieldOfLine|undefined, seen: Map<string, number>, additions: Additions, singleField?: string, optional?: true): OptStrs => {
   if (!line) return;
   const {id, typ, typLen, comm, divisor, values, constValue}
   = divisorValues(line[0], line[2], line[3], line[5], singleField);
@@ -495,7 +505,7 @@ const fieldTrans = (location: string, line: FieldOfLine|undefined, seen: Map<str
     divisor||values,
     typLen,
     constValue!==undefined ? `@constValue(${constValue})` : '',
-    `${suffName}: ${typ},`,
+    `${suffName}${optional?'?':''}: ${typ},`,
   ]
 };
 const messageHeader = [
@@ -557,7 +567,7 @@ const namespaceWithZz = (header: string, additions: Additions) => {
   //   // drop component index suffix
   //   parts.splice(parts.length-1, 1);
   // }
-  circuit = parts.map(p=>normId(p)).map(p=>(p[0]>='0'&&p[0]<='9'?'_'+p:pascalCase(p))).join('.');
+  circuit = parts.filter(p=>!!p).map(p=>normId(p)).map(p=>(p[0]>='0'&&p[0]<='9'?'_'+p:pascalCase(p))).join('.');
   return [
     zz,
     `namespace ${circuit} {`,
@@ -803,7 +813,14 @@ const messageTrans: Trans<MessageLine> = (location, wholeLine, header, additions
   }
   if (!model) {
     const fields: OptStrs = [];
-    fieldLines.forEach(fieldLine => fields.push(...fieldTrans(location, fieldLine, seenFields, additions, fieldLines.length===1?modelName:'')||[]));
+    let optional: undefined|true = undefined;
+    fieldLines.forEach(fieldLine => {
+      if (fieldLine[0]?.startsWith('?')) {
+        fieldLine[0] = fieldLine[0].substring(1);
+        optional = true;
+      }
+      fields.push(...fieldTrans(location, fieldLine, seenFields, additions, fieldLines.length===1?modelName:'', optional)||[]);
+    });
     model = [
       (line[3]||isDefault)&&`/** ${normComment(location, line[3])||isDefault} */`,
       single
@@ -868,6 +885,7 @@ const helpTxt = [
   '  -p mapfile   the file name of a previously generated multi-language mapping to read for seeding the i18n normalization',
   '  -s i18ndir   the directory in which to store i18n file(s) per language ("<lang>.yaml")',
   '  -i regex     pattern for file names (including relative dir) to ignore',
+  '  -I regex     pattern for comment strings to ignore for i18n',
   '  -n           add extra namespace for explicitly named circuit',
   '  csvfile      the csv file(s) to transform (unless to traverse the whole basedir)'
 ];
@@ -879,6 +897,7 @@ let i18nLang: keyof Omit<I18n, 'locations'> = 'en';
 let warnI18n = false;
 let i18nMap: Map<string, [string, Partial<I18n>]>; // map from message/field/template key to i18n key and language+text
 let i18nMapRev: Map<string, string>; // map from non-en language to en from previous mapping
+let commentI18nIgnore: RegExp|undefined;
 export const csv2tsp = async (args: string[] = []) => {
   let indir = 'latest/en';
   let outdir = 'outtsp';
@@ -930,6 +949,9 @@ export const csv2tsp = async (args: string[] = []) => {
       case '-i':
         ignorePattern = new RegExp(args[++i]);
         break;
+      case '-I':
+        commentI18nIgnore = new RegExp(args[++i]);
+        break;
       case '-n':
         namespacePerCircuit = true;
         break;