dexbot 1.4.13 → 1.4.14

package/dist/scripts/fix-err-message.js

@@ -1,193 +0,0 @@
-#!/usr/bin/env node
-/**
- * Fix unsafe getErrorMessage(err) usage in catch blocks across the codebase.
- *
- * Replaces direct `.message` access on caught error variables with
- * safe `getErrorMessage(err)` calls, and adds the import where needed.
- *
- * Usage: tsx scripts/fix-err-message.ts
- */
-import { readFileSync, writeFileSync, existsSync } from 'node:fs';
-import { globSync } from 'node:fs';
-import path from 'node:path';
-const ROOT = process.cwd();
-// Files to exclude (already clean or not applicable)
-const EXCLUDE = new Set([
-    'modules/utils/errors.ts',
-    'modules/env.ts',
-    'market_adapter/lp_chart_core.ts', // already safe with `err && err.message` pattern
-    // test files use their own patterns
-]);
-function findCatchVariableNames(content) {
-    // Match catch(X: any), catch(X), catch (X) etc.
-    const catchVarRe = /catch\s*\(\s*(\w+)\s*(?::\s*\w+)?\s*\)/g;
-    const names = new Set();
-    let m;
-    while ((m = catchVarRe.exec(content)) !== null) {
-        names.add(m[1]);
-    }
-    return names;
-}
-function hasGetErrorMessageImport(content) {
-    // Check for an actual import/require of getErrorMessage, not just usage
-    return /(?:import\s+\{[^}]*\bgetErrorMessage\b[^}]*\}|require\([^)]*errors[^)]*\))/.test(content) &&
-        /getErrorMessage/.test(content);
-}
-function hasGetErrorMessageUsage(content) {
-    return /\bgetErrorMessage\s*\(/.test(content);
-}
-function needsGetErrorMessage(content, names) {
-    for (const name of names) {
-        const escaped = name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-        // Check if any .message access exists for this catch variable
-        const re = new RegExp(`${escaped}\\.message`, 'g');
-        if (re.test(content))
-            return true;
-    }
-    return false;
-}
-function addGetErrorMessageImport(content, relPath) {
-    const errorsRel = path.posix.relative(path.posix.dirname(relPath), 'modules/utils/errors');
-    const errorsPath = errorsRel.startsWith('.') ? errorsRel : './' + errorsRel;
-    // Detect if file uses ESM imports (prefer ESM style if any import exists)
-    const hasImport = /^import\s/m.test(content);
-    if (hasImport) {
-        // ESM style
-        const importLine = `import { getErrorMessage } from '${errorsPath}';`;
-        // Find the last complete import statement (line with `from '...'` or `from "..."` ending with ;)
-        const lines = content.split('\n');
-        let lastImportEnd = -1;
-        for (let i = 0; i < lines.length; i++) {
-            if (/from\s+['"]/.test(lines[i]) && lines[i].trim().endsWith(';')) {
-                lastImportEnd = i;
-            }
-        }
-        if (lastImportEnd >= 0) {
-            lines.splice(lastImportEnd + 1, 0, importLine);
-            return lines.join('\n');
-        }
-        return importLine + '\n' + content;
-    }
-    else {
-        // CJS style — find the last top-level require (not inside a function/block)
-        const importLine = `const { getErrorMessage } = require('${errorsPath}');`;
-        const lines = content.split('\n');
-        let insertAt = 0;
-        // Track brace depth to skip requires inside function/blocks
-        let braceDepth = 0;
-        let lastRequireAtDepth0 = -1;
-        for (let i = 0; i < lines.length; i++) {
-            const raw = lines[i];
-            const trimmed = raw.trim();
-            const stripped = trimmed.replace(/\/\/.*$/, '').replace(/\/\*[\s\S]*?\*\//g, '');
-            const openCount = (stripped.match(/\{/g) || []).length;
-            const closeCount = (stripped.match(/\}/g) || []).length;
-            // If this is a require() call at depth 0, track it
-            if (braceDepth === 0 && /^(?:const|let|var)\s/.test(trimmed) && /require\(/.test(trimmed)) {
-                lastRequireAtDepth0 = i;
-            }
-            braceDepth += openCount - closeCount;
-            // Stop scanning for requires if brace depth went negative (ES module boundary)
-            // or if we've clearly moved past the import section into runtime code
-            // that's not itself a require
-            if (braceDepth < 0)
-                braceDepth = 0;
-        }
-        if (lastRequireAtDepth0 >= 0) {
-            insertAt = lastRequireAtDepth0 + 1;
-        }
-        else {
-            // Fallback: find first non-comment line
-            for (let i = 0; i < Math.min(lines.length, 40); i++) {
-                const trimmed = lines[i].trim();
-                if (trimmed.startsWith('#!/') || trimmed.startsWith("'use strict") || trimmed === '' ||
-                    trimmed.startsWith('//') || trimmed.startsWith('/*') || trimmed.startsWith('*') || trimmed.startsWith('*/')) {
-                    insertAt = i + 1;
-                }
-                else
-                    break;
-            }
-        }
-        lines.splice(insertAt, 0, importLine);
-        return lines.join('\n');
-    }
-}
-function fixContent(content, names) {
-    for (const name of names) {
-        const escaped = name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-        // Skip if already wrapped in getErrorMessage(...)
-        // Pattern 1: `${name}.message` → `${getErrorMessage(name)}`
-        // Match only when NOT already inside getErrorMessage(...)
-        const templateRe = new RegExp(`\\$\\{${escaped}\\.message\\}`, 'g');
-        content = content.replace(templateRe, `\${getErrorMessage(${name})}`);
-        // Pattern 2: `name.message` → `getErrorMessage(name)`
-        // Only replace when NOT already preceded by getErrorMessage(
-        const directRe = new RegExp(`(?<!getErrorMessage\\()\\b${escaped}\\.message\\b`, 'g');
-        content = content.replace(directRe, `getErrorMessage(${name})`);
-    }
-    return content;
-}
-function processFile(filePath) {
-    const relPath = path.relative(ROOT, filePath);
-    if (EXCLUDE.has(relPath))
-        return false;
-    let content;
-    try {
-        content = readFileSync(filePath, 'utf-8');
-    }
-    catch {
-        return false;
-    }
-    const catchNames = findCatchVariableNames(content);
-    if (catchNames.size === 0)
-        return false;
-    if (!needsGetErrorMessage(content, catchNames))
-        return false;
-    // Fix .message accesses
-    const fixed = fixContent(content, catchNames);
-    const afterFixHasImport = hasGetErrorMessageImport(fixed);
-    const afterFixHasUsage = hasGetErrorMessageUsage(fixed);
-    // Add import if there's usage but no import
-    let result = fixed;
-    if (afterFixHasUsage && !afterFixHasImport) {
-        result = addGetErrorMessageImport(result, relPath);
-    }
-    if (result !== content) {
-        writeFileSync(filePath, result, 'utf-8');
-        return true;
-    }
-    return false;
-}
-// Gather all .ts files
-const tsFiles = [
-    ...globSync('modules/**/*.ts', { cwd: ROOT }),
-    ...globSync('market_adapter/**/*.ts', { cwd: ROOT }),
-    ...globSync('scripts/*.ts', { cwd: ROOT }),
-    ...globSync('claw/modules/**/*.ts', { cwd: ROOT }),
-    ...globSync('claw/scripts/*.ts', { cwd: ROOT }),
-    ...globSync('*.ts', { cwd: ROOT }),
-    // tests
-    ...globSync('tests/*.ts', { cwd: ROOT }),
-    ...globSync('claw/tests/*.ts', { cwd: ROOT }),
-];
-let changed = 0;
-let skipped = 0;
-for (const file of tsFiles) {
-    const fullPath = path.join(ROOT, file);
-    if (!existsSync(fullPath))
-        continue;
-    try {
-        if (processFile(fullPath)) {
-            console.log(`✓ ${file}`);
-            changed++;
-        }
-        else {
-            skipped++;
-        }
-    }
-    catch (err) {
-        console.error(`✗ ${file}: ${err?.message || err}`);
-    }
-}
-console.log(`\nDone: ${changed} files modified, ${skipped} files skipped.`);
-//# sourceMappingURL=fix-err-message.js.map

package/dist/scripts/fix-err-message.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fix-err-message.js","sourceRoot":"","sources":["../../scripts/fix-err-message.ts"],"names":[],"mappings":"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"}