@start9labs/start-sdk 0.3.6-alpha7 → 0.3.6-alpha8

package/mjs/lib/inits/migrations/Migration.d.ts

@@ -1,33 +1,20 @@
 import { ValidateExVer } from "../../exver";
 import * as T from "../../types";
+export declare const IMPOSSIBLE: unique symbol;
+export type MigrationOptions<Manifest extends T.Manifest, Store, Version extends string> = {
+    fromRange?: string;
+    version: Version & ValidateExVer<Version>;
+    up: ((opts: {
+        effects: T.Effects;
+    }) => Promise<void>) | typeof IMPOSSIBLE;
+    down?: (opts: {
+        effects: T.Effects;
+    }) => Promise<void>;
+};
 export declare class Migration<Manifest extends T.Manifest, Store, Version extends string> {
-    readonly options: {
-        version: Version & ValidateExVer<Version>;
-        up: (opts: {
-            effects: T.Effects;
-        }) => Promise<void>;
-        down: (opts: {
-            effects: T.Effects;
-        }) => Promise<void>;
-    };
-    constructor(options: {
-        version: Version & ValidateExVer<Version>;
-        up: (opts: {
-            effects: T.Effects;
-        }) => Promise<void>;
-        down: (opts: {
-            effects: T.Effects;
-        }) => Promise<void>;
-    });
-    static of<Manifest extends T.Manifest, Store, Version extends string>(options: {
-        version: Version & ValidateExVer<Version>;
-        up: (opts: {
-            effects: T.Effects;
-        }) => Promise<void>;
-        down: (opts: {
-            effects: T.Effects;
-        }) => Promise<void>;
-    }): Migration<Manifest, Store, Version>;
+    readonly options: MigrationOptions<Manifest, Store, Version>;
+    constructor(options: MigrationOptions<Manifest, Store, Version>);
+    static of<Manifest extends T.Manifest, Store, Version extends string>(options: MigrationOptions<Manifest, Store, Version>): Migration<Manifest, Store, Version>;
     up(opts: {
         effects: T.Effects;
     }): Promise<void>;

package/mjs/lib/inits/migrations/Migration.js

@@ -1,3 +1,4 @@
+export const IMPOSSIBLE = Symbol("IMPOSSIBLE");
 export class Migration {
     options;
     constructor(options) {
@@ -7,10 +8,16 @@ export class Migration {
         return new Migration(options);
     }
     async up(opts) {
-        this.up(opts);
+        if (this.options.up === IMPOSSIBLE) {
+            throw new Error(`impossible to migrate to ${this.options.version} from the current version`);
+        }
+        return this.options.up(opts);
     }
     async down(opts) {
-        this.down(opts);
+        if (!this.options.down) {
+            throw new Error(`impossible to downgrade from ${this.options.version}`);
+        }
+        return this.options.down(opts);
     }
 }
 //# sourceMappingURL=Migration.js.map

package/mjs/lib/inits/migrations/Migration.js.map

@@ -1 +1 @@
-{"version":3,"file":"Migration.js","sourceRoot":"","sources":["../../../../../lib/inits/migrations/Migration.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,SAAS;IAMT;IADX,YACW,OAIR;QAJQ,YAAO,GAAP,OAAO,CAIf;IACA,CAAC;IACJ,MAAM,CAAC,EAAE,CAIP,OAID;QACC,OAAO,IAAI,SAAS,CAA2B,OAAO,CAAC,CAAA;IACzD,CAAC;IAED,KAAK,CAAC,EAAE,CAAC,IAA4B;QACnC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAA;IACf,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAA4B;QACrC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACjB,CAAC;CACF"}
+{"version":3,"file":"Migration.js","sourceRoot":"","sources":["../../../../../lib/inits/migrations/Migration.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,CAAA;AAa9C,MAAM,OAAO,SAAS;IAKC;IAArB,YAAqB,OAAmD;QAAnD,YAAO,GAAP,OAAO,CAA4C;IAAG,CAAC;IAC5E,MAAM,CAAC,EAAE,CACP,OAAmD;QAEnD,OAAO,IAAI,SAAS,CAA2B,OAAO,CAAC,CAAA;IACzD,CAAC;IAED,KAAK,CAAC,EAAE,CAAC,IAA4B;QACnC,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,UAAU,EAAE;YAClC,MAAM,IAAI,KAAK,CACb,4BAA4B,IAAI,CAAC,OAAO,CAAC,OAAO,2BAA2B,CAC5E,CAAA;SACF;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,CAAA;IAC9B,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAA4B;QACrC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;SACxE;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC;CACF"}

package/mjs/lib/inits/migrations/setupMigrations.d.ts

@@ -1,14 +1,19 @@
+import { ExtendedVersion, VersionRange } from "../../exver";
 import * as T from "../../types";
 import { Migration } from "./Migration";
 export declare class Migrations<Manifest extends T.Manifest, Store> {
     readonly manifest: T.Manifest;
-    readonly migrations: Array<Migration<Manifest, Store, any>>;
+    private readonly migrationGraph;
     private constructor();
-    private sortedMigrations;
-    private currentVersion;
+    currentVersion: () => ExtendedVersion;
     static of<Manifest extends T.Manifest, Store, Migrations extends Array<Migration<Manifest, Store, any>>>(manifest: T.Manifest, ...migrations: EnsureUniqueId<Migrations>): import("./setupMigrations").Migrations<Manifest, Store>;
-    init({ effects, previousVersion, }: Parameters<T.ExpectedExports.init>[0]): Promise<void>;
-    uninit({ effects, nextVersion, }: Parameters<T.ExpectedExports.uninit>[0]): Promise<void>;
+    migrate({ effects, from, to, }: {
+        effects: T.Effects;
+        from: ExtendedVersion;
+        to: ExtendedVersion;
+    }): Promise<void>;
+    canMigrateFrom: () => VersionRange;
+    canMigrateTo: () => VersionRange;
 }
 export declare function setupMigrations<Manifest extends T.Manifest, Store, Migrations extends Array<Migration<Manifest, Store, any>>>(manifest: T.Manifest, ...migrations: EnsureUniqueId<Migrations>): import("./setupMigrations").Migrations<Manifest, Store>;
 export type EnsureUniqueId<A, B = A, ids = never> = B extends [] ? A : B extends [Migration<any, any, infer id>, ...infer Rest] ? (id extends ids ? "One of the ids are not unique"[] : EnsureUniqueId<A, Rest, id | ids>) : "There exists a migration that is not a Migration"[];

package/mjs/lib/inits/migrations/setupMigrations.js

@@ -1,44 +1,108 @@
-import { ExtendedVersion } from "../../exver";
+import { ExtendedVersion, VersionRange } from "../../exver";
+import { Graph } from "../../util/graph";
 import { once } from "../../util/once";
+import { IMPOSSIBLE } from "./Migration";
 export class Migrations {
     manifest;
-    migrations;
+    migrationGraph;
     constructor(manifest, migrations) {
         this.manifest = manifest;
-        this.migrations = migrations;
+        this.migrationGraph = once(() => {
+            const flavorMap = migrations.reduce((acc, x) => {
+                const v = ExtendedVersion.parse(x.options.version);
+                const flavor = v.flavor || "";
+                if (!(flavor in acc)) {
+                    acc[flavor] = [];
+                }
+                acc[flavor].push({
+                    fromRange: x.options.fromRange
+                        ? VersionRange.parse(x.options.fromRange)
+                        : undefined,
+                    toVersion: v,
+                    up: x.up,
+                    down: x.down,
+                });
+                return acc;
+            }, {});
+            const graph = new Graph();
+            for (let flavor in flavorMap) {
+                flavorMap[flavor].sort((a, b) => a.toVersion.compareForSort(b.toVersion));
+                const last = flavorMap[flavor][flavorMap[flavor].length - 1];
+                if (!last || last.toVersion.lessThan(this.currentVersion())) {
+                    flavorMap[flavor].push({
+                        toVersion: this.currentVersion(),
+                        up: async () => { },
+                        down: async () => { },
+                    });
+                }
+                let prev;
+                for (let migration of flavorMap[flavor]) {
+                    migration.vTo =
+                        graph
+                            .findVertex((v) => v.metadata instanceof ExtendedVersion &&
+                            v.metadata.equals(migration.toVersion))
+                            .next().value || graph.addVertex(migration.toVersion, [], []);
+                    const fromRange = migration.fromRange ||
+                        (prev
+                            ? VersionRange.anchor(">=", prev).and(VersionRange.anchor("<", migration.toVersion))
+                            : VersionRange.anchor("<", migration.toVersion));
+                    prev = migration.toVersion;
+                    const vFrom = graph.addVertex(fromRange, [], []);
+                    if (migration.up !== IMPOSSIBLE) {
+                        graph.addEdge(migration.up, vFrom, migration.vTo);
+                    }
+                    if (migration.down) {
+                        graph.addEdge(migration.down, migration.vTo, vFrom);
+                    }
+                }
+            }
+            for (let flavor in flavorMap) {
+                for (let migration of flavorMap[flavor]) {
+                    if (migration.vTo) {
+                        for (let vertex of graph.findVertex((v) => v instanceof VersionRange && v.satisfiedBy(migration.toVersion))) {
+                            for (let edge of vertex.edges.filter((v) => v.from === vertex)) {
+                                graph.addEdge(edge.metadata, migration.vTo, edge.to);
+                            }
+                        }
+                    }
+                }
+            }
+            return graph;
+        });
     }
-    sortedMigrations = once(() => {
-        const migrationsAsVersions = this.migrations
-            .map((x) => [ExtendedVersion.parse(x.options.version), x])
-            .filter(([v, _]) => v.flavor === this.currentVersion().flavor);
-        migrationsAsVersions.sort((a, b) => a[0].compareForSort(b[0]));
-        return migrationsAsVersions;
-    });
     currentVersion = once(() => ExtendedVersion.parse(this.manifest.version));
     static of(manifest, ...migrations) {
         return new Migrations(manifest, migrations);
     }
-    async init({ effects, previousVersion, }) {
-        if (!!previousVersion) {
-            const previousVersionExVer = ExtendedVersion.parse(previousVersion);
-            for (const [_, migration] of this.sortedMigrations()
-                .filter((x) => x[0].greaterThan(previousVersionExVer))
-                .filter((x) => x[0].lessThanOrEqual(this.currentVersion()))) {
-                await migration.up({ effects });
-            }
-        }
-    }
-    async uninit({ effects, nextVersion, }) {
-        if (!!nextVersion) {
-            const nextVersionExVer = ExtendedVersion.parse(nextVersion);
-            const reversed = [...this.sortedMigrations()].reverse();
-            for (const [_, migration] of reversed
-                .filter((x) => x[0].greaterThan(nextVersionExVer))
-                .filter((x) => x[0].lessThanOrEqual(this.currentVersion()))) {
-                await migration.down({ effects });
+    async migrate({ effects, from, to, }) {
+        const graph = this.migrationGraph();
+        if (from && to) {
+            const path = graph.shortestPath((v) => (v.metadata instanceof VersionRange &&
+                v.metadata.satisfiedBy(from)) ||
+                (v.metadata instanceof ExtendedVersion && v.metadata.equals(from)), (v) => (v.metadata instanceof VersionRange && v.metadata.satisfiedBy(to)) ||
+                (v.metadata instanceof ExtendedVersion && v.metadata.equals(to)));
+            if (path) {
+                for (let edge of path) {
+                    await edge.metadata({ effects });
+                    // TODO: track partial migrations
+                }
+                return;
             }
         }
+        throw new Error();
     }
+    canMigrateFrom = once(() => Array.from(this.migrationGraph().reverseBfs((v) => (v.metadata instanceof VersionRange &&
+        v.metadata.satisfiedBy(this.currentVersion())) ||
+        (v.metadata instanceof ExtendedVersion &&
+            v.metadata.equals(this.currentVersion())))).reduce((acc, x) => acc.or(x.metadata instanceof VersionRange
+        ? x.metadata
+        : VersionRange.anchor("=", x.metadata)), VersionRange.none()));
+    canMigrateTo = once(() => Array.from(this.migrationGraph().bfs((v) => (v.metadata instanceof VersionRange &&
+        v.metadata.satisfiedBy(this.currentVersion())) ||
+        (v.metadata instanceof ExtendedVersion &&
+            v.metadata.equals(this.currentVersion())))).reduce((acc, x) => acc.or(x.metadata instanceof VersionRange
+        ? x.metadata
+        : VersionRange.anchor("=", x.metadata)), VersionRange.none()));
 }
 export function setupMigrations(manifest, ...migrations) {
     return Migrations.of(manifest, ...migrations);

package/mjs/lib/inits/migrations/setupMigrations.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupMigrations.js","sourceRoot":"","sources":["../../../../../lib/inits/migrations/setupMigrations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setupMigrations.js","sourceRoot":"","sources":["../../../../../lib/inits/migrations/setupMigrations.ts"],"names":[],"mappings":"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"}

package/mjs/lib/inits/setupInit.d.ts

@@ -2,10 +2,10 @@ import { DependenciesReceipt } from "../config/setupConfig";
 import { SetInterfaces } from "../interfaces/setupInterfaces";
 import { ExposedStorePaths } from "../store/setupExposeStore";
 import * as T from "../types";
-import { Migrations } from "./migrations/setupMigrations";
+import { VersionGraph } from "../version/VersionGraph";
 import { Install } from "./setupInstall";
 import { Uninstall } from "./setupUninstall";
-export declare function setupInit<Manifest extends T.Manifest, Store>(migrations: Migrations<Manifest, Store>, install: Install<Manifest, Store>, uninstall: Uninstall<Manifest, Store>, setInterfaces: SetInterfaces<Manifest, Store, any, any>, setDependencies: (options: {
+export declare function setupInit<Manifest extends T.Manifest, Store>(versions: VersionGraph<Manifest["version"]>, install: Install<Manifest, Store>, uninstall: Uninstall<Manifest, Store>, setInterfaces: SetInterfaces<Manifest, Store, any, any>, setDependencies: (options: {
     effects: T.Effects;
     input: any;
 }) => Promise<DependenciesReceipt>, exposedStore: ExposedStorePaths): {

package/mjs/lib/inits/setupInit.js

@@ -1,8 +1,21 @@
-export function setupInit(migrations, install, uninstall, setInterfaces, setDependencies, exposedStore) {
+import { ExtendedVersion } from "../exver";
+export function setupInit(versions, install, uninstall, setInterfaces, setDependencies, exposedStore) {
     return {
         init: async (opts) => {
-            await migrations.init(opts);
-            await install.init(opts);
+            const prev = await opts.effects.getDataVersion();
+            if (prev) {
+                await versions.migrate({
+                    effects: opts.effects,
+                    from: ExtendedVersion.parse(prev),
+                    to: versions.currentVersion(),
+                });
+            }
+            else {
+                await install.install(opts);
+                await opts.effects.setDataVersion({
+                    version: versions.current.options.version,
+                });
+            }
             await setInterfaces({
                 ...opts,
                 input: null,
@@ -11,8 +24,19 @@ export function setupInit(migrations, install, uninstall, setInterfaces, setDepe
             await setDependencies({ effects: opts.effects, input: null });
         },
         uninit: async (opts) => {
-            await migrations.uninit(opts);
-            await uninstall.uninit(opts);
+            if (opts.nextVersion) {
+                const prev = await opts.effects.getDataVersion();
+                if (prev) {
+                    await versions.migrate({
+                        effects: opts.effects,
+                        from: ExtendedVersion.parse(prev),
+                        to: ExtendedVersion.parse(opts.nextVersion),
+                    });
+                }
+            }
+            else {
+                await uninstall.uninstall(opts);
+            }
         },
     };
 }

package/mjs/lib/inits/setupInit.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupInit.js","sourceRoot":"","sources":["../../../../lib/inits/setupInit.ts"],"names":[],"mappings":"AASA,MAAM,UAAU,SAAS,CACvB,UAAuC,EACvC,OAAiC,EACjC,SAAqC,EACrC,aAAuD,EACvD,eAGkC,EAClC,YAA+B;IAK/B,OAAO;QACL,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACnB,MAAM,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC3B,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACxB,MAAM,aAAa,CAAC;gBAClB,GAAG,IAAI;gBACP,KAAK,EAAE,IAAI;aACZ,CAAC,CAAA;YACF,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAA;YAC/D,MAAM,eAAe,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QAC/D,CAAC;QACD,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACrB,MAAM,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YAC7B,MAAM,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAC9B,CAAC;KACF,CAAA;AACH,CAAC"}
+{"version":3,"file":"setupInit.js","sourceRoot":"","sources":["../../../../lib/inits/setupInit.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAgB,MAAM,UAAU,CAAA;AASxD,MAAM,UAAU,SAAS,CACvB,QAA2C,EAC3C,OAAiC,EACjC,SAAqC,EACrC,aAAuD,EACvD,eAGkC,EAClC,YAA+B;IAK/B,OAAO;QACL,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACnB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAA;YAChD,IAAI,IAAI,EAAE;gBACR,MAAM,QAAQ,CAAC,OAAO,CAAC;oBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,IAAI,EAAE,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC;oBACjC,EAAE,EAAE,QAAQ,CAAC,cAAc,EAAE;iBAC9B,CAAC,CAAA;aACH;iBAAM;gBACL,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;gBAC3B,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC;oBAChC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO;iBAC1C,CAAC,CAAA;aACH;YACD,MAAM,aAAa,CAAC;gBAClB,GAAG,IAAI;gBACP,KAAK,EAAE,IAAI;aACZ,CAAC,CAAA;YACF,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAA;YAC/D,MAAM,eAAe,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QAC/D,CAAC;QACD,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACrB,IAAI,IAAI,CAAC,WAAW,EAAE;gBACpB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAA;gBAChD,IAAI,IAAI,EAAE;oBACR,MAAM,QAAQ,CAAC,OAAO,CAAC;wBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;wBACrB,IAAI,EAAE,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC;wBACjC,EAAE,EAAE,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC;qBAC5C,CAAC,CAAA;iBACH;aACF;iBAAM;gBACL,MAAM,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;aAChC;QACH,CAAC;KACF,CAAA;AACH,CAAC"}

package/mjs/lib/inits/setupInstall.d.ts

@@ -6,6 +6,6 @@ export declare class Install<Manifest extends T.Manifest, Store> {
     readonly fn: InstallFn<Manifest, Store>;
     private constructor();
     static of<Manifest extends T.Manifest, Store>(fn: InstallFn<Manifest, Store>): Install<Manifest, Store>;
-    init({ effects, previousVersion, }: Parameters<T.ExpectedExports.init>[0]): Promise<void>;
+    install({ effects }: Parameters<T.ExpectedExports.init>[0]): Promise<void>;
 }
 export declare function setupInstall<Manifest extends T.Manifest, Store>(fn: InstallFn<Manifest, Store>): Install<Manifest, Store>;

package/mjs/lib/inits/setupInstall.js

@@ -6,11 +6,10 @@ export class Install {
     static of(fn) {
         return new Install(fn);
     }
-    async init({ effects, previousVersion, }) {
-        if (!previousVersion)
-            await this.fn({
-                effects,
-            });
+    async install({ effects }) {
+        await this.fn({
+            effects,
+        });
     }
 }
 export function setupInstall(fn) {

package/mjs/lib/inits/setupInstall.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupInstall.js","sourceRoot":"","sources":["../../../../lib/inits/setupInstall.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,OAAO;IACW;IAA7B,YAA6B,EAA8B;QAA9B,OAAE,GAAF,EAAE,CAA4B;IAAG,CAAC;IAC/D,MAAM,CAAC,EAAE,CACP,EAA8B;QAE9B,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EACT,OAAO,EACP,eAAe,GACuB;QACtC,IAAI,CAAC,eAAe;YAClB,MAAM,IAAI,CAAC,EAAE,CAAC;gBACZ,OAAO;aACR,CAAC,CAAA;IACN,CAAC;CACF;AAED,MAAM,UAAU,YAAY,CAC1B,EAA8B;IAE9B,OAAO,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;AACvB,CAAC"}
+{"version":3,"file":"setupInstall.js","sourceRoot":"","sources":["../../../../lib/inits/setupInstall.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,OAAO;IACW;IAA7B,YAA6B,EAA8B;QAA9B,OAAE,GAAF,EAAE,CAA4B;IAAG,CAAC;IAC/D,MAAM,CAAC,EAAE,CACP,EAA8B;QAE9B,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,EAAyC;QAC9D,MAAM,IAAI,CAAC,EAAE,CAAC;YACZ,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;CACF;AAED,MAAM,UAAU,YAAY,CAC1B,EAA8B;IAE9B,OAAO,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;AACvB,CAAC"}

package/mjs/lib/inits/setupUninstall.d.ts

@@ -6,6 +6,6 @@ export declare class Uninstall<Manifest extends T.Manifest, Store> {
     readonly fn: UninstallFn<Manifest, Store>;
     private constructor();
     static of<Manifest extends T.Manifest, Store>(fn: UninstallFn<Manifest, Store>): Uninstall<Manifest, Store>;
-    uninit({ effects, nextVersion, }: Parameters<T.ExpectedExports.uninit>[0]): Promise<void>;
+    uninstall({ effects, nextVersion, }: Parameters<T.ExpectedExports.uninit>[0]): Promise<void>;
 }
 export declare function setupUninstall<Manifest extends T.Manifest, Store>(fn: UninstallFn<Manifest, Store>): Uninstall<Manifest, Store>;

package/mjs/lib/inits/setupUninstall.js

@@ -6,7 +6,7 @@ export class Uninstall {
     static of(fn) {
         return new Uninstall(fn);
     }
-    async uninit({ effects, nextVersion, }) {
+    async uninstall({ effects, nextVersion, }) {
         if (!nextVersion)
             await this.fn({
                 effects,

package/mjs/lib/inits/setupUninstall.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupUninstall.js","sourceRoot":"","sources":["../../../../lib/inits/setupUninstall.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,SAAS;IACS;IAA7B,YAA6B,EAAgC;QAAhC,OAAE,GAAF,EAAE,CAA8B;IAAG,CAAC;IACjE,MAAM,CAAC,EAAE,CACP,EAAgC;QAEhC,OAAO,IAAI,SAAS,CAAC,EAAE,CAAC,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EACX,OAAO,EACP,WAAW,GAC6B;QACxC,IAAI,CAAC,WAAW;YACd,MAAM,IAAI,CAAC,EAAE,CAAC;gBACZ,OAAO;aACR,CAAC,CAAA;IACN,CAAC;CACF;AAED,MAAM,UAAU,cAAc,CAC5B,EAAgC;IAEhC,OAAO,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;AACzB,CAAC"}
+{"version":3,"file":"setupUninstall.js","sourceRoot":"","sources":["../../../../lib/inits/setupUninstall.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,SAAS;IACS;IAA7B,YAA6B,EAAgC;QAAhC,OAAE,GAAF,EAAE,CAA8B;IAAG,CAAC;IACjE,MAAM,CAAC,EAAE,CACP,EAAgC;QAEhC,OAAO,IAAI,SAAS,CAAC,EAAE,CAAC,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,EACd,OAAO,EACP,WAAW,GAC6B;QACxC,IAAI,CAAC,WAAW;YACd,MAAM,IAAI,CAAC,EAAE,CAAC;gBACZ,OAAO;aACR,CAAC,CAAA;IACN,CAAC;CACF;AAED,MAAM,UAAU,cAAc,CAC5B,EAAgC;IAEhC,OAAO,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;AACzB,CAAC"}

package/mjs/lib/mainFn/CommandController.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import * as T from "../types";
-import { MountOptions, Overlay } from "../util/Overlay";
+import { ExecSpawnable, MountOptions, NonDestroyableOverlay } from "../util/Overlay";
 export declare class CommandController {
     readonly runningAnswer: Promise<unknown>;
-    readonly overlay: Overlay;
+    private readonly overlay;
     readonly pid: number | undefined;
     readonly sigtermTimeout: number;
     private constructor();
@@ -17,7 +17,7 @@ export declare class CommandController {
             path: string;
             options: MountOptions;
         }[] | undefined;
-        overlay?: Overlay | undefined;
+        overlay?: ExecSpawnable | undefined;
         env?: {
             [variable: string]: string;
         } | undefined;
@@ -26,7 +26,10 @@ export declare class CommandController {
         onStdout?: ((x: Buffer) => void) | undefined;
         onStderr?: ((x: Buffer) => void) | undefined;
     }) => Promise<CommandController>;
-    wait(timeout?: number): Promise<unknown>;
+    get nonDestroyableOverlay(): NonDestroyableOverlay;
+    wait({ timeout }?: {
+        timeout?: number | undefined;
+    }): Promise<unknown>;
     term({ signal, timeout }?: {
         signal?: NodeJS.Signals | undefined;
         timeout?: number | undefined;

package/mjs/lib/mainFn/CommandController.js

@@ -1,6 +1,7 @@
 import { DEFAULT_SIGTERM_TIMEOUT } from ".";
 import { NO_TIMEOUT, SIGTERM } from "../StartSdk";
-import { Overlay } from "../util/Overlay";
+import { asError } from "../util/asError";
+import { NonDestroyableOverlay, Overlay, } from "../util/Overlay";
 import { splitCommand } from "../util/splitCommand";
 import { cpExecFile } from "./Daemons";
 export class CommandController {
@@ -17,10 +18,14 @@ export class CommandController {
     static of() {
         return async (effects, imageId, command, options) => {
             const commands = splitCommand(command);
-            const overlay = options.overlay || (await Overlay.of(effects, imageId));
-            for (let mount of options.mounts || []) {
-                await overlay.mount(mount.options, mount.path);
-            }
+            const overlay = options.overlay ||
+                (await (async () => {
+                    const overlay = await Overlay.of(effects, imageId);
+                    for (let mount of options.mounts || []) {
+                        await overlay.mount(mount.options, mount.path);
+                    }
+                    return overlay;
+                })());
             const childProcess = await overlay.spawn(commands, {
                 env: options.env,
             });
@@ -31,7 +36,7 @@ export class CommandController {
                     }));
                 childProcess.stderr.on("data", options.onStderr ??
                     ((data) => {
-                        console.error(data.toString());
+                        console.error(asError(data));
                     }));
                 childProcess.on("exit", (code) => {
                     if (code === 0) {
@@ -44,7 +49,10 @@ export class CommandController {
             return new CommandController(answer, overlay, pid, options.sigtermTimeout);
         };
     }
-    async wait(timeout = NO_TIMEOUT) {
+    get nonDestroyableOverlay() {
+        return new NonDestroyableOverlay(this.overlay);
+    }
+    async wait({ timeout = NO_TIMEOUT } = {}) {
         if (timeout > 0)
             setTimeout(() => {
                 this.term();
@@ -56,7 +64,7 @@ export class CommandController {
             if (this.pid !== undefined) {
                 await cpExecFile("pkill", ["-9", "-s", String(this.pid)]).catch((_) => { });
             }
-            await this.overlay.destroy().catch((_) => { });
+            await this.overlay.destroy?.().catch((_) => { });
         }
     }
     async term({ signal = SIGTERM, timeout = this.sigtermTimeout } = {}) {
@@ -74,7 +82,7 @@ export class CommandController {
             }
         }
         finally {
-            await this.overlay.destroy();
+            await this.overlay.destroy?.();
         }
     }
 }

package/mjs/lib/mainFn/CommandController.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommandController.js","sourceRoot":"","sources":["../../../../lib/mainFn/CommandController.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CommandController.js","sourceRoot":"","sources":["../../../../lib/mainFn/CommandController.ts"],"names":[],"mappings":"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"}

package/mjs/lib/mainFn/Daemon.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import * as T from "../types";
-import { MountOptions, Overlay } from "../util/Overlay";
+import { ExecSpawnable, MountOptions, Overlay } from "../util/Overlay";
+import { CommandController } from "./CommandController";
 /**
  * This is a wrapper around CommandController that has a state of off, where the command shouldn't be running
  * and the others state of running, where it will keep a living running command
@@ -10,7 +11,8 @@ export declare class Daemon {
     private startCommand;
     private commandController;
     private shouldBeRunning;
-    private constructor();
+    constructor(startCommand: () => Promise<CommandController>);
+    get overlay(): undefined | ExecSpawnable;
     static of<Manifest extends T.Manifest>(): <A extends string>(effects: T.Effects, imageId: {
         id: keyof Manifest["images"] & T.ImageId;
         sharedRun?: boolean;

package/mjs/lib/mainFn/Daemon.js

@@ -1,3 +1,4 @@
+import { asError } from "../util/asError";
 import { CommandController } from "./CommandController";
 const TIMEOUT_INCREMENT_MS = 1000;
 const MAX_TIMEOUT_MS = 30000;
@@ -12,6 +13,9 @@ export class Daemon {
     constructor(startCommand) {
         this.startCommand = startCommand;
     }
+    get overlay() {
+        return this.commandController?.nonDestroyableOverlay;
+    }
     static of() {
         return async (effects, imageId, command, options) => {
             const startCommand = () => CommandController.of()(effects, imageId, command, options);
@@ -33,7 +37,7 @@ export class Daemon {
                 timeoutCounter = Math.max(MAX_TIMEOUT_MS, timeoutCounter);
             }
         }).catch((err) => {
-            console.error(err);
+            console.error(asError(err));
         });
     }
     async term(termOptions) {
@@ -42,8 +46,8 @@ export class Daemon {
     async stop(termOptions) {
         this.shouldBeRunning = false;
         await this.commandController
-            ?.term(termOptions)
-            .catch((e) => console.error(e));
+            ?.term({ ...termOptions })
+            .catch((e) => console.error(asError(e)));
         this.commandController = null;
     }
 }

package/mjs/lib/mainFn/Daemon.js.map

@@ -1 +1 @@
-{"version":3,"file":"Daemon.js","sourceRoot":"","sources":["../../../../lib/mainFn/Daemon.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,MAAM,oBAAoB,GAAG,IAAI,CAAA;AACjC,MAAM,cAAc,GAAG,KAAK,CAAA;AAC5B;;;GAGG;AAEH,MAAM,OAAO,MAAM;IAGW;IAFpB,iBAAiB,GAA6B,IAAI,CAAA;IAClD,eAAe,GAAG,KAAK,CAAA;IAC/B,YAA4B,YAA8C;QAA9C,iBAAY,GAAZ,YAAY,CAAkC;IAAG,CAAC;IAC9E,MAAM,CAAC,EAAE;QACP,OAAO,KAAK,EACV,OAAkB,EAClB,OAGC,EACD,OAAsB,EACtB,OAaC,EACD,EAAE;YACF,MAAM,YAAY,GAAG,GAAG,EAAE,CACxB,iBAAiB,CAAC,EAAE,EAAY,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;YACtE,OAAO,IAAI,MAAM,CAAC,YAAY,CAAC,CAAA;QACjC,CAAC,CAAA;IACH,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1B,OAAM;SACP;QACD,IAAI,CAAC,eAAe,GAAG,IAAI,CAAA;QAC3B,IAAI,cAAc,GAAG,CAAC,CAAA;QACtB,IAAI,OAAO,CAAC,KAAK,IAAI,EAAE;YACrB,OAAO,IAAI,CAAC,eAAe,EAAE;gBAC3B,IAAI,CAAC,iBAAiB,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAA;gBAClD,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;gBACtE,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAA;gBACnE,cAAc,IAAI,oBAAoB,CAAA;gBACtC,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA;aAC1D;QACH,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACf,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACpB,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,WAGV;QACC,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAC/B,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,WAGV;QACC,IAAI,CAAC,eAAe,GAAG,KAAK,CAAA;QAC5B,MAAM,IAAI,CAAC,iBAAiB;YAC1B,EAAE,IAAI,CAAC,WAAW,CAAC;aAClB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QACjC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAA;IAC/B,CAAC;CACF"}
+{"version":3,"file":"Daemon.js","sourceRoot":"","sources":["../../../../lib/mainFn/Daemon.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAEzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,MAAM,oBAAoB,GAAG,IAAI,CAAA;AACjC,MAAM,cAAc,GAAG,KAAK,CAAA;AAC5B;;;GAGG;AAEH,MAAM,OAAO,MAAM;IAGG;IAFZ,iBAAiB,GAA6B,IAAI,CAAA;IAClD,eAAe,GAAG,KAAK,CAAA;IAC/B,YAAoB,YAA8C;QAA9C,iBAAY,GAAZ,YAAY,CAAkC;IAAG,CAAC;IACtE,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,iBAAiB,EAAE,qBAAqB,CAAA;IACtD,CAAC;IACD,MAAM,CAAC,EAAE;QACP,OAAO,KAAK,EACV,OAAkB,EAClB,OAGC,EACD,OAAsB,EACtB,OAaC,EACD,EAAE;YACF,MAAM,YAAY,GAAG,GAAG,EAAE,CACxB,iBAAiB,CAAC,EAAE,EAAY,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;YACtE,OAAO,IAAI,MAAM,CAAC,YAAY,CAAC,CAAA;QACjC,CAAC,CAAA;IACH,CAAC;IACD,KAAK,CAAC,KAAK;QACT,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1B,OAAM;SACP;QACD,IAAI,CAAC,eAAe,GAAG,IAAI,CAAA;QAC3B,IAAI,cAAc,GAAG,CAAC,CAAA;QACtB,IAAI,OAAO,CAAC,KAAK,IAAI,EAAE;YACrB,OAAO,IAAI,CAAC,eAAe,EAAE;gBAC3B,IAAI,CAAC,iBAAiB,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAA;gBAClD,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;gBACtE,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAA;gBACnE,cAAc,IAAI,oBAAoB,CAAA;gBACtC,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA;aAC1D;QACH,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACf,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;QAC7B,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,WAGV;QACC,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAC/B,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,WAGV;QACC,IAAI,CAAC,eAAe,GAAG,KAAK,CAAA;QAC5B,MAAM,IAAI,CAAC,iBAAiB;YAC1B,EAAE,IAAI,CAAC,EAAE,GAAG,WAAW,EAAE,CAAC;aACzB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1C,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAA;IAC/B,CAAC;CACF"}

package/mjs/lib/mainFn/Daemons.d.ts

@@ -6,7 +6,7 @@ import { HealthCheckResult } from "../health/checkFns";
 import { Trigger } from "../trigger";
 import * as T from "../types";
 import { Mounts } from "./Mounts";
-import { MountOptions, Overlay } from "../util/Overlay";
+import { MountOptions } from "../util/Overlay";
 import * as CP from "node:child_process";
 export { Daemon } from "./Daemon";
 export { CommandController } from "./CommandController";
@@ -42,7 +42,7 @@ export declare const runCommand: <Manifest extends T.Manifest>() => <A extends s
         path: string;
         options: MountOptions;
     }[] | undefined;
-    overlay?: Overlay | undefined;
+    overlay?: import("../util/Overlay").ExecSpawnable | undefined;
     env?: {
         [variable: string]: string;
     } | undefined;