@zwa73/utils 1.0.268 → 1.0.270

package/dist/UtilClass/Markdown.d.ts

@@ -5,17 +5,23 @@ type ExtractBlockOpt = {
     /**将标题从结构中排除 */
     trimTitle: boolean;
 };
+type FromArg = {
+    data?: Record<string, any>;
+    content?: string;
+};
 /**Markdown解析器 */
 export declare class Markdown {
-    data: Record<string, any>;
-    content: string;
-    constructor(data: Record<string, any>, content: string);
+    data?: Record<string, any> | undefined;
+    content?: string | undefined;
+    private constructor();
     /**从内容文本构建Md */
     static parse(ctx?: string): Promise<Markdown>;
     /**从文件构建Md */
     static fromFile(filepath: string): Promise<Markdown>;
+    /**从数据构建 */
+    static from(arg: FromArg): Markdown;
     /**输出md文本 */
-    stringify(opt: Exclude<Parameters<typeof stringify>[2], string | number>): Promise<string>;
+    stringify(opt: Exclude<Parameters<typeof stringify>[2], string | number>): string;
     /**根据标题提取块
      * @param opt - 选项
      */

package/dist/UtilClass/Markdown.js

@@ -24,7 +24,7 @@ class Markdown {
     }
     /**从内容文本构建Md */
     static async parse(ctx = '') {
-        const { data, content } = (await getMatter())(ctx);
+        const { data, content } = (await getMatter())(ctx.replace(/\r\n/g, '\n'));
         return new Markdown(data, content);
     }
     /**从文件构建Md */
@@ -32,9 +32,13 @@ class Markdown {
         const context = (await fs_1.default.promises.readFile(filepath, 'utf-8')).replace(/\r\n/g, '\n');
         return Markdown.parse(context);
     }
+    /**从数据构建 */
+    static from(arg) {
+        return new Markdown(arg.data, arg.content);
+    }
     /**输出md文本 */
-    async stringify(opt) {
-        const yamlText = Object.values(this.data).length > 0 ? `---\n${(0, yaml_1.stringify)(this.data, opt)}---\n` : '';
+    stringify(opt) {
+        const yamlText = Object.values(this.data ?? {}).length > 0 ? `---\n${(0, yaml_1.stringify)(this.data, opt)}---\n` : '';
         return `${yamlText}${this.content}`;
         //return (await getMatter()).stringify(this.content,this.data);
     }
@@ -56,7 +60,7 @@ class Markdown {
          * - (?=\n${level} |$)：直到下一个同级标题或文件结束
          */
         const pattern = new RegExp(`(^|\\n)${level} ${content}[\\s\\S]*?(?=\\n${level} |$)`);
-        const match = this.content.match(pattern);
+        const match = (this.content ?? '').match(pattern);
         const result = match ? match[0].trim() : undefined;
         return trimTitle && result !== undefined
             ? result.replace(new RegExp(`^${level} ${content}\\n?`), '')

package/dist/UtilClass/index.d.ts

@@ -1,3 +1,4 @@
 export * from './Hbs';
+export * from './Markdown';
 export type { EventData, DListMiddleNode, DListHeadNode, DListTailNode, DListInvalidNode, DListMaybeNode, DListNode, BridgeInterface } from "@zwa73/js-utils";
 export { Stream, Spool, SmartCache, SequenceQueue, PromiseQueue, Piper, EventSystem, DLinkedList, DelayQueue, Bridge } from "@zwa73/js-utils";

package/dist/UtilClass/index.js

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Bridge = exports.DelayQueue = exports.DLinkedList = exports.EventSystem = exports.Piper = exports.PromiseQueue = exports.SequenceQueue = exports.SmartCache = exports.Spool = exports.Stream = void 0;
 __exportStar(require("./Hbs"), exports);
+__exportStar(require("./Markdown"), exports);
 var js_utils_1 = require("@zwa73/js-utils");
 Object.defineProperty(exports, "Stream", { enumerable: true, get: function () { return js_utils_1.Stream; } });
 Object.defineProperty(exports, "Spool", { enumerable: true, get: function () { return js_utils_1.Spool; } });

package/package.json

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