Feature/v0.3.0 (#4)

* Added missing index.js.

* Fixed relative path.

* 0.2.0

* Another generating require relative path fix.

* Fixed generator path appender.

* Renemade to outDir #1.

* Fixed default generator appender.

* Renamed g to o argument.

* Added config checks for required arguments.

* Fixed examples.

* 0.3.0

* 0.3.0

Author: Martynas Žilinskas

example/dist/hello.js

@@ -1,2 +1,2 @@
 /* Generated by main-file-generator */
-module.exports.default = require('./build.js').Default;
+module.exports.default = require('./build.js').default;

example/dts-bundle.json

@@ -5,7 +5,7 @@
     "removeSource": true,
     "proxyjs": {
       "default": "Hello",
-      "generateDir": "./dist",
+      "outDir": "./dist",
       "requireFile": "./dist/build.js"
     }
 }

example/package.json

@@ -1,6 +1,6 @@
 {
   "name": "example-lib",
-  "version": "1.0.0",
+  "version": "0.3.0",
   "main": "./dist/index.js",
   "devDependencies": {
     "rollup": "^0.34.7",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dts-bundle-proxyjs",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Generates JS proxies from bundled dts.",
   "main": "index.js",
   "scripts": {

src/arguments.ts

@@ -13,15 +13,15 @@ export default yargs
     })
     .option('default', {
         alias: 'd',
-        describe: 'Bundled default export.',
+        describe: 'Bundled require default export.',
         type: 'string'
     })
-    .option('generatedir', {
-        alias: 'g',
+    .option('outDir', {
+        alias: 'o',
         describe: 'Where generate JS files.',
         type: 'string'
     })
-    .option('requirefile', {
+    .option('requireFile', {
         alias: 'r',
         describe: 'Bundled JS main file.',
         type: 'string'

src/cli.ts

@@ -39,9 +39,15 @@ class Cli {
 
     private getConfig(config: Contracts.Config, args: Contracts.Arguments) {
         if (args.default != null) config.proxyjs.default = args.default;
-        if (args.generatedir != null) config.proxyjs.generateDir = args.generatedir;
-        if (args.requirefile != null) config.proxyjs.requireFile = args.requirefile;
+        if (args.outDir != null) config.proxyjs.outDir = args.outDir;
+        if (args.requireFile != null) config.proxyjs.requireFile = args.requireFile;
         if (config.baseDir == null) config.baseDir = '';
+        if (config.proxyjs.outDir == null) {
+            this.throwError('[Error] In proxyjs config `outDir` is undefined.');
+        }
+        if (config.proxyjs.requireFile == null) {
+            this.throwError('[Error] In proxyjs config `requireFile` is undefined.');
+        }
         return config;
     }
 

src/contracts.ts

@@ -4,7 +4,7 @@ export interface Config {
     out: string;
     proxyjs: {
         default: string;
-        generateDir: string;
+        outDir: string;
         requireFile: string;
     }
 }
@@ -15,6 +15,6 @@ export interface Arguments {
     help: boolean;
     version: boolean;
     default: string;
-    generatedir: string;
-    requirefile: string;
+    outDir: string;
+    requireFile: string;
 }

src/generator.ts

@@ -37,7 +37,7 @@ export default class Generator {
         console.info(clc.yellow('Generating files:'));
         matches.forEach((match: string) => {
             let cleanedMatch = this.cleanModule(match);
-            let fullFilePath = path.join(process.cwd(), this.config.proxyjs.generateDir, `${match}.js`);
+            let fullFilePath = path.join(process.cwd(), this.config.proxyjs.outDir, `${match}.js`);
             // Make sure that all folders are created.
             mkdirp.sync(path.dirname(fullFilePath));
 
@@ -61,7 +61,7 @@ export default class Generator {
 
     private generateLine(requirePath: string, moduleName: string) {
         if (this.config.proxyjs.default === moduleName) {
-            moduleName = 'Default';
+            moduleName = 'default';
         }
         return `module.exports.default = require('${requirePath}').${moduleName};`;
     }
@@ -77,7 +77,7 @@ export default class Generator {
             filePath = filePath.split(path.sep).join('/');
         }
 
-        if (filePath.indexOf('/') === -1) {
+        if (filePath.indexOf('../') !== 0) {
             filePath = './' + filePath;
         }