Restore older package names (#342)

* Restore older package names

* Fix headers

* Adjust imports & tupe exports

.codeclimate.yml

@@ -17,4 +17,4 @@ exclude_patterns:
 - "**/*.spec.ts"
 - "docs/**/*.js"
 - "**/test/**/*.js"
-- "packages/wasm-data-wasm/src/fflate.ts"
+- "packages/wasm-crypto-wasm/src/fflate.ts"

jest.config.cjs

@@ -6,9 +6,8 @@ const config = require('@polkadot/dev/config/jest.cjs');
 module.exports = {
   ...config,
   moduleNameMapper: {
-    '@polkadot/wasm-crypto-init(.*)$': '<rootDir>/packages/wasm-crypto-init/build/$1',
-    '@polkadot/wasm-data-(asmjs|wasm)(.*)$': '<rootDir>/packages/wasm-data-$1/build/$2',
+    '@polkadot/wasm-crypto-(init|asmjs|wasm)(.*)$': '<rootDir>/packages/wasm-crypto-$1/build/$2',
     // eslint-disable-next-line sort-keys
-    '@polkadot/wasm-crypto(.*)$': '<rootDir>/packages/wasm-crypto/src/$1'
+    '@polkadot/wasm-crypto(.*)$': '<rootDir>/packages/wasm-crypto/build/$1'
   }
 };

packages/wasm-crypto-asmjs/README.md

@@ -0,0 +1 @@
+## @polkadot/wasm-crypto-asmjs

packages/wasm-crypto-asmjs/package.json

@@ -6,12 +6,12 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "homepage": "https://github.com/polkadot-js/wasm/tree/master/packages/wasm-data-asmjs#readme",
+  "homepage": "https://github.com/polkadot-js/wasm/tree/master/packages/wasm-crypto-asmjs#readme",
   "license": "Apache-2.0",
   "maintainers": [],
-  "name": "@polkadot/wasm-data-asmjs",
+  "name": "@polkadot/wasm-crypto-asmjs",
   "repository": {
-    "directory": "packages/wasm-data-asmjs",
+    "directory": "packages/wasm-crypto-asmjs",
     "type": "git",
     "url": "https://github.com/polkadot-js/wasm.git"
   },

packages/wasm-crypto-asmjs/src/bundle.ts

@@ -1,4 +1,4 @@
-// Copyright 2019-2022 @polkadot/wasm-data-asmjs authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto-asmjs authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 export { asmJsInit } from './cjs/data.js';

packages/wasm-crypto-asmjs/src/cjs/cjs/data.js

@@ -1,4 +1,4 @@
-// Copyright 2019-2022 @polkadot/wasm-data-wasm authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto-wasm authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const data = require('../data');

packages/wasm-crypto-asmjs/src/cjs/data.d.ts

@@ -1,4 +1,4 @@
-// Copyright 2019-2022 @polkadot/wasm-data-asmjs authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto-asmjs authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 export declare const asmJsInit: null;

packages/wasm-crypto-asmjs/src/cjs/data.js

@@ -1,4 +1,4 @@
-// Copyright 2019-2022 @polkadot/wasm-data-asmjs authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto-asmjs authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const asmJsInit = null;

packages/wasm-crypto-asmjs/src/detectOther.ts

@@ -0,0 +1,4 @@
+// Copyright 2019-2022 @polkadot/wasm-crypto-asmjs authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export default [];

packages/wasm-crypto-asmjs/src/detectPackage.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2022 @polkadot/wasm-data-asmjs authors & contributors
+// Copyright 2017-2022 @polkadot/wasm-crypto-asmjs authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 // Do not edit, auto-generated by @polkadot/dev

packages/wasm-crypto-asmjs/src/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2019-2022 @polkadot/wasm-data-wasm authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto-asmjs authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import './detectPackage';

packages/wasm-crypto-asmjs/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2022 @polkadot/wasm-crypto-asmjs authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Do not edit, auto-generated by @polkadot/dev
+
+export const packageInfo = { name: '@polkadot/wasm-crypto-asmjs', path: 'auto', type: 'auto', version: '6.0.2-9' };

packages/wasm-crypto-init/README.md

@@ -0,0 +1 @@
+## @polkadot/wasm-crypto-init

packages/wasm-crypto-init/package.json

@@ -2,7 +2,7 @@
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "bugs": "https://github.com/polkadot-js/wasm/issues",
   "contributors": [],
-  "description": "Asm.js content for wasm-crypto",
+  "description": "Init handlers for wasm-crypto",
   "engines": {
     "node": ">=14.0.0"
   },
@@ -26,8 +26,8 @@
   "react-native": "asm.js",
   "dependencies": {
     "@babel/runtime": "^7.17.9",
-    "@polkadot/wasm-data-asmjs": "6.0.2-9",
-    "@polkadot/wasm-data-wasm": "6.0.2-9"
+    "@polkadot/wasm-crypto-asmjs": "6.0.2-9",
+    "@polkadot/wasm-crypto-wasm": "6.0.2-9"
   },
   "devDependencies": {
     "@polkadot/util": "^9.1.1"

packages/wasm-crypto-init/src/asm.ts

@@ -1,12 +1,12 @@
 // Copyright 2019-2022 @polkadot/wasm-crypto-init authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { InitResult } from './types';
+import type { InitFn } from './types';
 
-import { asmJsInit } from '@polkadot/wasm-data-asmjs';
+import { asmJsInit } from '@polkadot/wasm-crypto-asmjs';
 
-import { createPromise } from './create';
+import { createInitFn } from './util';
 
-export function init (wbg: WebAssembly.ModuleImports): Promise<InitResult> {
-  return createPromise(wbg, null, asmJsInit);
-}
+export { packageInfo } from './packageInfo';
+
+export const init: InitFn = createInitFn(null, asmJsInit);

packages/wasm-crypto-init/src/both.ts

@@ -1,13 +1,13 @@
 // Copyright 2019-2022 @polkadot/wasm-crypto-init authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { InitResult } from './types';
+import type { InitFn } from './types';
 
-import { asmJsInit } from '@polkadot/wasm-data-asmjs';
-import { wasmBytes } from '@polkadot/wasm-data-wasm';
+import { asmJsInit } from '@polkadot/wasm-crypto-asmjs';
+import { wasmBytes } from '@polkadot/wasm-crypto-wasm';
 
-import { createPromise } from './create';
+import { createInitFn } from './util';
 
-export function init (wbg: WebAssembly.ModuleImports): Promise<InitResult> {
-  return createPromise(wbg, wasmBytes, asmJsInit);
-}
+export { packageInfo } from './packageInfo';
+
+export const init: InitFn = createInitFn(wasmBytes, asmJsInit);

packages/wasm-crypto-init/src/create.ts

@@ -1,33 +0,0 @@
-// Copyright 2019-2022 @polkadot/wasm-crypto-init authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import type { InitResult } from './types';
-
-import { assert } from '@polkadot/util';
-
-export async function createPromise (wbg: WebAssembly.ModuleImports, wasmBytes: null | Uint8Array, asmFn: null | ((wbg: WebAssembly.ModuleImports) => unknown)): Promise<InitResult> {
-  const result: InitResult = {
-    type: 'wasm',
-    wasm: null
-  };
-
-  try {
-    assert(typeof WebAssembly === 'object' && typeof WebAssembly.instantiate === 'function' && wasmBytes && wasmBytes.length, 'WebAssembly is not available in your environment');
-
-    const source = await WebAssembly.instantiate(wasmBytes, { wbg });
-
-    result.wasm = source.instance.exports;
-  } catch (error) {
-    // if we have a valid supplied asm.js, return that
-    if (asmFn) {
-      result.type = 'asm';
-      result.wasm = asmFn(wbg);
-    } else {
-      console.error(`FATAL: Unable to initialize @polkadot/wasm-crypto:: ${(error as Error).message}`);
-
-      result.wasm = null;
-    }
-  }
-
-  return result;
-}

packages/wasm-crypto-init/src/detectOther.ts

@@ -1,7 +1,7 @@
 // Copyright 2017-2022 @polkadot/wasm-crypto-init authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { packageInfo as asmInfo } from '@polkadot/wasm-data-asmjs/packageInfo';
-import { packageInfo as wasmInfo } from '@polkadot/wasm-data-wasm/packageInfo';
+import { packageInfo as asmInfo } from '@polkadot/wasm-crypto-asmjs/packageInfo';
+import { packageInfo as wasmInfo } from '@polkadot/wasm-crypto-wasm/packageInfo';
 
 export default [asmInfo, wasmInfo];

packages/wasm-crypto-init/src/index.ts

@@ -1,4 +0,0 @@
-// Copyright 2019-2022 @polkadot/wasm-crypto-init authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-export { init } from './wasm';

packages/wasm-crypto-init/src/none.ts

@@ -1,10 +1,10 @@
 // Copyright 2019-2022 @polkadot/wasm-crypto-init authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { InitResult } from './types';
+import type { InitFn } from './types';
 
-import { createPromise } from './create';
+import { createInitFn } from './util';
 
-export function init (wbg: WebAssembly.ModuleImports): Promise<InitResult> {
-  return createPromise(wbg, null, null);
-}
+export { packageInfo } from './packageInfo';
+
+export const init: InitFn = createInitFn(null, null);

packages/wasm-crypto-init/src/types.ts

@@ -5,3 +5,5 @@ export declare interface InitResult {
   type: 'wasm' | 'asm';
   wasm: unknown;
 }
+
+export type InitFn = (wbg: WebAssembly.ModuleImports) => Promise<InitResult>;

packages/wasm-crypto-init/src/util.ts

@@ -0,0 +1,35 @@
+// Copyright 2019-2022 @polkadot/wasm-crypto-init authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { InitFn, InitResult } from './types';
+
+import { assert } from '@polkadot/util';
+
+export function createInitFn (wasmBytes: null | Uint8Array, asmFn: null | ((wbg: WebAssembly.ModuleImports) => unknown)): InitFn {
+  return async (wbg: WebAssembly.ModuleImports): Promise<InitResult> => {
+    const result: InitResult = {
+      type: 'wasm',
+      wasm: null
+    };
+
+    try {
+      assert(typeof WebAssembly === 'object' && typeof WebAssembly.instantiate === 'function' && wasmBytes && wasmBytes.length, 'WebAssembly is not available in your environment');
+
+      const source = await WebAssembly.instantiate(wasmBytes, { wbg });
+
+      result.wasm = source.instance.exports;
+    } catch (error) {
+      // if we have a valid supplied asm.js, return that
+      if (asmFn) {
+        result.type = 'asm';
+        result.wasm = asmFn(wbg);
+      } else {
+        console.error(`FATAL: Unable to initialize @polkadot/wasm-crypto:: ${(error as Error).message}`);
+
+        result.wasm = null;
+      }
+    }
+
+    return result;
+  };
+}

packages/wasm-crypto-init/src/wasm.ts

@@ -1,12 +1,12 @@
 // Copyright 2019-2022 @polkadot/wasm-crypto-init authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { InitResult } from './types';
+import type { InitFn } from './types';
 
-import { wasmBytes } from '@polkadot/wasm-data-wasm';
+import { wasmBytes } from '@polkadot/wasm-crypto-wasm';
 
-import { createPromise } from './create';
+import { createInitFn } from './util';
 
-export function init (wbg: WebAssembly.ModuleImports): Promise<InitResult> {
-  return createPromise(wbg, wasmBytes, null);
-}
+export { packageInfo } from './packageInfo';
+
+export const init: InitFn = createInitFn(wasmBytes, null);

packages/wasm-crypto-init/tsconfig.build.json

@@ -6,7 +6,7 @@
     "rootDir": "./src"
   },
   "references": [
-    { "path": "../wasm-data-asmjs/tsconfig.build.json" },
-    { "path": "../wasm-data-wasm/tsconfig.build.json" }
+    { "path": "../wasm-crypto-asmjs/tsconfig.build.json" },
+    { "path": "../wasm-crypto-wasm/tsconfig.build.json" }
   ]
 }

