Merge branch 'feature/ptf-1347/_shared_launcher' into 'develop'

PTF-1347: [CLI]: Shared service launcher

See merge request cs-platform/public/cli!91

Author: denismukhopadov

package-lock.json

@@ -35,7 +35,7 @@
     "chalk": "^3.0.0",
     "clear": "^0.1.0",
     "cli-ux": "^5.4.5",
-    "codestore-utils": "^1.2.0",
+    "codestore-utils": "^1.3.0",
     "completion": "^1.0.1",
     "cross-fetch": "^3.0.4",
     "debug": "^4.1.1",

package.json

@@ -1,8 +1,8 @@
-import { logger } from 'codestore-utils';
+import {
+  logger, compile, PathsResolverTool, GraphqlValidatorTool, bootstrap,
+} from 'codestore-utils';
 import Command from '../../lib/command';
-import { bootstrap } from '../../lib/launcher';
 import { installDependencies } from '../../lib/child-cli';
-import compile from '../../lib/compiler';
 
 export default class Dev extends Command {
   public static description = 'Launch your service locally';
@@ -24,12 +24,11 @@ export default class Dev extends Command {
     await installDependencies();
 
     logger.log('Compiling typescript code', 'TypeScript');
-    await compile([...await this.serviceWorker.loadResolversPaths(), ...await this.serviceWorker.loadEntitiesAndMutationsPaths()]);
-
+    await compile(await PathsResolverTool.loadFilesToCompile());
     logger.log('Validating schema', 'GraphQL');
-    await this.serviceWorker.validateSchema();
+    await GraphqlValidatorTool.validateSchema();
     logger.log('Validating queries and mutations', 'GraphQL');
-    await this.serviceWorker.validateQueriesAndMutations();
+    await GraphqlValidatorTool.validateQueriesAndMutations();
 
     const { database, application } = localConfiguration;
 
@@ -38,6 +37,7 @@ export default class Dev extends Command {
     await bootstrap({
       db: database,
       port: application.port,
+      playgroundUrl: `http://localhost:${application.port || 3000}/graphql`,
     });
   }
 }

src/commands/service/dev.ts

@@ -1,13 +1,13 @@
 import { Listr, ListrTask } from 'listr2';
 import clear from 'clear';
 import { yellow } from 'chalk';
-import { PromisifiedFs } from 'codestore-utils';
+import {
+  PromisifiedFs, compile, PathsResolverTool, GraphqlValidatorTool,
+} from 'codestore-utils';
 import { Connection } from 'typeorm';
 import Command from '../../lib/command';
 import Aliases from '../../common/constants/aliases';
 import FileWorker from '../../common/file-worker';
-import Paths from '../../common/constants/paths';
-import compile from '../../lib/compiler';
 import { installDependencies } from '../../lib/child-cli';
 import { generateChecksumForFile } from '../../common/utils';
 
@@ -16,7 +16,7 @@ const firstLine = (str: string): string => str.split('\n')[0].replace(/:$/, '').
 export const migrationsAreActual = async (context: Command): Promise<boolean> => {
   const checksum = await generateChecksumForFile(context.serviceWorker.schemaPath);
 
-  const migrations = await PromisifiedFs.readdir(Paths.MIGRATIONS);
+  const migrations = await PromisifiedFs.readdir(PathsResolverTool.MIGRATIONS);
   const lastMigration = migrations.pop();
   const lastMigrationChecksum = lastMigration?.split('_')?.[1]?.replace(/\.ts/g, '');
 
@@ -28,23 +28,23 @@ export const generateFlow = (context: Command, error: (input: string | Error, op
     title: 'Compiling your code',
     task: async (): Promise<void> => {
       await installDependencies();
-      await compile(await context.serviceWorker.loadResolversPaths());
+      await compile(await PathsResolverTool.loadFilesToCompile());
     },
   },
   {
     title: 'Validating schema',
     task: async (): Promise<void> => {
-      await context.serviceWorker.validateSchema();
+      await GraphqlValidatorTool.validateSchema();
       if (context.id !== 'service:generate') {
-        await context.serviceWorker.validateQueriesAndMutations();
+        await GraphqlValidatorTool.validateQueriesAndMutations();
       }
     },
   },
   {
     title: 'Preparing the service code for upload',
     task: async (ctx): Promise<void> => {
-      await PromisifiedFs.createFolderIfNotExist(Paths.MIGRATIONS);
-      await PromisifiedFs.createFolderIfNotExist(Paths.ENTITIES);
+      await PromisifiedFs.createFolderIfNotExist(PathsResolverTool.MIGRATIONS);
+      await PromisifiedFs.createFolderIfNotExist(PathsResolverTool.ENTITIES);
       ctx.encodedZip = await FileWorker.zipFolder();
     },
   },
@@ -66,7 +66,7 @@ export const generateFlow = (context: Command, error: (input: string | Error, op
         return;
       }
 
-      const currentMigrations = (await PromisifiedFs.readdir(Paths.MIGRATIONS))
+      const currentMigrations = (await PromisifiedFs.readdir(PathsResolverTool.MIGRATIONS))
         .filter((name) => /\.ts$/.test(name));
 
       // eslint-disable-next-line no-param-reassign
@@ -121,12 +121,12 @@ export const generateFlow = (context: Command, error: (input: string | Error, op
         error('An error occured', { exit: 1 });
       }
 
-      await PromisifiedFs.rimraf(Paths.MIGRATIONS);
-      await PromisifiedFs.rimraf(Paths.ENTITIES);
-      await PromisifiedFs.rimraf(Paths.DIST);
-      await PromisifiedFs.rimraf(Paths.BUILD);
-      await FileWorker.saveZipFromB64(generated, Paths.DATA);
-      await compile(await context.serviceWorker.loadResolversPaths());
+      await PromisifiedFs.rimraf(PathsResolverTool.MIGRATIONS);
+      await PromisifiedFs.rimraf(PathsResolverTool.ENTITIES);
+      await PromisifiedFs.rimraf(PathsResolverTool.DIST);
+      await PromisifiedFs.rimraf(PathsResolverTool.BUILD);
+      await FileWorker.saveZipFromB64(generated, PathsResolverTool.DATA);
+      await compile(await PathsResolverTool.loadFilesToCompile());
 
       // eslint-disable-next-line no-param-reassign
       task.title = 'Generated code has been saved';

src/commands/service/generate.ts

@@ -1,5 +1,6 @@
 enum CommandIds {
-  LOGIN = 'auth:login'
+  LOGIN = 'auth:login',
+  DEV = 'service:dev'
 }
 
 export default CommandIds;