🔧 🎵 🆙

Author: Gaubee

deno.json deno.jsoncdeno.json renamed to deno.jsonc

@@ -8,12 +8,33 @@
   },
   "nodeModulesDir": "auto",
   "compilerOptions": {
-    "lib": ["deno.window", "dom", "ESNext"],
-    "types": ["node"],
+    "lib": [
+      "deno.window",
+      "dom",
+      "ESNext"
+    ],
+    "types": [
+      "node"
+    ],
     "noImplicitOverride": true
   },
-  "workspace": ["flow", "tc39-shim", "util", "w3c-shim", "web", "node", "denokit", "nodekit"],
-  "exclude": [".npm", "docs"],
+  "workspace": [
+    //
+    "flow",
+    "tc39-shim",
+    "util",
+    "w3c-shim",
+    "web",
+    "node",
+    "denokit",
+    "nodekit"
+  ],
+  "exclude": [
+    ".npm",
+    "tc39-shim",
+    "w3c-shim",
+    "docs"
+  ],
   "fmt": {
     "trailingCommas": "onlyMultiLine",
     "lineWidth": 180,
@@ -23,7 +44,15 @@
   },
   "lint": {
     "rules": {
-      "exclude": ["no-explicit-any", "ban-ts-comment", "no-namespace"]
+      // "include": [
+      //   "explicit-function-return-type",
+      //   "explicit-module-boundary-types"
+      // ],
+      "exclude": [
+        "no-explicit-any",
+        "ban-ts-comment",
+        "no-namespace"
+      ]
     }
   }
-}
+}

util/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@gaubee/util",
-  "version": "0.34.1",
+  "version": "0.34.2",
   "exports": {
     "./abort": "./src/abort.ts",
     "./bigint": "./src/bigint.ts",

util/src/func.ts

@@ -1,6 +1,6 @@
 import {obj_assign_props} from "./object.ts";
 import {isPromiseLike} from "./promise-helper.ts";
-import {pureEvent} from "./pure_event.ts";
+import {pureEvent, PureEventWithApply} from "./pure_event.ts";
 
 /**
  * 函数转化，一个新函数：它的第一个参数 将作为 原函数的 this
@@ -265,7 +265,7 @@ export const withEffect = <T extends object>(source: T, effect: Func<void, [T]>)
  * 执行副作用
  * @param sources
  */
-export const applyEffect = (...sources: (WithEffect | object)[]) => {
+export const applyEffect = (...sources: (WithEffect | object)[]): void => {
   for (const source of sources) {
     if (effect_symbol in source) {
       const effect = source[effect_symbol];
@@ -286,7 +286,14 @@ export const applyEffect = (...sources: (WithEffect | object)[]) => {
  * 每个函数的结果会通过 `returns` 事件的 `emit` 方法发出，数据格式为 `{ source: T; result: FuncCatch.Return<unknown, Func.Return<T>> }`。
  * `result` 是一个元组，成功时为 `[undefined, R]`，失败时为 `[E, undefined]`，并附带 `success`、`result` 和 `error` 属性。
  */
-export const func_parallel_limit = <T extends Func<void>>(funcs: Iterable<T> | AsyncIterable<T>, limit: number) => {
+export const func_parallel_limit = <T extends Func<void>>(
+  funcs: Iterable<T> | AsyncIterable<T>,
+  limit: number,
+): PureEventWithApply<{
+  source: T;
+  result: FuncCatch.Return<unknown, Func.Return<T>>;
+}> &
+  PromiseLike<void[]> => {
   const returns = pureEvent<{source: T; result: FuncCatch.Return<unknown, Func.Return<T>>}>();
   const func_iter = Symbol.asyncIterator in funcs ? funcs[Symbol.asyncIterator]() : funcs[Symbol.iterator]();
   const done = Promise.withResolvers<void[]>();

util/src/locks.ts

@@ -19,7 +19,7 @@ export class LockManger {
     return map_get_or_put(this.#locks, name, () => []);
   }
   /**等到可以执行的时候，返回lock对象 */
-  async request(name: string, options: LockOptions = {}) {
+  async request(name: string, options: LockOptions = {}): Promise<Lock> {
     const {mode = "exclusive", signal} = options || {};
     const _locks = this.#getLocks(name);
     const lock = new Lock(name, mode, signal, () => {
@@ -68,11 +68,14 @@ export class LockManger {
     lock.pending = false;
     return lock;
   }
-  async run<R>(name: string, options: LockOptions, callback: (lock: Lock) => Promise<R>) {
+  async run<R>(name: string, options: LockOptions, callback: (lock: Lock) => Promise<R>): Promise<R> {
     using lock = await this.request(name, options);
     return await callback(lock);
   }
-  query(name: string) {
+  query(name: string): {
+    held: Lock[];
+    pending: Lock[];
+  } {
     const locks = this.#locks.get(name);
     const held: Lock[] = [];
     const pending: Lock[] = [];
@@ -114,16 +117,16 @@ class Lock {
     }
   }
   #job = Promise.withResolvers<void>();
-  release() {
+  release(): void {
     this.#job.resolve();
     this.onRelease();
   }
-  get promise() {
+  get promise(): Promise<void> {
     return this.#job.promise;
   }
   [Symbol.dispose]() {
     this.release();
   }
 }
 
-export const locks = new LockManger();
+export const locks: LockManger = new LockManger();