packages/wasm-crypto-wasm/README.md

@@ -0,0 +1 @@
+## @polkadot/wasm-crypto-wasm

packages/wasm-crypto-wasm/package.json

@@ -6,12 +6,12 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "homepage": "https://github.com/polkadot-js/wasm/tree/master/packages/wasm-data-wasm#readme",
+  "homepage": "https://github.com/polkadot-js/wasm/tree/master/packages/wasm-crypto-wasm#readme",
   "license": "Apache-2.0",
   "maintainers": [],
-  "name": "@polkadot/wasm-data-wasm",
+  "name": "@polkadot/wasm-crypto-wasm",
   "repository": {
-    "directory": "packages/wasm-data-wasm",
+    "directory": "packages/wasm-crypto-wasm",
     "type": "git",
     "url": "https://github.com/polkadot-js/wasm.git"
   },

packages/wasm-crypto-wasm/src/bundle.ts

@@ -1,4 +1,4 @@
-// Copyright 2019-2022 @polkadot/wasm-data-wasm authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto-wasm authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import { bytes, sizeUncompressed } from './cjs/bytes';

packages/wasm-crypto-wasm/src/cjs/bytes.d.ts

@@ -1,4 +1,4 @@
-// Copyright 2019-2022 @polkadot/wasm-data-wasm authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto-wasm authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 export declare const bytes = '';

