Reapply "isolatedDeclarations"

This reverts commit bdef016.

Author: northword

package.json

@@ -98,7 +98,7 @@
     "eslint-plugin-format": "^1.0.2",
     "husky": "^9.1.7",
     "lint-staged": "^16.2.6",
-    "tsdown": "^0.16.6",
+    "tsdown": "^0.16.4",
     "tsx": "^4.20.6",
     "typescript": "^5.9.3",
     "vitest": "^4.0.7"

pnpm-lock.yaml

@@ -105,14 +105,14 @@ type Constructor<T> = new (ctx: Context) => T;
 export async function runCommand<T extends Base>(
   CommandClass: Constructor<T>,
   config: OverrideConfig,
-) {
+): Promise<void> {
   const ctx = await Config.loadConfig(config);
   const instance = new CommandClass(ctx);
   process.on("SIGINT", instance.exit.bind(instance));
   await instance.run();
 }
 
-export default async function mainWithErrorHandler() {
+export default async function mainWithErrorHandler(): Promise<void> {
   main()
     .then(() => {
       checkGitIgnore();

src/cli.ts

@@ -1,16 +1,16 @@
 export const BASE_DIR = ".scaffold";
-export const CACHE_DIR = `${BASE_DIR}/cache`;
+export const CACHE_DIR = `.scaffold/cache`;
 export const DEFAULT_PROFILE_DIR = "";
 export const DEFAULT_DATA_DIR = "";
 
 // Builder
 export const DEFAULT_DIST_TEMP_DIR = "addon";
 
 // Testser
-export const TESTER_BASE_PATH = `${BASE_DIR}/test`;
-export const TESTER_PROFILE_DIR = `${TESTER_BASE_PATH}/profile`;
-export const TESTER_DATA_DIR = `${TESTER_BASE_PATH}/data`;
-export const TESTER_PLUGIN_DIR = `${TESTER_BASE_PATH}/resource`;
-export const TESTER_PLUGIN_TESTS_DIR = `${TESTER_PLUGIN_DIR}/content/units`;
+export const TESTER_BASE_PATH = `.scaffold/test`;
+export const TESTER_PROFILE_DIR = `.scaffold/test/profile`;
+export const TESTER_DATA_DIR = `.scaffold/test/data`;
+export const TESTER_PLUGIN_DIR = `.scaffold/test/resource`;
+export const TESTER_PLUGIN_TESTS_DIR = `.scaffold/test/resource/content/units`;
 export const TESTER_PLUGIN_REF = "zotero-plugin-scaffold-test-runner";
-export const TESTER_PLUGIN_ID = "[email protected]";
+export const TESTER_PLUGIN_ID = "[email protected]" as const;

src/constant.ts

@@ -1,4 +1,5 @@
 import type { Context } from "../types/index.js";
+import type { Logger } from "../utils/logger.js";
 
 export abstract class Base {
   ctx: Context;
@@ -10,7 +11,7 @@ export abstract class Base {
 
   abstract exit(): void;
 
-  get logger() {
+  get logger(): Logger {
     return this.ctx.logger;
   }
 }

src/core/base.ts

@@ -11,7 +11,7 @@ export default async function copyAssets(
   source: string | string[],
   dist: string,
   assets: string | string[],
-) {
+): Promise<void> {
   const sourceArr = toArray(source);
   const paths = await glob(assets, {
     ignore: [...DEFAULT_IGNORE, dist],

src/core/builder/assets.ts

@@ -1,3 +1,3 @@
-export default async function clean() {
+export default async function clean(): Promise<void> {
   //
 }

src/core/builder/clean.ts

@@ -1,9 +1,10 @@
+import type { BuildOptions, BuildResult } from "esbuild";
 import type { BuildConfig } from "../../types/config.js";
 import { resolve } from "node:path";
 import { build as buildAsync } from "esbuild";
 import { logger } from "../../utils/logger.js";
 
-export function resolveConfig(dist: string, esbuildOptions: BuildConfig["esbuildOptions"]) {
+export function resolveConfig(dist: string, esbuildOptions: BuildConfig["esbuildOptions"]): BuildOptions[] {
   const distAbsolute = resolve(dist);
 
   // ensure outfile and outdir are in dist folder
@@ -20,7 +21,7 @@ export function resolveConfig(dist: string, esbuildOptions: BuildConfig["esbuild
   });
 }
 
-export default async function esbuild(dist: string, esbuildOptions: BuildConfig["esbuildOptions"]) {
+export default async function esbuild(dist: string, esbuildOptions: BuildConfig["esbuildOptions"]): Promise<BuildResult<BuildOptions>[] | undefined> {
   if (esbuildOptions.length === 0)
     return;
 

src/core/builder/esbuild.ts

@@ -13,7 +13,7 @@ export default async function buildLocale(
   dist: string,
   namespace: string,
   options: BuildConfig["fluent"],
-) {
+): Promise<void> {
   const ignores = toArray(options.ignore);
   const localeNames = await getLocales(dist);
   const messageManager = new MessageManager(ignores);
@@ -81,13 +81,13 @@ export class FluentManager {
   constructor() {}
 
   // Parse Fluent source into an AST and extract messages
-  public parse(source: string) {
+  public parse(source: string): void {
     this.source = source;
     this.resource = parse(source, {});
   }
 
   // Read a file, parse its content, and extract messages
-  public async read(path: string) {
+  public async read(path: string): Promise<void> {
     const content = await readFile(path, "utf-8");
     this.parse(content);
   }
@@ -106,7 +106,7 @@ export class FluentManager {
   }
 
   // Apply namespace prefix to message IDs in the resource
-  public prefixMessages(namespace: string) {
+  public prefixMessages(namespace: string): void {
     if (!this.resource) {
       throw new Error("Resource must be parsed before applying prefix.");
     }
@@ -122,7 +122,7 @@ export class FluentManager {
   }
 
   // Write the serialized resource to a file
-  public async write(path: string) {
+  public async write(path: string): Promise<void> {
     const result = this.serialize();
     if (result !== this.source)
       await writeFile(path, this.serialize());
@@ -163,7 +163,7 @@ export class MessageManager {
   }
 
   // Add a set of messages (FTL or HTML) for a specific locale or for HTML globally
-  addMessages(target: string | "html", messages: string[]) {
+  addMessages(target: string | "html", messages: string[]): void {
     if (target === "html") {
       messages.forEach(msg => this.htmlMessages.add(msg));
     }
@@ -177,7 +177,7 @@ export class MessageManager {
     }
   }
 
-  validateMessages() {
+  validateMessages(): void {
     // Check miss 1: Cross check in diff locale - seems no need
     // messagesByLocale.forEach((messageInThisLang, lang) => {
     //   // Needs Nodejs 22
@@ -223,7 +223,10 @@ export function processHTMLFile(
   allMessages: Set<string>,
   ignores: string[],
   filePath: string,
-) {
+): {
+  processedContent: string;
+  foundMessages: string[];
+} {
   const foundMessages = new Set<string>();
 
   const L10N_PATTERN = new RegExp(`(data-l10n-id)="((?!${namespace})\\S*)"`, "g");

src/core/builder/fluent.ts

@@ -25,7 +25,7 @@ export default class Build extends Base {
   /**
    * Default build runner
    */
-  async run() {
+  async run(): Promise<void> {
     const { dist, version } = this.ctx;
     const t = new Date();
     this.buildTime = dateFormat("YYYY-mm-dd HH:MM:SS", t);
@@ -71,13 +71,13 @@ export default class Build extends Base {
     await buildPrefs(dist, build.prefs);
   }
 
-  async bundle() {
+  async bundle(): Promise<void> {
     const { dist, build: { esbuildOptions } } = this.ctx;
     await esbuild(dist, esbuildOptions);
     await this.ctx.hooks.callHook("build:bundle", this.ctx);
   }
 
-  async buildInProduction() {
+  async buildInProduction(): Promise<void> {
     const { dist, xpiName } = this.ctx;
 
     await pack(dist, xpiName);
@@ -87,5 +87,5 @@ export default class Build extends Base {
     await this.ctx.hooks.callHook("build:makeUpdateJSON", this.ctx);
   }
 
-  exit() {}
+  exit(): void {}
 }