@start9labs/start-sdk 0.3.6-alpha1 → 0.3.6-alpha3

package/cjs/lib/test/output.sdk.d.ts

@@ -55,8 +55,6 @@ export declare const sdk: {
         }, infer Value> ? Value : never) => Promise<void>;
     };
     host: {
-        static: (effects: import("../types").Effects, id: string) => import("../interfaces/Host").StaticHost;
-        single: (effects: import("../types").Effects, id: string) => import("../interfaces/Host").SingleHost;
         multi: (effects: import("../types").Effects, id: string) => import("../interfaces/Host").MultiHost;
     };
     nullIfEmpty: typeof import("../util/nullIfEmpty").default;
@@ -98,7 +96,7 @@ export declare const sdk: {
             long: string;
         };
         containers: {};
-        images: never[];
+        images: {};
         volumes: never[];
         assets: never[];
         alerts: {
@@ -185,7 +183,7 @@ export declare const sdk: {
             long: string;
         };
         containers: {};
-        images: never[];
+        images: {};
         volumes: never[];
         assets: never[];
         alerts: {
@@ -225,7 +223,7 @@ export declare const sdk: {
                 long: string;
             };
             containers: {};
-            images: never[];
+            images: {};
             volumes: never[];
             assets: never[];
             alerts: {
@@ -291,7 +289,7 @@ export declare const sdk: {
             long: string;
         };
         containers: {};
-        images: never[];
+        images: {};
         volumes: never[];
         assets: never[];
         alerts: {
@@ -333,7 +331,7 @@ export declare const sdk: {
             long: string;
         };
         containers: {};
-        images: never[];
+        images: {};
         volumes: never[];
         assets: never[];
         alerts: {
@@ -375,7 +373,7 @@ export declare const sdk: {
             long: string;
         };
         containers: {};
-        images: never[];
+        images: {};
         volumes: never[];
         assets: never[];
         alerts: {
@@ -413,7 +411,7 @@ export declare const sdk: {
             long: string;
         };
         containers: {};
-        images: never[];
+        images: {};
         volumes: never[];
         assets: never[];
         alerts: {
@@ -458,7 +456,7 @@ export declare const sdk: {
                 long: string;
             };
             containers: {};
-            images: never[];
+            images: {};
             volumes: never[];
             assets: never[];
             alerts: {
@@ -509,7 +507,7 @@ export declare const sdk: {
             long: string;
         };
         containers: {};
-        images: never[];
+        images: {};
         volumes: never[];
         assets: never[];
         alerts: {
@@ -547,7 +545,7 @@ export declare const sdk: {
             long: string;
         };
         containers: {};
-        images: never[];
+        images: {};
         volumes: never[];
         assets: never[];
         alerts: {
@@ -585,7 +583,7 @@ export declare const sdk: {
             long: string;
         };
         containers: {};
-        images: never[];
+        images: {};
         volumes: never[];
         assets: never[];
         alerts: {
@@ -623,7 +621,7 @@ export declare const sdk: {
             long: string;
         };
         containers: {};
-        images: never[];
+        images: {};
         volumes: never[];
         assets: never[];
         alerts: {
@@ -668,7 +666,7 @@ export declare const sdk: {
             long: string;
         };
         containers: {};
-        images: never[];
+        images: {};
         volumes: never[];
         assets: never[];
         alerts: {
@@ -706,7 +704,7 @@ export declare const sdk: {
             long: string;
         };
         containers: {};
-        images: never[];
+        images: {};
         volumes: never[];
         assets: never[];
         alerts: {
@@ -749,7 +747,7 @@ export declare const sdk: {
             long: string;
         };
         containers: {};
-        images: never[];
+        images: {};
         volumes: never[];
         assets: never[];
         alerts: {
@@ -787,7 +785,7 @@ export declare const sdk: {
             long: string;
         };
         containers: {};
-        images: never[];
+        images: {};
         volumes: never[];
         assets: never[];
         alerts: {
@@ -829,7 +827,7 @@ export declare const sdk: {
             long: string;
         };
         containers: {};
-        images: never[];
+        images: {};
         volumes: never[];
         assets: never[];
         alerts: {
@@ -864,7 +862,7 @@ export declare const sdk: {
             long: string;
         };
         containers: {};
-        images: never[];
+        images: {};
         volumes: never[];
         assets: never[];
         alerts: {
@@ -902,7 +900,7 @@ export declare const sdk: {
             long: string;
         };
         containers: {};
-        images: never[];
+        images: {};
         volumes: never[];
         assets: never[];
         alerts: {
@@ -926,7 +924,7 @@ export declare const sdk: {
     }>;
     setupProperties: (fn: (options: {
         effects: import("../types").Effects;
-    }) => Promise<import("../types").SdkPropertiesReturn>) => import("../types").ExpectedExports.Properties;
+    }) => Promise<import("../types").SdkPropertiesReturn>) => import("../types").ExpectedExports.properties;
     setupUninstall: (fn: import("../inits/setupUninstall").UninstallFn<{
         id: "testOutput";
         title: string;
@@ -944,7 +942,7 @@ export declare const sdk: {
             long: string;
         };
         containers: {};
-        images: never[];
+        images: {};
         volumes: never[];
         assets: never[];
         alerts: {
@@ -982,7 +980,7 @@ export declare const sdk: {
             long: string;
         };
         containers: {};
-        images: never[];
+        images: {};
         volumes: never[];
         assets: never[];
         alerts: {
@@ -1028,7 +1026,7 @@ export declare const sdk: {
                 long: string;
             };
             containers: {};
-            images: never[];
+            images: {};
             volumes: never[];
             assets: never[];
             alerts: {
@@ -1065,7 +1063,7 @@ export declare const sdk: {
                 long: string;
             };
             containers: {};
-            images: never[];
+            images: {};
             volumes: never[];
             assets: never[];
             alerts: {
@@ -1126,7 +1124,7 @@ export declare const sdk: {
                 long: string;
             };
             containers: {};
-            images: never[];
+            images: {};
             volumes: never[];
             assets: never[];
             alerts: {
@@ -1175,7 +1173,7 @@ export declare const sdk: {
                 long: string;
             };
             containers: {};
-            images: never[];
+            images: {};
             volumes: never[];
             assets: never[];
             alerts: {
@@ -1303,7 +1301,7 @@ export declare const sdk: {
                 long: string;
             };
             containers: {};
-            images: never[];
+            images: {};
             volumes: never[];
             assets: never[];
             alerts: {

package/cjs/lib/test/output.sdk.js

@@ -21,7 +21,7 @@ exports.sdk = StartSdk_1.StartSdk.of()
         long: "",
     },
     containers: {},
-    images: [],
+    images: {},
     volumes: [],
     assets: [],
     alerts: {

package/cjs/lib/test/startosTypeValidation.test.js

@@ -35,7 +35,6 @@ describe("startosTypeValidation ", () => {
             removeAddress: {},
             exportAction: {},
             removeAction: {},
-            reverseProxy: {},
             mount: {},
             checkDependencies: {},
             getDependencies: undefined,

package/cjs/lib/test/startosTypeValidation.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"startosTypeValidation.test.js","sourceRoot":"","sources":["../../../../lib/test/startosTypeValidation.test.ts"],"names":[],"mappings":";;AA6BA,SAAS,YAAY,CAAe,EAAgB,IAAG,CAAC;AACxD,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACtC,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACrC,MAAM,SAAS,GAAQ,EAAE,CAAA;QACzB,YAAY,CAIT;YACD,aAAa,EAAE,EAAmB;YAClC,oBAAoB,EAAE,EAAgC;YACtD,qBAAqB,EAAE,EAAiC;YACxD,aAAa,EAAE,SAAS;YACxB,IAAI,EAAE,EAAgB;YACtB,WAAW,EAAE,EAAuB;YACpC,MAAM,EAAE,EAAqB;YAC7B,aAAa,EAAE,SAAS;YACxB,OAAO,EAAE,EAA0B;YACnC,OAAO,EAAE,EAAqB;YAC9B,OAAO,EAAE,SAAS;YAClB,QAAQ,EAAE,SAAS;YACnB,aAAa,EAAE,EAAmB;YAClC,SAAS,EAAE,EAAe;YAC1B,mBAAmB,EAAE,EAA+B;YACpD,iBAAiB,EAAE,EAA6B;YAChD,SAAS,EAAE,EAAqB;YAChC,mBAAmB,EAAE,EAA+B;YACpD,eAAe,EAAE,EAA2B;YAC5C,KAAK,EAAE,EAAW;YAClB,aAAa,EAAE,EAAyB;YACxC,cAAc,EAAE,SAAS;YACzB,qBAAqB,EAAE,EAAiC;YACxD,sBAAsB,EAAE,SAAS;YACjC,sBAAsB,EAAE,EAAkC;YAC1D,aAAa,EAAE,EAAyB;YACxC,qBAAqB,EAAE,EAAiC;YACxD,aAAa,EAAE,EAAyB;YACxC,YAAY,EAAE,EAAwB;YACtC,YAAY,EAAE,EAAwB;YACtC,YAAY,EAAE,EAAwB;YACtC,KAAK,EAAE,EAAiB;YACxB,iBAAiB,EAAE,EAA4B;YAC/C,eAAe,EAAE,SAAS;YAC1B,aAAa,EAAE,EAAmB;SACnC,CAAC,CAAA;QACF,YAAY,CACV,SAA0B,CAC3B,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"startosTypeValidation.test.js","sourceRoot":"","sources":["../../../../lib/test/startosTypeValidation.test.ts"],"names":[],"mappings":";;AA4BA,SAAS,YAAY,CAAe,EAAgB,IAAG,CAAC;AACxD,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACtC,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACrC,MAAM,SAAS,GAAQ,EAAE,CAAA;QACzB,YAAY,CAIT;YACD,aAAa,EAAE,EAAmB;YAClC,oBAAoB,EAAE,EAAgC;YACtD,qBAAqB,EAAE,EAAiC;YACxD,aAAa,EAAE,SAAS;YACxB,IAAI,EAAE,EAAgB;YACtB,WAAW,EAAE,EAAuB;YACpC,MAAM,EAAE,EAAqB;YAC7B,aAAa,EAAE,SAAS;YACxB,OAAO,EAAE,EAA0B;YACnC,OAAO,EAAE,EAAqB;YAC9B,OAAO,EAAE,SAAS;YAClB,QAAQ,EAAE,SAAS;YACnB,aAAa,EAAE,EAAmB;YAClC,SAAS,EAAE,EAAe;YAC1B,mBAAmB,EAAE,EAA+B;YACpD,iBAAiB,EAAE,EAA6B;YAChD,SAAS,EAAE,EAAqB;YAChC,mBAAmB,EAAE,EAA+B;YACpD,eAAe,EAAE,EAA2B;YAC5C,KAAK,EAAE,EAAW;YAClB,aAAa,EAAE,EAAyB;YACxC,cAAc,EAAE,SAAS;YACzB,qBAAqB,EAAE,EAAiC;YACxD,sBAAsB,EAAE,SAAS;YACjC,sBAAsB,EAAE,EAAkC;YAC1D,aAAa,EAAE,EAAyB;YACxC,qBAAqB,EAAE,EAAiC;YACxD,aAAa,EAAE,EAAyB;YACxC,YAAY,EAAE,EAAwB;YACtC,YAAY,EAAE,EAAwB;YACtC,KAAK,EAAE,EAAiB;YACxB,iBAAiB,EAAE,EAA4B;YAC/C,eAAe,EAAE,SAAS;YAC1B,aAAa,EAAE,EAAmB;SACnC,CAAC,CAAA;QACF,YAAY,CACV,SAA0B,CAC3B,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/cjs/lib/types.d.ts

@@ -1,9 +1,8 @@
 export * as configTypes from "./config/configTypes";
-import { DependencyRequirement, SetHealth, HealthCheckResult, SetMainStatus } from "./osBindings";
-import { MainEffects, ServiceInterfaceType, Signals } from "./StartSdk";
+import { DependencyRequirement, SetHealth, HealthCheckResult, SetMainStatus, ServiceInterface, Host, ExportServiceInterfaceParams, GetPrimaryUrlParams, LanInfo, BindParams, Manifest } from "./osBindings";
+import { MainEffects, Signals } from "./StartSdk";
 import { InputSpec } from "./config/configTypes";
 import { DependenciesReceipt } from "./config/setupConfig";
-import { BindOptions } from "./interfaces/Host";
 import { Daemons } from "./mainFn/Daemons";
 import { StorePath } from "./store/PathBuilder";
 import { ExposedStorePaths } from "./store/setupExposeStore";
@@ -86,10 +85,26 @@ export declare namespace ExpectedExports {
      * that this service could use.
      */
     type dependencyConfig = Record<PackageId, DependencyConfig | null>;
-    type Properties = (options: {
+    type properties = (options: {
         effects: Effects;
     }) => Promise<PropertiesReturn>;
+    type manifest = Manifest;
 }
+export type ABI = {
+    setConfig: ExpectedExports.setConfig;
+    getConfig: ExpectedExports.getConfig;
+    createBackup: ExpectedExports.createBackup;
+    restoreBackup: ExpectedExports.restoreBackup;
+    actions: ExpectedExports.actions;
+    actionsMetadata: ExpectedExports.actionsMetadata;
+    main: ExpectedExports.main;
+    afterShutdown: ExpectedExports.afterShutdown;
+    init: ExpectedExports.init;
+    uninit: ExpectedExports.uninit;
+    dependencyConfig: ExpectedExports.dependencyConfig;
+    properties: ExpectedExports.properties;
+    manifest: ExpectedExports.manifest;
+};
 export type TimeMs = number;
 export type VersionString = string;
 /**
@@ -155,13 +170,6 @@ export declare const hostName: unique symbol;
 export type Hostname = string & {
     [hostName]: never;
 };
-/** ${scheme}://${username}@${host}:${externalPort}${suffix} */
-export type AddressInfo = {
-    username: string | null;
-    hostId: string;
-    bindOptions: BindOptions;
-    suffix: string;
-};
 export type HostnameInfoIp = {
     kind: "ip";
     networkInterfaceId: string;
@@ -188,38 +196,8 @@ export type HostnameInfoOnion = {
     };
 };
 export type HostnameInfo = HostnameInfoIp | HostnameInfoOnion;
-export type SingleHost = {
-    id: string;
-    kind: "single" | "static";
-    hostname: HostnameInfo | null;
-};
-export type MultiHost = {
-    id: string;
-    kind: "multi";
-    hostnames: HostnameInfo[];
-};
-export type HostInfo = SingleHost | MultiHost;
 export type ServiceInterfaceId = string;
-export type ServiceInterface = {
-    id: ServiceInterfaceId;
-    /** The title of this field to be displayed */
-    name: string;
-    /** Human readable description, used as tooltip usually */
-    description: string;
-    /** Whether or not one address must be the primary address */
-    hasPrimary: boolean;
-    /** Disabled interfaces do not serve, but they retain their metadata and addresses */
-    disabled: boolean;
-    /** Whether or not to mask the URIs for this interface. Useful if the URIs contain sensitive information, such as a password, macaroon, or API key */
-    masked: boolean;
-    /** URI Information */
-    addressInfo: AddressInfo;
-    /** The network interface could be several types, something like ui, p2p, or network */
-    type: ServiceInterfaceType;
-};
-export type ServiceInterfaceWithHostInfo = ServiceInterface & {
-    hostInfo: HostInfo;
-};
+export { ServiceInterface };
 export type ExposeServicePaths<Store = never> = {
     /** The path to the value in the Store. [JsonPath](https://jsonpath.com/)  */
     paths: ExposedStorePaths;
@@ -285,18 +263,13 @@ export type Effects = {
     /** Removes all network bindings */
     clearBindings(): Promise<void>;
     /** Creates a host connected to the specified port with the provided options */
-    bind(options: {
-        kind: "static" | "single" | "multi";
-        id: string;
-        internalPort: number;
-    } & BindOptions): Promise<void>;
+    bind(options: BindParams): Promise<void>;
     /** Retrieves the current hostname(s) associated with a host id */
     getHostInfo(options: {
-        kind: "multi" | null;
-        serviceInterfaceId: string;
+        hostId: string;
         packageId: string | null;
         callback: () => void;
-    }): Promise<MultiHost>;
+    }): Promise<Host>;
     store: {
         /** Get a value in a json like data, can be observed and subscribed */
         get<Store = never, ExtractStore = unknown>(options: {
@@ -325,13 +298,13 @@ export type Effects = {
     getServicePortForward(options: {
         internalPort: number;
         packageId: string | null;
-    }): Promise<number>;
+    }): Promise<LanInfo>;
     /** Removes all network interfaces */
     clearServiceInterfaces(): Promise<void>;
     /** When we want to create a link in the front end interfaces, and example is
      * exposing a url to view a web service
      */
-    exportServiceInterface(options: ServiceInterface): Promise<string>;
+    exportServiceInterface(options: ExportServiceInterfaceParams): Promise<string>;
     exposeForDependents(options: {
         paths: string[];
     }): Promise<void>;
@@ -350,11 +323,7 @@ export type Effects = {
      * The user sets the primary url for a interface
      * @param options
      */
-    getPrimaryUrl(options: {
-        packageId: PackageId | null;
-        serviceInterfaceId: ServiceInterfaceId;
-        callback: () => void;
-    }): Promise<UrlString | null>;
+    getPrimaryUrl(options: GetPrimaryUrlParams): Promise<UrlString | null>;
     /**
      * There are times that we want to see the addresses that where exported
      * @param options.addressId If we want to filter the address id
@@ -364,7 +333,7 @@ export type Effects = {
     listServiceInterfaces(options: {
         packageId: PackageId | null;
         callback: () => void;
-    }): Promise<ServiceInterface[]>;
+    }): Promise<Record<ServiceInterfaceId, ServiceInterface>>;
     /**
      *Remove an address that was exported. Used problably during main or during setConfig.
      * @param options
@@ -432,26 +401,6 @@ export type Effects = {
     running(options: {
         packageId: PackageId;
     }): Promise<boolean>;
-    /** Instead of creating proxies with nginx, we have a utility to create and maintain a proxy in the lifetime of this running. */
-    reverseProxy(options: {
-        bind: {
-            /** Optional, default is 0.0.0.0 */
-            ip: string | null;
-            port: number;
-            ssl: boolean;
-        };
-        dst: {
-            /** Optional: default is 127.0.0.1 */
-            ip: string | null;
-            port: number;
-            ssl: boolean;
-        };
-        http: {
-            headers: Record<string, string> | null;
-        } | null;
-    }): Promise<{
-        stop(): Promise<void>;
-    }>;
     restart(): void;
     shutdown(): void;
     mount(options: {

package/cjs/lib/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../lib/types.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oEAAmD;AAiBnD,+CAA4B;AAS5B,IAAiB,eAAe,CAmF/B;AAnFD,WAAiB,eAAe;IAC9B,OAAO,EAAE,CAAC,CAAA;AAkFZ,CAAC,EAnFgB,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAmF/B"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../lib/types.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oEAAmD;AAwBnD,+CAA4B;AAS5B,IAAiB,eAAe,CAqF/B;AArFD,WAAiB,eAAe;IAC9B,OAAO,EAAE,CAAC,CAAA;AAoFZ,CAAC,EArFgB,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAqF/B"}

package/cjs/lib/util/Hostname.d.ts

@@ -0,0 +1,2 @@
+import { HostnameInfo } from "../types";
+export declare function hostnameInfoToAddress(hostInfo: HostnameInfo): string;

package/cjs/lib/util/Hostname.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hostnameInfoToAddress = void 0;
+function hostnameInfoToAddress(hostInfo) {
+    if (hostInfo.kind === "onion") {
+        return `${hostInfo.hostname.value}`;
+    }
+    if (hostInfo.kind !== "ip") {
+        throw Error("Expecting that the kind is ip.");
+    }
+    const hostname = hostInfo.hostname;
+    if (hostname.kind === "domain") {
+        return `${hostname.subdomain ? `${hostname.subdomain}.` : ""}${hostname.domain}`;
+    }
+    const port = hostname.sslPort || hostname.port;
+    const portString = port ? `:${port}` : "";
+    if ("ipv4" === hostname.kind || "ipv6" === hostname.kind) {
+        return `${hostname.value}${portString}`;
+    }
+    if ("local" === hostname.kind) {
+        return `${hostname.value}${portString}`;
+    }
+    throw Error("Expecting to have a valid hostname kind." + JSON.stringify(hostname));
+}
+exports.hostnameInfoToAddress = hostnameInfoToAddress;
+//# sourceMappingURL=Hostname.js.map

package/cjs/lib/util/Hostname.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Hostname.js","sourceRoot":"","sources":["../../../../lib/util/Hostname.ts"],"names":[],"mappings":";;;AAEA,SAAgB,qBAAqB,CAAC,QAAsB;IAC1D,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE;QAC7B,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAA;KACpC;IACD,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI,EAAE;QAC1B,MAAM,KAAK,CAAC,gCAAgC,CAAC,CAAA;KAC9C;IACD,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAA;IAClC,IAAI,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE;QAC9B,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAA;KACjF;IACD,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAA;IAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IACzC,IAAI,MAAM,KAAK,QAAQ,CAAC,IAAI,IAAI,MAAM,KAAK,QAAQ,CAAC,IAAI,EAAE;QACxD,OAAO,GAAG,QAAQ,CAAC,KAAK,GAAG,UAAU,EAAE,CAAA;KACxC;IACD,IAAI,OAAO,KAAK,QAAQ,CAAC,IAAI,EAAE;QAC7B,OAAO,GAAG,QAAQ,CAAC,KAAK,GAAG,UAAU,EAAE,CAAA;KACxC;IACD,MAAM,KAAK,CACT,0CAA0C,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CACtE,CAAA;AACH,CAAC;AAtBD,sDAsBC"}

package/cjs/lib/util/Overlay.d.ts

@@ -7,12 +7,12 @@ import { Buffer } from "node:buffer";
 export declare const execFile: typeof cp.execFile.__promisify__;
 export declare class Overlay {
     readonly effects: T.Effects;
-    readonly imageId: string;
+    readonly imageId: T.ImageId;
     readonly rootfs: string;
-    readonly guid: string;
+    readonly guid: T.Guid;
     private constructor();
     static of(effects: T.Effects, image: {
-        id: string;
+        id: T.ImageId;
         sharedRun?: boolean;
     }): Promise<Overlay>;
     mount(options: MountOptions, path: string): Promise<Overlay>;

package/cjs/lib/util/Overlay.js

@@ -38,8 +38,10 @@ class Overlay {
         this.guid = guid;
     }
     static async of(effects, image) {
-        const { id: imageId, sharedRun } = image;
-        const [rootfs, guid] = await effects.createOverlayedImage({ imageId });
+        const { id, sharedRun } = image;
+        const [rootfs, guid] = await effects.createOverlayedImage({
+            imageId: id,
+        });
         const shared = ["dev", "sys", "proc"];
         if (!!sharedRun) {
             shared.push("run");
@@ -52,7 +54,7 @@ class Overlay {
                 `${rootfs}/${dirPart}`,
             ]);
         }
-        return new Overlay(effects, imageId, rootfs, guid);
+        return new Overlay(effects, id, rootfs, guid);
     }
     async mount(options, path) {
         path = path.startsWith("/")

package/cjs/lib/util/Overlay.js.map

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

package/cjs/lib/util/fileHelper.d.ts

@@ -52,6 +52,7 @@ export declare class FileHelper<A> {
     protected constructor(path: string, writeData: (dataIn: A) => string, readData: (stringValue: string) => A);
     write(data: A, effects: T.Effects): Promise<void>;
     read(effects: T.Effects): Promise<A | null>;
+    merge(data: A, effects: T.Effects): Promise<void>;
     /**
      * Create a File Helper for an arbitrary file type.
      *

package/cjs/lib/util/fileHelper.js

@@ -22,11 +22,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileHelper = void 0;
 const YAML = __importStar(require("yaml"));
 const TOML = __importStar(require("@iarna/toml"));
-const fs = __importStar(require("fs"));
+const lodash_1 = __importDefault(require("lodash"));
+const fs = __importStar(require("node:fs/promises"));
 const previousPath = /(.+?)\/([^/]*)$/;
 /**
  * Used in the get config and the set config exported functions.
@@ -80,16 +84,22 @@ class FileHelper {
         this.readData = readData;
     }
     async write(data, effects) {
-        if (previousPath.exec(this.path)) {
-            await new Promise((resolve, reject) => fs.mkdir(this.path, (err) => (!err ? resolve(null) : reject(err))));
+        const parent = previousPath.exec(this.path);
+        if (parent) {
+            await fs.mkdir(parent[1], { recursive: true });
         }
-        await new Promise((resolve, reject) => fs.writeFile(this.path, this.writeData(data), (err) => !err ? resolve(null) : reject(err)));
+        await fs.writeFile(this.path, this.writeData(data));
     }
     async read(effects) {
-        if (!fs.existsSync(this.path)) {
+        if (!(await fs.access(this.path).then(() => true, () => false))) {
             return null;
         }
-        return this.readData(await new Promise((resolve, reject) => fs.readFile(this.path, (err, data) => !err ? resolve(data.toString("utf-8")) : reject(err))));
+        return this.readData(await fs.readFile(this.path).then((data) => data.toString("utf-8")));
+    }
+    async merge(data, effects) {
+        const fileData = (await this.read(effects).catch(() => ({}))) || {};
+        const mergeData = lodash_1.default.merge({}, fileData, data);
+        return await this.write(mergeData, effects);
     }
     /**
      * Create a File Helper for an arbitrary file type.
@@ -124,7 +134,7 @@ class FileHelper {
      */
     static yaml(path, shape) {
         return new FileHelper(path, (inData) => {
-            return JSON.stringify(inData, null, 2);
+            return YAML.stringify(inData, null, 2);
         }, (inString) => {
             return shape.unsafeCast(YAML.parse(inString));
         });

package/cjs/lib/util/fileHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"fileHelper.js","sourceRoot":"","sources":["../../../../lib/util/fileHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,2CAA4B;AAC5B,kDAAmC;AAEnC,uCAAwB;AAExB,MAAM,YAAY,GAAG,iBAAiB,CAAA;AAEtC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,MAAa,UAAU;IACrB,YACW,IAAY,EACZ,SAAgC,EAChC,QAAoC;QAFpC,SAAI,GAAJ,IAAI,CAAQ;QACZ,cAAS,GAAT,SAAS,CAAuB;QAChC,aAAQ,GAAR,QAAQ,CAA4B;IAC5C,CAAC;IACJ,KAAK,CAAC,KAAK,CAAC,IAAO,EAAE,OAAkB;QACrC,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAChC,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CACpC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CACxE,CAAA;SACF;QAED,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CACpC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CACzD,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CACnC,CACF,CAAA;IACH,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,OAAkB;QAC3B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC7B,OAAO,IAAI,CAAA;SACZ;QACD,OAAO,IAAI,CAAC,QAAQ,CAClB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CACpC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAQ,EAAE,IAAS,EAAE,EAAE,CAC7C,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CACrD,CACF,CACF,CAAA;IACH,CAAC;IACD;;;;OAIG;IACH,MAAM,CAAC,GAAG,CACR,IAAY,EACZ,MAA6B,EAC7B,QAAgC;QAEhC,OAAO,IAAI,UAAU,CAAI,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;IAClD,CAAC;IACD;;OAEG;IACH,MAAM,CAAC,IAAI,CAAI,IAAY,EAAE,KAAoC;QAC/D,OAAO,IAAI,UAAU,CACnB,IAAI,EACJ,CAAC,MAAM,EAAE,EAAE;YACT,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QACxC,CAAC,EACD,CAAC,QAAQ,EAAE,EAAE;YACX,OAAO,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC/C,CAAC,CACF,CAAA;IACH,CAAC;IACD;;OAEG;IACH,MAAM,CAAC,IAAI,CACT,IAAY,EACZ,KAAoC;QAEpC,OAAO,IAAI,UAAU,CACnB,IAAI,EACJ,CAAC,MAAM,EAAE,EAAE;YACT,OAAO,IAAI,CAAC,SAAS,CAAC,MAAa,CAAC,CAAA;QACtC,CAAC,EACD,CAAC,QAAQ,EAAE,EAAE;YACX,OAAO,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC/C,CAAC,CACF,CAAA;IACH,CAAC;IACD;;OAEG;IACH,MAAM,CAAC,IAAI,CACT,IAAY,EACZ,KAAoC;QAEpC,OAAO,IAAI,UAAU,CACnB,IAAI,EACJ,CAAC,MAAM,EAAE,EAAE;YACT,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QACxC,CAAC,EACD,CAAC,QAAQ,EAAE,EAAE;YACX,OAAO,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC/C,CAAC,CACF,CAAA;IACH,CAAC;CACF;AA3FD,gCA2FC;AAED,kBAAe,UAAU,CAAA"}
+{"version":3,"file":"fileHelper.js","sourceRoot":"","sources":["../../../../lib/util/fileHelper.ts"],"names":[],"mappings":"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"}