@openchemistry/utils
Advanced tools
Comparing version 0.6.3 to 0.6.4
@@ -6,2 +6,10 @@ # Change Log | ||
## [0.6.4](https://github.com/OpenChemistry/oc-web-components/compare/@openchemistry/utils@0.6.3...@openchemistry/utils@0.6.4) (2018-12-13) | ||
**Note:** Version bump only for package @openchemistry/utils | ||
## [0.6.3](https://github.com/OpenChemistry/oc-web-components/compare/@openchemistry/utils@0.6.2...@openchemistry/utils@0.6.3) (2018-11-26) | ||
@@ -8,0 +16,0 @@ |
@@ -14,3 +14,3 @@ var __assign = (this && this.__assign) || function () { | ||
export { composeDisplayOptions, composeStyleOptions, composeNormalModeOptions, composeIsoSurfaces, composeVolumeOptions, composeVisibilityOptions }; | ||
import { isUndefined } from "lodash-es"; | ||
import { isUndefined, merge } from "lodash-es"; | ||
var defaultIsoSurfaces = [ | ||
@@ -78,3 +78,3 @@ { | ||
} | ||
return __assign({}, defaultNormalModeOptions, normalModeOptions); | ||
return merge(__assign({}, defaultNormalModeOptions), normalModeOptions); | ||
} | ||
@@ -85,3 +85,3 @@ function composeStyleOptions(styleOptions) { | ||
} | ||
return __assign({}, defaultStyleOptions, styleOptions); | ||
return merge(__assign({}, defaultStyleOptions), styleOptions); | ||
} | ||
@@ -92,3 +92,3 @@ function composeVolumeOptions(volumeOptions) { | ||
} | ||
return __assign({}, defaultVolumeOptions, volumeOptions); | ||
return merge(__assign({}, defaultVolumeOptions), volumeOptions); | ||
} | ||
@@ -100,3 +100,3 @@ function composeVisibilityOptions(visibilityOptions) { | ||
else { | ||
return __assign({}, defaultVisibilityOptions, visibilityOptions); | ||
return merge(__assign({}, defaultVisibilityOptions), visibilityOptions); | ||
} | ||
@@ -103,0 +103,0 @@ } |
{ | ||
"name": "@openchemistry/utils", | ||
"version": "0.6.3", | ||
"version": "0.6.4", | ||
"description": "Utilities to validate and convert cjson chemical data", | ||
@@ -25,3 +25,3 @@ "main": "dist/index.js", | ||
"devDependencies": { | ||
"@openchemistry/types": "^0.8.3", | ||
"@openchemistry/types": "^0.8.4", | ||
"@types/lodash-es": "^4.17.1", | ||
@@ -33,3 +33,3 @@ "typescript": "^3.1.6" | ||
}, | ||
"gitHead": "39a7bc55550493e3fc91cf7b0ce88ca21ad56fee" | ||
"gitHead": "bc6f3c1bc64862e6bc6d373910df6d0c8d0ccede" | ||
} |
@@ -6,3 +6,3 @@ import { IDisplayOptions, IIsoSurfaceOptions, IStyleOptions, INormalModeOptions, IVolumeOptions, IVisibilityOptions } from '@openchemistry/types'; | ||
import { isUndefined } from "lodash-es"; | ||
import { isUndefined, merge } from "lodash-es"; | ||
@@ -78,3 +78,3 @@ const defaultIsoSurfaces : IIsoSurfaceOptions[] = [ | ||
} | ||
return { ...defaultNormalModeOptions, ...normalModeOptions }; | ||
return merge({...defaultNormalModeOptions}, normalModeOptions); | ||
} | ||
@@ -86,3 +86,3 @@ | ||
} | ||
return { ...defaultStyleOptions, ...styleOptions }; | ||
return merge({...defaultStyleOptions}, styleOptions); | ||
} | ||
@@ -94,3 +94,3 @@ | ||
} | ||
return { ...defaultVolumeOptions, ...volumeOptions }; | ||
return merge({...defaultVolumeOptions}, volumeOptions); | ||
} | ||
@@ -102,3 +102,3 @@ | ||
} else { | ||
return { ...defaultVisibilityOptions, ...visibilityOptions}; | ||
return merge({...defaultVisibilityOptions}, visibilityOptions); | ||
} | ||
@@ -105,0 +105,0 @@ } |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
43384