From 50142d7e6390fc5395b2b05dc6139035fd8ef951 Mon Sep 17 00:00:00 2001 From: Jaco Date: Sun, 17 Apr 2022 07:31:04 +0200 Subject: [PATCH] Pull typegen __dirname from packageInfo (#4748) * Pull ty[pegen __dirname from packageInfo * CHANGELOG --- CHANGELOG.md | 1 + packages/typegen/src/util/file.ts | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cbfbe6df3b..508468e984 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Contributed: - Adjust typegen for `Vec<{ struct: }>` (Thanks to https://github.com/zannis) +- Adjust typegen __dirname for ESM (Thanks to https://github.com/drewstone) Changes: diff --git a/packages/typegen/src/util/file.ts b/packages/typegen/src/util/file.ts index aead86b9c6..9ee28367e4 100644 --- a/packages/typegen/src/util/file.ts +++ b/packages/typegen/src/util/file.ts @@ -6,6 +6,8 @@ import path from 'path'; import { assert } from '@polkadot/util'; +import { packageInfo } from '../packageInfo'; + export function writeFile (dest: string, generator: () => string, noLog?: boolean): void { !noLog && console.log(`${dest}\n\tGenerating`); @@ -23,12 +25,17 @@ export function writeFile (dest: string, generator: () => string, noLog?: boolea } export function readTemplate (template: string): string { + // Inside the api repo itself, it will be 'auto' + const rootDir = packageInfo.path === 'auto' + ? path.join(__dirname, '..') + : packageInfo.path; + // NOTE With cjs in a subdir, search one lower as well - const file = ['../templates', '../../templates'] - .map((p) => path.join(__dirname, p, `${template}.hbs`)) + const file = ['./templates', '../templates'] + .map((p) => path.join(rootDir, p, `${template}.hbs`)) .find((p) => fs.existsSync(p)); - assert(file, `Unable to locate ${template}.hbs from ${__dirname}`); + assert(file, `Unable to locate ${template}.hbs from ${rootDir}`); return fs.readFileSync(file).toString(); }