Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cache Execution Scope #6076

Merged
merged 1 commit into from
Jul 15, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ export interface ExecutionScope {
requireResult: MapLike<any>
}

let lastSeenProjectContents: ProjectContentTreeRoot | null
let executionScopeCache: { [filename: string]: ExecutionScope } = {}

export function createExecutionScope(
filePath: string,
customRequire: (importOrigin: string, toImport: string) => any,
Expand All @@ -70,11 +73,18 @@ export function createExecutionScope(
updateInvalidatedPaths: DomWalkerInvalidatePathsCtxData,
shouldIncludeCanvasRootInTheSpy: boolean,
editedText: ElementPath | null,
): {
scope: MapLike<any>
topLevelJsxComponents: Map<string | null, UtopiaJSXComponent>
requireResult: MapLike<any>
} {
): ExecutionScope {
// Return something from the cache as appropriate.
if (lastSeenProjectContents === projectContents) {
if (filePath in executionScopeCache) {
return executionScopeCache[filePath]
}
} else {
lastSeenProjectContents = projectContents
executionScopeCache = {}
}

// Build the scope.
const { topLevelElements, imports, jsxFactoryFunction, combinedTopLevelArbitraryBlock } =
getParseSuccessForFilePath(filePath, projectContents)
const requireResult: MapLike<any> = importResultFromImports(filePath, imports, customRequire)
Expand Down Expand Up @@ -236,11 +246,13 @@ export function createExecutionScope(
},
})

return {
const toReturn = {
scope: executionScope,
topLevelJsxComponents: topLevelJsxComponents,
requireResult: requireResult,
}
executionScopeCache[filePath] = toReturn
return toReturn
}

const emptyHighlightBoundsResult = { code: '', highlightBounds: null }
Expand Down
Loading