@adviser/cement 0.4.22 → 0.4.25

package/ts/esm/cli/patch-version-cmd.js

@@ -0,0 +1,233 @@
+import * as ts from "typescript";
+import { command, option, restPositionals, string } from "cmd-ts";
+import * as path from "node:path";
+import * as fs from "node:fs";
+import * as process from "node:process";
+import { $, cd, glob } from "zx";
+function createCompilerHost(options, version) {
+    const host = ts.createCompilerHost(options);
+    const myGetSourceFile = host.getSourceFile;
+    host.getSourceFile = (fileName, languageVersion, onError, shouldCreateNewSourceFile) => {
+        const sourceFile = myGetSourceFile(fileName, languageVersion, onError, shouldCreateNewSourceFile);
+        if (fileName.endsWith("version.ts") && sourceFile) {
+            const newText = `export const VERSION: string = "${version}";`;
+            return ts.createSourceFile(fileName, newText, languageVersion);
+        }
+        return sourceFile;
+    };
+    return host;
+}
+function readTSConfig(configPath = "./tsconfig.json") {
+    const configFile = ts.readConfigFile(configPath, ts.sys.readFile);
+    if (configFile.error) {
+        throw new Error(`Error reading tsconfig: ${configFile.error.messageText}`);
+    }
+    const parsedConfig = ts.parseJsonConfigFileContent(configFile.config, ts.sys, path.dirname(configPath), undefined, configPath);
+    if (parsedConfig.errors.length > 0) {
+        const errors = parsedConfig.errors.map((err) => err.messageText).join("\n");
+        throw new Error(`Error parsing tsconfig: ${errors}`);
+    }
+    return parsedConfig.options;
+}
+function versionFromPackageJson() {
+    const packageJson = JSON.parse(fs.readFileSync("package.json").toString());
+    return packageJson.version;
+}
+export function generateVersionTsCmd() {
+    return command({
+        name: "fireproof build cli",
+        description: "helps to build fp",
+        version: "1.0.0",
+        args: {
+            version: option({
+                long: "version",
+                short: "v",
+                defaultValue: () => getVersion(),
+                defaultValueIsSerializable: true,
+                type: string,
+                description: "Version to patch in, defaults to reading from package.json.",
+            }),
+            versionFile: option({
+                long: "versionFile",
+                short: "f",
+                defaultValue: () => "src/version.ts",
+                defaultValueIsSerializable: true,
+                type: string,
+                description: "Path to the file containing the version, defaults to './src/version.ts'.",
+            }),
+            tsconfig: option({
+                long: "tsconfig",
+                short: "t",
+                defaultValue: () => "tsconfig.json",
+                defaultValueIsSerializable: true,
+                type: string,
+                description: "Path to the tsconfig.json file, defaults to './tsconfig.json'.",
+            }),
+        },
+        handler: (args) => {
+            const options = readTSConfig(args.tsconfig);
+            const host = createCompilerHost(options, args.version);
+            const program = ts.createProgram([args.versionFile], options, host);
+            program.emit();
+        },
+    });
+}
+function getVersion(iversion) {
+    const ghref = iversion || process.env.GITHUB_REF || versionFromPackageJson() || "a/v0.0.0-smoke";
+    let lastPart = ghref.split("/").slice(-1)[0];
+    if (iversion) {
+        return iversion.replace(/^[vdsp]/, "");
+    }
+    const short = $.sync `git rev-parse --short HEAD`.stdout.trim();
+    if (process.env.GITHUB_REF) {
+        lastPart = lastPart.replace(/^[vdsp]/, "");
+        if (lastPart.match(/^\d+\.\d+\.\d+/)) {
+            return lastPart;
+        }
+        return `0.0.0-dev-ci-${short}`;
+    }
+    return `0.0.0-dev-local-${Date.now()}`;
+}
+export function patchVersionCmd() {
+    return command({
+        name: "patch-version",
+        description: "patch version in package.json and deno.json",
+        version: "1.0.0",
+        args: {
+            version: option({
+                long: "version",
+                short: "v",
+                defaultValue: () => getVersion(),
+                defaultValueIsSerializable: true,
+                type: string,
+                description: "Path to the file containing the version, defaults to './package.json'.",
+            }),
+            files: restPositionals({
+                type: string,
+                displayName: "packageJsonFiles",
+                description: "package.json files to process",
+            }),
+        },
+        handler: (args) => {
+            const version = getVersion(args.version);
+            for (const fileToPatch of args.files) {
+                console.log(`Patch ${fileToPatch} version to ${version}(${process.env.GITHUB_REF})`);
+                const packageJson = JSON.parse(fs.readFileSync(fileToPatch).toString());
+                packageJson.version = version;
+                fs.writeFileSync(fileToPatch, JSON.stringify(packageJson, undefined, 2) + "\n");
+            }
+        },
+    });
+}
+function setupDenoJson(packageJsonFile, jsrJsonFile) {
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonFile).toString());
+    const jsrJson = JSON.parse(fs.readFileSync(jsrJsonFile).toString());
+    jsrJson.imports = Object.fromEntries(Array.from(Object.entries(packageJson.dependencies)).map(([k, v]) => [k, `npm:${k}@${v.replace(/^npm:/, "")}`]));
+    fs.writeFileSync(jsrJsonFile, JSON.stringify(jsrJson, undefined, 2) + "\n");
+}
+export function setUpDenoJsonCmd() {
+    return command({
+        name: "setup-deno-json",
+        description: "setup deno.json",
+        version: "1.0.0",
+        args: {
+            packageJson: option({
+                long: "packageJson",
+                short: "p",
+                defaultValue: () => "package.json",
+                defaultValueIsSerializable: true,
+                type: string,
+                description: "Path to the package.json file, defaults to './package.json'.",
+            }),
+            jsrJson: option({
+                long: "jsrJson",
+                short: "j",
+                defaultValue: () => "deno.json",
+                defaultValueIsSerializable: true,
+                type: string,
+                description: "Path to the deno.json file, defaults to './deno.json'.",
+            }),
+        },
+        handler: (args) => {
+            console.log(`Setup deno.json ${args.jsrJson} from ${args.packageJson}`);
+            setupDenoJson(args.packageJson, args.jsrJson);
+        },
+    });
+}
+export async function preparePubdir(pubdir, version) {
+    $.verbose = true;
+    if (process.env.IN_CI !== "in_ci") {
+        await $ `pnpm run build`;
+    }
+    await $ `rm -rf ${pubdir}`;
+    await $ `mkdir -p ${pubdir}`;
+    await $ `cp -pr ../.gitignore ../README.md ../LICENSE ./dist/ts/ ${pubdir}/`;
+    cd("dist/pkg");
+    await $ `cp -pr . ../../${pubdir}/`;
+    cd("../..");
+    cd("src");
+    await $ `cp -pr . ../${pubdir}/src/`;
+    cd("..");
+    const jsFiles = await glob(`${pubdir}/cjs/**/*.js`);
+    for (const file of jsFiles) {
+        const newFile = file.replace(/\.js$/, ".cjs");
+        await $ `mv ${file} ${newFile}`;
+    }
+    const mapFiles = await glob(`${pubdir}/cjs/**/*.js.map`);
+    for (const file of mapFiles) {
+        const newFile = file.replace(/\.js\.map$/, ".cjs.map");
+        await $ `mv ${file} ${newFile}`;
+    }
+    const cjsFiles = await glob(`${pubdir}/cjs/**/*.cjs`);
+    if (cjsFiles.length > 0) {
+        await $ `pnpm exec jscodeshift --parser=babel -t=./to-cjs.js ${cjsFiles}`;
+    }
+    await $ `cp package.json ${pubdir}/`;
+    cd(`${pubdir}/src`);
+    await $ `rm -f test/test-exit-handler.* ./utils/stream-test-helper.ts`.catch(() => {
+    });
+    cd("../..");
+    const screenshotDirs = await glob(`${pubdir}/src/**/__screenshots__`);
+    for (const dir of screenshotDirs) {
+        await $ `rm -rf ${dir}`;
+    }
+    const testFiles = await glob(`${pubdir}/src/**/*.test.ts`);
+    for (const file of testFiles) {
+        await $ `rm -f ${file}`;
+    }
+    await $ `cp ./deno.json ./${pubdir}/`;
+    await patchVersionCmd().handler({ version, files: [`${pubdir}/package.json`, `${pubdir}/deno.json`] });
+    await setUpDenoJsonCmd().handler({ packageJson: `${pubdir}/package.json`, jsrJson: `${pubdir}/deno.json` });
+    cd("pubdir");
+    await $ `pnpm pack`;
+    await $ `deno publish --dry-run --unstable-sloppy-imports --allow-dirty`;
+}
+export function preparePubdirCmd() {
+    return command({
+        name: "prepare-pubdir",
+        description: "prepare pubdir",
+        version: "1.0.0",
+        args: {
+            pubdir: option({
+                long: "pubdir",
+                short: "p",
+                defaultValue: () => "pubdir",
+                defaultValueIsSerializable: true,
+                type: string,
+                description: "Path to the pubdir, defaults to './pubdir'.",
+            }),
+            version: option({
+                long: "version",
+                short: "v",
+                defaultValue: () => getVersion(),
+                defaultValueIsSerializable: true,
+                type: string,
+                description: "Version to patch in, defaults to reading from package.json.",
+            }),
+        },
+        handler: async (args) => {
+            await preparePubdir(args.pubdir, args.version);
+        },
+    });
+}
+//# sourceMappingURL=patch-version-cmd.js.map

