Fix import inconsistencies based on code review feedback

Co-authored-by: huangyiirene <7665279+huangyiirene@users.noreply.github.com>

Author: Copilot

packages/tools/cli/src/commands/build.ts

@@ -3,6 +3,7 @@ import { ObjectLoader } from '@objectql/platform-node';
 import { generateTypes } from './generate';
 import * as path from 'path';
 import * as fs from 'fs';
+import glob from 'fast-glob';
 import chalk from 'chalk';
 
 interface BuildOptions {
@@ -71,7 +72,6 @@ export async function build(options: BuildOptions) {
         ];
 
         let fileCount = 0;
-        const glob = require('fast-glob');
         const files = await glob(metadataPatterns, { cwd: rootDir });
 
         for (const file of files) {

packages/tools/cli/src/commands/format.ts

@@ -2,6 +2,7 @@ import * as path from 'path';
 import * as fs from 'fs';
 import chalk from 'chalk';
 import * as yaml from 'js-yaml';
+import glob from 'fast-glob';
 
 interface FormatOptions {
     dir?: string;
@@ -20,7 +21,6 @@ export async function format(options: FormatOptions) {
     let errorCount = 0;
 
     try {
-        const glob = require('fast-glob');
         const files = await glob(['**/*.yml', '**/*.yaml'], { 
             cwd: rootDir,
             ignore: ['node_modules/**', 'dist/**', 'build/**']
@@ -37,29 +37,34 @@ export async function format(options: FormatOptions) {
                 // Parse to validate YAML
                 yaml.load(content);
 
-                // Format with Prettier (using require instead of import for better compatibility)
-                const prettierFormat = require('prettier').format;
-                const formatted = await prettierFormat(content, {
-                    parser: 'yaml',
-                    printWidth: 80,
-                    tabWidth: 2,
-                    singleQuote: true
-                });
-                
-                if (content !== formatted) {
-                    if (options.check) {
-                        console.log(chalk.yellow(`  ⚠️  ${file} needs formatting`));
-                        formattedCount++;
+                // Format with Prettier - use dynamic import for better compatibility
+                try {
+                    const prettier = await import('prettier');
+                    const formatted = await prettier.format(content, {
+                        parser: 'yaml',
+                        printWidth: 80,
+                        tabWidth: 2,
+                        singleQuote: true
+                    });
+                    
+                    if (content !== formatted) {
+                        if (options.check) {
+                            console.log(chalk.yellow(`  ⚠️  ${file} needs formatting`));
+                            formattedCount++;
+                        } else {
+                            fs.writeFileSync(filePath, formatted, 'utf-8');
+                            console.log(chalk.green(`  ✅ ${file}`));
+                            formattedCount++;
+                        }
                     } else {
-                        fs.writeFileSync(filePath, formatted, 'utf-8');
-                        console.log(chalk.green(`  ✅ ${file}`));
-                        formattedCount++;
-                    }
-                } else {
-                    unchangedCount++;
-                    if (!options.check) {
-                        console.log(chalk.gray(`  ✓  ${file}`));
+                        unchangedCount++;
+                        if (!options.check) {
+                            console.log(chalk.gray(`  ✓  ${file}`));
+                        }
                     }
+                } catch (prettierError: any) {
+                    console.error(chalk.red(`  ❌ ${file}: Prettier error - ${prettierError.message}`));
+                    errorCount++;
                 }
             } catch (e: any) {
                 console.error(chalk.red(`  ❌ ${file}: ${e.message}`));

packages/tools/cli/src/commands/test.ts

@@ -1,4 +1,5 @@
 import * as path from 'path';
+import * as fs from 'fs';
 import chalk from 'chalk';
 import { spawn } from 'child_process';
 
@@ -21,7 +22,6 @@ export async function test(options: TestOptions) {
     let testCommand = 'npm test';
 
     try {
-        const fs = require('fs');
         if (fs.existsSync(packageJsonPath)) {
             const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));