fix ts warnings

benzaita · Jul 7, 2019 · d80a033 · d80a033
1 parent 6b2e270
commit d80a033
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ $ npm install -g dockerized-cli
 $ dockerized COMMAND
 running command...
 $ dockerized (-v|--version|version)
-dockerized-cli/0.4.0 darwin-x64 node-v11.6.0
+dockerized-cli/0.4.0 darwin-x64 node-v8.15.1
 $ dockerized --help [COMMAND]
 USAGE
   $ dockerized COMMAND
@@ -146,11 +146,11 @@ USAGE
   $ dockerized init
 
 OPTIONS
-  -C, --composeFile=composeFile  [default: .dockerized/docker-compose.dockerized.yml] Docker-Compose file to create
-  -D, --dockerFile=dockerFile    [default: .dockerized/Dockerfile.dockerized] Dockerfile to create
-  --withGoCache                  Includes a volume for GOPATH
-  --[no-]withNestedDocker        Includes support for running Docker inside Docker
-  --withYarnCache                Includes support for utilizing yarn cache
+  --composeFile=composeFile  [default: .dockerized/docker-compose.dockerized.yml] Docker-Compose file to create
+  --dockerFile=dockerFile    [default: .dockerized/Dockerfile.dockerized] Dockerfile to create
+  --withGoCache              Includes a volume for GOPATH
+  --[no-]withNestedDocker    Includes support for running Docker inside Docker
+  --withYarnCache            Includes support for utilizing yarn cache
 
 EXAMPLE
   $ dockerized init

diff --git a/src/commands/compose.ts b/src/commands/compose.ts
@@ -6,7 +6,7 @@ import runDockerCompose from '../utils/run-docker-compose';
 
 const readConfig = createReadConfig();
 
-function execDockerComposeCommand(command, baseDir, dockerComposeFile) {
+function execDockerComposeCommand(command: string[], baseDir: string, dockerComposeFile: string) {
     return runDockerCompose({
         rejectOnNonZeroExitCode: false,
         baseDir,

diff --git a/src/commands/init.ts b/src/commands/init.ts
@@ -13,8 +13,8 @@ const composeConfig = {
                 dockerfile: '',
             },
             entrypoint: ['sh', '-c'],
-            environment: [],
-            volumes: [],
+            environment: [] as string[],
+            volumes: [] as string[],
             // eslint-disable-next-line @typescript-eslint/camelcase
             network_mode: '',
         },
@@ -34,12 +34,10 @@ export default class Init extends Command {
 
     public static flags = {
         composeFile: flags.string({
-            char: 'C',
             description: 'Docker-Compose file to create',
             default: '.dockerized/docker-compose.dockerized.yml',
         }),
         dockerFile: flags.string({
-            char: 'D',
             description: 'Dockerfile to create',
             default: '.dockerized/Dockerfile.dockerized',
         }),
@@ -70,13 +68,13 @@ export default class Init extends Command {
                 throw new Error('already initialized');
             }
 
-            if (fs.existsSync(flags.composeFile)) {
+            if (flags.composeFile === undefined || fs.existsSync(flags.composeFile)) {
                 throw new Error(
                     `will not overwrite ${flags.composeFile}. Use --composeFile to choose a different name`,
                 );
             }
 
-            if (fs.existsSync(flags.dockerFile)) {
+            if (flags.dockerFile === undefined || fs.existsSync(flags.dockerFile)) {
                 throw new Error(`will not overwrite ${flags.dockerFile}. Use --dockerFile to choose a different name`);
             }
 
@@ -91,12 +89,14 @@ export default class Init extends Command {
             if (flags.withYarnCache) {
                 composeConfig.services.dockerized.volumes.push('yarn-cache:/data/yarn-cache');
                 composeConfig.services.dockerized.environment.push('YARN_CACHE_FOLDER=/data/yarn-cache');
+                // @ts-ignore
                 composeConfig.volumes['yarn-cache'] = {};
             }
 
             if (flags.withGoCache) {
                 composeConfig.services.dockerized.volumes.push('go-cache:/go');
                 composeConfig.services.dockerized.environment.push('GOPATH=/go');
+                // @ts-ignore
                 composeConfig.volumes['go-cache'] = {};
             }
 
@@ -106,7 +106,7 @@ export default class Init extends Command {
                 composeConfig.services.dockerized.network_mode = 'host';
             }
 
-            fs.writeFileSync(config.composeFile, yaml.safeDump(composeConfig));
+            fs.writeFileSync(config.composeFile as string, yaml.safeDump(composeConfig));
 
             fs.writeFileSync(flags.dockerFile, dockerConfig);
 

diff --git a/src/operations/exec.ts b/src/operations/exec.ts
@@ -11,9 +11,9 @@ const debug = createDebug('dockerized:exec');
 export interface CreateExecInput {
     config: Config;
     baseDir: string;
-    runInContainer: typeof _runInContainer;
-    runDockerCompose: typeof _runDockerCompose;
-    writeConfig: typeof _writeConfig;
+    runInContainer?: typeof _runInContainer;
+    runDockerCompose?: typeof _runDockerCompose;
+    writeConfig?: typeof _writeConfig;
 }
 
 export default function createExec({

diff --git a/tsconfig.json b/tsconfig.json
@@ -8,7 +8,7 @@
     "allowJs": true,                       /* Allow javascript files to be compiled. */
     // "checkJs": true,                       /* Report errors in .js files. */
     // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
-    "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+    "declaration": false,                   /* Generates corresponding '.d.ts' file. */
     // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
     // "sourceMap": true,                     /* Generates corresponding '.map' file. */
     // "outFile": "./",                       /* Concatenate and emit output to single file. */