package/ts/esm/cli/patch-version-cmd.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"patch-version-cmd.js","sourceRoot":"","sources":["../../../../src/cli/patch-version-cmd.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClE,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAGjC,SAAS,kBAAkB,CAAC,OAA2B,EAAE,OAAe,EAAmB;IACzF,MAAM,IAAI,GAAG,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAE5C,MAAM,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC;IAE3C,IAAI,CAAC,aAAa,GAAG,CAAC,QAAQ,EAAE,eAAe,EAAE,OAAO,EAAE,yBAAyB,EAAiB,EAAE,CAAC;QACrG,MAAM,UAAU,GAAG,eAAe,CAAC,QAAQ,EAAE,eAAe,EAAE,OAAO,EAAE,yBAAyB,CAAC,CAAC;QAGlG,IAAI,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,UAAU,EAAE,CAAC;YAClD,MAAM,OAAO,GAAG,mCAAmC,OAAO,IAAI,CAAC;YAC/D,OAAO,EAAE,CAAC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;QACjE,CAAC;QAED,OAAO,UAAU,CAAC;IAAA,CACnB,CAAC;IACF,OAAO,IAAI,CAAC;AAAA,CACb;AAED,SAAS,YAAY,CAAC,UAAU,GAAG,iBAAiB,EAAsB;IAGxE,MAAM,UAAU,GAAG,EAAE,CAAC,cAAc,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAElE,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,CAAC,KAAK,CAAC,WAAqB,EAAE,CAAC,CAAC;IACvF,CAAC;IAGD,MAAM,YAAY,GAAG,EAAE,CAAC,0BAA0B,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;IAE/H,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnC,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAqB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtF,MAAM,IAAI,KAAK,CAAC,2BAA2B,MAAM,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,OAAO,YAAY,CAAC,OAAO,CAAC;AAAA,CAC7B;AAED,SAAS,sBAAsB,GAAW;IACxC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,CAAwB,CAAC;IAClG,OAAO,WAAW,CAAC,OAAO,CAAC;AAAA,CAC5B;AAED,MAAM,UAAU,oBAAoB,GAA+B;IACjE,OAAO,OAAO,CAAC;QACb,IAAI,EAAE,qBAAqB;QAC3B,WAAW,EAAE,mBAAmB;QAChC,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE;YACJ,OAAO,EAAE,MAAM,CAAC;gBACd,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,GAAG;gBACV,YAAY,EAAE,GAAG,EAAE,CAAC,UAAU,EAAE;gBAChC,0BAA0B,EAAE,IAAI;gBAChC,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,6DAA6D;aAC3E,CAAC;YACF,WAAW,EAAE,MAAM,CAAC;gBAClB,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,GAAG;gBACV,YAAY,EAAE,GAAG,EAAE,CAAC,gBAAgB;gBACpC,0BAA0B,EAAE,IAAI;gBAChC,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,0EAA0E;aACxF,CAAC;YACF,QAAQ,EAAE,MAAM,CAAC;gBACf,IAAI,EAAE,UAAU;gBAChB,KAAK,EAAE,GAAG;gBACV,YAAY,EAAE,GAAG,EAAE,CAAC,eAAe;gBACnC,0BAA0B,EAAE,IAAI;gBAChC,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,gEAAgE;aAC9E,CAAC;SACH;QACD,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;YACjB,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC5C,MAAM,IAAI,GAAG,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACvD,MAAM,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;YACpE,OAAO,CAAC,IAAI,EAAE,CAAC;QAAA,CAChB;KACF,CAAC,CAAC;AAAA,CACJ;AAED,SAAS,UAAU,CAAC,QAAiB,EAAU;IAC7C,MAAM,KAAK,GAAG,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,sBAAsB,EAAE,IAAI,gBAAgB,CAAC;IACjG,IAAI,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7C,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IACzC,CAAC;IACD,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAA,4BAA4B,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC/D,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;QAC3B,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC3C,IAAI,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACrC,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,OAAO,gBAAgB,KAAK,EAAE,CAAC;IACjC,CAAC;IACD,OAAO,mBAAmB,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;AAAA,CACxC;AAED,MAAM,UAAU,eAAe,GAA+B;IAC5D,OAAO,OAAO,CAAC;QACb,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE,6CAA6C;QAC1D,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE;YACJ,OAAO,EAAE,MAAM,CAAC;gBACd,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,GAAG;gBACV,YAAY,EAAE,GAAG,EAAE,CAAC,UAAU,EAAE;gBAChC,0BAA0B,EAAE,IAAI;gBAChC,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,wEAAwE;aACtF,CAAC;YACF,KAAK,EAAE,eAAe,CAAC;gBACrB,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,kBAAkB;gBAC/B,WAAW,EAAE,+BAA+B;aAC7C,CAAC;SACH;QACD,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;YACjB,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACzC,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBAErC,OAAO,CAAC,GAAG,CAAC,SAAS,WAAW,eAAe,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,CAAC,CAAC;gBACrF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAwB,CAAC;gBAC/F,WAAW,CAAC,OAAO,GAAG,OAAO,CAAC;gBAC9B,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;YAClF,CAAC;QAAA,CACF;KACF,CAAC,CAAC;AAAA,CACJ;AAGD,SAAS,aAAa,CAAC,eAAuB,EAAE,WAAmB,EAAQ;IACzE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAA6C,CAAC;IACxH,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAwC,CAAC;IAC3G,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CAClC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAChH,CAAC;IACF,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;AAAA,CAC7E;AAED,MAAM,UAAU,gBAAgB,GAA+B;IAC7D,OAAO,OAAO,CAAC;QACb,IAAI,EAAE,iBAAiB;QACvB,WAAW,EAAE,iBAAiB;QAC9B,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE;YACJ,WAAW,EAAE,MAAM,CAAC;gBAClB,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,GAAG;gBACV,YAAY,EAAE,GAAG,EAAE,CAAC,cAAc;gBAClC,0BAA0B,EAAE,IAAI;gBAChC,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,8DAA8D;aAC5E,CAAC;YACF,OAAO,EAAE,MAAM,CAAC;gBACd,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,GAAG;gBACV,YAAY,EAAE,GAAG,EAAE,CAAC,WAAW;gBAC/B,0BAA0B,EAAE,IAAI;gBAChC,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,wDAAwD;aACtE,CAAC;SACH;QACD,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;YAEjB,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,CAAC,OAAO,SAAS,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YACxE,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAAA,CAC/C;KACF,CAAC,CAAC;AAAA,CACJ;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAAc,EAAE,OAAe,EAAiB;IAElF,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC;IAGjB,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;QAClC,MAAM,CAAC,CAAA,gBAAgB,CAAC;IAC1B,CAAC;IAGD,MAAM,CAAC,CAAA,UAAU,MAAM,EAAE,CAAC;IAC1B,MAAM,CAAC,CAAA,YAAY,MAAM,EAAE,CAAC;IAG5B,MAAM,CAAC,CAAA,2DAA2D,MAAM,GAAG,CAAC;IAG5E,EAAE,CAAC,UAAU,CAAC,CAAC;IACf,MAAM,CAAC,CAAA,kBAAkB,MAAM,GAAG,CAAC;IACnC,EAAE,CAAC,OAAO,CAAC,CAAC;IAGZ,EAAE,CAAC,KAAK,CAAC,CAAC;IACV,MAAM,CAAC,CAAA,eAAe,MAAM,OAAO,CAAC;IACpC,EAAE,CAAC,IAAI,CAAC,CAAC;IAGT,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,MAAM,cAAc,CAAC,CAAC;IACpD,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC9C,MAAM,CAAC,CAAA,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;IACjC,CAAC;IAGD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,MAAM,kBAAkB,CAAC,CAAC;IACzD,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QACvD,MAAM,CAAC,CAAA,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;IACjC,CAAC;IAGD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,MAAM,eAAe,CAAC,CAAC;IACtD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,CAAC,CAAA,uDAAuD,QAAQ,EAAE,CAAC;IAC3E,CAAC;IAGD,MAAM,CAAC,CAAA,mBAAmB,MAAM,GAAG,CAAC;IAGpC,EAAE,CAAC,GAAG,MAAM,MAAM,CAAC,CAAC;IACpB,MAAM,CAAC,CAAA,8DAA8D,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;IAAC,CAElF,CAAC,CAAC;IACH,EAAE,CAAC,OAAO,CAAC,CAAC;IAGZ,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,GAAG,MAAM,yBAAyB,CAAC,CAAC;IACtE,KAAK,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;QACjC,MAAM,CAAC,CAAA,UAAU,GAAG,EAAE,CAAC;IACzB,CAAC;IAGD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,GAAG,MAAM,mBAAmB,CAAC,CAAC;IAC3D,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,CAAC,CAAA,SAAS,IAAI,EAAE,CAAC;IACzB,CAAC;IAGD,MAAM,CAAC,CAAA,oBAAoB,MAAM,GAAG,CAAC;IAGrC,MAAM,eAAe,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,GAAG,MAAM,eAAe,EAAE,GAAG,MAAM,YAAY,CAAC,EAAE,CAAC,CAAC;IAIvG,MAAM,gBAAgB,EAAE,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,GAAG,MAAM,eAAe,EAAE,OAAO,EAAE,GAAG,MAAM,YAAY,EAAE,CAAC,CAAC;IAI5G,EAAE,CAAC,QAAQ,CAAC,CAAC;IACb,MAAM,CAAC,CAAA,WAAW,CAAC;IACnB,MAAM,CAAC,CAAA,gEAAgE,CAAC;AAAA,CACzE;AAED,MAAM,UAAU,gBAAgB,GAA+B;IAC7D,OAAO,OAAO,CAAC;QACb,IAAI,EAAE,gBAAgB;QACtB,WAAW,EAAE,gBAAgB;QAC7B,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE;YACJ,MAAM,EAAE,MAAM,CAAC;gBACb,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,GAAG;gBACV,YAAY,EAAE,GAAG,EAAE,CAAC,QAAQ;gBAC5B,0BAA0B,EAAE,IAAI;gBAChC,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,6CAA6C;aAC3D,CAAC;YACF,OAAO,EAAE,MAAM,CAAC;gBACd,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,GAAG;gBACV,YAAY,EAAE,GAAG,EAAE,CAAC,UAAU,EAAE;gBAChC,0BAA0B,EAAE,IAAI;gBAChC,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,6DAA6D;aAC3E,CAAC;SACH;QACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC;YACvB,MAAM,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAAA,CAChD;KACF,CAAC,CAAC;AAAA,CACJ"}

