@teambit/generator 0.0.555 → 0.0.559

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/generator",
-  "version": "0.0.555",
+  "version": "0.0.559",
   "homepage": "https://bit.dev/teambit/generator/generator",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.generator",
     "name": "generator",
-    "version": "0.0.555"
+    "version": "0.0.559"
   },
   "dependencies": {
     "camelcase": "6.2.0",
@@ -21,21 +21,21 @@
     "isbinaryfile": "4.0.6",
     "@babel/runtime": "7.12.18",
     "core-js": "^3.0.0",
-    "@teambit/bit-error": "0.0.372",
-    "@teambit/component-id": "0.0.376",
-    "@teambit/envs": "0.0.555",
-    "@teambit/workspace": "0.0.555",
-    "@teambit/cli": "0.0.386",
-    "@teambit/graphql": "0.0.555",
-    "@teambit/aspect-loader": "0.0.555",
-    "@teambit/bit": "0.0.557",
-    "@teambit/component": "0.0.555",
-    "@teambit/legacy-bit-id": "0.0.375",
-    "@teambit/compiler": "0.0.555",
-    "@teambit/dependency-resolver": "0.0.555",
-    "@teambit/logger": "0.0.471",
-    "@teambit/pkg": "0.0.555",
-    "@teambit/ui": "0.0.555"
+    "@teambit/bit-error": "0.0.375",
+    "@teambit/component-id": "0.0.379",
+    "@teambit/envs": "0.0.559",
+    "@teambit/workspace": "0.0.559",
+    "@teambit/cli": "0.0.389",
+    "@teambit/graphql": "0.0.559",
+    "@teambit/aspect-loader": "0.0.559",
+    "@teambit/bit": "0.0.561",
+    "@teambit/component": "0.0.559",
+    "@teambit/legacy-bit-id": "0.0.378",
+    "@teambit/compiler": "0.0.559",
+    "@teambit/dependency-resolver": "0.0.559",
+    "@teambit/logger": "0.0.474",
+    "@teambit/pkg": "0.0.559",
+    "@teambit/ui": "0.0.559"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",
@@ -46,10 +46,10 @@
     "@types/react-dom": "^17.0.5",
     "@types/react": "^17.0.8",
     "@types/node": "12.20.4",
-    "@teambit/generator.aspect-docs.generator": "0.0.108"
+    "@teambit/generator.aspect-docs.generator": "0.0.111"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.172",
+    "@teambit/legacy": "1.0.175",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },
@@ -77,12 +77,27 @@
         "react": "-"
       },
       "peerDependencies": {
-        "@teambit/legacy": "1.0.172",
+        "@teambit/legacy": "1.0.175",
         "react-dom": "^16.8.0 || ^17.0.0",
         "react": "^16.8.0 || ^17.0.0"
       }
     }
   },
