SharedOptions

Author: Peter Ullrich

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.18",
+  "version": "0.2.1",
   "name": "dotup-typescript-yeoman-generators",
   "author": {
     "name": "Peter Ullrich",

src/BaseGenerator.ts

@@ -13,8 +13,12 @@ import { ProjectPathAnalyser } from './project/ProjectPathAnalyser';
 import { Question } from './questions/Question';
 import { GeneratorOptions, MethodsToRegister, IProperty, ITypedProperty } from './Types';
 import { SharedOptions } from './SharedOptions';
+import { ISharedOptionsSubscriber } from "./ISharedOptionsSubscriber";
 
-export abstract class BaseGenerator<TStep extends string> extends generator {
+export abstract class BaseGenerator<TStep extends string> extends generator implements ISharedOptionsSubscriber {
+  onValue(key: string, value: any): void {
+    (<IProperty>this.options)[key] = value;
+  };
 
   static counter: number = 0;
   static sharedOptions: SharedOptions<string>;
@@ -39,13 +43,14 @@ export abstract class BaseGenerator<TStep extends string> extends generator {
 
   currentStep: TStep;
 
-  constructor(args: string | string[], options: GeneratorOptions<TStep>) {
+  constructor(args: string | string[], options: GeneratorOptions<TStep>, sharedOptions?: SharedOptions<TStep>) {
     super(args, options);
+
     BaseGenerator.counter += 1;
-    this.generatorName = this.constructor.name;
+    BaseGenerator.sharedOptions = sharedOptions; // (<IProperty>options)['sharedOptions'];
 
+    this.generatorName = this.constructor.name;
     this.projectInfo = new ProjectInfo();
-    BaseGenerator.sharedOptions = (<IProperty>options)['sharedOptions'];
 
     this.setRootPath();
   }

src/ISharedOptionsSubscriber.ts

@@ -0,0 +1,3 @@
+export interface ISharedOptionsSubscriber {
+  onValue: (key: string, value: any) => void;
+}

src/SharedOptions.ts

@@ -1,18 +1,15 @@
 import { IProperty, ITypedProperty } from './Types';
 import { BaseGenerator } from './BaseGenerator';
 import { SharedOptionsSubscription } from './SharedOptionsSubscription';
-
-export interface ISubscriber {
-  onValue: (value: string) => void;
-}
+import { ISharedOptionsSubscriber } from './ISharedOptionsSubscriber';
 
 export class SharedOptions<TStep extends string> {
 
   values: ITypedProperty<string> = {};
 
   subscriber: SharedOptionsSubscription<TStep>[] = [];
 
-  subscribe<K extends keyof TStep>(subscriber: ISubscriber, questionName: K | string): void {
+  subscribe<K extends keyof TStep>(subscriber: ISharedOptionsSubscriber, questionName: K | string): void {
     const question = <string>questionName;
     const questionSubscriber = this.subscriber.find(s => s.isSubscriber(subscriber));
 
@@ -37,7 +34,7 @@ export class SharedOptions<TStep extends string> {
     const subs = this.subscriber
       .filter(s => s.hasStepSubscription(<string>questionName))
       .map(x => x.getSubscriber());
-    subs.forEach(x => x.onValue(value));
+    subs.forEach(x => x.onValue(<string>questionName, value));
   }
 
 }

src/SharedOptionsSubscription.ts

@@ -1,17 +1,17 @@
-import { ISubscriber } from './SharedOptions';
+import { ISharedOptionsSubscriber } from "./ISharedOptionsSubscriber";
 export class SharedOptionsSubscription<TStep extends string> {
-  private subscriber: ISubscriber;
+  private subscriber: ISharedOptionsSubscriber;
   stepNames: string[] = [];
-  constructor(subscriber: ISubscriber) {
+  constructor(subscriber: ISharedOptionsSubscriber) {
     this.subscriber = subscriber;
   }
-  isSubscriber(subscriber: ISubscriber): boolean {
+  isSubscriber(subscriber: ISharedOptionsSubscriber): boolean {
     return subscriber === this.subscriber;
   }
-  getSubscriber(): ISubscriber {
+  getSubscriber(): ISharedOptionsSubscriber {
     return this.subscriber;
   }
-  getStepSubscriber(stepname: string): ISubscriber {
+  getStepSubscriber(stepname: string): ISharedOptionsSubscriber {
     if (this.hasStepSubscription(stepname)) {
       return undefined;
     }

src/index.ts

@@ -4,6 +4,7 @@ export * from './questions/index';
 export * from './BaseGenerator';
 export * from './questions/IStepQuestion';
 export * from './questions/Question';
+export * from './ISharedOptionsSubscriber';
 export * from './SharedOptions';
 export * from './SharedOptionsSubscription';
 export * from './Types';