Use .js imports in src (#5526)
* Use .js imports in src * Adjust * Fix imports * Bump dev * Adjust with .js imports for typegen * Adjust * Adjust * Remove target override
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
// Copyright 2017-2023 @polkadot/typegen authors & contributors
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
export { packageInfo } from './packageInfo';
|
||||
export { formatType } from './util/formatting';
|
||||
export { packageInfo } from './packageInfo.js';
|
||||
export { formatType } from './util/formatting.js';
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
import { detectPackage } from '@polkadot/util';
|
||||
|
||||
import others from './detectOther';
|
||||
import { packageInfo } from './packageInfo';
|
||||
import others from './detectOther.js';
|
||||
import { packageInfo } from './packageInfo.js';
|
||||
|
||||
detectPackage(packageInfo, null, others);
|
||||
|
||||
@@ -10,8 +10,8 @@ import yargs from 'yargs';
|
||||
import { Definitions, DefinitionsTypes } from '@polkadot/types/types';
|
||||
import { formatNumber, isHex } from '@polkadot/util';
|
||||
|
||||
import { generateDefaultConsts, generateDefaultErrors, generateDefaultEvents, generateDefaultQuery, generateDefaultRpc, generateDefaultRuntime, generateDefaultTx } from './generate';
|
||||
import { assertDir, assertFile, getMetadataViaWs, HEADER, writeFile } from './util';
|
||||
import { generateDefaultConsts, generateDefaultErrors, generateDefaultEvents, generateDefaultQuery, generateDefaultRpc, generateDefaultRuntime, generateDefaultTx } from './generate/index.js';
|
||||
import { assertDir, assertFile, getMetadataViaWs, HEADER, writeFile } from './util/index.js';
|
||||
|
||||
async function generate (metaHex: HexString, pkg: string | undefined, output: string, isStrict?: boolean): Promise<void> {
|
||||
console.log(`Generating from metadata, ${formatNumber((metaHex.length - 2) / 2)} bytes`);
|
||||
@@ -60,7 +60,7 @@ async function generate (metaHex: HexString, pkg: string | undefined, output: st
|
||||
...[
|
||||
...['consts', 'errors', 'events', 'query', 'tx', 'rpc', 'runtime']
|
||||
.filter((key) => !!key)
|
||||
.map((key) => `./augment-api-${key}`)
|
||||
.map((key) => `./augment-api-${key}.js`)
|
||||
].map((path) => `import '${path}';\n`)
|
||||
].join('')
|
||||
);
|
||||
|
||||
@@ -10,10 +10,10 @@ import yargs from 'yargs';
|
||||
import * as substrateDefs from '@polkadot/types/interfaces/definitions';
|
||||
import { isHex } from '@polkadot/util';
|
||||
|
||||
import { generateInterfaceTypes } from './generate/interfaceRegistry';
|
||||
import { generateTsDef } from './generate/tsDef';
|
||||
import { generateDefaultLookup } from './generate';
|
||||
import { assertDir, assertFile, getMetadataViaWs } from './util';
|
||||
import { generateDefaultLookup } from './generate/index.js';
|
||||
import { generateInterfaceTypes } from './generate/interfaceRegistry.js';
|
||||
import { generateTsDef } from './generate/tsDef.js';
|
||||
import { assertDir, assertFile, getMetadataViaWs } from './util/index.js';
|
||||
|
||||
type ArgV = { input: string; package: string; endpoint?: string; };
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
import type { Metadata } from '@polkadot/types/metadata/Metadata';
|
||||
import type { HexString } from '@polkadot/util/types';
|
||||
import type { ExtraTypes } from './types';
|
||||
import type { ExtraTypes } from './types.js';
|
||||
|
||||
import Handlebars from 'handlebars';
|
||||
|
||||
@@ -12,7 +12,7 @@ import { Definitions } from '@polkadot/types/types';
|
||||
import lookupDefinitions from '@polkadot/types-augment/lookup/definitions';
|
||||
import { stringCamelCase } from '@polkadot/util';
|
||||
|
||||
import { compareName, createImports, formatType, initMeta, readTemplate, setImports, writeFile } from '../util';
|
||||
import { compareName, createImports, formatType, initMeta, readTemplate, setImports, writeFile } from '../util/index.js';
|
||||
|
||||
const generateForMetaTemplate = Handlebars.compile(readTemplate('consts'));
|
||||
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
|
||||
import type { Metadata } from '@polkadot/types/metadata/Metadata';
|
||||
import type { HexString } from '@polkadot/util/types';
|
||||
import type { ExtraTypes } from './types';
|
||||
import type { ExtraTypes } from './types.js';
|
||||
|
||||
import Handlebars from 'handlebars';
|
||||
|
||||
import { stringCamelCase } from '@polkadot/util';
|
||||
|
||||
import { compareName, createImports, initMeta, readTemplate, writeFile } from '../util';
|
||||
import { compareName, createImports, initMeta, readTemplate, writeFile } from '../util/index.js';
|
||||
|
||||
const generateForMetaTemplate = Handlebars.compile(readTemplate('errors'));
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
import type { Metadata } from '@polkadot/types/metadata/Metadata';
|
||||
import type { HexString } from '@polkadot/util/types';
|
||||
import type { ExtraTypes } from './types';
|
||||
import type { ExtraTypes } from './types.js';
|
||||
|
||||
import Handlebars from 'handlebars';
|
||||
|
||||
@@ -12,7 +12,7 @@ import { Definitions } from '@polkadot/types/types';
|
||||
import lookupDefinitions from '@polkadot/types-augment/lookup/definitions';
|
||||
import { stringCamelCase } from '@polkadot/util';
|
||||
|
||||
import { compareName, createImports, formatType, initMeta, readTemplate, setImports, writeFile } from '../util';
|
||||
import { compareName, createImports, formatType, initMeta, readTemplate, setImports, writeFile } from '../util/index.js';
|
||||
|
||||
const generateForMetaTemplate = Handlebars.compile(readTemplate('events'));
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
// Copyright 2017-2023 @polkadot/typegen authors & contributors
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
export { generateDefaultConsts } from './consts';
|
||||
export { generateDefaultErrors } from './errors';
|
||||
export { generateDefaultEvents } from './events';
|
||||
export { generateDefaultInterface } from './interfaceRegistry';
|
||||
export { generateDefaultLookup } from './lookup';
|
||||
export { generateDefaultQuery } from './query';
|
||||
export { generateDefaultRpc } from './rpc';
|
||||
export { generateDefaultRuntime } from './runtime';
|
||||
export { generateDefaultTsDef } from './tsDef';
|
||||
export { generateDefaultTx } from './tx';
|
||||
export { generateDefaultConsts } from './consts.js';
|
||||
export { generateDefaultErrors } from './errors.js';
|
||||
export { generateDefaultEvents } from './events.js';
|
||||
export { generateDefaultInterface } from './interfaceRegistry.js';
|
||||
export { generateDefaultLookup } from './lookup.js';
|
||||
export { generateDefaultQuery } from './query.js';
|
||||
export { generateDefaultRpc } from './rpc.js';
|
||||
export { generateDefaultRuntime } from './runtime.js';
|
||||
export { generateDefaultTsDef } from './tsDef.js';
|
||||
export { generateDefaultTx } from './tx.js';
|
||||
|
||||
@@ -8,8 +8,8 @@ import { TypeRegistry } from '@polkadot/types/create';
|
||||
import * as defaultDefinitions from '@polkadot/types/interfaces/definitions';
|
||||
import * as defaultPrimitives from '@polkadot/types/primitive';
|
||||
|
||||
import { createImports, readTemplate, setImports, writeFile } from '../util';
|
||||
import { ModuleTypes } from '../util/imports';
|
||||
import { ModuleTypes } from '../util/imports.js';
|
||||
import { createImports, readTemplate, setImports, writeFile } from '../util/index.js';
|
||||
|
||||
const primitiveClasses = {
|
||||
...defaultPrimitives,
|
||||
|
||||
@@ -16,8 +16,8 @@ import staticPolkadot from '@polkadot/types-support/metadata/static-polkadot';
|
||||
import staticSubstrate from '@polkadot/types-support/metadata/static-substrate';
|
||||
import { isString, stringify } from '@polkadot/util';
|
||||
|
||||
import { createImports, exportInterface, initMeta, readTemplate, writeFile } from '../util';
|
||||
import { typeEncoders } from './tsDef';
|
||||
import { createImports, exportInterface, initMeta, readTemplate, writeFile } from '../util/index.js';
|
||||
import { typeEncoders } from './tsDef.js';
|
||||
|
||||
const WITH_TYPEDEF = false;
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ import type { StorageEntryMetadataLatest } from '@polkadot/types/interfaces';
|
||||
import type { Metadata, PortableRegistry } from '@polkadot/types/metadata';
|
||||
import type { Definitions, Registry } from '@polkadot/types/types';
|
||||
import type { HexString } from '@polkadot/util/types';
|
||||
import type { ExtraTypes } from './types';
|
||||
import type { ExtraTypes } from './types.js';
|
||||
|
||||
import Handlebars from 'handlebars';
|
||||
|
||||
@@ -14,8 +14,8 @@ import { unwrapStorageSi } from '@polkadot/types/primitive/StorageKey';
|
||||
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';
|
||||
import { ModuleTypes } from '../util/imports';
|
||||
import { ModuleTypes } from '../util/imports.js';
|
||||
import { compareName, createImports, formatType, getSimilarTypes, initMeta, readTemplate, setImports, TypeImports, writeFile } from '../util/index.js';
|
||||
|
||||
const generateForMetaTemplate = Handlebars.compile(readTemplate('query'));
|
||||
|
||||
|
||||
@@ -3,14 +3,14 @@
|
||||
|
||||
import type { TypeRegistry } from '@polkadot/types/create';
|
||||
import type { Definitions } from '@polkadot/types/types';
|
||||
import type { ExtraTypes } from './types';
|
||||
import type { ExtraTypes } from './types.js';
|
||||
|
||||
import Handlebars from 'handlebars';
|
||||
|
||||
import * as defaultDefinitions from '@polkadot/types/interfaces/definitions';
|
||||
import staticSubstrate from '@polkadot/types-support/metadata/static-substrate';
|
||||
|
||||
import { createImports, formatType, getSimilarTypes, initMeta, readTemplate, setImports, writeFile } from '../util';
|
||||
import { createImports, formatType, getSimilarTypes, initMeta, readTemplate, setImports, writeFile } from '../util/index.js';
|
||||
|
||||
interface ItemDef {
|
||||
args: string;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
import type { Metadata } from '@polkadot/types/metadata/Metadata';
|
||||
import type { DefinitionCallNamed, Definitions, Registry } from '@polkadot/types/types';
|
||||
import type { HexString } from '@polkadot/util/types';
|
||||
import type { ExtraTypes } from './types';
|
||||
import type { ExtraTypes } from './types.js';
|
||||
|
||||
import Handlebars from 'handlebars';
|
||||
|
||||
@@ -13,7 +13,7 @@ import lookupDefinitions from '@polkadot/types-augment/lookup/definitions';
|
||||
import { objectSpread, stringCamelCase } from '@polkadot/util';
|
||||
import { blake2AsHex } from '@polkadot/util-crypto';
|
||||
|
||||
import { createImports, formatType, getSimilarTypes, initMeta, readTemplate, setImports, writeFile } from '../util';
|
||||
import { createImports, formatType, getSimilarTypes, initMeta, readTemplate, setImports, writeFile } from '../util/index.js';
|
||||
|
||||
type Apis = [HexString, number][];
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ import * as defaultDefinitions from '@polkadot/types/interfaces/definitions';
|
||||
import { getTypeDef, TypeDefInfo } from '@polkadot/types-create';
|
||||
import { assert, isString, stringify, stringPascalCase } from '@polkadot/util';
|
||||
|
||||
import { createImports, exportInterface, formatType, readTemplate, setImports, TypeImports, writeFile } from '../util';
|
||||
import { createImports, exportInterface, formatType, readTemplate, setImports, TypeImports, writeFile } from '../util/index.js';
|
||||
|
||||
interface Imports extends TypeImports {
|
||||
interfaces: [string, string][];
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
import type { Metadata } from '@polkadot/types/metadata/Metadata';
|
||||
import type { Definitions, Registry } from '@polkadot/types/types';
|
||||
import type { HexString } from '@polkadot/util/types';
|
||||
import type { ExtraTypes } from './types';
|
||||
import type { ExtraTypes } from './types.js';
|
||||
|
||||
import Handlebars from 'handlebars';
|
||||
|
||||
@@ -13,7 +13,7 @@ import { Text } from '@polkadot/types/primitive';
|
||||
import lookupDefinitions from '@polkadot/types-augment/lookup/definitions';
|
||||
import { stringCamelCase } from '@polkadot/util';
|
||||
|
||||
import { compareName, createImports, formatType, getSimilarTypes, initMeta, readTemplate, setImports, writeFile } from '../util';
|
||||
import { compareName, createImports, formatType, getSimilarTypes, initMeta, readTemplate, setImports, writeFile } from '../util/index.js';
|
||||
|
||||
const MAPPED_NAMES: Record<string, string> = {
|
||||
class: 'clazz',
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// Copyright 2017-2023 @polkadot/typegen authors & contributors
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
import './detectPackage';
|
||||
import './detectPackage.js';
|
||||
|
||||
export * from './bundle';
|
||||
export * from './bundle.js';
|
||||
|
||||
@@ -7,7 +7,7 @@ import kusama from '@polkadot/types-support/metadata/static-kusama';
|
||||
import polkadot from '@polkadot/types-support/metadata/static-polkadot';
|
||||
import substrate from '@polkadot/types-support/metadata/static-substrate';
|
||||
|
||||
import { generateDefaultConsts, generateDefaultErrors, generateDefaultEvents, generateDefaultInterface, generateDefaultLookup, generateDefaultQuery, generateDefaultRpc, generateDefaultRuntime, generateDefaultTsDef, generateDefaultTx } from './generate';
|
||||
import { generateDefaultConsts, generateDefaultErrors, generateDefaultEvents, generateDefaultInterface, generateDefaultLookup, generateDefaultQuery, generateDefaultRpc, generateDefaultRuntime, generateDefaultTsDef, generateDefaultTx } from './generate/index.js';
|
||||
|
||||
const BASE = 'packages/api-augment/src';
|
||||
const METAS = Object.entries<HexString>({ kusama, polkadot, substrate });
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
{{> header }}
|
||||
|
||||
export * from './types';
|
||||
export * from './types.js';
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
{{> header }}
|
||||
|
||||
export * from './types';
|
||||
export * from './types.js';
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{{> header }}
|
||||
|
||||
{{#each items}}
|
||||
export * from './{{{this}}}/types';
|
||||
export * from './{{{this}}}/types.js';
|
||||
{{/each}}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
import { TypeRegistry } from '@polkadot/types/create';
|
||||
|
||||
import { getSimilarTypes } from './derived';
|
||||
import { getSimilarTypes } from './derived.js';
|
||||
|
||||
describe('getSimilarTypes', (): void => {
|
||||
const registry = new TypeRegistry();
|
||||
|
||||
@@ -10,8 +10,8 @@ import { AbstractInt, bool, Compact, Enum, Null, Option, Struct, Tuple, UInt, Ve
|
||||
import { getTypeDef, TypeDefInfo } from '@polkadot/types-create';
|
||||
import { isChildClass, stringify } from '@polkadot/util';
|
||||
|
||||
import { formatType } from './formatting';
|
||||
import { ModuleTypes, setImports, TypeImports } from './imports';
|
||||
import { formatType } from './formatting.js';
|
||||
import { ModuleTypes, setImports, TypeImports } from './imports.js';
|
||||
|
||||
function arrayToStrType (arr: string[]): string {
|
||||
return `${arr.map((c) => `'${c}'`).join(' | ')}`;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
import Handlebars from 'handlebars';
|
||||
|
||||
import { readTemplate } from './file';
|
||||
import { readTemplate } from './file.js';
|
||||
|
||||
Handlebars.registerPartial({
|
||||
docs: Handlebars.compile(readTemplate('docs'))
|
||||
|
||||
@@ -5,7 +5,7 @@ import fs from 'node:fs';
|
||||
import path from 'node:path';
|
||||
import process from 'node:process';
|
||||
|
||||
import { packageInfo } from '../packageInfo';
|
||||
import { packageInfo } from '../packageInfo.js';
|
||||
|
||||
export function writeFile (dest: string, generator: () => string, noLog?: boolean): void {
|
||||
!noLog && console.log(`${dest}\n\tGenerating`);
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
import { TypeRegistry } from '@polkadot/types';
|
||||
|
||||
import { formatType } from './formatting';
|
||||
import { formatType } from './formatting.js';
|
||||
|
||||
describe('formatType', (): void => {
|
||||
const registry = new TypeRegistry();
|
||||
|
||||
@@ -13,8 +13,8 @@ import * as typesCodec from '@polkadot/types-codec';
|
||||
import { getTypeDef, paramsNotation, TypeDefInfo } from '@polkadot/types-create';
|
||||
import { isString, stringify } from '@polkadot/util';
|
||||
|
||||
import { readTemplate } from './file';
|
||||
import { ModuleTypes, setImports, TypeImports } from './imports';
|
||||
import { readTemplate } from './file.js';
|
||||
import { ModuleTypes, setImports, TypeImports } from './imports.js';
|
||||
|
||||
interface ImportDef {
|
||||
file: string;
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
// Copyright 2017-2023 @polkadot/typegen authors & contributors
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
export * from './assert';
|
||||
export * from './derived';
|
||||
export * from './docs';
|
||||
export * from './file';
|
||||
export * from './formatting';
|
||||
export * from './imports';
|
||||
export * from './initMeta';
|
||||
export * from './register';
|
||||
export * from './wsMeta';
|
||||
export * from './assert.js';
|
||||
export * from './derived.js';
|
||||
export * from './docs.js';
|
||||
export * from './file.js';
|
||||
export * from './formatting.js';
|
||||
export * from './imports.js';
|
||||
export * from './initMeta.js';
|
||||
export * from './register.js';
|
||||
export * from './wsMeta.js';
|
||||
|
||||
type Cmp = { name: { toString(): string } };
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ import type { ExtraTypes } from '../generate/types';
|
||||
|
||||
import { Metadata, TypeRegistry } from '@polkadot/types';
|
||||
|
||||
import { registerDefinitions } from './register';
|
||||
import { registerDefinitions } from './register.js';
|
||||
|
||||
interface Result {
|
||||
metadata: Metadata;
|
||||
|
||||
Reference in New Issue
Block a user