node-karin 1.15.4 → 1.15.5

package/dist/index.d.ts

@@ -8,7 +8,8 @@ import { Job } from 'node-schedule';
 import fs$1, { WriteStream } from 'node:fs';
 import { Readable } from 'node:stream';
 import { AxiosRequestConfig, AxiosResponse } from 'axios';
-import YAML from 'yaml';
+import * as _yaml from 'yaml';
+import { Document, parse, stringify, parseDocument, YAMLSeq, YAMLMap } from 'yaml';
 import { FSWatcher } from 'chokidar';
 import { ExecException as ExecException$1, exec as exec$2 } from 'node:child_process';
 import { Request as Request$1, Router, Response, RequestHandler, Express } from 'express';
@@ -8158,8 +8159,8 @@ type Save = {
 /** YAML 编辑器 */
 declare class YamlEditor {
     filePath: string;
-    doc: YAML.Document;
-    document: YAML.Document;
+    doc: Document;
+    document: Document;
     constructor(file: string);
     /**
      * 获取指定路径的值
@@ -8312,7 +8313,16 @@ declare const comment: (filePath: string, commentConfig: string | YamlComment) =
  */
 declare const applyComments: (editor: YamlEditor, comments: YamlComment) => void;
 /** YAML 工具 */
-declare const yaml: typeof YAML & {
+declare const yaml: {
+    parse: typeof parse;
+    stringify: typeof stringify;
+    parseDocument: typeof parseDocument;
+    Document: typeof Document;
+    YAMLSeq: typeof YAMLSeq;
+    YAMLMap: typeof YAMLMap;
+    isMap: <K = unknown, V = unknown>(node: any) => node is YAMLMap<K, V>;
+    isSeq: <T = unknown>(node: any) => node is YAMLSeq<T>;
+    isPair: <K = unknown, V = unknown>(node: any) => node is _yaml.Pair<K, V>;
     /** 读取并解析 YAML 文件 */
     read: ReadFunction;
     /** 保存数据并写入注释 */

package/dist/index.mjs

@@ -4,7 +4,8 @@ import require$$2 from 'os';
 import require$$3 from 'crypto';
 import { fileURLToPath } from 'url';
 import fs5, { promises, existsSync as existsSync$1 } from 'node:fs';
-import YAML, { isMap, isSeq, isPair } from 'yaml';
+import * as yaml2 from 'yaml';
+import { parseDocument, YAMLSeq, YAMLMap, isMap, isSeq, isPair, parse, stringify, Document } from 'yaml';
 import { spawn, execSync, exec as exec$2 } from 'node:child_process';
 import path4, { join } from 'node:path';
 import chokidar from 'chokidar';
@@ -81,7 +82,7 @@ function requireMain() {
   const packageJson = require$$4;
   const version2 = packageJson.version;
   const LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/mg;
-  function parse2(src) {
+  function parse5(src) {
     const obj = {};
     let lines = src.toString();
     lines = lines.replace(/\r\n?/mg, "\n");
@@ -324,7 +325,7 @@ function requireMain() {
     _parseVault: _parseVault2,
     config: config3,
     decrypt: decrypt2,
-    parse: parse2,
+    parse: parse5,
     populate: populate2
   };
   main$1.exports.configDotenv = DotenvModule.configDotenv;
@@ -504,7 +505,7 @@ var init_env = __esm({
     isWorkspace = () => {
       const workspace = fs5.existsSync(`${process.cwd()}/pnpm-workspace.yaml`);
       if (!workspace) return false;
-      const data = YAML.parse(fs5.readFileSync(`${process.cwd()}/pnpm-workspace.yaml`, "utf-8"));
+      const data = yaml2.parse(fs5.readFileSync(`${process.cwd()}/pnpm-workspace.yaml`, "utf-8"));
       return Array.isArray(data.packages) && data.packages.length > 0;
     };
     setProcessEnv = (key, value) => {
@@ -624,10 +625,10 @@ var init_require = __esm({
       if (parser2) return parser2(content);
       if (type) {
         if (type === "json") return JSON.parse(content);
-        if (type === "yaml" || type === "yml") return YAML.parse(content);
+        if (type === "yaml" || type === "yml") return yaml2.parse(content);
       }
       if (absPath2.endsWith(".json")) return JSON.parse(content);
-      if (absPath2.endsWith(".yaml") || absPath2.endsWith(".yml")) return YAML.parse(content);
+      if (absPath2.endsWith(".yaml") || absPath2.endsWith(".yml")) return yaml2.parse(content);
       return content;
     };
     setInterval(() => {
@@ -1524,7 +1525,7 @@ var init_yaml = __esm({
       document;
       constructor(file2) {
         this.filePath = file2;
-        const data = YAML.parseDocument(fs5.existsSync(file2) ? fs5.readFileSync(file2, "utf8") : file2);
+        const data = parseDocument(fs5.existsSync(file2) ? fs5.readFileSync(file2, "utf8") : file2);
         this.doc = data;
         this.document = data;
       }
@@ -1602,9 +1603,9 @@ var init_yaml = __esm({
           const _path = typeof path36 === "string" ? isSplit ? path36.split(".") : [path36] : path36;
           let current = this.document.getIn(_path);
           if (!current) {
-            current = new YAML.YAMLSeq();
+            current = new YAMLSeq();
             this.document.setIn(_path, current);
-          } else if (!(current instanceof YAML.YAMLSeq)) {
+          } else if (!(current instanceof YAMLSeq)) {
             logger.error("[YamlEditor] \u6307\u5B9A\u7684\u8DEF\u5F84\u4E0D\u662F\u6570\u7EC4");
             return false;
           } else {
@@ -1631,7 +1632,7 @@ var init_yaml = __esm({
             logger.error("[YamlEditor] \u6307\u5B9A\u7684\u8DEF\u5F84\u4E0D\u5B58\u5728");
             return false;
           }
-          if (!(current instanceof YAML.YAMLSeq)) {
+          if (!(current instanceof YAMLSeq)) {
             logger.error("[YamlEditor] \u6307\u5B9A\u7684\u8DEF\u5F84\u4E0D\u662F\u6570\u7EC4");
             return false;
           }
@@ -1673,9 +1674,9 @@ var init_yaml = __esm({
           const _path = typeof path36 === "string" ? isSplit ? path36.split(".") : [path36] : path36;
           const current = this.document.getIn(_path);
           if (!current) return false;
-          if (current instanceof YAML.YAMLSeq) {
+          if (current instanceof YAMLSeq) {
             return current.items.some((item) => lodash3.isEqual(item.toJSON(), value));
-          } else if (current instanceof YAML.YAMLMap) {
+          } else if (current instanceof YAMLMap) {
             return Array.from(current.values()).some((v) => lodash3.isEqual(v.toJSON(), value));
           } else {
             return lodash3.isEqual(current, value);
@@ -1700,8 +1701,8 @@ var init_yaml = __esm({
        */
       pusharr(value) {
         try {
-          if (!(this.document.contents instanceof YAML.YAMLSeq)) {
-            this.document.contents = new YAML.YAMLSeq();
+          if (!(this.document.contents instanceof YAMLSeq)) {
+            this.document.contents = new YAMLSeq();
             logger.debug("[YamlEditor] \u6839\u8282\u70B9\u5DF2\u8F6C\u6362\u4E3A\u6570\u7EC4");
           }
           this.document.contents.add(value);
@@ -1718,7 +1719,7 @@ var init_yaml = __esm({
        */
       delarr(index4) {
         try {
-          if (!(this.document.contents instanceof YAML.YAMLSeq)) {
+          if (!(this.document.contents instanceof YAMLSeq)) {
             throw new Error("[YamlEditor] \u6839\u8282\u70B9\u4E0D\u662F\u6570\u7EC4");
           }
           if (index4 < 0 || index4 >= this.document.contents.items.length) {
@@ -1827,7 +1828,7 @@ var init_yaml = __esm({
       }
     };
     read = (path36) => {
-      const data = YAML.parse(fs5.readFileSync(path36, "utf-8"));
+      const data = parse(fs5.readFileSync(path36, "utf-8"));
       read.save = (options) => {
         try {
           save(path36, data, typeof options === "string" ? JSON.parse(options) : options);
@@ -1842,7 +1843,7 @@ var init_yaml = __esm({
     };
     write = (path36, value) => {
       try {
-        fs5.writeFileSync(path36, YAML.stringify(value));
+        fs5.writeFileSync(path36, stringify(value));
         return true;
       } catch {
         return false;
@@ -1850,10 +1851,10 @@ var init_yaml = __esm({
     };
     save = (path36, value, options) => {
       if (!options) {
-        fs5.writeFileSync(path36, YAML.stringify(value));
+        fs5.writeFileSync(path36, stringify(value));
         return;
       }
-      const editor = new YamlEditor(YAML.stringify(value));
+      const editor = new YamlEditor(stringify(value));
       const comment2 = typeof options === "string" ? JSON.parse(fs5.readFileSync(options, "utf8")) : options;
       applyComments(editor, comment2);
       fs5.writeFileSync(path36, editor.document.toString());
@@ -1876,7 +1877,16 @@ var init_yaml = __esm({
         }
       }
     };
-    yaml3 = Object.assign(YAML, {
+    yaml3 = {
+      parse: parse,
+      stringify,
+      parseDocument,
+      Document,
+      YAMLSeq,
+      YAMLMap,
+      isMap,
+      isSeq,
+      isPair,
       /** 读取并解析 YAML 文件 */
       read,
       /** 保存数据并写入注释 */
@@ -1885,7 +1895,7 @@ var init_yaml = __esm({
       comment,
       /** 批量添加注释 */
       applyComments
-    });
+    };
   }
 });
 var fnStore, lockMethod, unlockMethod, lockProp, lock;
@@ -7907,12 +7917,18 @@ var init_update = __esm({
       }
     };
     getPkgVersion = async (name) => {
+      let pkg2;
+      try {
+        pkg2 = await getPkg();
+      } catch {
+        pkg2 = void 0;
+      }
+      if (pkg2?.name === name) {
+        return pkg2?.version || "";
+      }
       const { stdout, error } = await exec(`npm list ${name} --depth=0`);
       if (stdout) {
         const data = stdout.toString();
-        if (data.includes("empty") || data.includes("extraneous")) {
-          throw new Error(`\u83B7\u53D6\u5931\u8D25\uFF0C${name} \u672A\u5B89\u88C5`);
-        }
         const esc = escapeRegex2(name);
         const reg = new RegExp(`${esc}@([0-9A-Za-z-.+]+)`, "gm");
         const match = reg.exec(data);
@@ -7920,17 +7936,18 @@ var init_update = __esm({
           return match[1].trim();
         }
       }
+      const spec = pkg2?.dependencies?.[name] || pkg2?.devDependencies?.[name] || pkg2?.peerDependencies?.[name];
+      if (spec) {
+        return extractSemver(spec) || spec;
+      }
       if (error) {
         const stack = error?.stack?.toString() || "";
-        if (stack.includes("empty") || stack.includes("extraneous")) {
+        if (stack.includes("empty")) {
           throw new Error(`\u83B7\u53D6\u5931\u8D25\uFF0C${name} \u672A\u5B89\u88C5`);
         }
         throw error;
       }
-      const pkg2 = await getPkg();
-      const spec = pkg2?.dependencies?.[name] || pkg2?.devDependencies?.[name] || pkg2?.peerDependencies?.[name];
-      if (!spec) return "";
-      return extractSemver(spec) || spec;
+      return "";
     };
     getRemotePkgVersion = async (name, tag = "latest") => {
       const cmd = tag === "latest" ? `npm show ${name} version` : `npm show ${name} dist-tags.${tag}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "1.15.4",
+  "version": "1.15.5",
   "description": "Lightweight, efficient, concise, and stable robot framework.",
   "keywords": [
     "node",