@mdbase-dev/connect 0.1.0-beta.43 → 0.1.0-beta.45

package/dist/application-session.d.ts

@@ -104,6 +104,7 @@ export declare class MdbaseApplicationSession<Frontmatter extends JsonObject = J
     private base;
     private stopBase?;
     private setupAssessment;
+    private setupTypePackAdoptions;
     private verificationGeneration;
     private lifecycleGeneration;
     private startOperation;

package/dist/application-session.js

@@ -35,6 +35,7 @@ export class MdbaseApplicationSession {
     base = null;
     stopBase;
     setupAssessment = null;
+    setupTypePackAdoptions = null;
     verificationGeneration = 0;
     lifecycleGeneration = 0;
     startOperation = null;
@@ -108,10 +109,6 @@ export class MdbaseApplicationSession {
             operations: operationsForSession(capabilities)
         });
         this.base = base;
-        this.stopBase = base.subscribe(() => {
-            if (this.base === base)
-                void this.refresh();
-        });
         try {
             const started = await base.start(options);
             if (!started.ok) {
@@ -121,6 +118,10 @@ export class MdbaseApplicationSession {
             if (generation !== this.lifecycleGeneration || options.signal?.aborted) {
                 throw requestAbortReason(options.signal ?? new AbortController().signal);
             }
+            this.stopBase = base.subscribe(() => {
+                if (this.base === base)
+                    void this.refresh();
+            });
             await this.refresh(true, options);
             if (generation !== this.lifecycleGeneration || options.signal?.aborted) {
                 throw requestAbortReason(options.signal ?? new AbortController().signal);
@@ -142,6 +143,7 @@ export class MdbaseApplicationSession {
         this.application = null;
         this.manifest = null;
         this.setupAssessment = null;
+        this.setupTypePackAdoptions = null;
         this.snapshot = { status: "opening", connections: [] };
         this.listeners.clear();
     }
@@ -218,7 +220,7 @@ export class MdbaseApplicationSession {
         }
         const assessment = this.setupAssessment;
         const input = {
-            ...this.collectionSetupInput(),
+            ...this.collectionSetupInput(this.setupTypePackAdoptions ?? undefined),
             expectedAssessmentDigest: assessment.assessmentDigest,
             expectedCollectionRevision: assessment.collectionRevision,
             expectedProvisionDigest: assessment.provisionDigest,
@@ -233,6 +235,7 @@ export class MdbaseApplicationSession {
             if (!applied.ok)
                 return applied;
             this.setupAssessment = null;
+            this.setupTypePackAdoptions = null;
             await this.verifySetup(this.context(connection), ++this.verificationGeneration, requestOptions);
             return connectSuccess(this.snapshot);
         }
@@ -247,6 +250,7 @@ export class MdbaseApplicationSession {
         this.verificationGeneration += 1;
         const generation = this.verificationGeneration;
         this.setupAssessment = null;
+        this.setupTypePackAdoptions = null;
         if (current.status === "unselected") {
             this.publish({ status: "unselected", connections: current.connections });
             return;
@@ -282,15 +286,31 @@ export class MdbaseApplicationSession {
         const manifest = this.requireManifest();
         if (!connection || connection.collectionId !== context.collectionId)
             return;
-        const outcome = options
-            ? await connection.assessCollectionSetup(this.collectionSetupInput(), options)
-            : await connection.assessCollectionSetup(this.collectionSetupInput());
+        const initialInput = this.collectionSetupInput();
+        let outcome = options
+            ? await connection.assessCollectionSetup(initialInput, options)
+            : await connection.assessCollectionSetup(initialInput);
         if (generation !== this.verificationGeneration)
             return;
         if (!outcome.ok) {
             this.publish({ status: "blocked", problem: outcome.problem, ...context });
             return;
         }
+        if (!outcome.value.applicable) {
+            const adoptions = reviewableTypePackAdoptions(outcome.value);
+            if (Object.keys(adoptions).length > 0) {
+                outcome = options
+                    ? await connection.assessCollectionSetup(this.collectionSetupInput(adoptions), options)
+                    : await connection.assessCollectionSetup(this.collectionSetupInput(adoptions));
+                if (generation !== this.verificationGeneration)
+                    return;
+                if (!outcome.ok) {
+                    this.publish({ status: "blocked", problem: outcome.problem, ...context });
+                    return;
+                }
+                this.setupTypePackAdoptions = adoptions;
+            }
+        }
         if (generation !== this.verificationGeneration)
             return;
         if (outcome.value.status !== "current") {
@@ -306,7 +326,7 @@ export class MdbaseApplicationSession {
         this.verificationStore.write(verificationKey(manifest, context.collectionId), verificationValue(manifest));
         this.publish({ status: "ready", verification: "verified", ...context });
     }
-    collectionSetupInput() {
+    collectionSetupInput(typePackAdoptions) {
         const manifest = this.requireManifest();
         const application = this.requireApplication();
         return {
@@ -318,7 +338,8 @@ export class MdbaseApplicationSession {
             provisions: {
                 configuration: manifest.provisions?.configuration ?? [],
                 typePacks: manifest.provisions?.type_packs ?? []
-            }
+            },
+            ...(typePackAdoptions ? { typePackAdoptions } : {})
         };
     }
     context(connection) {
@@ -404,6 +425,20 @@ function collectionSetupUpdate(assessment, provisions) {
         reason
     };
 }
+function reviewableTypePackAdoptions(assessment) {
+    const adoptions = {};
+    for (const pack of assessment.typePacks) {
+        const resources = Object.fromEntries(pack.resources
+            .filter((resource) => resource.action === "conflict"
+            && resource.mode === "managed"
+            && resource.currentDigest !== undefined
+            && resource.installedDigest === undefined)
+            .map((resource) => [resource.target, resource.currentDigest]));
+        if (Object.keys(resources).length > 0)
+            adoptions[pack.desired.id] = resources;
+    }
+    return adoptions;
+}
 function verificationKey(manifest, collectionId) {
     return `mdbase-application-session:v1:${manifest.id}:${collectionId}`;
 }

package/dist/browser/integrity.json

@@ -1,4 +1,4 @@
 {
   "file": "mdbase-connect.min.js",
-  "integrity": "sha384-g2N0xs9/iucLSg776Sf/DvW0XAg9Vv0N6FEef0kkiDkzZVk/O4kejPyknzN9PeMF"
+  "integrity": "sha384-tQNAGhNHK5o3rGSGfgYxdlId+kkNuHjACybvLOd7G/uGGkJkBsO5FP6evKsXiIMy"
 }