@rexnow/rslib-plugin 3.1.1 → 3.1.2

package/dist/generators/danmu.d.ts

@@ -2,4 +2,7 @@ import type { SourceFile } from "ts-morph";
 /**
  * 生成弹幕模块接口
  */
-export declare function generateDanmuModuleInterfaces(nameSpaceName: string, sourceFile: SourceFile, module: WidgetModule): void;
+export declare function generateDanmuModuleInterfaces(nameSpaceName: string, sourceFile: SourceFile, module: WidgetModule, typeNames?: {
+    paramsTypeName: string;
+    returnTypeName: string;
+}): void;

package/dist/generators/stream.d.ts

@@ -1,2 +1,5 @@
 import type { SourceFile } from "ts-morph";
-export declare function generateStreamModuleInterface(nameSpaceName: string, sourceFile: SourceFile, module: WidgetModule): void;
+export declare function generateStreamModuleInterface(nameSpaceName: string, sourceFile: SourceFile, module: WidgetModule, typeNames?: {
+    paramsTypeName: string;
+    returnTypeName: string;
+}): void;

package/dist/generators/subtitle.d.ts

@@ -1,2 +1,5 @@
 import type { SourceFile } from "ts-morph";
-export declare function generateSubtitleModuleInterface(nameSpaceName: string, sourceFile: SourceFile, module: WidgetModule): void;
+export declare function generateSubtitleModuleInterface(nameSpaceName: string, sourceFile: SourceFile, module: WidgetModule, typeNames?: {
+    paramsTypeName: string;
+    returnTypeName: string;
+}): void;

package/dist/generators/video.d.ts

@@ -2,4 +2,7 @@ import type { SourceFile } from 'ts-morph';
 /**
  * 生成 Video 模块接口
  */
-export declare function generateVideoModuleInterface(nameSpaceName: string, sourceFile: SourceFile, module: WidgetModule): void;
+export declare function generateVideoModuleInterface(nameSpaceName: string, sourceFile: SourceFile, module: WidgetModule, typeNames?: {
+    paramsTypeName: string;
+    returnTypeName: string;
+}): void;

package/dist/index.js

@@ -6225,9 +6225,9 @@ function generateParamType(param) {
         ]
     };
 }
