diff --git a/libs/remix-ws-templates/src/script-templates/sindri/utils.ts b/libs/remix-ws-templates/src/script-templates/sindri/utils.ts index 82030a0df7..8905d037da 100644 --- a/libs/remix-ws-templates/src/script-templates/sindri/utils.ts +++ b/libs/remix-ws-templates/src/script-templates/sindri/utils.ts @@ -22,15 +22,28 @@ const getSindriManifest = async () => { return JSON.parse(sindriJson) } +const normalizePath = (path: string): string => { + while (path.startsWith('/') || path.startsWith('./')) { + path = path.replace(/^(\.\/|\/)/, '') + } + return path +} + /** - * Create a map of file paths to `File` objects for either all or a subset of files in the workspace. + * Compile the circuit. * - * @param {RegExp | null} includeRegex - A regular expression to limit the included files to those - * whose paths match. If not specified, then all paths are included. - * @param {RegExp | null} excludeRegex - A regular expression to exclude files whose paths match. - * @returns {Promise<{[path: string]: File}>} A map of file paths to `File` objects. + * @param {string | string[] | null} tags - The tag or tags to use when compiling the circuit. + * @returns {CircuitInfoResponse} compiled circuit */ -const getWorkspaceFilesByPath = async (includeRegex: RegExp | null = null, excludeRegex: RegExp | null = null): Promise<{[path: string]: File}> => { +export const compile = async (tags: string | string[] | null = ['latest']): CircuitInfoResponse => { + await authorize() + const sindriManifest = await getSindriManifest() + + // Create a map from file paths to `File` objects for (almost) all files in the workspace. + // We exclude `.deps/` files because these are resolved to more intuitive locations so they can + // be used by the circuit without specifying a complex import path. We'll merge the dependencies + // into the files at their expected import paths in a later step. + const excludeRegex = /^\.deps\// const filesByPath: {[path: string]: File} = {} interface Workspace { children?: Workspace @@ -40,35 +53,13 @@ const getWorkspaceFilesByPath = async (includeRegex: RegExp | null = null, exclu const childQueue: Array<[string, Workspace]> = Object.entries(workspace) while (childQueue.length > 0) { const [path, child] = childQueue.pop() - if ('content' in child && (includeRegex === null || includeRegex.test(path)) && (excludeRegex === null || !excludeRegex.test(path))) { + if ('content' in child && !excludeRegex.test(path)) { filesByPath[path] = new File([child.content], path) } if ('children' in child) { childQueue.push(...Object.entries(child.children)) } } - return filesByPath -} - -const normalizePath = (path: string): string => { - while (path.startsWith('/') || path.startsWith('./')) { - path = path.replace(/^(\.\/|\/)/, '') - } - return path -} - -/** - * Compile the circuit. - * - * @param {string | string[] | null} tags - The tag or tags to use when compiling the circuit. - * @returns {CircuitInfoResponse} compiled circuit - */ -export const compile = async (tags: string | string[] | null = ['latest']): CircuitInfoResponse => { - await authorize() - const sindriManifest = await getSindriManifest() - - // Create a map from file paths to `File` objects for all files in the workspace. - const filesByPath = await getWorkspaceFilesByPath(null, /^\.deps\//) // Merge any of the circuit's resolved dependencies into the files at their expected import paths. if (sindriManifest.circuitType === 'circom') {