@esportsplus/reactivity 0.1.17 → 0.1.19

package/build/constants.js

@@ -1,9 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SIGNAL = exports.ROOT = exports.EFFECT = exports.DISPOSED = exports.DIRTY = exports.COMPUTED = exports.CLEAN = exports.CHECK = void 0;
 const CLEAN = 0;
+exports.CLEAN = CLEAN;
 const CHECK = 1;
+exports.CHECK = CHECK;
 const DIRTY = 2;
+exports.DIRTY = DIRTY;
 const DISPOSED = 3;
+exports.DISPOSED = DISPOSED;
 const COMPUTED = 0;
+exports.COMPUTED = COMPUTED;
 const EFFECT = 1;
+exports.EFFECT = EFFECT;
 const ROOT = 2;
+exports.ROOT = ROOT;
 const SIGNAL = 3;
-export { CHECK, CLEAN, COMPUTED, DIRTY, DISPOSED, EFFECT, ROOT, SIGNAL };
+exports.SIGNAL = SIGNAL;

package/build/index.d.ts

@@ -2,4 +2,5 @@ export { default as macro } from './macro';
 export { default as resource } from './resource';
 export { default as reactive } from './reactive';
 export { computed, dispose, effect, root, signal } from './signal';
+export * from './constants';
 export * from './types';

package/build/index.js

@@ -1,5 +1,34 @@
-export { default as macro } from './macro';
-export { default as resource } from './resource';
-export { default as reactive } from './reactive';
-export { computed, dispose, effect, root, signal } from './signal';
-export * from './types';
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.signal = exports.root = exports.effect = exports.dispose = exports.computed = exports.reactive = exports.resource = exports.macro = void 0;
+var macro_1 = require("./macro");
+Object.defineProperty(exports, "macro", { enumerable: true, get: function () { return __importDefault(macro_1).default; } });
+var resource_1 = require("./resource");
+Object.defineProperty(exports, "resource", { enumerable: true, get: function () { return __importDefault(resource_1).default; } });
+var reactive_1 = require("./reactive");
+Object.defineProperty(exports, "reactive", { enumerable: true, get: function () { return __importDefault(reactive_1).default; } });
+var signal_1 = require("./signal");
+Object.defineProperty(exports, "computed", { enumerable: true, get: function () { return signal_1.computed; } });
+Object.defineProperty(exports, "dispose", { enumerable: true, get: function () { return signal_1.dispose; } });
+Object.defineProperty(exports, "effect", { enumerable: true, get: function () { return signal_1.effect; } });
+Object.defineProperty(exports, "root", { enumerable: true, get: function () { return signal_1.root; } });
+Object.defineProperty(exports, "signal", { enumerable: true, get: function () { return signal_1.signal; } });
+__exportStar(require("./constants"), exports);
+__exportStar(require("./types"), exports);

package/build/macro.js

