removed question inquirer & fixed stuff (#51)

panacloud · Oct 23, 2021 · 52012a7 · 52012a7
1 parent b6f93e2
commit 52012a7
Show file tree

Hide file tree

Showing 9 changed files with 192 additions and 215 deletions.
diff --git a/src/commands/init.ts b/src/commands/init.ts
@@ -40,14 +40,14 @@ export default class Create extends Command {
 
     // Config to generate code.
     const config: Config = {
-      entityId: usrInput.entityId,
-      api_token: usrInput.api_token,
-      saasType: usrInput.saas_type,
+      // entityId: usrInput.entityId,
+      // api_token: usrInput.api_token,
+      saasType: SAASTYPE.api,
       api: {
         template: usrInput.template,
         nestedResolver: usrInput.nestedResolver,
-        language: usrInput.language,
-        cloudprovider: usrInput.cloud_provider,
+        // language: usrInput.language,
+        // cloudprovider: usrInput.cloud_provider,
         apiName: camelCase(usrInput.api_name),
         schemaPath: usrInput.schema_path,
         apiType:
@@ -142,7 +142,7 @@ export default class Create extends Command {
       });
       await fs.writeFileSync(file, nextData, "utf8");
     });
-    
+
     stopSpinner(formatting, "Formatting Done", false);
 
     this.log(chalk.greenBright("Build your Billion Dollar API"));

diff --git a/src/commands/update.ts b/src/commands/update.ts
@@ -1,23 +1,17 @@
 import { Command, flags } from "@oclif/command";
 import { startSpinner, stopSpinner } from "../lib/spinner";
-import { basicApi, todoApi, updateYourOwnApi } from "../lib/api/functions";
-import { userInput } from "../lib/inquirer";
-import {
-  checkEmptyDirectoy,
-  validateSchemaFile,
-} from "../lib/api/errorHandling";
+import { updateYourOwnApi } from "../lib/api/functions";
+import { validateSchemaFile } from "../lib/api/errorHandling";
 import { TEMPLATE, SAASTYPE, Config, APITYPE } from "../utils/constants";
 const path = require("path");
-const chalk = require("chalk");
 const fse = require("fs-extra");
 const fs = require("fs");
 const prettier = require("prettier");
 const globby = require("globby");
 const exec = require("await-exec");
-const camelCase = require("lodash/camelCase");
 
 export default class Create extends Command {
-  static description = "Generates CDK code based on the given schema";
+  static description = "Updates the Generated Code.";
 
   static flags = {
     help: flags.help({ char: "h" }),
@@ -26,60 +20,61 @@ export default class Create extends Command {
   async run() {
     const { flags } = this.parse(Create);
 
+    const validating = startSpinner("Validating Everything");
 
+    const configCli: Config = fse.readJsonSync("codegenconfig.json");
 
-   const validating = startSpinner("Validating files");
-
-    const configCli:Config = fse.readJsonSync('codegenconfig.json')
-
     if (configCli.saasType === SAASTYPE.api) {
-      if (configCli.api.apiType === APITYPE.graphql){
-      if (configCli.api?.template === TEMPLATE.defineApi) {
-        validateSchemaFile(
-          configCli.api?.schemaPath,
+      if (configCli.api.apiType === APITYPE.graphql) {
+        if (configCli.api?.template === TEMPLATE.defineApi) {
+          validateSchemaFile(
+            configCli.api?.schemaPath,
+            validating,
+            configCli.api?.apiType
+          );
+        } else {
+          stopSpinner(
+            validating,
+            "Update command is only supported for 'Define Your Own API'",
+            true
+          );
+          process.exit(1);
+        }
+      } else {
+        stopSpinner(
           validating,
-          configCli.api?.apiType
+          "Update command is only supported for GraphQL",
+          true
         );
-      }
-
-      else {
-        stopSpinner(validating, "Update command is only supported for 'defining your own API'", false);
-        process.exit(1);
-      }
-    }
-
-      else {
-        stopSpinner(validating, "Update command is only supported for GraphQl", false);
         process.exit(1);
       }
     }
 
-    stopSpinner(validating, "Files validated", false);
-
+    stopSpinner(validating, "Everything's fine", false);
 
-    const updatingCode = startSpinner("Updating Code");
+    const updatingCode = startSpinner("Updating CDK Code...");
 
-
-    fse.removeSync('mock_lambda', { recursive: true });
-    fse.removeSync('consumer_lambda', { recursive: true });
-    fse.removeSync('lib', { recursive: true });
+    fse.removeSync("mock_lambda", { recursive: true });
+    fse.removeSync("consumer_lambda", { recursive: true });
+    fse.removeSync("lib", { recursive: true });
 
     if (configCli.saasType === SAASTYPE.api) {
-       if (configCli.api?.template === TEMPLATE.defineApi) {
-       await updateYourOwnApi(configCli,updatingCode);
-      } 
+      if (configCli.api?.template === TEMPLATE.defineApi) {
+        await updateYourOwnApi(configCli, updatingCode);
+      }
     }
 
-
-    stopSpinner(updatingCode, "Code Updated", false);
+    stopSpinner(updatingCode, "CDK Code Updated", false);
 
     const generatingTypes = startSpinner("Generating Types");
+
     try {
       await exec(`npx graphql-codegen`);
     } catch (error) {
       stopSpinner(generatingTypes, `Error: ${error}`, true);
       process.exit(1);
     }
+
     stopSpinner(generatingTypes, "Types generated", false);
 
     const formatting = startSpinner("Formatting Code");
@@ -95,7 +90,7 @@ export default class Create extends Command {
         "!*.lock",
         "!*.yaml",
         "!*.yml",
-        "editable_src/panacloudconfig.json"
+        "editable_src/panacloudconfig.json",
       ],
       {
         gitignore: true,
@@ -111,6 +106,5 @@ export default class Create extends Command {
     });
 
     stopSpinner(formatting, "Formatting Done", false);
-
   }
 }
diff --git a/src/lib/api/functions/BasicApi/index.ts b/src/lib/api/functions/BasicApi/index.ts
@@ -13,7 +13,7 @@ const fse = require("fs-extra");
 const _ = require("lodash");
 
 async function basicApi(config: Config, templateDir: string) {
-  const { api_token, entityId } = config;
+  // const { api_token, entityId } = config;
 
   const workingDir = _.snakeCase(path.basename(process.cwd()));
   const generatingCode = startSpinner("Generating CDK Code...");
@@ -63,16 +63,16 @@ async function basicApi(config: Config, templateDir: string) {
     }
   );
 
-  writeFileAsync(
-    `./cdk.context.json`,
-    JSON.stringify(contextInfo(api_token, entityId)),
-    (err: string) => {
-      if (err) {
-        stopSpinner(generatingCode, `Error: ${err}`, true);
-        process.exit(1);
-      }
-    }
-  );
+  // writeFileAsync(
+  //   `./cdk.context.json`,
+  //   JSON.stringify(contextInfo(api_token, entityId)),
+  //   (err: string) => {
+  //     if (err) {
+  //       stopSpinner(generatingCode, `Error: ${err}`, true);
+  //       process.exit(1);
+  //     }
+  //   }
+  // );
 
   mkdirRecursiveAsync(`lib`);
   mkdirRecursiveAsync(`bin`);

diff --git a/src/lib/api/functions/DefineYourOwnApi/index.ts b/src/lib/api/functions/DefineYourOwnApi/index.ts
@@ -1,6 +1,6 @@
 import { startSpinner, stopSpinner } from "../../../spinner";
 import { mkdirRecursiveAsync } from "../../../fs";
-import { contextInfo, generatePanacloudConfig } from "../../info";
+import { generatePanacloudConfig } from "../../info";
 import { Config, APITYPE, ApiModel } from "../../../../utils/constants";
 import { generator } from "../../generators";
 import { introspectionFromSchema, buildSchema } from "graphql";
@@ -16,7 +16,7 @@ const fse = require("fs-extra");
 const snakeCase = require("lodash/snakeCase");
 
 async function defineYourOwnApi(config: Config, templateDir: string) {
-  const { api_token, entityId } = config;
+  // const { api_token, entityId } = config;
 
   const {
     api: { schemaPath, apiType, nestedResolver },
@@ -73,16 +73,16 @@ async function defineYourOwnApi(config: Config, templateDir: string) {
     }
   });
 
-  await fse.writeJson(
-    `./cdk.context.json`,
-    contextInfo(api_token, entityId),
-    (err: string) => {
-      if (err) {
-        stopSpinner(generatingCode, `Error: ${err}`, true);
-        process.exit(1);
-      }
-    }
-  );
+  // await fse.writeJson(
+  //   `./cdk.context.json`,
+  //   contextInfo(api_token, entityId),
+  //   (err: string) => {
+  //     if (err) {
+  //       stopSpinner(generatingCode, `Error: ${err}`, true);
+  //       process.exit(1);
+  //     }
+  //   }
+  // );
 
   if (apiType === APITYPE.graphql) {
     await mkdirRecursiveAsync(`editable_src`);

diff --git a/src/lib/api/functions/TodoApi/index.ts b/src/lib/api/functions/TodoApi/index.ts
@@ -20,16 +20,16 @@ async function todoApi(config: Config) {
     singleBranch: true,
   });
 
-  await writeFileAsync(
-    `cdk.context.json`,
-    JSON.stringify(contextInfo(config.api_token, config.entityId)),
-    (err: string) => {
-      if (err) {
-        stopSpinner(generatingCode, `Error: ${err}`, true);
-        process.exit(1);
-      }
-    }
-  );
+  // await writeFileAsync(
+  //   `cdk.context.json`,
+  //   JSON.stringify(contextInfo(config.api_token, config.entityId)),
+  //   (err: string) => {
+  //     if (err) {
+  //       stopSpinner(generatingCode, `Error: ${err}`, true);
+  //       process.exit(1);
+  //     }
+  //   }
+  // );
 
   stopSpinner(generatingCode, "CDK Code Generated", false);