f.spilla/typeorm-model-generator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove duplicated type definition

Browse Source
This commit is contained in:
Kononnable 2020-02-29 18:51:40 +01:00
parent be9d8925bf
commit a8ef75f765
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ModelCustomization.ts
View File

@ -5,20 +5,12 @@ import IGenerationOptions from "./IGenerationOptions";
import * as NamingStrategy from "./NamingStrategy";
import * as TomgUtils from "./Utils";
type NamingStrategy = {
enablePluralization: typeof NamingStrategy.enablePluralization;
relationIdName: typeof NamingStrategy.relationIdName;
relationName: typeof NamingStrategy.relationName;
columnName: typeof NamingStrategy.columnName;
entityName: typeof NamingStrategy.entityName;
};
export default function modelCustomizationPhase(
dbModel: Entity[],
generationOptions: IGenerationOptions,
defaultValues: DataTypeDefaults
): Entity[] {
const namingStrategy: NamingStrategy = {
const namingStrategy: typeof NamingStrategy = {
enablePluralization: NamingStrategy.enablePluralization,
columnName: NamingStrategy.columnName,
entityName: NamingStrategy.entityName,
@ -32,7 +24,7 @@ export default function modelCustomizationPhase(
// TODO: change form of logging
const req = TomgUtils.requireLocalFile(
generationOptions.customNamingStrategyPath
) as Partial<NamingStrategy>;
) as Partial<typeof NamingStrategy>;
if (req.columnName) {
console.log(
`[${new Date().toLocaleTimeString()}] Using custom naming strategy for column names.`
@ -235,7 +227,7 @@ function addImportsAndGenerationOptions(
}
function applyNamingStrategy(
namingStrategy: NamingStrategy,
namingStrategy: typeof NamingStrategy,
dbModel: Entity[]
): Entity[] {
let retVal = changeRelationNames(dbModel);