Skip to content

Commit

Permalink
Merge pull request #6 from smartive/greenkeeper/@smartive/tslint-conf…
Browse files Browse the repository at this point in the history
…ig-4.0.0

Update @smartive/tslint-config to the latest version 🚀
  • Loading branch information
mfeltscher authored Jul 10, 2018
2 parents 93234c6 + d6bd0ab commit 9ed1930
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"homepage": "https://github.com/smartive/es-model#readme",
"dependencies": {},
"devDependencies": {
"@smartive/tslint-config": "^3.0.1",
"@smartive/tslint-config": "^4.0.0",
"@types/jest": "^23.0.0",
"del-cli": "^1.1.0",
"jest": "^22.4.3",
Expand Down
6 changes: 3 additions & 3 deletions src/utils/template.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function buildMapping(type: Function): { name: string | undefined, mapping: EsIn
mapping._source = meta._source;
mapping.dynamic = meta.dynamic;
}

const properties = getMetadata<Fields>(type, 'properties');
if (properties) {
mapping.properties = buildFields(properties, type);
Expand Down Expand Up @@ -94,12 +94,12 @@ function buildField(field: Field, name: string, type: Function): EsIndexTemplate
res.type = 'object';

const prototype = field.type.prototype;

const fieldTypeMeta = getMetadata<SubMappingMeta>(prototype);
if (fieldTypeMeta) {
res = { ...res, ...fieldTypeMeta };
}

const properties = getMetadata<Fields>(prototype, 'properties');
if (properties) {
res.properties = buildFields(properties, prototype);
Expand Down

0 comments on commit 9ed1930

Please sign in to comment.