quantus/api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split into types-augment (#4350)

Browse Source 
* Aplit into types-augment

* Adjust

* Adjust, fix typegen run

* Adjust

* Rebuild

* Adjust

* Adjust

* CC
This commit is contained in:
Jaco
2021-12-18 17:31:18 +02:00
committed by GitHub
parent 2b2bad6725
commit fcee83d803
71 changed files with 449 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/typegen/package.json
+1
View File
@@ -37,6 +37,7 @@
"@polkadot/rpc-augment": "6.12.2-15",
"@polkadot/rpc-provider": "6.12.2-15",
"@polkadot/types": "6.12.2-15",
"@polkadot/types-augment": "6.12.2-15",
"@polkadot/types-codec": "6.12.2-15",
"@polkadot/types-create": "6.12.2-15",
"@polkadot/types-support": "6.12.2-15",
packages/typegen/scripts/aliases.cjs
+22 -16
View File
@@ -3,20 +3,26 @@
/* eslint-disable sort-keys */
module.exports = {
alias: {
'^@polkadot/api-augment(.*)': './packages/api-augment/src\\1',
'^@polkadot/api-base(.*)': './packages/api-base/src\\1',
'^@polkadot/api-derive(.*)': './packages/api-derive/src\\1',
'^@polkadot/api(.*)': './packages/api/src/\\1',
'^@polkadot/rpc-augment(.*)': './packages/rpc-augment/src\\1',
'^@polkadot/rpc-core(.*)': './packages/rpc-core/src\\1',
'^@polkadot/rpc-provider(.*)': './packages/rpc-provider/src\\1',
'^@polkadot/types-codec(.*)': './packages/types-codec/src\\1',
'^@polkadot/types-create(.*)': './packages/types-create/src\\1',
'^@polkadot/types-known(.*)': './packages/types-known/src\\1',
'^@polkadot/types-metadata(.*)': './packages/types-metadata/src\\1',
'^@polkadot/types-support(.*)': './packages/types-support/src\\1',
'^@polkadot/types(.*)': './packages/types/src\\1'
}
const alias = {
'^@polkadot/api-augment(.*)': './packages/api-augment/src\\1',
'^@polkadot/api-base(.*)': './packages/api-base/src\\1',
'^@polkadot/api-derive(.*)': './packages/api-derive/src\\1',
'^@polkadot/api(.*)': './packages/api/src/\\1',
'^@polkadot/rpc-augment(.*)': './packages/rpc-augment/src\\1',
'^@polkadot/rpc-core(.*)': './packages/rpc-core/src\\1',
'^@polkadot/rpc-provider(.*)': './packages/rpc-provider/src\\1',
'^@polkadot/types-(augment)(.*)': './packages/types-\\1/src\\2',
'^@polkadot/types-codec(.*)': './packages/types-codec/src\\1',
'^@polkadot/types-create(.*)': './packages/types-create/src\\1',
'^@polkadot/types-known(.*)': './packages/types-known/src\\1',
'^@polkadot/types-metadata(.*)': './packages/types-metadata/src\\1',
'^@polkadot/types-support(.*)': './packages/types-support/src\\1',
'^@polkadot/types(.*)': './packages/types/src\\1'
};
require('@babel/register')({
extensions: ['.js', '.ts'],
plugins: [
['module-resolver', { alias }]
]
});
packages/typegen/scripts/polkadot-types-chain-info.cjs
+1 -20
View File
@@ -2,8 +2,6 @@
// Copyright 2017-2021 @polkadot/typegen authors & contributors
// SPDX-License-Identifier: Apache-2.0
/* eslint-disable sort-keys */
let main;
try {
@@ -11,24 +9,7 @@ try {
} catch (error) {
process.env.JEST_WORKER_ID = '123';
require('@babel/register')({
extensions: ['.js', '.ts'],
plugins: [
['module-resolver', {
alias: {
'^@polkadot/api-derive(.*)': './packages/api-derive/src\\1',
'^@polkadot/api(.*)': './packages/api/src/\\1',
'^@polkadot/rpc-core(.*)': './packages/rpc-core/src\\1',
'^@polkadot/rpc-provider(.*)': './packages/rpc-provider/src\\1',
'^@polkadot/types-codec(.*)': './packages/types-codec/src\\1',
'^@polkadot/types-create(.*)': './packages/types-create/src\\1',
'^@polkadot/types-known(.*)': './packages/types-known/src\\1',
'^@polkadot/types-support(.*)': './packages/types-support/src\\1',
'^@polkadot/types(.*)': './packages/types/src\\1'
}
}]
]
});
require('./aliases.cjs');
main = require('../src/extractChain.ts').main;
}
packages/typegen/scripts/polkadot-types-from-chain.cjs
+1 -16
View File
@@ -2,8 +2,6 @@
// Copyright 2017-2021 @polkadot/typegen authors & contributors
// SPDX-License-Identifier: Apache-2.0
/* eslint-disable sort-keys */
let main;
try {
@@ -11,20 +9,7 @@ try {
} catch (error) {
process.env.JEST_WORKER_ID = '123';
require('@babel/register')({
extensions: ['.js', '.ts'],
plugins: [
['module-resolver', {
alias: {
'^@polkadot/types-codec(.*)': './packages/types-codec/src\\1',
'^@polkadot/types-create(.*)': './packages/types-create/src\\1',
'^@polkadot/types-known(.*)': './packages/types-known/src\\1',
'^@polkadot/types-support(.*)': './packages/types-support/src\\1',
'^@polkadot/types(.*)': './packages/types/src\\1'
}
}]
]
});
require('./aliases.cjs');
main = require('../src/fromChain').main;
}
packages/typegen/scripts/polkadot-types-from-defs.cjs
+1 -17
View File
@@ -2,8 +2,6 @@
// Copyright 2017-2021 @polkadot/typegen authors & contributors
// SPDX-License-Identifier: Apache-2.0
/* eslint-disable sort-keys */
let main;
try {
@@ -11,21 +9,7 @@ try {
} catch (error) {
process.env.JEST_WORKER_ID = '123';
require('@babel/register')({
extensions: ['.js', '.ts'],
plugins: [
['module-resolver', {
alias: {
'^@polkadot/typegen(.*)': './packages/typegen/src\\1',
'^@polkadot/types-codec(.*)': './packages/types-codec/src\\1',
'^@polkadot/types-create(.*)': './packages/types-create/src\\1',
'^@polkadot/types-known(.*)': './packages/types-known/src\\1',
'^@polkadot/types-support(.*)': './packages/types-support/src\\1',
'^@polkadot/types(.*)': './packages/types/src\\1'
}
}]
]
});
require('./aliases.cjs');
main = require('../src/fromDefs.ts').main;
}
packages/typegen/scripts/polkadot-types-internal-interfaces.cjs
+1 -16
View File
@@ -2,8 +2,6 @@
// Copyright 2017-2021 @polkadot/typegen authors & contributors
// SPDX-License-Identifier: Apache-2.0
/* eslint-disable sort-keys */
let main;
try {
@@ -11,20 +9,7 @@ try {
} catch (error) {
process.env.JEST_WORKER_ID = '123';
require('@babel/register')({
extensions: ['.js', '.ts'],
plugins: [
['module-resolver', {
alias: {
'^@polkadot/types-codec(.*)': './packages/types-codec/src\\1',
'^@polkadot/types-create(.*)': './packages/types-create/src\\1',
'^@polkadot/types-known(.*)': './packages/types-known/src\\1',
'^@polkadot/types-support(.*)': './packages/types-support/src\\1',
'^@polkadot/types(.*)': './packages/types/src\\1'
}
}]
]
});
require('./aliases.cjs');
main = require('../src/interfacesTs.ts').main;
}
packages/typegen/scripts/polkadot-types-internal-metadata.cjs
+1 -16
View File
@@ -2,8 +2,6 @@
// Copyright 2017-2021 @polkadot/typegen authors & contributors
// SPDX-License-Identifier: Apache-2.0
/* eslint-disable sort-keys */
let main;
try {
@@ -11,20 +9,7 @@ try {
} catch (error) {
process.env.JEST_WORKER_ID = '123';
require('@babel/register')({
extensions: ['.js', '.ts'],
plugins: [
['module-resolver', {
alias: {
'^@polkadot/types-codec(.*)': './packages/types-codec/src\\1',
'^@polkadot/types-create(.*)': './packages/types-create/src\\1',
'^@polkadot/types-known(.*)': './packages/types-known/src\\1',
'^@polkadot/types-support(.*)': './packages/types-support/src\\1',
'^@polkadot/types(.*)': './packages/types/src\\1'
}
}]
]
});
require('./aliases.cjs');
main = require('../src/metadataMd.ts').main;
}
packages/typegen/src/generate/consts.ts
+3 -3
View File
@@ -7,9 +7,9 @@ import type { ExtraTypes } from './types';
import Handlebars from 'handlebars';
import lookupDefinitions from '@polkadot/types/augment/lookup/definitions';
import * as defaultDefs from '@polkadot/types/interfaces/definitions';
import { Definitions } from '@polkadot/types/types';
import lookupDefinitions from '@polkadot/types-augment/augment/lookup/definitions';
import { stringCamelCase } from '@polkadot/util';
import { compareName, createImports, formatType, initMeta, readTemplate, setImports, writeFile } from '../util';
@@ -20,7 +20,7 @@ const generateForMetaTemplate = Handlebars.compile(readTemplate('consts'));
function generateForMeta (meta: Metadata, dest: string, extraTypes: ExtraTypes, isStrict: boolean, customLookupDefinitions?: Definitions): void {
writeFile(dest, (): string => {
const allTypes = {
'@polkadot/types/augment': {
'@polkadot/types-augment': {
lookup: {
...lookupDefinitions,
...customLookupDefinitions
@@ -71,7 +71,7 @@ function generateForMeta (meta: Metadata, dest: string, extraTypes: ExtraTypes,
modules,
types: [
...Object.keys(imports.localTypes).sort().map<{ file: string; types: string[] }>((packagePath) => ({
file: packagePath.replace('@polkadot/types/augment', '@polkadot/types'),
file: packagePath.replace('@polkadot/types-augment', '@polkadot/types'),
types: Object.keys(imports.localTypes[packagePath])
})),
{
packages/typegen/src/generate/events.ts
+3 -3
View File
@@ -7,9 +7,9 @@ import type { ExtraTypes } from './types';
import Handlebars from 'handlebars';
import lookupDefinitions from '@polkadot/types/augment/lookup/definitions';
import * as defaultDefs from '@polkadot/types/interfaces/definitions';
import { Definitions } from '@polkadot/types/types';
import lookupDefinitions from '@polkadot/types-augment/augment/lookup/definitions';
import { stringCamelCase } from '@polkadot/util';
import { compareName, createImports, formatType, initMeta, readTemplate, setImports, writeFile } from '../util';
@@ -20,7 +20,7 @@ const generateForMetaTemplate = Handlebars.compile(readTemplate('events'));
function generateForMeta (meta: Metadata, dest: string, extraTypes: ExtraTypes, isStrict: boolean, customLookupDefinitions?: Definitions): void {
writeFile(dest, (): string => {
const allTypes = {
'@polkadot/types/augment': {
'@polkadot/types-augment': {
lookup: {
...lookupDefinitions,
...customLookupDefinitions
@@ -63,7 +63,7 @@ function generateForMeta (meta: Metadata, dest: string, extraTypes: ExtraTypes,
modules,
types: [
...Object.keys(imports.localTypes).sort().map((packagePath): { file: string; types: string[] } => ({
file: packagePath.replace('@polkadot/types/augment', '@polkadot/types'),
file: packagePath.replace('@polkadot/types-augment', '@polkadot/types'),
types: Object.keys(imports.localTypes[packagePath])
})),
{
packages/typegen/src/generate/interfaceRegistry.ts
+1 -1
View File
@@ -79,6 +79,6 @@ export function generateInterfaceTypes (importDefinitions: { [importPath: string
export function generateDefaultInterface (): void {
generateInterfaceTypes(
{ '@polkadot/types/interfaces': defaultDefinitions },
'packages/types/src/augment/registry.ts'
'packages/types-augment/src/augment/registry.ts'
);
}
packages/typegen/src/generate/lookup.ts
+1 -1
View File
@@ -231,7 +231,7 @@ function generateLookup (destDir: string, entries: [string | undefined, HexStrin
}
// Generate `packages/types/src/lookup/*s`, the registry of all lookup types
export function generateDefaultLookup (destDir = 'packages/types/src/augment/lookup', staticData?: HexString): void {
export function generateDefaultLookup (destDir = 'packages/types-augment/src/augment/lookup', staticData?: HexString): void {
generateLookup(
destDir,
staticData
packages/typegen/src/generate/query.ts
+3 -3
View File
@@ -9,9 +9,9 @@ import type { ExtraTypes } from './types';
import Handlebars from 'handlebars';
import lookupDefinitions from '@polkadot/types/augment/lookup/definitions';
import * as defaultDefs from '@polkadot/types/interfaces/definitions';
import { unwrapStorageSi } from '@polkadot/types/primitive/StorageKey';
import lookupDefinitions from '@polkadot/types-augment/augment/lookup/definitions';
import { stringCamelCase } from '@polkadot/util';
import { compareName, createImports, formatType, getSimilarTypes, initMeta, readTemplate, setImports, TypeImports, writeFile } from '../util';
@@ -69,7 +69,7 @@ function entrySignature (lookup: PortableRegistry, allDefs: Record<string, Modul
function generateForMeta (registry: Registry, meta: Metadata, dest: string, extraTypes: ExtraTypes, isStrict: boolean, customLookupDefinitions?: Definitions): void {
writeFile(dest, (): string => {
const allTypes: ExtraTypes = {
'@polkadot/types/augment': {
'@polkadot/types-augment': {
lookup: {
...lookupDefinitions,
...customLookupDefinitions
@@ -120,7 +120,7 @@ function generateForMeta (registry: Registry, meta: Metadata, dest: string, extr
modules,
types: [
...Object.keys(imports.localTypes).sort().map((packagePath): { file: string; types: string[] } => ({
file: packagePath.replace('@polkadot/types/augment', '@polkadot/types'),
file: packagePath.replace('@polkadot/types-augment', '@polkadot/types'),
types: Object.keys(imports.localTypes[packagePath])
})),
{
packages/typegen/src/generate/rpc.ts
+1 -1
View File
@@ -131,7 +131,7 @@ export function generateRpcTypes (registry: TypeRegistry, importDefinitions: Rec
modules,
types: [
...Object.keys(imports.localTypes).sort().map((packagePath): { file: string; types: string[] } => ({
file: packagePath.replace('@polkadot/types/augment', '@polkadot/types'),
file: packagePath.replace('@polkadot/types-augment', '@polkadot/types'),
types: Object.keys(imports.localTypes[packagePath])
})),
{
packages/typegen/src/generate/tx.ts
+3 -3
View File
@@ -8,9 +8,9 @@ import type { ExtraTypes } from './types';
import Handlebars from 'handlebars';
import lookupDefinitions from '@polkadot/types/augment/lookup/definitions';
import * as defaultDefs from '@polkadot/types/interfaces/definitions';
import { Text } from '@polkadot/types/primitive';
import lookupDefinitions from '@polkadot/types-augment/augment/lookup/definitions';
import { stringCamelCase } from '@polkadot/util';
import { compareName, createImports, formatType, getSimilarTypes, initMeta, readTemplate, setImports, writeFile } from '../util';
@@ -32,7 +32,7 @@ function mapName (_name: Text): string {
function generateForMeta (registry: Registry, meta: Metadata, dest: string, extraTypes: ExtraTypes, isStrict: boolean, customLookupDefinitions?: Definitions): void {
writeFile(dest, (): string => {
const allTypes: ExtraTypes = {
'@polkadot/types/augment': {
'@polkadot/types-augment': {
lookup: {
...lookupDefinitions,
...customLookupDefinitions
@@ -105,7 +105,7 @@ function generateForMeta (registry: Registry, meta: Metadata, dest: string, extr
modules,
types: [
...Object.keys(imports.localTypes).sort().map((packagePath): { file: string; types: string[] } => ({
file: packagePath.replace('@polkadot/types/augment', '@polkadot/types'),
file: packagePath.replace('@polkadot/types-augment', '@polkadot/types'),
types: Object.keys(imports.localTypes[packagePath])
})),
{
packages/typegen/src/templates/interfaceRegistry.hbs
+1 -1
View File
@@ -2,7 +2,7 @@
{{{ importsRelative }}}
declare module '@polkadot/types/types/registry' {
declare module '@polkadot/types-augment/registry' {
{{{ importsPackage }}}
export interface InterfaceTypes {
packages/typegen/src/templates/lookup/types.hbs
+1 -1
View File
@@ -2,7 +2,7 @@
{{{ importsRelative }}}
declare module '@polkadot/types/lookup' {
declare module '@polkadot/types-augment/lookup' {
{{{ importsPackage }}}
{{#each items}}
packages/typegen/tsconfig.json
+3
View File
@@ -7,7 +7,10 @@
},
"references": [
{ "path": "../api" },
{ "path": "../api-augment" },
{ "path": "../rpc-augment" },
{ "path": "../rpc-provider" },
{ "path": "../types-augment" },
{ "path": "../types-codec" },
{ "path": "../types-support" }
]