invar-tools 1.17.17__py3-none-any.whl → 1.17.19__py3-none-any.whl

invar/node_tools/eslint-plugin/cli.js

@@ -16,6 +16,7 @@
 import { ESLint } from 'eslint';
 import { resolve, dirname } from 'path';
 import { statSync, realpathSync } from 'fs';
+import { spawnSync } from 'child_process';
 import { fileURLToPath } from 'url';
 import { createRequire } from 'module';
 import plugin from './index.js';
@@ -27,12 +28,49 @@ const require = createRequire(import.meta.url);
 
 function resolveTsParser(projectPath) {
     try {
-        return require.resolve('@typescript-eslint/parser', { paths: [projectPath, __dirname] });
+        const tseslintEntry = require.resolve('typescript-eslint', { paths: [projectPath] });
+        if (tseslintEntry) {
+            const tseslintRoot = dirname(dirname(tseslintEntry));
+            return require.resolve('@typescript-eslint/parser', { paths: [tseslintRoot] });
+        }
+    }
+    catch {
+    }
+
+    try {
+        return require.resolve('@typescript-eslint/parser', { paths: [projectPath] });
+    }
+    catch {
+    }
+
+    try {
+        return require.resolve('@typescript-eslint/parser', { paths: [__dirname] });
     }
     catch {
         return null;
     }
 }