packages/wasm-crypto-wasm/src/cjs/bytes.js

@@ -1,4 +1,4 @@
-// Copyright 2019-2022 @polkadot/wasm-data-wasm authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto-wasm authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 module.exports.bytes = '';

packages/wasm-crypto-wasm/src/cjs/cjs/bytes.js

@@ -1,4 +1,4 @@
-// Copyright 2019-2022 @polkadot/wasm-data-wasm authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto-wasm authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const bytes = require('../bytes');

packages/wasm-crypto-wasm/src/detectOther.ts

@@ -0,0 +1,4 @@
+// Copyright 2019-2022 @polkadot/wasm-crypto-wasm authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export default [];

packages/wasm-crypto-wasm/src/detectPackage.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2022 @polkadot/wasm-data-wasm authors & contributors
+// Copyright 2017-2022 @polkadot/wasm-crypto-wasm authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 // Do not edit, auto-generated by @polkadot/dev

packages/wasm-crypto-wasm/src/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2019-2022 @polkadot/wasm-data-asmjs authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto-wasm authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import './detectPackage';

packages/wasm-crypto-wasm/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2022 @polkadot/wasm-crypto-wasm authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Do not edit, auto-generated by @polkadot/dev
+
+export const packageInfo = { name: '@polkadot/wasm-crypto-wasm', path: 'auto', type: 'auto', version: '6.0.2-9' };

