@anvil-works/anvil-cli 0.7.6 → 0.7.7

package/dist/index.js

@@ -14414,323 +14414,65 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             return true;
         }
     }
-    const ANVIL_DEPS_DIR = ".anvil/deps";
-    const ANVIL_DEPS_MANIFEST = "manifest.json";
-    const DEPS_MANIFEST_VERSION = 1;
-    function formatFetchError(prefix, status, errorBody) {
-        if (!errorBody) return `${prefix}: ${status}`;
-        try {
-            const parsed = JSON.parse(errorBody);
-            if ("string" == typeof parsed.error && parsed.error.trim()) return `${prefix}: ${parsed.error} (${status})`;
-        } catch  {}
-        return `${prefix}: ${status} ${errorBody}`;
-    }
-    async function fetchAllDependencies(appId, anvilUrl = resolveAnvilUrl(), options = {}) {
-        const { commit, includeDocs = true, knownDependencies = [] } = options;
-        const token = await auth_getValidAuthToken(anvilUrl, options.username);
-        const body = {
-            include_docs: includeDocs,
-            known_dependencies: knownDependencies
-        };
-        if (commit) body.commit = commit;
-        const resp = await fetch(`${anvilUrl}/ide/api/_/apps/${appId}/resolved-dependencies`, {
-            method: "POST",
-            headers: {
-                Authorization: `Bearer ${token}`,
-                "Content-Type": "application/json"
-            },
-            body: JSON.stringify(body)
-        });
-        if (!resp.ok) {
-            const errorBody = await resp.text();
-            throw new Error(formatFetchError("Failed to fetch dependencies", resp.status, errorBody));
-        }
-        return await resp.json();
+    const external_timers_promises_namespaceObject = require("timers/promises");
+    const WANT_NOT_VALID_RE = /\bwant\s+[0-9a-f]{7,40}\s+not valid\b/i;
+    const FETCH_RETRY_DELAY_MS = 200;
+    function isWantNotValidError(error) {
+        return WANT_NOT_VALID_RE.test(error.message || "");
     }
-    async function refreshDependencyCache(projectRoot, appId, anvilUrl = resolveAnvilUrl(), options = {}) {
-        const includeDocs = options.includeDocs ?? true;
-        const knownDependencies = await getKnownDependenciesForCache(projectRoot, includeDocs);
-        const response = await fetchAllDependencies(appId, anvilUrl, {
-            username: options.username,
-            commit: options.commit,
-            includeDocs,
-            knownDependencies
-        });
-        if (!response.resolved_dependencies.length) {
-            await clearDepsCache(projectRoot);
-            return {
-                response,
-                addedGitignoreEntry: false
-            };
+    class git_GitService extends Emitter {
+        git;
+        repoPath;
+        static INDEX_LOCK_RETRY_DELAYS_MS = [
+            25,
+            50,
+            100,
+            200
+        ];
+        constructor(repoPath){
+            super();
+            this.repoPath = external_path_default().resolve(repoPath);
+            this.git = esm_default(this.repoPath);
         }
-        const addedGitignoreEntry = await ensureProjectGitignoreIgnoresAnvilDir(projectRoot);
-        await writeAllDepsToCache(projectRoot, response, {
-            includeDocs
-        });
-        return {
-            response,
-            addedGitignoreEntry
-        };
-    }
-    function depsDir(projectRoot) {
-        return external_path_default().join(projectRoot, ANVIL_DEPS_DIR);
-    }
-    function depsManifestPath(projectRoot) {
-        return external_path_default().join(depsDir(projectRoot), ANVIL_DEPS_MANIFEST);
-    }
-    function isResolvedDependencyManifestEntry(value) {
-        if (!value || "object" != typeof value) return false;
-        const entry = value;
-        return "string" == typeof entry.app_id && entry.app_id.length > 0 && "string" == typeof entry.commit_id && entry.commit_id.length > 0 && (void 0 === entry.branch || "string" == typeof entry.branch);
-    }
-    function isCachedDependencyManifestEntry(value) {
-        if (!isResolvedDependencyManifestEntry(value)) return false;
-        const entry = value;
-        return "string" == typeof entry.package_name && entry.package_name.length > 0;
-    }
-    function isDepsCacheManifest(value) {
-        if (!value || "object" != typeof value) return false;
-        const manifest = value;
-        return manifest.version === DEPS_MANIFEST_VERSION && "boolean" == typeof manifest.includeDocs && Array.isArray(manifest.resolved_dependencies) && manifest.resolved_dependencies.every(isResolvedDependencyManifestEntry) && Array.isArray(manifest.cached_dependencies) && manifest.cached_dependencies.every(isCachedDependencyManifestEntry);
-    }
-    async function readDepsCacheManifest(projectRoot) {
-        try {
-            const raw = await promises_default().readFile(depsManifestPath(projectRoot), "utf-8");
-            const parsed = JSON.parse(raw);
-            return isDepsCacheManifest(parsed) ? parsed : void 0;
-        } catch  {
-            return;
+        getGit() {
+            return this.git;
         }
-    }
-    async function getKnownDependenciesForCache(projectRoot, includeDocs) {
-        const manifest = await readDepsCacheManifest(projectRoot);
-        if (!manifest || manifest.includeDocs !== includeDocs) return [];
-        return manifest.resolved_dependencies.map(({ app_id, commit_id })=>({
-                app_id,
-                commit_id
-            }));
-    }
-    function getDependencyWatchSubscriptionsFromManifest(manifest) {
-        if (!manifest) return [];
-        const cachedByAppId = new Map(manifest.cached_dependencies.map((dep)=>[
-                dep.app_id,
-                dep
-            ]));
-        return manifest.resolved_dependencies.flatMap((dep)=>{
-            if (!dep.branch) return [];
-            return [
-                {
-                    appId: dep.app_id,
-                    branch: dep.branch,
-                    packageName: cachedByAppId.get(dep.app_id)?.package_name
-                }
-            ];
-        });
-    }
-    function normalizeAnvilYamlDependenciesFromContent(content) {
-        const parsed = external_js_yaml_default().load(content);
-        if (!parsed || "object" != typeof parsed || !Array.isArray(parsed.dependencies)) return [];
-        return normalizeAnvilYamlDependenciesValue(parsed.dependencies);
-    }
-    function normalizeAnvilYamlDependenciesValue(value) {
-        if (!Array.isArray(value)) return [];
-        return normalizeForComparison(value);
-    }
-    async function readAnvilYamlDependencies(projectRoot) {
-        try {
-            const content = await promises_default().readFile(external_path_default().join(projectRoot, "anvil.yaml"), "utf-8");
-            return normalizeAnvilYamlDependenciesFromContent(content);
-        } catch  {
-            return [];
+        getRepoPath() {
+            return this.repoPath;
         }
-    }
-    function anvilYamlDependenciesEqual(left, right) {
-        return deepEqual(left, right);
-    }
-    function normalizeForComparison(value) {
-        if (Array.isArray(value)) return value.map(normalizeForComparison);
-        if (value && "object" == typeof value) return Object.fromEntries(Object.entries(value).sort(([left], [right])=>left.localeCompare(right)).map(([key, entryValue])=>[
-                key,
-                normalizeForComparison(entryValue)
-            ]));
-        return value;
-    }
-    function cachedManifestEntry(dep, packageName) {
-        return {
-            app_id: dep.app_id,
-            commit_id: dep.commit_id,
-            ...dep.branch ? {
-                branch: dep.branch
-            } : {},
-            package_name: packageName
-        };
-    }
-    function safeDependencyPath(filePath, kind) {
-        const normalizedPath = external_path_default().normalize(filePath);
-        if (external_path_default().isAbsolute(normalizedPath) || normalizedPath.startsWith("..")) throw new Error(`Invalid dependency ${kind} path: ${filePath}`);
-        return normalizedPath;
-    }
-    async function writeDepToCache(projectRoot, dep) {
-        const depDir = external_path_default().join(projectRoot, ANVIL_DEPS_DIR, dep.package_name);
-        await promises_default().rm(depDir, {
-            recursive: true,
-            force: true
-        });
-        await promises_default().mkdir(external_path_default().join(depDir, "client_code"), {
-            recursive: true
-        });
-        await promises_default().mkdir(external_path_default().join(depDir, "server_code"), {
-            recursive: true
-        });
-        await promises_default().writeFile(external_path_default().join(depDir, "anvil.yaml"), external_js_yaml_default().dump({
-            package_name: dep.package_name
-        }));
-        for (const mod of dep.modules ?? [])if (mod.is_package) {
-            const modDir = external_path_default().join(depDir, "client_code", mod.name);
-            await promises_default().mkdir(modDir, {
-                recursive: true
-            });
-            await promises_default().writeFile(external_path_default().join(modDir, "__init__.py"), mod.code);
-        } else await promises_default().writeFile(external_path_default().join(depDir, "client_code", `${mod.name}.py`), mod.code);
-        for (const form of dep.forms ?? []){
-            const { code, class_name, is_package, ...formTemplate } = form;
-            if (is_package) {
-                const formDir = external_path_default().join(depDir, "client_code", class_name);
-                await promises_default().mkdir(formDir, {
-                    recursive: true
-                });
-                await promises_default().writeFile(external_path_default().join(formDir, "__init__.py"), code);
-                await promises_default().writeFile(external_path_default().join(formDir, "form_template.yaml"), external_js_yaml_default().dump(formTemplate));
-            } else {
-                await promises_default().writeFile(external_path_default().join(depDir, "client_code", `${class_name}.py`), code);
-                await promises_default().writeFile(external_path_default().join(depDir, "client_code", `${class_name}.yaml`), external_js_yaml_default().dump(formTemplate));
+        async getGitDir() {
+            try {
+                const gitDir = (await this.git.revparse([
+                    "--git-dir"
+                ])).trim();
+                if (!external_path_default().isAbsolute(gitDir)) return external_path_default().resolve(this.repoPath, gitDir);
+                return gitDir;
+            } catch (e) {
+                throw errors_createGitError.commandFailed("rev-parse --git-dir", e.message);
             }
         }
-        for (const mod of dep.server_modules ?? [])if (mod.is_package) {
-            const modDir = external_path_default().join(depDir, "server_code", mod.name);
-            await promises_default().mkdir(modDir, {
-                recursive: true
-            });
-            await promises_default().writeFile(external_path_default().join(modDir, "__init__.py"), mod.code);
-        } else await promises_default().writeFile(external_path_default().join(depDir, "server_code", `${mod.name}.py`), mod.code);
-        for (const asset of dep.assets ?? []){
-            const targetPath = external_path_default().join(depDir, "theme", "assets", safeDependencyPath(asset.name, "asset"));
-            await promises_default().mkdir(external_path_default().dirname(targetPath), {
-                recursive: true
-            });
-            await promises_default().writeFile(targetPath, Buffer.from(asset.content, "base64"));
+        async getCurrentBranch() {
+            try {
+                const branchRef = await this.git.revparse([
+                    "--abbrev-ref",
+                    "HEAD"
+                ]);
+                if ("HEAD" === branchRef) throw createSyncError.detachedHead();
+                return branchRef;
+            } catch (e) {
+                if ("detached_head" === e.type) throw e;
+                throw createSyncError.detachedHead();
+            }
         }
-        for (const doc of dep.docs ?? []){
-            const targetPath = external_path_default().join(depDir, safeDependencyPath(doc.path, "doc"));
-            await promises_default().mkdir(external_path_default().dirname(targetPath), {
-                recursive: true
-            });
-            await promises_default().writeFile(targetPath, doc.content);
-        }
-    }
-    async function writeAllDepsToCache(projectRoot, response, options = {}) {
-        const includeDocs = options.includeDocs ?? true;
-        const manifest = await readDepsCacheManifest(projectRoot);
-        const canReuseExistingCache = manifest?.includeDocs === includeDocs;
-        if (!canReuseExistingCache) await clearDepsCache(projectRoot);
-        const previousCached = canReuseExistingCache ? manifest.cached_dependencies : [];
-        const resolvedAppIds = new Set(response.resolved_dependencies.map((dep)=>dep.app_id));
-        for (const dep of previousCached)if (!resolvedAppIds.has(dep.app_id)) await promises_default().rm(external_path_default().join(projectRoot, ANVIL_DEPS_DIR, dep.package_name), {
-            recursive: true,
-            force: true
-        });
-        for (const dep of response.dependencies)await writeDepToCache(projectRoot, dep);
-        const returnedByAppId = new Map(response.dependencies.map((dep)=>[
-                dep.app_id,
-                dep
-            ]));
-        const previousByAppId = new Map(previousCached.map((dep)=>[
-                dep.app_id,
-                dep
-            ]));
-        const cachedDependencies = response.resolved_dependencies.map((dep)=>{
-            const returned = returnedByAppId.get(dep.app_id);
-            if (returned) return cachedManifestEntry(returned, returned.package_name);
-            const previous = previousByAppId.get(dep.app_id);
-            if (!previous) return;
-            return cachedManifestEntry(dep, previous.package_name);
-        }).filter((dep)=>void 0 !== dep);
-        const newManifest = {
-            version: DEPS_MANIFEST_VERSION,
-            includeDocs,
-            resolved_dependencies: response.resolved_dependencies,
-            cached_dependencies: cachedDependencies
-        };
-        await promises_default().mkdir(depsDir(projectRoot), {
-            recursive: true
-        });
-        await promises_default().writeFile(depsManifestPath(projectRoot), `${JSON.stringify(newManifest, null, 2)}\n`);
-    }
-    async function clearDepsCache(projectRoot) {
-        await promises_default().rm(depsDir(projectRoot), {
-            recursive: true,
-            force: true
-        });
-    }
-    const external_timers_promises_namespaceObject = require("timers/promises");
-    const WANT_NOT_VALID_RE = /\bwant\s+[0-9a-f]{7,40}\s+not valid\b/i;
-    const FETCH_RETRY_DELAY_MS = 200;
-    function isWantNotValidError(error) {
-        return WANT_NOT_VALID_RE.test(error.message || "");
-    }
-    class git_GitService extends Emitter {
-        git;
-        repoPath;
-        static INDEX_LOCK_RETRY_DELAYS_MS = [
-            25,
-            50,
-            100,
-            200
-        ];
-        constructor(repoPath){
-            super();
-            this.repoPath = external_path_default().resolve(repoPath);
-            this.git = esm_default(this.repoPath);
-        }
-        getGit() {
-            return this.git;
-        }
-        getRepoPath() {
-            return this.repoPath;
-        }
-        async getGitDir() {
-            try {
-                const gitDir = (await this.git.revparse([
-                    "--git-dir"
-                ])).trim();
-                if (!external_path_default().isAbsolute(gitDir)) return external_path_default().resolve(this.repoPath, gitDir);
-                return gitDir;
-            } catch (e) {
-                throw errors_createGitError.commandFailed("rev-parse --git-dir", e.message);
-            }
-        }
-        async getCurrentBranch() {
-            try {
-                const branchRef = await this.git.revparse([
-                    "--abbrev-ref",
-                    "HEAD"
-                ]);
-                if ("HEAD" === branchRef) throw createSyncError.detachedHead();
-                return branchRef;
-            } catch (e) {
-                if ("detached_head" === e.type) throw e;
-                throw createSyncError.detachedHead();
-            }
-        }
-        async getCommitId() {
-            try {
-                const commitId = (await this.git.revparse([
-                    "HEAD"
-                ])).trim();
-                return commitId;
-            } catch (e) {
-                throw errors_createGitError.commandFailed("revparse", e.message);
-            }
+        async getCommitId() {
+            try {
+                const commitId = (await this.git.revparse([
+                    "HEAD"
+                ])).trim();
+                return commitId;
+            } catch (e) {
+                throw errors_createGitError.commandFailed("revparse", e.message);
+            }
         }
         async getCommitInfo() {
             try {
@@ -15122,6 +14864,265 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             throw errors_createGitError.commandFailed("status", e.message);
         }
     }
+    const ANVIL_DEPS_DIR = ".anvil/deps";
+    const ANVIL_DEPS_MANIFEST = "manifest.json";
+    const DEPS_MANIFEST_VERSION = 1;
+    function formatFetchError(prefix, status, errorBody) {
+        if (!errorBody) return `${prefix}: ${status}`;
+        try {
+            const parsed = JSON.parse(errorBody);
+            if ("string" == typeof parsed.error && parsed.error.trim()) return `${prefix}: ${parsed.error} (${status})`;
+        } catch  {}
+        return `${prefix}: ${status} ${errorBody}`;
+    }
+    async function fetchAllDependencies(appId, anvilUrl = resolveAnvilUrl(), options = {}) {
+        const { commit, includeDocs = true, knownDependencies = [] } = options;
+        const token = await auth_getValidAuthToken(anvilUrl, options.username);
+        const body = {
+            include_docs: includeDocs,
+            known_dependencies: knownDependencies
+        };
+        if (commit) body.commit = commit;
+        const resp = await fetch(`${anvilUrl}/ide/api/_/apps/${appId}/resolved-dependencies`, {
+            method: "POST",
+            headers: {
+                Authorization: `Bearer ${token}`,
+                "Content-Type": "application/json"
+            },
+            body: JSON.stringify(body)
+        });
+        if (!resp.ok) {
+            const errorBody = await resp.text();
+            throw new Error(formatFetchError("Failed to fetch dependencies", resp.status, errorBody));
+        }
+        return await resp.json();
+    }
+    async function refreshDependencyCache(projectRoot, appId, anvilUrl = resolveAnvilUrl(), options = {}) {
+        const includeDocs = options.includeDocs ?? true;
+        const commit = options.commit ?? await new git_GitService(projectRoot).getCommitId();
+        const knownDependencies = await getKnownDependenciesForCache(projectRoot, includeDocs);
+        const response = await fetchAllDependencies(appId, anvilUrl, {
+            username: options.username,
+            commit,
+            includeDocs,
+            knownDependencies
+        });
+        if (!response.resolved_dependencies.length) {
+            await clearDepsCache(projectRoot);
+            return {
+                response,
+                addedGitignoreEntry: false
+            };
+        }
+        const addedGitignoreEntry = await ensureProjectGitignoreIgnoresAnvilDir(projectRoot);
+        await writeAllDepsToCache(projectRoot, response, {
+            includeDocs
+        });
+        return {
+            response,
+            addedGitignoreEntry
+        };
+    }
+    function depsDir(projectRoot) {
+        return external_path_default().join(projectRoot, ANVIL_DEPS_DIR);
+    }
+    function depsManifestPath(projectRoot) {
+        return external_path_default().join(depsDir(projectRoot), ANVIL_DEPS_MANIFEST);
+    }
+    function isResolvedDependencyManifestEntry(value) {
+        if (!value || "object" != typeof value) return false;
+        const entry = value;
+        return "string" == typeof entry.app_id && entry.app_id.length > 0 && "string" == typeof entry.commit_id && entry.commit_id.length > 0 && (void 0 === entry.branch || "string" == typeof entry.branch);
+    }
+    function isCachedDependencyManifestEntry(value) {
+        if (!isResolvedDependencyManifestEntry(value)) return false;
+        const entry = value;
+        return "string" == typeof entry.package_name && entry.package_name.length > 0;
+    }
+    function isDepsCacheManifest(value) {
+        if (!value || "object" != typeof value) return false;
+        const manifest = value;
+        return manifest.version === DEPS_MANIFEST_VERSION && "boolean" == typeof manifest.includeDocs && Array.isArray(manifest.resolved_dependencies) && manifest.resolved_dependencies.every(isResolvedDependencyManifestEntry) && Array.isArray(manifest.cached_dependencies) && manifest.cached_dependencies.every(isCachedDependencyManifestEntry);
+    }
+    async function readDepsCacheManifest(projectRoot) {
+        try {
+            const raw = await promises_default().readFile(depsManifestPath(projectRoot), "utf-8");
+            const parsed = JSON.parse(raw);
+            return isDepsCacheManifest(parsed) ? parsed : void 0;
+        } catch  {
+            return;
+        }
+    }
+    async function getKnownDependenciesForCache(projectRoot, includeDocs) {
+        const manifest = await readDepsCacheManifest(projectRoot);
+        if (!manifest || manifest.includeDocs !== includeDocs) return [];
+        return manifest.resolved_dependencies.map(({ app_id, commit_id })=>({
+                app_id,
+                commit_id
+            }));
+    }
+    function getDependencyWatchSubscriptionsFromManifest(manifest) {
+        if (!manifest) return [];
+        const cachedByAppId = new Map(manifest.cached_dependencies.map((dep)=>[
+                dep.app_id,
+                dep
+            ]));
+        return manifest.resolved_dependencies.flatMap((dep)=>{
+            if (!dep.branch) return [];
+            return [
+                {
+                    appId: dep.app_id,
+                    branch: dep.branch,
+                    packageName: cachedByAppId.get(dep.app_id)?.package_name
+                }
+            ];
+        });
+    }
+    function normalizeAnvilYamlDependenciesFromContent(content) {
+        const parsed = external_js_yaml_default().load(content);
+        if (!parsed || "object" != typeof parsed || !Array.isArray(parsed.dependencies)) return [];
+        return normalizeAnvilYamlDependenciesValue(parsed.dependencies);
+    }
+    function normalizeAnvilYamlDependenciesValue(value) {
+        if (!Array.isArray(value)) return [];
+        return normalizeForComparison(value);
+    }
+    async function readAnvilYamlDependencies(projectRoot) {
+        try {
+            const content = await promises_default().readFile(external_path_default().join(projectRoot, "anvil.yaml"), "utf-8");
+            return normalizeAnvilYamlDependenciesFromContent(content);
+        } catch  {
+            return [];
+        }
+    }
+    function anvilYamlDependenciesEqual(left, right) {
+        return deepEqual(left, right);
+    }
+    function normalizeForComparison(value) {
+        if (Array.isArray(value)) return value.map(normalizeForComparison);
+        if (value && "object" == typeof value) return Object.fromEntries(Object.entries(value).sort(([left], [right])=>left.localeCompare(right)).map(([key, entryValue])=>[
+                key,
+                normalizeForComparison(entryValue)
+            ]));
+        return value;
+    }
+    function cachedManifestEntry(dep, packageName) {
+        return {
+            app_id: dep.app_id,
+            commit_id: dep.commit_id,
+            ...dep.branch ? {
+                branch: dep.branch
+            } : {},
+            package_name: packageName
+        };
+    }
+    function safeDependencyPath(filePath, kind) {
+        const normalizedPath = external_path_default().normalize(filePath);
+        if (external_path_default().isAbsolute(normalizedPath) || normalizedPath.startsWith("..")) throw new Error(`Invalid dependency ${kind} path: ${filePath}`);
+        return normalizedPath;
+    }
+    async function writeDepToCache(projectRoot, dep) {
+        const depDir = external_path_default().join(projectRoot, ANVIL_DEPS_DIR, dep.package_name);
+        await promises_default().rm(depDir, {
+            recursive: true,
+            force: true
+        });
+        await promises_default().mkdir(external_path_default().join(depDir, "client_code"), {
+            recursive: true
+        });
+        await promises_default().mkdir(external_path_default().join(depDir, "server_code"), {
+            recursive: true
+        });
+        await promises_default().writeFile(external_path_default().join(depDir, "anvil.yaml"), external_js_yaml_default().dump({
+            package_name: dep.package_name
+        }));
+        for (const mod of dep.modules ?? [])if (mod.is_package) {
+            const modDir = external_path_default().join(depDir, "client_code", mod.name);
+            await promises_default().mkdir(modDir, {
+                recursive: true
+            });
+            await promises_default().writeFile(external_path_default().join(modDir, "__init__.py"), mod.code);
+        } else await promises_default().writeFile(external_path_default().join(depDir, "client_code", `${mod.name}.py`), mod.code);
+        for (const form of dep.forms ?? []){
+            const { code, class_name, is_package, ...formTemplate } = form;
+            if (is_package) {
+                const formDir = external_path_default().join(depDir, "client_code", class_name);
+                await promises_default().mkdir(formDir, {
+                    recursive: true
+                });
+                await promises_default().writeFile(external_path_default().join(formDir, "__init__.py"), code);
+                await promises_default().writeFile(external_path_default().join(formDir, "form_template.yaml"), external_js_yaml_default().dump(formTemplate));
+            } else {
+                await promises_default().writeFile(external_path_default().join(depDir, "client_code", `${class_name}.py`), code);
+                await promises_default().writeFile(external_path_default().join(depDir, "client_code", `${class_name}.yaml`), external_js_yaml_default().dump(formTemplate));
+            }
+        }
+        for (const mod of dep.server_modules ?? [])if (mod.is_package) {
+            const modDir = external_path_default().join(depDir, "server_code", mod.name);
+            await promises_default().mkdir(modDir, {
+                recursive: true
+            });
+            await promises_default().writeFile(external_path_default().join(modDir, "__init__.py"), mod.code);
+        } else await promises_default().writeFile(external_path_default().join(depDir, "server_code", `${mod.name}.py`), mod.code);
+        for (const asset of dep.assets ?? []){
+            const targetPath = external_path_default().join(depDir, "theme", "assets", safeDependencyPath(asset.name, "asset"));
+            await promises_default().mkdir(external_path_default().dirname(targetPath), {
+                recursive: true
+            });
+            await promises_default().writeFile(targetPath, Buffer.from(asset.content, "base64"));
+        }
+        for (const doc of dep.docs ?? []){
+            const targetPath = external_path_default().join(depDir, safeDependencyPath(doc.path, "doc"));
+            await promises_default().mkdir(external_path_default().dirname(targetPath), {
+                recursive: true
+            });
+            await promises_default().writeFile(targetPath, doc.content);
+        }
+    }
+    async function writeAllDepsToCache(projectRoot, response, options = {}) {
+        const includeDocs = options.includeDocs ?? true;
+        const manifest = await readDepsCacheManifest(projectRoot);
+        const canReuseExistingCache = manifest?.includeDocs === includeDocs;
+        if (!canReuseExistingCache) await clearDepsCache(projectRoot);
+        const previousCached = canReuseExistingCache ? manifest.cached_dependencies : [];
+        const resolvedAppIds = new Set(response.resolved_dependencies.map((dep)=>dep.app_id));
+        for (const dep of previousCached)if (!resolvedAppIds.has(dep.app_id)) await promises_default().rm(external_path_default().join(projectRoot, ANVIL_DEPS_DIR, dep.package_name), {
+            recursive: true,
+            force: true
+        });
+        for (const dep of response.dependencies)await writeDepToCache(projectRoot, dep);
+        const returnedByAppId = new Map(response.dependencies.map((dep)=>[
+                dep.app_id,
+                dep
+            ]));
+        const previousByAppId = new Map(previousCached.map((dep)=>[
+                dep.app_id,
+                dep
+            ]));
+        const cachedDependencies = response.resolved_dependencies.map((dep)=>{
+            const returned = returnedByAppId.get(dep.app_id);
+            if (returned) return cachedManifestEntry(returned, returned.package_name);
+            const previous = previousByAppId.get(dep.app_id);
+            if (!previous) return;
+            return cachedManifestEntry(dep, previous.package_name);
+        }).filter((dep)=>void 0 !== dep);
+        const newManifest = {
+            version: DEPS_MANIFEST_VERSION,
+            includeDocs,
+            resolved_dependencies: response.resolved_dependencies,
+            cached_dependencies: cachedDependencies
+        };
+        await promises_default().mkdir(depsDir(projectRoot), {
+            recursive: true
+        });
+        await promises_default().writeFile(depsManifestPath(projectRoot), `${JSON.stringify(newManifest, null, 2)}\n`);
+    }
+    async function clearDepsCache(projectRoot) {
+        await promises_default().rm(depsDir(projectRoot), {
+            recursive: true,
+            force: true
+        });
+    }
     const external_chokidar_namespaceObject = require("chokidar");
     var external_chokidar_default = /*#__PURE__*/ __webpack_require__.n(external_chokidar_namespaceObject);
     class FileWatcher extends Emitter {

package/dist/services/deps.d.ts.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anvil-works/anvil-cli",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "description": "CLI tool for developing Anvil apps locally",
   "main": "dist/index.js",
   "types": "dist/api.d.ts",