+function _gitLsFiles(projectPath) {
+    const check = spawnSync('git', ['-C', projectPath, 'rev-parse', '--is-inside-work-tree'], {
+        encoding: 'utf8',
+        timeout: 2000,
+    });
+    if (check.status !== 0) {
+        return null;
+    }
+
+    const ls = spawnSync('git', ['-C', projectPath, 'ls-files', '-z', '--', '*.ts', '*.tsx'], {
+        encoding: 'utf8',
+        timeout: 15000,
+    });
+    if (ls.status !== 0 || !ls.stdout) {
+        return null;
+    }
+
+    const files = ls.stdout.split('\0').filter(Boolean);
+    return files.length > 0 ? files : null;
+}
+
 function parseArgs(args) {
     const projectPath = args.find(arg => !arg.startsWith('--')) || '.';
     const configArg = args.find(arg => arg.startsWith('--config='));
@@ -107,20 +145,51 @@ async function main() {
         }
         const tsParser = resolveTsParser(projectPath);
         if (!tsParser) {
-            console.error("ESLint failed: Failed to load parser '@typescript-eslint/parser'.");
-            console.error("Install it in your project (recommended), or use npx-based ESLint.");
-            console.error("Example: pnpm add -D @typescript-eslint/parser");
+            console.error("ESLint failed: Failed to load TypeScript parser.");
+            console.error("Install either 'typescript-eslint' or '@typescript-eslint/parser' in your project.");
+            process.exit(1);
+        }
+
+        let filesToLint;
+        let lintCwd = projectPath;
+        let globInputPaths = true;
+        try {
+            const stats = statSync(projectPath);
+            if (stats.isFile()) {
+                lintCwd = dirname(projectPath);
+                filesToLint = [projectPath];
+                globInputPaths = false;
+            }
+            else if (stats.isDirectory()) {
+                const gitFiles = _gitLsFiles(projectPath);
+                if (gitFiles) {
+                    filesToLint = gitFiles;
+                    globInputPaths = false;
+                }
+                else {
+                    filesToLint = [
+                        "**/*.ts",
+                        "**/*.tsx",
+                    ];
+                }
+            }
+            else {
+                console.error(`Error: Path is neither a file nor a directory: ${projectPath}`);
+                process.exit(1);
+            }
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
+            console.error(`Error: Cannot access path: ${errorMessage}`);
             process.exit(1);
         }
 
-        // Create ESLint instance with programmatic configuration
-        // Use __dirname (where CLI is located) for module resolution
-        // This allows ESLint to find embedded node_modules in site-packages
         const eslint = new ESLint({
-            useEslintrc: false, // Don't load .eslintrc files
-            cwd: projectPath, // Use project directory as working directory (fix for timeout issue)
-            resolvePluginsRelativeTo: __dirname, // Resolve plugins from embedded location
+            useEslintrc: false,
+            cwd: lintCwd,
+            resolvePluginsRelativeTo: __dirname,
             errorOnUnmatchedPattern: false,
+            globInputPaths,
             baseConfig: {
                 parser: tsParser,
                 parserOptions: {
@@ -130,49 +199,23 @@ async function main() {
                 plugins: ['@invar'],
                 rules: selectedConfig.rules,
                 ignorePatterns: [
-                    // Explicit ignores to prevent scanning generated/cached directories
                     '**/node_modules/**',
                     '**/.next/**',
                     '**/dist/**',
                     '**/build/**',
                     '**/.cache/**',
                     '**/coverage/**',
+                    '**/.turbo/**',
+                    '**/.vercel/**',
+                    '**/playwright-report/**',
+                    '**/test-results/**',
                 ],
             },
             plugins: {
                 '@invar': plugin, // Register plugin directly
             },
-        }); // Type assertion for ESLint config complexity
-        // Lint the project - detect if path is a file or directory
-        // ESLint defaults to .js only, so we need glob patterns for .ts/.tsx
-        let filesToLint;
-        try {
-            const stats = statSync(projectPath);
-            // Note: Advisory check for optimization - TOCTOU race condition is acceptable
-            // because ESLint will handle file system changes gracefully during actual linting
-            if (stats.isFile()) {
-                // Single file - lint it directly
-                filesToLint = [projectPath];
-            }
-            else if (stats.isDirectory()) {
-                // Directory - use relative glob patterns for TypeScript files
-                // Note: Focus on TypeScript files as this is a TypeScript Guard tool
-                // Use relative patterns (no projectPath prefix) since cwd is set to projectPath
-                filesToLint = [
-                    "**/*.ts",
-                    "**/*.tsx",
-                ];
-            }
-            else {
-                console.error(`Error: Path is neither a file nor a directory: ${projectPath}`);
-                process.exit(1);
-            }
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            console.error(`Error: Cannot access path: ${errorMessage}`);
-            process.exit(1);
-        }
+        });
+
         const results = await eslint.lintFiles(filesToLint);
         // Output in standard ESLint JSON format (compatible with guard_ts.py)
         const formatter = await eslint.loadFormatter('json');

invar/node_tools/eslint-plugin/rules/require-schema-validation.js

@@ -77,49 +77,58 @@ function matchesEnforcePattern(filePath, patterns) {
 function isZodType(typeAnnotation) {
     return ZOD_TYPE_PATTERNS.some(pattern => pattern.test(typeAnnotation));
 }
-function hasParseCall(body, paramName) {
+function collectParseArgs(body, visitorKeys) {
+    const parsed = new Set();
     if (!body)
-        return false;
-    let found = false;
-    const MAX_DEPTH = 50; // Prevent stack overflow on deeply nested types
-    const visit = (node, depth = 0) => {
-        if (found)
-            return;
+        return parsed;
+
+    const MAX_DEPTH = 50;
+    const stack = [{ node: body, depth: 0 }];
+
+    while (stack.length > 0) {
+        const current = stack.pop();
+        if (!current)
+            continue;
+        const node = current.node;
+        const depth = current.depth;
+        if (!node || typeof node !== 'object')
+            continue;
         if (depth > MAX_DEPTH)
-            return; // Depth limit to prevent stack overflow
+            continue;
+
         if (node.type === 'CallExpression') {
             const callee = node.callee;
-            if (callee.type === 'MemberExpression') {
+            if (callee && callee.type === 'MemberExpression') {
                 const property = callee.property;
-                if (property.type === 'Identifier' &&
-                    (property.name === 'parse' || property.name === 'safeParse')) {
-                    // Check if argument is our param
-                    if (node.arguments.some(arg => arg.type === 'Identifier' && arg.name === paramName)) {
-                        found = true;
-                        return;
+                if (property && property.type === 'Identifier' && (property.name === 'parse' || property.name === 'safeParse')) {
+                    for (const arg of node.arguments || []) {
+                        if (arg && arg.type === 'Identifier') {
+                            parsed.add(arg.name);
+                        }
                     }
                 }
             }
         }
-        // Recursively visit children with depth tracking
-        for (const key of Object.keys(node)) {
+
+        const keys = (visitorKeys && node.type && visitorKeys[node.type]) || [];
+        for (const key of keys) {
             const value = node[key];
-            if (value && typeof value === 'object') {
-                if (Array.isArray(value)) {
-                    for (const item of value) {
-                        if (item && typeof item === 'object' && 'type' in item) {
-                            visit(item, depth + 1);
-                        }
+            if (!value)
+                continue;
+            if (Array.isArray(value)) {
+                for (const item of value) {
+                    if (item && typeof item === 'object' && item.type) {
+                        stack.push({ node: item, depth: depth + 1 });
                     }
                 }
-                else if ('type' in value) {
-                    visit(value, depth + 1);
-                }
+            }
+            else if (typeof value === 'object' && value.type) {
+                stack.push({ node: value, depth: depth + 1 });
             }
         }
-    };
-    visit(body);
-    return found;
+    }
+
+    return parsed;
 }
 export const requireSchemaValidation = {
     meta: {
@@ -206,49 +215,54 @@ export const requireSchemaValidation = {
         }
         function checkFunction(node, params) {
             const functionName = getFunctionName(node);
-            // Skip if shouldn't check based on mode
             if (!shouldCheck(functionName)) {
                 return;
             }
+
             const body = 'body' in node ? node.body : null;
+            const zodParams = params.filter((p) => p.typeAnnotation && isZodType(p.typeAnnotation) && p.name && p.name !== '{...}' && p.name !== '[...]');
+            if (zodParams.length === 0) {
+                return;
+            }
+
+            const parsedArgs = collectParseArgs(body, sourceCode.visitorKeys);
             const isRiskFunction = isHighRiskFunction(functionName, filename);
-            for (const param of params) {
-                if (param.typeAnnotation && isZodType(param.typeAnnotation)) {
-                    if (!hasParseCall(body, param.name)) {
-                        // Extract schema name from type annotation (e.g., "z.infer<typeof UserSchema>" -> "UserSchema")
-                        const schemaMatch = param.typeAnnotation.match(/typeof\s+(\w+)/);
-                        const schemaName = schemaMatch ? schemaMatch[1] : 'Schema';
-                        const validatedVarName = `validated${param.name.charAt(0).toUpperCase()}${param.name.slice(1)}`;
-                        context.report({
-                            node: node,
-                            messageId: isRiskFunction ? 'missingValidationRisk' : 'missingValidation',
-                            data: {
-                                name: param.name,
-                                functionName: functionName,
-                            },
-                            suggest: [
-                                {
-                                    messageId: 'addParseCall',
-                                    data: { name: param.name },
-                                    fix(fixer) {
-                                        // Find the opening brace of the function body
-                                        if (!body || body.type !== 'BlockStatement')
-                                            return null;
-                                        const blockBody = body;
-                                        if (!blockBody.body || blockBody.body.length === 0)
-                                            return null;
-                                        const firstStatement = blockBody.body[0];
-                                        // Detect indentation from the first statement
-                                        const firstStatementStart = firstStatement.loc?.start.column ?? 2;
-                                        const indent = ' '.repeat(firstStatementStart);
-                                        const parseCode = `const ${validatedVarName} = ${schemaName}.parse(${param.name});\n${indent}`;
-                                        return fixer.insertTextBefore(firstStatement, parseCode);
-                                    },
-                                },
-                            ],
-                        });
-                    }
+
+            for (const param of zodParams) {
+                if (parsedArgs.has(param.name)) {
+                    continue;
                 }
+
+                const schemaMatch = param.typeAnnotation.match(/typeof\s+(\w+)/);
+                const schemaName = schemaMatch ? schemaMatch[1] : 'Schema';
+                const validatedVarName = `validated${param.name.charAt(0).toUpperCase()}${param.name.slice(1)}`;
+
+                context.report({
+                    node: node,
+                    messageId: isRiskFunction ? 'missingValidationRisk' : 'missingValidation',
+                    data: {
+                        name: param.name,
+                        functionName: functionName,
+                    },
+                    suggest: [
+                        {
+                            messageId: 'addParseCall',
+                            data: { name: param.name },
+                            fix(fixer) {
+                                if (!body || body.type !== 'BlockStatement')
+                                    return null;
+                                const blockBody = body;
+                                if (!blockBody.body || blockBody.body.length === 0)
+                                    return null;
+                                const firstStatement = blockBody.body[0];
+                                const firstStatementStart = firstStatement.loc?.start.column ?? 2;
+                                const indent = ' '.repeat(firstStatementStart);
+                                const parseCode = `const ${validatedVarName} = ${schemaName}.parse(${param.name});\n${indent}`;
+                                return fixer.insertTextBefore(firstStatement, parseCode);
+                            },
+                        },
+                    ],
+                });
             }
         }
         /**

invar/shell/prove/guard_ts.py

@@ -374,6 +374,19 @@ def _check_tool_available(tool: str, check_args: list[str]) -> bool:
 # =============================================================================
 
 
+def _is_invar_package_dir(package_dir: Path, package_name: str) -> bool:
+    package_json = package_dir / "package.json"
+    if not package_json.exists():
+        return False
+
+    try:
+        data = json.loads(package_json.read_text(encoding="utf-8"))
+    except (OSError, json.JSONDecodeError):
+        return False
+
+    return data.get("name") == f"@invar/{package_name}"
+
+
 # @shell_complexity: Path discovery with fallback logic
 def _get_invar_package_cmd(package_name: str, project_path: Path) -> list[str]:
     """Get command to run an @invar/* package.
@@ -395,11 +408,11 @@ def _get_invar_package_cmd(package_name: str, project_path: Path) -> list[str]:
     resolved_path = project_path.resolve()
 
     local_cli = resolved_path / "typescript" / "packages" / package_name / "dist" / "cli.js"
-    if local_cli.exists():
+    if local_cli.exists() and _is_invar_package_dir(local_cli.parent.parent, package_name):
         return ["node", str(local_cli)]
 
     local_cli = resolved_path / "packages" / package_name / "dist" / "cli.js"
-    if local_cli.exists():
+    if local_cli.exists() and _is_invar_package_dir(local_cli.parent.parent, package_name):
         return ["node", str(local_cli)]
 
     # Priority 2: Embedded tools (from pip install)
@@ -417,7 +430,7 @@ def _get_invar_package_cmd(package_name: str, project_path: Path) -> list[str]:
     check_path = resolved_path
     for _ in range(5):  # Max 5 levels up
         candidate = check_path / f"typescript/packages/{package_name}/dist/cli.js"
-        if candidate.exists():
+        if candidate.exists() and _is_invar_package_dir(candidate.parent.parent, package_name):
             return ["node", str(candidate)]
         parent = check_path.parent
         if parent == check_path:

{invar_tools-1.17.17.dist-info → invar_tools-1.17.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invar-tools
-Version: 1.17.17
+Version: 1.17.19
 Summary: AI-native software engineering tools with design-by-contract verification
 Project-URL: Homepage, https://github.com/tefx/invar
 Project-URL: Documentation, https://github.com/tefx/invar#readme

{invar_tools-1.17.17.dist-info → invar_tools-1.17.19.dist-info}/RECORD

@@ -56,7 +56,7 @@ invar/node_tools/.gitignore,sha256=M2kz8Iw7Kzmi44mKo1r7_HOZMh79a7dFDdRrqXyaEhI,5
 invar/node_tools/MANIFEST,sha256=2Z2at-27MK8K7DSjOjjtR4faTbt6eCiKQuEfvP_lwH8,145
 invar/node_tools/__init__.py,sha256=HzILh3jtP28Lm2jZwss1SY65ECxbtw2J2uFpXQA6Y94,1740
 invar/node_tools/ts-query.js,sha256=fEc_f0JT_Mb18dEoA4_vJoazvd7Lqv_rsed4eHSAbCg,13303
-invar/node_tools/eslint-plugin/cli.js,sha256=KbqACF8NEB7RRfybDPNqSwjB2KYWI97stdEpkE36kZY,8042
+invar/node_tools/eslint-plugin/cli.js,sha256=jgRHHHDRbyQiVbIWgmaxlsA9PlDvonWFEEYf9_XPaZ4,8481
 invar/node_tools/eslint-plugin/cli.js.map,sha256=AZt_DYAD6NnHGjR6oxXfGYaOHc6-vfDs0ENvYsbw5Ro,4489
 invar/node_tools/eslint-plugin/index.js,sha256=atrI37dn1yDznQrgKY-1xIhLnCdvJQTU53123ZI_9J4,5132
 invar/node_tools/eslint-plugin/index.js.map,sha256=MlFuNso9sZ4v9ggGJLyMq4Pt_JdEzP1OyouyCCki1wA,2344
@@ -2616,7 +2616,7 @@ invar/node_tools/eslint-plugin/rules/require-complete-validation.js,sha256=ZGeAE
 invar/node_tools/eslint-plugin/rules/require-complete-validation.js.map,sha256=UhEr4fql0TObHt3ya8DydqbFlig5CSDFKIIJZSf74rA,2497
 invar/node_tools/eslint-plugin/rules/require-jsdoc-example.js,sha256=Uql3FKdnTHFBMh_OkwGuOdMBzf4k94QHOaWo9frAcSM,4488
 invar/node_tools/eslint-plugin/rules/require-jsdoc-example.js.map,sha256=00cKhvu890f-8UXPZcEAaX44IjCxxw12E4l_gsi93JM,2960
-invar/node_tools/eslint-plugin/rules/require-schema-validation.js,sha256=gdJaRr9-j8ZmUr8-u_MnafeQ4I92OoIq3RzUXeqrpBg,12372
+invar/node_tools/eslint-plugin/rules/require-schema-validation.js,sha256=6kRnMrTBuqeHmNOdBz78jZ0WBZgTmIUBoR_0ozWlK4k,12155
 invar/node_tools/eslint-plugin/rules/require-schema-validation.js.map,sha256=akTSZQq-OC6ZvwMklIBRaxsesJ9w6GHaPhRTJ_ihmaE,8211
 invar/node_tools/eslint-plugin/rules/shell-complexity.js,sha256=Bhc9i7ILYMNNAUvxf9l7PlwhC_Neb69Jl1nUNABu2jg,11260
 invar/node_tools/eslint-plugin/rules/shell-complexity.js.map,sha256=0oJoDxXpXg2VTrwGMa-UDZ6te15Sv9vq-LgwWjJB5Q4,7140
@@ -2697,7 +2697,7 @@ invar/shell/prove/__init__.py,sha256=ZqlbmyMFJf6yAle8634jFuPRv8wNvHps8loMlOJyf8A
 invar/shell/prove/accept.py,sha256=cnY_6jzU1EBnpLF8-zWUWcXiSXtCwxPsXEYXsSVPG38,3717
 invar/shell/prove/cache.py,sha256=jbNdrvfLjvK7S0iqugErqeabb4YIbQuwIlcSRyCKbcg,4105
 invar/shell/prove/crosshair.py,sha256=XhJDsQWIriX9SuqeflUYvJgp9gJTDH7I7Uka6zjNzZ0,16734
-invar/shell/prove/guard_ts.py,sha256=mq6_bNLBosVlkHf8KQ3EaWUtLUkh0Jeggh-YKybvD2I,37363
+invar/shell/prove/guard_ts.py,sha256=8InEWFd6oqFxBUEaAdlqOvPi43p0VZKxJIrAaF0eReU,37936
 invar/shell/prove/hypothesis.py,sha256=QUclOOUg_VB6wbmHw8O2EPiL5qBOeBRqQeM04AVuLw0,9880
 invar/templates/CLAUDE.md.template,sha256=eaGU3SyRO_NEifw5b26k3srgQH4jyeujjCJ-HbM36_w,4913
 invar/templates/__init__.py,sha256=cb3ht8KPK5oBn5oG6HsTznujmo9WriJ_P--fVxJwycc,45
@@ -2778,10 +2778,10 @@ invar/templates/skills/invar-reflect/template.md,sha256=Rr5hvbllvmd8jSLf_0ZjyKt6
 invar/templates/skills/investigate/SKILL.md.jinja,sha256=cp6TBEixBYh1rLeeHOR1yqEnFqv1NZYePORMnavLkQI,3231
 invar/templates/skills/propose/SKILL.md.jinja,sha256=6BuKiCqO1AEu3VtzMHy1QWGqr_xqG9eJlhbsKT4jev4,3463
 invar/templates/skills/review/SKILL.md.jinja,sha256=ET5mbdSe_eKgJbi2LbgFC-z1aviKcHOBw7J5Q28fr4U,14105
-invar_tools-1.17.17.dist-info/METADATA,sha256=8zrGXhNN7aKCrwqXggDn00ZYT10BSUzN2r89ruFtaqw,28596
-invar_tools-1.17.17.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-invar_tools-1.17.17.dist-info/entry_points.txt,sha256=RwH_EhqgtFPsnO6RcrwrAb70Zyfb8Mh6uUtztWnUxGk,102
-invar_tools-1.17.17.dist-info/licenses/LICENSE,sha256=qeFksp4H4kfTgQxPCIu3OdagXyiZcgBlVfsQ6M5oFyk,10767
-invar_tools-1.17.17.dist-info/licenses/LICENSE-GPL,sha256=IvZfC6ZbP7CLjytoHVzvpDZpD-Z3R_qa1GdMdWlWQ6Q,35157
-invar_tools-1.17.17.dist-info/licenses/NOTICE,sha256=joEyMyFhFY8Vd8tTJ-a3SirI0m2Sd0WjzqYt3sdcglc,2561
-invar_tools-1.17.17.dist-info/RECORD,,
+invar_tools-1.17.19.dist-info/METADATA,sha256=ecuhzoJZslp81KIMpPROD2LH-owOo4p8viFpMB5uKbw,28596
+invar_tools-1.17.19.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+invar_tools-1.17.19.dist-info/entry_points.txt,sha256=RwH_EhqgtFPsnO6RcrwrAb70Zyfb8Mh6uUtztWnUxGk,102
+invar_tools-1.17.19.dist-info/licenses/LICENSE,sha256=qeFksp4H4kfTgQxPCIu3OdagXyiZcgBlVfsQ6M5oFyk,10767
+invar_tools-1.17.19.dist-info/licenses/LICENSE-GPL,sha256=IvZfC6ZbP7CLjytoHVzvpDZpD-Z3R_qa1GdMdWlWQ6Q,35157
+invar_tools-1.17.19.dist-info/licenses/NOTICE,sha256=joEyMyFhFY8Vd8tTJ-a3SirI0m2Sd0WjzqYt3sdcglc,2561
+invar_tools-1.17.19.dist-info/RECORD,,