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

more tests passing

Browse Source
This commit is contained in:
Kononnable 2019-10-06 16:21:12 +02:00
parent 113e2ff3bf
commit e86a26d279
11 changed files with 118 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/Engine.ts
View File

@ -53,11 +53,11 @@ export async function createModelFromDatabase(
);
return;
}
// dbModel = modelCustomizationPhase(
// dbModel,
// generationOptions,
// driver.defaultValues
// );
dbModel = modelCustomizationPhase(
dbModel,
generationOptions,
driver.defaultValues
);
// const dbModel: Entity = {
// sqlName: "sqlName",
// tscName: "typescriptName",
@ -128,7 +128,7 @@ export async function dataCollectionPhase(
}
export function modelCustomizationPhase(
dbModel: EntityInfo[],
dbModel: Entity[],
generationOptions: IGenerationOptions,
defaultValues: DataTypeDefaults
) {
@ -144,9 +144,10 @@ export function modelCustomizationPhase(
namingStrategy = new NamingStrategy();
}
let retVal = setRelationId(generationOptions, dbModel);
retVal = applyNamingStrategy(namingStrategy, retVal);
retVal = addImportsAndGenerationOptions(retVal, generationOptions);
retVal = removeColumnDefaultProperties(retVal, defaultValues);
// TODO:
// retVal = applyNamingStrategy(namingStrategy, retVal);
// retVal = addImportsAndGenerationOptions(retVal, generationOptions);
// retVal = removeColumnDefaultProperties(retVal, defaultValues);
return retVal;
}
function removeColumnDefaultProperties(
@ -216,19 +217,17 @@ function addImportsAndGenerationOptions(
return dbModel;
}
function setRelationId(
generationOptions: IGenerationOptions,
model: EntityInfo[]
) {
if (generationOptions.relationIds) {
model.forEach(ent => {
ent.Columns.forEach(col => {
col.relations.forEach(rel => {
rel.relationIdField = rel.isOwner;
});
});
});
}
function setRelationId(generationOptions: IGenerationOptions, model: Entity[]) {
// TODO:
// if (generationOptions.relationIds) {
// model.forEach(ent => {
// ent.columns.forEach(col => {
// col.relations.forEach(rel => {
// rel.relationIdField = rel.isOwner;
// });
// });
// });
// }
return model;
}
export function modelGenerationPhase(
@ -310,6 +309,13 @@ function createHandlebarsHelpers(generationOptions: IGenerationOptions) {
Handlebars.registerHelper("concat", (stra, strb) => {
return stra + strb;
});
Handlebars.registerHelper("toFileImports", (set: Set<any>) => {
return [...set].reduce(
(pv, cv) =>
`${pv}import { {{toEntityName ${cv}}} } from './{{toFileName ${cv}}};`,
""
);
});
Handlebars.registerHelper("toFileName", str => {
let retStr = "";
switch (generationOptions.convertCaseFile) {

67
src/drivers/AbstractDriver.ts
View File

@ -160,35 +160,49 @@ export default abstract class AbstractDriver {
}
public async GetDataFromServer(
connectionOptons: IConnectionOptions
connectionOptions: IConnectionOptions
): Promise<Entity[]> {
let dbModel = [] as Entity[];
await this.ConnectToServer(connectionOptons);
await this.ConnectToServer(connectionOptions);
const sqlEscapedSchema = AbstractDriver.escapeCommaSeparatedList(
connectionOptons.schemaName
connectionOptions.schemaName
);
dbModel = await this.GetAllTables(
sqlEscapedSchema,
connectionOptons.databaseName
connectionOptions.databaseName
);
await this.GetCoulmnsFromEntity(
dbModel,
sqlEscapedSchema,
connectionOptons.databaseName
connectionOptions.databaseName
);
await this.GetIndexesFromEntity(
dbModel,
sqlEscapedSchema,
connectionOptons.databaseName
connectionOptions.databaseName
);
AbstractDriver.FindPrimaryColumnsFromIndexes(dbModel);
dbModel = await this.GetRelations(
dbModel,
sqlEscapedSchema,
connectionOptons.databaseName
connectionOptions.databaseName
);
await this.DisconnectFromServer();
// dbModel = AbstractDriver.FindManyToManyRelations(dbModel);
AbstractDriver.FindPrimaryColumnsFromIndexes(dbModel);
dbModel = AbstractDriver.FindFileImports(dbModel);
return dbModel;
}
private static FindFileImports(dbModel: Entity[]) {
dbModel.forEach(entity => {
entity.relations.forEach(relation => {
if (
!entity.fileImports.some(v => v === relation.relatedTable)
) {
entity.fileImports.push(relation.relatedTable);
}
});
});
return dbModel;
}
@ -208,7 +222,8 @@ export default abstract class AbstractDriver {
sqlName: val.TABLE_NAME,
tscName: val.TABLE_NAME,
database: dbNames.includes(",") ? val.DB_NAME : "",
schema: val.TABLE_SCHEMA
schema: val.TABLE_SCHEMA,
fileImports: []
});
});
return ret;
@ -304,11 +319,35 @@ export default abstract class AbstractDriver {
);
isOneToMany = !index;
const ownerRelation: Relation = {
fieldName: AbstractDriver.findNameForNewField(
if (true) {
// TODO: RelationId
ownerEntity.columns = ownerEntity.columns.filter(
v =>
!relationTmp.ownerColumns.some(
u => u === v.tscName
) || v.primary
);
relationTmp.relatedTable.columns = relationTmp.relatedTable.columns.filter(
v =>
!relationTmp.relatedColumns.some(
u => u === v.tscName
) || v.primary
);
}
let fieldName = "";
if (relationTmp.ownerColumns.length === 1) {
fieldName = AbstractDriver.findNameForNewField(
ownerColumn.tscName,
ownerEntity
);
} else {
fieldName = AbstractDriver.findNameForNewField(
relationTmp.relatedTable.tscName,
ownerEntity
),
);
}
const ownerRelation: Relation = {
fieldName,
joinColumnOptions: relationTmp.ownerColumns.map(
(v, idx) => {
const retVal: JoinColumnOptions = {
@ -334,7 +373,7 @@ export default abstract class AbstractDriver {
fieldName: ownerRelation.relatedField,
relatedField: ownerRelation.fieldName,
relatedTable: relationTmp.ownerTable.tscName,
relationOptions: ownerRelation.relationOptions,
// relationOptions: ownerRelation.relationOptions,
relationType: isOneToMany ? "ManyToOne" : "OneToOne"
};
@ -350,7 +389,7 @@ export default abstract class AbstractDriver {
const validNameCondition =
entity.columns.every(v => v.tscName !== fieldName) &&
entity.relations.every(v => v.fieldName !== fieldName);
if (validNameCondition) {
if (!validNameCondition) {
fieldName += "_";
for (
let i = 2;

1
src/drivers/MysqlDriver.ts
View File

@ -380,6 +380,7 @@ export default class MysqlDriver extends AbstractDriver {
internal.ownerColumns.push(row.ForeignKeyColumn);
internal.relatedColumns.push(row.ForeignKeyColumnReferenced);
});
relationsTemp.push(internal);
});
const retVal = MysqlDriver.GetRelationsFromRelationTempInfo(

3
src/drivers/SqliteDriver.ts
View File

@ -45,7 +45,8 @@ export default class SqliteDriver extends AbstractDriver {
indices: [],
relations: [],
sqlName: val.tbl_name,
tscName: val.tbl_name
tscName: val.tbl_name,
fileImports: []
});
});
return ret;

14
src/entity.mst
View File

@ -1,20 +1,25 @@
{{#*inline "Index"}}
@Index("{{name}}",[{{#columns}}"{{.}}",{{/columns~}}],{ {{json options}} })
{{/inline}}
{{#*inline "Import"}}
import { {{toEntityName .}} } from './{{toFileName .}}'
{{/inline}}
{{#*inline "Column"}}
{{#generated}}@PrimaryGeneratedColumn({ type:"{{type}}", {{/generated}}{{^generated}}@Column("{{type}}",{ {{#primary}}primary:{{primary}},{{/primary}}{{/generated}}{{json options}}{{#default}},default: {{.}},{{/default}} })
{{tscName}}:{{tscType}};
{{toPropertyName tscName}}:{{tscType}};
{{/inline}}
{{#*inline "Relation"}}
@{{relationType}}(()=>{{relatedTable}},{{relatedTable}}=>{{relatedTable}}.{{relatedField}},{ {{json relationOptions}} })
{{fieldName}}:{{relatedTable}};
@{{relationType}}(()=>{{toEntityName relatedTable}},{{toEntityName relatedTable}}=>{{toEntityName relatedTable}}.{{toPropertyName relatedField}}{{#if (or joinColumnOptions joinTableOptions)}},{ {{json relationOptions}} }{{/if}})
{{#if joinColumnOptions}}@JoinColumn({{json joinColumnOptions}}){{/if}}
{{#if joinTableOptions}}@JoinTable{{json joinTableOptions}}){{/if}}
{{toPropertyName fieldName}}:{{toEntityName relatedTable}};
{{/inline}}
{{#*inline "Entity"}}
{{#indices}}{{> Index}}{{/indices~}}
@Entity("{{sqlName}}",{schema:"{{schema}}",database:"{{database}}"})
export class {{tscName}} {
export class {{toEntityName tscName}} {
{{#columns}}{{> Column}}{{/columns~}}
{{#relations}}{{> Relation}}{{/relations~}}
@ -22,6 +27,7 @@ export class {{tscName}} {
{{/inline}}
import {BaseEntity,Column,Entity,Index,JoinColumn,JoinTable,ManyToMany,ManyToOne,OneToMany,OneToOne,PrimaryColumn,PrimaryGeneratedColumn,RelationId} from "typeorm";
{{#fileImports}}{{> Import}}{{/fileImports~}}
{{~> Entity}}

1
src/models/Entity.ts
View File

@ -12,4 +12,5 @@ export type Entity = {
columns: Column[];
relations: Relation[];
indices: Index[];
fileImports: string[];
};

2
src/models/Relation.ts
View File

@ -6,7 +6,7 @@ export type Relation = {
relatedTable: string;
relatedField: string;
fieldName: string;
relationOptions: RelationOptions;
relationOptions?: RelationOptions;
joinColumnOptions?: JoinColumnOptions[];
joinTableOptions?: JoinTableMultipleColumnsOptions;
};

13
test/integration/examples/sample1-simple-entity/entity/Post.ts
View File

@ -1,8 +1,13 @@
import { Column, Entity, PrimaryGeneratedColumn, Index, Generated } from "typeorm";
import {
Column,
Entity,
PrimaryGeneratedColumn,
Index,
Generated
} from "typeorm";
@Entity("Post")
export class Post {
@PrimaryGeneratedColumn()
id: number;
@ -13,8 +18,8 @@ export class Post {
text: string;
@Column("int", {
nullable: false
// Columns are non-nullable by default
// nullable: false
})
likesCount: number;
}

22
test/integration/runTestsFromPath.test.ts
View File

@ -106,12 +106,11 @@ function runTestForMultipleDrivers(
);
break;
}
// TODO: Remove
// dbModel = modelCustomizationPhase(
// dbModel,
// generationOptions,
// driver.defaultValues
// );
dbModel = modelCustomizationPhase(
dbModel,
generationOptions,
driver.defaultValues
);
modelGenerationPhase(connectionOptions, generationOptions, dbModel);
const filesGenPath = path.resolve(resultsPath, "entities");
compareGeneratedFiles(filesOrgPathTS, filesGenPath);
@ -163,12 +162,11 @@ async function runTest(
filesOrgPathTS
} = await prepareTestRuns(testPartialPath, dbDriver, dbDriver);
let dbModel = await dataCollectionPhase(driver, connectionOptions);
// TODO: Remove
// dbModel = modelCustomizationPhase(
// dbModel,
// generationOptions,
// driver.defaultValues
// );
dbModel = modelCustomizationPhase(
dbModel,
generationOptions,
driver.defaultValues
);
modelGenerationPhase(connectionOptions, generationOptions, dbModel);
const filesGenPath = path.resolve(resultsPath, "entities");
compareGeneratedFiles(filesOrgPathTS, filesGenPath);

2
test/utils/EntityFileToJson.ts
View File

@ -173,7 +173,7 @@ export default class EntityFileToJson {
decoratorParameters.indexOf('"') + 1,
decoratorParameters
.substr(decoratorParameters.indexOf('"') + 1)
.indexOf('"')
.indexOf('"') + 1
);
}
if (containsTables) {

4
test/utils/GeneralTestUtils.ts
View File

@ -15,9 +15,9 @@ export function getGenerationOptions(resultsPath: string): IGenerationOptions {
return {
resultsPath,
noConfigs: false,
convertCaseEntity: "none",
convertCaseEntity: "none", // TODO: Change to lib defaults
convertCaseFile: "none",
convertCaseProperty: "none",
convertCaseProperty: "camel",
propertyVisibility: "none",
lazy: false,
generateConstructor: false,