refactor: rearrange packages, flatten further

Signed-off-by: 0x009922 <43530070+0x009922@users.noreply.github.com>

Author: 0x009922

.changeset/README.md

@@ -10,5 +10,5 @@ v8-compile-cache-0
 .vscode
 
 /.iroha
-/packages/crypto-*/src/wasm-target
+/packages/crypto*/wasm-target
 

.changeset/config.json

@@ -1,11 +1,11 @@
 {
   "nodeModulesDir": "auto",
   "workspace": [
-    "./packages/data-model",
-    "./packages/client",
+    "./packages/core",
     "./packages/crypto",
     "./packages/crypto-target-node",
     "./packages/crypto-target-web",
+    "./packages/client",
     // Could be enabled for DX (i.e. Deno LSP will recognise and help), but Deno will fail at running
     // because of deps in `package.json`. They are specified with `pnpm dlx jsr add ...`, and Deno doesn't handle that.
     "./tests/support/iroha-source",
@@ -52,7 +52,7 @@
   },
   "fmt": {
     "include": ["."],
-    "exclude": ["**/*._generated_.ts"],
+    "exclude": ["**/*_generated_.ts"],
     "semiColons": false,
     "lineWidth": 120,
     "singleQuote": true
@@ -68,6 +68,7 @@
     "@deno/vite-plugin": "npm:@deno/vite-plugin@^1.0.3",
     "@std/assert": "jsr:@std/assert@^1.0.11",
     "@std/async": "jsr:@std/async@^1.0.10",
+    "@std/encoding": "jsr:@std/encoding@^1.0.7",
     "@std/fmt": "jsr:@std/fmt@^1.0.5",
     "@std/toml": "jsr:@std/toml@^1.0.2",
     "change-case": "npm:change-case@^5.4.4",

.gitignore

@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'vitest'
-import type { Schema } from '../packages/data-model/src/schema/lib.ts'
-import { SCHEMA } from '../packages/data-model/src/schema/lib.ts'
+import type { Schema } from '@iroha/core/data-model/schema'
+import SCHEMA from '@iroha/core/data-model/schema-json'
 import {
   type EmitCode,
   type EmitsMap,
@@ -49,24 +49,21 @@ const EXTENSION: Schema = {
 
 */
 
-// function prettierFormat(code: string): Promise<string> {
-//   return format(code, { parser: 'typescript', ...PRETTIER_OPTIONS })
-// }
-
 // convenient for development in watch mode
 // works almost as if JavaScript supported comptime codegen
 test('codegen snapshots', async () => {
   expect(SCHEMA).not.contain.keys(Object.keys(EXTENSION))
 
   const resolver = new Resolver({ ...SCHEMA, ...EXTENSION })
 
-  await expect(await formatTS(generateDataModel(resolver, './data-model.prelude.ts'))).toMatchFileSnapshot(
-    '../packages/data-model/src/generated/data-model._generated_.ts',
+  await expect(await formatTS(generateDataModel(resolver, './_generated_.prelude.ts'))).toMatchFileSnapshot(
+    '../packages/core/data-model/_generated_.ts',
   )
 
-  await expect(await formatTS(generateClientFindAPI(resolver, './find-api.prelude.ts'))).toMatchFileSnapshot(
-    '../packages/client/src/generated/find-api._generated_.ts',
-  )
+  await expect(await formatTS(generateClientFindAPI(resolver, './find-api._generated_.prelude.ts')))
+    .toMatchFileSnapshot(
+      '../packages/client/find-api._generated_.ts',
+    )
 })
 
 // test("codegen")

deno.jsonc

@@ -1,4 +1,4 @@
-import type { EnumDefinition, NamedStructDefinition, Schema, SchemaTypeDefinition } from '@iroha2/data-model'
+import type { EnumDefinition, NamedStructDefinition, Schema, SchemaTypeDefinition } from '@iroha/core/data-model/schema'
 import { camelCase } from 'change-case'
 import { deepEqual } from 'fast-equals'
 import { assert as assert, fail } from '@std/assert'
@@ -58,8 +58,8 @@ export function generateClientFindAPI(resolver: Resolver, libClient: string): st
       `/**\n* Convenience method for \`${x.tag}\` query, a variant of {@link dm.QueryBox} enum.\n` +
       `* - Predicate type: {@link dm.${predicate}}\n` +
       `* - Selector type: {@link dm.${selector}}\n */\n` +
-      `  public ${methodName}<const P extends dm.BuildQueryParams<'${x.tag}'>>(${payloadArg}params?: P): ` +
-      `client.QueryHandle<dm.GetQueryOutput<'${x.tag}', P>> {` +
+      `  public ${methodName}<const P extends core.BuildQueryParams<'${x.tag}'>>(${payloadArg}params?: P): ` +
+      `client.QueryHandle<core.GetQueryOutput<'${x.tag}', P>> {` +
       `return client.buildQueryHandle(this._executor, '${x.tag}', ${payloadArgValue}, params) }\n`
     )
   })
@@ -75,14 +75,15 @@ export function generateClientFindAPI(resolver: Resolver, libClient: string): st
 
     return (
       `\n/** Convenience method for \`${x.tag}\` query, a variant of {@link dm.SingularQueryBox} enum. */` +
-      `  public ${methodName}(): Promise<dm.GetSingularQueryOutput<'${x.tag}'>> {` +
+      `  public ${methodName}(): Promise<core.GetSingularQueryOutput<'${x.tag}'>> {` +
       `return client.executeSingularQuery(this._executor, '${x.tag}') }`
     )
   })
 
   return [
     `import * as client from '${libClient}'`,
-    `import type * as dm from '@iroha2/data-model'`,
+    `import type * as core from '@iroha/core'`,
+    `import type * as dm from '@iroha/core/data-model'`,
     `export class FindAPI {`,
     `  private _executor: client.QueryExecutor`,
     `  public constructor(executor: client.QueryExecutor) { this._executor = executor; }`,

deno.lock

@@ -43,7 +43,7 @@ async function buildCryptoWasm(opts?: { wasmPack?: boolean }) {
   await Deno.mkdir(copyToDir)
   const dts = path.join(wasmPackOutDir('node'), `${wasmPackOutName}.d.ts`)
   await $`cp ${dts} ${copyToDir}/wasm-pkg.d.ts`
-  $.logStep('Copied artifacts to @iroha2/crypto* packages')
+  $.logStep('Copied artifacts to @iroha/crypto* packages')
 }
 
 const args = parseArgs(Deno.args, {