Merge pull request #2 from flotiq/hotfix/model-imports

Fix typescript declaration build

README.md

@@ -34,6 +34,17 @@ const flotiq = new FlotiqApi(FLOTIQ_RO_API_KEY);
 const eventList = await flotiq.Event.list({limit:100});
 ```
 
+## Generating declarations
+
+To generate a set of `d.ts` files for Typescript follow these steps:
+
+1. Execute `npx flotiq-codegen-ts generate` as usual
+2. Go to `./flotiqApi` directory
+3. Execute `../clean_duplicate_import.sh`
+4. Execute `npm run build`
+
+This will render the declarations in the `flotiqApi/dist` folder.
+
 ## Collaborating
 
 If you wish to talk with us about this project, feel free to hop on our [![Discord Chat](https://img.shields.io/discord/682699728454025410.svg)](https://discord.gg/FwXcHnX).

clean_duplicate_import.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+file_patterns="src/models/*WithoutInternal.ts src/models/*WithoutRequired.ts"
+delete_line="import { DataSource, DataSourceFromJSON } from './DataSource';"
+
+escaped_delete_line=$(printf '%s\n' "$delete_line" | sed 's:[][\/.^$*]:\\&:g')
+
+for file in $file_patterns; do
+  if grep -Fq "$delete_line" "$file"; then
+    sed -i '' "/$escaped_delete_line/d" "$file"
+  fi
+done
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "flotiq-codegen-ts",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "CLI tool to generate API clients using Flotiq API and OpenAPI Generator",
   "main": "index.js",
   "bin": {

templates/modelGeneric.mustache

@@ -8,7 +8,9 @@ import {
     {{.}}ToJSON,
 } from './{{.}}{{importFileExtension}}';
 {{/imports}}
-//import { DataSource, DataSourceFromJSON } from './DataSource';
+
+import { DataSource, DataSourceFromJSON } from './DataSource';
+
 {{/hasImports}}
 {{#discriminator}}
 import {