packages/wasm-crypto/package.json

@@ -32,7 +32,9 @@
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.17.9",
-    "@polkadot/wasm-crypto-init": "6.0.2-9"
+    "@polkadot/wasm-crypto-asmjs": "6.0.2-9",
+    "@polkadot/wasm-crypto-init": "6.0.2-9",
+    "@polkadot/wasm-crypto-wasm": "6.0.2-9"
   },
   "devDependencies": {
     "@polkadot/util": "^9.1.1",

packages/wasm-crypto/src/detectOther.ts

@@ -1,6 +1,8 @@
 // Copyright 2017-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { packageInfo as asmInfo } from '@polkadot/wasm-crypto-asmjs/packageInfo';
 import { packageInfo as initInfo } from '@polkadot/wasm-crypto-init/packageInfo';
+import { packageInfo as wasmInfo } from '@polkadot/wasm-crypto-wasm/packageInfo';
 
-export default [initInfo];
+export default [asmInfo, initInfo, wasmInfo];

packages/wasm-crypto/test/alias-imports.cjs

@@ -1,7 +1,13 @@
 // Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-const rootIncl = ['@polkadot/wasm-crypto', '@polkadot/wasm-crypto-init', '@polkadot/wasm-data-asmjs', '@polkadot/wasm-data-wasm'];
+const rootIncl = [
+  '@polkadot/wasm-crypto',
+  '@polkadot/wasm-crypto-init',
+  '@polkadot/wasm-crypto-asmjs',
+  '@polkadot/wasm-crypto-wasm'
+];
+
 const detcIncl = [
   ...rootIncl.map((p) => `${p}/initOnlyAsm`),
   ...rootIncl.map((p) => `${p}/cjs/asm`),
@@ -14,7 +20,9 @@ require('override-require')(
     detcIncl.some((p) => request.endsWith(p)),
   (request) =>
     rootIncl.some((p) => request.endsWith(p))
-      ? require(`${rootIncl.find((p) => request.endsWith(p))}/build/cjs`)
+      ? rootIncl.find((p) => request.endsWith(p)) === '@polkadot/wasm-crypto-init'
+        ? require('@polkadot/wasm-crypto-init/build/cjs/wasm')
+        : require(`${rootIncl.find((p) => request.endsWith(p))}/build/cjs`)
       : require(`${detcIncl.find((p) => request.endsWith(p))
         .replace('/initOnlyAsm', '/build/cjs/initOnlyAsm.js')
         .replace('/cjs/asm', '/build/cjs/asm.js')

packages/wasm-crypto/tsconfig.build.json

@@ -6,6 +6,8 @@
     "rootDir": "./src"
   },
   "references": [
-    { "path": "../wasm-crypto-init/tsconfig.build.json" }
+    { "path": "../wasm-crypto-init/tsconfig.build.json" },
+    { "path": "../wasm-crypto-asmjs/tsconfig.build.json" },
+    { "path": "../wasm-crypto-wasm/tsconfig.build.json" }
   ]
 }

packages/wasm-data-asmjs/src/detectOther.ts

@@ -1,4 +0,0 @@
-// Copyright 2019-2022 @polkadot/wasm-data-asmjs authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-export default [];

packages/wasm-data-asmjs/src/packageInfo.ts

@@ -1,6 +0,0 @@
-// Copyright 2017-2022 @polkadot/wasm-data-asmjs authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-// Do not edit, auto-generated by @polkadot/dev
-
-export const packageInfo = { name: '@polkadot/wasm-data-asmjs', path: 'auto', type: 'auto', version: '6.0.2-9' };

packages/wasm-data-wasm/src/detectOther.ts

@@ -1,4 +0,0 @@
-// Copyright 2019-2022 @polkadot/wasm-data-wasm authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-export default [];

packages/wasm-data-wasm/src/packageInfo.ts

@@ -1,6 +0,0 @@
-// Copyright 2017-2022 @polkadot/wasm-data-wasm authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-// Do not edit, auto-generated by @polkadot/dev
-
-export const packageInfo = { name: '@polkadot/wasm-data-wasm', path: 'auto', type: 'auto', version: '6.0.2-9' };

rollup.config.mjs

@@ -16,8 +16,8 @@ const overrides = {
   '@polkadot/wasm-crypto': {
     entries: {
       '@polkadot/wasm-crypto-init': '../../wasm-crypto-init/build',
-      '@polkadot/wasm-data-asmjs': '../../../wasm-data-asmjs/build',
-      '@polkadot/wasm-data-wasm': '../../../wasm-data-wasm/build',
+      '@polkadot/wasm-crypto-asmjs': '../../../wasm-crypto-asmjs/build',
+      '@polkadot/wasm-crypto-wasm': '../../../wasm-crypto-wasm/build',
     }
   }
 };

scripts/build-wasm.sh

@@ -9,7 +9,7 @@ source ../scripts/rust-version.sh
 
 WSM=bytes/wasm_bg.wasm
 OPT=bytes/wasm_opt.wasm
-ASM=wasm-data-asmjs/build/cjs/data.js
+ASM=wasm-crypto-asmjs/build/cjs/data.js
 
 # build new via wasm-pack
 echo "*** Building Rust sources"
@@ -42,5 +42,5 @@ sed -i -e '1,/var retasmFunc = /!d' $ASM
 sed -i -e 's/var retasmFunc = .*/const asmJsInit = (wbg) => asmFunc(wbg);\n\nmodule.exports = { asmJsInit };/g' $ASM
 
 # cleanups
-rm -rf wasm-data-asmjs/build/cjs/*-e
-rm -rf wasm-data-wasm/build/cjs/*-e
+rm -rf wasm-crypto-asmjs/build/cjs/*-e
+rm -rf wasm-crypto-wasm/build/cjs/*-e

scripts/build.sh

@@ -19,11 +19,11 @@ echo ""
 echo "*** wasm-crypto"
 ls -alR wasm-crypto/build
 echo ""
-echo "*** wasm-data-asmjs"
-ls -alR wasm-data-asmjs/build
+echo "*** wasm-crypto-asmjs"
+ls -alR wasm-crypto-asmjs/build
 echo ""
-echo "*** wasm-data-wasm"
-ls -alR wasm-data-wasm/build
+echo "*** wasm-crypto-wasm"
+ls -alR wasm-crypto-wasm/build
 
 cd ..
 

scripts/pack-wasm-base.cjs

@@ -5,7 +5,7 @@ const fflate = require('fflate/node');
 const fs = require('fs');
 const { formatNumber } = require('@polkadot/util');
 
-const W_NAME = 'wasm-data-wasm';
+const W_NAME = 'wasm-crypto-wasm';
 
 const data = fs.readFileSync('./bytes/wasm_opt.wasm');
 const compressed = Buffer.from(fflate.zlibSync(data, { level: 9 }));

tsconfig.base.json

@@ -3,17 +3,17 @@
   "compilerOptions": {
     "composite": true,
     "paths": {
-      "@polkadot/wasm-data-asmjs/packageInfo": ["wasm-data-asmjs/src/packageInfo"],
-      "@polkadot/wasm-data-asmjs": ["wasm-data-asmjs/src"],
-      "@polkadot/wasm-data-wasm/packageInfo": ["wasm-data-wasm/src/packageInfo"],
-      "@polkadot/wasm-data-wasm": ["wasm-data-wasm/src"],
+      "@polkadot/wasm-crypto-asmjs/packageInfo": ["wasm-crypto-asmjs/src/packageInfo"],
+      "@polkadot/wasm-crypto-asmjs": ["wasm-crypto-asmjs/src"],
+      "@polkadot/wasm-crypto-wasm/packageInfo": ["wasm-crypto-wasm/src/packageInfo"],
+      "@polkadot/wasm-crypto-wasm": ["wasm-crypto-wasm/src"],
       "@polkadot/wasm-crypto-init/asm": ["wasm-crypto-init/src/asm"],
       "@polkadot/wasm-crypto-init/both": ["wasm-crypto-init/src/both"],
       "@polkadot/wasm-crypto-init/none": ["wasm-crypto-init/src/none"],
       "@polkadot/wasm-crypto-init/wasm": ["wasm-crypto-init/src/wasm"],
       "@polkadot/wasm-crypto-init/types": ["wasm-crypto-init/src/types"],
       "@polkadot/wasm-crypto-init/packageInfo": ["wasm-crypto-init/src/packageInfo"],
-      "@polkadot/wasm-crypto-init": ["wasm-crypto-init/src"],
+      "@polkadot/wasm-crypto-init": ["wasm-crypto-init/src/wasm"],
       "@polkadot/wasm-crypto": ["wasm-crypto/src"]
     },
     "skipLibCheck": true

tsconfig.build.json

@@ -5,7 +5,8 @@
   "files": [],
   "references": [
     { "path": "./packages/wasm-crypto/tsconfig.build.json" },
-    { "path": "./packages/wasm-data-asmjs/tsconfig.build.json" },
-    { "path": "./packages/wasm-data-wasm/tsconfig.build.json" }
+    { "path": "./packages/wasm-crypto-init/tsconfig.build.json" },
+    { "path": "./packages/wasm-crypto-asmjs/tsconfig.build.json" },
+    { "path": "./packages/wasm-crypto-wasm/tsconfig.build.json" }
   ]
 }

yarn.lock

@@ -2032,14 +2032,36 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@polkadot/wasm-crypto-asmjs@6.0.2-9, @polkadot/wasm-crypto-asmjs@workspace:packages/wasm-crypto-asmjs":
+  version: 0.0.0-use.local
+  resolution: "@polkadot/wasm-crypto-asmjs@workspace:packages/wasm-crypto-asmjs"
+  dependencies:
+    "@babel/runtime": ^7.17.9
+    "@polkadot/util": ^9.1.1
+  peerDependencies:
+    "@polkadot/util": "*"
+  languageName: unknown
+  linkType: soft
+
 "@polkadot/wasm-crypto-init@6.0.2-9, @polkadot/wasm-crypto-init@workspace:packages/wasm-crypto-init":
   version: 0.0.0-use.local
   resolution: "@polkadot/wasm-crypto-init@workspace:packages/wasm-crypto-init"
   dependencies:
     "@babel/runtime": ^7.17.9
     "@polkadot/util": ^9.1.1
-    "@polkadot/wasm-data-asmjs": 6.0.2-9
-    "@polkadot/wasm-data-wasm": 6.0.2-9
+    "@polkadot/wasm-crypto-asmjs": 6.0.2-9
+    "@polkadot/wasm-crypto-wasm": 6.0.2-9
+  peerDependencies:
+    "@polkadot/util": "*"
+  languageName: unknown
+  linkType: soft
+
+"@polkadot/wasm-crypto-wasm@6.0.2-9, @polkadot/wasm-crypto-wasm@workspace:packages/wasm-crypto-wasm":
+  version: 0.0.0-use.local
+  resolution: "@polkadot/wasm-crypto-wasm@workspace:packages/wasm-crypto-wasm"
+  dependencies:
+    "@babel/runtime": ^7.17.9
+    "@polkadot/util": ^9.1.1
   peerDependencies:
     "@polkadot/util": "*"
   languageName: unknown
@@ -2051,7 +2073,9 @@ __metadata:
   dependencies:
     "@babel/runtime": ^7.17.9
     "@polkadot/util": ^9.1.1
+    "@polkadot/wasm-crypto-asmjs": 6.0.2-9
     "@polkadot/wasm-crypto-init": 6.0.2-9
+    "@polkadot/wasm-crypto-wasm": 6.0.2-9
     "@polkadot/x-randomvalues": ^9.1.1
   peerDependencies:
     "@polkadot/util": "*"
@@ -2059,28 +2083,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/wasm-data-asmjs@6.0.2-9, @polkadot/wasm-data-asmjs@workspace:packages/wasm-data-asmjs":
-  version: 0.0.0-use.local
-  resolution: "@polkadot/wasm-data-asmjs@workspace:packages/wasm-data-asmjs"
-  dependencies:
-    "@babel/runtime": ^7.17.9
-    "@polkadot/util": ^9.1.1
-  peerDependencies:
-    "@polkadot/util": "*"
-  languageName: unknown
-  linkType: soft
-
-"@polkadot/wasm-data-wasm@6.0.2-9, @polkadot/wasm-data-wasm@workspace:packages/wasm-data-wasm":
-  version: 0.0.0-use.local
-  resolution: "@polkadot/wasm-data-wasm@workspace:packages/wasm-data-wasm"
-  dependencies:
-    "@babel/runtime": ^7.17.9
-    "@polkadot/util": ^9.1.1
-  peerDependencies:
-    "@polkadot/util": "*"
-  languageName: unknown
-  linkType: soft
-
 "@polkadot/x-bigint@npm:9.1.1":
   version: 9.1.1
   resolution: "@polkadot/x-bigint@npm:9.1.1"