tst-defaults
Advanced tools
Comparing version 1.3.0 to 1.3.1
@@ -18,3 +18,2 @@ "use strict"; | ||
let t = type ? type : (__genericParams__ && __genericParams__.T); | ||
t = resolveType(t); | ||
let d = defaultValue; | ||
@@ -39,3 +38,2 @@ if (Array.isArray(d)) { | ||
let t = type ? type : (__genericParams__ && __genericParams__.T); | ||
t = resolveType(t); | ||
usingTypes.delete(t); | ||
@@ -54,3 +52,3 @@ } | ||
delete arguments[arguments.length]; | ||
let t = type ? resolveType(type) : resolveType((__genericParams__ && __genericParams__.T)); | ||
let t = type ? type : (__genericParams__ && __genericParams__.T); | ||
let v = value; | ||
@@ -73,3 +71,3 @@ if (v === undefined) { | ||
if (!prop.optional) { | ||
let propType = resolveType(prop.type); | ||
let propType = prop.type; | ||
if (v[prop.name] === undefined || propType.isObjectLike() || propType.isArray()) { | ||
@@ -85,20 +83,2 @@ v[prop.name] = mergeDefaults(v[prop.name], propType, { T: _ßr.Type.store.wrap({ n: "any", k: 2 }) }); | ||
/** | ||
* Check if type if bug-like type of ts-reflect | ||
* And if it is, gets real type | ||
* @param type | ||
* @returns | ||
*/ | ||
const resolveType = (type) => { | ||
if (type instanceof Function) { | ||
let t = type(); | ||
if (!(t instanceof tst_reflect_1.Type)) { | ||
throw new Error("Type is not a reflected Type"); | ||
} | ||
return t; | ||
} | ||
else { | ||
return type; | ||
} | ||
}; | ||
/** | ||
* Returns default value for specified type <T> | ||
@@ -119,3 +99,2 @@ * Predefined values: | ||
let t = type ? type : (__genericParams__ && __genericParams__.T); | ||
t = resolveType(t); | ||
if (usingTypes.has(t)) { | ||
@@ -122,0 +101,0 @@ const defaultValue = usingTypes.get(t); |
{ | ||
"name": "tst-defaults", | ||
"version": "1.3.0", | ||
"version": "1.3.1", | ||
"description": "Get default values by Typescript type reflection", | ||
@@ -22,3 +22,3 @@ "main": "dist/index.js", | ||
"dependencies": { | ||
"tst-reflect": "0.7.4" | ||
"tst-reflect": "0.7.6" | ||
}, | ||
@@ -25,0 +25,0 @@ "devDependencies": { |
Sorry, the diff of this file is not supported yet
15050
190
+ Addedtst-reflect@0.7.6(transitive)
- Removedtst-reflect@0.7.4(transitive)
Updatedtst-reflect@0.7.6