cli-ext: add typescript support (#4820)

Aleksandra Sikora · web-flow · commit 90dea986637a · 2020-06-02T19:41:56.000+05:30
diff --git a/cli-ext/.babelrc b/cli-ext/.babelrc
@@ -1,4 +1,4 @@
 {
-  presets: ["@babel/preset-env"],
-  plugins: ["@babel/plugin-transform-async-to-generator"]
+  "presets": ["@babel/preset-env", "@babel/preset-typescript"],
+  "plugins": ["@babel/plugin-transform-async-to-generator"]
 }
diff --git a/cli-ext/.eslintrc b/cli-ext/.eslintrc
@@ -2,8 +2,9 @@
   "env": {
     "node": true
   },
-  "extends": "airbnb-base",
-  "plugins": ["promise"],
+  "extends": ["airbnb-base", "plugin:@typescript-eslint/recommended"],
+  "plugins": ["promise", "@typescript-eslint/eslint-plugin"],
+  "parser": "@typescript-eslint/parser",
   "rules": {
     "no-console": "off",
     "consistent-return": "off",
@@ -24,6 +25,10 @@
     "promise/no-promise-in-callback": "error",
     "promise/no-callback-in-promise": "error",
     "promise/no-return-in-finally": "error",
-    "prefer-arrow-callback": "error"
+    "prefer-arrow-callback": "error",
+    "@typescript-eslint/no-var-requires": "off",
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/explicit-function-return-type": "off",
+    "@typescript-eslint/camelcase": "off"
   }
 }
diff --git a/cli-ext/package-lock.json b/cli-ext/package-lock.json
diff --git a/cli-ext/package.json b/cli-ext/package.json
@@ -6,14 +6,14 @@
   "scripts": {
     "get-shared-modules": "rm -rf src/shared && cp ../console/src/shared ./src/shared -r",
     "pretranspile": "npm run get-shared-modules",
-    "transpile": "rm -rf build/* && babel ./src ./tests --out-dir build",
+    "transpile": "rm -rf build/* && babel --extensions '.ts,.js' ./src ./tests --out-dir build",
     "prebuild": "npm run transpile",
     "build": "rm -rf ./bin/* && pkg ./build/command.js --output ./bin/cli-ext-hasura -t node12-linux-x64,node12-macos-x64,node12-win-x64",
     "pretest": "npm run transpile && babel ./tests --out-dir _tmptests",
     "posttest": "rm -rf _tmptests",
     "test": "node ./_tmptests/index.js",
-    "lint": "eslint 'src/**/*.js' --fix",
-    "format": "prettier-eslint $PWD'src/**/*.{js,json}' --write && npm run lint"
+    "lint": "eslint 'src/**/*.{js,ts}' --fix",
+    "format": "prettier-eslint $PWD'src/**/*.{js,ts,json}' --write && npm run lint"
   },
   "lint-staged": {
     "**/*.js": [
@@ -42,12 +42,19 @@
     "@babel/core": "^7.0.0",
     "@babel/plugin-transform-async-to-generator": "^7.7.4",
     "@babel/preset-env": "^7.7.6",
+    "@babel/preset-typescript": "^7.9.0",
+    "@types/graphql": "^14.5.0",
+    "@types/inflection": "^1.5.28",
+    "@types/node-fetch": "^2.5.7",
+    "@typescript-eslint/eslint-plugin": "^2.34.0",
+    "@typescript-eslint/parser": "^2.34.0",
     "eslint": "^6.8.0",
     "eslint-config-airbnb-base": "^14.1.0",
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-promise": "^4.2.1",
     "husky": "^4.2.5",
     "lint-staged": "^10.1.5",
-    "prettier-eslint-cli": "^5.0.0"
+    "prettier-eslint-cli": "^5.0.0",
+    "typescript": "^3.9.2"
   }
-}
+}
diff --git a/cli-ext/src/command.ts b/cli-ext/src/command.ts
@@ -7,7 +7,7 @@ const { getFlagValue, OUTPUT_FILE_FLAG } = require('./utils/commandUtils');
 const commandArgs = process.argv;
 const outputFilePath = getFlagValue(commandArgs, OUTPUT_FILE_FLAG);
 
