yummies 5.4.5 → 5.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yummies",
-  "version": "5.4.5",
+  "version": "5.4.6",
   "keywords": [],
   "author": "js2me",
   "license": "MIT",
@@ -17,42 +17,6 @@
     "mobx": "^6.12.4",
     "react": "^18 || ^19"
   },
-  "zshy": {
-    "exports": {
-      "./package.json": "./package.json",
-      "./complex": "./src/complex/index.ts",
-      "./format": "./src/format/index.ts",
-      "./mobx": "./src/mobx/index.ts",
-      "./parser": "./src/parser/index.ts",
-      "./react": "./src/react/index.ts",
-      "./type-guard": "./src/type-guard/index.ts",
-      "./utils/types": "./src/utils/types.ts",
-      "./async": "./src/async.ts",
-      "./common": "./src/common.ts",
-      "./cookie": "./src/cookie.ts",
-      "./css": "./src/css.ts",
-      "./data": "./src/data.ts",
-      "./date-time": "./src/date-time.ts",
-      "./device": "./src/device.ts",
-      "./encodings": "./src/encodings.ts",
-      "./errors": "./src/errors.ts",
-      "./file": "./src/file.ts",
-      "./html": "./src/html.ts",
-      "./id": "./src/id.ts",
-      "./imports": "./src/imports.ts",
-      "./math": "./src/math.ts",
-      "./media": "./src/media.ts",
-      "./ms": "./src/ms.ts",
-      "./number": "./src/number.ts",
-      "./price": "./src/price.ts",
-      "./random": "./src/random.ts",
-      "./sound": "./src/sound.ts",
-      "./storage": "./src/storage.ts",
-      "./text": "./src/text.ts",
-      "./vibrate": "./src/vibrate.ts",
-      "./utility-types": "./src/utils/types.ts"
-    }
-  },
   "peerDependenciesMeta": {
     "mobx": {
       "optional": true
@@ -86,359 +50,9 @@
     "rimraf": "^6.0.1",
     "tsx": "^4.20.5",
     "typescript": "^5.8.3",
-    "vitest": "^3.1.2",
-    "zshy": "^0.4.2"
+    "vitest": "^3.1.2"
   },
   "type": "module",
-  "files": [
-    "dist",
-    "utility-types.d.ts",
-    "utils"
-  ],
-  "exports": {
-    "./package.json": "./package.json",
-    "./complex": {
-      "types": "./dist/complex/index.d.ts",
-      "import": {
-        "types": "./dist/complex/index.d.ts",
-        "default": "./dist/complex/index.js"
-      },
-      "require": {
-        "types": "./dist/complex/index.d.cts",
-        "default": "./dist/complex/index.cjs"
-      }
-    },
-    "./format": {
-      "types": "./dist/format/index.d.ts",
-      "import": {
-        "types": "./dist/format/index.d.ts",
-        "default": "./dist/format/index.js"
-      },
-      "require": {
-        "types": "./dist/format/index.d.cts",
-        "default": "./dist/format/index.cjs"
-      }
-    },
-    "./mobx": {
-      "types": "./dist/mobx/index.d.ts",
-      "import": {
-        "types": "./dist/mobx/index.d.ts",
-        "default": "./dist/mobx/index.js"
-      },
-      "require": {
-        "types": "./dist/mobx/index.d.cts",
-        "default": "./dist/mobx/index.cjs"
-      }
-    },
-    "./parser": {
-      "types": "./dist/parser/index.d.ts",
-      "import": {
-        "types": "./dist/parser/index.d.ts",
-        "default": "./dist/parser/index.js"
-      },
-      "require": {
-        "types": "./dist/parser/index.d.cts",
-        "default": "./dist/parser/index.cjs"
-      }
-    },
-    "./react": {
-      "types": "./dist/react/index.d.ts",
-      "import": {
-        "types": "./dist/react/index.d.ts",
-        "default": "./dist/react/index.js"
-      },
-      "require": {
-        "types": "./dist/react/index.d.cts",
-        "default": "./dist/react/index.cjs"
-      }
-    },
-    "./type-guard": {
-      "types": "./dist/type-guard/index.d.ts",
-      "import": {
-        "types": "./dist/type-guard/index.d.ts",
-        "default": "./dist/type-guard/index.js"
-      },
-      "require": {
-        "types": "./dist/type-guard/index.d.cts",
-        "default": "./dist/type-guard/index.cjs"
-      }
-    },
-    "./utils/types": {
-      "types": "./dist/utils/types.d.ts",
-      "import": {
-        "types": "./dist/utils/types.d.ts",
-        "default": "./dist/utils/types.js"
-      },
-      "require": {
-        "types": "./dist/utils/types.d.cts",
-        "default": "./dist/utils/types.cjs"
-      }
-    },
-    "./async": {
-      "types": "./dist/async.d.ts",
-      "import": {
-        "types": "./dist/async.d.ts",
-        "default": "./dist/async.js"
-      },
-      "require": {
-        "types": "./dist/async.d.cts",
-        "default": "./dist/async.cjs"
-      }
-    },
-    "./common": {
-      "types": "./dist/common.d.ts",
-      "import": {
-        "types": "./dist/common.d.ts",
-        "default": "./dist/common.js"
-      },
-      "require": {
-        "types": "./dist/common.d.cts",
-        "default": "./dist/common.cjs"
-      }
-    },
-    "./cookie": {
-      "types": "./dist/cookie.d.ts",
-      "import": {
-        "types": "./dist/cookie.d.ts",
-        "default": "./dist/cookie.js"
-      },
-      "require": {
-        "types": "./dist/cookie.d.cts",
-        "default": "./dist/cookie.cjs"
-      }
-    },
-    "./css": {
-      "types": "./dist/css.d.ts",
-      "import": {
-        "types": "./dist/css.d.ts",
-        "default": "./dist/css.js"
-      },
-      "require": {
-        "types": "./dist/css.d.cts",
-        "default": "./dist/css.cjs"
-      }
-    },
-    "./data": {
-      "types": "./dist/data.d.ts",
-      "import": {
-        "types": "./dist/data.d.ts",
-        "default": "./dist/data.js"
-      },
-      "require": {
-        "types": "./dist/data.d.cts",
-        "default": "./dist/data.cjs"
-      }
-    },
-    "./date-time": {
-      "types": "./dist/date-time.d.ts",
-      "import": {
-        "types": "./dist/date-time.d.ts",
-        "default": "./dist/date-time.js"
-      },
-      "require": {
-        "types": "./dist/date-time.d.cts",
-        "default": "./dist/date-time.cjs"
-      }
-    },
-    "./device": {
-      "types": "./dist/device.d.ts",
-      "import": {
-        "types": "./dist/device.d.ts",
-        "default": "./dist/device.js"
-      },
-      "require": {
-        "types": "./dist/device.d.cts",
-        "default": "./dist/device.cjs"
-      }
-    },
-    "./encodings": {
-      "types": "./dist/encodings.d.ts",
-      "import": {
-        "types": "./dist/encodings.d.ts",
-        "default": "./dist/encodings.js"
-      },
-      "require": {
-        "types": "./dist/encodings.d.cts",
-        "default": "./dist/encodings.cjs"
-      }
-    },
-    "./errors": {
-      "types": "./dist/errors.d.ts",
-      "import": {
-        "types": "./dist/errors.d.ts",
-        "default": "./dist/errors.js"
-      },
-      "require": {
-        "types": "./dist/errors.d.cts",
-        "default": "./dist/errors.cjs"
-      }
-    },
-    "./file": {
-      "types": "./dist/file.d.ts",
-      "import": {
-        "types": "./dist/file.d.ts",
-        "default": "./dist/file.js"
-      },
-      "require": {
-        "types": "./dist/file.d.cts",
-        "default": "./dist/file.cjs"
-      }
-    },
-    "./html": {
-      "types": "./dist/html.d.ts",
-      "import": {
-        "types": "./dist/html.d.ts",
-        "default": "./dist/html.js"
-      },
-      "require": {
-        "types": "./dist/html.d.cts",
-        "default": "./dist/html.cjs"
-      }
-    },
-    "./id": {
-      "types": "./dist/id.d.ts",
-      "import": {
-        "types": "./dist/id.d.ts",
-        "default": "./dist/id.js"
-      },
-      "require": {
-        "types": "./dist/id.d.cts",
-        "default": "./dist/id.cjs"
-      }
-    },
-    "./imports": {
-      "types": "./dist/imports.d.ts",
-      "import": {
-        "types": "./dist/imports.d.ts",
-        "default": "./dist/imports.js"
-      },
-      "require": {
-        "types": "./dist/imports.d.cts",
-        "default": "./dist/imports.cjs"
-      }
-    },
-    "./math": {
-      "types": "./dist/math.d.ts",
-      "import": {
-        "types": "./dist/math.d.ts",
-        "default": "./dist/math.js"
-      },
-      "require": {
-        "types": "./dist/math.d.cts",
-        "default": "./dist/math.cjs"
-      }
-    },
-    "./media": {
-      "types": "./dist/media.d.ts",
-      "import": {
-        "types": "./dist/media.d.ts",
-        "default": "./dist/media.js"
-      },
-      "require": {
-        "types": "./dist/media.d.cts",
-        "default": "./dist/media.cjs"
-      }
-    },
-    "./ms": {
-      "types": "./dist/ms.d.ts",
-      "import": {
-        "types": "./dist/ms.d.ts",
-        "default": "./dist/ms.js"
-      },
-      "require": {
-        "types": "./dist/ms.d.cts",
-        "default": "./dist/ms.cjs"
-      }
-    },
-    "./number": {
-      "types": "./dist/number.d.ts",
-      "import": {
-        "types": "./dist/number.d.ts",
-        "default": "./dist/number.js"
-      },
-      "require": {
-        "types": "./dist/number.d.cts",
-        "default": "./dist/number.cjs"
-      }
-    },
-    "./price": {
-      "types": "./dist/price.d.ts",
-      "import": {
-        "types": "./dist/price.d.ts",
-        "default": "./dist/price.js"
-      },
-      "require": {
-        "types": "./dist/price.d.cts",
-        "default": "./dist/price.cjs"
-      }
-    },
-    "./random": {
-      "types": "./dist/random.d.ts",
-      "import": {
-        "types": "./dist/random.d.ts",
-        "default": "./dist/random.js"
-      },
-      "require": {
-        "types": "./dist/random.d.cts",
-        "default": "./dist/random.cjs"
-      }
-    },
-    "./sound": {
-      "types": "./dist/sound.d.ts",
-      "import": {
-        "types": "./dist/sound.d.ts",
-        "default": "./dist/sound.js"
-      },
-      "require": {
-        "types": "./dist/sound.d.cts",
-        "default": "./dist/sound.cjs"
-      }
-    },
-    "./storage": {
-      "types": "./dist/storage.d.ts",
-      "import": {
-        "types": "./dist/storage.d.ts",
-        "default": "./dist/storage.js"
-      },
-      "require": {
-        "types": "./dist/storage.d.cts",
-        "default": "./dist/storage.cjs"
-      }
-    },
-    "./text": {
-      "types": "./dist/text.d.ts",
-      "import": {
-        "types": "./dist/text.d.ts",
-        "default": "./dist/text.js"
-      },
-      "require": {
-        "types": "./dist/text.d.cts",
-        "default": "./dist/text.cjs"
-      }
-    },
-    "./vibrate": {
-      "types": "./dist/vibrate.d.ts",
-      "import": {
-        "types": "./dist/vibrate.d.ts",
-        "default": "./dist/vibrate.js"
-      },
-      "require": {
-        "types": "./dist/vibrate.d.cts",
-        "default": "./dist/vibrate.cjs"
-      }
-    },
-    "./utility-types": {
-      "types": "./utility-types.d.ts",
-      "import": {
-        "types": "./dist/utils/types.d.ts",
-        "default": "./dist/utils/types.js"
-      },
-      "require": {
-        "types": "./dist/utils/types.d.cts",
-        "default": "./dist/utils/types.cjs"
-      }
-    }
-  },
   "scripts": {
     "clean": "rm -rf dist",
     "lint:check": "pnpm exec biome check --write --no-errors-on-unmatched --files-ignore-unknown=true",
@@ -446,7 +60,7 @@
     "check": "npm run lint:check && npm run ts:check",
     "prebuild": "npm run clean && npm run check",
     "build:watch": "pnpm build && nodemon --watch src --ext ts --exec \"pnpm build\"",
-    "build": "zshy && tsx scripts/process-exports-field && tsx scripts/generate-utility-types-file",
+    "build": "tsc && tsx scripts/post-build",
     "pub": "pnpm build && node node_modules/js2me-exports-post-build-script/scripts/publish",
     "pub:patch": "PUBLISH_VERSION=patch pnpm pub",
     "pub:minor": "PUBLISH_VERSION=minor pnpm pub",

package/scripts/post-build.ts

@@ -0,0 +1,71 @@
+import {
+  getInfoFromChangelog,
+  postBuildScript,
+  publishGhRelease,
+  publishScript,
+} from "js2me-exports-post-build-script";
+import path from "path";
+
+postBuildScript({
+	buildDir: "dist",
+	rootDir: ".",
+	srcDirName: "src",
+	filesToCopy: ["LICENSE", "README.md", "assets"],
+	updateVersion: process.env.PUBLISH_VERSION as "patch" | "minor" | "major" | undefined,
+	onDone: (versionsDiff, targetPackageJson, { $ }) => {
+		$("pnpm test");
+		$(`cp dist/utils/types.d.ts dist/utility-types.d.ts`);
+		$(`sed -i 's/^export type/type/' dist/utility-types.d.ts`);
+
+		if (process.env.PUBLISH) {
+			if (!process.env.CI) {
+				$(`pnpm test`);
+				$("pnpm changeset version");
+			}
+
+			// remove all test compiled files. TODO: find a better to ignore test files
+			$("rm dist/**/*.test.*");
+
+			const nextVersion = versionsDiff?.next ?? targetPackageJson.data.version;
+
+			const publishOutput = publishScript({
+				gitTagFormat: "<tag>",
+				nextVersion: nextVersion,
+				packageManager: "pnpm",
+				commitAllCurrentChanges: true,
+				createTag: true,
+				safe: true,
+				onAlreadyPublishedThisVersion: () => {
+					console.warn(`${nextVersion} already published`);
+				},
+				cleanupCommand: "pnpm clean",
+				targetPackageJson,
+			});
+
+			if (process.env.CI) {
+				if (publishOutput?.publishedGitTag) {
+					const { whatChangesText } = getInfoFromChangelog(
+						nextVersion,
+						path.resolve(targetPackageJson.locationDir, "../CHANGELOG.md"),
+						targetPackageJson.repositoryUrl,
+					);
+
+					publishGhRelease({
+						authToken: process.env.GITHUB_TOKEN!,
+						body: whatChangesText,
+						owner: targetPackageJson.ghRepoData.user,
+						repo: targetPackageJson.ghRepoData.packageName,
+						version: nextVersion,
+					})
+						.then((r) => {
+							console.info("published new gh release", r);
+						})
+						.catch((err) => {
+							console.error("failed to publish new gh release", err);
+							process.exit(1);
+						});
+				}
+			}
+		}
+	},
+});

package/src/async.ts

@@ -0,0 +1,86 @@
+/**
+ * Создает промис, который будет ждать указанное количество ms, чтобы выполниться
+ *
+ * @param ms значение в миллисекундах
+ * @returns Promise
+ */
+export const sleep = (time: number = 0) =>
+  new Promise((resolve) => setTimeout(resolve, time));
+
+/**
+ * Создает промис, который будет ждать указанное количество ms, чтобы выполниться
+ *
+ * @deprecated используй {sleep}
+ * @param ms значение в миллисекундах
+ * @returns Promise
+ */
+export const waitAsync = async (ms = 1000) =>
+  new Promise((resolve) => setTimeout(resolve, ms));
+
+/**
+ * Создает вызов requestAnimationFrame, посылая туда фукнцию {quitFn}, если она возвращает true,
+ * тогда повторно не будет создан вызов requestAnimationFrame, иначе будут создаваться повторно
+ * вызовы requestAnimationFrame до тем пор, пока эта функция не вернёт true
+ *
+ * @param quitFn - сама фукнция которая исполнится в requestAnimationFrame
+ * @param asMicrotask - дополнительно оборачивает RAF в queueMicrotask
+ * @returns void
+ */
+export const endlessRAF = (
+  quitFunction: () => boolean | void,
+  asMicrotask?: boolean,
+) => {
+  if (quitFunction()) return;
+
+  const raf = () =>
+    requestAnimationFrame(() => endlessRAF(quitFunction, asMicrotask));
+
+  if (asMicrotask) {
+    queueMicrotask(raf);
+  } else {
+    raf();
+  }
+};
+
+export function setAbortableTimeout(
+  callback: VoidFunction,
+  delayInMs?: number,
+  signal?: AbortSignal,
+) {
+  let internalTimer: number | null = null;
+
+  const handleAbort = () => {
+    if (internalTimer == null) {
+      return;
+    }
+    clearTimeout(internalTimer);
+    internalTimer = null;
+  };
+
+  signal?.addEventListener('abort', handleAbort, { once: true });
+
+  internalTimer = setTimeout(() => {
+    signal?.removeEventListener('abort', handleAbort);
+    callback();
+  }, delayInMs);
+}
+
+export function setAbortableInterval(
+  callback: VoidFunction,
+  delayInMs?: number,
+  signal?: AbortSignal,
+) {
+  let timer: number | null = null;
+
+  const handleAbort = () => {
+    if (timer == null) {
+      return;
+    }
+    clearInterval(timer);
+    timer = null;
+  };
+
+  signal?.addEventListener('abort', handleAbort, { once: true });
+
+  timer = setInterval(callback, delayInMs);
+}

package/src/common.ts

@@ -0,0 +1,26 @@
+import type { MaybeFn } from './utils/types.js';
+
+/**
+ * @deprecated use {MaybeFn} type
+ */
+export type FnValue<TValue, TArgs extends any[] = []> = MaybeFn<TValue, TArgs>;
+
+/**
+ * Calls the provided function with the given arguments if it is a function;
+ * otherwise, returns the value directly.
+ */
+export const callFunction = <TValue, TArgs extends any[] = []>(
+  fn: MaybeFn<TValue, TArgs>,
+  ...args: TArgs
+) => {
+  if (typeof fn === 'function') {
+    return (fn as any)(...args) as TValue;
+  }
+
+  return fn;
+};
+
+/**
+ * @deprecated use {callFunction}
+ */
+export const resolveFnValue = callFunction;

package/src/complex/counter.test.ts

@@ -0,0 +1,41 @@
+import { describe } from 'node:test';
+import { expect, it } from 'vitest';
+
+import { createCounter } from './counter';
+
+describe('createCounter', () => {
+  it('should have initial values', () => {
+    const counter = createCounter(undefined, -1);
+
+    expect(counter.counter).toBe(-1);
+    expect(counter.value).toBe(-1);
+  });
+
+  it('should increment and update value and counter properties', () => {
+    const counter = createCounter(undefined, -1);
+
+    counter();
+
+    expect(counter.counter).toBe(0);
+    expect(counter.value).toBe(0);
+  });
+
+  it('should decrement and update value and counter properties', () => {
+    const counter = createCounter(undefined, -1);
+
+    counter.decrement();
+
+    expect(counter.counter).toBe(-2);
+    expect(counter.value).toBe(-2);
+  });
+
+  it('should increment and update processed value', () => {
+    const counter = createCounter((counter) => `counter_${counter}_counter`);
+
+    expect(counter.value).toBe(`counter_0_counter`);
+
+    counter();
+
+    expect(counter.value).toBe(`counter_1_counter`);
+  });
+});

package/src/complex/counter.ts

@@ -0,0 +1,40 @@
+export interface Counter<TValue = number> {
+  (): TValue;
+  counter: number;
+  value: TValue;
+  increment(): TValue;
+  decrement(): TValue;
+  reset(): void;
+}
+
+/**
+ * @deprecated use {`Counter`}. Will be removed in next major release
+ */
+export interface CounterFn<TValue = number> extends Counter<TValue> {}
+
+export const createCounter = <TValue = number>(
+  processValue?: (value: number) => TValue,
+  initial: number = 0,
+): Counter<TValue> => {
+  const update = (counter: number) => {
+    fn.value = processValue?.(counter) ?? (counter as TValue);
+    return fn.value;
+  };
+
+  const increment = () => update(++fn.counter);
+  const decrement = () => update(--fn.counter);
+
+  const fn: Counter<TValue> = increment as any;
+
+  fn.increment = increment;
+  fn.decrement = decrement;
+
+  fn.reset = () => {
+    fn.counter = initial;
+    fn.value = processValue?.(initial) ?? (initial as TValue);
+  };
+
+  fn.reset();
+
+  return fn as Counter<TValue>;
+};