Merge pull request #2 from typescript-package/develop

v0.1.0

Author: sciborrudnicki

README.md

@@ -2,7 +2,7 @@
 <a href="https://www.typescriptlang.org/">
   <img
     src="https://avatars.githubusercontent.com/u/189666396?s=150&u=9d55b1eb4ce258974ead76bf07ccf49ef0eb0ea7&v=4"
-    title="typescript-package/controller - A lightweight TypeScript package with for various kind of controllers."
+    title="typescript-package/controller - A lightweight TypeScript package with various kind of controllers for behavior control."
   />
 </a>
 
@@ -127,7 +127,15 @@ MIT © typescript-package ([license][typescript-package-license])
 
 ## Related packages
 
-- [`@xtypescript/property`](https://github.com/xtypescript/property) - A comprehensive, reactive TypeScript library for precise and extensible object property control.
+- **[@typescript-package/chain-descriptor](https://github.com/typescript-package/chain-descriptor)**: A **TypeScript** library for chain property descriptor.
+- **[@typescript-package/controller](https://github.com/typescript-package/controller)**: A **TypeScript** package with for various kind of controllers.
+- **[@typescript-package/descriptor](https://github.com/typescript-package/descriptor)**: A **TypeScript** library for property descriptor.
+- **[@typescript-package/descriptor-chain](https://github.com/typescript-package/descriptor-chain)**: A **TypeScript** library for property descriptor chain.
+- **[@typescript-package/descriptors](https://github.com/typescript-package/descriptors)**: A **TypeScript** library for property descriptors.
+- **[@typescript-package/property](https://github.com/typescript-package/property)**: A **TypeScript** package with features to handle object properties.
+- **[@typescript-package/wrap-descriptor](https://github.com/typescript-package/wrap-descriptor)**: A **TypeScript** package for wrapping object descriptors.
+- **[@typescript-package/wrap-property](https://github.com/typescript-package/wrap-property)**: A **TypeScript** package for wrapping object properties.
+- **[@xtypescript/property](https://github.com/xtypescript/property)** - A comprehensive, reactive **TypeScript** library for precise and extensible object property control.
 
 <!-- This package: typescript-package  -->
   <!-- GitHub: badges -->
@@ -145,7 +153,8 @@ MIT © typescript-package ([license][typescript-package-license])
 <!-- Package: typescript-package -->
   <!-- npm -->
   [typescript-package-npm-badge-svg]: https://badge.fury.io/js/@typescript-package%2Fcontroller.svg
-  [typescript-package-npm-badge]: https://badge.fury.io/js/@typescript-package%controller
+  [typescript-package-npm-badge]: https://badge.fury.io/js/@typescript-package%2Fcontroller
+
 
 <!-- GIT -->
 [git-semver]: http://semver.org/

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@typescript-package/controller",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "author": "wwwdev.io <[email protected]>",
   "description": "A lightweight TypeScript package with various kind of controllers for behavior control.",
   "license": "MIT",
@@ -10,9 +10,9 @@
   },
   "peerDependencies": {
     "@typedly/callback": "^1.0.0",
-    "@typedly/controlled-descriptor": "^0.0.1",
-    "@typedly/controller": "^0.2.0",
-    "@typedly/descriptor": "^10.0.0"
+    "@typedly/controlled-descriptor": "^0.1.0",
+    "@typedly/controller": "^0.3.0",
+    "@typedly/descriptor": "^10.1.1"
   },
   "scripts": {
     "prepublishOnly": "npm run pkg && npm run clean",

package.json

@@ -1,7 +1,7 @@
 // Interface.
+import { ControlledPropertyDescriptor } from '@typedly/controlled-descriptor';
 import { WrappedPropertyDescriptor } from '@typedly/descriptor';
 import { WrappedPropertyDescriptorController } from '@typedly/controller';
-import { ControlledPropertyDescriptor } from '@typedly/controlled-descriptor';
 // Type.
 import { GetterCallback, SetterCallback } from '@typedly/callback';
 /**
@@ -15,7 +15,7 @@ import { GetterCallback, SetterCallback } from '@typedly/callback';
  * @template {boolean} [N=boolean] The type of enabled.
  * @template {boolean} [C=boolean] The type of configurable.
  * @template {boolean} [E=boolean] The type of enumerable.
- * @template {ControlledPropertyDescriptor<O, K, V, A, N, C, E, D>} [D=ControlledPropertyDescriptor<O, K, V, A, N, C, E, any>] The type of previous descriptor.
+ * @template {ControlledPropertyDescriptor<O, K, V, A, N, C, E, D> | PropertyDescriptor} [D=ControlledPropertyDescriptor<O, K, V, A, N, C, E, any>] The type of previous descriptor.
  * @implements {WrappedPropertyDescriptorController<O, K, V, A, N, C, E, D>}
  */
 export class ControlledDescriptorController<
@@ -34,7 +34,7 @@ export class ControlledDescriptorController<
   // Enumerable.
   E extends boolean = boolean,
   // The type of the previous descriptor.
-  D extends ControlledPropertyDescriptor<O, K, V, A, N, C, E, D> = ControlledPropertyDescriptor<O, K, V, A, N, C, E, any>,
+  D extends ControlledPropertyDescriptor<O, K, V, A, N, C, E, D> | PropertyDescriptor = ControlledPropertyDescriptor<O, K, V, A, N, C, E, any>,
 > implements WrappedPropertyDescriptorController<O, K, V, A, N, C, E, D> {
   /**
    * @description The default active state of the descriptor.
@@ -213,8 +213,10 @@ export class ControlledDescriptorController<
     key: K,
     descriptor?: Partial<WrappedPropertyDescriptor<O, K, V, A, N, C, E, D>>,
   ) {
-    this.#active = typeof descriptor?.active === 'boolean' || typeof descriptor?.active === 'object' ? descriptor?.active : ControlledDescriptorController.active as A;
-    this.#enabled = typeof descriptor?.enabled === 'boolean' || typeof descriptor?.enabled === 'object' ? descriptor?.enabled : ControlledDescriptorController.enabled as N;
+    this.#active = typeof descriptor?.active === 'boolean' || typeof descriptor?.active === 'object'
+      ? descriptor?.active : ControlledDescriptorController.active as A;
+    this.#enabled = typeof descriptor?.enabled === 'boolean' || typeof descriptor?.enabled === 'object'
+      ? descriptor?.enabled : ControlledDescriptorController.enabled as N;
     this.#get = descriptor?.get!;
     this.#index = descriptor?.index;
     this.#key = key;
@@ -262,7 +264,7 @@ export class ControlledDescriptorController<
   }
 
   /**
-   * @inheritdoc 
+   * @inheritdoc
    */
   public isActive(callback: 'both' | 'onGet' | 'onSet'): boolean {
     switch(callback) {
@@ -285,7 +287,7 @@ export class ControlledDescriptorController<
    * @param {A} active 
    */
   #setActive(callback: 'both' | 'onGet' | 'onSet', active: A) {
-    if (typeof this.#active === 'object' && ('onGet' === callback || 'onSet' === callback)) {
+    if (typeof this.#active === 'object' && (callback === 'onGet' || callback === 'onSet')) {
       this.#active[callback] = active;
     } else {
       this.#active = active as A;