@wenyan-md/core 2.0.2 → 2.0.4

package/dist/core.js

@@ -1293,6 +1293,7 @@ const DEFAULT_CSS_UPDATES = {
   ]
 };
 export {
+  addFootnotes,
   createCssModifier,
   createWenyanCore,
   getAllGzhThemes,

package/dist/http.js

@@ -0,0 +1 @@
+

package/dist/publish.js

@@ -2,49 +2,62 @@ import { JSDOM } from "jsdom";
 import { fileFromPath } from "formdata-node/file-from-path";
 import path from "node:path";
 import { stat } from "node:fs/promises";
-import { R as RuntimeEnv } from "./runtimeEnv-pU2mTDLR.js";
+import { createWechatClient } from "./wechat.js";
 import { FormDataEncoder } from "form-data-encoder";
 import { FormData } from "formdata-node";
 import { Readable } from "node:stream";
-const tokenUrl = "https://api.weixin.qq.com/cgi-bin/token";
-const publishUrl = "https://api.weixin.qq.com/cgi-bin/draft/add";
-const uploadUrl = "https://api.weixin.qq.com/cgi-bin/material/add_material";
-function createWechatClient(adapter) {
-  return {
-    async fetchAccessToken(appId, appSecret) {
-      const res = await adapter.fetch(
-        `${tokenUrl}?grant_type=client_credential&appid=${appId}&secret=${appSecret}`
-      );
-      if (!res.ok) throw new Error(await res.text());
-      return res.json();
-    },
-    async uploadMaterial(type, file, filename, accessToken) {
-      const multipart = adapter.createMultipart("media", file, filename);
-      const res = await adapter.fetch(`${uploadUrl}?access_token=${accessToken}&type=${type}`, {
-        ...multipart,
-        method: "POST"
-      });
-      const data = await res.json();
-      if (data.errcode && data.errcode !== 0) {
-        throw new Error(`${data.errcode}: ${data.errmsg}`);
+function normalizePath(p) {
+  return p.replace(/\\/g, "/").replace(/\/+$/, "");
+}
+function isAbsolutePath(path2) {
+  if (!path2) return false;
+  const winAbsPattern = /^[a-zA-Z]:\//;
+  const linuxAbsPattern = /^\//;
+  return winAbsPattern.test(path2) || linuxAbsPattern.test(path2);
+}
+const RuntimeEnv = {
+  isContainer: !!process.env.CONTAINERIZED,
+  hostFilePath: normalizePath(process.env.HOST_FILE_PATH || ""),
+  containerFilePath: normalizePath(process.env.CONTAINER_FILE_PATH || "/mnt/host-downloads"),
+  resolveLocalPath(inputPath, relativeBase) {
+    if (!this.isContainer) {
+      if (relativeBase) {
+        return path.resolve(relativeBase, inputPath);
+      } else {
+        if (!path.isAbsolute(inputPath)) {
+          throw new Error(
+            `Invalid input: '${inputPath}'. When relativeBase is not provided, inputPath must be an absolute path.`
+          );
+        }
+        return path.normalize(inputPath);
+      }
+    }
+    let normalizedInput = normalizePath(inputPath);
+    relativeBase = normalizePath(relativeBase || "");
+    if (relativeBase) {
+      if (!isAbsolutePath(normalizedInput)) {
+        normalizedInput = relativeBase + (normalizedInput.startsWith("/") ? "" : "/") + normalizedInput;
+      }
+    } else {
+      if (!isAbsolutePath(normalizedInput)) {
+        throw new Error(
+          `Invalid input: '${inputPath}'. When relativeBase is not provided, inputPath must be an absolute path.`
+        );
+      }
+    }
+    if (normalizedInput.startsWith(this.hostFilePath)) {
+      let relativePart = normalizedInput.slice(this.hostFilePath.length);
+      if (relativePart && !relativePart.startsWith("/")) {
+        return normalizedInput;
       }
-      if (data.url?.startsWith("http://")) {
-        data.url = data.url.replace(/^http:\/\//i, "https://");
+      if (!relativePart.startsWith("/")) {
+        relativePart = "/" + relativePart;
       }
-      return data;
-    },
-    async publishArticle(title, content, thumbMediaId, accessToken) {
-      const res = await adapter.fetch(`${publishUrl}?access_token=${accessToken}`, {
-        method: "POST",
-        body: JSON.stringify({
-          articles: [{ title, content, thumb_media_id: thumbMediaId }]
-        })
-      });
-      if (!res.ok) throw new Error(await res.text());
-      return res.json();
+      return this.containerFilePath + relativePart;
     }
-  };
-}
+    return normalizedInput;
+  }
+};
 const nodeHttpAdapter = {
   fetch,
   createMultipart(field, file, filename) {

package/dist/types/core/index.d.ts

@@ -30,3 +30,4 @@ export { getMacStyleCss, registerMacStyle } from "./theme/macStyleRegistry.js";
 export * from "./platform/medium.js";
 export * from "./platform/zhihu.js";
 export * from "./platform/toutiao.js";
+export { addFootnotes } from "./renderer/footnotesRender.js";

package/dist/types/node/wrapper.d.ts

@@ -8,4 +8,3 @@ export interface StyledContent {
 export declare function renderStyledContent(content: string, options?: ApplyStylesOptions): Promise<StyledContent>;
 export declare function getGzhContent(content: string, themeId: string, hlThemeId: string, isMacStyle?: boolean, isAddFootnote?: boolean): Promise<StyledContent>;
 export * from "./configStore.js";
-export * from "./runtimeEnv.js";

package/dist/types/{wechat/core.d.ts → wechat.d.ts}

@@ -4,3 +4,4 @@ export declare function createWechatClient(adapter: HttpAdapter): {
     uploadMaterial(type: string, file: Blob, filename: string, accessToken: string): Promise<any>;
     publishArticle(title: string, content: string, thumbMediaId: string, accessToken: string): Promise<any>;
 };
+export type WechatClient = ReturnType<typeof createWechatClient>;

package/dist/wechat.js

@@ -0,0 +1,42 @@
+const tokenUrl = "https://api.weixin.qq.com/cgi-bin/token";
+const publishUrl = "https://api.weixin.qq.com/cgi-bin/draft/add";
+const uploadUrl = "https://api.weixin.qq.com/cgi-bin/material/add_material";
+function createWechatClient(adapter) {
+  return {
+    async fetchAccessToken(appId, appSecret) {
+      const res = await adapter.fetch(
+        `${tokenUrl}?grant_type=client_credential&appid=${appId}&secret=${appSecret}`
+      );
+      if (!res.ok) throw new Error(await res.text());
+      return res.json();
+    },
+    async uploadMaterial(type, file, filename, accessToken) {
+      const multipart = adapter.createMultipart("media", file, filename);
+      const res = await adapter.fetch(`${uploadUrl}?access_token=${accessToken}&type=${type}`, {
+        ...multipart,
+        method: "POST"
+      });
+      const data = await res.json();
+      if (data.errcode && data.errcode !== 0) {
+        throw new Error(`${data.errcode}: ${data.errmsg}`);
+      }
+      if (data.url?.startsWith("http://")) {
+        data.url = data.url.replace(/^http:\/\//i, "https://");
+      }
+      return data;
+    },
+    async publishArticle(title, content, thumbMediaId, accessToken) {
+      const res = await adapter.fetch(`${publishUrl}?access_token=${accessToken}`, {
+        method: "POST",
+        body: JSON.stringify({
+          articles: [{ title, content, thumb_media_id: thumbMediaId }]
+        })
+      });
+      if (!res.ok) throw new Error(await res.text());
+      return res.json();
+    }
+  };
+}
+export {
+  createWechatClient
+};

package/dist/wrapper.js

@@ -3,7 +3,6 @@ import { createWenyanCore } from "./core.js";
 import path from "node:path";
 import os from "node:os";
 import fs from "node:fs";
-import { R } from "./runtimeEnv-pU2mTDLR.js";
 const defaultConfig = {};
 const configDir = process.env.APPDATA ? path.join(process.env.APPDATA, "wenyan-md") : path.join(os.homedir(), ".config", "wenyan-md");
 const configPath = path.join(configDir, "config.json");
@@ -112,7 +111,6 @@ async function getGzhContent(content, themeId, hlThemeId, isMacStyle = true, isA
   });
 }
 export {
-  R as RuntimeEnv,
   configDir,
   configPath,
   configStore,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wenyan-md/core",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "Core library for Wenyan markdown rendering & publishing",
   "author": "Lei <caol64@gmail.com> (https://github.com/caol64)",
   "license": "Apache-2.0",
@@ -28,16 +28,23 @@
   "exports": {
     ".": {
       "import": "./dist/core.js",
-      "types": "./dist/types/core/index.d.ts",
-      "browser": "./dist/browser/wenyan-core.js"
+      "types": "./dist/types/core/index.d.ts"
     },
     "./publish": {
       "import": "./dist/publish.js",
-      "types": "./dist/types/wechat/publish.d.ts"
+      "types": "./dist/types/node/publish.d.ts"
     },
     "./wrapper": {
       "import": "./dist/wrapper.js",
       "types": "./dist/types/node/wrapper.d.ts"
+    },
+    "./wechat": {
+      "import": "./dist/wechat.js",
+      "types": "./dist/types/wechat.d.ts"
+    },
+    "./http": {
+      "import": "./dist/http.js",
+      "types": "./dist/types/http.d.ts"
     }
   },
   "devDependencies": {

package/dist/runtimeEnv-pU2mTDLR.js

@@ -1,56 +0,0 @@
-import path from "node:path";
-function normalizePath(p) {
-  return p.replace(/\\/g, "/").replace(/\/+$/, "");
-}
-function isAbsolutePath(path2) {
-  if (!path2) return false;
-  const winAbsPattern = /^[a-zA-Z]:\//;
-  const linuxAbsPattern = /^\//;
-  return winAbsPattern.test(path2) || linuxAbsPattern.test(path2);
-}
-const RuntimeEnv = {
-  isContainer: !!process.env.CONTAINERIZED,
-  hostFilePath: normalizePath(process.env.HOST_FILE_PATH || ""),
-  containerFilePath: normalizePath(process.env.CONTAINER_FILE_PATH || "/mnt/host-downloads"),
-  resolveLocalPath(inputPath, relativeBase) {
-    if (!this.isContainer) {
-      if (relativeBase) {
-        return path.resolve(relativeBase, inputPath);
-      } else {
-        if (!path.isAbsolute(inputPath)) {
-          throw new Error(
-            `Invalid input: '${inputPath}'. When relativeBase is not provided, inputPath must be an absolute path.`
-          );
-        }
-        return path.normalize(inputPath);
-      }
-    }
-    let normalizedInput = normalizePath(inputPath);
-    relativeBase = normalizePath(relativeBase || "");
-    if (relativeBase) {
-      if (!isAbsolutePath(normalizedInput)) {
-        normalizedInput = relativeBase + (normalizedInput.startsWith("/") ? "" : "/") + normalizedInput;
-      }
-    } else {
-      if (!isAbsolutePath(normalizedInput)) {
-        throw new Error(
-          `Invalid input: '${inputPath}'. When relativeBase is not provided, inputPath must be an absolute path.`
-        );
-      }
-    }
-    if (normalizedInput.startsWith(this.hostFilePath)) {
-      let relativePart = normalizedInput.slice(this.hostFilePath.length);
-      if (relativePart && !relativePart.startsWith("/")) {
-        return normalizedInput;
-      }
-      if (!relativePart.startsWith("/")) {
-        relativePart = "/" + relativePart;
-      }
-      return this.containerFilePath + relativePart;
-    }
-    return normalizedInput;
-  }
-};
-export {
-  RuntimeEnv as R
-};