-function generateTypeName(module) {
-    const paramsTypeName = toPascalCase(`${module.functionName}Params`);
-    const returnTypeName = toPascalCase(`${module.functionName}ReturnType`);
+function generateTypeName(module, distinct = false) {
+    const paramsTypeName = distinct ? `${toPascalCase(module.id)}${toPascalCase(module.functionName)}Params` : toPascalCase(`${module.functionName}Params`);
+    const returnTypeName = distinct ? `${toPascalCase(module.id)}${toPascalCase(module.functionName)}ReturnType` : toPascalCase(`${module.functionName}ReturnType`);
     return {
         paramsTypeName,
         returnTypeName
@@ -6271,10 +6271,10 @@ function getReturnTypeExtends(moduleId) {
             return;
     }
 }
-function generateDanmuModuleInterfaces(nameSpaceName, sourceFile, module) {
+function generateDanmuModuleInterfaces(nameSpaceName, sourceFile, module, typeNames = generateTypeName(module)) {
     if ("danmu" !== module.type) return;
     const { id, title } = module;
-    const { paramsTypeName, returnTypeName } = generateTypeName(module);
+    const { paramsTypeName, returnTypeName } = typeNames;
     sourceFile.addInterface({
         name: paramsTypeName,
         docs: [
@@ -6300,10 +6300,9 @@ function generateDanmuModuleInterfaces(nameSpaceName, sourceFile, module) {
             }
         ] : []
     });
-    generateModuleFunctionType(sourceFile, module);
 }
-function generateStreamModuleInterface(nameSpaceName, sourceFile, module) {
-    const { paramsTypeName, returnTypeName } = generateTypeName(module);
+function generateStreamModuleInterface(nameSpaceName, sourceFile, module, typeNames = generateTypeName(module)) {
+    const { paramsTypeName, returnTypeName } = typeNames;
     sourceFile.addInterface({
         name: paramsTypeName,
         docs: [
@@ -6330,10 +6329,9 @@ function generateStreamModuleInterface(nameSpaceName, sourceFile, module) {
             if ("loadResource" === module.id) writer.write("Array<StreamSourceItem>");
         }
     });
-    generateModuleFunctionType(sourceFile, module);
 }
-function generateSubtitleModuleInterface(nameSpaceName, sourceFile, module) {
-    const { paramsTypeName, returnTypeName } = generateTypeName(module);
+function generateSubtitleModuleInterface(nameSpaceName, sourceFile, module, typeNames = generateTypeName(module)) {
+    const { paramsTypeName, returnTypeName } = typeNames;
     sourceFile.addInterface({
         name: paramsTypeName,
         docs: [
@@ -6360,10 +6358,9 @@ function generateSubtitleModuleInterface(nameSpaceName, sourceFile, module) {
             if ("loadSubtitle" === module.id) writer.write("Array<SubtitleItem>");
         }
     });
-    generateModuleFunctionType(sourceFile, module);
 }
-function generateVideoModuleInterface(nameSpaceName, sourceFile, module) {
-    const { paramsTypeName, returnTypeName } = generateTypeName(module);
+function generateVideoModuleInterface(nameSpaceName, sourceFile, module, typeNames = generateTypeName(module)) {
+    const { paramsTypeName, returnTypeName } = typeNames;
     sourceFile.addInterface({
         name: paramsTypeName,
         docs: [
@@ -6389,7 +6386,6 @@ function generateVideoModuleInterface(nameSpaceName, sourceFile, module) {
             'Array<VideoItem>'
         ]
     });
-    generateModuleFunctionType(sourceFile, module);
 }
 function toExecutableWidgetMetadataSource(content) {
     return content.replace(/\b(?:export\s+)?(?:const|let|var)\s+WidgetMetadata\b/g, 'WidgetMetadata');
@@ -6428,7 +6424,8 @@ function generateFunctionTypesFactory(api, sourceFile) {
             if (!widgetMetadataObject) return;
             const nameSpaceName = upperFirst(camelCase(widgetMetadataObject.id));
             const nameSpace = sourceFile.addModule({
-                name: nameSpaceName
+                name: nameSpaceName,
+                hasDeclareKeyword: true
             });
             nameSpace.addInterface({
                 name: "GlobalParams",
@@ -6441,25 +6438,49 @@ function generateFunctionTypesFactory(api, sourceFile) {
     };
 }
 function generateModuleInterfaces(nameSpaceName, sourceFile, modules) {
+    const modulesByFunctionName = new Map();
+    for (const module of modules){
+        const group = modulesByFunctionName.get(module.functionName);
+        if (group) group.push(module);
+        else modulesByFunctionName.set(module.functionName, [
+            module
+        ]);
+    }
     for (const module of modules){
         const { id, type: moduleType } = module;
+        const shared = (modulesByFunctionName.get(module.functionName)?.length ?? 0) > 1;
+        const typeNames = generateTypeName(module, shared);
         sourceFile.addStatements(`\n//#region ${id}`);
         switch(moduleType){
             case "danmu":
-                generateDanmuModuleInterfaces(nameSpaceName, sourceFile, module);
+                generateDanmuModuleInterfaces(nameSpaceName, sourceFile, module, typeNames);
                 break;
             case "stream":
-                generateStreamModuleInterface(nameSpaceName, sourceFile, module);
+                generateStreamModuleInterface(nameSpaceName, sourceFile, module, typeNames);
                 break;
             case "subtitle":
-                generateSubtitleModuleInterface(nameSpaceName, sourceFile, module);
+                generateSubtitleModuleInterface(nameSpaceName, sourceFile, module, typeNames);
                 break;
             default:
-                generateVideoModuleInterface(nameSpaceName, sourceFile, module);
+                generateVideoModuleInterface(nameSpaceName, sourceFile, module, typeNames);
                 break;
         }
+        if (!shared) generateModuleFunctionType(sourceFile, module);
         sourceFile.addStatements(`//#endregion ${id}`);
     }
+    for (const group of modulesByFunctionName.values()){
+        if (group.length < 2) continue;
+        const { paramsTypeName, returnTypeName } = generateTypeName(group[0]);
+        sourceFile.addTypeAlias({
+            name: paramsTypeName,
+            type: group.map((module)=>generateTypeName(module, true).paramsTypeName).join(" | ")
+        });
+        sourceFile.addTypeAlias({
+            name: returnTypeName,
+            type: group.map((module)=>generateTypeName(module, true).returnTypeName).join(" | ")
+        });
+        generateModuleFunctionType(sourceFile, group[0]);
+    }
 }
 async function clearExportDeclaration(distPath) {
     if (!node_fs.existsSync(distPath)) return;

package/dist/utils/index.d.ts

@@ -7,7 +7,7 @@ export declare const toPascalCase: (str: string) => string;
  * 生成参数类型
  */
 export declare function generateParamType(param: WidgetModuleParam): OptionalKind<PropertySignatureStructure>;
-export declare function generateTypeName(module: WidgetModule): {
+export declare function generateTypeName(module: WidgetModule, distinct?: boolean): {
     paramsTypeName: string;
     returnTypeName: string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rexnow/rslib-plugin",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "type": "module",
   "exports": {
     ".": {
@@ -17,7 +17,7 @@
     "provenance": true
   },
   "devDependencies": {
-    "@rexnow/libs": "3.1.1",
+    "@rexnow/libs": "3.1.2",
     "@rsbuild/core": "^2.2.5",
     "@rslib/core": "^1.0.0",
     "@rstest/adapter-rslib": "^0.11.12",