Merge pull request #79 from asarazan/fix/star-imports

fix missing json imports for star import strategy
asarazan · Apr 24, 2024 · 7ddf776 · 7ddf776
2 parents b1e8994 + cd0a856
commit 7ddf776
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/kotlin/StandardKotlinImports.ts b/src/kotlin/StandardKotlinImports.ts
@@ -14,5 +14,10 @@ export const StandardKotlinImportList = [
   `import kotlinx.serialization.json.jsonObject`,
 ];
 
-export const StarKotlinImport = "import kotlinx.serialization.*";
+export const StarKotlinImportList = [
+  "import kotlinx.serialization.*",
+  "import kotlinx.serialization.json.*",
+];
+
+export const StarKotlinImports = StarKotlinImportList.join("\n");
 export const StandardKotlinImports = StandardKotlinImportList.join("\n");
diff --git a/src/martok/Martok.ts b/src/martok/Martok.ts
@@ -5,7 +5,7 @@ import _ from "lodash";
 import { TsHelper } from "../typescript/TsHelper";
 import {
   StandardKotlinImportList,
-  StarKotlinImport,
+  StarKotlinImportList,
 } from "../kotlin/StandardKotlinImports";
 import { ImportGenerator } from "./ImportGenerator";
 import { DeclarationGenerator } from "./declarations/DeclarationGenerator";
@@ -167,7 +167,7 @@ export class Martok {
         package: `package ${pkg}`,
         imports: [
           ...(this.config.options?.importStar
-            ? [StarKotlinImport]
+            ? StarKotlinImportList
             : StandardKotlinImportList),
         ],
         declarations: [],

diff --git a/src/martok/MartokFormatter.ts b/src/martok/MartokFormatter.ts
@@ -1,7 +1,8 @@
 import { MartokOutFile } from "./MartokOutFile";
 import {
   StandardKotlinImports,
-  StarKotlinImport,
+  StarKotlinImportList,
+  StarKotlinImports,
 } from "../kotlin/StandardKotlinImports";
 import { MartokConfig } from "./MartokConfig";
 import { KlassPrinter } from "../kotlin/KlassPrinter";
@@ -27,7 +28,7 @@ ${file.text.declarations
     return `${StandardFileHeader}
 package ${this.config.package}
 
-${this.config.options?.importStar ? StarKotlinImport : StandardKotlinImports}
+${this.config.options?.importStar ? StarKotlinImports : StandardKotlinImports}
 
 ${files
   .flatMap((value) =>