Merge pull request #29 from flotiq/support-cjs-mjs

Include cjs/mjs in compiled output

index.js

@@ -80,7 +80,7 @@ async function generateSDK(apiKey, compileToJs) {
         console.log('Generating client from schema...');
 
         // Generate command
-        const lambdaUrl = `https://0c8judkapg.execute-api.us-east-1.amazonaws.com/default/codegen-ts?token=${apiKey}`
+        const lambdaUrl = `https://0c8judkapg.execute-api.us-east-1.amazonaws.com/default/codegen-ts?token=${apiKey}`;
         const zip = new admZip(await lambdaInvoke(lambdaUrl));
         const tmpPath = getWorkingPath();
         const tmpSDKPath = `${tmpPath}/flotiqApi`;

package.json

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

src/build_to_js.js

@@ -15,8 +15,12 @@ const buildToJs = (tmpSDKPath) => {
             return console.error(err.message);
         }
     });
-    execSync(`tsc -p ${sdkCopyPath}`, {stdio: 'inherit'});
-    fce.moveSync(`${sdkCopyPath}/dist/`, `${tmpSDKPath}`, {overwrite: true});
+    execSync(`npm run build`, {stdio: 'inherit', cwd: sdkCopyPath});
+    // Move main files (dist, package.json, README.nd) to the result dir
+    // Don't move typescript sources to the result dir
+    fce.moveSync(`${sdkCopyPath}/dist`, `${tmpSDKPath}/dist`, {overwrite: true});
+    fce.moveSync(`${sdkCopyPath}/package.json`, `${tmpSDKPath}/package.json`, {overwrite: true});
+    fce.moveSync(`${sdkCopyPath}/README.md`, `${tmpSDKPath}/README.md`, {overwrite: true});
 }
 
 module.exports = buildToJs;