logicstamp-context 0.5.5 → 0.7.0

package/dist/core/pack/loader.js

@@ -2,8 +2,9 @@
  * Loader module - Load contracts, manifests, and source code
  */
 import { readFile } from 'node:fs/promises';
-import { join, resolve, isAbsolute } from 'node:path';
+import { join, resolve, isAbsolute, relative } from 'node:path';
 import { debugError } from '../../utils/debug.js';
+import { validateUIFContract } from '../../utils/schemaValidator.js';
 import { loadSecurityReport, sanitizeCode } from '../../utils/codeSanitizer.js';
 // Cache expiration time (5 minutes) - balances performance vs memory for long-running processes
 const CACHE_MAX_AGE_MS = 5 * 60 * 1000;
@@ -37,7 +38,10 @@ let sanitizeStats = {
     filesWithSecrets: 0,
     totalSecretsReplaced: 0,
     filesProcessed: [],
+    securityReportLoaded: false,
 };
+// Track whether security report was loaded during this context generation
+let securityReportWasLoaded = false;
 /**
  * Record sanitization info into the module-level accumulator
  * Thread-safe: callers aggregate results and call this once after processing
@@ -66,12 +70,17 @@ export function recordSanitizationBatch(infos) {
  * Get and reset sanitization statistics
  */
 export function getAndResetSanitizeStats() {
-    const stats = { ...sanitizeStats };
+    const stats = {
+        ...sanitizeStats,
+        securityReportLoaded: securityReportWasLoaded,
+    };
     sanitizeStats = {
         filesWithSecrets: 0,
         totalSecretsReplaced: 0,
         filesProcessed: [],
+        securityReportLoaded: false,
     };
+    securityReportWasLoaded = false;
     return stats;
 }
 /**
@@ -111,17 +120,83 @@ export async function loadManifest(basePath) {
  * Sidecar path is computed from the manifest key (project-relative): resolved from projectRoot + key + '.uif.json'
  */
 export async function loadContract(entryId, projectRoot) {
+    // Validate path stays within project root (prevents path traversal attacks)
+    if (!isPathWithinRoot(entryId, projectRoot)) {
+        debugError('loader', 'loadContract', {
+            entryId,
+            projectRoot,
+            message: 'Path traversal attempt detected - path outside project root',
+        });
+        return null;
+    }
     // Resolve relative path from project root
     const absolutePath = isAbsolute(entryId) ? entryId : resolve(projectRoot, entryId);
     const sidecarPath = `${absolutePath}.uif.json`;
+    // 1. Read file
+    let content;
     try {
-        const content = await readFile(sidecarPath, 'utf8');
-        return JSON.parse(content);
+        content = await readFile(sidecarPath, 'utf8');
     }
     catch (error) {
-        // Sidecar file doesn't exist or can't be read
+        const err = error;
+        // File not found is normal (sidecar doesn't exist yet) - silent return
+        if (err.code === 'ENOENT') {
+            return null;
+        }
+        // Other read errors (permissions, etc.) - log and return
+        debugError('loader', 'loadContract', {
+            sidecarPath,
+            entryId,
+            message: 'Failed to read sidecar file',
+            errorCode: err.code,
+            errorMessage: err.message,
+        });
+        return null;
+    }
+    // 2. Parse JSON
+    let parsed;
+    try {
+        parsed = JSON.parse(content);
+    }
+    catch (error) {
+        const err = error;
+        debugError('loader', 'loadContract', {
+            sidecarPath,
+            entryId,
+            message: 'Invalid JSON in sidecar file',
+            parseError: err.message,
+        });
+        return null;
+    }
+    // 3. Validate against UIFContract schema
+    const { valid, errors, data } = validateUIFContract(parsed);
+    if (!valid) {
+        // Cap errors to prevent log spam (AJV can output dozens of lines)
+        const MAX_ERRORS = 20;
+        const shownErrors = errors.slice(0, MAX_ERRORS);
+        const extraCount = errors.length - shownErrors.length;
+        debugError('loader', 'loadContract', {
+            sidecarPath,
+            entryId,
+            message: 'Invalid contract schema',
+            validationErrors: shownErrors,
+            ...(extraCount > 0 && { additionalErrors: `+${extraCount} more` }),
+            hint: 'This file may have been generated by an older LogicStamp version; rerun `stamp context`',
+        });
         return null;
     }
+    return data;
+}
+/**
+ * Check if a file path is within the project root directory
+ * Prevents path traversal attacks (e.g., `../../../sensitive.json`)
+ */
+function isPathWithinRoot(filePath, rootPath) {
+    const resolvedPath = resolve(rootPath, filePath);
+    const relativePath = relative(rootPath, resolvedPath);
+    // Path is outside root if relative path starts with '..' or is absolute
+    // On Windows, also check for drive letter changes (e.g., C: to D:)
+    return !relativePath.startsWith('..') && !isAbsolute(relativePath);
 }
 /**
  * Normalize project root for comparison (handles Windows case-insensitivity and path variations)
@@ -141,6 +216,10 @@ function normalizeProjectRoot(path) {
 async function getSecurityReport(projectRoot) {
     // Check if we have a valid cached report
     if (isCacheValid(securityReportCache, projectRoot)) {
+        // Track that we have a security report available
+        if (securityReportCache.report !== null) {
+            securityReportWasLoaded = true;
+        }
         return securityReportCache.report;
     }
     // Load and cache the report with timestamp
@@ -150,6 +229,10 @@ async function getSecurityReport(projectRoot) {
         projectRoot,
         timestamp: Date.now(),
     };
+    // Track that we have a security report available
+    if (report !== null) {
+        securityReportWasLoaded = true;
+    }
     return report;
 }
 /**
@@ -161,6 +244,15 @@ async function getSecurityReport(projectRoot) {
  * Callers should aggregate sanitization info and record it once after batch processing.
  */
 export async function extractCodeHeader(entryId, projectRoot) {
+    // Validate path stays within project root (prevents path traversal attacks)
+    if (!isPathWithinRoot(entryId, projectRoot)) {
+        debugError('loader', 'extractCodeHeader', {
+            entryId,
+            projectRoot,
+            message: 'Path traversal attempt detected - path outside project root',
+        });
+        return { header: null };
+    }
     try {
         const absolutePath = isAbsolute(entryId) ? entryId : resolve(projectRoot, entryId);
         // Read file content (source file is never modified)
@@ -201,6 +293,15 @@ export async function extractCodeHeader(entryId, projectRoot) {
  * Callers should aggregate sanitization info and record it once after batch processing.
  */
 export async function readSourceCode(entryId, projectRoot) {
+    // Validate path stays within project root (prevents path traversal attacks)
+    if (!isPathWithinRoot(entryId, projectRoot)) {
+        debugError('loader', 'readSourceCode', {
+            entryId,
+            projectRoot,
+            message: 'Path traversal attempt detected - path outside project root',
+        });
+        return { code: null };
+    }
     try {
         const absolutePath = isAbsolute(entryId) ? entryId : resolve(projectRoot, entryId);
         // Read file content (source file is never modified)

package/dist/core/pack/loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/core/pack/loader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/core/pack/loader.ts"],"names":[],"mappings":"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"}

package/dist/extractors/react/propExtractor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"propExtractor.d.ts","sourceRoot":"","sources":["../../../src/extractors/react/propExtractor.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAA0B,MAAM,UAAU,CAAC;AAC9D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AA0B3D;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CA4NzE;AAID,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC"}
+{"version":3,"file":"propExtractor.d.ts","sourceRoot":"","sources":["../../../src/extractors/react/propExtractor.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAsG,MAAM,UAAU,CAAC;AAC1I,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAiN3D;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAiDzE;AAID,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC"}

package/dist/extractors/react/propExtractor.js

@@ -8,22 +8,157 @@ import { hasExportedHooks, extractHookParameters } from './hookParameterExtracto
 // TypeScript TypeFlags.Undefined constant (0x4000 = 16384)
 // Used for checking if a union type includes undefined
 const TYPEFLAG_UNDEFINED = 16384; // ts.TypeFlags.Undefined
+/**
+ * Wraps a function call in a try-catch, returning a default value on error.
+ * Use this to simplify error handling for operations that may fail but shouldn't
+ * stop processing of other items.
+ */
+function safeExtract(fn, defaultValue, errorContext) {
+    try {
+        return fn();
+    }
+    catch (error) {
+        if (errorContext) {
+            debugError('propExtractor', 'extractProps', {
+                filePath: errorContext.filePath,
+                error: error instanceof Error ? error.message : String(error),
+                context: errorContext.context,
+            });
+        }
+        return defaultValue;
+    }
+}
 /**
  * Safely get TypeScript type flags from a ts-morph Type
  * Accesses the underlying TypeScript compiler type to get flags
  */
 function getTypeFlags(type) {
-    try {
-        // Access the underlying TypeScript compiler type
-        const compilerType = type.compilerType;
-        if (compilerType && typeof compilerType.flags === 'number') {
-            return compilerType.flags;
+    const compilerType = type.compilerType;
+    if (compilerType && typeof compilerType.flags === 'number') {
+        return compilerType.flags;
+    }
+    return 0;
+}
+/**
+ * Check if a union type includes undefined
+ */
+function isUndefinedType(type) {
+    const flags = getTypeFlags(type);
+    if ((flags & TYPEFLAG_UNDEFINED) !== 0) {
+        return true;
+    }
+    return type.getText() === 'undefined';
+}
+/**
+ * Check if a union type contains undefined and extract the non-undefined type text
+ * Returns { hasUndefined, typeText } where typeText excludes undefined
+ */
+function analyzeUnionForUndefined(propType) {
+    if (!propType.isUnion()) {
+        return { hasUndefined: false, typeText: propType.getText() };
+    }
+    const unionTypes = propType.getUnionTypes();
+    const hasUndefined = unionTypes.some(isUndefinedType);
+    if (!hasUndefined) {
+        return { hasUndefined: false, typeText: propType.getText() };
+    }
+    const typeText = unionTypes
+        .filter(ut => !isUndefinedType(ut))
+        .map(ut => ut.getText())
+        .join(' | ');
+    return { hasUndefined: true, typeText };
+}
+/**
+ * Extract a single prop from an interface property
+ */
+function extractInterfaceProp(prop) {
+    const name = prop.getName();
+    let isOptional = prop.hasQuestionToken();
+    let type = prop.getType().getText();
+    let didRebuildFromUnion = false;
+    // Check for union-with-undefined (some people write foo: string | undefined without ?)
+    if (!isOptional) {
+        const analysis = analyzeUnionForUndefined(prop.getType());
+        if (analysis.hasUndefined) {
+            isOptional = true;
+            type = analysis.typeText;
+            didRebuildFromUnion = true;
         }
     }
-    catch {
-        // Fallback if compiler type not accessible
+    // If optional but we didn't rebuild from union types, strip undefined from type text
+    if (isOptional && !didRebuildFromUnion) {
+        type = stripUndefinedFromUnionText(type);
     }
-    return 0;
+    return { name, propType: normalizePropType(type, isOptional) };
+}
+/**
+ * Extract props from a single interface declaration
+ */
+function extractPropsFromInterface(iface, filePath) {
+    const props = {};
+    if (!/Props$/i.test(iface.getName())) {
+        return props;
+    }
+    for (const prop of iface.getProperties()) {
+        const result = safeExtract(() => extractInterfaceProp(prop), null, { filePath, context: 'props-interface-property' });
+        if (result) {
+            props[result.name] = result.propType;
+        }
+    }
+    return props;
+}
+/**
+ * Extract a single prop from a type alias property symbol
+ */
+function extractTypeAliasProp(prop, typeAlias) {
+    const name = prop.getName();
+    let isOptional = false;
+    let propType = prop.getTypeAtLocation(typeAlias).getText();
+    let didRebuildFromUnion = false;
+    // Method 1: Check if type is a union that includes undefined
+    const propTypeObj = prop.getTypeAtLocation(typeAlias);
+    const analysis = analyzeUnionForUndefined(propTypeObj);
+    if (analysis.hasUndefined) {
+        isOptional = true;
+        propType = analysis.typeText;
+        didRebuildFromUnion = true;
+    }
+    // Method 2: Check declarations for question token (AST method)
+    if (!isOptional) {
+        const declarations = prop.getDeclarations();
+        isOptional = declarations.some((decl) => {
+            if (Node.isPropertySignature(decl)) {
+                return decl.hasQuestionToken();
+            }
+            if (Node.isPropertyDeclaration(decl)) {
+                return decl.hasQuestionToken();
+            }
+            return false;
+        });
+    }
+    // If optional but we didn't rebuild from union types, strip undefined from type text
+    if (isOptional && !didRebuildFromUnion) {
+        propType = stripUndefinedFromUnionText(propType);
+    }
+    return { name, propType: normalizePropType(propType, isOptional) };
+}
+/**
+ * Extract props from a single type alias declaration
+ */
+function extractPropsFromTypeAlias(typeAlias, filePath) {
+    const props = {};
+    if (!/Props$/i.test(typeAlias.getName())) {
+        return props;
+    }
+    const type = typeAlias.getType();
+    const properties = type.getProperties();
+    for (const prop of properties) {
+        const result = safeExtract(() => extractTypeAliasProp(prop, typeAlias), null, { filePath, context: 'props-typealias-property' });
+        if (result) {
+            props[result.name] = result.propType;
+        }
+    }
+    return props;
 }
 /**
  * Extract component props from TypeScript interfaces/types
@@ -32,216 +167,28 @@ function getTypeFlags(type) {
 export function extractProps(source) {
     const props = {};
     const filePath = source.getFilePath?.() ?? 'unknown';
-    try {
-        // Look for interfaces ending with Props
-        try {
-            source.getInterfaces().forEach((iface) => {
-                try {
-                    if (/Props$/i.test(iface.getName())) {
-                        iface.getProperties().forEach((prop) => {
-                            try {
-                                const name = prop.getName();
-                                let isOptional = prop.hasQuestionToken();
-                                let type = prop.getType().getText();
-                                let didRebuildFromUnion = false;
-                                // Also check for union-with-undefined (some people write foo: string | undefined without ?)
-                                if (!isOptional) {
-                                    try {
-                                        const propType = prop.getType();
-                                        if (propType.isUnion()) {
-                                            const unionTypes = propType.getUnionTypes();
-                                            const hasUndefined = unionTypes.some(ut => {
-                                                try {
-                                                    const flags = getTypeFlags(ut);
-                                                    if ((flags & TYPEFLAG_UNDEFINED) !== 0) {
-                                                        return true;
-                                                    }
-                                                }
-                                                catch {
-                                                    // Fallback to string check if flags not available
-                                                }
-                                                const text = ut.getText();
-                                                return text === 'undefined';
-                                            });
-                                            if (hasUndefined) {
-                                                isOptional = true;
-                                                // Normalize type text by removing undefined from union (handles any position)
-                                                type = unionTypes
-                                                    .filter(ut => {
-                                                    const flags = getTypeFlags(ut);
-                                                    if ((flags & TYPEFLAG_UNDEFINED) !== 0) {
-                                                        return false;
-                                                    }
-                                                    return ut.getText() !== 'undefined';
-                                                })
-                                                    .map(ut => ut.getText())
-                                                    .join(' | ');
-                                                didRebuildFromUnion = true;
-                                            }
-                                        }
-                                    }
-                                    catch {
-                                        // Fallback if union check fails
-                                    }
-                                }
-                                // If optional but we didn't rebuild from union types, strip undefined from type text
-                                // This handles cases like "foo?: undefined | string" where ? token made us skip union logic
-                                if (isOptional && !didRebuildFromUnion) {
-                                    type = stripUndefinedFromUnionText(type);
-                                }
-                                props[name] = normalizePropType(type, isOptional);
-                            }
-                            catch (error) {
-                                debugError('propExtractor', 'extractProps', {
-                                    filePath,
-                                    error: error instanceof Error ? error.message : String(error),
-                                    context: 'props-interface-property',
-                                });
-                                // Continue with next property
-                            }
-                        });
-                    }
-                }
-                catch (error) {
-                    debugError('propExtractor', 'extractProps', {
-                        filePath,
-                        error: error instanceof Error ? error.message : String(error),
-                        context: 'props-interface',
-                    });
-                    // Continue with next interface
-                }
-            });
-        }
-        catch (error) {
-            debugError('propExtractor', 'extractProps', {
-                filePath,
-                error: error instanceof Error ? error.message : String(error),
-                context: 'props-interfaces-batch',
-            });
-        }
-        // Look for type aliases ending with Props
-        try {
-            source.getTypeAliases().forEach((typeAlias) => {
-                try {
-                    if (/Props$/i.test(typeAlias.getName())) {
-                        const type = typeAlias.getType();
-                        const properties = type.getProperties();
-                        properties.forEach((prop) => {
-                            try {
-                                const name = prop.getName();
-                                // Check if optional using TypeScript's type system
-                                let isOptional = false;
-                                let propType = prop.getTypeAtLocation(typeAlias).getText();
-                                let didRebuildFromUnion = false;
-                                // Method 1: Check if type is a union that includes undefined
-                                // Use type flags instead of string matching to avoid false positives
-                                try {
-                                    const propTypeObj = prop.getTypeAtLocation(typeAlias);
-                                    if (propTypeObj.isUnion()) {
-                                        const unionTypes = propTypeObj.getUnionTypes();
-                                        const hasUndefined = unionTypes.some(ut => {
-                                            // Check type flags for undefined (more robust than string matching)
-                                            const flags = getTypeFlags(ut);
-                                            if ((flags & TYPEFLAG_UNDEFINED) !== 0) {
-                                                return true;
-                                            }
-                                            // Fallback: exact string match only (avoid false positives like SomeUndefinedType)
-                                            const text = ut.getText();
-                                            return text === 'undefined';
-                                        });
-                                        if (hasUndefined) {
-                                            isOptional = true;
-                                            // Normalize type text by removing undefined from union (handles any position)
-                                            // This ensures consistent output: undefined | string and string | undefined both become string
-                                            propType = unionTypes
-                                                .filter(ut => {
-                                                const flags = getTypeFlags(ut);
-                                                if ((flags & TYPEFLAG_UNDEFINED) !== 0) {
-                                                    return false;
-                                                }
-                                                return ut.getText() !== 'undefined';
-                                            })
-                                                .map(ut => ut.getText())
-                                                .join(' | ');
-                                            didRebuildFromUnion = true;
-                                        }
-                                    }
-                                }
-                                catch {
-                                    // Fallback if union check fails
-                                }
-                                // Method 2: Check declarations for question token (AST method)
-                                if (!isOptional) {
-                                    const declarations = prop.getDeclarations();
-                                    isOptional = declarations.some((decl) => {
-                                        // Use AST method to check for question token
-                                        // PropertySignature and PropertyDeclaration both have hasQuestionToken()
-                                        if (Node.isPropertySignature(decl)) {
-                                            return decl.hasQuestionToken();
-                                        }
-                                        if (Node.isPropertyDeclaration(decl)) {
-                                            return decl.hasQuestionToken();
-                                        }
-                                        return false;
-                                    });
-                                }
-                                // If optional but we didn't rebuild from union types, strip undefined from type text
-                                // This handles cases like "foo?: undefined | string" where ? token made us skip union logic
-                                // Also handles "foo?: string | number" where union exists but doesn't contain undefined
-                                if (isOptional && !didRebuildFromUnion) {
-                                    propType = stripUndefinedFromUnionText(propType);
-                                }
-                                props[name] = normalizePropType(propType, isOptional);
-                            }
-                            catch (error) {
-                                debugError('propExtractor', 'extractProps', {
-                                    filePath,
-                                    error: error instanceof Error ? error.message : String(error),
-                                    context: 'props-typealias-property',
-                                });
-                                // Continue with next property
-                            }
-                        });
-                    }
-                }
-                catch (error) {
-                    debugError('propExtractor', 'extractProps', {
-                        filePath,
-                        error: error instanceof Error ? error.message : String(error),
-                        context: 'props-typealias',
-                    });
-                    // Continue with next type alias
-                }
-            });
-        }
-        catch (error) {
-            debugError('propExtractor', 'extractProps', {
-                filePath,
-                error: error instanceof Error ? error.message : String(error),
-                context: 'props-typealiases-batch',
-            });
-        }
-        // Always try to extract hook parameters if there are exported hooks
-        // This ensures hook parameters are captured even if there's a Props interface
-        // Props take priority on conflicts (if a prop exists in both, Props value is kept)
-        // Quick check: only extract if there might be exported hooks (performance optimization)
-        if (hasExportedHooks(source)) {
-            const hookParams = extractHookParameters(source);
-            if (Object.keys(hookParams).length > 0) {
-                // Merge hook parameters with Props, with Props taking priority on conflicts
-                // Save original props to preserve Props values, then merge hookParams, then restore Props
-                const originalProps = { ...props };
-                Object.assign(props, hookParams);
-                Object.assign(props, originalProps); // Props override any conflicting hook parameters
-            }
-        }
+    // Extract props from interfaces ending with Props
+    const interfaces = safeExtract(() => source.getInterfaces(), [], { filePath, context: 'props-interfaces-batch' });
+    for (const iface of interfaces) {
+        const ifaceProps = safeExtract(() => extractPropsFromInterface(iface, filePath), {}, { filePath, context: 'props-interface' });
+        Object.assign(props, ifaceProps);
     }
-    catch (error) {
-        debugError('propExtractor', 'extractProps', {
-            filePath,
-            error: error instanceof Error ? error.message : String(error),
-        });
-        return {};
+    // Extract props from type aliases ending with Props
+    const typeAliases = safeExtract(() => source.getTypeAliases(), [], { filePath, context: 'props-typealiases-batch' });
+    for (const typeAlias of typeAliases) {
+        const typeAliasProps = safeExtract(() => extractPropsFromTypeAlias(typeAlias, filePath), {}, { filePath, context: 'props-typealias' });
+        Object.assign(props, typeAliasProps);
+    }
+    // Extract hook parameters if there are exported hooks
+    // Props take priority on conflicts (if a prop exists in both, Props value is kept)
+    if (hasExportedHooks(source)) {
+        const hookParams = extractHookParameters(source);
+        if (Object.keys(hookParams).length > 0) {
+            // Merge hook parameters with Props, with Props taking priority on conflicts
+            const originalProps = { ...props };
+            Object.assign(props, hookParams);
+            Object.assign(props, originalProps); // Props override any conflicting hook parameters
+        }
     }
     return props;
 }