refactor(generators): add utility functions

Author: jgw96

src/generators.ts

@@ -1,11 +1,7 @@
-import { Logger} from './logger/logger';
 import { generateContext } from './util/config';
 import * as Constants from './util/constants';
 import { BuildContext } from './util/interfaces';
-import { readFileAsync, writeFileAsync } from './util/helpers';
-import { getTypescriptSourceFile, appendNgModuleDeclaration, insertNamedImportIfNeeded } from './util/typescript-utils';
-import { applyTemplates, filterOutTemplates, getNgModules, GeneratorOption, GeneratorRequest, hydrateRequest, readTemplates, writeGeneratedFiles } from './generators/util';
-import * as path from 'path';
+import { getNgModules, GeneratorOption, GeneratorRequest, nonPageFileManipulation, processNonTabRequest } from './generators/util';
 
 export { getNgModules, GeneratorOption, GeneratorRequest };
 
@@ -19,31 +15,19 @@ export function processPageRequest(context: BuildContext, name: string) {
 }
 
 export function processPipeRequest(context: BuildContext, name: string, ngModulePath: string) {
-  const hydratedRequest = hydrateRequest(context, { type: 'pipe', name });
-  return readFileAsync(ngModulePath).then((fileContent: string) => {
-    fileContent = insertNamedImportIfNeeded(ngModulePath, fileContent, hydratedRequest.className, path.relative(path.dirname(ngModulePath), hydratedRequest.dirToWrite));
-    fileContent = appendNgModuleDeclaration(ngModulePath, fileContent, hydratedRequest.className);
-    return writeFileAsync(ngModulePath, fileContent);
-  }).then(() => {
-    return processNonTabRequest(context, hydratedRequest);
-  }).then(() => {
-    // TODO
-  });
+  return nonPageFileManipulation(context, name, ngModulePath, 'pipe');
 }
 
-function processNonTabRequest(context: BuildContext, request: GeneratorRequest): Promise<string[]> {
-  Logger.debug('[Generators] processNonTabRequest: Hydrating the request with project data ...');
-  const hydratedRequest = hydrateRequest(context, request);
-  Logger.debug('[Generators] processNonTabRequest: Reading templates ...');
-  return readTemplates(hydratedRequest.dirToRead).then((map: Map<string, string>) => {
-    Logger.debug('[Generators] processNonTabRequest: Filtering out NgModule and Specs if needed ...');
-    return filterOutTemplates(hydratedRequest, map);
-  }).then((filteredMap: Map<string, string>) => {
-    Logger.debug('[Generators] processNonTabRequest: Applying tempaltes ...');
-    const appliedTemplateMap = applyTemplates(hydratedRequest, filteredMap);
-    Logger.debug('[Generators] processNonTabRequest: Writing generated files to disk ...');
-    return writeGeneratedFiles(hydratedRequest, appliedTemplateMap);
-  });
+export function processDirectiveRequest(context: BuildContext, name: string, ngModulePath: string) {
+  return nonPageFileManipulation(context, name, ngModulePath, 'directive');
+}
+
+export function processComponentRequest(context: BuildContext, name: string, ngModulePath: string) {
+  return nonPageFileManipulation(context, name, ngModulePath, 'component');
+}
+
+export function processProviderRequest(context: BuildContext, name: string, ngModulePath: string) {
+  return nonPageFileManipulation(context, name, ngModulePath, 'provider');
 }
 
 export function listOptions() {

src/generators/util.ts

@@ -1,5 +1,6 @@
-import { basename, dirname, join } from 'path';
-import { readdirSync} from 'fs';
+import { basename, dirname, join, relative } from 'path';
+import { readdirSync } from 'fs';
+import { Logger} from '../logger/logger';
 
 import { paramCase, pascalCase, upperCaseFirst } from 'change-case';
 
@@ -9,6 +10,7 @@ import { getPropertyValue, getStringPropertyValue, mkDirpAsync, readFileAsync, r
 import { BuildContext } from '../util/interfaces';
 import { globAll, GlobResult } from '../util/glob-util';
 import { ensureSuffix, removeSuffix } from '../util/helpers';
+import { appendNgModuleDeclaration, insertNamedImportIfNeeded } from '../util/typescript-utils';
 
 export function hydrateRequest(context: BuildContext, request: GeneratorRequest) {
   const hydrated = Object.assign({ includeNgModule: true }, request) as HydratedGeneratorRequest;
@@ -107,6 +109,34 @@ export function getDirToWriteToByType(context: BuildContext, type: string) {
   throw new Error(`Unknown Generator Type: ${type}`);
 }
 
+export function nonPageFileManipulation(context: BuildContext, name: string, ngModulePath: string, type: string) {
+  const hydratedRequest = hydrateRequest(context, { type: type, name });
+  return readFileAsync(ngModulePath).then((fileContent: string) => {
+    fileContent = insertNamedImportIfNeeded(ngModulePath, fileContent, hydratedRequest.className, relative(dirname(ngModulePath), hydratedRequest.dirToWrite));
+    fileContent = appendNgModuleDeclaration(ngModulePath, fileContent, hydratedRequest.className);
+    return writeFileAsync(ngModulePath, fileContent);
+  }).then(() => {
+    return processNonTabRequest(context, hydratedRequest);
+  }).then(() => {
+    // TODO
+  });
+}
+
+export function processNonTabRequest(context: BuildContext, request: GeneratorRequest): Promise<string[]> {
+  Logger.debug('[Generators] processNonTabRequest: Hydrating the request with project data ...');
+  const hydratedRequest = hydrateRequest(context, request);
+  Logger.debug('[Generators] processNonTabRequest: Reading templates ...');
+  return readTemplates(hydratedRequest.dirToRead).then((map: Map<string, string>) => {
+    Logger.debug('[Generators] processNonTabRequest: Filtering out NgModule and Specs if needed ...');
+    return filterOutTemplates(hydratedRequest, map);
+  }).then((filteredMap: Map<string, string>) => {
+    Logger.debug('[Generators] processNonTabRequest: Applying tempaltes ...');
+    const appliedTemplateMap = applyTemplates(hydratedRequest, filteredMap);
+    Logger.debug('[Generators] processNonTabRequest: Writing generated files to disk ...');
+    return writeGeneratedFiles(hydratedRequest, appliedTemplateMap);
+  });
+}
+
 export interface GeneratorOption {
   type: string;
   multiple: boolean;

src/util/config.ts

@@ -95,7 +95,7 @@ export function generateContext(context?: BuildContext): BuildContext {
   setProcessEnvVar(Constants.ENV_VAR_COMPONENTS_DIR, context.componentsDir);
   Logger.debug(`componentsDir set to ${context.componentsDir}`);
 
-  context.directivesDir = resolve(context.directivesDir || getConfigValue(context, '--directivesDir', null, Constants.ENV_VAR_DIRECTIVES_DIR, Constants.ENV_VAR_DIRECTIVES_DIR.toLowerCase(), join(context.srcDir, 'components')));
+  context.directivesDir = resolve(context.directivesDir || getConfigValue(context, '--directivesDir', null, Constants.ENV_VAR_DIRECTIVES_DIR, Constants.ENV_VAR_DIRECTIVES_DIR.toLowerCase(), join(context.srcDir, 'directives')));
   setProcessEnvVar(Constants.ENV_VAR_DIRECTIVES_DIR, context.directivesDir);
   Logger.debug(`directivesDir set to ${context.directivesDir}`);