@typemf/generator 0.7.0 → 0.8.1

package/dist/cli.js

@@ -743,7 +743,7 @@ var FileExtension = class {
 // src/generate.ts
 function generate(pkg, templateSet, options = {}) {
   assignFreshIds(pkg);
-  const problems = templateSet.validate?.(pkg) ?? [];
+  const problems = templateSet.validate?.(pkg, options) ?? [];
   if (problems.length > 0) {
     throw new Error(
       `Cannot generate from this package - ${templateSet.name} found ${problems.length} unresolved problem(s):
@@ -818,13 +818,19 @@ var TypeImportMapping = class _TypeImportMapping {
 };
 
 // src/generation-context.ts
-var generationContext = { pkg: void 0, typeImports: new TypeImportMapping() };
+var generationContext = {
+  pkg: void 0,
+  typeImports: new TypeImportMapping(),
+  generateEcore: false
+};
+var GENERATE_ECORE_OPTION = "generate-ecore";
 var TYPE_IMPORTS_OPTION = "type-imports";
 function beginGeneration(pkg, options) {
   generationContext.pkg = pkg;
   const entries = options[TYPE_IMPORTS_OPTION];
   const valid = typeof entries === "object" && entries !== null && !Array.isArray(entries);
   generationContext.typeImports = new TypeImportMapping(valid ? entries : {});
+  generationContext.generateEcore = options[GENERATE_ECORE_OPTION] === true;
 }
 function isExternal(classifier) {
   const owner = classifier.getEPackage();
@@ -924,7 +930,8 @@ function locationOfPath(path) {
 
 // src/typescript-filters.ts
 import {
-  detailValue as detailValue2
+  detailValue as detailValue2,
+  isEDataType as isDataTypeObject
 } from "@typemf/core";
 var TYPEMF_GENERATOR_ANNOTATION_SOURCE = "https://typemf.dev/generator";
 var ECLIPSE_GENMODEL_ANNOTATION_SOURCE = "http://www.eclipse.org/emf/2002/GenModel";
@@ -940,18 +947,34 @@ function layeredAnnotationDetail(element, key, fallbackSource) {
 function documentationOf(element) {
   return layeredAnnotationDetail(element, "documentation", ECLIPSE_ECORE_ANNOTATION_SOURCE);
 }
+var DOC_COMMENT_WIDTH = 100;
 function docComment(element, indent = "") {
-  const doc = documentationOf(element);
+  const doc = documentationOf(element)?.trim();
   if (!doc) return "";
-  const lines = doc.trim().split("\n");
-  if (lines.length === 1) {
-    return `${indent}/** ${lines[0]} */`;
-  }
-  const body = lines.map((line) => `${indent} * ${line}`).join("\n");
+  const single = `${indent}/** ${doc} */`;
+  if (!doc.includes("\n") && single.length <= DOC_COMMENT_WIDTH) return single;
+  const width = DOC_COMMENT_WIDTH - `${indent} * `.length;
+  const lines = doc.split("\n").flatMap((line) => wrapLine(line, width));
+  const body = lines.map((line) => line === "" ? `${indent} *` : `${indent} * ${line}`).join("\n");
   return `${indent}/**
 ${body}
 ${indent} */`;
 }
+function wrapLine(line, width) {
+  if (line.length <= width) return [line];
+  const lines = [];
+  let current = "";
+  for (const word of line.split(" ")) {
+    if (current !== "" && current.length + 1 + word.length > width) {
+      lines.push(current);
+      current = word;
+    } else {
+      current = current === "" ? word : `${current} ${word}`;
+    }
+  }
+  lines.push(current);
+  return lines;
+}
 function operationBody(operation) {
   return layeredAnnotationDetail(operation, "body", ECLIPSE_GENMODEL_ANNOTATION_SOURCE);
 }
@@ -1086,10 +1109,24 @@ function isPrimitiveValueType(classifier) {
   return classifier !== void 0 && isEDataType(classifier) && PRIMITIVE_VALUE_DATATYPE_NAMES.has(classifier.getName());
 }
 function primitiveDefaultValue(feature) {
-  const literal = "getDefaultValueLiteral" in feature ? feature.getDefaultValueLiteral() : void 0;
-  if (literal !== void 0 && literal !== "") return literal;
-  const classifier = feature.getEType();
-  return classifier?.getName() === "EBoolean" ? "false" : "0";
+  const declared = "getDefaultValueLiteral" in feature ? feature.getDefaultValueLiteral()?.trim() : void 0;
+  const literal = declared === "" ? void 0 : declared;
+  const typeName = feature.getEType()?.getName();
+  const invalid = () => new Error(`Invalid defaultValueLiteral '${literal}' for feature '${feature.getName()}'.`);
+  if (typeName === "EBoolean") {
+    if (literal === void 0) return "false";
+    if (!/^(true|false)$/i.test(literal)) throw invalid();
+    return literal.toLowerCase();
+  }
+  if (typeName === "ELong") {
+    if (literal === void 0) return "0n";
+    if (!/^[+-]?\d+$/.test(literal)) throw invalid();
+    return `${BigInt(literal)}n`;
+  }
+  if (literal === void 0) return "0";
+  const value = Number(literal);
+  if (Number.isNaN(value)) throw invalid();
+  return String(value);
 }
 function tsOptionalScalarType(type) {
   const scalar = tsScalarType(type);
@@ -1314,13 +1351,13 @@ function superTypeChain(eClass) {
   return chain;
 }
 function isClassifierDerived(eClass) {
-  return superTypeChain(eClass).some((c) => c.getName() === "EClassifier");
+  return generationContext.generateEcore && superTypeChain(eClass).some((c) => c.getName() === "EClassifier");
 }
 function isStructuralFeatureDerived(eClass) {
-  return superTypeChain(eClass).some((c) => c.getName() === "EStructuralFeature");
+  return generationContext.generateEcore && superTypeChain(eClass).some((c) => c.getName() === "EStructuralFeature");
 }
 function isOperationDerived(eClass) {
-  return superTypeChain(eClass).some((c) => c.getName() === "EOperation");
+  return generationContext.generateEcore && superTypeChain(eClass).some((c) => c.getName() === "EOperation");
 }
 function isBookkeepingOperation(op, eClass) {
   if (op.getName() === "getClassifierID" && op.getEParameters().isEmpty() && isClassifierDerived(eClass)) return true;
@@ -1475,6 +1512,16 @@ function jsString(value) {
   }
   return JSON.stringify(value);
 }
+function hasStoredManyValuedFeature(features) {
+  return [...features].some((feature) => feature.isMany() && featureGetter(feature) === void 0);
+}
+function runtimeAnnotations(element) {
+  return element.getEAnnotations().toArray().filter((annotation) => {
+    const source = annotation.getSource() ?? "";
+    if (source === ECLIPSE_GENMODEL_ANNOTATION_SOURCE) return false;
+    return !source.startsWith(TYPEMF_GENERATOR_ANNOTATION_SOURCE) || isDataTypeObject(element);
+  });
+}
 function detailsEntries(annotation) {
   return [...annotation.getDetails()].map((entry) => ({ key: entry.getKey() ?? "", value: entry.getValue() ?? "" }));
 }
@@ -1500,7 +1547,8 @@ function useImport(name, location, opts) {
 var typescriptTemplateSet = {
   name: "typescript",
   baseFolder: join(packageRoot, "templates", "typescript"),
-  validate(pkg) {
+  validate(pkg, options) {
+    beginGeneration(pkg, options);
     return [
       ...findUnnamedElements(pkg),
       ...findUnresolvedCollisions(pkg).map(
@@ -1545,6 +1593,8 @@ var typescriptTemplateSet = {
     env.addGlobal("findEClassByName", findEClassByName);
     env.addGlobal("jsString", jsString);
     env.addGlobal("detailsEntries", detailsEntries);
+    env.addGlobal("runtimeAnnotations", runtimeAnnotations);
+    env.addGlobal("hasStoredManyValuedFeature", hasStoredManyValuedFeature);
     env.addGlobal("beanGetterName", beanGetterName);
     env.addGlobal("isPrimitiveValueType", isPrimitiveValueType);
     env.addGlobal("primitiveDefaultValue", primitiveDefaultValue);

package/dist/index.d.ts

@@ -155,7 +155,7 @@ interface TemplateSet {
      * colliding in a way it doesn't know how to resolve automatically.
      * Runs once, after ID assignment, before configureEnvironment/main.njk.
      */
-    validate?(pkg: EPackage): string[];
+    validate?(pkg: EPackage, options: Record<string, unknown>): string[];
     /**
      * Optional hook to register set-specific filters/globals (e.g. a
      * `tsType` filter mapping EDataType names to TypeScript type names) on
@@ -274,12 +274,9 @@ declare function layeredAnnotationDetail(element: EModelElement, key: string, fa
  */
 declare function documentationOf(element: EModelElement): string | undefined;
 /**
- * Renders a JSDoc block from documentationOf(), or '' if there is none.
- * Deliberately WITHOUT a trailing newline: every template writes
- * `{{ docComment(x) }}` on its own line and puts the declaration on the
- * next one, so the template's own newline is what separates them - a
- * trailing newline here as well used to leave a blank line between every
- * doc comment and the declaration it documents.
+ * Renders a JSDoc block from documentationOf(), or '' if there is none. Lines longer than
+ * {@link DOC_COMMENT_WIDTH} are wrapped at spaces; shorter lines are kept as written. Has no
+ * trailing newline, since every template puts the declaration on the next line itself.
  */
 declare function docComment(element: EModelElement, indent?: string): string;
 /**
@@ -436,10 +433,11 @@ declare function resolveDataTypeTs(dataType: EDataType): ResolvedDataTypeText;
 declare function registerBodyImports(element: EModelElement): string;
 declare function isPrimitiveValueType(classifier: EClassifier | undefined): boolean;
 /**
- * The feature's own declared `defaultValueLiteral` when it has one (e.g. `changeable`'s real
- * declared default is "true", not the generic zero-default) - otherwise 'false' for EBoolean, '0' for
- * every other primitive numeric EDataType (the real Java-primitive zero-default). Used as a stored
- * field's initial value instead of `undefined`.
+ * The initial value of a stored field of a primitive data type, as TypeScript source: the
+ * feature's `defaultValueLiteral` if it has one, else `false` for EBoolean, `0n` for ELong and
+ * `0` for the other numeric types.
+ *
+ * @throws Error if the `defaultValueLiteral` is not a valid value of the type.
  */
 declare function primitiveDefaultValue(feature: ETypedElement): string;
 /**
@@ -572,31 +570,20 @@ declare function superType(eClass: EClass): EClass | undefined;
 /** eClass itself, then each ancestor in turn (via superType()), nearest first. */
 declare function superTypeChain(eClass: EClass): EClass[];
 /**
- * Whether this class descends from (or is) "EClassifier" - needed
- * specifically for self-hosting Ecore.ecore: classifierID is internal
- * dispatch bookkeeping, not a real modeled Ecore feature, so it's never
- * emitted by the ordinary feature-driven getter/setter generation - but
- * bootstrap code constructing the metamodel's own classifier shells
- * (which ARE real EClassifier-derived instances, e.g. EClassImpl,
- * EDataTypeImpl) genuinely needs to set it. Confirmed as a real,
- * necessary gap by actually running self-hosted bootstrap code, not
- * assumed - see NOTES.md.
+ * Whether `eClass` is EClassifier or a subclass of it, when generating Ecore itself: such a class
+ * gets a stored classifier ID (`getClassifierID`/`setClassifierID`), which is bookkeeping, not a
+ * modeled feature. Always false for any other package, so a user class that happens to be named
+ * EClassifier is generated like any other class.
  */
 declare function isClassifierDerived(eClass: EClass): boolean;
-/** The featureID analog of isClassifierDerived() - same reasoning, same real gap found the same way (see NOTES.md). */
+/** Like {@link isClassifierDerived}, for EStructuralFeature (feature ID and container class). */
 declare function isStructuralFeatureDerived(eClass: EClass): boolean;
-/** The operationID analog of isClassifierDerived()/isStructuralFeatureDerived() - added for point 4. */
+/** Like {@link isClassifierDerived}, for EOperation (operation ID). */
 declare function isOperationDerived(eClass: EClass): boolean;
 /**
- * Whether a real EOperation's name collides with a hand-added bookkeeping
- * method (classifierID/featureID - see isClassifierDerived/
- * isStructuralFeatureDerived's own doc comments). Real Ecore.ecore
- * genuinely declares both "EClassifier.getClassifierID(): EInt" and
- * "EStructuralFeature.getFeatureID(): EInt" as real, zero-arg operations
- * - colliding, by name, with exactly the bookkeeping getters added for
- * the self-hosting bootstrap fix. Confirmed directly against the real
- * file before excluding these operations from the generic,
- * throwing-stub-generating operation loop, not assumed - see NOTES.md.
+ * Whether `op` is one of Ecore's own operations that the bookkeeping methods implement
+ * (`getClassifierID`, `getFeatureID`, `getOperationID`, `getContainerClass`; see
+ * {@link isClassifierDerived}), so the operation loop must not generate it again.
  */
 declare function isBookkeepingOperation(op: EOperation, eClass: EClass): boolean;
 /**
@@ -717,6 +704,16 @@ declare function jsString(value: string | undefined): string;
  * properties). Converting to a plain array here avoids relying on
  * behavior that was never actually verified.
  */
+/** Whether one of `features` is many-valued and stored in a list (has no custom getter). */
+declare function hasStoredManyValuedFeature(features: Iterable<EStructuralFeature>): boolean;
+/**
+ * `element`'s annotations that belong in the runtime metamodel. EMF's GenModel annotations are
+ * left out, and so are the generator's own (sources starting with https://typemf.dev/generator),
+ * which only steer code generation - except on a data type, where they say which TypeScript type
+ * the data type maps to and what to import, which generating another package that uses the data
+ * type reads from this runtime metamodel.
+ */
+declare function runtimeAnnotations(element: EModelElement): EAnnotation[];
 declare function detailsEntries(annotation: EAnnotation): {
     key: string;
     value: string;
@@ -738,4 +735,4 @@ declare function singleValuedFeatures(features: Iterable<EStructuralFeature>): E
 
 declare const typescriptTemplateSet: TemplateSet;
 
-export { ECLIPSE_ECORE_ANNOTATION_SOURCE, ECLIPSE_GENMODEL_ANNOTATION_SOURCE, FEATURE_ANNOTATION_SOURCE, type GeneratedFile, type GeneratorConfig, type MemberCollision, type OverloadBranch, type OverloadDispatch, type ResolvedDataTypeText, type RunGenerationResult, TYPEMF_GENERATOR_ANNOTATION_SOURCE, type TemplateSet, argList, assignFreshIds, beanGetterName, buildEcoreMetaSchema, concreteEClassesOf, convertDynamicEcoreToTyped, customBodyNeedsOwnField, detailsEntries, docComment, documentationOf, eClassesOf, factoryClassName, featureGetter, featureSetter, findEClassByName, findFeatureAnnotationProblems, findUnnamedElements, findUnresolvedCollisions, generate, genericArgumentClassifiers, groupOperationsByName, isBookkeepingOperation, isClassifierDerived, isEClass, isEDataType, isEEnum, isEReference, isOperationDerived, isOptional, isPrimitiveValueType, isReadOnlyFeature, isStructuralFeatureDerived, jsString, layeredAnnotationDetail, loadConfig, loadEcorePackage, mergedParamList, mergedReturnType, metaclassAccessorCollision, metaclassAccessorCollisionTypeNames, needsImplOnlySetter, operationBody, optionalParamList, overloadDispatch, packageClassName, paramList, primitiveDefaultValue, referencedApiTypes, referencedOperationTypes, registerBodyImports, resolveDataTypeTs, resolveTemplateSet, runGeneration, singleValuedFeatures, superType, superTypeChain, switchClassName, trivialDerivedFormula, tsFeatureType, tsOperationReturnType, tsOptionalScalarType, tsScalarType, typeGuardsClassName, typescriptTemplateSet, ucfirst };
+export { ECLIPSE_ECORE_ANNOTATION_SOURCE, ECLIPSE_GENMODEL_ANNOTATION_SOURCE, FEATURE_ANNOTATION_SOURCE, type GeneratedFile, type GeneratorConfig, type MemberCollision, type OverloadBranch, type OverloadDispatch, type ResolvedDataTypeText, type RunGenerationResult, TYPEMF_GENERATOR_ANNOTATION_SOURCE, type TemplateSet, argList, assignFreshIds, beanGetterName, buildEcoreMetaSchema, concreteEClassesOf, convertDynamicEcoreToTyped, customBodyNeedsOwnField, detailsEntries, docComment, documentationOf, eClassesOf, factoryClassName, featureGetter, featureSetter, findEClassByName, findFeatureAnnotationProblems, findUnnamedElements, findUnresolvedCollisions, generate, genericArgumentClassifiers, groupOperationsByName, hasStoredManyValuedFeature, isBookkeepingOperation, isClassifierDerived, isEClass, isEDataType, isEEnum, isEReference, isOperationDerived, isOptional, isPrimitiveValueType, isReadOnlyFeature, isStructuralFeatureDerived, jsString, layeredAnnotationDetail, loadConfig, loadEcorePackage, mergedParamList, mergedReturnType, metaclassAccessorCollision, metaclassAccessorCollisionTypeNames, needsImplOnlySetter, operationBody, optionalParamList, overloadDispatch, packageClassName, paramList, primitiveDefaultValue, referencedApiTypes, referencedOperationTypes, registerBodyImports, resolveDataTypeTs, resolveTemplateSet, runGeneration, runtimeAnnotations, singleValuedFeatures, superType, superTypeChain, switchClassName, trivialDerivedFormula, tsFeatureType, tsOperationReturnType, tsOptionalScalarType, tsScalarType, typeGuardsClassName, typescriptTemplateSet, ucfirst };

package/dist/index.js

@@ -734,7 +734,7 @@ var FileExtension = class {
 // src/generate.ts
 function generate(pkg, templateSet, options = {}) {
   assignFreshIds(pkg);
-  const problems = templateSet.validate?.(pkg) ?? [];
+  const problems = templateSet.validate?.(pkg, options) ?? [];
   if (problems.length > 0) {
     throw new Error(
       `Cannot generate from this package - ${templateSet.name} found ${problems.length} unresolved problem(s):
@@ -813,13 +813,19 @@ var TypeImportMapping = class _TypeImportMapping {
 };
 
 // src/generation-context.ts
-var generationContext = { pkg: void 0, typeImports: new TypeImportMapping() };
+var generationContext = {
+  pkg: void 0,
+  typeImports: new TypeImportMapping(),
+  generateEcore: false
+};
+var GENERATE_ECORE_OPTION = "generate-ecore";
 var TYPE_IMPORTS_OPTION = "type-imports";
 function beginGeneration(pkg, options) {
   generationContext.pkg = pkg;
   const entries = options[TYPE_IMPORTS_OPTION];
   const valid = typeof entries === "object" && entries !== null && !Array.isArray(entries);
   generationContext.typeImports = new TypeImportMapping(valid ? entries : {});
+  generationContext.generateEcore = options[GENERATE_ECORE_OPTION] === true;
 }
 function isExternal(classifier) {
   const owner = classifier.getEPackage();
@@ -919,7 +925,8 @@ function locationOfPath(path) {
 
 // src/typescript-filters.ts
 import {
-  detailValue as detailValue2
+  detailValue as detailValue2,
+  isEDataType as isDataTypeObject
 } from "@typemf/core";
 var TYPEMF_GENERATOR_ANNOTATION_SOURCE = "https://typemf.dev/generator";
 var ECLIPSE_GENMODEL_ANNOTATION_SOURCE = "http://www.eclipse.org/emf/2002/GenModel";
@@ -935,18 +942,34 @@ function layeredAnnotationDetail(element, key, fallbackSource) {
 function documentationOf(element) {
   return layeredAnnotationDetail(element, "documentation", ECLIPSE_ECORE_ANNOTATION_SOURCE);
 }
+var DOC_COMMENT_WIDTH = 100;
 function docComment(element, indent = "") {
-  const doc = documentationOf(element);
+  const doc = documentationOf(element)?.trim();
   if (!doc) return "";
-  const lines = doc.trim().split("\n");
-  if (lines.length === 1) {
-    return `${indent}/** ${lines[0]} */`;
-  }
-  const body = lines.map((line) => `${indent} * ${line}`).join("\n");
+  const single = `${indent}/** ${doc} */`;
+  if (!doc.includes("\n") && single.length <= DOC_COMMENT_WIDTH) return single;
+  const width = DOC_COMMENT_WIDTH - `${indent} * `.length;
+  const lines = doc.split("\n").flatMap((line) => wrapLine(line, width));
+  const body = lines.map((line) => line === "" ? `${indent} *` : `${indent} * ${line}`).join("\n");
   return `${indent}/**
 ${body}
 ${indent} */`;
 }
+function wrapLine(line, width) {
+  if (line.length <= width) return [line];
+  const lines = [];
+  let current = "";
+  for (const word of line.split(" ")) {
+    if (current !== "" && current.length + 1 + word.length > width) {
+      lines.push(current);
+      current = word;
+    } else {
+      current = current === "" ? word : `${current} ${word}`;
+    }
+  }
+  lines.push(current);
+  return lines;
+}
 function operationBody(operation) {
   return layeredAnnotationDetail(operation, "body", ECLIPSE_GENMODEL_ANNOTATION_SOURCE);
 }
@@ -1095,10 +1118,24 @@ function isPrimitiveValueType(classifier) {
   return classifier !== void 0 && isEDataType(classifier) && PRIMITIVE_VALUE_DATATYPE_NAMES.has(classifier.getName());
 }
 function primitiveDefaultValue(feature) {
-  const literal = "getDefaultValueLiteral" in feature ? feature.getDefaultValueLiteral() : void 0;
-  if (literal !== void 0 && literal !== "") return literal;
-  const classifier = feature.getEType();
-  return classifier?.getName() === "EBoolean" ? "false" : "0";
+  const declared = "getDefaultValueLiteral" in feature ? feature.getDefaultValueLiteral()?.trim() : void 0;
+  const literal = declared === "" ? void 0 : declared;
+  const typeName = feature.getEType()?.getName();
+  const invalid = () => new Error(`Invalid defaultValueLiteral '${literal}' for feature '${feature.getName()}'.`);
+  if (typeName === "EBoolean") {
+    if (literal === void 0) return "false";
+    if (!/^(true|false)$/i.test(literal)) throw invalid();
+    return literal.toLowerCase();
+  }
+  if (typeName === "ELong") {
+    if (literal === void 0) return "0n";
+    if (!/^[+-]?\d+$/.test(literal)) throw invalid();
+    return `${BigInt(literal)}n`;
+  }
+  if (literal === void 0) return "0";
+  const value = Number(literal);
+  if (Number.isNaN(value)) throw invalid();
+  return String(value);
 }
 function tsOptionalScalarType(type) {
   const scalar = tsScalarType(type);
@@ -1323,13 +1360,13 @@ function superTypeChain(eClass) {
   return chain;
 }
 function isClassifierDerived(eClass) {
-  return superTypeChain(eClass).some((c) => c.getName() === "EClassifier");
+  return generationContext.generateEcore && superTypeChain(eClass).some((c) => c.getName() === "EClassifier");
 }
 function isStructuralFeatureDerived(eClass) {
-  return superTypeChain(eClass).some((c) => c.getName() === "EStructuralFeature");
+  return generationContext.generateEcore && superTypeChain(eClass).some((c) => c.getName() === "EStructuralFeature");
 }
 function isOperationDerived(eClass) {
-  return superTypeChain(eClass).some((c) => c.getName() === "EOperation");
+  return generationContext.generateEcore && superTypeChain(eClass).some((c) => c.getName() === "EOperation");
 }
 function isBookkeepingOperation(op, eClass) {
   if (op.getName() === "getClassifierID" && op.getEParameters().isEmpty() && isClassifierDerived(eClass)) return true;
@@ -1484,6 +1521,16 @@ function jsString(value) {
   }
   return JSON.stringify(value);
 }
+function hasStoredManyValuedFeature(features) {
+  return [...features].some((feature) => feature.isMany() && featureGetter(feature) === void 0);
+}
+function runtimeAnnotations(element) {
+  return element.getEAnnotations().toArray().filter((annotation) => {
+    const source = annotation.getSource() ?? "";
+    if (source === ECLIPSE_GENMODEL_ANNOTATION_SOURCE) return false;
+    return !source.startsWith(TYPEMF_GENERATOR_ANNOTATION_SOURCE) || isDataTypeObject(element);
+  });
+}
 function detailsEntries(annotation) {
   return [...annotation.getDetails()].map((entry) => ({ key: entry.getKey() ?? "", value: entry.getValue() ?? "" }));
 }
@@ -1509,7 +1556,8 @@ function useImport(name, location, opts) {
 var typescriptTemplateSet = {
   name: "typescript",
   baseFolder: join(packageRoot, "templates", "typescript"),
-  validate(pkg) {
+  validate(pkg, options) {
+    beginGeneration(pkg, options);
     return [
       ...findUnnamedElements(pkg),
       ...findUnresolvedCollisions(pkg).map(
@@ -1554,6 +1602,8 @@ var typescriptTemplateSet = {
     env.addGlobal("findEClassByName", findEClassByName);
     env.addGlobal("jsString", jsString);
     env.addGlobal("detailsEntries", detailsEntries);
+    env.addGlobal("runtimeAnnotations", runtimeAnnotations);
+    env.addGlobal("hasStoredManyValuedFeature", hasStoredManyValuedFeature);
     env.addGlobal("beanGetterName", beanGetterName);
     env.addGlobal("isPrimitiveValueType", isPrimitiveValueType);
     env.addGlobal("primitiveDefaultValue", primitiveDefaultValue);
@@ -1631,6 +1681,7 @@ export {
   generate,
   genericArgumentClassifiers,
   groupOperationsByName,
+  hasStoredManyValuedFeature,
   isBookkeepingOperation,
   isClassifierDerived,
   isEClass2 as isEClass,
@@ -1663,6 +1714,7 @@ export {
   resolveDataTypeTs,
   resolveTemplateSet,
   runGeneration,
+  runtimeAnnotations,
   singleValuedFeatures,
   superType,
   superTypeChain,