@zwa73/utils 1.0.69 → 1.0.70

package/dist/UtilInterfaces.d.ts

@@ -101,10 +101,10 @@ export type MethodsThisAs<Methods, T> = {
  */
 export declare function assertThisAs<Self, T>(prototype: MethodsThisAs<Self, T>): void;
 /**可自动混入的类型 */
-export type MixinAble<Mixin> = {
+export type Mixinable<Mixin> = {
     /**可混入的字段 */
     readonly MIXIN_FIELDS: ReadonlyArray<keyof Mixin>;
 };
-/**自动混入的组合类 */
-export type ComposedMixinable<B extends object, Ms extends Array<unknown>> = Ms extends [infer M, ...infer Rest] ? M extends MixinAble<M> ? ComposedMixinable<ComposedClassPart<B, M, M['MIXIN_FIELDS'][number]>, Rest> : B : B;
+/**自动组合可混入的类 */
+export type ComposedMixinable<B extends object, Ms extends Array<unknown>> = Ms extends [infer M, ...infer Rest] ? M extends Mixinable<M> ? ComposedMixinable<ComposedClassPart<B, M, M['MIXIN_FIELDS'][number]>, Rest> : B : B;
 export {};

package/dist/test/composeTest.d.ts

@@ -1,12 +1,12 @@
-import { MixinAble } from "..";
-declare class A implements MixinAble<A> {
+import { Mixinable } from "..";
+declare class A implements Mixinable<A> {
     private num;
     getNum: () => number;
     /**A的函数 */
     getA: () => this;
     MIXIN_FIELDS: readonly ["getNum", "getA"];
 }
-declare class B implements MixinAble<B> {
+declare class B implements Mixinable<B> {
     private text;
     getText: () => string;
     /**B的函数 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zwa73/utils",
-  "version": "1.0.69",
+  "version": "1.0.70",
   "description": "my utils",
   "main": "index.js",
   "scripts": {

package/src/UtilFunctions.ts

@@ -1,5 +1,5 @@
 import * as crypto from "crypto";
-import { ComposedClass, ComposedClassMult, ComposedClassPart, ComposedMixinable, FuncPropNames, JToken, MixinAble, PromiseProcFn, PromiseStat, PromiseVerifyFn } from "@src/UtilInterfaces";
+import { ComposedClass, ComposedClassMult, ComposedClassPart, ComposedMixinable, FuncPropNames, JToken, Mixinable, PromiseProcFn, PromiseStat, PromiseVerifyFn } from "@src/UtilInterfaces";
 import * as cp from "child_process";
 import { SLogger } from "@src/UtilLogger";
 
@@ -256,7 +256,7 @@ export function composeMixinable
     M1, M2, M3,M4, M5, M6,M7, M8, M9>
     (base:B,m1?:M1,m2?:M2,m3?:M3,m4?:M4,m5?:M5,m6?:M6,m7?:M7,m8?:M8,m9?:M9):
     ComposedMixinable<B,[M1,M2,M3,M4,M5,M6,M4,M8,M9]>
-export function composeMixinable<Base extends object, Mixin extends MixinAble<Mixin>>(base:Base,...mixins:Mixin[]){
+export function composeMixinable<Base extends object, Mixin extends Mixinable<Mixin>>(base:Base,...mixins:Mixin[]){
     let out = base;
     for(const mixin of mixins)
         out = composeClassPart(base,mixin,...mixin.MIXIN_FIELDS);

package/src/UtilInterfaces.ts

@@ -158,15 +158,15 @@ export type MethodsThisAs<Methods, T> = {
 export function assertThisAs<Self,T>(prototype: MethodsThisAs<Self, T>) {}
 
 /**可自动混入的类型 */
-export type MixinAble<Mixin> = {
+export type Mixinable<Mixin> = {
     /**可混入的字段 */
     readonly MIXIN_FIELDS:ReadonlyArray<keyof Mixin>
 };
 
-/**自动混入的组合类 */
+/**自动组合可混入的类 */
 export type ComposedMixinable<B extends object, Ms extends Array<unknown>> = 
     Ms extends [infer M, ...infer Rest]
-        ? M extends MixinAble<M>
+        ? M extends Mixinable<M>
             ? ComposedMixinable<ComposedClassPart<B,M,M['MIXIN_FIELDS'][number]>,Rest>
             : B
         : B

package/src/test/composeTest.ts

@@ -1,13 +1,13 @@
-import { MixinAble, UtilFP, UtilFunc, assertThisAs } from ".."
+import { Mixinable, UtilFP, UtilFunc, assertThisAs } from ".."
 
-class A implements MixinAble<A>{
+class A implements Mixinable<A>{
     private num = 1;
     getNum = ()=>this.num;
     /**A的函数 */
     getA=()=>this;
     MIXIN_FIELDS =['getNum','getA'] as const;
 }
-class B implements MixinAble<B>{
+class B implements Mixinable<B>{
     private text = "B的text";
     getText = ()=>this.text;
     /**B的函数 */