records

ldproxy · Jan 2, 2025 · 1d593e4 · 1d593e4
1 parent 7dbe734
commit 1d593e4
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
diff --git a/libxtracfg/js/types/generate-java-classes.ts b/libxtracfg/js/types/generate-java-classes.ts
@@ -129,7 +129,7 @@ public abstract class Handler<T extends Handler.Context, U extends Handler.Conte
         return notConnected();
       }
 
-      ${result} result = handle(new ${initCommand}(command.getOptions()), false, ignore -> {});
+      ${result} result = handle(new ${initCommand}(command.options()), false, ignore -> {});
 
       if (result instanceof ${failure}) {
         return result;
@@ -155,7 +155,7 @@ public abstract class Handler<T extends Handler.Context, U extends Handler.Conte
     }
 
     code += `
-    return new ${failure}("Unknown command: " + command.getCommand());
+    return new ${failure}("Unknown command: " + command.command());
   }
 }
     `;

diff --git a/libxtracfg/js/types/java/data.ts b/libxtracfg/js/types/java/data.ts
@@ -25,9 +25,9 @@ public record ${name}(`;
     let i = 0;
     for (const [key, entry] of props) {
       i++;
-      /*if (isConst(entry)) {
+      if (isConst(entry)) {
         continue;
-      }*/
+      }
       const comma = i <= Object.keys(properties).length - 1 ? "," : "";
       code += `
     ${getType(entry, suffixNs)} ${key}${comma}`;
@@ -40,9 +40,9 @@ public ${name}(`;
     let j = 0;
     for (const [key, entry] of props) {
       j++;
-      /*if (isConst(entry)) {
+      if (isConst(entry)) {
         continue;
-      }*/
+      }
       const comma = j <= Object.keys(properties).length - 1 ? "," : "";
       code += `
   ${getType(entry, suffixNs)} ${key}${comma}`;
@@ -52,8 +52,8 @@ public ${name}(`;
 ) {`;
     for (const [key, entry] of props) {
       if (isConst(entry)) {
-        code += `
-  this.${key} = ${getValue(entry)};`;
+        /*code += `
+  this.${key} = ${getValue(entry)};`;*/
         continue;
       }
       if (Object.hasOwn(entry, "default")) {
@@ -68,10 +68,24 @@ public ${name}(`;
     }
 
     code += `
-}
 }
   `;
 
+    for (const [key, entry] of props) {
+      if (isConst(entry)) {
+        code += `
+public ${getType(entry, suffixNs)} ${key}() {
+  return ${getValue(entry)};
+}
+`;
+      }
+    }
+
+    code += `
+}
+
+`;
+
     return code;
   };
 

diff --git a/libxtracfg/js/types/src/index.ts b/libxtracfg/js/types/src/index.ts
@@ -82,18 +82,18 @@ export namespace Command {
    */
   export class Connect extends Base {
     declare readonly command: Enums.Main.Connect;
-    declare readonly options: Options.Options;
+    declare readonly options: Options.Base;
 
-    constructor(options: Options.Options = {}) {
+    constructor(options: Options.Base = {}) {
       super(Enums.Main.Connect, options);
     }
   }
 
   export class Info extends Base {
     declare readonly command: Enums.Main.Info;
-    declare readonly options: Options.Options;
+    declare readonly options: Options.Base;
 
-    constructor(options: Options.Options = {}) {
+    constructor(options: Options.Base = {}) {
       super(Enums.Main.Info, options);
     }
   }