types: fix linter and prettier issues

package.json

@@ -4,8 +4,8 @@
   "version": "1.0.0",
   "license": "GPL-3.0-only",
   "scripts": {
-    "postinstall": "yarn workspace @joystream/types build",
-    "_postinstall": "yarn workspace @joystream/types build && yarn workspace @joystream/cd-schemas generate:all && yarn workspace @joystream/cd-schemas build && yarn workspace @joystream/cli build",
+    "postinstall": "yarn workspace @joystream/types build && yarn workspace @joystream/cd-schemas generate:all && yarn workspace @joystream/cd-schemas build",
+    "build-joystream-cli": "yarn workspace @joystream/cli build",
     "build": "./build.sh",
     "start": "./start.sh",
     "cargo-checks": "devops/git-hooks/pre-commit && devops/git-hooks/pre-push",
@@ -41,14 +41,14 @@
     "@polkadot/rpc-provider": "2.4.1",
     "@polkadot/metadata": "2.4.1",
     "babel-core": "^7.0.0-bridge.0",
-    "typescript": "^4.0.3",
+    "typescript": "^4.1.3",
     "bn.js": "^5.1.2",
     "@dzlzv/hydra-indexer-lib": "0.0.21-legacy.1.26.1"
   },
   "devDependencies": {
     "eslint": "^7.6.0",
     "husky": "^4.2.5",
-    "prettier": "2.0.2"
+    "prettier": "2.2.1"
   },
   "husky": {
     "hooks": {

types/augment/all/defs.json

@@ -174,6 +174,10 @@
         "stake_amount": "u128",
         "leaving_unstaking_period": "u32"
     },
+    "StakeParameters": {
+        "stake": "u128",
+        "staking_account_id": "AccountId"
+    },
     "StorageProviderId": "u64",
     "OpeningType": {
         "_enum": {
@@ -187,7 +191,7 @@
         "role_account_id": "AccountId",
         "reward_account_id": "AccountId",
         "description": "Text",
-        "stake_parameters": "Option<{\"stake\":\"u128\",\"staking_account_id\":\"AccountId\"}>"
+        "stake_parameters": "Option<StakeParameters>"
     },
     "Penalty": {
         "slashing_text": "Text",

types/augment/all/types.ts

@@ -67,7 +67,7 @@ export interface ApplyOnOpeningParameters extends Struct {
   readonly role_account_id: AccountId;
   readonly reward_account_id: AccountId;
   readonly description: Text;
-  readonly stake_parameters: Option<{"stake":"u128","staking_account_id":"AccountId"}>;
+  readonly stake_parameters: Option<StakeParameters>;
 }
 
 /** @name Approved */
@@ -745,6 +745,12 @@ export interface SideEffect extends Option<ITuple<[EntityId, EntityReferenceCoun
 /** @name SideEffects */
 export interface SideEffects extends Option<ReferenceCounterSideEffects> {}
 
+/** @name StakeParameters */
+export interface StakeParameters extends Struct {
+  readonly stake: u128;
+  readonly staking_account_id: AccountId;
+}
+
 /** @name StakePolicy */
 export interface StakePolicy extends Struct {
   readonly stake_amount: u128;

types/src/JoyStruct.ts

@@ -12,11 +12,10 @@ export interface ExtendedStruct<FieldTypes extends Record<string, Constructor>>
 export type ExtendedStructGetters<FieldTypes extends Record<string, Constructor>> = {
   [k in keyof FieldTypes]: InstanceType<FieldTypes[k]>
 }
+
 // More rich TypeScript definition of the Struct (includes automatically created getters)
-export type ExtendedStructDecorated<FieldTypes extends Record<string, Constructor>> = ExtendedStructGetters<
-  FieldTypes
-> &
-  ExtendedStruct<FieldTypes>
+export type ExtendedStructDecorated<T extends Record<string, Constructor>> = ExtendedStructGetters<T> &
+  ExtendedStruct<T>
 
 export interface StructConstructor<
   FieldTypes extends Record<string, Constructor>,

types/src/working-group/index.ts

@@ -179,6 +179,7 @@ export const workingGroupTypes: RegistryTypes = {
   Opening,
   OpeningId,
   StakePolicy,
+  StakeParameters,
   StorageProviderId,
   OpeningType,
   ApplyOnOpeningParameters,

yarn.lock

@@ -20930,16 +20930,16 @@ prettier@2.0.2:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.2.tgz#1ba8f3eb92231e769b7fcd7cb73ae1b6b74ade08"
   integrity sha512-5xJQIPT8BraI7ZnaDwSbu5zLrB6vvi8hVV58yHQ+QK64qrY40dULy0HSRlQ2/2IdzeBpjhDkqdcFBnFeDEMVdg==
 
+prettier@2.2.1, prettier@^2.0.5, prettier@^2.1.1, prettier@^2.1.2:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
+  integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
+
 prettier@^1.16.4, prettier@^1.18.2, prettier@^1.19.1:
   version "1.19.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
-prettier@^2.0.5, prettier@^2.1.1, prettier@^2.1.2:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
-  integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
-
 pretty-error@^2.0.2, pretty-error@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz#be89f82d81b1c86ec8fdfbc385045882727f93b6"
@@ -25590,7 +25590,7 @@ typescript-formatter@^7.2.2:
     commandpost "^1.0.0"
     editorconfig "^0.15.0"
 
-typescript@^3.0.3, typescript@^3.8.3, typescript@^3.9.5, typescript@^3.9.6, typescript@^3.9.7, typescript@^4.0.3:
+typescript@^3.0.3, typescript@^3.8.3, typescript@^3.9.5, typescript@^3.9.6, typescript@^3.9.7, typescript@^4.0.3, typescript@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7"
   integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==