package/ts/esm/future.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"future.d.ts","sourceRoot":"","sources":["../../../src/future.ts"],"names":[],"mappings":"AAAA,qBAAa,MAAM,CAAC,CAAC;;IASnB,cAKC;IAEK,SAAS,IAAI,OAAO,CAAC,CAAC,CAAC,CAE5B;IAED,OAAO,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,CAEtB;IACD,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAE5B;CACF"}
+{"version":3,"file":"future.d.ts","sourceRoot":"","sources":["../../../src/future.ts"],"names":[],"mappings":"AAAA,qBAAa,MAAM,CAAC,CAAC;;IAUnB,cAKC;IAED,SAAS,IAAI,OAAO,CAAC,CAAC,CAAC,CAEtB;IAED,OAAO,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,CAEtB;IACD,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAE5B;CACF"}

package/ts/esm/future.js

@@ -12,7 +12,7 @@ export class Future {
             this.#rejectFn = reject;
         });
     }
-    async asPromise() {
+    asPromise() {
         return this.#promise;
     }
     resolve(value) {

package/ts/esm/future.js.map

@@ -1 +1 @@
-{"version":3,"file":"future.js","sourceRoot":"","sources":["../../../src/future.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,MAAM;IACR,QAAQ,CAAa;IAC9B,UAAU,GAAuB,GAAG,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAAA,CAC7D,CAAC;IACF,SAAS,GAA8B,GAAG,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAAA,CAC7D,CAAC;IAEF,cAAc;QACZ,IAAI,CAAC,QAAQ,GAAG,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC;YAClD,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;YAC1B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC;QAAA,CACzB,CAAC,CAAC;IAAA,CACJ;IAED,KAAK,CAAC,SAAS,GAAe;QAC5B,OAAO,IAAI,CAAC,QAAQ,CAAC;IAAA,CACtB;IAED,OAAO,CAAC,KAAQ,EAAQ;QACtB,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAAA,CACxB;IACD,MAAM,CAAC,MAAe,EAAQ;QAC5B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAAA,CACxB;CACF"}
+{"version":3,"file":"future.js","sourceRoot":"","sources":["../../../src/future.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,MAAM;IAER,QAAQ,CAAa;IAC9B,UAAU,GAAuB,GAAG,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAAA,CAC7D,CAAC;IACF,SAAS,GAA8B,GAAG,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAAA,CAC7D,CAAC;IAEF,cAAc;QACZ,IAAI,CAAC,QAAQ,GAAG,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC;YAClD,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;YAC1B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC;QAAA,CACzB,CAAC,CAAC;IAAA,CACJ;IAED,SAAS,GAAe;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC;IAAA,CACtB;IAED,OAAO,CAAC,KAAQ,EAAQ;QACtB,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAAA,CACxB;IACD,MAAM,CAAC,MAAe,EAAQ;QAC5B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAAA,CACxB;CACF"}

package/ts/esm/is-promise.d.ts

@@ -1,5 +1,7 @@
 export type UnPromisify<T> = T extends Promise<infer U> ? U : T;
 export type WithoutPromise<T> = UnPromisify<T>;
+export type IsNotPromise<T> = T extends Promise<never> ? never : T;
 export type Promisable<T> = T | Promise<T>;
 export declare function isPromise<T>(a: T): a is T extends Promise<unknown> ? T : never;
+export declare function isNotPromise<T>(a: T): T;
 //# sourceMappingURL=is-promise.d.ts.map

package/ts/esm/is-promise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"is-promise.d.ts","sourceRoot":"","sources":["../../../src/is-promise.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAChE,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;AAE/C,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAE3C,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAY9E"}
+{"version":3,"file":"is-promise.d.ts","sourceRoot":"","sources":["../../../src/is-promise.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAChE,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;AAE/C,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;AAEnE,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAE3C,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAY9E;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAEvC"}

package/ts/esm/is-promise.js

@@ -7,4 +7,7 @@ export function isPromise(a) {
             typeof mayBe.catch === "function" &&
             typeof mayBe.finally === "function"));
 }
+export function isNotPromise(a) {
+    return !isPromise(a);
+}
 //# sourceMappingURL=is-promise.js.map

package/ts/esm/is-promise.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-promise.js","sourceRoot":"","sources":["../../../src/is-promise.ts"],"names":[],"mappings":"AAKA,MAAM,UAAU,SAAS,CAAI,CAAI,EAA+C;IAC9E,MAAM,KAAK,GAAG,CAA4E,CAAC;IAC3F,OAAO,CACL,KAAK,YAAY,OAAO;QACxB,CAAC,CAAC,CACA,KAAK;YACL,KAAK,KAAK,IAAI;YACd,OAAO,KAAK,CAAC,IAAI,KAAK,UAAU;YAChC,OAAO,KAAK,CAAC,KAAK,KAAK,UAAU;YACjC,OAAO,KAAK,CAAC,OAAO,KAAK,UAAU,CACpC,CACF,CAAC;AAAA,CACH"}
+{"version":3,"file":"is-promise.js","sourceRoot":"","sources":["../../../src/is-promise.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,SAAS,CAAI,CAAI,EAA+C;IAC9E,MAAM,KAAK,GAAG,CAA4E,CAAC;IAC3F,OAAO,CACL,KAAK,YAAY,OAAO;QACxB,CAAC,CAAC,CACA,KAAK;YACL,KAAK,KAAK,IAAI;YACd,OAAO,KAAK,CAAC,IAAI,KAAK,UAAU;YAChC,OAAO,KAAK,CAAC,KAAK,KAAK,UAAU;YACjC,OAAO,KAAK,CAAC,OAAO,KAAK,UAAU,CACpC,CACF,CAAC;AAAA,CACH;AAED,MAAM,UAAU,YAAY,CAAI,CAAI,EAAK;IACvC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAM,CAAC;AAAA,CAC3B"}

package/ts/esm/option.d.ts

@@ -3,6 +3,7 @@ export declare abstract class Option<T> {
     static None<T>(): Option<T>;
     static Is<T>(t: unknown): t is Option<T>;
     static From<T>(t?: T): Option<T>;
+    toValue(): T | undefined;
     IsNone(): boolean;
     IsSome(): boolean;
     Unwrap(): T;

package/ts/esm/option.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"option.d.ts","sourceRoot":"","sources":["../../../src/option.ts"],"names":[],"mappings":"AAAA,8BAAsB,MAAM,CAAC,CAAC;IAC5B,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAE9B;IAED,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,CAE1B;IAED,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAEvC;IAED,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAK/B;IAED,MAAM,IAAI,OAAO,CAEhB;IAED,MAAM,IAAI,OAAO,CAEhB;IACD,MAAM,IAAI,CAAC,CAEV;IAED,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC;IAC5B,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC;IAC5B,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAC;CACtB;AAED,qBAAa,IAAI,CAAC,CAAC,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;IACpC,OAAO,CAAC,EAAE,CAAI;IACd,YAAY,EAAE,EAAE,CAAC,EAGhB;IAED,OAAO,IAAI,OAAO,CAEjB;IACD,OAAO,IAAI,OAAO,CAEjB;IACD,MAAM,IAAI,CAAC,CAEV;CACF;AAED,qBAAa,IAAI,CAAC,CAAC,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;IACpC,OAAO,IAAI,OAAO,CAEjB;IACD,OAAO,IAAI,OAAO,CAEjB;IACD,MAAM,IAAI,CAAC,CAEV;CACF;AAED,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC"}
+{"version":3,"file":"option.d.ts","sourceRoot":"","sources":["../../../src/option.ts"],"names":[],"mappings":"AAAA,8BAAsB,MAAM,CAAC,CAAC;IAC5B,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAE9B;IAED,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,CAE1B;IAED,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAEvC;IAED,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAK/B;IAED,OAAO,IAAI,CAAC,GAAG,SAAS,CAEvB;IAED,MAAM,IAAI,OAAO,CAEhB;IAED,MAAM,IAAI,OAAO,CAEhB;IACD,MAAM,IAAI,CAAC,CAEV;IAED,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC;IAC5B,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC;IAC5B,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAC;CACtB;AAED,qBAAa,IAAI,CAAC,CAAC,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;IACpC,OAAO,CAAC,EAAE,CAAI;IACd,YAAY,EAAE,EAAE,CAAC,EAGhB;IAED,OAAO,IAAI,OAAO,CAEjB;IACD,OAAO,IAAI,OAAO,CAEjB;IACD,MAAM,IAAI,CAAC,CAEV;CACF;AAED,qBAAa,IAAI,CAAC,CAAC,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;IACpC,OAAO,IAAI,OAAO,CAEjB;IACD,OAAO,IAAI,OAAO,CAEjB;IACD,MAAM,IAAI,CAAC,CAEV;CACF;AAED,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC"}

package/ts/esm/option.js

@@ -14,6 +14,9 @@ export class Option {
         }
         return new Some(t);
     }
+    toValue() {
+        return this.is_some() ? this.unwrap() : undefined;
+    }
     IsNone() {
         return this.is_none();
     }

package/ts/esm/option.js.map

@@ -1 +1 @@
-{"version":3,"file":"option.js","sourceRoot":"","sources":["../../../src/option.ts"],"names":[],"mappings":"AAAA,MAAM,OAAgB,MAAM;IAC1B,MAAM,CAAC,IAAI,CAAI,CAAI,EAAa;QAC9B,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;IAAA,CACpB;IAED,MAAM,CAAC,IAAI,GAAiB;QAC1B,OAAO,IAAI,IAAI,EAAE,CAAC;IAAA,CACnB;IAED,MAAM,CAAC,EAAE,CAAI,CAAU,EAAkB;QACvC,OAAO,CAAC,YAAY,MAAM,CAAC;IAAA,CAC5B;IAED,MAAM,CAAC,IAAI,CAAI,CAAK,EAAa;QAC/B,IAAI,CAAC,CAAC,EAAE,CAAC;YACP,OAAO,IAAI,IAAI,EAAE,CAAC;QACpB,CAAC;QACD,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;IAAA,CACpB;IAED,MAAM,GAAY;QAChB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IAAA,CACvB;IAED,MAAM,GAAY;QAChB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IAAA,CACvB;IACD,MAAM,GAAM;QACV,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IAAA,CACtB;CAKF;AAED,MAAM,OAAO,IAAQ,SAAQ,MAAS;IAC5B,EAAE,CAAI;IACd,YAAY,EAAK,EAAE;QACjB,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IAAA,CACd;IAED,OAAO,GAAY;QACjB,OAAO,KAAK,CAAC;IAAA,CACd;IACD,OAAO,GAAY;QACjB,OAAO,IAAI,CAAC;IAAA,CACb;IACD,MAAM,GAAM;QACV,OAAO,IAAI,CAAC,EAAE,CAAC;IAAA,CAChB;CACF;AAED,MAAM,OAAO,IAAQ,SAAQ,MAAS;IACpC,OAAO,GAAY;QACjB,OAAO,IAAI,CAAC;IAAA,CACb;IACD,OAAO,GAAY;QACjB,OAAO,KAAK,CAAC;IAAA,CACd;IACD,MAAM,GAAM;QACV,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;IAAA,CAChC;CACF"}
+{"version":3,"file":"option.js","sourceRoot":"","sources":["../../../src/option.ts"],"names":[],"mappings":"AAAA,MAAM,OAAgB,MAAM;IAC1B,MAAM,CAAC,IAAI,CAAI,CAAI,EAAa;QAC9B,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;IAAA,CACpB;IAED,MAAM,CAAC,IAAI,GAAiB;QAC1B,OAAO,IAAI,IAAI,EAAE,CAAC;IAAA,CACnB;IAED,MAAM,CAAC,EAAE,CAAI,CAAU,EAAkB;QACvC,OAAO,CAAC,YAAY,MAAM,CAAC;IAAA,CAC5B;IAED,MAAM,CAAC,IAAI,CAAI,CAAK,EAAa;QAC/B,IAAI,CAAC,CAAC,EAAE,CAAC;YACP,OAAO,IAAI,IAAI,EAAE,CAAC;QACpB,CAAC;QACD,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;IAAA,CACpB;IAED,OAAO,GAAkB;QACvB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAAA,CACnD;IAED,MAAM,GAAY;QAChB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IAAA,CACvB;IAED,MAAM,GAAY;QAChB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IAAA,CACvB;IACD,MAAM,GAAM;QACV,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IAAA,CACtB;CAKF;AAED,MAAM,OAAO,IAAQ,SAAQ,MAAS;IAC5B,EAAE,CAAI;IACd,YAAY,EAAK,EAAE;QACjB,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IAAA,CACd;IAED,OAAO,GAAY;QACjB,OAAO,KAAK,CAAC;IAAA,CACd;IACD,OAAO,GAAY;QACjB,OAAO,IAAI,CAAC;IAAA,CACb;IACD,MAAM,GAAM;QACV,OAAO,IAAI,CAAC,EAAE,CAAC;IAAA,CAChB;CACF;AAED,MAAM,OAAO,IAAQ,SAAQ,MAAS;IACpC,OAAO,GAAY;QACjB,OAAO,IAAI,CAAC;IAAA,CACb;IACD,OAAO,GAAY;QACjB,OAAO,KAAK,CAAC;IAAA,CACd;IACD,MAAM,GAAM;QACV,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;IAAA,CAChC;CACF"}

package/ts/esm/resolve-once.d.ts

@@ -1,9 +1,11 @@
 import { Future } from "./future.js";
+import { UnPromisify } from "./is-promise.js";
+import { Promisable } from "./is-promise.js";
 import { LRUMap, LRUParam, UnregFn } from "./lru-map-set.js";
 import { Result } from "./result.js";
-interface ResolveSeqItem<T, C> {
+interface ResolveSeqItem<T, C, R extends Promisable<T>> {
     readonly future: Future<T>;
-    readonly fn: (c?: C) => Promise<T>;
+    readonly fn: (c?: C) => R;
     readonly id?: number;
 }
 export declare class ResolveSeq<T, C = void> {
@@ -12,24 +14,51 @@ export declare class ResolveSeq<T, C = void> {
     reset(): void;
     readonly _flushWaiting: Future<void>[];
     flush(): Promise<void>;
-    _step(item?: ResolveSeqItem<T, C>): Promise<void>;
-    readonly _seqFutures: ResolveSeqItem<T, C>[];
-    add(fn: (c?: C) => Promise<T>, id?: number): Promise<T>;
+    _step<R extends Promisable<T>>(item?: ResolveSeqItem<T, C, R>): Promise<void>;
+    readonly _seqFutures: ResolveSeqItem<T, C, Promisable<T>>[];
+    add<R extends Promisable<T>>(fn: (c?: C) => R, id?: number): Promise<UnPromisify<R>>;
 }
-export declare class ResolveOnce<T, CTX = void> {
-    _onceDone: boolean;
-    readonly _onceFutures: Future<T>[];
-    _onceOk: boolean;
-    _onceValue?: T;
-    _onceError?: Error;
-    _isPromise: boolean;
-    _inProgress?: Future<T>;
-    readonly ctx?: CTX;
-    constructor(ctx?: CTX);
+type ResolveState = "initial" | "processed" | "waiting" | "processing";
+interface ResolveOnceIf<T extends Promisable<unknown>, CTX = void> {
     get ready(): boolean;
+    get value(): UnPromisify<T> | undefined;
+    get error(): Error | undefined;
+    get state(): ResolveState;
+    once<R extends Promisable<UnPromisify<T>>>(fn: (c?: CTX) => R): R;
+    reset<R extends Promisable<UnPromisify<T>>>(fn?: (c?: CTX) => R): R;
+}
+export declare class SyncResolveOnce<T extends Promisable<unknown>, CTX = void> {
+    #private;
+    state: ResolveState;
+    readonly queueLength: number;
     get value(): T | undefined;
-    reset(): void;
-    once<R>(fn: (c?: CTX) => R): R;
+    get error(): Error | undefined;
+    get ready(): boolean;
+    constructor(ctx?: CTX);
+    resolve(fn: (ctx?: CTX) => T): T;
+    reset(fn?: (c?: CTX) => T): T | undefined;
+}
+export declare class AsyncResolveOnce<T extends Promisable<unknown>, CTX = void> {
+    #private;
+    state: ResolveState;
+    constructor(ctx?: CTX);
+    get queueLength(): number;
+    get ready(): boolean;
+    get value(): UnPromisify<T> | undefined;
+    get error(): Error | undefined;
+    resolve(fn: (ctx?: CTX) => T): T;
+    reset(fn?: (c?: CTX) => T): T;
+}
+export declare class ResolveOnce<T extends Promisable<unknown>, CTX = void> implements ResolveOnceIf<T, CTX> {
+    #private;
+    constructor(ctx?: CTX);
+    get ready(): boolean;
+    get value(): UnPromisify<T> | undefined;
+    get queueLength(): number;
+    get error(): Error | undefined;
+    get state(): ResolveState;
+    once<R extends Promisable<UnPromisify<T>>>(fn: (c?: CTX) => R): R;
+    reset<R extends Promisable<UnPromisify<T>>>(fn?: (c?: CTX) => R): R;
 }
 export interface KeyedParam {
     readonly lru: Partial<LRUParam>;
@@ -46,6 +75,7 @@ export declare class Keyed<T extends {
     asyncGet(key: () => Promise<K>): Promise<T>;
     get(key: K | (() => K)): T;
     has(key: K | (() => K)): boolean;
+    delete(key: K): void;
     unget(key: K): void;
     reset(): void;
 }
@@ -61,6 +91,6 @@ export declare class KeyedResolvOnce<T, K = string> extends Keyed<ResolveOnce<T,
 export declare class KeyedResolvSeq<T, K = string> extends Keyed<ResolveSeq<T, K>, K> {
     constructor(kp?: Partial<KeyedParam>);
 }
-export declare function Lazy<R>(fn: () => R): () => ReturnType<typeof fn>;
+export declare function Lazy<R extends Promisable<unknown>>(fn: () => R): () => ReturnType<typeof fn>;
 export {};
 //# sourceMappingURL=resolve-once.d.ts.map

package/ts/esm/resolve-once.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-once.d.ts","sourceRoot":"","sources":["../../../src/resolve-once.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolve-once.d.ts","sourceRoot":"","sources":["../../../src/resolve-once.ts"],"names":[],"mappings":"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"}