alchemy 0.67.0 → 0.69.0

package/lib/neon/project.js

@@ -1,8 +1,6 @@
-import { alchemy } from "../alchemy.js";
 import { Resource } from "../resource.js";
-import { logger } from "../util/logger.js";
-import { handleApiError } from "./api-error.js";
 import { createNeonApi } from "./api.js";
+import { formatConnectionUri, formatRole, waitForOperations, } from "./utils.js";
 /**
  * Creates a Neon serverless PostgreSQL project.
  *
@@ -30,280 +28,103 @@ import { createNeonApi } from "./api.js";
  */
 export const NeonProject = Resource("neon::Project", async function (id, props) {
     const api = createNeonApi(props);
-    const projectId = props.existing_project_id || this.output?.id;
-    const projectName = props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
-    if (this.phase === "update" && this.output.name !== projectName) {
-        this.replace();
-    }
-    if (this.phase === "delete") {
-        try {
-            // Check if the project exists before attempting to delete
-            if (projectId) {
-                const deleteResponse = await api.delete(`/projects/${projectId}`);
-                if (!deleteResponse.ok && deleteResponse.status !== 404) {
-                    await handleApiError(deleteResponse, "delete", "project", id);
-                }
-            }
-        }
-        catch (error) {
-            logger.error(`Error deleting Neon project ${id}:`, error);
-            throw error;
+    const name = props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
+    switch (this.phase) {
+        case "create": {
+            const { data } = await api.createProject({
+                body: {
+                    project: {
+                        name,
+                        region_id: props.region_id,
+                        pg_version: props.pg_version,
+                        default_endpoint_settings: props.default_endpoint_settings,
+                        branch: {
+                            name: props.default_branch_name,
+                        },
+                        settings: props.settings,
+                        history_retention_seconds: props.history_retention_seconds,
+                    },
+                },
+            });
+            // Branch and endpoints have fields that are updated after operations are complete.
+            await waitForOperations(api, data.operations);
+            const [branch, endpoints] = await Promise.all([
+                api
+                    .getProjectBranch({
+                    path: {
+                        project_id: data.project.id,
+                        branch_id: data.branch.id,
+                    },
+                })
+                    .then((res) => res.data.branch),
+                api
+                    .listProjectEndpoints({
+                    path: {
+                        project_id: data.project.id,
+                    },
+                })
+                    .then((res) => res.data.endpoints),
+            ]);
+            return {
+                id: data.project.id,
+                name: data.project.name,
+                created_at: data.project.created_at,
+                updated_at: data.project.updated_at,
+                proxy_host: data.project.proxy_host,
+                region_id: data.project.region_id,
+                pg_version: data.project.pg_version,
+                settings: data.project.settings,
+                default_endpoint_settings: data.project.default_endpoint_settings,
+                history_retention_seconds: data.project.history_retention_seconds,
+                connection_uris: data.connection_uris.map(formatConnectionUri),
+                roles: data.roles.map(formatRole),
+                databases: data.databases,
+                branch,
+                endpoints: endpoints,
+            };
         }
-        return this.destroy();
-    }
-    let response;
-    try {
-        if (this.phase === "update" && projectId) {
-            // Update existing project
-            // Neon only allows updating the project name
-            const projectResponse = await api.patch(`/projects/${projectId}`, {
-                project: {
-                    name: projectName,
+        case "update": {
+            const { data } = await api.updateProject({
+                path: {
+                    project_id: this.output.id,
+                },
+                body: {
+                    project: {
+                        name,
+                        settings: props.settings,
+                        default_endpoint_settings: props.default_endpoint_settings,
+                        history_retention_seconds: props.history_retention_seconds,
+                    },
                 },
             });
-            if (!projectResponse.ok) {
-                await handleApiError(projectResponse, "update", "project", id);
-            }
-            const initialData = await projectResponse.json();
-            // Reify project properties to get complete data
-            response = await getProject(api, projectId, initialData);
+            return {
+                ...this.output,
+                name: data.project.name,
+                updated_at: data.project.updated_at,
+                proxy_host: data.project.proxy_host,
+                region_id: data.project.region_id,
+                pg_version: data.project.pg_version,
+                settings: data.project.settings,
+                default_endpoint_settings: data.project.default_endpoint_settings,
+                history_retention_seconds: data.project.history_retention_seconds,
+            };
         }
-        else {
-            // Check if a project with this ID already exists
-            if (projectId) {
-                const getResponse = await api.get(`/projects/${projectId}`);
-                if (getResponse.ok) {
-                    // Project exists, update it
-                    const projectResponse = await api.patch(`/projects/${projectId}`, {
-                        project: {
-                            name: projectName,
-                        },
+        case "delete": {
+            if (this.output?.id) {
+                const response = await api.deleteProject({
+                    path: {
+                        project_id: this.output.id,
+                    },
+                    throwOnError: false,
+                });
+                if (response.error && response.response.status !== 404) {
+                    throw new Error(`Failed to delete project: ${response.error.message}`, {
+                        cause: response.error,
                     });
-                    if (!projectResponse.ok) {
-                        await handleApiError(projectResponse, "update", "project", id);
-                    }
-                    const initialData = await projectResponse.json();
-                    // Reify project properties to get complete data
-                    response = await getProject(api, projectId, initialData);
-                }
-                else if (getResponse.status !== 404) {
-                    // Unexpected error during GET check
-                    await handleApiError(getResponse, "get", "project", id);
-                    throw new Error("Failed to check if project exists");
                 }
-                else {
-                    // Project doesn't exist, create new
-                    response = await createNewProject(api, projectName, props);
-                }
-            }
-            else {
-                // No output ID, create new project
-                response = await createNewProject(api, projectName, props);
             }
+            return this.destroy();
         }
-        // Wait for any pending operations to complete
-        if (response.operations && response.operations.length > 0) {
-            await waitForOperations(api, response.operations);
-        }
-        // Get the latest project state after operations complete
-        if (response.project?.id) {
-            // Reify project properties to get complete data
-            response = await getProject(api, response.project.id, response);
-        }
-        return this({
-            id: response.project.id,
-            name: response.project.name,
-            region_id: response.project.region_id,
-            pg_version: response.project.pg_version,
-            created_at: response.project.created_at,
-            updated_at: response.project.updated_at,
-            proxy_host: response.project.proxy_host,
-            // Pass through the provided props except apiKey (which is sensitive)
-            default_endpoint: props.default_endpoint,
-            default_branch_name: props.default_branch_name,
-            baseUrl: props.baseUrl,
-            // Add all available data
-            // @ts-expect-error - api ensures they're non-empty
-            connection_uris: response.connection_uris,
-            // @ts-expect-error
-            roles: response.roles,
-            // @ts-expect-error
-            databases: response.databases,
-            branch: response.branch,
-            // @ts-expect-error
-            endpoints: response.endpoints,
-        });
-    }
-    catch (error) {
-        logger.error(`Error ${this.phase} Neon project '${id}':`, error);
-        throw error;
     }
 });
-/**
- * Helper function to create a new Neon project
- */
-async function createNewProject(api, projectName, props) {
-    const defaultEndpoint = props.default_endpoint ?? true;
-    const projectResponse = await api.post("/projects", {
-        project: {
-            name: projectName,
-            region_id: props.region_id || "aws-us-east-1",
-            pg_version: props.pg_version || 16,
-            default_endpoint: defaultEndpoint,
-            branch: defaultEndpoint
-                ? { name: props.default_branch_name || "main" }
-                : undefined,
-        },
-    });
-    if (!projectResponse.ok) {
-        await handleApiError(projectResponse, "create", "project");
-    }
-    return (await projectResponse.json());
-}
-/**
- * Helper function to get complete project details by fetching all related data
- *
- * @param api The Neon API client
- * @param projectId The project ID
- * @param initialData Initial project data (optional)
- * @returns Complete project data with all related resources
- */
-async function getProject(api, projectId, initialData = {}) {
-    // Get the latest project details
-    const updatedData = await getProjectDetails(api, projectId);
-    // Start with a copy of the initial data
-    const responseData = { ...initialData };
-    // Check if we have a branch ID from the initial data
-    const branchId = initialData.branch?.id;
-    if (branchId) {
-        // Get the branch details
-        const branchData = await getBranchDetails(api, projectId, branchId);
-        // Update with the latest branch data
-        responseData.branch = branchData.branch;
-        // Also fetch the latest endpoint details for this branch
-        const endpointData = await getEndpointDetails(api, projectId, branchId);
-        // Update with the latest endpoint data if available
-        if (endpointData.endpoints && endpointData.endpoints.length > 0) {
-            responseData.endpoints = endpointData.endpoints;
-        }
-    }
-    // Preserve all data from the original response
-    // Only update properties that might have changed during operations
-    return {
-        ...responseData,
-        connection_uris: (updatedData.connection_uris || responseData.connection_uris)?.map((uri) => ({
-            connection_uri: alchemy.secret(uri.connection_uri),
-            connection_parameters: {
-                database: uri.connection_parameters.database,
-                host: uri.connection_parameters.host,
-                port: uri.connection_parameters.port ?? 5432,
-                user: uri.connection_parameters.user ?? "neondb_owner",
-                password: alchemy.secret(uri.connection_parameters.password),
-            },
-        })),
-        project: updatedData.project,
-        branch: updatedData.branch || responseData.branch,
-        endpoints: updatedData.endpoints || responseData.endpoints,
-    };
-}
-/**
- * Wait for operations to complete
- *
- * @param api The Neon API client
- * @param operations Operations to wait for
- * @throws Error if an operation fails or times out
- * @returns Promise that resolves when all operations complete
- */
-async function waitForOperations(api, operations) {
-    const pendingOperations = operations.filter((op) => op.status !== "finished" && op.status !== "failed");
-    if (pendingOperations.length === 0) {
-        return;
-    }
-    // Maximum wait time in milliseconds (5 minutes)
-    const maxWaitTime = 5 * 60 * 1000;
-    // Initial delay between retries in milliseconds
-    const initialRetryDelay = 500;
-    // Maximum delay between retries
-    const maxRetryDelay = 10000;
-    // Backoff factor for exponential backoff
-    const backoffFactor = 1.5;
-    for (const operation of pendingOperations) {
-        let totalWaitTime = 0;
-        let retryDelay = initialRetryDelay;
-        let operationStatus = operation.status;
-        while (operationStatus !== "finished" &&
-            operationStatus !== "failed" &&
-            totalWaitTime < maxWaitTime) {
-            // Wait before checking again with exponential backoff
-            await new Promise((resolve) => setTimeout(resolve, retryDelay));
-            totalWaitTime += retryDelay;
-            // Increase delay for next retry with exponential backoff, up to max
-            retryDelay = Math.min(retryDelay * backoffFactor, maxRetryDelay);
-            // Check operation status
-            const operationResponse = await api.get(`/projects/${operation.project_id}/operations/${operation.id}`);
-            if (operationResponse.ok) {
-                const operationData = await operationResponse.json();
-                operationStatus = operationData.operation?.status;
-            }
-            else {
-                throw new Error(`Failed to check operation ${operation.id} status: HTTP ${operationResponse.status}`);
-            }
-        }
-        if (operationStatus === "failed") {
-            throw new Error(`Operation ${operation.id} (${operation.action}) failed`);
-        }
-        if (totalWaitTime >= maxWaitTime) {
-            throw new Error(`Timeout waiting for operation ${operation.id} (${operation.action}) to complete`);
-        }
-    }
-    // Explicitly return when all operations are complete
-    return;
-}
-/**
- * Get the latest project details
- *
- * @param api The Neon API client
- * @param projectId The project ID
- * @returns Project details including branch and endpoints
- * @throws Error if project details cannot be retrieved
- */
-async function getProjectDetails(api, projectId) {
-    const response = await api.get(`/projects/${projectId}`);
-    if (!response.ok) {
-        throw new Error(`Failed to get project details: HTTP ${response.status}`);
-    }
-    return (await response.json());
-}
-/**
- * Get the latest branch details
- *
- * @param api The Neon API client
- * @param projectId The project ID
- * @param branchId The branch ID
- * @returns Branch details
- * @throws Error if branch details cannot be retrieved
- */
-async function getBranchDetails(api, projectId, branchId) {
-    const response = await api.get(`/projects/${projectId}/branches/${branchId}`);
-    if (!response.ok) {
-        throw new Error(`Failed to get branch details: HTTP ${response.status}`);
-    }
-    return (await response.json());
-}
-/**
- * Get the latest endpoint details for a branch
- *
- * @param api The Neon API client
- * @param projectId The project ID
- * @param branchId The branch ID
- * @returns Endpoint details for the branch
- * @throws Error if endpoint details cannot be retrieved
- */
-async function getEndpointDetails(api, projectId, branchId) {
-    const response = await api.get(`/projects/${projectId}/branches/${branchId}/endpoints`);
-    if (!response.ok) {
-        throw new Error(`Failed to get endpoint details: HTTP ${response.status}`);
-    }
-    return (await response.json());
-}
 //# sourceMappingURL=project.js.map

package/lib/neon/project.js.map

@@ -1 +1 @@
-{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/neon/project.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/neon/project.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAuB,MAAM,UAAU,CAAC;AAE9D,OAAO,EACL,mBAAmB,EACnB,UAAU,EACV,iBAAiB,GAGlB,MAAM,YAAY,CAAC;AAmJpB;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CACjC,eAAe,EACf,KAAK,WAEH,EAAU,EACV,KAAuB;IAEvB,MAAM,GAAG,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACjC,MAAM,IAAI,GACR,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;IAEvE,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC;gBACvC,IAAI,EAAE;oBACJ,OAAO,EAAE;wBACP,IAAI;wBACJ,SAAS,EAAE,KAAK,CAAC,SAAS;wBAC1B,UAAU,EAAE,KAAK,CAAC,UAAU;wBAC5B,yBAAyB,EAAE,KAAK,CAAC,yBAAyB;wBAC1D,MAAM,EAAE;4BACN,IAAI,EAAE,KAAK,CAAC,mBAAmB;yBAChC;wBACD,QAAQ,EAAE,KAAK,CAAC,QAAQ;wBACxB,yBAAyB,EAAE,KAAK,CAAC,yBAAyB;qBAC3D;iBACF;aACF,CAAC,CAAC;YAEH,mFAAmF;YACnF,MAAM,iBAAiB,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;YAC9C,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBAC5C,GAAG;qBACA,gBAAgB,CAAC;oBAChB,IAAI,EAAE;wBACJ,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;wBAC3B,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;qBAC1B;iBACF,CAAC;qBACD,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;gBACjC,GAAG;qBACA,oBAAoB,CAAC;oBACpB,IAAI,EAAE;wBACJ,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;qBAC5B;iBACF,CAAC;qBACD,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;aACrC,CAAC,CAAC;YAEH,OAAO;gBACL,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;gBACnB,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;gBACvB,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;gBACnC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;gBACnC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;gBACnC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAuB;gBAC/C,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAA2B;gBACpD,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;gBAC/B,yBAAyB,EAAE,IAAI,CAAC,OAAO,CAAC,yBAAyB;gBACjE,yBAAyB,EAAE,IAAI,CAAC,OAAO,CAAC,yBAAyB;gBACjE,eAAe,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,mBAAmB,CAG5D;gBACD,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAA8B;gBAC9D,SAAS,EAAE,IAAI,CAAC,SAAgD;gBAChE,MAAM;gBACN,SAAS,EAAE,SAAgD;aAC5D,CAAC;QACJ,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC;gBACvC,IAAI,EAAE;oBACJ,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;iBAC3B;gBACD,IAAI,EAAE;oBACJ,OAAO,EAAE;wBACP,IAAI;wBACJ,QAAQ,EAAE,KAAK,CAAC,QAAQ;wBACxB,yBAAyB,EAAE,KAAK,CAAC,yBAAyB;wBAC1D,yBAAyB,EAAE,KAAK,CAAC,yBAAyB;qBAC3D;iBACF;aACF,CAAC,CAAC;YACH,OAAO;gBACL,GAAG,IAAI,CAAC,MAAM;gBACd,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;gBACvB,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;gBACnC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;gBACnC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAuB;gBAC/C,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAA2B;gBACpD,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;gBAC/B,yBAAyB,EAAE,IAAI,CAAC,OAAO,CAAC,yBAAyB;gBACjE,yBAAyB,EAAE,IAAI,CAAC,OAAO,CAAC,yBAAyB;aAClE,CAAC;QACJ,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC;gBACpB,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC;oBACvC,IAAI,EAAE;wBACJ,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;qBAC3B;oBACD,YAAY,EAAE,KAAK;iBACpB,CAAC,CAAC;gBACH,IAAI,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBACvD,MAAM,IAAI,KAAK,CACb,6BAA6B,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,EACrD;wBACE,KAAK,EAAE,QAAQ,CAAC,KAAK;qBACtB,CACF,CAAC;gBACJ,CAAC;YACH,CAAC;YACD,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;QACxB,CAAC;IACH,CAAC;AACH,CAAC,CACF,CAAC"}

package/lib/neon/utils.d.ts

@@ -0,0 +1,49 @@
+import { Secret } from "../secret.ts";
+import type { NeonClient } from "./api/sdk.gen.ts";
+import type * as neon from "./api/types.gen.ts";
+export interface NeonConnectionUri {
+    /**
+     * Connection URI string
+     */
+    connection_uri: Secret;
+    /**
+     * Connection parameters
+     */
+    connection_parameters: {
+        database: string;
+        host: string;
+        port: number;
+        user: string;
+        password: Secret;
+    };
+}
+export declare function formatConnectionUri(details: neon.ConnectionDetails): NeonConnectionUri;
+export interface NeonRole {
+    /**
+     * The ID of the branch to which the role belongs
+     */
+    branch_id: string;
+    /**
+     * The role name
+     */
+    name: string;
+    /**
+     * The role password
+     */
+    password?: Secret;
+    /**
+     * Whether or not the role is system-protected
+     */
+    protected?: boolean;
+    /**
+     * A timestamp indicating when the role was created
+     */
+    created_at: string;
+    /**
+     * A timestamp indicating when the role was last updated
+     */
+    updated_at: string;
+}
+export declare function formatRole(role: neon.Role): NeonRole;
+export declare function waitForOperations(api: NeonClient, operations: neon.Operation[]): Promise<void>;
+//# sourceMappingURL=utils.d.ts.map

package/lib/neon/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/neon/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAC;AAEhD,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;OAEG;IACH,qBAAqB,EAAE;QACrB,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACH;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,IAAI,CAAC,iBAAiB,GAC9B,iBAAiB,CAWnB;AAED,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,GAAG,QAAQ,CAKpD;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,UAAU,EACf,UAAU,EAAE,IAAI,CAAC,SAAS,EAAE,iBAyB7B"}

package/lib/neon/utils.js

@@ -0,0 +1,44 @@
+import { Secret } from "../secret.js";
+import { poll } from "../util/poll.js";
+export function formatConnectionUri(details) {
+    return {
+        connection_uri: new Secret(details.connection_uri),
+        connection_parameters: {
+            database: details.connection_parameters.database,
+            host: details.connection_parameters.host,
+            port: 5432,
+            user: details.connection_parameters.role,
+            password: new Secret(details.connection_parameters.password),
+        },
+    };
+}
+export function formatRole(role) {
+    return {
+        ...role,
+        password: role.password ? new Secret(role.password) : undefined,
+    };
+}
+export async function waitForOperations(api, operations) {
+    for (const operation of operations) {
+        if (isOperationComplete(operation)) {
+            continue;
+        }
+        await poll({
+            description: `operation "${operation.id}"`,
+            fn: () => api.getProjectOperation({
+                path: {
+                    project_id: operation.project_id,
+                    operation_id: operation.id,
+                },
+            }),
+            predicate: ({ data }) => {
+                if (["error", "failed"].includes(data.operation.status)) {
+                    throw new Error(`Operation ${operation.id} (${operation.action}) failed: ${data.operation.error}`);
+                }
+                return isOperationComplete(data.operation);
+            },
+        });
+    }
+}
+const isOperationComplete = (operation) => ["finished", "failed", "error", "cancelled", "skipped"].includes(operation.status);
+//# sourceMappingURL=utils.js.map

package/lib/neon/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/neon/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAsBvC,MAAM,UAAU,mBAAmB,CACjC,OAA+B;IAE/B,OAAO;QACL,cAAc,EAAE,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC;QAClD,qBAAqB,EAAE;YACrB,QAAQ,EAAE,OAAO,CAAC,qBAAqB,CAAC,QAAQ;YAChD,IAAI,EAAE,OAAO,CAAC,qBAAqB,CAAC,IAAI;YACxC,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,OAAO,CAAC,qBAAqB,CAAC,IAAI;YACxC,QAAQ,EAAE,IAAI,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC,QAAQ,CAAC;SAC7D;KACF,CAAC;AACJ,CAAC;AA6BD,MAAM,UAAU,UAAU,CAAC,IAAe;IACxC,OAAO;QACL,GAAG,IAAI;QACP,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;KAChE,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,GAAe,EACf,UAA4B;IAE5B,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,mBAAmB,CAAC,SAAS,CAAC,EAAE,CAAC;YACnC,SAAS;QACX,CAAC;QACD,MAAM,IAAI,CAAC;YACT,WAAW,EAAE,cAAc,SAAS,CAAC,EAAE,GAAG;YAC1C,EAAE,EAAE,GAAG,EAAE,CACP,GAAG,CAAC,mBAAmB,CAAC;gBACtB,IAAI,EAAE;oBACJ,UAAU,EAAE,SAAS,CAAC,UAAU;oBAChC,YAAY,EAAE,SAAS,CAAC,EAAE;iBAC3B;aACF,CAAC;YACJ,SAAS,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;gBACtB,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;oBACxD,MAAM,IAAI,KAAK,CACb,aAAa,SAAS,CAAC,EAAE,KAAK,SAAS,CAAC,MAAM,aAAa,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAClF,CAAC;gBACJ,CAAC;gBACD,OAAO,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC7C,CAAC;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,MAAM,mBAAmB,GAAG,CAAC,SAAyB,EAAW,EAAE,CACjE,CAAC,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC,QAAQ,CAC9D,SAAS,CAAC,MAAM,CACjB,CAAC"}

package/lib/os/exec.d.ts

@@ -1,6 +1,5 @@
 import { type SpawnOptions } from "node:child_process";
 import type { Context } from "../context.ts";
-import { Resource } from "../resource.ts";
 import type { Secret } from "../secret.ts";
 /**
  * Properties for executing a shell command
@@ -54,7 +53,7 @@ export interface ExecProps {
 /**
  * Output returned after command execution
  */
-export interface Exec extends Resource<"os::Exec">, ExecProps {
+export interface Exec extends ExecProps {
     /**
      * Unique identifier for this execution
      */

package/lib/os/exec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../../src/os/exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAG9D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG;QAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAE3C;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC;IAE1D;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,IAAK,SAAQ,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS;IAC3D;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuEG;AACH,eAAO,MAAM,IAAI,yFAMP,OAAO,CAAC,IAAI,CAAC,MACf,MAAM,SACH,SAAS,KACf,OAAO,CAAC,IAAI,CAAC,CAyGjB,CAAC;AAUF;;GAEG;AACH,MAAM,WAAW,WAAY,SAAQ,OAAO,CAAC,YAAY,CAAC;IACxD;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;;;;;;GAOG;AACH,wBAAsB,IAAI,CACxB,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,CAmDzD"}
+{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../../src/os/exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAG9D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG;QAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAE3C;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC;IAE1D;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,IAAK,SAAQ,SAAS;IACrC;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuEG;AACH,eAAO,MAAM,IAAI,yFAMP,OAAO,CAAC,IAAI,CAAC,MACf,MAAM,SACH,SAAS,KACf,OAAO,CAAC,IAAI,CAAC,CAyGjB,CAAC;AAUF;;GAEG;AACH,MAAM,WAAW,WAAY,SAAQ,OAAO,CAAC,YAAY,CAAC;IACxD;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;;;;;;GAOG;AACH,wBAAsB,IAAI,CACxB,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,CAmDzD"}

package/lib/os/exec.js

@@ -150,7 +150,7 @@ export const Exec = Resource("os::Exec", {
         throw new Error(`Command failed with exit code ${exitCode}: ${props.command}\n${stderr}`);
     }
     // Return the execution result
-    return this({
+    return {
         id,
         command: props.command,
         cwd: props.cwd,
@@ -163,7 +163,7 @@ export const Exec = Resource("os::Exec", {
         executedAt: Date.now(),
         completed: true,
         hash,
-    });
+    };
 });
 const defaultOptions = {
     stdio: "inherit",

package/lib/os/exec.js.map

@@ -1 +1 @@
-{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/os/exec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/os/exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AA+F1C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuEG;AACH,MAAM,CAAC,MAAM,IAAI,GAAG,QAAQ,CAC1B,UAAU,EACV;IACE,YAAY,EAAE,IAAI;CACnB,EACD,KAAK,WAEH,EAAU,EACV,KAAgB;IAEhB,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,iDAAiD;QACjD,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,MAAM,IAAI,GACR,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ;QAC/B,CAAC,CAAC,MAAM,UAAU,CAAC,KAAK,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;QACtE,CAAC,CAAC,SAAS,CAAC;IAEhB,IACE,IAAI,CAAC,KAAK,KAAK,QAAQ;QACvB,KAAK,CAAC,OAAO;QACb,IAAI,CAAC,MAAM,EAAE,OAAO,KAAK,KAAK,CAAC,OAAO;QACtC,CAAC,OAAO,KAAK,CAAC,OAAO,KAAK,SAAS;YACjC,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE,IAAI,KAAK,IAAI,CAAC,CAAC,EACvC,CAAC;QACD,mFAAmF;QACnF,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,iBAAiB;IACjB,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,QAAQ,GAAG,CAAC,CAAC;IAEjB,6DAA6D;IAC7D,MAAM,YAAY,GAAG,KAAK,CAAC,YAAY,KAAK,KAAK,CAAC;IAElD,IAAI,CAAC;QACH,0CAA0C;QAC1C,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAElD,gEAAgE;QAChE,MAAM,YAAY,GAA2B,EAAE,CAAC;QAChD,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;YACd,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;oBAC9B,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBAC5B,CAAC;qBAAM,IAAI,KAAK,EAAE,CAAC;oBACjB,wBAAwB;oBACxB,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,WAAW,CAAC;gBACxC,CAAC;YACH,CAAC;QACH,CAAC;QAED,qCAAqC;QACrC,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE;YACpC,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE;YAC/B,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,YAAY,EAAE;YACxC,KAAK,EAAE,IAAI,EAAE,uCAAuC;YACpD,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,EAAE,+BAA+B;SAC1E,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,mDAAmD;YACnD,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBACvC,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,CAAC,CAAC,CAAC;YAEH,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBACvC,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,CAAC,CAAC,CAAC;QACL,CAAC;QAED,mCAAmC;QACnC,QAAQ,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;YACxD,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;gBAChC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;YAEH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBAC/B,MAAM,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;gBACzB,OAAO,CAAC,CAAC,CAAC,CAAC;YACb,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,iDAAiD;QACjD,QAAQ,GAAG,CAAC,CAAC;QACb,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;IAED,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CACb,iCAAiC,QAAQ,KAAK,KAAK,CAAC,OAAO,KAAK,MAAM,EAAE,CACzE,CAAC;IACJ,CAAC;IAED,8BAA8B;IAC9B,OAAO;QACL,EAAE;QACF,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,YAAY;QACZ,QAAQ;QACR,MAAM;QACN,MAAM;QACN,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE;QACtB,SAAS,EAAE,IAAI;QACf,IAAI;KACL,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,cAAc,GAAiB;IACnC,KAAK,EAAE,SAAS;IAChB,GAAG,EAAE;QACH,GAAG,OAAO,CAAC,GAAG;KACf;IACD,KAAK,EAAE,IAAI;CACZ,CAAC;AAaF;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,IAAI,CACxB,OAAe,EACf,OAAqB;IAErB,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC5C,MAAM,aAAa,GAAG,OAAO,EAAE,aAAa,KAAK,IAAI,CAAC;IAEtD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,mDAAmD;QACnD,MAAM,YAAY,GAAG;YACnB,GAAG,cAAc;YACjB,GAAG,OAAO;YACV,GAAG,EAAE;gBACH,GAAG,cAAc,CAAC,GAAG;gBACrB,GAAG,OAAO,EAAE,GAAG;aAChB;YACD,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK;SACrD,CAAC;QAEF,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;QAE7C,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,MAAM,GAAG,EAAE,CAAC;QAEhB,IAAI,aAAa,EAAE,CAAC;YAClB,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAChC,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,CAAC,CAAC,CAAC;YAEH,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAChC,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,CAAC,CAAC,CAAC;QACL,CAAC;QAED,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YACzB,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;gBACf,IAAI,aAAa,EAAE,CAAC;oBAClB,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;gBAC9B,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,SAAS,CAAC,CAAC;gBACrB,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,CACJ,IAAI,KAAK,CACP,iCAAiC,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACtE,CACF,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACxB,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,GAAW,EAAE,QAAkB;IACvD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;IACtC,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IAEtD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEzC,MAAM,OAAO,CAAC,GAAG,CACf,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACjC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QAC3C,OAAO,OAAO,CAAC,GAAG,CAChB,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAY,EAAE,EAAE;YAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAC7B,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;YACrC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACvE,CAAC,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAC9D,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACzB,CAAC;IAEF,MAAM,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;IACvC,KAAK,MAAM,CAAC,EAAE,IAAI,CAAC,IAAI,YAAY,EAAE,CAAC;QACpC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IACD,OAAO,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC"}