-const logOutput = (log) => {
+const logOutput = (log: any) => {
   try {
     fs.writeFile(outputFilePath, log, 'utf8', () => {
       console.log(
@@ -43,13 +43,13 @@ try {
   }
   if (cliResponse.constructor.name === 'Promise') {
     cliResponse
-      .then((r) => {
+      .then((r: { error?: string }) => {
         if (r.error) {
           throw Error(r.error);
         }
         logOutput(JSON.stringify(r));
       })
-      .catch((e) => {
+      .catch((e: Error) => {
         console.error(e);
         process.exit(1);
       });
diff --git a/cli-ext/src/constants.ts b/cli-ext/src/constants.ts
diff --git a/cli-ext/src/services/actions-codegen/command.js b/cli-ext/src/services/actions-codegen/command.js
@@ -2,7 +2,6 @@ const { getInputPayload } = require('../../utils/commandUtils');
 const handler = require('./handler');
 
 const command = (subCommands) => {
-  const rootInput = subCommands[0];
   const payload = getInputPayload(subCommands);
   return handler(payload);
 };
diff --git a/cli-ext/src/services/actions-codegen/handler.ts b/cli-ext/src/services/actions-codegen/handler.ts
@@ -1,6 +1,6 @@
 const { getActionsCodegen } = require('./codegen');
 
-const handler = async (payload) => {
+const handler = async (payload: unknown) => {
   try {
     const codegen = await getActionsCodegen(payload);
     return { codegen };
diff --git a/cli-ext/src/services/actions-codegen/index.ts b/cli-ext/src/services/actions-codegen/index.ts
diff --git a/cli-ext/src/services/index.ts b/cli-ext/src/services/index.ts
diff --git a/cli-ext/src/services/sdl/command.ts b/cli-ext/src/services/sdl/command.ts
@@ -1,7 +1,7 @@
 const toCommand = require('./to/command');
 const fromCommand = require('./from/command');
 
-const command = (subCommands) => {
+const command = (subCommands: string[]) => {
   const rootSubCommand = subCommands[0];
   switch (rootSubCommand) {
     case 'to':
diff --git a/cli-ext/src/services/sdl/index.ts b/cli-ext/src/services/sdl/index.ts
diff --git a/cli-ext/src/services/sdl/to/command.js b/cli-ext/src/services/sdl/to/command.js
@@ -2,7 +2,6 @@ const handler = require('./handler');
 const { getInputPayload } = require('../../../utils/commandUtils');
 
 const command = (subCommands) => {
-  const rootInput = subCommands[0];
   const payload = getInputPayload(subCommands);
   const response = handler(payload);
   return response;
diff --git a/cli-ext/src/utils/commandUtils.ts b/cli-ext/src/utils/commandUtils.ts
@@ -3,7 +3,7 @@ const fs = require('fs');
 const OUTPUT_FILE_FLAG = 'output-file';
 const INPUT_FILE_FLAG = 'input-file';
 
-const getFlagValue = (args, flagname) => {
+const getFlagValue = (args: string[], flagname: string) => {
   for (let i = args.length - 1; i >= 0; i--) {
     if (args[i] === `--${flagname}`) {
       const flagValue = args[i + 1];
@@ -16,7 +16,7 @@ const getFlagValue = (args, flagname) => {
   }
 };
 
-const getInputPayload = (args) => {
+const getInputPayload = (args: string[]) => {
   const inputFilePath = getFlagValue(args, INPUT_FILE_FLAG);
   const payloadString = fs.readFileSync(inputFilePath, 'utf8');
   return JSON.parse(payloadString);
diff --git a/cli-ext/tsconfig.json b/cli-ext/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "checkJs": false,
+    "allowJs": true,
+    "strict": true
+  },
+  "exclude": ["node_modules"],
+  "include": ["src/**/*"]
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- presets: ["@babel/preset-env"],`
`3`		`- plugins: ["@babel/plugin-transform-async-to-generator"]`
	`2`	`+ "presets": ["@babel/preset-env", "@babel/preset-typescript"],`
	`3`	`+ "plugins": ["@babel/plugin-transform-async-to-generator"]`
`4`	`4`	`}`