Added parsing of @bean elements

Author: NathanJPhillips

env-model-generator/src/parseJson.ts

@@ -2,6 +2,7 @@ import * as fs from "fs-extra";
 import * as jsonConfig from "./annotationConfig";
 import { ConfigParseError } from "./configParseError";
 import * as model from "./model";
+import { getBeanById } from "./parserDriver";
 import { lowerInitialChar } from "./utils";
 
 interface NamedComponent {
@@ -71,7 +72,7 @@ function checkBeanId(id: string, location: string): void {
 }
 
 export function beanWithIdExists(id: string): boolean {
-  return componentsById.has(id);
+  return componentsById.has(id) || beansById.has(id);
 }
 
 export function parseAllBeans(): void {
@@ -81,12 +82,21 @@ export function parseAllBeans(): void {
     // We don't store the results of this parsing, it is stored in internal data structures which do enough for us
     parseJsonComponent(beanId, component);
   }
+  for (const [ beanId, namedMethod ] of beansById) {
+    if (model.Bean.tryGet(beanId) !== undefined)
+      continue;
+    // We don't store the results of this parsing, it is stored in internal data structures which do enough for us
+    parseJsonBean(beanId, namedMethod);
+  }
 }
 
 export function parseBean(id: string): model.Bean {
   const component = componentsById.get(id);
   if (component !== undefined)
     return parseJsonComponent(id, component);
+  const bean = beansById.get(id);
+  if (bean !== undefined)
+    return parseJsonBean(id, bean);
   throw new Error("Called parseBean on a bean that did not exist");
 }
 
@@ -105,6 +115,25 @@ function parseJsonComponent(id: string, namedBean: NamedComponent): model.Bean {
   return new model.Bean(undefined, id, namedBean.qualifiedClassName, false, [], properties);
 }
 
+function parseJsonBean(id: string, namedMethod: NamedBeanDefinitionMethod): model.Bean {
+  const fieldBeanId = model.Bean.tryGetIdByClass(namedMethod.className);
+  if (fieldBeanId === undefined)
+    throw new ConfigParseError(
+      `Factory method '${namedMethod.name}' is defined in a class '${namedMethod.className}' `
+        + `that has ${model.Bean.hasMultipleBeansForClass(namedMethod.className) ? "multiple" : "no"} implementations`);
+  const factoryBean = getBeanById(fieldBeanId);
+  if (factoryBean === undefined)
+    throw new ConfigParseError(
+      `Couldn't find bean '${namedMethod.className}' that is configuration containing factory method '${namedMethod.name}'`);
+  const method = namedMethod.method;
+  const argumentValues: model.Value[] = [];
+  for (const parameterType of method.parameterTypes) {
+    argumentValues.push(getBeanForClass(parameterType, `Parameter to factory method '${namedMethod.className}.${namedMethod.name}'`));
+  }
+  const isLazyInit = method.scope !== undefined && method.scope !== "singleton" || method.isLazyInit === true;
+  return new model.Bean(undefined, id, { bean: factoryBean, method: namedMethod.name }, isLazyInit, argumentValues, []);
+}
+
 function getBeanForClass(className: string, userString: string): model.BeanRefValue {
   const fieldBeanId = model.Bean.tryGetIdByClass(className);
   if (fieldBeanId === undefined)