oip-common 0.0.31 → 0.0.32

package/index.d.ts

@@ -465,38 +465,59 @@ declare class FooterComponent {
 
 /** Data Transfer Object for creating a new module instance */
 interface AddModuleInstanceDto {
-    /** The identifier of the module to create an instance of */
+    /**
+     * The identifier of the module to create an instance of
+     * @format int32
+     */
     moduleId?: number;
     /** The display label for the module instance */
     label?: string | null;
     /** The icon identifier for the module instance (optional) */
     icon?: string | null;
-    /** The parent module instance identifier (optional) */
+    /**
+     * The parent module instance identifier (optional)
+     * @format int32
+     */
     parentId?: number | null;
     /** Array of role identifiers that can view this module instance (optional) */
     viewRoles?: string[] | null;
 }
 /** Data Transfer Object for editing an existing module instance */
-interface EditModuleInstanceDto$1 {
-    /** The identifier of the module instance to edit */
+interface EditModuleInstanceDto {
+    /**
+     * The identifier of the module instance to edit
+     * @format int32
+     */
     moduleInstanceId?: number;
     /** The updated display label for the module instance */
     label?: string | null;
     /** The updated icon identifier for the module instance (optional) */
     icon?: string | null;
-    /** The updated parent module instance identifier (optional) */
+    /**
+     * The updated parent module instance identifier (optional)
+     * @format int32
+     */
     parentId?: number | null;
     /** Updated array of role identifiers that can view this module instance (optional) */
     viewRoles?: string[] | null;
+    /**
+     * For front compatibility
+     * @format int32
+     */
+    moduleId?: number | null;
 }
 /** Represents a key-value pair where the key is an integer and the value is a string. */
 interface IntKeyValueDto {
+    /** @format int32 */
     key?: number;
     value?: string | null;
 }
 /** It module in app */
 interface ModuleDto {
-    /** Id */
+    /**
+     * Id
+     * @format int32
+     */
     moduleId?: number;
     /** Name */
     name?: string | null;
@@ -507,9 +528,15 @@ interface ModuleDto {
 }
 /** Module Instance Dto */
 interface ModuleInstanceDto {
-    /** Unique identifier for the module instance. */
+    /**
+     * Unique identifier for the module instance.
+     * @format int32
+     */
     moduleInstanceId?: number;
-    /** Identifier for the module. */
+    /**
+     * Identifier for the module.
+     * @format int32
+     */
     moduleId?: number;
     /** The label for the module instance. */
     label?: string | null;
@@ -527,10 +554,18 @@ interface ModuleInstanceDto {
     items?: ModuleInstanceDto[] | null;
     /** Securities */
     securities?: string[] | null;
-    /** Identifier for the parent module instance. */
+    /**
+     * Identifier for the parent module instance.
+     * @format int32
+     */
     parentId?: number | null;
-    /** Sort order position for the module instance. */
+    /**
+     * Sort order position for the module instance.
+     * @format int32
+     */
     order?: number;
+    /** Indicates whether this module instance should be displayed as a separator. */
+    separator?: boolean;
 }
 /** Module security DTO */
 interface ModuleSecurityDto {
@@ -539,14 +574,23 @@ interface ModuleSecurityDto {
     /** Role */
     role: string | null;
 }
-interface MenuDeleteModuleInstanceParams {
-    /** The unique identifier of the module instance to delete. */
+interface DeleteModuleInstanceParams {
+    /**
+     * The unique identifier of the module instance to delete.
+     * @format int32
+     */
     id?: number;
 }
-interface MenuChangeOrderParams {
-    /** The identifier of the first module to swap. */
+interface ChangeOrderParams {
+    /**
+     * The identifier of the first module to swap.
+     * @format int32
+     */
     firstModuleId?: number;
-    /** The identifier of the second module to swap with. */
+    /**
+     * The identifier of the second module to swap with.
+     * @format int32
+     */
     secondModuleId?: number;
 }
 
@@ -602,15 +646,6 @@ interface MenuChangeEvent {
     item: ContextMenuItemDto;
 }
 
-interface EditModuleInstanceDto {
-    moduleInstanceId: number;
-    moduleId: number;
-    parentId: number;
-    label: string;
-    icon: string;
-    viewRoles: string[];
-}
-
 declare class MenuService extends BaseDataService {
     private readonly menuSource;
     private readonly resetSource;
@@ -633,8 +668,8 @@ declare class MenuService extends BaseDataService {
     getAdminMenu(): Promise<ModuleInstanceDto[]>;
     getModules(): Promise<IntKeyValueDto[]>;
     addModuleInstance(addModuleInstance: AddModuleInstanceDto): Promise<void>;
-    deleteItem(moduleInstanceId: number): Promise<unknown>;
-    editModuleInstance(item: EditModuleInstanceDto): Promise<unknown>;
+    deleteItem(moduleInstanceId: number): Promise<void>;
+    editModuleInstance(item: EditModuleInstanceDto): Promise<void>;
     static ɵfac: i0.ɵɵFactoryDeclaration<MenuService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<MenuService>;
 }
@@ -663,6 +698,7 @@ type RequestParams = Omit<FullRequestParams, "body" | "method" | "query" | "path
 type CancelToken = Symbol | string | number;
 declare enum ContentType {
     Json = "application/json",
+    JsonApi = "application/vnd.api+json",
     FormData = "multipart/form-data",
     UrlEncoded = "application/x-www-form-urlencoded",
     Text = "text/plain"
@@ -692,77 +728,95 @@ declare class HttpClient<SecurityDataType = unknown> {
     static ɵprov: i0.ɵɵInjectableDeclaration<HttpClient<any>>;
 }
 
-declare class Menu<SecurityDataType = unknown> extends HttpClient<SecurityDataType> {
+declare class MenuApi<SecurityDataType = unknown> extends HttpClient<SecurityDataType> {
     /**
      * @description Retrieves the menu available to the current authenticated user.
      *
      * @tags Menu
-     * @name menuGet
+     * @name get
+     * @summary Retrieves the menu available to the current authenticated user.
      * @request GET:/api/menu/get
      * @secure
+     * @response `200` `(ModuleInstanceDto)[]` OK
      */
-    menuGet: (params?: RequestParams) => Promise<ModuleInstanceDto[]>;
+    get: (params?: RequestParams) => Promise<ModuleInstanceDto[]>;
     /**
      * @description Retrieves the admin-specific menu.
      *
      * @tags Menu
-     * @name menuGetAdminMenu
+     * @name getAdminMenu
+     * @summary Retrieves the admin-specific menu.
      * @request GET:/api/menu/get-admin-menu
      * @secure
+     * @response `200` `(ModuleInstanceDto)[]` OK
      */
-    menuGetAdminMenu: (params?: RequestParams) => Promise<ModuleInstanceDto[]>;
+    getAdminMenu: (params?: RequestParams) => Promise<ModuleInstanceDto[]>;
     /**
      * @description Retrieves all available modules in the system.
      *
      * @tags Menu
-     * @name menuGetModules
+     * @name getModules
+     * @summary Retrieves all available modules in the system.
      * @request GET:/api/menu/get-modules
      * @secure
+     * @response `200` `(IntKeyValueDto)[]` OK
      */
-    menuGetModules: (params?: RequestParams) => Promise<IntKeyValueDto[]>;
+    getModules: (params?: RequestParams) => Promise<IntKeyValueDto[]>;
     /**
      * @description Adds a new module instance to the system.
      *
      * @tags Menu
-     * @name menuAddModuleInstance
+     * @name addModuleInstance
+     * @summary Adds a new module instance to the system.
      * @request POST:/api/menu/add-module-instance
      * @secure
+     * @response `200` `void` OK
+     * @response `500` `ApiExceptionResponse` Internal Server Error
      */
-    menuAddModuleInstance: (data: AddModuleInstanceDto, params?: RequestParams) => Promise<void>;
+    addModuleInstance: (data: AddModuleInstanceDto, params?: RequestParams) => Promise<void>;
     /**
      * @description Edits an existing module instance.
      *
      * @tags Menu
-     * @name menuEditModuleInstance
+     * @name editModuleInstance
+     * @summary Edits an existing module instance.
      * @request POST:/api/menu/edit-module-instance
      * @secure
+     * @response `200` `void` OK
+     * @response `500` `ApiExceptionResponse` Internal Server Error
      */
-    menuEditModuleInstance: (data: EditModuleInstanceDto$1, params?: RequestParams) => Promise<void>;
+    editModuleInstance: (data: EditModuleInstanceDto, params?: RequestParams) => Promise<void>;
     /**
      * @description Deletes a module instance by its identifier.
      *
      * @tags Menu
-     * @name menuDeleteModuleInstance
+     * @name deleteModuleInstance
+     * @summary Deletes a module instance by its identifier.
      * @request DELETE:/api/menu/delete-module-instance
      * @secure
+     * @response `200` `void` OK
+     * @response `500` `ApiExceptionResponse` Internal Server Error
      */
-    menuDeleteModuleInstance: (query: MenuDeleteModuleInstanceParams, params?: RequestParams) => Promise<void>;
+    deleteModuleInstance: (query: DeleteModuleInstanceParams, params?: RequestParams) => Promise<void>;
     /**
      * @description Swaps the order positions of two modules in the menu structure.
      *
      * @tags Menu
-     * @name menuChangeOrder
+     * @name changeOrder
+     * @summary Swaps the order positions of two modules in the menu structure.
      * @request POST:/api/menu/change-order
      * @secure
+     * @response `200` `void` OK
+     * @response `500` `ApiExceptionResponse` Internal Server Error
      */
-    menuChangeOrder: (query: MenuChangeOrderParams, params?: RequestParams) => Promise<void>;
-    static ɵfac: i0.ɵɵFactoryDeclaration<Menu<any>, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<Menu<any>>;
+    changeOrder: (query: ChangeOrderParams, params?: RequestParams) => Promise<void>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MenuApi<any>, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<MenuApi<any>>;
 }
 
 declare class MenuItemCreateDialogComponent implements OnInit {
-    menuService: MenuService;
-    protected readonly menu: Menu<any>;
+    protected readonly menuService: MenuService;
+    protected readonly menu: MenuApi<any>;
     visible: boolean;
     visibleChange: EventEmitter<boolean>;
     modules: IntKeyValueDto[];
@@ -861,7 +915,6 @@ declare class L10nService {
     private readonly primeNg;
     private readonly layoutService;
     availableLanguages: LanguageDto[];
-    private appRef;
     /**
      * Loads translations for a specific component
      * @param component - Name of the component to load translations for
@@ -1224,5 +1277,5 @@ declare class SecurePipe implements PipeTransform {
  */
 declare const httpLoaderAuthFactory: (httpClient: HttpClient$1) => StsConfigHttpLoader;
 
-export { AppConfiguratorComponent, AppFloatingConfiguratorComponent, AppLayoutComponent, AppModulesComponent, AppTopbar, AuthGuardService, BaseDataService, BaseModuleComponent, ConfigComponent, DbMigrationComponent, ErrorComponent, FooterComponent, KeycloakSecurityService, L10nService, LOGO_COMPONENT_TOKEN, LayoutService, LogoComponent, LogoService, MenuComponent, MenuService, MsgService, NotfoundComponent, NotificationService, ProfileComponent, SecurePipe, SecurityComponent, SecurityDataService, SecurityService, SecurityStorageService, SidebarComponent, TableFilterService, TopBarService, UnauthorizedComponent, UserService, httpLoaderAuthFactory, langIntercept, provideLogoComponent };
-export type { AppConfig, LanguageDto, MenuChangeEvent, NoSettingsDto, PutSecurityDto, SecurityDto, TopBarDto };
+export { AppConfiguratorComponent, AppFloatingConfiguratorComponent, AppLayoutComponent, AppModulesComponent, AppTopbar, AuthGuardService, BaseDataService, BaseModuleComponent, ConfigComponent, ContentType, DbMigrationComponent, ErrorComponent, FooterComponent, HttpClient, KeycloakSecurityService, L10nService, LOGO_COMPONENT_TOKEN, LayoutService, LogoComponent, LogoService, MenuComponent, MenuService, MsgService, NotfoundComponent, NotificationService, ProfileComponent, SecurePipe, SecurityComponent, SecurityDataService, SecurityService, SecurityStorageService, SidebarComponent, TableFilterService, TopBarService, UnauthorizedComponent, UserService, httpLoaderAuthFactory, langIntercept, provideLogoComponent };
+export type { AppConfig, LanguageDto, MenuChangeEvent, NoSettingsDto, PutSecurityDto, RequestParams, SecurityDto, TopBarDto };

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "oip-common",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "description": "A template for cross-platform web applications based on sakai-ng and primeNG",
   "main": "index.js",
   "keywords": [
     "oip",
     "template"
   ],
+  "bin": {
+    "oip-generate-api": "./dist/cli.js"
+  },
   "author": "Igor Tyulyakov aka g101k",
   "license": "MIT",
   "repository": {

package/scripts/generate-api.mjs

@@ -0,0 +1,163 @@
+#!/usr/bin/env node
+
+import fs from "node:fs";
+import path from "node:path";
+import {generateApi, generateTemplates} from "swagger-typescript-api";
+import {ArgumentParser} from 'argparse';
+
+const parser = new ArgumentParser({
+  description: 'Argparse example'
+});
+
+parser.add_argument('-o', '--output', {help: 'Output path'});
+parser.add_argument('-i', '--input', {help: 'Input swagger file path'});
+parser.add_argument('-t', '--templates', {help: 'Templates'});
+parser.add_argument('-d', '--data-contract-prefix', {help: 'Data Contract Prefix'});
+parser.add_argument('-c', '--use-common-client', {action: 'store_true', help: 'Use common http client'});
+
+let a = parser.parse_args();
+a.data_contract_prefix ??= "";
+
+console.log(a);
+/* NOTE: all fields are optional expect one of `input`, `url`, `spec` */
+
+let config = {
+  input: path.resolve(process.cwd(), a.input),
+  templates: path.resolve(process.cwd(), a.templates),
+  httpClientType: "fetch", // or "fetch"
+  defaultResponseAsSuccess: false,
+  generateClient: true,
+  useCommonClient: a.use_common_client,
+  generateRouteTypes: false,
+  generateResponses: true,
+  toJS: false,
+  extractRequestParams: true,
+  extractRequestBody: true,
+  extractEnums: true,
+  unwrapResponseData: true,
+  modular: true,
+  prettier: {
+    printWidth: 120,
+    tabWidth: 2,
+    trailingComma: "all",
+    parser: "typescript",
+  },
+  defaultResponseType: "void",
+  singleHttpClient: false,
+  cleanOutput: false,
+  enumNamesAsValues: false,
+  moduleNameFirstTag: true,
+  generateUnionEnums: false,
+  dataContractPrefix: a.data_contract_prefix,
+  typePrefix: "",
+  typeSuffix: "",
+  enumKeyPrefix: "",
+  enumKeySuffix: "",
+  addReadonly: false,
+  sortTypes: false,
+  sortRouters: false,
+  extractingOptions: {
+    requestBodySuffix: ["Payload", "Body", "Input"],
+    requestParamsSuffix: ["Params"],
+    responseBodySuffix: ["Data", "Result", "Output"],
+    responseErrorSuffix: [
+      "Error",
+      "Fail",
+      "Fails",
+      "ErrorData",
+      "HttpError",
+      "BadResponse",
+    ],
+  },
+  /** allow to generate extra files based with this extra templates, see more below */
+  extraTemplates: [],
+  anotherArrayType: false,
+  fixInvalidTypeNamePrefix: "Type",
+  fixInvalidEnumKeyPrefix: "Value",
+  codeGenConstructs: (constructs) => ({
+    ...constructs,
+    RecordType: (key, value) => `MyRecord<key, value>`,
+  }),
+  primitiveTypeConstructs: (constructs) => ({
+    ...constructs,
+    string: {
+      "date-time": "Date",
+    },
+  }),
+  hooks: {
+    onCreateComponent: (component) => {
+    },
+    onCreateRequestParams: (rawType) => {
+    },
+    onCreateRoute: (routeData) => {
+    },
+    onCreateRouteName: (routeNameInfo, rawRouteInfo) => {
+      if (routeNameInfo.usage.startsWith(rawRouteInfo.moduleName)) {
+        const str = routeNameInfo.usage.substring(rawRouteInfo.moduleName.length);
+        routeNameInfo.usage = str[0].toLowerCase() + str.slice(1);
+        routeNameInfo.original = routeNameInfo.usage;
+      }
+      return routeNameInfo;
+    },
+    onFormatRouteName: (routeInfo, templateRouteName) => {
+    },
+    onFormatTypeName: (typeName, rawTypeName, schemaType) => {
+    },
+    onInit: (configuration) => {
+    },
+    onPreParseSchema: (originalSchema, typeName, schemaType) => {
+    },
+    onParseSchema: (originalSchema, parsedSchema) => {
+    },
+    onPrepareConfig: (currentConfiguration) => {
+    },
+  },
+}
+const toKebabCase = (str) =>
+  str &&
+  str
+    .match(/[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+/g)
+    .map(x => x.toLowerCase())
+    .join('-');
+
+generateApi(config)
+  .then(async ({files, configuration}) => {
+    for (const f of files) {
+      if (f.fileContent) {
+        if (f.fileName === 'http-client')
+          continue;
+        let dir = path.join(process.cwd(), a.output);
+        if (!fs.existsSync(dir))
+          fs.mkdirSync(dir);
+
+        if (f.fileName === 'data-contracts') {
+          f.fileName = config.dataContractPrefix + f.fileName;
+        } else if (f.fileName.endsWith('http-client')) {
+          // do nothing
+        } else {
+          f.fileName = `${toKebabCase(f.fileName)}.api`;
+        }
+
+        const absolutePath = path.join(dir, `${f.fileName}${f.fileExtension}`);
+        fs.writeFile(absolutePath, f.fileContent, (err) => {
+          if (err) {
+            console.log(err);
+          } else {
+            console.log(`File create: ${f.fileName}${f.fileExtension}`);
+          }
+        });
+      }
+    }
+  })
+  .catch((e) => console.error(e));
+
+/*
+generateTemplates({
+  cleanOutput: false,
+  output: './output/',
+  httpClientType: "fetch",
+  modular: true,
+  silent: false,
+  rewrite: false,
+});
+*/

package/templates/api.ejs

@@ -8,14 +8,14 @@ const dataContracts = _.map(modelTypes, "name");
 
 <% if (config.httpClientType === config.constants.HTTP_CLIENT.AXIOS) { %> import type { AxiosRequestConfig, AxiosResponse } from "axios"; <% } %>
 
-import { HttpClient, RequestParams, ContentType, HttpResponse } from "./<%~ config.fileNames.httpClient %>";
+import { HttpClient, RequestParams, ContentType, HttpResponse } from "<%~ (config.useCommonClient) ? 'oip-common' : './' + config.fileNames.httpClient %>";
 <% if (dataContracts.length) { %>
-import { <%~ dataContracts.join(", ") %> } from "./<%~ config.fileNames.dataContracts %>"
+import { <%~ dataContracts.join(", ") %> } from "./<%~ config.dataContractPrefix + config.fileNames.dataContracts %>"
 <% } %>
 import { Injectable } from "@angular/core";
 
 @Injectable()
-export class <%= apiClassName %><SecurityDataType = unknown><% if (!config.singleHttpClient) { %> extends HttpClient<SecurityDataType> <% } %> {
+export class <%= apiClassName %>Api<SecurityDataType = unknown><% if (!config.singleHttpClient) { %> extends HttpClient<SecurityDataType> <% } %> {
 <% if(config.singleHttpClient) { %>
   http: HttpClient<SecurityDataType>;
 

package/templates/data-contract-jsdoc.ejs

@@ -1,27 +1,27 @@
 <%
 const { data, utils } = it;
-const { formatDescription, require, _ } = utils;
+const { formatDescription, escapeJSDocContent, require, _ } = utils;
 
-const stringify = (value) => _.isObject(value) ? JSON.stringify(value) : _.isString(value) ? `"${value}"` : value
+const stringify = (value) => _.isObject(value) ? JSON.stringify(value) : _.isString(value) ? `"${value}"` : value;
 
 const jsDocLines = _.compact([
-    data.title,
+    data.title && formatDescription(data.title),
     data.description && formatDescription(data.description),
     !_.isUndefined(data.deprecated) && data.deprecated && '@deprecated',
-    !_.isUndefined(data.format) && `@format ${data.format}`,
-    !_.isUndefined(data.minimum) && `@min ${data.minimum}`,
-    !_.isUndefined(data.multipleOf) && `@multipleOf ${data.multipleOf}`,
-    !_.isUndefined(data.exclusiveMinimum) && `@exclusiveMin ${data.exclusiveMinimum}`,
-    !_.isUndefined(data.maximum) && `@max ${data.maximum}`,
-    !_.isUndefined(data.minLength) && `@minLength ${data.minLength}`,
-    !_.isUndefined(data.maxLength) && `@maxLength ${data.maxLength}`,
-    !_.isUndefined(data.exclusiveMaximum) && `@exclusiveMax ${data.exclusiveMaximum}`,
-    !_.isUndefined(data.maxItems) && `@maxItems ${data.maxItems}`,
-    !_.isUndefined(data.minItems) && `@minItems ${data.minItems}`,
-    !_.isUndefined(data.uniqueItems) && `@uniqueItems ${data.uniqueItems}`,
-    !_.isUndefined(data.default) && `@default ${stringify(data.default)}`,
-    !_.isUndefined(data.pattern) && `@pattern ${data.pattern}`,
-    !_.isUndefined(data.example) && `@example ${stringify(data.example)}`
+    !_.isUndefined(data.format) && `@format ${escapeJSDocContent(data.format)}`,
+    !_.isUndefined(data.minimum) && `@min ${escapeJSDocContent(data.minimum)}`,
+    !_.isUndefined(data.multipleOf) && `@multipleOf ${escapeJSDocContent(data.multipleOf)}`,
+    !_.isUndefined(data.exclusiveMinimum) && `@exclusiveMin ${escapeJSDocContent(data.exclusiveMinimum)}`,
+    !_.isUndefined(data.maximum) && `@max ${escapeJSDocContent(data.maximum)}`,
+    !_.isUndefined(data.minLength) && `@minLength ${escapeJSDocContent(data.minLength)}`,
+    !_.isUndefined(data.maxLength) && `@maxLength ${escapeJSDocContent(data.maxLength)}`,
+    !_.isUndefined(data.exclusiveMaximum) && `@exclusiveMax ${escapeJSDocContent(data.exclusiveMaximum)}`,
+    !_.isUndefined(data.maxItems) && `@maxItems ${escapeJSDocContent(data.maxItems)}`,
+    !_.isUndefined(data.minItems) && `@minItems ${escapeJSDocContent(data.minItems)}`,
+    !_.isUndefined(data.uniqueItems) && `@uniqueItems ${escapeJSDocContent(data.uniqueItems)}`,
+    !_.isUndefined(data.default) && `@default ${escapeJSDocContent(stringify(data.default))}`,
+    !_.isUndefined(data.pattern) && `@pattern ${escapeJSDocContent(data.pattern)}`,
+    !_.isUndefined(data.example) && `@example ${escapeJSDocContent(stringify(data.example))}`
 ]).join('\n').split('\n');
 %>
 <% if (jsDocLines.every(_.isEmpty)) { %>

package/templates/data-contracts.ejs

@@ -20,7 +20,7 @@ const dataContractTemplates = {
     return `enum ${contract.name} {\r\n${contract.content} \r\n }`;
   },
   interface: (contract) => {
-    return `interface ${contract.name}${buildGenerics(contract)} {\r\n${contract.content}}\r\n\r\n`;
+    return `interface ${contract.name}${buildGenerics(contract)} {\r\n${contract.content}}`;
   },
   type: (contract) => {
     return `type ${contract.name}${buildGenerics(contract)} = ${contract.content}`;
@@ -32,21 +32,9 @@ const dataContractTemplates = {
 type <%~ config.Ts.CodeGenKeyword.UtilRequiredKeys %><T, K extends keyof T> = Omit<T, K> & Required<Pick<T, K>>
 <% } %>
 
-<% for (const contract of modelTypes) {
-  if (contract.typeIdentifier === 'interface' && contract.rawContent && Array.isArray(contract.rawContent)) {
-    contract.rawContent.forEach((prop) => {
-      if (prop.format ==='date-time') {
-        prop.field = prop.field.replace(': string', ': Date');
-      }
-    })
-      let customContent = '';
-      contract.rawContent.forEach((prop) => {
-          if (prop.description) customContent += `/** ${prop.description} */ \r\n`;
-          customContent += `${prop.field};\r\n`;
-      })
-      contract.content = customContent;
-  }
-%>
+<% for (const contract of modelTypes) { %>
   <%~ includeFile('./data-contract-jsdoc.ejs', { ...it, data: { ...contract, ...contract.typeData } }) %>
   <%~ contract.internal ? '' : 'export'%> <%~ (dataContractTemplates[contract.typeIdentifier] || dataContractTemplates.type)(contract) %>
+
+
 <% } %>

package/templates/enum-data-contract.ejs

@@ -7,6 +7,12 @@ const { name, $content } = contract;
   export type <%~ name %> = <%~ _.map($content, ({ value }) => value).join(" | ") %>
 <% } else { %>
   export enum <%~ name %> {
-    <%~ _.map($content, ({ key, value }) => `${key} = ${value}`).join(",\n") %>
+    <%~ _.map($content, ({ key, value, description }) => {
+      let formattedDescription = description && formatDescription(description, true);
+      return [
+        formattedDescription && `/** ${formattedDescription} */`,
+        `${key} = ${value}`
+      ].filter(Boolean).join("\n");
+    }).join(",\n") %>
   }
 <% } %>