@@ -1,17 +1,22 @@
-import CustomFunction from '@esportsplus/custom-function';
-import { computed } from './signal';
-class Macro extends CustomFunction {
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const custom_function_1 = __importDefault(require("@esportsplus/custom-function"));
+const signal_1 = require("./signal");
+class Macro extends custom_function_1.default {
     #factory;
     constructor(fn, options = {}) {
         super((...args) => {
             return this.#factory.get()(...args);
         });
-        this.#factory = computed(fn, options);
+        this.#factory = (0, signal_1.computed)(fn, options);
     }
     dispose() {
         this.#factory.dispose();
     }
 }
-export default (fn, options = {}) => {
+exports.default = (fn, options = {}) => {
     return new Macro(fn, options);
 };

package/build/reactive/array.js

@@ -1,9 +1,12 @@
-import { dispose, signal } from '../signal';
-import { ReactiveObject } from './object';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ReactiveObjectArray = exports.ReactiveArray = void 0;
+const signal_1 = require("../signal");
+const object_1 = require("./object");
 function factory(data, options = {}) {
     let signals = [];
     for (let i = 0, n = data.length; i < n; i++) {
-        signals.push(new ReactiveObject(data[i], options));
+        signals.push(new object_1.ReactiveObject(data[i], options));
     }
     return signals;
 }
@@ -14,7 +17,7 @@ class ReactiveArray extends Array {
     #signal;
     constructor(data) {
         super(...data);
-        this.#signal = signal(false);
+        this.#signal = (0, signal_1.signal)(false);
     }
     set length(n) {
         if (n > this.length) {
@@ -99,6 +102,7 @@ class ReactiveArray extends Array {
         return length;
     }
 }
+exports.ReactiveArray = ReactiveArray;
 class ReactiveObjectArray extends ReactiveArray {
     #options;
     constructor(data, options = {}) {
@@ -112,22 +116,22 @@ class ReactiveObjectArray extends ReactiveArray {
         return unsupported('reverse');
     }
     pop() {
-        return dispose(super.pop());
+        return (0, signal_1.dispose)(super.pop());
     }
     push(...values) {
         return super.push(...factory(values, this.#options));
     }
     shift() {
-        return dispose(super.shift());
+        return (0, signal_1.dispose)(super.shift());
     }
     sort() {
         return unsupported('sort');
     }
     splice(start, deleteCount = super.length, ...values) {
-        return dispose(super.splice(start, deleteCount, ...factory(values, this.#options)));
+        return (0, signal_1.dispose)(super.splice(start, deleteCount, ...factory(values, this.#options)));
     }
     unshift(...values) {
         return super.unshift(...factory(values, this.#options));
     }
 }
-export { ReactiveArray, ReactiveObjectArray };
+exports.ReactiveObjectArray = ReactiveObjectArray;

package/build/reactive/index.js

@@ -1,4 +1,6 @@
-import { ReactiveObject } from './object';
-export default (data, options) => {
-    return new ReactiveObject(data, options);
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const object_1 = require("./object");
+exports.default = (data, options) => {
+    return new object_1.ReactiveObject(data, options);
 };

package/build/reactive/object.js

@@ -1,6 +1,9 @@
-import { computed, signal } from '../signal';
-import { defineProperty, isArray } from '../utilities';
-import { ReactiveArray, ReactiveObjectArray } from './array';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ReactiveObject = void 0;
+const signal_1 = require("../signal");
+const utilities_1 = require("../utilities");
+const array_1 = require("./array");
 class ReactiveObject {
     nodes = {};
     constructor(data, options = {}) {
@@ -8,23 +11,23 @@ class ReactiveObject {
         for (let key in data) {
             let input = data[key];
             if (typeof input === 'function') {
-                let node = nodes[key] = computed(input, options);
-                defineProperty(this, key, {
+                let node = nodes[key] = (0, signal_1.computed)(input, options);
+                (0, utilities_1.defineProperty)(this, key, {
                     enumerable: true,
                     get() {
                         return node.get();
                     }
                 });
             }
-            else if (isArray(input)) {
+            else if ((0, utilities_1.isArray)(input)) {
                 let node, test = input[0];
                 if (typeof test === 'object' && test !== null && test?.constructor?.name === 'Object') {
-                    node = nodes[key] = new ReactiveObjectArray(input, options);
+                    node = nodes[key] = new array_1.ReactiveObjectArray(input, options);
                 }
                 else {
-                    node = nodes[key] = new ReactiveArray(input);
+                    node = nodes[key] = new array_1.ReactiveArray(input);
                 }
-                defineProperty(this, key, {
+                (0, utilities_1.defineProperty)(this, key, {
                     enumerable: true,
                     get() {
                         node.track();
@@ -33,8 +36,8 @@ class ReactiveObject {
                 });
             }
             else {
-                let node = nodes[key] = signal(input, options);
-                defineProperty(this, key, {
+                let node = nodes[key] = (0, signal_1.signal)(input, options);
+                (0, utilities_1.defineProperty)(this, key, {
                     enumerable: true,
                     get() {
                         return node.get();
@@ -53,4 +56,4 @@ class ReactiveObject {
         }
     }
 }
-export { ReactiveObject };
+exports.ReactiveObject = ReactiveObject;

package/build/resource.js

@@ -1,6 +1,11 @@
-import CustomFunction from '@esportsplus/custom-function';
-import { signal } from './signal';
-class Resource extends CustomFunction {
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const custom_function_1 = __importDefault(require("@esportsplus/custom-function"));
+const signal_1 = require("./signal");
+class Resource extends custom_function_1.default {
     #data;
     #input;
     #ok;
@@ -26,9 +31,9 @@ class Resource extends CustomFunction {
                 this.#ok.set(false);
             });
         });
-        this.#data = signal(undefined, options);
-        this.#input = signal(null, options);
-        this.#ok = signal(null, options);
+        this.#data = (0, signal_1.signal)(undefined, options);
+        this.#input = (0, signal_1.signal)(null, options);
+        this.#ok = (0, signal_1.signal)(null, options);
     }
     get data() {
         return this.#data.get();
@@ -45,6 +50,6 @@ class Resource extends CustomFunction {
         this.#ok.dispose();
     }
 }
-export default (fn, options = {}) => {
+exports.default = (fn, options = {}) => {
     return new Resource(fn, options);
 };

package/build/signal.js

@@ -1,5 +1,8 @@
-import { CHECK, CLEAN, COMPUTED, DIRTY, DISPOSED, EFFECT, ROOT, SIGNAL } from './constants';
-import { isArray } from './utilities';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Reactive = exports.signal = exports.root = exports.effect = exports.dispose = exports.computed = void 0;
+const constants_1 = require("./constants");
+const utilities_1 = require("./utilities");
 let index = 0, observer = null, observers = null, scope = null;
 class Reactive {
     changed = null;
@@ -16,7 +19,7 @@ class Reactive {
     value;
     constructor(state, type, value) {
         let root = null;
-        if (type !== ROOT) {
+        if (type !== constants_1.ROOT) {
             if (scope !== null) {
                 root = scope;
             }
@@ -24,7 +27,7 @@ class Reactive {
                 root = observer.root;
             }
             if (root == null) {
-                if (type === EFFECT) {
+                if (type === constants_1.EFFECT) {
                     throw new Error(`Reactivity: 'effect' cannot be created without a reactive root`);
                 }
             }
@@ -62,7 +65,7 @@ class Reactive {
         }
     }
     dispose() {
-        if (this.state === DISPOSED) {
+        if (this.state === constants_1.DISPOSED) {
             return;
         }
         this.dispatch('cleanup', this);
@@ -71,10 +74,10 @@ class Reactive {
         this.listeners = null;
         this.observers = null;
         this.sources = null;
-        this.state = DISPOSED;
+        this.state = constants_1.DISPOSED;
     }
     get() {
-        if (this.state === DISPOSED) {
+        if (this.state === constants_1.DISPOSED) {
             return this.value;
         }
         if (observer !== null) {
@@ -90,13 +93,13 @@ class Reactive {
                 observers.push(this);
             }
         }
-        if (this.type === COMPUTED || this.type === EFFECT) {
+        if (this.type === constants_1.COMPUTED || this.type === constants_1.EFFECT) {
             sync(this);
         }
         return this.value;
     }
     on(event, listener) {
-        if (this.state === DIRTY) {
+        if (this.state === constants_1.DIRTY) {
             if (event !== 'cleanup') {
                 throw new Error(`Reactivity: events set within computed or effects must use the 'cleanup' event name`);
             }
@@ -126,16 +129,17 @@ class Reactive {
         this.on(event, listener);
     }
     set(value) {
-        if (this.type !== SIGNAL && observer !== this) {
+        if (this.type !== constants_1.SIGNAL && observer !== this) {
             throw new Error(`Reactivity: 'set' method is only available on signals`);
         }
         if (this.changed(this.value, value)) {
             this.value = value;
-            notify(this.observers, DIRTY);
+            notify(this.observers, constants_1.DIRTY);
         }
         return this.value;
     }
 }
+exports.Reactive = Reactive;
 function changed(a, b) {
     return a !== b;
 }
@@ -146,11 +150,11 @@ function notify(nodes, state) {
     for (let i = 0, n = nodes.length; i < n; i++) {
         let node = nodes[i];
         if (node.state < state) {
-            if (node.type === EFFECT && node.state === CLEAN) {
+            if (node.type === constants_1.EFFECT && node.state === constants_1.CLEAN) {
                 node.root.scheduler(node.task);
             }
             node.state = state;
-            notify(node.observers, CHECK);
+            notify(node.observers, constants_1.CHECK);
         }
     }
 }
@@ -168,19 +172,19 @@ function removeSourceObservers(node, start) {
     }
 }
 function sync(node) {
-    if (node.state === CHECK && node.sources !== null) {
+    if (node.state === constants_1.CHECK && node.sources !== null) {
         for (let i = 0, n = node.sources.length; i < n; i++) {
             sync(node.sources[i]);
-            if (node.state === DIRTY) {
+            if (node.state === constants_1.DIRTY) {
                 break;
             }
         }
     }
-    if (node.state === DIRTY) {
+    if (node.state === constants_1.DIRTY) {
         update(node);
     }
     else {
-        node.state = CLEAN;
+        node.state = constants_1.CLEAN;
     }
 }
 function update(node) {
@@ -217,7 +221,7 @@ function update(node) {
             removeSourceObservers(node, index);
             node.sources.length = index;
         }
-        if (node.type === COMPUTED) {
+        if (node.type === constants_1.COMPUTED) {
             node.set(value);
         }
     }
@@ -226,18 +230,19 @@ function update(node) {
         observer = o;
         observers = os;
     }
-    node.state = CLEAN;
+    node.state = constants_1.CLEAN;
 }
 const computed = (fn, options) => {
-    let instance = new Reactive(DIRTY, COMPUTED, undefined);
+    let instance = new Reactive(constants_1.DIRTY, constants_1.COMPUTED, undefined);
     instance.changed = options?.changed || changed;
     instance.fn = fn;
     return instance;
 };
+exports.computed = computed;
 const dispose = (dispose) => {
     if (dispose == null) {
     }
-    else if (isArray(dispose)) {
+    else if ((0, utilities_1.isArray)(dispose)) {
         for (let i = 0, n = dispose.length; i < n; i++) {
             dispose[i].dispose();
         }
@@ -247,23 +252,28 @@ const dispose = (dispose) => {
     }
     return dispose;
 };
+exports.dispose = dispose;
 const effect = (fn) => {
-    let instance = new Reactive(DIRTY, EFFECT, null);
+    let instance = new Reactive(constants_1.DIRTY, constants_1.EFFECT, null);
     instance.fn = fn;
     instance.task = () => instance.get();
     update(instance);
     return instance;
 };
+exports.effect = effect;
 const root = (fn, scheduler) => {
     let o = observer, s = scope;
     if (scheduler === undefined) {
+        if (o?.type === constants_1.EFFECT) {
+            scope = o.root;
+        }
         if (scope === null) {
             throw new Error('Reactivity: `root` cannot be created without a task scheduler');
         }
         scheduler = scope.scheduler;
     }
     observer = null;
-    scope = new Reactive(CLEAN, ROOT, null);
+    scope = new Reactive(constants_1.CLEAN, constants_1.ROOT, null);
     scope.scheduler = scheduler;
     scope.tracking = fn.length > 0;
     let result = fn.call(null, scope);
@@ -271,10 +281,10 @@ const root = (fn, scheduler) => {
     scope = s;
     return result;
 };
+exports.root = root;
 const signal = (value, options) => {
-    let instance = new Reactive(CLEAN, SIGNAL, value);
+    let instance = new Reactive(constants_1.CLEAN, constants_1.SIGNAL, value);
     instance.changed = options?.changed || changed;
     return instance;
 };
-export { computed, dispose, effect, root, signal };
-export { Reactive };
+exports.signal = signal;

package/build/types.js

@@ -1 +1,2 @@
-export {};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/utilities.js

@@ -1,3 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isArray = exports.defineProperty = void 0;
 const { isArray } = Array;
+exports.isArray = isArray;
 const { defineProperty } = Object;
-export { defineProperty, isArray };
+exports.defineProperty = defineProperty;

package/package.json

@@ -4,7 +4,7 @@
         "@esportsplus/custom-function": "^0.0.1"
     },
     "devDependencies": {
-        "@esportsplus/typescript": "^0.0.15"
+        "@esportsplus/typescript": "^0.0.16"
     },
     "main": "build/index.js",
     "name": "@esportsplus/reactivity",
@@ -16,5 +16,5 @@
         "prepublishOnly": "npm run build"
     },
     "types": "build/index.d.ts",
-    "version": "0.1.17"
+    "version": "0.1.19"
 }

package/src/index.ts

@@ -2,4 +2,5 @@ export { default as macro } from './macro';
 export { default as resource } from './resource';
 export { default as reactive } from './reactive';
 export { computed, dispose, effect, root, signal } from './signal';
+export * from './constants';
 export * from './types';

package/src/signal.ts

@@ -338,6 +338,10 @@ const root = <T>(fn: NeverAsync<(instance: Root) => T>, scheduler?: Scheduler) =
         s = scope;
 
     if (scheduler === undefined) {
+        if (o?.type === EFFECT) {
+            scope = o.root;
+        }
+
         if (scope === null) {
             throw new Error('Reactivity: `root` cannot be created without a task scheduler');
         }

package/tsconfig.json

@@ -1,10 +1,11 @@
 {
     "compilerOptions": {
         "baseUrl": ".",
+        "declaration": true,
         "declarationDir": "build",
-        "outDir": "build",
+        "outDir": "build"
     },
     "exclude": ["node_modules"],
-    "extends": "@esportsplus/typescript/tsconfig.base.json",
+    "extends": "./node_modules/@esportsplus/typescript/tsconfig.base.json",
     "include": ["src"]
 }