@esportsplus/reactivity 0.0.12 → 0.0.14

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.
@@ -1,15 +1,18 @@
1
1
  import Reactive from '../reactive';
2
- function factory(value) {
2
+ function factory(value, wrap = false) {
3
3
  if (typeof value === 'function') {
4
- return fn(value);
4
+ return fn(value, wrap);
5
5
  }
6
6
  if (typeof value === 'object' && value !== null && (value.constructor === Object)) {
7
7
  return obj(value);
8
8
  }
9
9
  return new Reactive(value);
10
10
  }
11
- function fn(value) {
11
+ function fn(value, wrap) {
12
12
  let fn = new Reactive(value);
13
+ if (!wrap) {
14
+ return fn;
15
+ }
13
16
  return (...args) => {
14
17
  let value = fn.get();
15
18
  if (args.length && typeof value === 'function') {
@@ -47,4 +50,4 @@ function obj(values) {
47
50
  return Object.defineProperties({}, properties);
48
51
  }
49
52
  ;
50
- export default (value) => factory(value);
53
+ export default (value) => factory(value, true);
package/package.json CHANGED
@@ -15,5 +15,5 @@
15
15
  "prepublishOnly": "npm run build"
16
16
  },
17
17
  "types": "./build/index.d.ts",
18
- "version": "0.0.12"
18
+ "version": "0.0.14"
19
19
  }
@@ -2,9 +2,9 @@ import { Infer } from '~/types';
2
2
  import Reactive from '~/reactive';
3
3
 
4
4
 
5
- function factory<T>(value: T) {
5
+ function factory<T>(value: T, wrap = false) {
6
6
  if (typeof value === 'function') {
7
- return fn(value);
7
+ return fn(value, wrap);
8
8
  }
9
9
 
10
10
  if (typeof value === 'object' && value !== null && (value.constructor === Object)) {
@@ -14,9 +14,15 @@ function factory<T>(value: T) {
14
14
  return new Reactive(value) as T;
15
15
  }
16
16
 
17
- function fn<T>(value: T) {
17
+ function fn<T>(value: T, wrap: boolean) {
18
18
  let fn = new Reactive(value);
19
19
 
20
+ // We're inside an object, it will unwrap reactive values
21
+ if (!wrap) {
22
+ return fn;
23
+ }
24
+
25
+ // Factory functions are wrapped to remove '.get' usage
20
26
  return (...args: any[]) => {
21
27
  let value = fn.get();
22
28
 
@@ -67,4 +73,4 @@ function obj<T>(values: T) {
67
73
  };
68
74
 
69
75
 
70
- export default <T>(value: T) => factory(value) as Infer<T>;
76
+ export default <T>(value: T) => factory(value, true) as Infer<T>;