typescript model generation update (output enums with interfaces as t…

…ypescript classes)
openremote · Apr 15, 2019 · 64e623e · 64e623e
1 parent 756e3c2
commit 64e623e
Show file tree

Hide file tree

Showing 8 changed files with 499 additions and 12 deletions.
diff --git a/ui/component/model/.gitignore b/ui/component/model/.gitignore
@@ -0,0 +1 @@
+src/index.ts
diff --git a/ui/component/model/build.gradle b/ui/component/model/build.gradle
@@ -7,13 +7,13 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'cz.habarta.typescript-generator:typescript-generator-gradle-plugin:2.10.466'
+        classpath 'cz.habarta.typescript-generator:typescript-generator-gradle-plugin:2.13.489'
     }
 }
 
 dependencies {
     compile resolveProject(":model")
-    compile 'cz.habarta.typescript-generator:typescript-generator-core:2.9.456'
+    compile 'cz.habarta.typescript-generator:typescript-generator-core:2.13.489'
 }
 
 generateTypeScript {
@@ -43,8 +43,20 @@ generateTypeScript {
     ]
     optionalProperties = "all" // TODO: cleanup model to be more explicit about optional params
     mapEnum = cz.habarta.typescript.generator.EnumMapping.asEnum
-    outputFile = "dist/index.d.ts"
+    outputFile = "src/index.ts"
+    outputFileType = "implementationFile"
     outputKind = "module"
+    extensionsWithConfiguration = [
+            new cz.habarta.typescript.generator.Settings.ConfiguredExtension(
+                className: "EnumWithInterfacesExtension",
+//                configuration: [
+//                        enumPattern1: "**AssetType**",
+//                        enumPattern2: "**AttributeType**",
+//                        enumPattern3: "**AttributeValueType**",
+//                        enumPattern4: "**MetaItemType**",
+//                ]
+            )
+    ]
 }
 
 clean {

diff --git a/ui/component/model/package.json b/ui/component/model/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.1",
   "main": "",
   "description": "OpenRemote 3.x Model Types",
-  "types": "dist/index.d.ts",
+  "types": "src/index.ts",
   "scripts": {
     "build": "exit 0",
     "test": "echo \"No tests\" && exit 0"

diff --git a/ui/component/model/src/main/java/EnumWithInterfacesExtension.java b/ui/component/model/src/main/java/EnumWithInterfacesExtension.java
diff --git a/ui/component/model/tsconfig.json b/ui/component/model/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig",
+  "compilerOptions": {
+    "outDir": "./dist/",
+    "rootDir": "src"
+  },
+  "include": [
+    "./src"
+  ]
+}
diff --git a/ui/component/rest/build.gradle b/ui/component/rest/build.gradle
@@ -7,13 +7,13 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'cz.habarta.typescript-generator:typescript-generator-gradle-plugin:2.10.466'
+        classpath 'cz.habarta.typescript-generator:typescript-generator-gradle-plugin:2.13.489'
     }
 }
 
 dependencies {
     compile resolveProject(":model")
-    compile 'cz.habarta.typescript-generator:typescript-generator-core:2.9.456'
+    compile 'cz.habarta.typescript-generator:typescript-generator-core:2.13.489'
 }
 
 generateTypeScript {
@@ -38,12 +38,9 @@ generateTypeScript {
     importDeclarations = [
             "import * as Model from \"@openremote/model\""
     ]
-
-    extensionClasses = [
-            "AggregatedApiClient"
-    ]
     extensions = [
-            "cz.habarta.typescript.generator.ext.AxiosClientExtension"
+        "AggregatedApiClient",
+        "cz.habarta.typescript.generator.ext.AxiosClientExtension"
     ]
 }
 

diff --git a/ui/component/rest/tsconfig.json b/ui/component/rest/tsconfig.json
@@ -6,5 +6,8 @@
   },
   "include": [
     "./src"
+  ],
+  "references": [
+    { "path": "../model" }
   ]
 }
diff --git a/ui/model-build.js b/ui/model-build.js
@@ -30,5 +30,5 @@ const gradleModelWatch = spawnSync((process.platform === "win32" ? "gradlew" : "
     cwd: cwd,
     shell: true
 });
-console.log("gradlew modelWatch finished!");
+console.log("gradlew modelWatch finished! Status = " + gradleModelWatch.status);
 process.exit(gradleModelWatch.status);