Add types tests

gear-tech · Oct 2, 2024 · 2e6b905 · 2e6b905
1 parent 4a1afff
commit 2e6b905
Show file tree

Hide file tree

Showing 4 changed files with 245 additions and 65 deletions.
diff --git a/js/cli/rollup.config.js b/js/cli/rollup.config.js
@@ -25,7 +25,7 @@ function updateConfigVersions() {
       config.versions['polkadot-api'] = sailsJs.peerDependencies['@polkadot/api'];
       config.versions['sails-js'] = sailsJs.version;
       config.versions['typescript'] = rootPkgJson.devDependencies.typescript;
-      config.versions['@gear-js/react-hooks'] = sailsJs.devDependencies['@gear-js/react-hooks'];
+      config.versions['gear-js-hooks'] = sailsJs.devDependencies['@gear-js/react-hooks'];
 
       writeFileSync('src/config.json', JSON.stringify(config, null, 2));
     },

diff --git a/js/cli/src/generate/hooks-gen.ts b/js/cli/src/generate/hooks-gen.ts
@@ -22,7 +22,7 @@ export class HooksGenerator extends BaseGenerator {
         useProgramEvent,
         UseProgramParameters as useSailsProgramParameters,
         UseProgramQueryParameters,
-        UseProgramEventParameters`,
+        UseProgramEventParameters`
       )
       // TODO: combine with above after hooks update
       .import(
@@ -34,7 +34,7 @@ export class HooksGenerator extends BaseGenerator {
         FunctionName,
         QueryName,
         QueryReturn,
-        EventReturn`,
+        EventReturn`
       )
       .import(`./${LIB_FILE_NAME}`, 'Program');
   };
@@ -62,9 +62,9 @@ export class HooksGenerator extends BaseGenerator {
       .line('QueryReturn<ProgramType[TServiceName][TFunctionName]>', false)
       .reduceIndent()
       .line('>,', false)
-      .line("'program' | 'serviceName' | 'functionName'", false)
+      .line("'serviceName' | 'functionName'", false)
       .reduceIndent()
-      .line('> & ProgramParameter')
+      .line('>')
       .line()
       .line('type UseEventParameters<', false)
       .increaseIndent()
@@ -81,16 +81,16 @@ export class HooksGenerator extends BaseGenerator {
       .line('EventCallbackArgs<Event<ProgramType[TServiceName][TFunctionName]>>', false)
       .reduceIndent()
       .line('>,', false)
-      .line("'program' | 'serviceName' | 'functionName'", false)
+      .line("'serviceName' | 'functionName'", false)
       .reduceIndent()
-      .line('> & ProgramParameter')
+      .line('>')
       .line();
   };
 
   private generateUseProgram = () =>
     this._out
       .block('export function useProgram(parameters: UseProgramParameters)', () =>
-        this._out.line('return useSailsProgram({ library: Program, ...parameters })'),
+        this._out.line('return useSailsProgram({ library: Program, ...parameters })')
       )
       .line();
 
@@ -101,9 +101,9 @@ export class HooksGenerator extends BaseGenerator {
       .block(`export function ${name}({ program }: ProgramParameter)`, () =>
         this._out.line(
           `return useSendProgramTransaction({ program, serviceName: '${toLowerCaseFirst(
-            serviceName,
-          )}', functionName: '${toLowerCaseFirst(functionName)}' })`,
-        ),
+            serviceName
+          )}', functionName: '${toLowerCaseFirst(functionName)}' })`
+        )
       )
       .line();
   };
@@ -115,9 +115,9 @@ export class HooksGenerator extends BaseGenerator {
       .block(`export function ${name}({ program }: ProgramParameter)`, () =>
         this._out.line(
           `return usePrepareProgramTransaction({ program, serviceName: '${toLowerCaseFirst(
-            serviceName,
-          )}', functionName: '${toLowerCaseFirst(functionName)}' })`,
-        ),
+            serviceName
+          )}', functionName: '${toLowerCaseFirst(functionName)}' })`
+        )
       )
       .line();
   };
@@ -132,8 +132,8 @@ export class HooksGenerator extends BaseGenerator {
         `export function ${name}(parameters: UseQueryParameters<'${formattedServiceName}', '${formattedFunctionName}'>)`,
         () =>
           this._out.line(
-            `return useProgramQuery({ ...parameters, serviceName: '${formattedServiceName}', functionName: '${formattedFunctionName}' })`,
-          ),
+            `return useProgramQuery({ ...parameters, serviceName: '${formattedServiceName}', functionName: '${formattedFunctionName}' })`
+          )
       )
       .line();
   };
@@ -148,8 +148,8 @@ export class HooksGenerator extends BaseGenerator {
         `export function ${name}(parameters: UseEventParameters<'${formattedServiceName}', '${functionName}'>)`,
         () =>
           this._out.line(
-            `return useProgramEvent({...parameters, serviceName: '${formattedServiceName}', functionName: '${functionName}' })`,
-          ),
+            `return useProgramEvent({...parameters, serviceName: '${formattedServiceName}', functionName: '${functionName}' })`
+          )
       )
       .line();
   };