@zwa73/utils 1.0.275 → 1.0.277

package/dist/UtilClass/Markdown.d.ts

@@ -1,3 +1,4 @@
+import type { MPromise } from '@zwa73/js-utils';
 import type { stringify } from 'yaml';
 type ExtractBlockOpt = {
     /**要提取的标题 必须为 "# 标题" 的格式 */
@@ -10,16 +11,25 @@ type FromArg = {
     content?: string;
 };
 /**Markdown解析器 */
-export declare class Markdown {
-    data?: Record<string, any> | undefined;
+export declare class Markdown<D extends Record<string, any> = Record<string, any>> {
+    /**yaml数据 */
+    data?: D | undefined;
+    /**md文本内容 */
     content?: string | undefined;
     private constructor();
     /**从内容文本构建Md */
-    static parse(ctx?: string): Promise<Markdown>;
+    static parse(ctx?: string): Promise<Markdown<Record<string, any>>>;
     /**从文件构建Md */
-    static fromFile(filepath: string): Promise<Markdown>;
+    static fromFile(filepath: string): Promise<Markdown<Record<string, any>>>;
     /**从数据构建 */
-    static from(arg?: FromArg): Markdown;
+    static from(arg?: FromArg): Markdown<Record<string, any>>;
+    /**辅助构建文本 */
+    static buildContent(obj: Record<string, (() => MPromise<string | undefined>) | string | undefined>): Promise<string>;
+    /**辅助构建代码块
+     * @param content - 代码内容
+     * @param lang - 代码块语言类型
+     */
+    static buildCodeBlock(content: string, lang?: string): Promise<string>;
     /**输出md文本 */
     stringify(opt: Exclude<Parameters<typeof stringify>[2], string | number>): Promise<string>;
     /**根据标题提取块

package/dist/UtilClass/Markdown.js

@@ -24,7 +24,11 @@ const getYaml = async () => {
 class Markdown {
     data;
     content;
-    constructor(data, content) {
+    constructor(
+    /**yaml数据 */
+    data, 
+    /**md文本内容 */
+    content) {
         this.data = data;
         this.content = content;
     }
@@ -42,9 +46,34 @@ class Markdown {
     static from(arg = {}) {
         return new Markdown(arg.data, arg.content);
     }
+    /**辅助构建文本 */
+    static async buildContent(obj) {
+        return Promise.all(Object.entries(obj).map(async ([k, v]) => {
+            const vtxt = typeof v == 'function' ? await v() : v;
+            if (vtxt != undefined && vtxt.length > 0)
+                return `${k}\n${vtxt}`;
+            return undefined;
+        })).then(p => p.filter(v => v != undefined).join('\n\n'));
+    }
+    /**辅助构建代码块
+     * @param content - 代码内容
+     * @param lang - 代码块语言类型
+     */
+    static async buildCodeBlock(content, lang) {
+        return '```' + (lang ?? '') + content + '```';
+    }
     /**输出md文本 */
     async stringify(opt) {
-        const yamlText = Object.values(this.data ?? {}).length > 0 ? `---\n${(await getYaml()).stringify(this.data, opt)}---\n` : '';
+        const fxopt = Object.assign({
+            blockQuote: false,
+            doubleQuotedAsJSON: true,
+            singleQuote: true,
+            defaultStringType: "QUOTE_SINGLE",
+            defaultKeyType: "PLAIN",
+            lineWidth: 0,
+            minContentWidth: 0,
+        }, opt);
+        const yamlText = Object.values(this.data ?? {}).length > 0 ? `---\n${(await getYaml()).stringify(this.data, fxopt)}---\n` : '';
         return `${yamlText}${this.content}`;
         //return (await getMatter()).stringify(this.content,this.data);
     }

package/dist/UtilFunctions.d.ts

@@ -1,6 +1,5 @@
 import { JsFunc } from "@zwa73/js-utils";
 import type { LogLevel } from "./UtilInterfaces";
-export type { PromiseRetries, PromiseRetryResult } from "@zwa73/js-utils";
 declare const HashAlgorithmList: readonly ["RSA-MD5", "RSA-RIPEMD160", "RSA-SHA1", "RSA-SHA1-2", "RSA-SHA224", "RSA-SHA256", "RSA-SHA3-224", "RSA-SHA3-256", "RSA-SHA3-384", "RSA-SHA3-512", "RSA-SHA384", "RSA-SHA512", "RSA-SHA512/224", "RSA-SHA512/256", "RSA-SM3", "blake2b512", "blake2s256", "id-rsassa-pkcs1-v1_5-with-sha3-224", "id-rsassa-pkcs1-v1_5-with-sha3-256", "id-rsassa-pkcs1-v1_5-with-sha3-384", "id-rsassa-pkcs1-v1_5-with-sha3-512", "md5", "md5-sha1", "md5WithRSAEncryption", "ripemd", "ripemd160", "ripemd160WithRSA", "rmd160", "sha1", "sha1WithRSAEncryption", "sha224", "sha224WithRSAEncryption", "sha256", "sha256WithRSAEncryption", "sha3-224", "sha3-256", "sha3-384", "sha3-512", "sha384", "sha384WithRSAEncryption", "sha512", "sha512-224", "sha512-224WithRSAEncryption", "sha512-256", "sha512-256WithRSAEncryption", "sha512WithRSAEncryption", "shake128", "shake256", "sm3", "sm3WithRSAEncryption", "ssl3-md5", "ssl3-sha1"];
 export type HashAlgorithm = typeof HashAlgorithmList[number];
 /**执行选项 */
@@ -49,3 +48,4 @@ declare class _UtilFunc {
 }
 export declare const UtilFunc: import("@zwa73/modular-mixer").ComposedClass<typeof _UtilFunc, typeof JsFunc, "__jsUtils", "prototype" | "preset" | "assignOption" | "genUUID" | "getTime" | "initField" | "initObject" | "afterward" | "sleep" | "getNeverResolvedPromise" | "retryPromise" | "timelimitPromise" | "mapEntries" | "eachField" | "stringifyJToken" | "sortJToken" | "assertType" | "assertLiteral" | "deepClone" | "isSafeNumber" | "dedent" | "throwError" | "getStack" | "getFuncLoc" | "cachePool" | "memoize" | "asyncize" | "lazyFunction" | "splitToChunk" | "mergeFromChunk" | "structEqual" | "concurrent" | "dynamicImport" | "createInjectable" | "createAsyncProxy" | "checkSharpSchema" | "unwarpReadonly" | "outcome" | "extractOutcome" | "success" | "failed" | "match" | "isStatus" | "eitherize" | "parseSrtTime" | "formatSrtTime" | "parseSrt" | "createSrt" | "ivk" | "range" | "s2l" | "l2s">;
 export type UtilFunc = typeof UtilFunc;
+export {};

package/dist/UtilHttp.d.ts

@@ -1,8 +1,7 @@
 import http from 'http';
-import type { LogLevel } from "@zwa73/js-utils";
+import type { LogLevel, PromiseRetries } from "@zwa73/js-utils";
 import { PromiseQueue } from "@zwa73/js-utils";
 import FormData from "form-data";
-import type { PromiseRetries } from "./UtilFunctions";
 import type { AnyString, JToken, MPromise, PartialOption, StatusVerifyFn } from "./UtilInterfaces";
 /**网络请求返回值 */
 export type RequestResult<T> = {

package/package.json

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