Improved generated npm package.json

Author: vojtechhabarta

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

@@ -62,6 +62,8 @@ public class Settings {
     public boolean generateNpmPackageJson = false;
     public String npmName = null;
     public String npmVersion = null;
+    public Map<String, String> npmPackageDependencies = new LinkedHashMap<>();
+    public String typescriptVersion = "2.2.2";
     public boolean displaySerializerWarning = true;
     public boolean disableJackson2ModuleDiscovery = false;
     public ClassLoader classLoader = null;
@@ -157,6 +159,9 @@ public void validate() {
                 reportConfigurationChange(extensionName, "restOptionsType", features.restOptionsType);
                 setRestOptionsType(features.restOptionsType);
             }
+            if (features.npmPackageDependencies != null) {
+                npmPackageDependencies.putAll(features.npmPackageDependencies);
+            }
             if (features.overridesStringEnums) {
                 defaultStringEnumsOverriddenByExtension = true;
             }

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

@@ -65,9 +65,12 @@ private void generateNpmPackageJson(Output output) {
             npmPackageJson.name = settings.npmName;
             npmPackageJson.version = settings.npmVersion;
             npmPackageJson.types = outputFile.getName();
-            npmPackageJson.main = settings.outputFileType == TypeScriptFileType.implementationFile
-                    ? Utils.replaceExtension(outputFile, ".js").getName()
-                    : null;
+            if (settings.outputFileType == TypeScriptFileType.implementationFile) {
+                npmPackageJson.main = Utils.replaceExtension(outputFile, ".js").getName();
+                npmPackageJson.dependencies = !settings.npmPackageDependencies.isEmpty() ? settings.npmPackageDependencies : null;
+                npmPackageJson.devDependencies = Collections.singletonMap("typescript", settings.typescriptVersion);
+                npmPackageJson.scripts = Collections.singletonMap("prepublish", "tsc --module umd --moduleResolution node --sourceMap " + outputFile.getName());
+            }
             getNpmPackageJsonEmitter().emit(npmPackageJson, npmOutput.getWriter(), npmOutput.getName(), npmOutput.shouldCloseWriter());
         }
     }

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

@@ -1,6 +1,8 @@
 
 package cz.habarta.typescript.generator.emitter;
 
+import java.util.Map;
+
 
 public class EmitterExtensionFeatures {
 
@@ -9,6 +11,7 @@ public class EmitterExtensionFeatures {
     public boolean generatesJaxrsApplicationClient = false;
     public String restResponseType = null;
     public String restOptionsType = null;
+    public Map<String, String> npmPackageDependencies = null;
     public boolean overridesStringEnums = false;
 
 }

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

@@ -1,12 +1,17 @@
 
 package cz.habarta.typescript.generator.emitter;
 
+import java.util.Map;
+
 
 public class NpmPackageJson {
 
     public String name;
     public String version;
     public String types;
     public String main;
+    public Map<String, String> dependencies;
+    public Map<String, String> devDependencies;
+    public Map<String, String> scripts;
 
 }

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/ext/AxiosClientExtension.java

@@ -19,8 +19,9 @@ public EmitterExtensionFeatures getFeatures() {
         features.generatesRuntimeCode = true;
         features.generatesModuleCode = true;
         features.generatesJaxrsApplicationClient = true;
-        features.restResponseType = "Axios.Promise<Axios.GenericAxiosResponse<R>>";
+        features.restResponseType = "Promise<Axios.GenericAxiosResponse<R>>";
         features.restOptionsType = "<O>";
+        features.npmPackageDependencies = Collections.singletonMap("axios", "0.16.0");
         return features;
     }
 

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/ext/AxiosClientExtensionTest.java

@@ -24,7 +24,6 @@ public void test() {
         settings.jaxrsNamespacing = JaxrsNamespacing.perResource;
         settings.extensions.add(new AxiosClientExtension());
         final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(JaxrsApplicationTest.OrganizationApplication.class));
-        System.out.println(output);
         final String errorMessage = "Unexpected output: " + output;
 
         Assert.assertTrue(errorMessage, output.contains("interface Organization"));
@@ -34,7 +33,7 @@ public void test() {
 
         Assert.assertTrue(errorMessage, output.contains("class OrganizationsResourceClient<O>"));
         Assert.assertTrue(errorMessage, output.contains("class PersonResourceClient<O>"));
-        Assert.assertTrue(errorMessage, output.contains("type RestResponse<R> = Axios.Promise<Axios.GenericAxiosResponse<R>>"));
+        Assert.assertTrue(errorMessage, output.contains("type RestResponse<R> = Promise<Axios.GenericAxiosResponse<R>>"));
 
         Assert.assertTrue(errorMessage, output.contains("class AxiosHttpClient implements HttpClient<Axios.AxiosRequestConfig>"));
         Assert.assertTrue(errorMessage, output.contains("request(requestConfig: { method: string; url: string; queryParams?: any; data?: any; options?: Axios.AxiosRequestConfig; }): RestResponse<any>"));