Generating main field in package.json

Author: vojtechhabarta

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/TypeScriptGenerator.java

@@ -4,6 +4,7 @@
 import cz.habarta.typescript.generator.compiler.*;
 import cz.habarta.typescript.generator.emitter.*;
 import cz.habarta.typescript.generator.parser.*;
+import cz.habarta.typescript.generator.util.Utils;
 import java.io.*;
 import java.util.*;
 
@@ -58,11 +59,15 @@ private void generateNpmPackageJson(Output output) {
             if (output.getName() == null) {
                 throw new RuntimeException("Generating NPM package.json can only be used when output is specified using file name");
             }
-            final Output npmOutput = Output.to(new File(new File(output.getName()).getParent(), "package.json"));
+            final File outputFile = new File(output.getName());
+            final Output npmOutput = Output.to(new File(outputFile.getParent(), "package.json"));
             final NpmPackageJson npmPackageJson = new NpmPackageJson();
             npmPackageJson.name = settings.npmName;
             npmPackageJson.version = settings.npmVersion;
-            npmPackageJson.types = new File(output.getName()).getName();
+            npmPackageJson.types = outputFile.getName();
+            npmPackageJson.main = settings.outputFileType == TypeScriptFileType.implementationFile
+                    ? Utils.replaceExtension(outputFile, ".js").getName()
+                    : null;
             getNpmPackageJsonEmitter().emit(npmPackageJson, npmOutput.getWriter(), npmOutput.getName(), npmOutput.shouldCloseWriter());
         }
     }

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/emitter/NpmPackageJson.java

@@ -7,5 +7,6 @@ public class NpmPackageJson {
     public String name;
     public String version;
     public String types;
+    public String main;
 
 }

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/emitter/NpmPackageJsonEmitter.java

@@ -1,6 +1,7 @@
 
 package cz.habarta.typescript.generator.emitter;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import cz.habarta.typescript.generator.util.StandardJsonPrettyPrinter;
@@ -26,6 +27,7 @@ private void emitPackageJson(NpmPackageJson npmPackageJson) {
         try {
             final ObjectMapper objectMapper = new ObjectMapper();
             objectMapper.enable(SerializationFeature.INDENT_OUTPUT);
+            objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
             objectMapper.setDefaultPrettyPrinter(new StandardJsonPrettyPrinter("  ", "\n"));
             objectMapper.writeValue(writer, npmPackageJson);
         } catch (IOException e) {

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/util/Utils.java

@@ -1,6 +1,7 @@
 
 package cz.habarta.typescript.generator.util;
 
+import java.io.File;
 import java.io.InputStream;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -88,4 +89,11 @@ private static String normalizeLineEndings(String text, String lineEndings) {
         return text.replaceAll("\\r\\n|\\n|\\r", lineEndings);
     }
 
+    public static File replaceExtension(File file, String newExtension) {
+        final String name = file.getName();
+        final int dotIndex = name.lastIndexOf(".");
+        final int index = dotIndex != -1 ? dotIndex : name.length();
+        return new File(file.getParent(), name.substring(0, index) + newExtension);
+    }
+
 }

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/UtilsTest.java

@@ -0,0 +1,18 @@
+
+package cz.habarta.typescript.generator;
+
+import cz.habarta.typescript.generator.util.Utils;
+import java.io.File;
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class UtilsTest {
+
+    @Test
+    public void testReplaceExtension() {
+        Assert.assertEquals(new File("test.dir/test.js"), Utils.replaceExtension(new File("test.dir/test"), ".js"));
+        Assert.assertEquals(new File("test.dir/test.1.js"), Utils.replaceExtension(new File("test.dir/test.1.ts"), ".js"));
+    }
+
+}