chore: switch to nx for flatpack script

clients/remote/package.json

@@ -13,6 +13,7 @@
         "test": "yarn node --experimental-vm-modules $(yarn bin jest)",
         "start": "yarn node dist/index.js -c ../test/config.json",
         "debug": "yarn node --inspect-brk dist/index.js -c ../test/config.json",
+        "flatpack": "yarn pack --out \"$FLATPACK_OUTDIR\"",
         "db:bootstrap": "tsx ./src/index -c ../test/config.json db bootstrap",
         "db:migrate:up": "tsx ./src/index -c ../test/config.json db up",
         "db:migrate:down": "tsx ./src/index -c ../test/config.json db down",

core/ledger-client/package.json

@@ -13,6 +13,7 @@
         "build": "tsc -b",
         "dev": "tsc -b --watch",
         "clean": "tsc -b --clean; rm -rf dist",
+        "flatpack": "yarn pack --out \"$FLATPACK_OUTDIR\"",
         "test": "yarn node --experimental-vm-modules $(yarn bin jest) --passWithNoTests"
     },
     "devDependencies": {

core/ledger-proto/package.json

@@ -12,6 +12,7 @@
     "scripts": {
         "build": "tsc -b",
         "dev": "tsc -b --watch",
+        "flatpack": "yarn pack --out \"$FLATPACK_OUTDIR\"",
         "clean": "tsc -b --clean; rm -rf dist"
     },
     "devDependencies": {

core/rpc-errors/package.json

@@ -17,6 +17,7 @@
     },
     "scripts": {
         "build": "tsc --build",
+        "flatpack": "yarn pack --out \"$FLATPACK_OUTDIR\"",
         "clean": "tsc -b --clean; rm -rf dist"
     },
     "dependencies": {

core/rpc-generator/templates/client/typescript/_package.json

@@ -10,6 +10,7 @@
     "scripts": {
         "build": "tsc && typedoc src/index.ts --out docs --excludeExternals --excludePrivate --hideGenerator --readme none",
         "dev": "tsc -b --watch",
+        "flatpack": "yarn pack --out \"$FLATPACK_OUTDIR\"",
         "clean": "tsc -b --clean; rm -rf dist"
     },
     "files": ["dist/**"],

core/signing-fireblocks/package.json

@@ -9,6 +9,7 @@
     "scripts": {
         "build": "tsc -b",
         "clean": "tsc -b --clean && rm -rf ./dist",
+        "flatpack": "yarn pack --out \"$FLATPACK_OUTDIR\"",
         "test": "jest"
     },
     "main": "dist/index.js",

core/signing-internal/package.json

@@ -11,6 +11,7 @@
     "scripts": {
         "build": "tsc -b",
         "clean": "tsc -b --clean && rm -rf ./dist",
+        "flatpack": "yarn pack --out \"$FLATPACK_OUTDIR\"",
         "test": "jest"
     },
     "dependencies": {

core/signing-lib/package.json

@@ -10,6 +10,7 @@
     "types": "dist/index.d.ts",
     "scripts": {
         "build": "tsc -b",
+        "flatpack": "yarn pack --out \"$FLATPACK_OUTDIR\"",
         "clean": "tsc -b --clean && rm -rf ./dist"
     },
     "dependencies": {

core/signing-participant/package.json

@@ -11,6 +11,7 @@
     "scripts": {
         "build": "tsc -b",
         "clean": "tsc -b --clean && rm -rf ./dist",
+        "flatpack": "yarn pack --out \"$FLATPACK_OUTDIR\"",
         "test": "yarn node --experimental-vm-modules $(yarn bin jest) --passWithNoTests"
     },
     "dependencies": {

core/splice-client/package.json

@@ -11,6 +11,7 @@
     "scripts": {
         "build": "tsc -b",
         "dev": "tsc -b --watch",
+        "flatpack": "yarn pack --out \"$FLATPACK_OUTDIR\"",
         "clean": "tsc -b --clean; rm -rf dist"
     },
     "dependencies": {

core/splice-provider/package.json

@@ -12,6 +12,7 @@
     "scripts": {
         "build": "tsc -b",
         "dev": "tsc -b --watch",
+        "flatpack": "yarn pack --out \"$FLATPACK_OUTDIR\"",
         "clean": "tsc -b --clean; rm -rf dist"
     },
     "devDependencies": {

core/token-standard/package.json

@@ -11,6 +11,7 @@
     "scripts": {
         "build": "rollup -c",
         "dev": "tsc -b --watch",
+        "flatpack": "yarn pack --out \"$FLATPACK_OUTDIR\"",
         "clean": "tsc -b --clean; rm -rf dist"
     },
     "dependencies": {

core/tx-visualizer/package.json

@@ -11,6 +11,7 @@
     "scripts": {
         "build": "tsc -b",
         "dev": "tsc -b --watch",
+        "flatpack": "yarn pack --out \"$FLATPACK_OUTDIR\"",
         "test": "yarn node --experimental-vm-modules $(yarn bin jest)",
         "clean": "tsc -b --clean; rm -rf dist"
     },

core/types/package.json

@@ -12,6 +12,7 @@
     "scripts": {
         "build": "tsc -b",
         "dev": "tsc -b --watch",
+        "flatpack": "yarn pack --out \"$FLATPACK_OUTDIR\"",
         "clean": "tsc -b --clean; rm -rf dist"
     },
     "dependencies": {

core/wallet-auth/package.json

@@ -12,6 +12,7 @@
     "scripts": {
         "build": "tsc -b",
         "dev": "tsc -b --watch",
+        "flatpack": "yarn pack --out \"$FLATPACK_OUTDIR\"",
         "clean": "tsc -b --clean; rm -rf dist",
         "test": "yarn node --experimental-vm-modules $(yarn bin jest) --passWithNoTests"
     },

core/wallet-dapp-remote-rpc-client/package.json

@@ -10,6 +10,7 @@
     "scripts": {
         "build": "tsc && typedoc src/index.ts --out docs --excludeExternals --excludePrivate --hideGenerator --readme none",
         "dev": "tsc -b --watch",
+        "flatpack": "yarn pack --out \"$FLATPACK_OUTDIR\"",
         "clean": "tsc -b --clean; rm -rf dist"
     },
     "files": [

core/wallet-store-inmemory/package.json

@@ -12,6 +12,7 @@
     "scripts": {
         "build": "tsc -b",
         "dev": "tsc -b --watch",
+        "flatpack": "yarn pack --out \"$FLATPACK_OUTDIR\"",
         "clean": "tsc -b --clean; rm -rf dist",
         "test": "yarn node --experimental-vm-modules $(yarn bin jest)"
     },

core/wallet-store-sql/package.json

@@ -12,6 +12,7 @@
     "scripts": {
         "build": "tsc -b",
         "dev": "tsc -b --watch",
+        "flatpack": "yarn pack --out \"$FLATPACK_OUTDIR\"",
         "clean": "tsc -b --clean; rm -rf dist",
         "test": "yarn node --experimental-vm-modules $(yarn bin jest)"
     },

core/wallet-store/package.json

@@ -12,6 +12,7 @@
     "scripts": {
         "build": "tsc -b",
         "dev": "tsc -b --watch",
+        "flatpack": "yarn pack --out \"$FLATPACK_OUTDIR\"",
         "clean": "tsc -b --clean; rm -rf dist",
         "test": "yarn node --experimental-vm-modules $(yarn bin jest) --passWithNoTests"
     },

core/wallet-ui-components/package.json

@@ -16,6 +16,7 @@
         "build": "vite build && yarn workspace @canton-network/core-wallet-ui-components tsc --emitDeclarationOnly",
         "build:watch": "vite build --watch & tsc --emitDeclarationOnly --watch",
         "typecheck": "tsc --noEmit",
+        "flatpack": "yarn pack --out \"$FLATPACK_OUTDIR\"",
         "clean": "rm -rf dist",
         "dev": "storybook dev -p 6006"
     },

nx.json

@@ -26,6 +26,9 @@
         }
     },
     "targetDefaults": {
+        "flatpack": {
+            "dependsOn": ["build", "^flatpack"]
+        },
         "build": {
             "dependsOn": ["^build"],
             "cache": true

scripts/src/lib/flat-pack.ts

@@ -11,26 +11,19 @@ import { getRepoRoot } from './utils.js'
 
 const repoRoot = getRepoRoot()
 
-function run(cmd: string, opts: { cwd?: string } = {}) {
+function run(
+    cmd: string,
+    opts: { cwd?: string; env?: Record<string, string> } = {}
+) {
     console.log(`$ ${cmd}`)
     execSync(cmd, { stdio: 'inherit', ...opts })
 }
 
-interface DependencyPackage {
-    name: string
-    dir: string
-}
-
-interface DependencyPackageVendored {
-    name: string
-    dir: string
-    filename: string
-}
-
 /** Given a package directory within this repository: build, pack, and copy it as well as all its dependencies to an output directory */
 export class FlatPack {
     private outDir: string
     private vendoredDir: string
+    private postInitHook: (() => void) | undefined = undefined
 
     constructor(
         private pkgDir: string,
@@ -41,58 +34,62 @@ export class FlatPack {
         this.vendoredDir = path.join(this.outDir, '.vendored')
     }
 
+    public postInit(callback: () => void): void {
+        this.postInitHook = callback
+    }
+
     /**
      * Build, pack, and copy the package and its dependencies to the output directory
      * @returns The path to the output directory
      */
     public pack(): string {
         const mainPkgDir = this.pkgDir
         const mainPkgName = this.readPackageJson(mainPkgDir).name
+        const mainPkgFileName = `${mainPkgName.replaceAll('/', '-')}.tgz`
+
+        console.log('Packing for: ' + mainPkgName)
 
-        console.log('packing for: ' + mainPkgName)
         this.init()
 
-        const dependencies = this.getRecursiveDependencies()
+        run(`yarn nx --tui=false run ${mainPkgName}:flatpack`, {
+            cwd: repoRoot,
+            env: {
+                ...process.env,
+                FLATPACK_OUTDIR: `${this.vendoredDir}/%s.tgz`,
+            },
+        })
 
-        for (const dep of dependencies) {
-            const vendored = this.buildDependency(dep)
-            this.overridePackageJson(vendored)
+        const overrides =
+            this.projectType === 'npm' ? 'overrides' : 'resolutions'
+
+        const resolvedDependencies = {} as Record<string, string>
+
+        const dependencies = fs
+            .readdirSync(this.vendoredDir)
+            .filter((f) => f.endsWith('.tgz'))
+            .filter((f) => f !== mainPkgFileName)
+
+        for (const file of dependencies) {
+            if (file.endsWith('.tgz')) {
+                const pkgName = file
+                    .split('.tgz')[0]
+                    .replaceAll('@canton-network-', '@canton-network/')
+                resolvedDependencies[pkgName] = `file:./.vendored/${file}`
+            }
         }
 
-        const mainPkg = this.buildDependency({
-            name: this.readPackageJson(this.pkgDir).name,
-            dir: this.pkgDir,
-        })
-        this.overridePackageJson(mainPkg)
         this.writePackageJson((pkgJson) => ({
             ...pkgJson,
             dependencies: {
-                [mainPkgName]: `file:./.vendored/${mainPkg.filename}`,
+                ...pkgJson.dependencies,
+                [mainPkgName]: `file:./.vendored/${mainPkgFileName}`,
             },
+            [overrides]: resolvedDependencies,
         }))
 
         return this.outDir
     }
 
-    public getRecursiveDependencies(): DependencyPackage[] {
-        const cmd =
-            'yarn workspaces foreach --no-private --topological -R exec \'echo "$npm_package_name $(pwd)"\''
-
-        const workspaces = execSync(cmd, {
-            encoding: 'utf8',
-            cwd: path.join(repoRoot, this.pkgDir),
-        })
-
-        return workspaces
-            .trim()
-            .split('\n')
-            .filter((l) => !l.startsWith('Done'))
-            .map((line) => {
-                const [name, dir] = line.split(' ')
-                return { name, dir }
-            })
-    }
-
     private init() {
         fs.mkdirSync(path.join(this.vendoredDir), { recursive: true })
         fs.writeFileSync(
@@ -103,34 +100,19 @@ export class FlatPack {
                     private: true,
                     version: '0.0.0',
                     description: 'Temporary package for flat packing',
+                    ...(this.projectType === 'yarn'
+                        ? { packageManager: 'yarn@4.9.4' }
+                        : {}),
                     dependencies: {},
                 },
                 null,
                 2
             )
         )
-    }
-
-    private pkgNameToFileName(name: string): string {
-        return (
-            name.replaceAll('/', '_').replaceAll('-', '_').replaceAll('@', '') +
-            '.tgz'
-        )
-    }
-
-    private buildDependency(dep: DependencyPackage): DependencyPackageVendored {
-        console.log('building package in: ' + dep.dir)
-
-        const filename = this.pkgNameToFileName(dep.name)
-        const outpath = path.join(
-            this.vendoredDir,
-            this.pkgNameToFileName(dep.name)
-        )
 
-        run('yarn build', { cwd: dep.dir })
-        run(`yarn pack --filename "${outpath}"`, { cwd: dep.dir })
-
-        return { ...dep, filename }
+        if (this.postInitHook) {
+            this.postInitHook()
+        }
     }
 
     private readPackageJson(parentDir: string): any {
@@ -151,17 +133,4 @@ export class FlatPack {
             JSON.stringify(callback(pkgJson), null, 2)
         )
     }
-
-    private overridePackageJson(dep: DependencyPackageVendored) {
-        const overrides =
-            this.projectType === 'npm' ? 'overrides' : 'resolutions'
-
-        this.writePackageJson((pkgJson) => ({
-            ...pkgJson,
-            [overrides]: {
-                ...pkgJson[overrides],
-                [dep.name]: `file:./.vendored/${dep.filename}`,
-            },
-        }))
-    }
 }