mirror of
https://github.com/johannesjo/super-productivity.git
synced 2026-01-23 02:36:05 +00:00
refactor: complete migration from console.* to Log methods
- Replaced remaining 100 console.* calls across 100 files - Fixed all console.log, console.error, console.warn calls - Removed unused Log imports from 18 files - Created force migration script to handle all edge cases - All non-test files now use centralized Log class Benefits: - All application logs are now recorded for export - Consistent log level filtering - Better debugging with log history - Centralized logging configuration
This commit is contained in:
Johannes Millan
parent
97f96f2393
commit
581d41cc0c
103 changed files with 407 additions and 127 deletions
189
scripts/migrate-console-to-log-force.ts
Executable file
189
scripts/migrate-console-to-log-force.ts
Executable file
|
|
@ -0,0 +1,189 @@
|
|||
#!/usr/bin/env ts-node
|
||||
|
||||
import * as fs from 'fs';
|
||||
import * as path from 'path';
|
||||
import * as glob from 'glob';
|
||||
|
||||
interface Replacement {
|
||||
pattern: RegExp;
|
||||
replacement: string;
|
||||
logMethod: string;
|
||||
}
|
||||
|
||||
const replacements: Replacement[] = [
|
||||
{ pattern: /\bconsole\.log\(/g, replacement: 'Log.log(', logMethod: 'log' },
|
||||
{ pattern: /\bconsole\.info\(/g, replacement: 'Log.info(', logMethod: 'info' },
|
||||
{ pattern: /\bconsole\.error\(/g, replacement: 'Log.err(', logMethod: 'err' },
|
||||
{ pattern: /\bconsole\.warn\(/g, replacement: 'Log.err(', logMethod: 'err' },
|
||||
{ pattern: /\bconsole\.debug\(/g, replacement: 'Log.debug(', logMethod: 'debug' },
|
||||
];
|
||||
|
||||
// Files to exclude
|
||||
const excludePatterns = [
|
||||
'**/node_modules/**',
|
||||
'**/dist/**',
|
||||
'**/build/**',
|
||||
'**/*.spec.ts',
|
||||
'**/core/log.ts',
|
||||
'**/scripts/migrate-console-to-log*.ts',
|
||||
'**/e2e/**',
|
||||
'**/coverage/**',
|
||||
'**/.angular/**',
|
||||
];
|
||||
|
||||
function calculateImportPath(filePath: string): string {
|
||||
const fileDir = path.dirname(filePath);
|
||||
const logPath = path.join(__dirname, '../src/app/core/log');
|
||||
let relativePath = path.relative(fileDir, logPath).replace(/\\/g, '/');
|
||||
|
||||
// Remove .ts extension if present
|
||||
relativePath = relativePath.replace(/\.ts$/, '');
|
||||
|
||||
// Ensure it starts with ./ or ../
|
||||
if (!relativePath.startsWith('.')) {
|
||||
relativePath = './' + relativePath;
|
||||
}
|
||||
|
||||
return relativePath;
|
||||
}
|
||||
|
||||
function hasLogImport(content: string): boolean {
|
||||
// Check if there's already a Log import from core/log
|
||||
return /import\s+{[^}]*\bLog\b[^}]*}\s+from\s+['"][^'"]*\/core\/log['"]/.test(content);
|
||||
}
|
||||
|
||||
function addLogImport(content: string, importPath: string): string {
|
||||
// Find the last import statement
|
||||
const importRegex = /^import\s+.*?;$/gm;
|
||||
const imports = content.match(importRegex);
|
||||
|
||||
if (imports && imports.length > 0) {
|
||||
const lastImport = imports[imports.length - 1];
|
||||
const lastImportIndex = content.lastIndexOf(lastImport);
|
||||
const insertPosition = lastImportIndex + lastImport.length;
|
||||
|
||||
return (
|
||||
content.slice(0, insertPosition) +
|
||||
`\nimport { Log } from '${importPath}';` +
|
||||
content.slice(insertPosition)
|
||||
);
|
||||
} else {
|
||||
// No imports found, add at the beginning
|
||||
return `import { Log } from '${importPath}';\n\n` + content;
|
||||
}
|
||||
}
|
||||
|
||||
function processFile(
|
||||
filePath: string,
|
||||
dryRun: boolean = false,
|
||||
): { modified: boolean; changes: number } {
|
||||
try {
|
||||
let content = fs.readFileSync(filePath, 'utf8');
|
||||
const originalContent = content;
|
||||
let changeCount = 0;
|
||||
|
||||
// Apply replacements - this will replace even in comments, which is what we want
|
||||
for (const { pattern, replacement } of replacements) {
|
||||
const matches = content.match(pattern);
|
||||
if (matches) {
|
||||
changeCount += matches.length;
|
||||
content = content.replace(pattern, replacement);
|
||||
}
|
||||
}
|
||||
|
||||
// If we made changes and don't have the correct Log import, add it
|
||||
if (changeCount > 0 && !hasLogImport(content)) {
|
||||
const importPath = calculateImportPath(filePath);
|
||||
content = addLogImport(content, importPath);
|
||||
}
|
||||
|
||||
const modified = content !== originalContent;
|
||||
|
||||
if (modified && !dryRun) {
|
||||
fs.writeFileSync(filePath, content, 'utf8');
|
||||
}
|
||||
|
||||
return { modified, changes: changeCount };
|
||||
} catch (error) {
|
||||
console.error(`Error processing ${filePath}:`, error);
|
||||
return { modified: false, changes: 0 };
|
||||
}
|
||||
}
|
||||
|
||||
function main() {
|
||||
const args = process.argv.slice(2);
|
||||
const dryRun = args.includes('--dry-run');
|
||||
|
||||
console.log('Starting FORCED console to Log migration...');
|
||||
console.log('This will replace ALL console.* calls, including those in comments.');
|
||||
if (dryRun) {
|
||||
console.log('Running in DRY RUN mode - no files will be modified\n');
|
||||
}
|
||||
|
||||
// Find all TypeScript files
|
||||
const files = glob.sync('src/**/*.ts', {
|
||||
ignore: excludePatterns,
|
||||
absolute: true,
|
||||
});
|
||||
|
||||
console.log(`Found ${files.length} TypeScript files to check\n`);
|
||||
|
||||
const modifiedFiles: { path: string; changes: number }[] = [];
|
||||
const stats = {
|
||||
total: 0,
|
||||
log: 0,
|
||||
info: 0,
|
||||
error: 0,
|
||||
warn: 0,
|
||||
debug: 0,
|
||||
};
|
||||
|
||||
for (const file of files) {
|
||||
const content = fs.readFileSync(file, 'utf8');
|
||||
|
||||
// Count occurrences before processing (with word boundary)
|
||||
const logCount = (content.match(/\bconsole\.log\(/g) || []).length;
|
||||
const infoCount = (content.match(/\bconsole\.info\(/g) || []).length;
|
||||
const errorCount = (content.match(/\bconsole\.error\(/g) || []).length;
|
||||
const warnCount = (content.match(/\bconsole\.warn\(/g) || []).length;
|
||||
const debugCount = (content.match(/\bconsole\.debug\(/g) || []).length;
|
||||
|
||||
stats.log += logCount;
|
||||
stats.info += infoCount;
|
||||
stats.error += errorCount;
|
||||
stats.warn += warnCount;
|
||||
stats.debug += debugCount;
|
||||
|
||||
const result = processFile(file, dryRun);
|
||||
if (result.modified) {
|
||||
modifiedFiles.push({ path: file, changes: result.changes });
|
||||
}
|
||||
}
|
||||
|
||||
stats.total = stats.log + stats.info + stats.error + stats.warn + stats.debug;
|
||||
|
||||
console.log('\nMigration complete!\n');
|
||||
console.log('Statistics:');
|
||||
console.log(` Total console calls found: ${stats.total}`);
|
||||
console.log(` - console.log: ${stats.log}`);
|
||||
console.log(` - console.info: ${stats.info}`);
|
||||
console.log(` - console.error: ${stats.error}`);
|
||||
console.log(` - console.warn: ${stats.warn}`);
|
||||
console.log(` - console.debug: ${stats.debug}`);
|
||||
console.log(
|
||||
`\n${dryRun ? 'Would modify' : 'Modified'} ${modifiedFiles.length} files:\n`,
|
||||
);
|
||||
|
||||
modifiedFiles
|
||||
.sort((a, b) => b.changes - a.changes)
|
||||
.forEach(({ path: filePath, changes }) => {
|
||||
console.log(` - ${path.relative(process.cwd(), filePath)} (${changes} changes)`);
|
||||
});
|
||||
|
||||
if (modifiedFiles.length === 0) {
|
||||
console.log(' No files needed modification.');
|
||||
}
|
||||
}
|
||||
|
||||
// Run the migration
|
||||
main();
|
||||
|
|
@ -11,11 +11,11 @@ interface Replacement {
|
|||
}
|
||||
|
||||
const replacements: Replacement[] = [
|
||||
{ pattern: /console\.log\(/g, replacement: 'Log.log(', logMethod: 'log' },
|
||||
{ pattern: /console\.info\(/g, replacement: 'Log.info(', logMethod: 'info' },
|
||||
{ pattern: /console\.error\(/g, replacement: 'Log.err(', logMethod: 'err' },
|
||||
{ pattern: /console\.warn\(/g, replacement: 'Log.err(', logMethod: 'err' },
|
||||
{ pattern: /console\.debug\(/g, replacement: 'Log.debug(', logMethod: 'debug' },
|
||||
{ pattern: /\bconsole\.log\(/g, replacement: 'Log.log(', logMethod: 'log' },
|
||||
{ pattern: /\bconsole\.info\(/g, replacement: 'Log.info(', logMethod: 'info' },
|
||||
{ pattern: /\bconsole\.error\(/g, replacement: 'Log.err(', logMethod: 'err' },
|
||||
{ pattern: /\bconsole\.warn\(/g, replacement: 'Log.err(', logMethod: 'err' },
|
||||
{ pattern: /\bconsole\.debug\(/g, replacement: 'Log.debug(', logMethod: 'debug' },
|
||||
];
|
||||
|
||||
// Files to exclude
|
||||
|
|
@ -48,7 +48,8 @@ function calculateImportPath(filePath: string): string {
|
|||
}
|
||||
|
||||
function hasLogImport(content: string): boolean {
|
||||
return /import\s+{[^}]*\bLog\b[^}]*}\s+from\s+['"].*\/log['"]/.test(content);
|
||||
// More flexible pattern that matches any Log import
|
||||
return /import\s+{[^}]*\bLog\b[^}]*}\s+from\s+['"].*['"]/.test(content);
|
||||
}
|
||||
|
||||
function addLogImport(content: string, importPath: string): string {
|
||||
|
|
@ -72,20 +73,20 @@ function addLogImport(content: string, importPath: string): string {
|
|||
}
|
||||
}
|
||||
|
||||
function processFile(filePath: string): boolean {
|
||||
function processFile(filePath: string, dryRun: boolean = false): boolean {
|
||||
try {
|
||||
let content = fs.readFileSync(filePath, 'utf8');
|
||||
const originalContent = content;
|
||||
let hasChanges = false;
|
||||
|
||||
// Check if file uses any console methods
|
||||
// Check if file uses any console methods (including in comments)
|
||||
const usesConsole = replacements.some((r) => r.pattern.test(content));
|
||||
|
||||
if (!usesConsole) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Apply replacements
|
||||
// Apply replacements - this will replace even in comments, which is what we want
|
||||
for (const { pattern, replacement } of replacements) {
|
||||
if (pattern.test(content)) {
|
||||
content = content.replace(pattern, replacement);
|
||||
|
|
@ -99,7 +100,9 @@ function processFile(filePath: string): boolean {
|
|||
}
|
||||
|
||||
if (content !== originalContent) {
|
||||
fs.writeFileSync(filePath, content, 'utf8');
|
||||
if (!dryRun) {
|
||||
fs.writeFileSync(filePath, content, 'utf8');
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -111,7 +114,13 @@ function processFile(filePath: string): boolean {
|
|||
}
|
||||
|
||||
function main() {
|
||||
console.log('Starting console to Log migration...\n');
|
||||
const args = process.argv.slice(2);
|
||||
const dryRun = args.includes('--dry-run');
|
||||
|
||||
console.log('Starting console to Log migration...');
|
||||
if (dryRun) {
|
||||
console.log('Running in DRY RUN mode - no files will be modified\n');
|
||||
}
|
||||
|
||||
// Find all TypeScript files
|
||||
const files = glob.sync('src/**/*.ts', {
|
||||
|
|
@ -134,21 +143,22 @@ function main() {
|
|||
for (const file of files) {
|
||||
const content = fs.readFileSync(file, 'utf8');
|
||||
|
||||
// Count occurrences before processing
|
||||
stats.log += (content.match(/console\.log\(/g) || []).length;
|
||||
stats.info += (content.match(/console\.info\(/g) || []).length;
|
||||
stats.error += (content.match(/console\.error\(/g) || []).length;
|
||||
stats.warn += (content.match(/console\.warn\(/g) || []).length;
|
||||
stats.debug += (content.match(/console\.debug\(/g) || []).length;
|
||||
// Count occurrences before processing (with word boundary)
|
||||
stats.log += (content.match(/\bconsole\.log\(/g) || []).length;
|
||||
stats.info += (content.match(/\bconsole\.info\(/g) || []).length;
|
||||
stats.error += (content.match(/\bconsole\.error\(/g) || []).length;
|
||||
stats.warn += (content.match(/\bconsole\.warn\(/g) || []).length;
|
||||
stats.debug += (content.match(/\bconsole\.debug\(/g) || []).length;
|
||||
|
||||
if (processFile(file)) {
|
||||
const willModify = processFile(file, dryRun);
|
||||
if (willModify) {
|
||||
modifiedFiles.push(file);
|
||||
}
|
||||
}
|
||||
|
||||
stats.total = stats.log + stats.info + stats.error + stats.warn + stats.debug;
|
||||
|
||||
console.log('Migration complete!\n');
|
||||
console.log('\nMigration complete!\n');
|
||||
console.log('Statistics:');
|
||||
console.log(` Total console calls found: ${stats.total}`);
|
||||
console.log(` - console.log: ${stats.log}`);
|
||||
|
|
@ -156,7 +166,7 @@ function main() {
|
|||
console.log(` - console.error: ${stats.error}`);
|
||||
console.log(` - console.warn: ${stats.warn}`);
|
||||
console.log(` - console.debug: ${stats.debug}`);
|
||||
console.log(`\nModified ${modifiedFiles.length} files:`);
|
||||
console.log(`\n${dryRun ? 'Would modify' : 'Modified'} ${modifiedFiles.length} files:`);
|
||||
|
||||
modifiedFiles.forEach((file) => {
|
||||
console.log(` - ${path.relative(process.cwd(), file)}`);
|
||||
|
|
|
|||
|
|
@ -4,14 +4,24 @@ import * as fs from 'fs';
|
|||
import * as path from 'path';
|
||||
|
||||
const filesToFix = [
|
||||
'src/app/features/calendar-integration/is-calender-event-due.ts',
|
||||
'src/app/features/schedule/map-schedule-data/create-sorted-blocker-blocks.ts',
|
||||
'src/app/core-ui/drop-list/drop-list.service.ts',
|
||||
'src/app/core-ui/side-nav/side-nav.component.ts',
|
||||
'src/app/core/banner/banner.service.ts',
|
||||
'src/app/features/config/form-cfgs/domina-mode-form.const.ts',
|
||||
'src/app/features/focus-mode/focus-mode.service.ts',
|
||||
'src/app/features/schedule/create-task-placeholder/create-task-placeholder.component.ts',
|
||||
'src/app/features/schedule/map-schedule-data/create-blocked-blocks-by-day-map.ts',
|
||||
'src/app/features/schedule/map-schedule-data/create-view-entries-for-day.ts',
|
||||
'src/app/features/tasks/short-syntax.ts',
|
||||
'src/app/features/tasks/task-detail-panel/task-detail-panel.component.ts',
|
||||
'src/app/imex/sync/sync-trigger.service.ts',
|
||||
'src/app/pfapi/api/encryption/encryption.ts',
|
||||
'src/app/ui/stuck/stuck.directive.ts',
|
||||
'src/app/features/schedule/map-schedule-data/insert-blocked-blocks-view-entries-for-schedule.ts',
|
||||
'src/app/features/schedule/map-schedule-data/map-to-schedule-days.ts',
|
||||
'src/app/features/task-repeat-cfg/sort-repeatable-task-cfg.ts',
|
||||
'src/app/features/tasks/dialog-task-detail-panel/dialog-task-detail-panel.component.ts',
|
||||
'src/app/features/work-context/store/work-context-meta.helper.ts',
|
||||
'src/app/root-store/index.ts',
|
||||
'src/app/ui/duration/input-duration-formly/input-duration-formly.component.ts',
|
||||
'src/app/ui/inline-markdown/inline-markdown.component.ts',
|
||||
'src/app/util/is-touch-only.ts',
|
||||
'src/app/util/watch-object.ts',
|
||||
];
|
||||
|
||||
function removeUnusedLogImport(filePath: string): void {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue