giime 0.6.45 → 0.7.1

package/lib/utils/src/http/url.d.ts

@@ -1,5 +1,15 @@
 /**
  * 获取当前页面的域
  * @example https://www.baidu.com/s?wd=hello&ie=utf-8 => .baidu.com
+ * @example https://127.0.0.1:5000/dashboard => 127.0.0.1
+ * @example http://localhost:3000/test => localhost
  */
 export declare function getDomain(): string | undefined;
+/**
+ * 拼接 url 路径，自动处理多余的 /
+ * @param {...string[]} parts 路径片段
+ * @returns {string}
+ * @example urlJoin('https://www.baidu.com', 's', 'wd=hello') => https://www.baidu.com/s/wd=hello
+ * @example urlJoin('/', 'ai/copywriting/gen') => /ai/copywriting/gen
+ */
+export declare function urlJoin(...parts: string[]): string;

package/lib/utils/src/http/url.js

@@ -6,18 +6,40 @@ function getDomain() {
   const match = url.match(domainPattern);
   if (match) {
     const domain = match[1];
-    if (/^(localhost|(\d{1,3}\.){3}\d{1,3})$/.test(domain)) {
-      return void 0;
+    const domainWithoutPort = domain.split(":")[0];
+    if (/^(\d{1,3}\.){3}\d{1,3}$/.test(domainWithoutPort)) {
+      return domainWithoutPort;
     }
-    const domainParts = domain.split(".");
+    if (domainWithoutPort === "localhost") {
+      return "localhost";
+    }
+    const domainParts = domainWithoutPort.split(".");
     if (domainParts.length > 2) {
       return `.${domainParts.slice(-2).join(".")}`;
     } else {
-      return `.${domain}`;
+      return `.${domainWithoutPort}`;
     }
   }
   return void 0;
 }
+function urlJoin(...parts) {
+  if (parts.length === 0)
+    return "";
+  if (parts.length === 1)
+    return parts[0];
+  const result = parts.map((part, i) => {
+    if (i === 0) {
+      if (part === "/")
+        return "";
+      return part.replace(/\/+$/, "");
+    }
+    if (i === parts.length - 1)
+      return part.replace(/^\/+/, "");
+    return part.replace(/^\/+|\/+$/g, "");
+  }).filter(Boolean).join("/");
+  return parts[0] === "/" ? "/" + result : result;
+}
 
 exports.getDomain = getDomain;
+exports.urlJoin = urlJoin;
 //# sourceMappingURL=url.js.map

package/lib/utils/src/http/url.js.map

@@ -1 +1 @@
-{"version":3,"file":"url.js","sources":["../../../../../../packages/utils/src/http/url.ts"],"sourcesContent":["/**\n * 获取当前页面的域\n * @example https://www.baidu.com/s?wd=hello&ie=utf-8 => .baidu.com\n */\nexport function getDomain() {\n  const url = window.location.href;\n  // eslint-disable-next-line no-useless-escape\n  const domainPattern = /https?:\\/\\/([^\\/]+)/;\n  const match = url.match(domainPattern);\n\n  if (match) {\n    const domain = match[1];\n    // 检查是否是IP地址或localhost\n    if (/^(localhost|(\\d{1,3}\\.){3}\\d{1,3})$/.test(domain)) {\n      return undefined;\n    }\n\n    // 提取主域名部分\n    const domainParts = domain.split('.');\n    if (domainParts.length > 2) {\n      return `.${domainParts.slice(-2).join('.')}`;\n    } else {\n      return `.${domain}`;\n    }\n  }\n\n  return undefined;\n}\n\n// // 使用示例\n// console.log(getDomain());\n"],"names":[],"mappings":";;AAIO,SAAS,SAAY,GAAA;AAC1B,EAAM,MAAA,GAAA,GAAM,OAAO,QAAS,CAAA,IAAA,CAAA;AAE5B,EAAA,MAAM,aAAgB,GAAA,qBAAA,CAAA;AACtB,EAAM,MAAA,KAAA,GAAQ,GAAI,CAAA,KAAA,CAAM,aAAa,CAAA,CAAA;AAErC,EAAA,IAAI,KAAO,EAAA;AACT,IAAM,MAAA,MAAA,GAAS,MAAM,CAAC,CAAA,CAAA;AAEtB,IAAI,IAAA,qCAAA,CAAsC,IAAK,CAAA,MAAM,CAAG,EAAA;AACtD,MAAO,OAAA,KAAA,CAAA,CAAA;AAAA,KACT;AAGA,IAAM,MAAA,WAAA,GAAc,MAAO,CAAA,KAAA,CAAM,GAAG,CAAA,CAAA;AACpC,IAAI,IAAA,WAAA,CAAY,SAAS,CAAG,EAAA;AAC1B,MAAA,OAAO,IAAI,WAAY,CAAA,KAAA,CAAM,EAAE,CAAE,CAAA,IAAA,CAAK,GAAG,CAAC,CAAA,CAAA,CAAA;AAAA,KACrC,MAAA;AACL,MAAA,OAAO,IAAI,MAAM,CAAA,CAAA,CAAA;AAAA,KACnB;AAAA,GACF;AAEA,EAAO,OAAA,KAAA,CAAA,CAAA;AACT;;;;"}
+{"version":3,"file":"url.js","sources":["../../../../../../packages/utils/src/http/url.ts"],"sourcesContent":["/**\n * 获取当前页面的域\n * @example https://www.baidu.com/s?wd=hello&ie=utf-8 => .baidu.com\n * @example https://127.0.0.1:5000/dashboard => 127.0.0.1\n * @example http://localhost:3000/test => localhost\n */\nexport function getDomain() {\n  const url = window.location.href;\n  // eslint-disable-next-line no-useless-escape\n  const domainPattern = /https?:\\/\\/([^\\/]+)/;\n  const match = url.match(domainPattern);\n\n  if (match) {\n    const domain = match[1];\n    // 去除端口号，只保留域名或IP部分\n    const domainWithoutPort = domain.split(':')[0];\n\n    // 检查是否是IP地址，如果是则直接返回IP\n    if (/^(\\d{1,3}\\.){3}\\d{1,3}$/.test(domainWithoutPort)) {\n      return domainWithoutPort;\n    }\n\n    // 检查是否是localhost，如果是则直接返回localhost\n    if (domainWithoutPort === 'localhost') {\n      return 'localhost';\n    }\n\n    // 提取主域名部分（对于真实域名，返回 .domain.com 格式）\n    const domainParts = domainWithoutPort.split('.');\n    if (domainParts.length > 2) {\n      return `.${domainParts.slice(-2).join('.')}`;\n    } else {\n      return `.${domainWithoutPort}`;\n    }\n  }\n\n  return undefined;\n}\n\n// // 使用示例\n// console.log(getDomain());\n/**\n * 拼接 url 路径，自动处理多余的 /\n * @param {...string[]} parts 路径片段\n * @returns {string}\n * @example urlJoin('https://www.baidu.com', 's', 'wd=hello') => https://www.baidu.com/s/wd=hello\n * @example urlJoin('/', 'ai/copywriting/gen') => /ai/copywriting/gen\n */\nexport function urlJoin(...parts: string[]): string {\n  if (parts.length === 0) return '';\n  if (parts.length === 1) return parts[0];\n\n  const result = parts\n    .map((part, i) => {\n      if (i === 0) {\n        // 对于第一个参数，如果只是 '/'，保留为空但记住它\n        if (part === '/') return '';\n        return part.replace(/\\/+$/, ''); // 否则去掉结尾/\n      }\n      if (i === parts.length - 1) return part.replace(/^\\/+/, ''); // 最后一个去掉开头/\n\n      return part.replace(/^\\/+|\\/+$/g, ''); // 中间的去掉头尾/\n    })\n    .filter(Boolean)\n    .join('/');\n\n  // 如果第一个参数是 '/'，在结果前加上 '/'\n  return parts[0] === '/' ? '/' + result : result;\n}\n"],"names":[],"mappings":";;AAMO,SAAS,SAAY,GAAA;AAC1B,EAAM,MAAA,GAAA,GAAM,OAAO,QAAS,CAAA,IAAA,CAAA;AAE5B,EAAA,MAAM,aAAgB,GAAA,qBAAA,CAAA;AACtB,EAAM,MAAA,KAAA,GAAQ,GAAI,CAAA,KAAA,CAAM,aAAa,CAAA,CAAA;AAErC,EAAA,IAAI,KAAO,EAAA;AACT,IAAM,MAAA,MAAA,GAAS,MAAM,CAAC,CAAA,CAAA;AAEtB,IAAA,MAAM,iBAAoB,GAAA,MAAA,CAAO,KAAM,CAAA,GAAG,EAAE,CAAC,CAAA,CAAA;AAG7C,IAAI,IAAA,yBAAA,CAA0B,IAAK,CAAA,iBAAiB,CAAG,EAAA;AACrD,MAAO,OAAA,iBAAA,CAAA;AAAA,KACT;AAGA,IAAA,IAAI,sBAAsB,WAAa,EAAA;AACrC,MAAO,OAAA,WAAA,CAAA;AAAA,KACT;AAGA,IAAM,MAAA,WAAA,GAAc,iBAAkB,CAAA,KAAA,CAAM,GAAG,CAAA,CAAA;AAC/C,IAAI,IAAA,WAAA,CAAY,SAAS,CAAG,EAAA;AAC1B,MAAA,OAAO,IAAI,WAAY,CAAA,KAAA,CAAM,EAAE,CAAE,CAAA,IAAA,CAAK,GAAG,CAAC,CAAA,CAAA,CAAA;AAAA,KACrC,MAAA;AACL,MAAA,OAAO,IAAI,iBAAiB,CAAA,CAAA,CAAA;AAAA,KAC9B;AAAA,GACF;AAEA,EAAO,OAAA,KAAA,CAAA,CAAA;AACT,CAAA;AAWO,SAAS,WAAW,KAAyB,EAAA;AAClD,EAAA,IAAI,MAAM,MAAW,KAAA,CAAA;AAAG,IAAO,OAAA,EAAA,CAAA;AAC/B,EAAA,IAAI,MAAM,MAAW,KAAA,CAAA;AAAG,IAAA,OAAO,MAAM,CAAC,CAAA,CAAA;AAEtC,EAAA,MAAM,MAAS,GAAA,KAAA,CACZ,GAAI,CAAA,CAAC,MAAM,CAAM,KAAA;AAChB,IAAA,IAAI,MAAM,CAAG,EAAA;AAEX,MAAA,IAAI,IAAS,KAAA,GAAA;AAAK,QAAO,OAAA,EAAA,CAAA;AACzB,MAAO,OAAA,IAAA,CAAK,OAAQ,CAAA,MAAA,EAAQ,EAAE,CAAA,CAAA;AAAA,KAChC;AACA,IAAI,IAAA,CAAA,KAAM,MAAM,MAAS,GAAA,CAAA;AAAG,MAAO,OAAA,IAAA,CAAK,OAAQ,CAAA,MAAA,EAAQ,EAAE,CAAA,CAAA;AAE1D,IAAO,OAAA,IAAA,CAAK,OAAQ,CAAA,YAAA,EAAc,EAAE,CAAA,CAAA;AAAA,GACrC,CACA,CAAA,MAAA,CAAO,OAAO,CAAA,CACd,KAAK,GAAG,CAAA,CAAA;AAGX,EAAA,OAAO,KAAM,CAAA,CAAC,CAAM,KAAA,GAAA,GAAM,MAAM,MAAS,GAAA,MAAA,CAAA;AAC3C;;;;;"}

package/lib/utils/src/vue/resolver.d.ts

@@ -4,7 +4,10 @@ import type { ProxyOptions } from 'vite';
 import * as http from 'node:http';
 export declare function kebabCase(key: string): string;
 export declare const GiimeResolver: () => ComponentResolver[];
+export interface GiimeBypassOptions {
+    showLog?: boolean;
+}
 /**
  * webpack-dev-server style bypass function
  */
-export declare const bypass: (req: http.IncomingMessage, res: http.ServerResponse | undefined, options: ProxyOptions) => void;
+export declare const bypass: (req: http.IncomingMessage, res: http.ServerResponse | undefined, options: ProxyOptions, giimeOptions?: GiimeBypassOptions) => void;

package/lib/utils/src/vue/resolver.js

@@ -22,11 +22,14 @@ const GiimeResolver = () => {
     }
   ];
 };
