From 11f8cb6cfab1b4d519b2d1ab4f17ecc42594c020 Mon Sep 17 00:00:00 2001 From: Jaco Date: Fri, 24 Dec 2021 14:22:15 +0100 Subject: [PATCH] Align types-augment with api-augment (#4390) * Align types-augment with api-augment * Adjust CHANGELOG * Dependencies * Definitions * Adjust dependencies --- CHANGELOG.md | 2 +- packages/typegen/package.json | 2 - packages/typegen/scripts/execWithSrc.cjs | 2 +- packages/typegen/src/generate/consts.ts | 2 +- packages/typegen/src/generate/events.ts | 2 +- .../typegen/src/generate/interfaceRegistry.ts | 2 +- packages/typegen/src/generate/lookup.ts | 2 +- packages/typegen/src/generate/query.ts | 2 +- packages/typegen/src/generate/tx.ts | 2 +- packages/typegen/tsconfig.json | 2 +- packages/types-augment-lookup/LICENSE | 201 ------------------ packages/types-augment-lookup/README.md | 3 - packages/types-augment-lookup/package.json | 31 --- packages/types-augment-lookup/src/bundle.ts | 6 - .../types-augment-lookup/src/detectPackage.ts | 9 - packages/types-augment-lookup/src/index.ts | 6 - .../types-augment-lookup/src/packageInfo.ts | 6 - packages/types-augment-lookup/tsconfig.json | 12 -- packages/types-augment-registry/LICENSE | 201 ------------------ packages/types-augment-registry/README.md | 3 - packages/types-augment-registry/package.json | 31 --- packages/types-augment-registry/src/bundle.ts | 6 - .../src/detectPackage.ts | 9 - packages/types-augment-registry/src/index.ts | 6 - .../types-augment-registry/src/packageInfo.ts | 6 - packages/types-augment-registry/tsconfig.json | 12 -- packages/types-augment/package.json | 4 +- packages/types-augment/src/augment.ts | 4 +- packages/types-augment/src/detectPackage.ts | 6 +- .../src/lookup}/definitions.ts | 0 .../src/lookup}/index.ts | 0 .../src/lookup}/kusama.ts | 0 .../src/lookup}/polkadot.ts | 0 .../src/lookup}/substrate.ts | 0 .../src/lookup}/types-kusama.ts | 0 .../src/lookup}/types-polkadot.ts | 0 .../src/lookup}/types-substrate.ts | 0 .../src/lookup}/types.ts | 0 .../src/registry.ts} | 0 packages/types-augment/tsconfig.json | 4 +- tsconfig.base.json | 4 - tsconfig.json | 2 - yarn.lock | 28 +-- 43 files changed, 20 insertions(+), 600 deletions(-) delete mode 100644 packages/types-augment-lookup/LICENSE delete mode 100644 packages/types-augment-lookup/README.md delete mode 100644 packages/types-augment-lookup/package.json delete mode 100644 packages/types-augment-lookup/src/bundle.ts delete mode 100644 packages/types-augment-lookup/src/detectPackage.ts delete mode 100644 packages/types-augment-lookup/src/index.ts delete mode 100644 packages/types-augment-lookup/src/packageInfo.ts delete mode 100644 packages/types-augment-lookup/tsconfig.json delete mode 100644 packages/types-augment-registry/LICENSE delete mode 100644 packages/types-augment-registry/README.md delete mode 100644 packages/types-augment-registry/package.json delete mode 100644 packages/types-augment-registry/src/bundle.ts delete mode 100644 packages/types-augment-registry/src/detectPackage.ts delete mode 100644 packages/types-augment-registry/src/index.ts delete mode 100644 packages/types-augment-registry/src/packageInfo.ts delete mode 100644 packages/types-augment-registry/tsconfig.json rename packages/{types-augment-lookup/src/augment => types-augment/src/lookup}/definitions.ts (100%) rename packages/{types-augment-lookup/src/augment => types-augment/src/lookup}/index.ts (100%) rename packages/{types-augment-lookup/src/augment => types-augment/src/lookup}/kusama.ts (100%) rename packages/{types-augment-lookup/src/augment => types-augment/src/lookup}/polkadot.ts (100%) rename packages/{types-augment-lookup/src/augment => types-augment/src/lookup}/substrate.ts (100%) rename packages/{types-augment-lookup/src/augment => types-augment/src/lookup}/types-kusama.ts (100%) rename packages/{types-augment-lookup/src/augment => types-augment/src/lookup}/types-polkadot.ts (100%) rename packages/{types-augment-lookup/src/augment => types-augment/src/lookup}/types-substrate.ts (100%) rename packages/{types-augment-lookup/src/augment => types-augment/src/lookup}/types.ts (100%) rename packages/{types-augment-registry/src/augment.ts => types-augment/src/registry.ts} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9b520d5db..b12cf07e38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,9 +9,9 @@ Contributed: Changes: - Expose `@polkadot/api-augment/{kusama, polkadot, substrate}` for specific augmentations (The bare `@polkadot/api-augment` is equivalent to `/substrate`, keeping the existing behavior) +- Expose `@polkadot/types-augment/{lookup, registry}` variants (The bare `@polkadot/types-augment` applies both) - Expose `txHash` on submittable results, e.g. `tx.signAndSend(..., ({ txHash }) => ...)` - Align casing for TS & exposed queries (adjusts for `ALLCAPS` entries) -- Split `types-augment` into `registry` & `lookup` variants (better control) - Additional tests for `Option` codec (explicit in expectations) diff --git a/packages/typegen/package.json b/packages/typegen/package.json index 5a7d95c292..f6e35473ed 100644 --- a/packages/typegen/package.json +++ b/packages/typegen/package.json @@ -39,8 +39,6 @@ "@polkadot/rpc-provider": "7.0.3-9", "@polkadot/types": "7.0.3-9", "@polkadot/types-augment": "7.0.3-9", - "@polkadot/types-augment-lookup": "7.0.3-9", - "@polkadot/types-augment-registry": "7.0.3-9", "@polkadot/types-codec": "7.0.3-9", "@polkadot/types-create": "7.0.3-9", "@polkadot/types-support": "7.0.3-9", diff --git a/packages/typegen/scripts/execWithSrc.cjs b/packages/typegen/scripts/execWithSrc.cjs index 004805e57e..0cffae8519 100644 --- a/packages/typegen/scripts/execWithSrc.cjs +++ b/packages/typegen/scripts/execWithSrc.cjs @@ -20,7 +20,7 @@ module.exports = function (file) { // eslint-disable-next-line sort-keys '^@polkadot/api(.*)': './packages/api/src/\\1', '^@polkadot/rpc-(augment|core|provider)(.*)': './packages/rpc-\\1/src\\2', - '^@polkadot/types-(augment-lookup|augment-registry|augment|codec|create|known|metadata|support)(.*)': './packages/types-\\1/src\\2', + '^@polkadot/types-(augment|codec|create|known|metadata|support)(.*)': './packages/types-\\1/src\\2', // eslint-disable-next-line sort-keys '^@polkadot/types(.*)': './packages/types/src\\1' } diff --git a/packages/typegen/src/generate/consts.ts b/packages/typegen/src/generate/consts.ts index 84d195d582..be6b6a18e0 100644 --- a/packages/typegen/src/generate/consts.ts +++ b/packages/typegen/src/generate/consts.ts @@ -9,7 +9,7 @@ import Handlebars from 'handlebars'; import * as defaultDefs from '@polkadot/types/interfaces/definitions'; import { Definitions } from '@polkadot/types/types'; -import lookupDefinitions from '@polkadot/types-augment-lookup/augment/definitions'; +import lookupDefinitions from '@polkadot/types-augment/lookup/definitions'; import { stringCamelCase } from '@polkadot/util'; import { compareName, createImports, formatType, initMeta, readTemplate, setImports, writeFile } from '../util'; diff --git a/packages/typegen/src/generate/events.ts b/packages/typegen/src/generate/events.ts index 3ef8ec6932..4da5cb74a9 100644 --- a/packages/typegen/src/generate/events.ts +++ b/packages/typegen/src/generate/events.ts @@ -9,7 +9,7 @@ import Handlebars from 'handlebars'; import * as defaultDefs from '@polkadot/types/interfaces/definitions'; import { Definitions } from '@polkadot/types/types'; -import lookupDefinitions from '@polkadot/types-augment-lookup/augment/definitions'; +import lookupDefinitions from '@polkadot/types-augment/lookup/definitions'; import { stringCamelCase } from '@polkadot/util'; import { compareName, createImports, formatType, initMeta, readTemplate, setImports, writeFile } from '../util'; diff --git a/packages/typegen/src/generate/interfaceRegistry.ts b/packages/typegen/src/generate/interfaceRegistry.ts index 53abe731bd..0eaf97fefb 100644 --- a/packages/typegen/src/generate/interfaceRegistry.ts +++ b/packages/typegen/src/generate/interfaceRegistry.ts @@ -79,6 +79,6 @@ export function generateInterfaceTypes (importDefinitions: { [importPath: string export function generateDefaultInterface (): void { generateInterfaceTypes( { '@polkadot/types/interfaces': defaultDefinitions }, - 'packages/types-augment-registry/src/augment.ts' + 'packages/types-augment/src/registry.ts' ); } diff --git a/packages/typegen/src/generate/lookup.ts b/packages/typegen/src/generate/lookup.ts index 1a00147bbe..6cee5563b6 100644 --- a/packages/typegen/src/generate/lookup.ts +++ b/packages/typegen/src/generate/lookup.ts @@ -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-augment-lookup/src/augment', staticData?: HexString): void { +export function generateDefaultLookup (destDir = 'packages/types-augment/src/lookup', staticData?: HexString): void { generateLookup( destDir, staticData diff --git a/packages/typegen/src/generate/query.ts b/packages/typegen/src/generate/query.ts index d84a850136..536aa4072b 100644 --- a/packages/typegen/src/generate/query.ts +++ b/packages/typegen/src/generate/query.ts @@ -11,7 +11,7 @@ import Handlebars from 'handlebars'; import * as defaultDefs from '@polkadot/types/interfaces/definitions'; import { unwrapStorageSi } from '@polkadot/types/primitive/StorageKey'; -import lookupDefinitions from '@polkadot/types-augment-lookup/augment/definitions'; +import lookupDefinitions from '@polkadot/types-augment/lookup/definitions'; import { stringCamelCase } from '@polkadot/util'; import { compareName, createImports, formatType, getSimilarTypes, initMeta, readTemplate, setImports, TypeImports, writeFile } from '../util'; diff --git a/packages/typegen/src/generate/tx.ts b/packages/typegen/src/generate/tx.ts index 21f67df475..2e4fd67c9f 100644 --- a/packages/typegen/src/generate/tx.ts +++ b/packages/typegen/src/generate/tx.ts @@ -10,7 +10,7 @@ import Handlebars from 'handlebars'; import * as defaultDefs from '@polkadot/types/interfaces/definitions'; import { Text } from '@polkadot/types/primitive'; -import lookupDefinitions from '@polkadot/types-augment-lookup/augment/definitions'; +import lookupDefinitions from '@polkadot/types-augment/lookup/definitions'; import { stringCamelCase } from '@polkadot/util'; import { compareName, createImports, formatType, getSimilarTypes, initMeta, readTemplate, setImports, writeFile } from '../util'; diff --git a/packages/typegen/tsconfig.json b/packages/typegen/tsconfig.json index 8a815a4f63..5fa7b5bcf7 100644 --- a/packages/typegen/tsconfig.json +++ b/packages/typegen/tsconfig.json @@ -11,7 +11,7 @@ { "path": "../rpc-augment" }, { "path": "../rpc-provider" }, { "path": "../types" }, - { "path": "../types-augment-lookup" }, + { "path": "../types-augment" }, { "path": "../types-codec" }, { "path": "../types-create" }, { "path": "../types-support" } diff --git a/packages/types-augment-lookup/LICENSE b/packages/types-augment-lookup/LICENSE deleted file mode 100644 index 0d381b2e97..0000000000 --- a/packages/types-augment-lookup/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/packages/types-augment-lookup/README.md b/packages/types-augment-lookup/README.md deleted file mode 100644 index e23939d700..0000000000 --- a/packages/types-augment-lookup/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# @polkadot/api-augment-lookup - -Generated augmentation. diff --git a/packages/types-augment-lookup/package.json b/packages/types-augment-lookup/package.json deleted file mode 100644 index c3096b6c62..0000000000 --- a/packages/types-augment-lookup/package.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "author": "Jaco Greeff ", - "bugs": "https://github.com/polkadot-js/api/issues", - "contributors": [], - "description": "Types generated augmentation", - "engines": { - "node": ">=14.0.0" - }, - "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types-augment-lookup#readme", - "license": "Apache-2.0", - "maintainers": [], - "name": "@polkadot/types-augment-lookup", - "repository": { - "directory": "packages/types-augment-lookup", - "type": "git", - "url": "https://github.com/polkadot-js/api.git" - }, - "sideEffects": [ - "./detectPackage.js", - "./detectPackage.cjs" - ], - "type": "module", - "version": "7.0.3-9", - "main": "index.js", - "dependencies": { - "@babel/runtime": "^7.16.5", - "@polkadot/types": "7.0.3-9", - "@polkadot/types-codec": "7.0.3-9", - "@polkadot/util": "^8.2.2" - } -} diff --git a/packages/types-augment-lookup/src/bundle.ts b/packages/types-augment-lookup/src/bundle.ts deleted file mode 100644 index 115b3835cd..0000000000 --- a/packages/types-augment-lookup/src/bundle.ts +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2017-2021 @polkadot/types-augment authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import './augment'; - -export { packageInfo } from './packageInfo'; diff --git a/packages/types-augment-lookup/src/detectPackage.ts b/packages/types-augment-lookup/src/detectPackage.ts deleted file mode 100644 index c9f193c9d7..0000000000 --- a/packages/types-augment-lookup/src/detectPackage.ts +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2017-2021 @polkadot/types-augment authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import { packageInfo as typesInfo } from '@polkadot/types/packageInfo'; -import { detectPackage } from '@polkadot/util'; - -import { packageInfo } from './packageInfo'; - -detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [typesInfo]); diff --git a/packages/types-augment-lookup/src/index.ts b/packages/types-augment-lookup/src/index.ts deleted file mode 100644 index d38cd76ca7..0000000000 --- a/packages/types-augment-lookup/src/index.ts +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2017-2021 @polkadot/types-augment authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import './detectPackage'; - -export * from './bundle'; diff --git a/packages/types-augment-lookup/src/packageInfo.ts b/packages/types-augment-lookup/src/packageInfo.ts deleted file mode 100644 index b748ce61c0..0000000000 --- a/packages/types-augment-lookup/src/packageInfo.ts +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2017-2021 @polkadot/types-augment-lookup authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Auto-generated by @polkadot/dev, do not edit - -export const packageInfo = { name: '@polkadot/types-augment-lookup', version: '7.0.3-9' }; diff --git a/packages/types-augment-lookup/tsconfig.json b/packages/types-augment-lookup/tsconfig.json deleted file mode 100644 index 36a3dcbaa4..0000000000 --- a/packages/types-augment-lookup/tsconfig.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "baseUrl": "..", - "outDir": "./build", - "rootDir": "./src" - }, - "references": [ - { "path": "../types" }, - { "path": "../types-codec" } - ] -} diff --git a/packages/types-augment-registry/LICENSE b/packages/types-augment-registry/LICENSE deleted file mode 100644 index 0d381b2e97..0000000000 --- a/packages/types-augment-registry/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/packages/types-augment-registry/README.md b/packages/types-augment-registry/README.md deleted file mode 100644 index 7c17b7d302..0000000000 --- a/packages/types-augment-registry/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# @polkadot/api-augment-registry - -Generated augmentation. diff --git a/packages/types-augment-registry/package.json b/packages/types-augment-registry/package.json deleted file mode 100644 index ad671564c0..0000000000 --- a/packages/types-augment-registry/package.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "author": "Jaco Greeff ", - "bugs": "https://github.com/polkadot-js/api/issues", - "contributors": [], - "description": "Types generated augmentation", - "engines": { - "node": ">=14.0.0" - }, - "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types-augment-registry#readme", - "license": "Apache-2.0", - "maintainers": [], - "name": "@polkadot/types-augment-registry", - "repository": { - "directory": "packages/types-augment-registry", - "type": "git", - "url": "https://github.com/polkadot-js/api.git" - }, - "sideEffects": [ - "./detectPackage.js", - "./detectPackage.cjs" - ], - "type": "module", - "version": "7.0.3-9", - "main": "index.js", - "dependencies": { - "@babel/runtime": "^7.16.5", - "@polkadot/types": "7.0.3-9", - "@polkadot/types-codec": "7.0.3-9", - "@polkadot/util": "^8.2.2" - } -} diff --git a/packages/types-augment-registry/src/bundle.ts b/packages/types-augment-registry/src/bundle.ts deleted file mode 100644 index 115b3835cd..0000000000 --- a/packages/types-augment-registry/src/bundle.ts +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2017-2021 @polkadot/types-augment authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import './augment'; - -export { packageInfo } from './packageInfo'; diff --git a/packages/types-augment-registry/src/detectPackage.ts b/packages/types-augment-registry/src/detectPackage.ts deleted file mode 100644 index c9f193c9d7..0000000000 --- a/packages/types-augment-registry/src/detectPackage.ts +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2017-2021 @polkadot/types-augment authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import { packageInfo as typesInfo } from '@polkadot/types/packageInfo'; -import { detectPackage } from '@polkadot/util'; - -import { packageInfo } from './packageInfo'; - -detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [typesInfo]); diff --git a/packages/types-augment-registry/src/index.ts b/packages/types-augment-registry/src/index.ts deleted file mode 100644 index d38cd76ca7..0000000000 --- a/packages/types-augment-registry/src/index.ts +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2017-2021 @polkadot/types-augment authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import './detectPackage'; - -export * from './bundle'; diff --git a/packages/types-augment-registry/src/packageInfo.ts b/packages/types-augment-registry/src/packageInfo.ts deleted file mode 100644 index 172c16a50b..0000000000 --- a/packages/types-augment-registry/src/packageInfo.ts +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2017-2021 @polkadot/types-augment-registry authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Auto-generated by @polkadot/dev, do not edit - -export const packageInfo = { name: '@polkadot/types-augment-registry', version: '7.0.3-9' }; diff --git a/packages/types-augment-registry/tsconfig.json b/packages/types-augment-registry/tsconfig.json deleted file mode 100644 index 36a3dcbaa4..0000000000 --- a/packages/types-augment-registry/tsconfig.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "baseUrl": "..", - "outDir": "./build", - "rootDir": "./src" - }, - "references": [ - { "path": "../types" }, - { "path": "../types-codec" } - ] -} diff --git a/packages/types-augment/package.json b/packages/types-augment/package.json index 6b8453f19a..38293d5657 100644 --- a/packages/types-augment/package.json +++ b/packages/types-augment/package.json @@ -24,8 +24,8 @@ "main": "index.js", "dependencies": { "@babel/runtime": "^7.16.5", - "@polkadot/types-augment-lookup": "7.0.3-9", - "@polkadot/types-augment-registry": "7.0.3-9", + "@polkadot/types": "7.0.3-9", + "@polkadot/types-codec": "7.0.3-9", "@polkadot/util": "^8.2.2" } } diff --git a/packages/types-augment/src/augment.ts b/packages/types-augment/src/augment.ts index 4f47f04f69..ab929ba6d5 100644 --- a/packages/types-augment/src/augment.ts +++ b/packages/types-augment/src/augment.ts @@ -1,5 +1,5 @@ // Copyright 2017-2021 @polkadot/types-augment authors & contributors // SPDX-License-Identifier: Apache-2.0 -import '@polkadot/types-augment-registry'; -import '@polkadot/types-augment-lookup'; +import './registry'; +import './lookup'; diff --git a/packages/types-augment/src/detectPackage.ts b/packages/types-augment/src/detectPackage.ts index 995f43ce51..90c7f7b3c1 100644 --- a/packages/types-augment/src/detectPackage.ts +++ b/packages/types-augment/src/detectPackage.ts @@ -1,10 +1,10 @@ // Copyright 2017-2021 @polkadot/types-augment authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { packageInfo as lookupInfo } from '@polkadot/types-augment-lookup/packageInfo'; -import { packageInfo as registryInfo } from '@polkadot/types-augment-registry/packageInfo'; +import { packageInfo as typesInfo } from '@polkadot/types/packageInfo'; +import { packageInfo as codecInfo } from '@polkadot/types-codec/packageInfo'; import { detectPackage } from '@polkadot/util'; import { packageInfo } from './packageInfo'; -detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [lookupInfo, registryInfo]); +detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [typesInfo, codecInfo]); diff --git a/packages/types-augment-lookup/src/augment/definitions.ts b/packages/types-augment/src/lookup/definitions.ts similarity index 100% rename from packages/types-augment-lookup/src/augment/definitions.ts rename to packages/types-augment/src/lookup/definitions.ts diff --git a/packages/types-augment-lookup/src/augment/index.ts b/packages/types-augment/src/lookup/index.ts similarity index 100% rename from packages/types-augment-lookup/src/augment/index.ts rename to packages/types-augment/src/lookup/index.ts diff --git a/packages/types-augment-lookup/src/augment/kusama.ts b/packages/types-augment/src/lookup/kusama.ts similarity index 100% rename from packages/types-augment-lookup/src/augment/kusama.ts rename to packages/types-augment/src/lookup/kusama.ts diff --git a/packages/types-augment-lookup/src/augment/polkadot.ts b/packages/types-augment/src/lookup/polkadot.ts similarity index 100% rename from packages/types-augment-lookup/src/augment/polkadot.ts rename to packages/types-augment/src/lookup/polkadot.ts diff --git a/packages/types-augment-lookup/src/augment/substrate.ts b/packages/types-augment/src/lookup/substrate.ts similarity index 100% rename from packages/types-augment-lookup/src/augment/substrate.ts rename to packages/types-augment/src/lookup/substrate.ts diff --git a/packages/types-augment-lookup/src/augment/types-kusama.ts b/packages/types-augment/src/lookup/types-kusama.ts similarity index 100% rename from packages/types-augment-lookup/src/augment/types-kusama.ts rename to packages/types-augment/src/lookup/types-kusama.ts diff --git a/packages/types-augment-lookup/src/augment/types-polkadot.ts b/packages/types-augment/src/lookup/types-polkadot.ts similarity index 100% rename from packages/types-augment-lookup/src/augment/types-polkadot.ts rename to packages/types-augment/src/lookup/types-polkadot.ts diff --git a/packages/types-augment-lookup/src/augment/types-substrate.ts b/packages/types-augment/src/lookup/types-substrate.ts similarity index 100% rename from packages/types-augment-lookup/src/augment/types-substrate.ts rename to packages/types-augment/src/lookup/types-substrate.ts diff --git a/packages/types-augment-lookup/src/augment/types.ts b/packages/types-augment/src/lookup/types.ts similarity index 100% rename from packages/types-augment-lookup/src/augment/types.ts rename to packages/types-augment/src/lookup/types.ts diff --git a/packages/types-augment-registry/src/augment.ts b/packages/types-augment/src/registry.ts similarity index 100% rename from packages/types-augment-registry/src/augment.ts rename to packages/types-augment/src/registry.ts diff --git a/packages/types-augment/tsconfig.json b/packages/types-augment/tsconfig.json index da05c893ca..36a3dcbaa4 100644 --- a/packages/types-augment/tsconfig.json +++ b/packages/types-augment/tsconfig.json @@ -6,7 +6,7 @@ "rootDir": "./src" }, "references": [ - { "path": "../types-augment-lookup" }, - { "path": "../types-augment-registry" } + { "path": "../types" }, + { "path": "../types-codec" } ] } diff --git a/tsconfig.base.json b/tsconfig.base.json index 11a3b28ee5..bbee80f89c 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -21,10 +21,6 @@ "@polkadot/rpc-provider/*": ["rpc-provider/src/*"], "@polkadot/types": ["types/src"], "@polkadot/types/*": ["types/src/*"], - "@polkadot/types-augment-lookup": ["types-augment-lookup/src"], - "@polkadot/types-augment-lookup/*": ["types-augment-lookup/src/*"], - "@polkadot/types-augment-registry": ["types-augment-registry/src"], - "@polkadot/types-augment-registry/*": ["types-augment-registry/src/*"], "@polkadot/types-augment": ["types-augment/src"], "@polkadot/types-augment/*": ["types-augment/src/*"], "@polkadot/types-codec": ["types-codec/src"], diff --git a/tsconfig.json b/tsconfig.json index bd7ad3cd53..79d63b0633 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -23,8 +23,6 @@ { "path": "./packages/types" }, { "path": "./packages/types/tsconfig.spec.json" }, { "path": "./packages/types-augment" }, - { "path": "./packages/types-augment-lookup" }, - { "path": "./packages/types-augment-registry" }, { "path": "./packages/types-codec" }, { "path": "./packages/types-codec/tsconfig.spec.json" }, { "path": "./packages/types-create" }, diff --git a/yarn.lock b/yarn.lock index e1992a119c..bff3086165 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2136,8 +2136,6 @@ __metadata: "@polkadot/rpc-provider": 7.0.3-9 "@polkadot/types": 7.0.3-9 "@polkadot/types-augment": 7.0.3-9 - "@polkadot/types-augment-lookup": 7.0.3-9 - "@polkadot/types-augment-registry": 7.0.3-9 "@polkadot/types-codec": 7.0.3-9 "@polkadot/types-create": 7.0.3-9 "@polkadot/types-support": 7.0.3-9 @@ -2157,35 +2155,13 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/types-augment-lookup@7.0.3-9, @polkadot/types-augment-lookup@workspace:packages/types-augment-lookup": - version: 0.0.0-use.local - resolution: "@polkadot/types-augment-lookup@workspace:packages/types-augment-lookup" - dependencies: - "@babel/runtime": ^7.16.5 - "@polkadot/types": 7.0.3-9 - "@polkadot/types-codec": 7.0.3-9 - "@polkadot/util": ^8.2.2 - languageName: unknown - linkType: soft - -"@polkadot/types-augment-registry@7.0.3-9, @polkadot/types-augment-registry@workspace:packages/types-augment-registry": - version: 0.0.0-use.local - resolution: "@polkadot/types-augment-registry@workspace:packages/types-augment-registry" - dependencies: - "@babel/runtime": ^7.16.5 - "@polkadot/types": 7.0.3-9 - "@polkadot/types-codec": 7.0.3-9 - "@polkadot/util": ^8.2.2 - languageName: unknown - linkType: soft - "@polkadot/types-augment@7.0.3-9, @polkadot/types-augment@^7.0.3-9, @polkadot/types-augment@workspace:packages/types-augment": version: 0.0.0-use.local resolution: "@polkadot/types-augment@workspace:packages/types-augment" dependencies: "@babel/runtime": ^7.16.5 - "@polkadot/types-augment-lookup": 7.0.3-9 - "@polkadot/types-augment-registry": 7.0.3-9 + "@polkadot/types": 7.0.3-9 + "@polkadot/types-codec": 7.0.3-9 "@polkadot/util": ^8.2.2 languageName: unknown linkType: soft