@dereekb/util 7.15.1 → 7.15.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/CHANGELOG.md +9 -0
  2. package/package.json +1 -1
  3. package/src/lib/model/model.conversion.js +9 -3
  4. package/src/lib/model/model.conversion.js.map +1 -1
  5. package/test/CHANGELOG.md +4 -0
  6. package/test/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -2,6 +2,15 @@
2
2
 
3
3
  This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
4
4
 
5
+ ## [7.15.2](https://github.com/dereekb/dbx-components/compare/v7.15.1-dev...v7.15.2) (2022-06-17)
6
+
7
+
8
+ ### Bug Fixes
9
+
10
+ * fixed model conversions ([18ac25f](https://github.com/dereekb/dbx-components/commit/18ac25f8389d77fc724ea12eb9a3352eb72a9501))
11
+
12
+
13
+
5
14
  ## [7.15.1](https://github.com/dereekb/dbx-components/compare/v7.15.0-dev...v7.15.1) (2022-06-16)
6
15
 
7
16
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dereekb/util",
3
- "version": "7.15.1",
3
+ "version": "7.15.2",
4
4
  "type": "commonjs",
5
5
  "exports": {
6
6
  ".": {
package/src/lib/model/model.conversion.js CHANGED
@@ -62,20 +62,26 @@ function modelFieldMapFunction(config) {
62
62
  const convertMaybe = config.convertMaybe;
63
63
  const defaultOutput = config.default;
64
64
  const defaultInput = config.defaultInput;
65
+ const hasDefaultInput = defaultInput != null;
65
66
  const getDefaultOutput = (0, getter_1.asGetter)(defaultOutput);
66
67
  const getDefaultInput = (0, getter_1.asGetter)(defaultInput);
67
68
  return (input) => {
69
+ let result;
68
70
  if ((0, maybe_1.isMaybeSo)(input)) {
69
- return convert(input);
71
+ result = convert(input);
70
72
  }
71
73
  else {
72
74
  if (convertMaybe) {
73
- return convertMaybe(input !== null && input !== void 0 ? input : getDefaultInput());
75
+ result = convertMaybe(input !== null && input !== void 0 ? input : getDefaultInput());
76
+ }
77
+ else if (hasDefaultInput) {
78
+ result = convert(getDefaultInput());
74
79
  }
75
80
  else {
76
- return getDefaultOutput();
81
+ result = getDefaultOutput();
77
82
  }
78
83
  }
84
+ return result;
79
85
  };
80
86
  }
81
87
  exports.modelFieldMapFunction = modelFieldMapFunction;
package/src/lib/model/model.conversion.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"model.conversion.js","sourceRoot":"","sources":["../../../../../../packages/util/src/lib/model/model.conversion.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"model.conversion.js","sourceRoot":"","sources":["../../../../../../packages/util/src/lib/model/model.conversion.ts"],"names":[],"mappings":"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"}
package/test/CHANGELOG.md CHANGED
@@ -2,6 +2,10 @@
2
2
 
3
3
  This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
4
4
 
5
+ ## [7.15.2](https://github.com/dereekb/dbx-components/compare/v7.15.1-dev...v7.15.2) (2022-06-17)
6
+
7
+
8
+
5
9
  ## [7.15.1](https://github.com/dereekb/dbx-components/compare/v7.15.0-dev...v7.15.1) (2022-06-16)
6
10
 
7
11
 
package/test/package.json CHANGED
@@ -1,11 +1,11 @@
1
1
  {
2
2
  "name": "@dereekb/util/test",
3
- "version": "7.15.1",
3
+ "version": "7.15.2",
4
4
  "main": "./src/index.js",
5
5
  "typings": "./src/index.d.ts",
6
6
  "dependencies": {},
7
7
  "peerDependencies": {
8
- "@dereekb/util": "7.15.1",
8
+ "@dereekb/util": "7.15.2",
9
9
  "make-error": "^1.3.0",
10
10
  "ts-essentials": "^9.1.2",
11
11
  "extra-set": "^2.2.11",