package.json

@@ -1,6 +1,6 @@
 {
    "name": "@hibas123/jrpcgen",
-   "version": "1.2.16",
+   "version": "1.2.14",
    "main": "lib/index.js",
    "license": "MIT",
    "packageManager": "yarn@3.1.1",

src/targets/typescript.ts

@@ -33,7 +33,7 @@ export class TypescriptTarget extends CompileTarget {
    }
 
    private generateImport(imports: string, path: string) {
-      return `import ${imports} from "${path + (this.flavour === "esm" ? ".js" : "")
+      return `import ${imports} from "${path + (this.flavour === "esm" ? ".ts" : "")
          }";\n`;
    }
 
@@ -207,7 +207,7 @@ export class TypescriptTarget extends CompileTarget {
       this.writeFormattedFile(
          "service_client.ts",
          this.generateImport(
-            "{ type RequestObject, type ResponseObject, ErrorCodes, Logging }",
+            "{ RequestObject, ResponseObject, ErrorCodes, Logging }",
             "./service_base"
          ) +
          this.generateImport(" { VerificationError }", "./ts_base") +
@@ -304,7 +304,7 @@ export class TypescriptTarget extends CompileTarget {
       this.writeFormattedFile(
          "service_server.ts",
          this.generateImport(
-            "{ type RequestObject, type ResponseObject, ErrorCodes, Logging }",
+            "{ RequestObject, ResponseObject, ErrorCodes, Logging }",
             "./service_base"
          ) +
          this.generateImport(" { VerificationError }", "./ts_base") +

templates/ts_base.ts

@@ -1,3 +1,5 @@
+import { isGeneratorFunction } from "util/types";
+
 function form_verficiation_error_message(type?: string, field?: string) {
    let msg = "Parameter verification failed! ";
    if (type && field) {

templates/ts_service_server.ts

@@ -1,7 +1,7 @@
 //@template-ignore
 import { VerificationError } from "./ts_base";
 //@template-ignore
-import { type RequestObject, type ResponseObject, ErrorCodes, Logging } from "./ts_service_base";
+import { RequestObject, ResponseObject, ErrorCodes, Logging } from "./ts_service_base";
 
 
 export class Service<T> {