@zwa73/utils 1.0.267 → 1.0.269

package/dist/UtilClass/Markdown.d.ts

@@ -0,0 +1,34 @@
+import { stringify } from 'yaml';
+type ExtractBlockOpt = {
+    /**要提取的标题 必须为 "# 标题" 的格式 */
+    title: string;
+    /**将标题从结构中排除 */
+    trimTitle: boolean;
+};
+type FromArg = {
+    data?: Record<string, any>;
+    content?: string;
+};
+/**Markdown解析器 */
+export declare class Markdown {
+    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): Promise<Markdown>;
+    /**输出md文本 */
+    stringify(opt: Exclude<Parameters<typeof stringify>[2], string | number>): Promise<string>;
+    /**根据标题提取块
+     * @param opt - 选项
+     */
+    extractBlock(opt: ExtractBlockOpt): string | undefined;
+    /**根据标题提取块内第一个json代码块
+     * @param opt - 选项
+     */
+    extractJson(title: string): string | undefined;
+}
+export {};

package/dist/UtilClass/Markdown.js

@@ -0,0 +1,76 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Markdown = void 0;
+const fs_1 = __importDefault(require("fs"));
+const js_utils_1 = require("@zwa73/js-utils");
+const UtilLogger_1 = require("../UtilLogger");
+const yaml_1 = require("yaml");
+const getMatter = async () => {
+    const matter = await js_utils_1.JsFunc.dynamicImport('gray-matter');
+    if (matter == undefined)
+        js_utils_1.JsFunc.throwError(`npm包 gray-matter 动态导入失败, 此包不会随@zwa73/utils自动安装, 可能是未安装, 可使用 npm i gray-matter@4.0.3 来安装`);
+    return matter;
+};
+/**Markdown解析器 */
+class Markdown {
+    data;
+    content;
+    constructor(data, content) {
+        this.data = data;
+        this.content = content;
+    }
+    /**从内容文本构建Md */
+    static async parse(ctx = '') {
+        const { data, content } = (await getMatter())(ctx.replace(/\r\n/g, '\n'));
+        return new Markdown(data, content);
+    }
+    /**从文件构建Md */
+    static async fromFile(filepath) {
+        const context = (await fs_1.default.promises.readFile(filepath, 'utf-8')).replace(/\r\n/g, '\n');
+        return Markdown.parse(context);
+    }
+    /**从数据构建 */
+    static async 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` : '';
+        return `${yamlText}${this.content}`;
+        //return (await getMatter()).stringify(this.content,this.data);
+    }
+    /**根据标题提取块
+     * @param opt - 选项
+     */
+    extractBlock(opt) {
+        const { title, trimTitle = false } = opt;
+        // 匹配标题格式，要求为 "# 标题" 或 "## 标题" 等
+        const matchTitle = title.match(/(#+) (.+)/);
+        if (matchTitle == null) {
+            UtilLogger_1.SLogger.warn(`${title} 不是有效的md标题, 必须为 "(#+) (标题)"`);
+            return undefined;
+        }
+        const [, level, content] = matchTitle;
+        /**构造正则：
+         * - (^|\n)${level} ${content}：匹配标题行（支持开头或换行）
+         * - [\s\S]*?：非贪婪匹配标题后的所有内容
+         * - (?=\n${level} |$)：直到下一个同级标题或文件结束
+         */
+        const pattern = new RegExp(`(^|\\n)${level} ${content}[\\s\\S]*?(?=\\n${level} |$)`);
+        const match = (this.content ?? '').match(pattern);
+        const result = match ? match[0].trim() : undefined;
+        return trimTitle && result !== undefined
+            ? result.replace(new RegExp(`^${level} ${content}\\n?`), '')
+            : result;
+    }
+    /**根据标题提取块内第一个json代码块
+     * @param opt - 选项
+     */
+    extractJson(title) {
+        return this.extractBlock({ title, trimTitle: true })?.trim().replace(/```json\n([\s\S]+)\n```/, '$1');
+    }
+}
+exports.Markdown = Markdown;

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/dist/UtilFileTools.js

@@ -144,7 +144,7 @@ var UtilFT;
     UtilFT.ensurePathExistsSync = ensurePathExistsSync;
     function loadJSONFileSync(filePath, opt) {
         try {
-            if (opt?.forceExt !== true && pathe_1.default.extname(filePath) !== '.json')
+            if (opt?.forceExt !== true && pathe_1.default.extname(filePath) == '')
                 filePath += '.json';
             const str = pathExistsSync(filePath)
                 ? fs.readFileSync(filePath, "utf-8")
@@ -167,7 +167,7 @@ var UtilFT;
     UtilFT.loadJSONFileSync = loadJSONFileSync;
     async function loadJSONFile(filePath, opt) {
         try {
-            if (opt?.forceExt !== true && pathe_1.default.extname(filePath) !== '.json')
+            if (opt?.forceExt !== true && pathe_1.default.extname(filePath) == '')
                 filePath += '.json';
             const str = (await pathExists(filePath))
                 ? await fs.promises.readFile(filePath, "utf-8")
@@ -202,7 +202,7 @@ var UtilFT;
      */
     async function writeJSONFile(filePath, token, opt) {
         const str = UtilFunctions_1.UtilFunc.stringifyJToken(token, opt);
-        if (opt?.forceExt !== true && pathe_1.default.extname(filePath) !== '.json')
+        if (opt?.forceExt !== true && pathe_1.default.extname(filePath) == '')
             filePath += '.json';
         // 判断文件路径是否存在 不存在则创建
         if (!(await pathExists(filePath)))

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.267",
+	"version": "1.0.269",
 	"description": "my utils",
 	"main": "dist/index.js",
 	"scripts": {
@@ -27,7 +27,8 @@
 		"pathe": "^1.1.2",
 		"querystring": "^0.2.1",
 		"winston": "^3.10.0",
-		"winston-daily-rotate-file": "^4.7.1"
+		"winston-daily-rotate-file": "^4.7.1",
+		"yaml": "^2.8.1"
 	},
 	"devDependencies": {
 		"@deepkit/type": "^1.0.1-alpha.153",