Merge pull request #111 from vojtechhabarta/umd

UMD modules (export as namespace)

Author: vojtechhabarta

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

@@ -1,6 +1,7 @@
 
 package cz.habarta.typescript.generator;
 
+import cz.habarta.typescript.generator.emitter.Emitter;
 import cz.habarta.typescript.generator.emitter.EmitterExtension;
 import cz.habarta.typescript.generator.util.Predicate;
 import java.io.File;
@@ -22,6 +23,7 @@ public class Settings {
     public TypeScriptOutputKind outputKind = null;
     public String module = null;
     public String namespace = null;
+    public String umdNamespace = null;
     public JsonLibrary jsonLibrary = null;
     private Predicate<String> excludeFilter = null;
     public boolean declarePropertiesAsOptional = false;
@@ -103,6 +105,15 @@ public void validate() {
         if (outputKind == TypeScriptOutputKind.ambientModule && outputFileType == TypeScriptFileType.implementationFile) {
             throw new RuntimeException("Ambient modules are not supported in implementation files. " + seeLink());
         }
+        if (outputKind != TypeScriptOutputKind.module && umdNamespace != null) {
+            throw new RuntimeException("'umdNamespace' parameter is only applicable to modules. " + seeLink());
+        }
+        if (outputFileType == TypeScriptFileType.implementationFile && umdNamespace != null) {
+            throw new RuntimeException("'umdNamespace' parameter is not applicable to implementation files. " + seeLink());
+        }
+        if (umdNamespace != null && !Emitter.isValidIdentifierName(umdNamespace)) {
+            throw new RuntimeException("Value of 'umdNamespace' parameter is not valid identifier: " + umdNamespace + ". " + seeLink());
+        }
         if (jsonLibrary == null) {
             throw new RuntimeException("Required 'jsonLibrary' parameter is not configured.");
         }

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

@@ -32,6 +32,7 @@ public void emit(TsModel model, Writer output, String outputName, boolean closeO
         emitReferences();
         emitImports();
         emitModule(model);
+        emitUmdNamespace();
         if (closeOutput) {
             close();
         }
@@ -148,7 +149,7 @@ private String toPropertyName(String name) {
 
     // https://github.com/Microsoft/TypeScript/blob/master/doc/spec.md#2.2.2
     // http://www.ecma-international.org/ecma-262/6.0/index.html#sec-names-and-keywords
-    private static boolean isValidIdentifierName(String name) {
+    public static boolean isValidIdentifierName(String name) {
         if (name == null || name.isEmpty()) {
             return false;
         }
@@ -193,6 +194,13 @@ private void emitNumberEnums(TsModel model, boolean exportKeyword, boolean decla
         }
     }
 
+    private void emitUmdNamespace() {
+        if (settings.umdNamespace != null) {
+            writeNewLine();
+            writeIndentedLine("export as namespace " + settings.umdNamespace + ";");
+        }
+    }
+
     private void emitComments(List<String> comments) {
         if (comments != null) {
             writeIndentedLine("/**");

typescript-generator-gradle-plugin/src/main/java/cz/habarta/typescript/generator/gradle/GenerateTask.java

@@ -17,6 +17,7 @@ public class GenerateTask extends DefaultTask {
     public TypeScriptOutputKind outputKind;
     public String module;
     public String namespace;
+    public String umdNamespace;
     public List<String> classes;
     public List<String> classPatterns;
     public String classesFromJaxrsApplication;
@@ -79,6 +80,7 @@ public void generate() throws Exception {
         settings.outputKind = outputKind;
         settings.module = module;
         settings.namespace = namespace;
+        settings.umdNamespace = umdNamespace;
         settings.setExcludeFilter(excludeClasses, excludeClassPatterns);
         settings.jsonLibrary = jsonLibrary;
         settings.declarePropertiesAsOptional = declarePropertiesAsOptional;

typescript-generator-maven-plugin/src/main/java/cz/habarta/typescript/generator/maven/GenerateMojo.java

@@ -56,6 +56,13 @@ public class GenerateMojo extends AbstractMojo {
     @Parameter
     private String namespace;
 
+    /**
+     * Turns proper module into UMD (Universal Module Definition) with specified namespace.
+     * Only applicable to declaration files.
+     */
+    @Parameter
+    private String umdNamespace;
+
     /**
      * JSON classes to process.
      */
@@ -309,6 +316,7 @@ public void execute() {
             settings.outputKind = outputKind;
             settings.module = module;
             settings.namespace = namespace;
+            settings.umdNamespace = umdNamespace;
             settings.setExcludeFilter(excludeClasses, excludeClassPatterns);
             settings.jsonLibrary = jsonLibrary;
             settings.declarePropertiesAsOptional = declarePropertiesAsOptional;