-const bypass = (req, res, options) => {
+const bypass = (req, res, options, giimeOptions) => {
   const targetPath = new URL(options.target?.toString() ?? "").pathname.replace(/\/$/, "");
   const rewrittenPath = options.rewrite?.(req.url) ?? "";
   const fullPath = `${targetPath}${rewrittenPath}`;
   const proxyUrl = new URL(fullPath, options.target?.toString());
+  if (giimeOptions?.showLog) {
+    console.log("proxyUrl", proxyUrl.toString());
+  }
   res?.setHeader("x-giime-proxy-url", proxyUrl.toString());
 };
 

package/lib/utils/src/vue/resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.js","sources":["../../../../../../packages/utils/src/vue/resolver.ts"],"sourcesContent":["import type { ComponentResolver } from 'unplugin-vue-components';\nimport type { ProxyOptions } from 'vite';\nimport * as http from 'node:http';\n\nexport function kebabCase(key: string) {\n  const result = key.replace(/([A-Z])/g, ' $1').trim();\n  return result.split(' ').join('-').toLowerCase();\n}\nexport const GiimeResolver = (): ComponentResolver[] => {\n  return [\n    {\n      type: 'component',\n      resolve: async (name: string) => {\n        if (!name.match(/^Gm[A-Z]/)) return;\n        // const partialName = kebabCase(name.slice(2));\n        // where `componentName` is always CapitalCase\n        return { name, from: 'giime' };\n      },\n    },\n    {\n      type: 'directive',\n      resolve: async () => {\n        return;\n      },\n    },\n  ];\n};\n/**\n * webpack-dev-server style bypass function\n */\nexport const bypass = (\n  req: http.IncomingMessage,\n  /** undefined for WebSocket upgrade requests */\n  res: http.ServerResponse | undefined,\n  options: ProxyOptions,\n) => {\n  // 获取请求路径，处理后缀斜杠的问题\n  const targetPath = new URL(options.target?.toString() ?? '').pathname.replace(/\\/$/, '');\n  // 使用 rewrite 函数处理请求路径，并处理后缀斜杠的问题\n  const rewrittenPath = options.rewrite?.(req.url!) ?? '';\n  // 合并路径\n  const fullPath = `${targetPath}${rewrittenPath}`;\n\n  // 构造完整的代理 URL\n  const proxyUrl = new URL(fullPath, options.target?.toString());\n\n  // 设置响应头\n  res?.setHeader('x-giime-proxy-url', proxyUrl.toString());\n};\n"],"names":[],"mappings":";;AAIO,SAAS,UAAU,GAAa,EAAA;AACrC,EAAA,MAAM,SAAS,GAAI,CAAA,OAAA,CAAQ,UAAY,EAAA,KAAK,EAAE,IAAK,EAAA,CAAA;AACnD,EAAA,OAAO,OAAO,KAAM,CAAA,GAAG,EAAE,IAAK,CAAA,GAAG,EAAE,WAAY,EAAA,CAAA;AACjD,CAAA;AACO,MAAM,gBAAgB,MAA2B;AACtD,EAAO,OAAA;AAAA,IACL;AAAA,MACE,IAAM,EAAA,WAAA;AAAA,MACN,OAAA,EAAS,OAAO,IAAiB,KAAA;AAC/B,QAAI,IAAA,CAAC,IAAK,CAAA,KAAA,CAAM,UAAU,CAAA;AAAG,UAAA,OAAA;AAG7B,QAAO,OAAA,EAAE,IAAM,EAAA,IAAA,EAAM,OAAQ,EAAA,CAAA;AAAA,OAC/B;AAAA,KACF;AAAA,IACA;AAAA,MACE,IAAM,EAAA,WAAA;AAAA,MACN,SAAS,YAAY;AACnB,QAAA,OAAA;AAAA,OACF;AAAA,KACF;AAAA,GACF,CAAA;AACF,EAAA;AAIO,MAAM,MAAS,GAAA,CACpB,GAEA,EAAA,GAAA,EACA,OACG,KAAA;AAEH,EAAA,MAAM,UAAa,GAAA,IAAI,GAAI,CAAA,OAAA,CAAQ,MAAQ,EAAA,QAAA,EAAc,IAAA,EAAE,CAAE,CAAA,QAAA,CAAS,OAAQ,CAAA,KAAA,EAAO,EAAE,CAAA,CAAA;AAEvF,EAAA,MAAM,aAAgB,GAAA,OAAA,CAAQ,OAAU,GAAA,GAAA,CAAI,GAAI,CAAK,IAAA,EAAA,CAAA;AAErD,EAAA,MAAM,QAAW,GAAA,CAAA,EAAG,UAAU,CAAA,EAAG,aAAa,CAAA,CAAA,CAAA;AAG9C,EAAA,MAAM,WAAW,IAAI,GAAA,CAAI,UAAU,OAAQ,CAAA,MAAA,EAAQ,UAAU,CAAA,CAAA;AAG7D,EAAA,GAAA,EAAK,SAAU,CAAA,mBAAA,EAAqB,QAAS,CAAA,QAAA,EAAU,CAAA,CAAA;AACzD;;;;;;"}
+{"version":3,"file":"resolver.js","sources":["../../../../../../packages/utils/src/vue/resolver.ts"],"sourcesContent":["import type { ComponentResolver } from 'unplugin-vue-components';\nimport type { ProxyOptions } from 'vite';\nimport * as http from 'node:http';\n\nexport function kebabCase(key: string) {\n  const result = key.replace(/([A-Z])/g, ' $1').trim();\n  return result.split(' ').join('-').toLowerCase();\n}\nexport const GiimeResolver = (): ComponentResolver[] => {\n  return [\n    {\n      type: 'component',\n      resolve: async (name: string) => {\n        if (!name.match(/^Gm[A-Z]/)) return;\n        // const partialName = kebabCase(name.slice(2));\n        // where `componentName` is always CapitalCase\n        return { name, from: 'giime' };\n      },\n    },\n    {\n      type: 'directive',\n      resolve: async () => {\n        return;\n      },\n    },\n  ];\n};\nexport interface GiimeBypassOptions {\n  showLog?: boolean;\n}\n\n/**\n * webpack-dev-server style bypass function\n */\nexport const bypass = (\n  req: http.IncomingMessage,\n  /** undefined for WebSocket upgrade requests */\n  res: http.ServerResponse | undefined,\n  options: ProxyOptions,\n  giimeOptions?: GiimeBypassOptions,\n) => {\n  // 获取请求路径，处理后缀斜杠的问题\n  const targetPath = new URL(options.target?.toString() ?? '').pathname.replace(/\\/$/, '');\n  // 使用 rewrite 函数处理请求路径，并处理后缀斜杠的问题\n  const rewrittenPath = options.rewrite?.(req.url!) ?? '';\n  // 合并路径\n  const fullPath = `${targetPath}${rewrittenPath}`;\n\n  // 构造完整的代理 URL\n  const proxyUrl = new URL(fullPath, options.target?.toString());\n\n  if (giimeOptions?.showLog) {\n    console.log('proxyUrl', proxyUrl.toString());\n  }\n  // 设置响应头\n  res?.setHeader('x-giime-proxy-url', proxyUrl.toString());\n};\n"],"names":[],"mappings":";;AAIO,SAAS,UAAU,GAAa,EAAA;AACrC,EAAA,MAAM,SAAS,GAAI,CAAA,OAAA,CAAQ,UAAY,EAAA,KAAK,EAAE,IAAK,EAAA,CAAA;AACnD,EAAA,OAAO,OAAO,KAAM,CAAA,GAAG,EAAE,IAAK,CAAA,GAAG,EAAE,WAAY,EAAA,CAAA;AACjD,CAAA;AACO,MAAM,gBAAgB,MAA2B;AACtD,EAAO,OAAA;AAAA,IACL;AAAA,MACE,IAAM,EAAA,WAAA;AAAA,MACN,OAAA,EAAS,OAAO,IAAiB,KAAA;AAC/B,QAAI,IAAA,CAAC,IAAK,CAAA,KAAA,CAAM,UAAU,CAAA;AAAG,UAAA,OAAA;AAG7B,QAAO,OAAA,EAAE,IAAM,EAAA,IAAA,EAAM,OAAQ,EAAA,CAAA;AAAA,OAC/B;AAAA,KACF;AAAA,IACA;AAAA,MACE,IAAM,EAAA,WAAA;AAAA,MACN,SAAS,YAAY;AACnB,QAAA,OAAA;AAAA,OACF;AAAA,KACF;AAAA,GACF,CAAA;AACF,EAAA;AAQO,MAAM,MAAS,GAAA,CACpB,GAEA,EAAA,GAAA,EACA,SACA,YACG,KAAA;AAEH,EAAA,MAAM,UAAa,GAAA,IAAI,GAAI,CAAA,OAAA,CAAQ,MAAQ,EAAA,QAAA,EAAc,IAAA,EAAE,CAAE,CAAA,QAAA,CAAS,OAAQ,CAAA,KAAA,EAAO,EAAE,CAAA,CAAA;AAEvF,EAAA,MAAM,aAAgB,GAAA,OAAA,CAAQ,OAAU,GAAA,GAAA,CAAI,GAAI,CAAK,IAAA,EAAA,CAAA;AAErD,EAAA,MAAM,QAAW,GAAA,CAAA,EAAG,UAAU,CAAA,EAAG,aAAa,CAAA,CAAA,CAAA;AAG9C,EAAA,MAAM,WAAW,IAAI,GAAA,CAAI,UAAU,OAAQ,CAAA,MAAA,EAAQ,UAAU,CAAA,CAAA;AAE7D,EAAA,IAAI,cAAc,OAAS,EAAA;AACzB,IAAA,OAAA,CAAQ,GAAI,CAAA,UAAA,EAAY,QAAS,CAAA,QAAA,EAAU,CAAA,CAAA;AAAA,GAC7C;AAEA,EAAA,GAAA,EAAK,SAAU,CAAA,mBAAA,EAAqB,QAAS,CAAA,QAAA,EAAU,CAAA,CAAA;AACzD;;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "giime",
-  "version": "0.6.45",
+  "version": "0.7.1",
   "description": "A Component Library for Vue 3",
   "keywords": [
     "giime",