fix: fix apifox includes encode character

Author: rookie-luochao

.changeset/mighty-bats-smash.md

@@ -0,0 +1,5 @@
+---
+'openapi-ts-request': patch
+---
+
+fix: fix apifox $ref includes encode character

src/generator/serviceGenarator.ts

@@ -72,6 +72,7 @@ import {
   getDefaultFileTag,
   getDefaultType,
   getFinalFileName,
+  getLastRefName,
   handleDuplicateTypeNames,
   isArraySchemaObject,
   isBinaryArraySchemaObject,
@@ -811,8 +812,7 @@ export default class ServiceGenerator {
       DEFAULT_SCHEMA) as SchemaObject;
 
     if (isReferenceObject(schema)) {
-      const refPaths = schema.$ref.split('/');
-      const refName = refPaths[refPaths.length - 1];
+      const refName = getLastRefName(schema.$ref);
       const childrenSchema = components.schemas[refName];
 
       if (isNonArraySchemaObject(childrenSchema) && this.config.dataFields) {
@@ -852,15 +852,13 @@ export default class ServiceGenerator {
             const isDirectObject =
               ((p.schema as SchemaObject)?.type === 'object' ||
                 (p as unknown as SchemaObject).type) === 'object';
-            const refList = (
+            const refName = getLastRefName(
               (p.schema as ReferenceObject)?.$ref ||
-              (p as unknown as ReferenceObject).$ref ||
-              ''
-            ).split('/');
-            const ref = refList[refList.length - 1];
+                (p as unknown as ReferenceObject).$ref
+            );
             const deRefObj =
               entries(this.openAPIData.components?.schemas).find(
-                ([k]) => k === ref
+                ([k]) => k === refName
               ) || [];
             const isRefObject =
               (deRefObj[1] as SchemaObject)?.type === 'object' &&
@@ -937,10 +935,10 @@ export default class ServiceGenerator {
 
   private resolveArray(schemaObject: ArraySchemaObject) {
     if (isReferenceObject(schemaObject.items)) {
-      const refPaths = schemaObject.items.$ref.split('/');
+      const refName = getLastRefName(schemaObject.items.$ref);
 
       return {
-        type: `${refPaths[refPaths.length - 1]}[]`,
+        type: `${refName}[]`,
       };
     }
 
@@ -1041,7 +1039,7 @@ export default class ServiceGenerator {
 
     if (refPaths[0] === '#') {
       const schema =
-        this.openAPIData.components?.schemas?.[refPaths[refPaths.length - 1]];
+        this.openAPIData.components?.schemas?.[getLastRefName(refObject.$ref)];
 
       if (!schema) {
         throw new Error(`[GenSDK] Data Error! Notfoud: ${refObject.$ref}`);

src/generator/util.ts

@@ -105,9 +105,15 @@ function getRefName(refObject: ReferenceObject | string) {
     return refObject;
   }
 
-  const refPaths = refObject.$ref.split('/');
+  return resolveTypeName(getLastRefName(refObject.$ref));
+}
+
+export function getLastRefName(refPath: string = '') {
+  const refPaths = refPath.split('/');
 
-  return resolveTypeName(refPaths[refPaths.length - 1]);
+  return refPaths.length > 0
+    ? decodeURIComponent(refPaths[refPaths.length - 1])
+    : '';
 }
 
 export function getDefaultType(
@@ -211,8 +217,7 @@ export function getDefaultType(
     const allofList = schemaObject.allOf.map((item) => {
       if (isReferenceObject(item)) {
         // 不使用 getRefName 函数处理，无法通过 schemas[schemaKey] 获取到schema
-        const refPaths = item.$ref.split('/');
-        const schemaKey = refPaths[refPaths.length - 1];
+        const schemaKey = getLastRefName(item.$ref);
 
         if ((schemas?.[schemaKey] as SchemaObject)?.enum) {
           return `I${getDefaultType(item, namespace)}`;
@@ -407,10 +412,7 @@ export function markAllowSchema(
   const refs = schemaStr?.match(/#\/components\/schemas\/([A-Za-z0-9._-]+)/g);
 
   forEach(refs, (ref) => {
-    const refPaths = ref.split('/');
-    const schema = schemas?.[
-      refPaths[refPaths.length - 1]
-    ] as ICustomSchemaObject;
+    const schema = schemas?.[getLastRefName(ref)] as ICustomSchemaObject;
 
     if (schema && !schema.isAllowed) {
       schema.isAllowed = true;