feat: splited schema command and added push behaviour

Author: TakSeBiegam

packages/cli/src/Editor.ts

@@ -22,8 +22,8 @@ const jolt = () => {
   const token = Config.getTokenOptions('token');
   const headers: Record<string, string> = token
     ? {
-      Authorization: `Bearer ${token}`,
-    }
+        Authorization: `Bearer ${token}`,
+      }
     : {};
   return Chain('https://api.staging.project.graphqleditor.com/graphql', {
     headers,
@@ -34,8 +34,8 @@ const joltSubscription = () => {
   const token = Config.getTokenOptions('token');
   const headers: Record<string, string> = token
     ? {
-      Authorization: `Bearer ${token}`,
-    }
+        Authorization: `Bearer ${token}`,
+      }
     : {};
   return Subscription('https://api.staging.project.graphqleditor.com/graphql', {
     headers,
@@ -184,9 +184,14 @@ export class Editor {
         ? (await fetch(libraryURL.getUrl!)).text()
         : new Promise<string>((resolve) => resolve('')),
     ]);
-    const sdlMerge = mergeSDLs(graphqlFile, libraryFile)
-    if (sdlMerge.__typename === 'error') throw new Error(sdlMerge.errors.map(e => `Conflict on: ${e.conflictingNode}.${e.conflictingField}`).join("\n"))
-    return sdlMerge.sdl
+    const sdlMerge = mergeSDLs(graphqlFile, libraryFile);
+    if (sdlMerge.__typename === 'error')
+      throw new Error(
+        sdlMerge.errors
+          .map((e) => `Conflict on: ${e.conflictingNode}.${e.conflictingField}`)
+          .join('\n'),
+      );
+    return sdlMerge.sdl;
   };
 
   public static getSchema = async (resolve: {

packages/cli/src/commands/common/init.ts

@@ -8,6 +8,7 @@ export const initConfiguration = async ({
   namespace?: string;
   project?: string;
   version?: string;
+  schemaDir?: string | null;
 }): Promise<void> => {
   Config.configure(
     {

packages/cli/src/commands/schema/CLI.ts

@@ -0,0 +1,46 @@
+import { Auth } from '@/Auth/index.js';
+import { projectOptions, confOptions } from '@/common/promptOptions.js';
+import { Config, ConfigurationOptions } from '@/Configuration/index.js';
+import { CommandModule } from 'yargs';
+import { CommandSchemaPull } from './pull.js';
+import { CommandSchemaPush } from './push.js';
+
+export default {
+  command: 'schema <command>',
+  describe: 'Generate and modify your GraphQL schema',
+  builder: (yargs) => {
+    return yargs
+      .command(
+        'pull',
+        'Generate GraphQL schema from project at given path',
+        async (yargs) => {
+          yargs.options(confOptions({ ...projectOptions }));
+        },
+        async (argv) => {
+          await Auth.login().then(Config.setTokenOptions);
+          await CommandSchemaPull(
+            argv as Pick<
+              ConfigurationOptions,
+              'namespace' | 'project' | 'projectVersion' | 'schemaDir'
+            >,
+          );
+        },
+      )
+      .command(
+        'push',
+        'Deploy GraphQL schema as latest',
+        async (yargs) => {
+          yargs.options(confOptions({ ...projectOptions }));
+        },
+        async (argv) => {
+          await Auth.login().then(Config.setTokenOptions);
+          await CommandSchemaPush(
+            argv as Pick<
+              ConfigurationOptions,
+              'namespace' | 'project' | 'projectVersion' | 'schemaDir'
+            >,
+          );
+        },
+      );
+  },
+} as CommandModule;

packages/cli/src/commands/common/schema.ts renamed to packages/cli/src/commands/schema/pull.ts

@@ -3,7 +3,7 @@ import { HandleTemplates } from '@/common/index.js';
 import { Editor } from '@/Editor.js';
 import path from 'path';
 
-export const CommandSchema = async ({
+export const CommandSchemaPull = async ({
   schemaDir,
   namespace,
   project,

packages/cli/src/commands/schema/push.ts

@@ -0,0 +1,44 @@
+import { Config } from '@/Configuration/index.js';
+import { HandleTemplates } from '@/common/index.js';
+import { Editor } from '@/Editor.js';
+import path from 'path';
+
+export const CommandSchemaPush = async ({
+  schemaDir,
+  namespace,
+  project,
+  projectVersion,
+}: {
+  schemaDir?: string;
+  namespace?: string;
+  project?: string;
+  projectVersion?: string;
+}) => {
+  const resolve = await Config.configure(
+    { namespace, project, projectVersion, schemaDir },
+    ['namespace', 'project', 'projectVersion', 'schemaDir'],
+  );
+  const isFile = resolve.schemaDir.match(/.*\.(graphql|gql|sdl)$/);
+  const schema = HandleTemplates.action({
+    content: '',
+    path: isFile
+      ? resolve.schemaDir
+      : path.join(resolve.schemaDir, 'schema.graphql'),
+    type: 'get',
+  });
+  if (!schema) {
+    throw new Error('schema does not exists');
+  }
+  const p = await Editor.fetchProject({
+    accountName: resolve.namespace,
+    projectName: resolve.project,
+  });
+  const t = await Editor.saveFilesToCloud(p.id, [
+    {
+      content: schema,
+      name: 'schema-latest.graphql',
+      type: 'application/json',
+    },
+  ]);
+  console.log(t);
+};

packages/cli/src/common/handleTemplates/index.ts

@@ -1,7 +1,9 @@
-import fs from 'fs';
+import fs, { read } from 'fs';
 import path from 'path';
 import { Action } from '@/common/handleTemplates/models.js';
-const unifyString = (s: string) => s.replace(/\s/g, '').replace(/\n/g, '').replace(/\"/g, `'`);
+import { log } from 'console';
+const unifyString = (s: string) =>
+  s.replace(/\s/g, '').replace(/\n/g, '').replace(/\"/g, `'`);
 export class HandleTemplates {
   public static action = (a: Action) => {
     const folder = path.dirname(a.path);
@@ -30,5 +32,12 @@ export class HandleTemplates {
       }
       fs.appendFileSync(a.path, a.content);
     }
+    if (a.type === 'get') {
+      const fileExist = fs.existsSync(a.path);
+      if (fileExist) {
+        const readFile = fs.readFileSync(a.path);
+        return readFile;
+      }
+    }
   };
 }

packages/cli/src/common/handleTemplates/models.ts

@@ -1,4 +1,4 @@
-export type ActionType = 'add' | 'append' | 'addIfNotExist';
+export type ActionType = 'add' | 'append' | 'addIfNotExist' | 'get';
 export interface Action {
   type: ActionType;
   content: string;

packages/cli/src/index.ts

@@ -4,7 +4,6 @@ import yargs from 'yargs';
 import { welcome } from '@/welcome.js';
 import { Auth } from '@/Auth/index.js';
 import { initConfiguration } from '@/commands/common/init.js';
-import { CommandSchema } from '@/commands/common/schema.js';
 import {
   Config,
   Configuration,
@@ -17,6 +16,7 @@ import CodeGen from '@/commands/codegen/CLI.js';
 import Cloud from '@/commands/create/CLI.js';
 import Create from '@/commands/cloud/CLI.js';
 import ExternalCI from '@/commands/externalCi/CLI.js';
+import Schema from '@/commands/schema/CLI.js';
 import { confOptions, projectOptions } from '@/common/promptOptions.js';
 import { CommandPrune } from '@/commands/common/prune.js';
 import { CommandInspect } from '@/commands/common/inspect.js';
@@ -44,77 +44,53 @@ welcome().then(() => {
         await initConfiguration(
           argv as Pick<
             ConfigurationOptions,
-            'project' | 'namespace' | 'projectVersion'
+            'project' | 'namespace' | 'projectVersion' | 'schemaDir'
           >,
         );
       },
     )
     .command(
       'login',
       'Login to GraphQL Editor',
-      async (yargs) => { },
+      async (yargs) => {},
       async (argv) => {
         await Auth.login().then(Config.setTokenOptions);
       },
     )
     .command(
       'logout',
       'Logout from GraphQL Editor',
-      async (yargs) => { },
+      async (yargs) => {},
       (argv) => {
         Auth.logout();
       },
     )
-    .command(
-      'schema',
-      'Generate GraphQL schema from project at given path',
-      async (yargs) => {
-        yargs.options(
-          confOptions({
-            ...projectOptions,
-            schemaDir: {
-              describe:
-                'Path to created schema containing its name and extension',
-              type: 'string',
-            },
-          }),
-        );
-      },
-      async (argv) => {
-        await Auth.login().then(Config.setTokenOptions);
-        await CommandSchema(
-          argv as Pick<
-            ConfigurationOptions,
-            'project' | 'namespace' | 'projectVersion' | 'schemaDir'
-          >,
-        );
-      },
-    )
     .command(
       'prune',
       'Get information about redundant resolvers that do not exist in schema now.',
-      async (yargs) => { },
+      async (yargs) => {},
       async (argv) => {
         await CommandPrune();
       },
     )
     .command(
       'inspect',
       'Get information about non-scalar resolvers that are not implemented in stucco.json',
-      async (yargs) => { },
+      async (yargs) => {},
       async (argv) => {
         await CommandInspect();
       },
     )
     .command(Create)
     .command(Cloud)
+    .command(Schema)
     .command(ExternalCI)
     .command(CodeGen)
     .command(Gei)
     .command(
       'dev',
       'Start Typescript server and stucco server with hot reload.',
-      async (yargs) => { },
+      async (yargs) => {},
       async (argv) => {
         CommandDev();
       },
@@ -125,7 +101,7 @@ welcome().then(() => {
     .command(
       'stucco',
       'Update your stucco file to cloud for synchronizing resolvers',
-      async (yargs) => { },
+      async (yargs) => {},
       async (argv) => {
         await pushStuccoJson(
           argv as Pick<ConfigurationOptions, 'project' | 'namespace'>,