@zwa73/utils 1.0.166 → 1.0.168

package/dist/UtilClass.js

@@ -210,11 +210,10 @@ class Hbs {
             return '';
         });
         this.hbs.registerHelper('defli', (name, options) => {
-            const rawvalue = options.fn();
+            const rawvalue = options.fn(this.context);
             const values = rawvalue
                 .split('[[br]]')
-                .map(value => value.trim())
-                .map(value => this.hbs.compile(value)(this.context));
+                .map(value => value.trim());
             this.context[name] = values;
             return '';
         });

package/package.json

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

package/src/UtilClass.ts

@@ -67,7 +67,7 @@ export class Stream<T> implements Iterable<T>{
             //轮询平均分
             'average':()=>{
                 for (let i = 0; i < count; i++) {
-                    const clist = [];
+                    const clist:T[] = [];
                     for (let j = i; j < size; j += count)
                         clist.push(this._list[j]);
                     result.push(clist);
@@ -218,12 +218,11 @@ export class Hbs<T extends Record<Keyable,any> = Record<Keyable,any>>{
         });
 
         this.hbs.registerHelper('defli', (name,options)=> {
-            const rawvalue = options.fn() as string;
+            const rawvalue = options.fn(this.context) as string;
 
             const values = rawvalue
                 .split('[[br]]')
-                .map(value => value.trim())
-                .map(value => this.hbs.compile(value)(this.context));
+                .map(value => value.trim());
             (this.context as any)[name] = values;
             return '';
         });

package/dist/backup.d.ts

@@ -1,32 +0,0 @@
-/**类组合
- * 将mixinList每个成员的字段混入base
- * @param base      - 基础类
- * @param mixinList - 目标类
- * @returns - 混合完成的类
- */
-export declare function composeClassFull<Base extends object, MixinList extends object[]>(base: Base, ...mixinList: MixinList): ComposedFullClassMult<Base, MixinList>;
-/**组合的类
- * @template Base     - 基类
- * @template Mixin    - 待混入的类
- */
-export type ComposedFullClass<Base extends object, Mixin extends object> = Base & Mixin;
-/**组合的类 多组合变体
- * @template Base     - 基类
- * @template MixinList- 待混入的类型数组
- */
-export type ComposedFullClassMult<Base extends object, MixinList extends object[]> = MixinList extends [infer Mixin, ...infer Rest] ? Mixin extends object ? Rest extends object[] ? ComposedFullClassMult<ComposedFullClass<Base, Mixin>, Rest> : Base : Base : Base;
-/**将一个类型的所有方法的 `this` 参数改为 `T` 类型
- * @template Methods - 待更改的函数表
- * @template T - 目标this类型
- */
-export type MethodsThisAs<Methods, T> = {
-    [K in keyof Methods]: Methods[K] extends (...args: infer A) => infer R ? (this: T, ...args: A) => R : Methods[K];
-};
-/**尝试断言一个类的原型
- * 其所有函数的 this 都必须为某个类型
- * assignThisAs<Self,T>(Self.prototype);
- * @template Self   - 类的类型
- * @template T      - 目标this类型
- * @param prototype - 类的原型
- */
-export declare function assertThisAs<Self, T>(prototype: MethodsThisAs<Self, T>): void;

package/dist/backup.js

@@ -1,47 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.composeClassFull = composeClassFull;
-exports.assertThisAs = assertThisAs;
-/**类组合
- * 将mixinList每个成员的字段混入base
- * @param base      - 基础类
- * @param mixinList - 目标类
- * @returns - 混合完成的类
- */
-function composeClassFull(base, ...mixinList) {
-    let obj = base;
-    for (let mixin of mixinList) {
-        let propks = Object.getOwnPropertyNames(mixin.constructor.prototype);
-        for (const key of propks) {
-            if (key != "constructor") {
-                Object.defineProperty(obj, key, {
-                    get: () => mixin[key],
-                    set: (value) => { mixin[key] = value; },
-                    enumerable: true,
-                    //writable: true,
-                    configurable: true
-                });
-                //obj[key] = (mixin as any)[key];
-            }
-        }
-        for (const key in mixin) {
-            Object.defineProperty(obj, key, {
-                get: () => mixin[key],
-                set: (value) => { mixin[key] = value; },
-                enumerable: true,
-                //writable: true  ,
-                configurable: true
-            });
-            //obj[key] = (mixin as any)[key];
-        }
-    }
-    return obj;
-}
-/**尝试断言一个类的原型
- * 其所有函数的 this 都必须为某个类型
- * assignThisAs<Self,T>(Self.prototype);
- * @template Self   - 类的类型
- * @template T      - 目标this类型
- * @param prototype - 类的原型
- */
-function assertThisAs(prototype) { }