+  "files": [
+    "dist",
+    "!dist/tsconfig.tsbuildinfo",
+    "**/*.md",
+    "**/*.mdx",
+    "**/*.js",
+    "**/*.json",
+    "**/*.sass",
+    "**/*.scss",
+    "**/*.less",
+    "**/*.css",
+    "**/*.css",
+    "**/*.jpeg",
+    "**/*.gif"
+  ],
   "private": false,
   "engines": {
     "node": ">=12.22.0"

package/tsconfig.json

@@ -15,9 +15,9 @@
     "skipLibCheck": true,
     "moduleResolution": "node",
     "esModuleInterop": true,
-    "outDir": "dist",
     "composite": true,
     "emitDeclarationOnly": true,
+    "outDir": "dist",
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "allowSyntheticDefaultImports": true,

package/component-generator.ts

@@ -1,119 +0,0 @@
-import Vinyl from 'vinyl';
-import fs from 'fs-extra';
-import pMapSeries from 'p-map-series';
-import path from 'path';
-import { Workspace } from '@teambit/workspace';
-import { EnvsMain } from '@teambit/envs';
-import camelcase from 'camelcase';
-import { BitError } from '@teambit/bit-error';
-import { PathOsBasedRelative } from '@teambit/legacy/dist/utils/path';
-import { AbstractVinyl } from '@teambit/legacy/dist/consumer/component/sources';
-import DataToPersist from '@teambit/legacy/dist/consumer/component/sources/data-to-persist';
-import { composeComponentPath } from '@teambit/legacy/dist/utils/bit/compose-component-path';
-import { ComponentID } from '@teambit/component-id';
-import { ComponentTemplate, ComponentFile } from './component-template';
-import { CreateOptions } from './create.cmd';
-
-export type GenerateResult = { id: ComponentID; dir: string; files: string[]; envId: string };
-
-export class ComponentGenerator {
-  constructor(
-    private workspace: Workspace,
-    private componentIds: ComponentID[],
-    private options: CreateOptions,
-    private template: ComponentTemplate,
-    private envs: EnvsMain
-  ) {}
-
-  async generate(): Promise<GenerateResult[]> {
-    const dirsToDeleteIfFailed: string[] = [];
-    const generateResults = await pMapSeries(this.componentIds, async (componentId) => {
-      try {
-        const componentPath = this.getComponentPath(componentId);
-        if (fs.existsSync(path.join(this.workspace.path, componentPath))) {
-          throw new BitError(`unable to create a component at "${componentPath}", this path already exist`);
-        }
-        if (await this.workspace.hasName(componentId.fullName)) {
-          throw new BitError(
-            `unable to create a component "${componentId.fullName}", a component with the same name already exist`
-          );
-        }
-        dirsToDeleteIfFailed.push(componentPath);
-        return await this.generateOneComponent(componentId, componentPath);
-      } catch (err: any) {
-        await this.deleteGeneratedComponents(dirsToDeleteIfFailed);
-        throw err;
-      }
-    });
-
-    await this.workspace.writeBitMap();
-
-    return generateResults;
-  }
-
-  private async deleteGeneratedComponents(dirs: string[]) {
-    await Promise.all(
-      dirs.map(async (dir) => {
-        const absoluteDir = path.join(this.workspace.path, dir);
-        try {
-          await fs.remove(absoluteDir);
-        } catch (err: any) {
-          if (err.code !== 'ENOENT') {
-            // if not exist, it's fine
-            throw err;
-          }
-        }
-      })
-    );
-  }
-
-  private async generateOneComponent(componentId: ComponentID, componentPath: string): Promise<GenerateResult> {
-    const name = componentId.name;
-    const namePascalCase = camelcase(name, { pascalCase: true });
-    const nameCamelCase = camelcase(name);
-    const files = this.template.generateFiles({ name, namePascalCase, nameCamelCase, componentId });
-    const mainFile = files.find((file) => file.isMain);
-    await this.writeComponentFiles(componentPath, files);
-    const addResults = await this.workspace.track({
-      rootDir: componentPath,
-      mainFile: mainFile?.relativePath,
-      componentName: componentId.fullName,
-    });
-    const component = await this.workspace.get(componentId);
-    const env = this.envs.getEnv(component);
-    return {
-      id: componentId,
-      dir: componentPath,
-      files: addResults.files,
-      envId: env.id,
-    };
-  }
-
-  /**
-   * writes the generated template files to the default directory set in the workspace config
-   */
-  private async writeComponentFiles(
-    componentPath: string,
-    templateFiles: ComponentFile[]
-  ): Promise<PathOsBasedRelative[]> {
-    const dataToPersist = new DataToPersist();
-    const vinylFiles = templateFiles.map((templateFile) => {
-      const templateFileVinyl = new Vinyl({
-        base: componentPath,
-        path: path.join(componentPath, templateFile.relativePath),
-        contents: Buffer.from(templateFile.content),
-      });
-      return AbstractVinyl.fromVinyl(templateFileVinyl);
-    });
-    const results = vinylFiles.map((v) => v.path);
-    dataToPersist.addManyFiles(vinylFiles);
-    dataToPersist.addBasePath(this.workspace.path);
-    await dataToPersist.persistAllToFS();
-    return results;
-  }
-
-  private getComponentPath(componentId: ComponentID) {
-    if (this.options.path) return this.options.path;
-    return composeComponentPath(componentId._legacy.changeScope(componentId.scope), this.workspace.defaultDirectory);
-  }
-}

package/component-template.ts

@@ -1,66 +0,0 @@
-import { ComponentID } from '@teambit/component-id';
-
-export interface ComponentFile {
-  /**
-   * relative path of the file within the component.
-   */
-  relativePath: string;
-
-  /**
-   * file content
-   */
-  content: string;
-
-  /**
-   * whether this file will be tracked as the main file
-   */
-  isMain?: boolean;
-}
-
-export interface ComponentContext {
-  /**
-   * component-name as entered by the user, e.g. `use-date`.
-   * without the scope and the namespace.
-   */
-  name: string;
-
-  /**
-   * component-name as upper camel case, e.g. `use-date` becomes `UseDate`.
-   * useful when generating the file content, for example for a class name.
-   */
-  namePascalCase: string;
-
-  /**
-   * component-name as lower camel case, e.g. `use-date` becomes `useDate`.
-   * useful when generating the file content, for example for a function/variable name.
-   */
-  nameCamelCase: string;
-
-  /**
-   * component id.
-   * the name is the name+namespace. the scope is the scope entered by --scope flag or the defaultScope
-   */
-  componentId: ComponentID;
-}
-
-export interface ComponentTemplate {
-  /**
-   * name of the component template. for example: `hook`, `react-component` or `module`.
-   */
-  name: string;
-
-  /**
-   * short description of the template. shown in the `bit templates` command.
-   */
-  description?: string;
-
-  /**
-   * hide this template so that it is not listed with `bit templates`
-   */
-  hidden?: boolean;
-
-  /**
-   * template function for generating the file of a certain component.,
-   */
-  generateFiles(context: ComponentContext): ComponentFile[];
-}

package/create.cmd.ts

@@ -1,44 +0,0 @@
-import { Command, CommandOptions } from '@teambit/cli';
-import chalk from 'chalk';
-import { GeneratorMain } from './generator.main.runtime';
-
-export type CreateOptions = {
-  namespace?: string;
-  aspect?: string;
-  scope?: string;
-  path?: string;
-};
-
-export class CreateCmd implements Command {
-  name = 'create <templateName> <componentNames...>';
-  description = 'create a new component from a template';
-  shortDescription = '';
-  alias = '';
-  loader = true;
-  group = 'development';
-  options = [
-    ['n', 'namespace <string>', `sets the component's namespace and nested dirs inside the scope`],
-    ['s', 'scope <string>', `sets the component's scope-name. if not entered, the default-scope will be used`],
-    ['a', 'aspect <string>', 'aspect-id of the template. helpful when multiple aspects use the same template name'],
-    ['p', 'path <string>', 'relative path in the workspace. by default the path is `<scope>/<namespace>/<name>`'],
-  ] as CommandOptions;
-
-  constructor(private generator: GeneratorMain) {}
-
-  async report([templateName, componentNames]: [string, string[]], options: CreateOptions) {
-    const results = await this.generator.generateComponentTemplate(componentNames, templateName, options);
-    const title = `${results.length} component(s) were created`;
-
-    const componentsData = results
-      .map((result) => {
-        return `${chalk.bold(result.id.toString())}
-    location: ${result.dir}
-    env:      ${result.envId}
-`;
-      })
-      .join('\n');
-    const footer = `env configuration is according to workspace variants. learn more at https://harmony-docs.bit.dev/building-with-bit/environments/#configure-environment-for-components`;
-
-    return `${chalk.green(title)}\n\n${componentsData}\n\n${footer}`;
-  }
-}

package/generator.aspect.ts

@@ -1,5 +0,0 @@
-import { Aspect } from '@teambit/harmony';
-
-export const GeneratorAspect = Aspect.create({
-  id: 'teambit.generator/generator',
-});

package/generator.graphql.ts

@@ -1,66 +0,0 @@
-import { Schema } from '@teambit/graphql';
-import gql from 'graphql-tag';
-import { GeneratorMain } from './generator.main.runtime';
-
-export function generatorSchema(generator: GeneratorMain): Schema {
-  return {
-    typeDefs: gql`
-      type GenerateResult {
-        id: String
-        dir: String
-        files: [String]
-      }
-
-      type Mutation {
-        # create Component by template
-        createComponent(
-          name: String!
-          templateName: String!
-          scope: String
-          namespace: String
-          aspect: String
-        ): [GenerateResult]
-      }
-
-      type TemplateDescriptor {
-        aspectId: String!
-        name: String!
-      }
-
-      type Generator {
-        templates: [TemplateDescriptor]
-      }
-
-      type Query {
-        generator: Generator
-      }
-    `,
-    resolvers: {
-      Mutation: {
-        createComponent: async (
-          req: any,
-          {
-            name,
-            templateName,
-            ...options
-          }: { name: string; templateName: string; scope?: string; namespace?: string; aspect?: string }
-        ) => {
-          const res = await generator.generateComponentTemplate([name], templateName, options);
-          return res.map((component) => ({
-            id: component.id.toString(),
-            dir: component.dir,
-            files: component.files,
-          }));
-        },
-      },
-      Generator: {
-        templates: async () => {
-          return generator.listTemplates();
-        },
-      },
-      Query: {
-        generator: () => generator,
-      },
-    },
-  };
-}

package/generator.main.runtime.ts

@@ -1,279 +0,0 @@
-import { GraphqlAspect, GraphqlMain } from '@teambit/graphql';
-import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';
-import WorkspaceAspect, { Workspace } from '@teambit/workspace';
-import { EnvsAspect, EnvsMain } from '@teambit/envs';
-import { ConsumerNotFound } from '@teambit/legacy/dist/consumer/exceptions';
-import { Component } from '@teambit/component';
-import { ComponentID } from '@teambit/component-id';
-import { loadBit } from '@teambit/bit';
-import { Slot, SlotRegistry } from '@teambit/harmony';
-import { BitError } from '@teambit/bit-error';
-import { InvalidScopeName, isValidScopeName } from '@teambit/legacy-bit-id';
-import AspectLoaderAspect, { AspectLoaderMain } from '@teambit/aspect-loader';
-import { ComponentTemplate } from './component-template';
-import { GeneratorAspect } from './generator.aspect';
-import { CreateCmd, CreateOptions } from './create.cmd';
-import { TemplatesCmd } from './templates.cmd';
-import { generatorSchema } from './generator.graphql';
-import { ComponentGenerator, GenerateResult } from './component-generator';
-import { WorkspaceGenerator } from './workspace-generator';
-import { WorkspaceTemplate } from './workspace-template';
-import { NewCmd, NewOptions } from './new.cmd';
-import { componentGeneratorTemplate } from './templates/component-generator';
-import { workspaceGeneratorTemplate } from './templates/workspace-generator';
-
-export type ComponentTemplateSlot = SlotRegistry<ComponentTemplate[]>;
-export type WorkspaceTemplateSlot = SlotRegistry<WorkspaceTemplate[]>;
-
-export type TemplateDescriptor = { aspectId: string; name: string; description?: string; hidden?: boolean };
-
-export type GeneratorConfig = {
-  /**
-   * array of aspects to include in the list of templates.
-   */
-  aspects: string[];
-};
-
-export class GeneratorMain {
-  private aspectLoaded = false;
-  constructor(
-    private componentTemplateSlot: ComponentTemplateSlot,
-    private workspaceTemplateSlot: WorkspaceTemplateSlot,
-    private config: GeneratorConfig,
-    private workspace: Workspace,
-    private envs: EnvsMain,
-    private aspectLoader: AspectLoaderMain
-  ) {}
-
-  /**
-   * register a new component template.
-   */
-  registerComponentTemplate(templates: ComponentTemplate[]) {
-    this.componentTemplateSlot.register(templates);
-    return this;
-  }
-
-  /**
-   * register a new component template.
-   */
-  registerWorkspaceTemplate(templates: WorkspaceTemplate[]) {
-    this.workspaceTemplateSlot.register(templates);
-    return this;
-  }
-
-  /**
-   * list all component templates registered in the workspace or workspace templates in case the
-   * workspace is not available
-   */
-  async listTemplates(): Promise<TemplateDescriptor[]> {
-    const getTemplateDescriptor = ({
-      id,
-      template,
-    }: {
-      id: string;
-      template: WorkspaceTemplate | ComponentTemplate;
-    }) => ({
-      aspectId: id,
-      name: template.name,
-      description: template.description,
-      hidden: template.hidden,
-    });
-    return this.isRunningInsideWorkspace()
-      ? this.getAllComponentTemplatesFlattened().map(getTemplateDescriptor)
-      : this.getAllWorkspaceTemplatesFlattened().map(getTemplateDescriptor);
-  }
-
-  /**
-   * @deprecated use this.listTemplates()
-   */
-  async listComponentTemplates(): Promise<TemplateDescriptor[]> {
-    return this.listTemplates();
-  }
-
-  isRunningInsideWorkspace(): boolean {
-    return Boolean(this.workspace);
-  }
-
-  /**
-   * get all component templates registered by a specific aspect ID.
-   */
-  getComponentTemplateByAspect(aspectId: string): ComponentTemplate[] {
-    return this.componentTemplateSlot.get(aspectId) || [];
-  }
-
-  /**
-   * returns a specific component template.
-   */
-  getComponentTemplate(name: string, aspectId?: string): ComponentTemplate | undefined {
-    const templates = this.getAllComponentTemplatesFlattened();
-    const found = templates.find(({ id, template }) => {
-      if (aspectId && id !== aspectId) return false;
-      return template.name === name;
-    });
-    return found?.template;
-  }
-
-  /**
-   * in the case the aspect-id is given and this aspect doesn't exist locally, import it to the
-   * global scope and load it from the capsule
-   */
-  async findTemplateInGlobalScope(aspectId: string, name?: string): Promise<WorkspaceTemplate | undefined> {
-    const aspects = await this.aspectLoader.loadAspectsFromGlobalScope([aspectId]);
-    const fullAspectId = aspects[0].id.toString();
-    return this.searchRegisteredWorkspaceTemplate(name, fullAspectId);
-  }
-
-  async findTemplateInOtherWorkspace(workspacePath: string, name: string, aspectId?: string) {
-    if (!aspectId)
-      throw new BitError(
-        `to load a template from a different workspace, please provide the aspect-id using --aspect flag`
-      );
-    const harmony = await loadBit(workspacePath);
-    let workspace: Workspace;
-    try {
-      workspace = harmony.get<Workspace>(WorkspaceAspect.id);
-    } catch (err: any) {
-      throw new Error(`fatal: "${workspacePath}" is not a valid Bit workspace, make sure the path is correct`);
-    }
-    const aspectComponentId = await workspace.resolveComponentId(aspectId);
-    await workspace.loadAspects([aspectId], true);
-    const aspectFullId = aspectComponentId.toString();
-    const generator = harmony.get<GeneratorMain>(GeneratorAspect.id);
-    return generator.searchRegisteredWorkspaceTemplate(name, aspectFullId);
-  }
-
-  /**
-   * returns a specific workspace template.
-   */
-  async getWorkspaceTemplate(
-    name: string,
-    aspectId?: string
-  ): Promise<{ workspaceTemplate: WorkspaceTemplate; aspect?: Component }> {
-    const registeredTemplate = await this.searchRegisteredWorkspaceTemplate(name, aspectId);
-    if (registeredTemplate) {
-      return { workspaceTemplate: registeredTemplate };
-    }
-    if (!aspectId) {
-      throw new BitError(`template "${name}" was not found, if this is a custom-template, please use --aspect flag`);
-    }
-    const aspects = await this.aspectLoader.loadAspectsFromGlobalScope([aspectId]);
-    const aspect = aspects[0];
-    const fullAspectId = aspect.id.toString();
-    const fromGlobal = await this.searchRegisteredWorkspaceTemplate(name, fullAspectId);
-    if (fromGlobal) {
-      return { workspaceTemplate: fromGlobal, aspect };
-    }
-    throw new BitError(`template "${name}" was not found`);
-  }
-
-  async searchRegisteredWorkspaceTemplate(name?: string, aspectId?: string): Promise<WorkspaceTemplate | undefined> {
-    const templates = this.getAllWorkspaceTemplatesFlattened();
-    const found = templates.find(({ id, template }) => {
-      if (aspectId && name) return aspectId === id && name === template.name;
-      if (aspectId) return aspectId === id;
-      if (name) return name === template.name;
-      throw new Error(`searchRegisteredWorkspaceTemplate expects to get "name" or "aspectId"`);
-    });
-    return found?.template;
-  }
-
-  async generateComponentTemplate(
-    componentNames: string[],
-    templateName: string,
-    options: CreateOptions
-  ): Promise<GenerateResult[]> {
-    if (!this.workspace) throw new ConsumerNotFound();
-    await this.loadAspects();
-    const { namespace, aspect: aspectId } = options;
-    const template = this.getComponentTemplate(templateName, aspectId);
-    if (!template) throw new BitError(`template "${templateName}" was not found`);
-    const scope = options.scope || this.workspace.defaultScope;
-    if (!isValidScopeName(scope)) {
-      throw new InvalidScopeName(scope);
-    }
-    if (!scope) throw new BitError(`failed finding defaultScope`);
-
-    const componentIds = componentNames.map((componentName) => {
-      const fullComponentName = namespace ? `${namespace}/${componentName}` : componentName;
-      return ComponentID.fromObject({ name: fullComponentName }, scope);
-    });
-
-    const componentGenerator = new ComponentGenerator(this.workspace, componentIds, options, template, this.envs);
-    return componentGenerator.generate();
-  }
-
-  async generateWorkspaceTemplate(workspaceName: string, templateName: string, options: NewOptions) {
-    if (this.workspace) {
-      throw new BitError('Error: unable to generate a new workspace inside of an existing workspace');
-    }
-    const { aspect: aspectId, loadFrom } = options;
-    let template: WorkspaceTemplate | undefined;
-    let aspectComponent: Component | undefined;
-    if (loadFrom) {
-      template = await this.findTemplateInOtherWorkspace(loadFrom, templateName, aspectId);
-    } else {
-      const { workspaceTemplate, aspect } = await this.getWorkspaceTemplate(templateName, aspectId);
-      template = workspaceTemplate;
-      aspectComponent = aspect;
-    }
-    if (!template) throw new BitError(`template "${templateName}" was not found`);
-    const workspaceGenerator = new WorkspaceGenerator(workspaceName, options, template, aspectComponent);
-    const workspacePath = await workspaceGenerator.generate();
-
-    return workspacePath;
-  }
-
-  private getAllComponentTemplatesFlattened(): Array<{ id: string; template: ComponentTemplate }> {
-    const templatesByAspects = this.componentTemplateSlot.toArray();
-    return templatesByAspects.flatMap(([id, componentTemplates]) => {
-      return componentTemplates.map((template) => ({
-        id,
-        template,
-      }));
-    });
-  }
-
-  private getAllWorkspaceTemplatesFlattened(): Array<{ id: string; template: WorkspaceTemplate }> {
-    const templatesByAspects = this.workspaceTemplateSlot.toArray();
-    return templatesByAspects.flatMap(([id, workspaceTemplates]) => {
-      return workspaceTemplates.map((template) => ({
-        id,
-        template,
-      }));
-    });
-  }
-
-  private async loadAspects() {
-    if (this.aspectLoaded) return;
-    await this.workspace.loadAspects(this.config.aspects);
-    this.aspectLoaded = true;
-  }
-
-  static slots = [Slot.withType<ComponentTemplate[]>(), Slot.withType<WorkspaceTemplate[]>()];
-
-  static dependencies = [WorkspaceAspect, CLIAspect, GraphqlAspect, EnvsAspect, AspectLoaderAspect];
-
-  static runtime = MainRuntime;
-
-  static async provider(
-    [workspace, cli, graphql, envs, aspectLoader]: [Workspace, CLIMain, GraphqlMain, EnvsMain, AspectLoaderMain],
-    config: GeneratorConfig,
-    [componentTemplateSlot, workspaceTemplateSlot]: [ComponentTemplateSlot, WorkspaceTemplateSlot]
-  ) {
-    const generator = new GeneratorMain(
-      componentTemplateSlot,
-      workspaceTemplateSlot,
-      config,
-      workspace,
-      envs,
-      aspectLoader
-    );
-    const commands = [new CreateCmd(generator), new TemplatesCmd(generator), new NewCmd(generator)];
-    cli.register(...commands);
-    graphql.register(generatorSchema(generator));
-    generator.registerComponentTemplate([componentGeneratorTemplate, workspaceGeneratorTemplate]);
-    return generator;
-  }
-}
-
-GeneratorAspect.addRuntime(GeneratorMain);