k8ts 0.8.1 → 0.9.2

package/dist/resources/persistent/volume/pv.js

@@ -1,110 +1,57 @@
 "use strict";
-var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
-    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
-    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _, done = false;
-    for (var i = decorators.length - 1; i >= 0; i--) {
-        var context = {};
-        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
-        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
-        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
-        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
-        if (kind === "accessor") {
-            if (result === void 0) continue;
-            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-            if (_ = accept(result.get)) descriptor.get = _;
-            if (_ = accept(result.set)) descriptor.set = _;
-            if (_ = accept(result.init)) initializers.unshift(_);
-        }
-        else if (_ = accept(result)) {
-            if (kind === "field") initializers.unshift(_);
-            else descriptor[key] = _;
-        }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-};
-var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i = 0; i < initializers.length; i++) {
-        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
-    }
-    return useValue ? value : void 0;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Pv = void 0;
 const instruments_1 = require("@k8ts/instruments");
-const _imports_1 = require("../../../_imports");
+const sample_interfaces_1 = require("@k8ts/sample-interfaces");
 const error_1 = require("../../../error");
-const kind_map_1 = require("../../../kind-map");
-const kinds_1 = require("../../../kinds");
-const equiv_cdk8s_1 = require("../../../node/equiv-cdk8s");
-const manifest_resource_1 = require("../../../node/manifest-resource");
+const default_1 = require("../../../kinds/default");
+const storage_1 = require("../../../kinds/storage");
 const access_mode_1 = require("../access-mode");
 const parse_backend_1 = require("./parse-backend");
-var Pv;
-(function (Pv_1) {
-    let Pv = (() => {
-        let _classDecorators = [(0, equiv_cdk8s_1.equiv_cdk8s)(_imports_1.CDK.KubePersistentVolume), (0, instruments_1.manifest)({
-                body(self) {
-                    const pvProps = self.props;
-                    const accessModes = access_mode_1.Access.parse(pvProps.$accessModes);
-                    if (self.props.$backend?.type === "Local") {
-                        if (!pvProps.nodeAffinity) {
-                            throw new error_1.MakeError(`While manifesting ${self.node.format("source")}, PV with Local backend must have nodeAffinity.`);
-                        }
-                    }
-                    if (!self.props.$backend && !self.props.$storageClass) {
-                        throw new error_1.MakeError(`While manifesting ${self.node.format("source")}, PV that doesn't have a $backend must have a $storageClass.`);
-                    }
-                    let base = {
-                        accessModes,
-                        storageClassName: pvProps.$storageClass?.name ?? "standard",
-                        capacity: pvProps.$capacity
-                            ? {
-                                storage: _imports_1.CDK.Quantity.fromString(pvProps.$capacity)
-                            }
-                            : undefined,
-                        volumeMode: pvProps.$mode ?? "Filesystem",
-                        mountOptions: pvProps.mountOptions,
-                        persistentVolumeReclaimPolicy: pvProps.reclaimPolicy ?? "Retain",
-                        nodeAffinity: pvProps.nodeAffinity
-                    };
-                    base = {
-                        ...base,
-                        ...(0, parse_backend_1.parseBackend)(pvProps.$backend)
-                    };
-                    return {
-                        spec: base
-                    };
-                }
-            }), (0, kind_map_1.k8ts)(kinds_1.api.v1_.PersistentVolume), (0, instruments_1.relations)({
-                needs(self) {
-                    return {
-                        storageClass: self.props.$storageClass
-                    };
-                }
-            })];
-        let _classDescriptor;
-        let _classExtraInitializers = [];
-        let _classThis;
-        let _classSuper = manifest_resource_1.ManifestResource;
-        var Pv = class extends _classSuper {
-            static { _classThis = this; }
-            static {
-                const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-                __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
-                Pv = _classThis = _classDescriptor.value;
-                if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-                __runInitializers(_classThis, _classExtraInitializers);
+const StorageClassKind = storage_1.storage.v1.StorageClass._;
+class Pv extends instruments_1.Resource_Top {
+    __MODE__;
+    get kind() {
+        return default_1.v1.PersistentVolume._;
+    }
+    __needs__() {
+        return {
+            storageClass: this.props.$storageClass
+        };
+    }
+    body() {
+        const self = this;
+        const pvProps = self.props;
+        const accessModes = access_mode_1.Access.pv_parseAccessMode(pvProps.$accessModes);
+        if (self.props.$backend?.type === "Local") {
+            if (!pvProps.nodeAffinity) {
+                throw new error_1.MakeError(`While manifesting ${self.node.format("source")}, PV with Local backend must have nodeAffinity.`);
             }
-            __MODE__;
-            kind = kinds_1.api.v1_.PersistentVolume;
+        }
+        if (!self.props.$backend && !self.props.$storageClass) {
+            throw new error_1.MakeError(`While manifesting ${self.node.format("source")}, PV that doesn't have a $backend must have a $storageClass.`);
+        }
+        let base = {
+            accessModes,
+            storageClassName: pvProps.$storageClass?.name ?? "standard",
+            capacity: pvProps.$capacity
+                ? {
+                    storage: sample_interfaces_1.CDK.Quantity.fromString(pvProps.$capacity)
+                }
+                : undefined,
+            volumeMode: pvProps.$mode ?? "Filesystem",
+            mountOptions: pvProps.mountOptions,
+            persistentVolumeReclaimPolicy: pvProps.reclaimPolicy ?? "Retain",
+            nodeAffinity: pvProps.nodeAffinity
         };
-        return Pv = _classThis;
-    })();
-    Pv_1.Pv = Pv;
-})(Pv || (exports.Pv = Pv = {}));
+        base = {
+            ...base,
+            ...(0, parse_backend_1.parseBackend)(pvProps.$backend)
+        };
+        return {
+            spec: base
+        };
+    }
+}
+exports.Pv = Pv;
 //# sourceMappingURL=pv.js.map

package/dist/resources/persistent/volume/pv.js.map

@@ -1 +1 @@
-{"version":3,"file":"pv.js","sourceRoot":"","sources":["../../../../src/resources/persistent/volume/pv.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAA2E;AAC3E,gDAAuC;AACvC,0CAA0C;AAE1C,gDAAwC;AACxC,0CAAoC;AACpC,2DAAuD;AACvD,uEAAkE;AAClE,gDAAuC;AAGvC,mDAA8C;AAG9C,IAAiB,EAAE,CAmElB;AAnED,WAAiB,IAAE;QA+DF,EAAE;gCA/Cd,IAAA,yBAAW,EAAC,cAAG,CAAC,oBAAoB,CAAC,EACrC,IAAA,sBAAQ,EAAC;gBACN,IAAI,CAAC,IAAI;oBACL,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAA;oBAC1B,MAAM,WAAW,GAAG,oBAAM,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;oBACtD,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,KAAK,OAAO,EAAE,CAAC;wBACxC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;4BACxB,MAAM,IAAI,iBAAS,CACf,qBAAqB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,iDAAiD,CACnG,CAAA;wBACL,CAAC;oBACL,CAAC;oBACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;wBACpD,MAAM,IAAI,iBAAS,CACf,qBAAqB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,8DAA8D,CAChH,CAAA;oBACL,CAAC;oBACD,IAAI,IAAI,GAA6B;wBACjC,WAAW;wBACX,gBAAgB,EAAE,OAAO,CAAC,aAAa,EAAE,IAAI,IAAI,UAAU;wBAC3D,QAAQ,EAAE,OAAO,CAAC,SAAS;4BACvB,CAAC,CAAC;gCACI,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC;6BACtD;4BACH,CAAC,CAAC,SAAS;wBACf,UAAU,EAAE,OAAO,CAAC,KAAK,IAAI,YAAY;wBACzC,YAAY,EAAE,OAAO,CAAC,YAAY;wBAClC,6BAA6B,EAAE,OAAO,CAAC,aAAa,IAAI,QAAQ;wBAChE,YAAY,EAAE,OAAO,CAAC,YAAY;qBACrC,CAAA;oBACD,IAAI,GAAG;wBACH,GAAG,IAAI;wBACP,GAAG,IAAA,4BAAY,EAAC,OAAO,CAAC,QAAQ,CAAC;qBACpC,CAAA;oBACD,OAAO;wBACH,IAAI,EAAE,IAAI;qBACb,CAAA;gBACL,CAAC;aACJ,CAAC,EACD,IAAA,eAAI,EAAC,WAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAC9B,IAAA,uBAAS,EAAC;gBACP,KAAK,CAAC,IAAI;oBACN,OAAO;wBACH,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa;qBACzC,CAAA;gBACL,CAAC;aACJ,CAAC;;;;0BACwD,oCAAgB;sBAAxB,SAAQ,WAA6B;;;;gBAAvF,6KAGC;;;gBAHY,uDAAE;;YACX,QAAQ,CAAO;YACN,IAAI,GAAG,WAAG,CAAC,GAAG,CAAC,gBAAgB,CAAA;;;;IAF/B,OAAE,KAGd,CAAA;AACL,CAAC,EAnEgB,EAAE,kBAAF,EAAE,QAmElB"}
+{"version":3,"file":"pv.js","sourceRoot":"","sources":["../../../../src/resources/persistent/volume/pv.ts"],"names":[],"mappings":";;;AAAA,mDAK0B;AAC1B,+DAA6C;AAC7C,0CAA0C;AAC1C,oDAA2C;AAC3C,oDAAgD;AAChD,gDAAuC;AAEvC,mDAA8C;AAE9C,MAAM,gBAAgB,GAAG,iBAAO,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAA;AAkClD,MAAa,EAGX,SAAQ,0BAAuC;IAC7C,QAAQ,CAAO;IACf,IAAI,IAAI;QACJ,OAAO,YAAE,CAAC,gBAAgB,CAAC,CAAC,CAAA;IAChC,CAAC;IAES,SAAS;QACf,OAAO;YACH,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa;SACzC,CAAA;IACL,CAAC;IACS,IAAI;QACV,MAAM,IAAI,GAAG,IAAI,CAAA;QACjB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAA;QAC1B,MAAM,WAAW,GAAG,oBAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;QACnE,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,KAAK,OAAO,EAAE,CAAC;YACxC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;gBACxB,MAAM,IAAI,iBAAS,CACf,qBAAqB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,iDAAiD,CACnG,CAAA;YACL,CAAC;QACL,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;YACpD,MAAM,IAAI,iBAAS,CACf,qBAAqB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,8DAA8D,CAChH,CAAA;QACL,CAAC;QACD,IAAI,IAAI,GAA6B;YACjC,WAAW;YACX,gBAAgB,EAAE,OAAO,CAAC,aAAa,EAAE,IAAI,IAAI,UAAU;YAC3D,QAAQ,EAAE,OAAO,CAAC,SAAS;gBACvB,CAAC,CAAC;oBACI,OAAO,EAAE,uBAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC;iBACtD;gBACH,CAAC,CAAC,SAAS;YACf,UAAU,EAAE,OAAO,CAAC,KAAK,IAAI,YAAY;YACzC,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,6BAA6B,EAAE,OAAO,CAAC,aAAa,IAAI,QAAQ;YAChE,YAAY,EAAE,OAAO,CAAC,YAAY;SACrC,CAAA;QACD,IAAI,GAAG;YACH,GAAG,IAAI;YACP,GAAG,IAAA,4BAAY,EAAC,OAAO,CAAC,QAAQ,CAAC;SACpC,CAAA;QACD,OAAO;YACH,IAAI,EAAE,IAAI;SACb,CAAA;IACL,CAAC;CACJ;AAnDD,gBAmDC"}

package/dist/resources/pod/container/container.d.ts

@@ -1,51 +1,45 @@
-import { Kinded, PortSet, ResourcesSpec, WritableDeep, type CmdBuilder, type InputPortSetRecord, type TaggedImage } from "@k8ts/instruments";
-import type { CDK } from "../../../_imports";
+import { PortSet, ResourcesSpec, type CmdBuilder, type InputPortSetRecord, type TaggedImage } from "@k8ts/instruments";
+import type { CDK } from "@k8ts/sample-interfaces";
+import type { Resource_Entity, Resource_Min_Ref, Resource_Top } from "@k8ts/instruments";
+import { Resource_Child } from "@k8ts/instruments";
 import { type InputEnvMapping } from "../../../env";
-import { api } from "../../../kinds";
-import type { ManifestResource } from "../../../node";
-import { SubResource } from "../../../node/sub-resource";
-import { Mount as Mount_ } from "./mounts";
-export type Container<Ports extends string = string> = Container.Container<Ports>;
-export declare namespace Container {
-    export import Mount = Mount_;
-    const container_ResourcesSpec: ResourcesSpec<{
-        readonly cpu: "m";
-        readonly memory: "M" | "G" | "T" | "K" | "Mi" | "Gi" | "Ki";
-    }>;
-    type Resources = (typeof container_ResourcesSpec)["__INPUT__"];
-    type SomeMount = Kinded<api.v1_.Pod_.DeviceMount | api.v1_.Pod_.VolumeMount>;
-    export type Mounts = {
-        [key: string]: SomeMount;
-    };
-    interface K8tsPropsClean<Ports extends string = never> {
-        image: TaggedImage;
-        ports?: InputPortSetRecord<Ports>;
-        command?: CmdBuilder;
-        mounts?: Mounts;
-        env?: InputEnvMapping;
-        resources?: Resources;
-    }
-    export type K8tsProps<Ports extends string = never> = {
-        [key in keyof K8tsPropsClean<Ports> as `$${key}`]: K8tsPropsClean<Ports>[key];
-    };
-    export type Props<Ports extends string = never> = K8tsProps<Ports> & WritableDeep<Omit<CDK.Container, keyof K8tsPropsClean | "name">>;
-    export class Container<Ports extends string = string> extends SubResource<Props<Ports>> {
-        readonly subtype: "init" | "main";
-        readonly props: Props<Ports>;
-        __PORTS__: Ports;
-        readonly kind: import("@k8ts/instruments").Kind.SubKind<"Container", import("@k8ts/instruments").Kind.Kind<"Pod", import("@k8ts/instruments").Kind.Version<"v1", import("@k8ts/instruments").Kind.Group<"">>>>;
-        get mounts(): {
-            mount: Mount.ContainerVolumeMount | Mount.ContainerDeviceMount;
-            path: string;
-        }[];
-        get volumes(): (import("..").Device.PodDevice | import("..").Volume)[];
-        get ports(): PortSet<Ports>;
-        submanifest(): CDK.Container;
-        constructor(parent: ManifestResource, name: string, subtype: "init" | "main", props: Props<Ports>);
-        private _groupedMounts;
-        private _resources;
-    }
-    export function make<Ports extends string>(parent: ManifestResource, name: string, subtype: "init" | "main", props: Props<Ports>): Container<Ports>;
-    export {};
+import { v1 } from "../../../kinds/default";
+import { type Container_Mount } from "./mounts";
+declare const container_ResourcesSpec: ResourcesSpec<{
+    readonly cpu: "m";
+    readonly memory: "M" | "G" | "T" | "K" | "Mi" | "Gi" | "Ki";
+}>;
+type Container_Resources = (typeof container_ResourcesSpec)["__INPUT__"];
+type Container_Mount_Some = Resource_Min_Ref<v1.Pod.Container.DeviceMount._ | v1.Pod.Container.VolumeMount._>;
+export type Container_Mounts = {
+    [key: string]: Container_Mount_Some;
+};
+interface Container_Props_K8ts<Ports extends string = never> {
+    $image: TaggedImage;
+    $ports?: InputPortSetRecord<Ports>;
+    $command?: CmdBuilder;
+    $mounts?: Container_Mounts;
+    $env?: InputEnvMapping;
+    $resources?: Container_Resources;
 }
+export type Container_Props<Ports extends string = never> = Container_Props_K8ts<Ports> & Omit<CDK.Container, keyof Container_Props_K8ts | "name">;
+export declare class Container<Ports extends string = string> extends Resource_Child<Container_Props<Ports>> {
+    readonly subtype: "init" | "main";
+    readonly props: Container_Props<Ports>;
+    __PORTS__: Ports;
+    get kind(): import("@k8ts/instruments").Kind.SubKind<"Container", import("@k8ts/instruments").Kind.Kind<"", "v1", "Pod">>;
+    protected __needs__(): Record<string, Resource_Entity | Resource_Entity[] | undefined>;
+    get mounts(): {
+        mount: Container_Mount;
+        path: string;
+    }[];
+    get volumes(): (import("..").Pod_Device | import("..").Pod_Volume<import("..").Pod_Volume_Backend<import("../..").Pv_VolumeMode>>)[];
+    get ports(): PortSet<Ports>;
+    protected __submanifest__(): CDK.Container;
+    constructor(parent: Resource_Entity, name: string, subtype: "init" | "main", props: Container_Props<Ports>);
+    private _groupedMounts;
+    private _resources;
+}
+export declare function make<Ports extends string>(parent: Resource_Top, name: string, subtype: "init" | "main", props: Container_Props<Ports>): Container<Ports>;
+export {};
 //# sourceMappingURL=container.d.ts.map

package/dist/resources/pod/container/container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../../src/resources/pod/container/container.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../../src/resources/pod/container/container.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,OAAO,EACP,aAAa,EAEb,KAAK,UAAU,EACf,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACnB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAA;AAGlD,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACxF,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAGlD,OAAO,EAAO,KAAK,eAAe,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAA;AAC3C,OAAO,EAA0B,KAAK,eAAe,EAAE,MAAM,UAAU,CAAA;AACvE,QAAA,MAAM,uBAAuB;;;EAG3B,CAAA;AAEF,KAAK,mBAAmB,GAAG,CAAC,OAAO,uBAAuB,CAAC,CAAC,WAAW,CAAC,CAAA;AACxE,KAAK,oBAAoB,GAAG,gBAAgB,CACxC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAClE,CAAA;AACD,MAAM,MAAM,gBAAgB,GAAG;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;CACtC,CAAA;AACD,UAAU,oBAAoB,CAAC,KAAK,SAAS,MAAM,GAAG,KAAK;IACvD,MAAM,EAAE,WAAW,CAAA;IACnB,MAAM,CAAC,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAA;IAClC,QAAQ,CAAC,EAAE,UAAU,CAAA;IACrB,OAAO,CAAC,EAAE,gBAAgB,CAAA;IAC1B,IAAI,CAAC,EAAE,eAAe,CAAA;IACtB,UAAU,CAAC,EAAE,mBAAmB,CAAA;CACnC;AAED,MAAM,MAAM,eAAe,CAAC,KAAK,SAAS,MAAM,GAAG,KAAK,IAAI,oBAAoB,CAAC,KAAK,CAAC,GACnF,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,oBAAoB,GAAG,MAAM,CAAC,CAAA;AAE5D,qBAAa,SAAS,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,cAAc,CACxE,eAAe,CAAC,KAAK,CAAC,CACzB;IA2DO,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;aACf,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC;IA3DnD,SAAS,EAAG,KAAK,CAAA;IACjB,IAAI,IAAI,kHAEP;IAED,SAAS,CAAC,SAAS,IAAI,MAAM,CAAC,MAAM,EAAE,eAAe,GAAG,eAAe,EAAE,GAAG,SAAS,CAAC;IAOtF,IAAI,MAAM;eAIsB,eAAe;cACjB,MAAM;QAKnC;IAED,IAAI,OAAO,0HAKV;IACD,IAAI,KAAK,mBAER;IACD,SAAS,CAAC,eAAe,IAAI,GAAG,CAAC,SAAS;gBAuBtC,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,MAAM,EACH,OAAO,EAAE,MAAM,GAAG,MAAM,EACf,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC;IAKnD,OAAO,CAAC,cAAc;IAetB,OAAO,CAAC,UAAU;CAOrB;AAED,wBAAgB,IAAI,CAAC,KAAK,SAAS,MAAM,EACrC,MAAM,EAAE,YAAY,EACpB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC,oBAGhC"}

package/dist/resources/pod/container/container.js

@@ -1,156 +1,102 @@
 "use strict";
-var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
-    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
-    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _, done = false;
-    for (var i = decorators.length - 1; i >= 0; i--) {
-        var context = {};
-        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
-        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
-        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
-        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
-        if (kind === "accessor") {
-            if (result === void 0) continue;
-            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-            if (_ = accept(result.get)) descriptor.get = _;
-            if (_ = accept(result.set)) descriptor.set = _;
-            if (_ = accept(result.init)) initializers.unshift(_);
-        }
-        else if (_ = accept(result)) {
-            if (kind === "field") initializers.unshift(_);
-            else descriptor[key] = _;
-        }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-};
-var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i = 0; i < initializers.length; i++) {
-        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
-    }
-    return useValue ? value : void 0;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Container = void 0;
+exports.make = make;
 const instruments_1 = require("@k8ts/instruments");
-const immutable_1 = require("immutable");
 const adapters_1 = require("../../utils/adapters");
+const instruments_2 = require("@k8ts/instruments");
 const doddle_1 = require("doddle");
 const lodash_1 = require("lodash");
 const env_1 = require("../../../env");
-const kind_map_1 = require("../../../kind-map");
-const kinds_1 = require("../../../kinds");
-const sub_resource_1 = require("../../../node/sub-resource");
+const default_1 = require("../../../kinds/default");
 const mounts_1 = require("./mounts");
-var Container;
-(function (Container_1) {
-    Container_1.Mount = mounts_1.Mount;
-    const container_ResourcesSpec = instruments_1.ResourcesSpec.make({
-        cpu: instruments_1.Unit.Cpu,
-        memory: instruments_1.Unit.Data
-    });
-    let Container = (() => {
-        let _classDecorators = [(0, kind_map_1.k8ts)(kinds_1.api.v1_.Pod_.Container), (0, instruments_1.relations)({
-                needs: self => {
-                    const a = self.mounts;
-                    return (0, lodash_1.mapValues)((0, lodash_1.mapKeys)(a, x => x.path), x => x.mount.volume);
-                }
-            })];
-        let _classDescriptor;
-        let _classExtraInitializers = [];
-        let _classThis;
-        let _classSuper = sub_resource_1.SubResource;
-        var Container = class extends _classSuper {
-            static { _classThis = this; }
-            static {
-                const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-                __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
-                Container = _classThis = _classDescriptor.value;
-                if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-                __runInitializers(_classThis, _classExtraInitializers);
-            }
-            subtype;
-            props;
-            __PORTS__;
-            kind = kinds_1.api.v1_.Pod_.Container;
-            get mounts() {
-                return (0, immutable_1.Map)(this.props.$mounts ?? {})
-                    .mapEntries(([path, mount]) => {
-                    return [
-                        mount,
-                        {
-                            mount: mount,
-                            path: path
-                        }
-                    ];
-                })
-                    .valueSeq()
-                    .toArray();
-            }
-            get volumes() {
-                return (0, doddle_1.seq)(this.mounts.map(x => x.mount.volume))
-                    .uniq()
-                    .toArray()
-                    .pull();
-            }
-            get ports() {
-                return instruments_1.PortSet.make(this.props.$ports);
-            }
-            submanifest() {
-                const self = this;
-                const { $image, $ports, $command, $env } = self.props;
-                const untaggedProps = (0, lodash_1.omitBy)(self.props, (_, k) => k.startsWith("$"));
-                let resourcesObject = self._resources()?.toObject();
-                const container = {
-                    ...untaggedProps,
-                    name: self.name,
-                    image: $image.toString(),
-                    ports: $ports && (0, adapters_1.toContainerPorts)(instruments_1.PortSet.make($ports)).valueSeq().toArray(),
-                    resources: resourcesObject,
-                    command: $command?.toArray(),
-                    env: (0, env_1.Env)($env).toEnvVars(),
-                    ...self._groupedMounts()
-                };
-                return container;
-            }
-            constructor(parent, name, subtype, props) {
-                super(parent, name, props);
-                this.subtype = subtype;
-                this.props = props;
-            }
-            _groupedMounts() {
-                const x = {
-                    volumeMounts: [],
-                    volumeDevices: []
-                };
-                for (const mnt of this.mounts) {
-                    const { mount, path } = mnt;
-                    if (mount instanceof Container_1.Mount.ContainerDeviceMount) {
-                        x.volumeDevices.push(mount.submanifest(path));
-                    }
-                    else {
-                        x.volumeMounts.push(mount.submanifest(path));
-                    }
-                }
-                return x;
+const container_ResourcesSpec = instruments_1.ResourcesSpec.make({
+    cpu: instruments_1.Unit.Cpu,
+    memory: instruments_1.Unit.Data
+});
+class Container extends instruments_2.Resource_Child {
+    subtype;
+    props;
+    __PORTS__;
+    get kind() {
+        return default_1.v1.Pod.Container._;
+    }
+    __needs__() {
+        const a = this.mounts;
+        return (0, lodash_1.mapValues)((0, lodash_1.mapKeys)(a, x => x.path), x => x.mount.volume);
+    }
+    get mounts() {
+        return (0, doddle_1.seq)(Object.entries(this.props.$mounts ?? {}))
+            .map(([path, mount]) => {
+            return {
+                mount: mount,
+                path: path
+            };
+        })
+            .toArray()
+            .pull();
+    }
+    get volumes() {
+        return (0, doddle_1.seq)(this.mounts.map(x => x.mount.volume))
+            .uniq()
+            .toArray()
+            .pull();
+    }
+    get ports() {
+        return instruments_1.PortSet.make(this.props.$ports);
+    }
+    __submanifest__() {
+        const self = this;
+        const { $image, $ports, $command, $env } = self.props;
+        const untaggedProps = (0, lodash_1.omitBy)(self.props, (_, k) => k.startsWith("$"));
+        let resourcesObject = self._resources()?.toObject();
+        const containerPorts = $ports &&
+            (0, doddle_1.seq)((0, adapters_1.toContainerPorts)(instruments_1.PortSet.make($ports)).values())
+                .toArray()
+                .pull();
+        const container = {
+            ...untaggedProps,
+            name: self.name,
+            image: $image.toString(),
+            ports: containerPorts,
+            resources: resourcesObject,
+            command: $command?.toArray(),
+            env: (0, env_1.Env)($env).toEnvVars(),
+            ...self._groupedMounts()
+        };
+        return container;
+    }
+    constructor(parent, name, subtype, props) {
+        super(parent, name, props);
+        this.subtype = subtype;
+        this.props = props;
+    }
+    _groupedMounts() {
+        const x = {
+            volumeMounts: [],
+            volumeDevices: []
+        };
+        for (const mnt of this.mounts) {
+            const { mount, path } = mnt;
+            if (mount instanceof mounts_1.Container_Mount_Device) {
+                x.volumeDevices.push(mount["__submanifest__"](path));
             }
-            _resources() {
-                if (!this.props.$resources) {
-                    return undefined;
-                }
-                const result = container_ResourcesSpec.parse(this.props.$resources);
-                return result;
+            else {
+                x.volumeMounts.push(mount["__submanifest__"](path));
             }
-        };
-        return Container = _classThis;
-    })();
-    Container_1.Container = Container;
-    function make(parent, name, subtype, props) {
-        return new Container(parent, name, subtype, props);
+        }
+        return x;
+    }
+    _resources() {
+        if (!this.props.$resources) {
+            return undefined;
+        }
+        const result = container_ResourcesSpec.parse(this.props.$resources);
+        return result;
     }
-    Container_1.make = make;
-})(Container || (exports.Container = Container = {}));
+}
+exports.Container = Container;
+function make(parent, name, subtype, props) {
+    return new Container(parent, name, subtype, props);
+}
 //# sourceMappingURL=container.js.map

package/dist/resources/pod/container/container.js.map

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

package/dist/resources/pod/container/mounts.d.ts

@@ -1,32 +1,31 @@
-import type { CDK } from "../../../_imports";
-import { Volume } from "../volume";
-import type { Device } from "../volume/devices";
-export type Mount = Mount.ContainerVolumeMount | Mount.ContainerDeviceMount;
-export declare namespace Mount {
-    type Path_Rooted = `/${string}`;
-    export type Path = `${"" | "." | ".."}${Path_Rooted}`;
-    export interface Props {
-        readOnly?: boolean;
-        subPath?: string;
-        volume: Volume;
-    }
-    export class ContainerVolumeMount {
-        readonly props: Props;
-        readonly kind: import("@k8ts/instruments").Kind.SubKind<"VolumeMount", import("@k8ts/instruments").Kind.SubKind<"Container", import("@k8ts/instruments").Kind.Kind<"Pod", import("@k8ts/instruments").Kind.Version<"v1", import("@k8ts/instruments").Kind.Group<"">>>>>;
-        constructor(props: Props);
-        get volume(): Volume;
-        submanifest(mountPath: string): CDK.VolumeMount;
-    }
-    export interface DeviceMountProps {
-        device: Device;
-    }
-    export class ContainerDeviceMount {
-        readonly props: DeviceMountProps;
-        kind: import("@k8ts/instruments").Kind.SubKind<"DeviceMount", import("@k8ts/instruments").Kind.SubKind<"Container", import("@k8ts/instruments").Kind.Kind<"Pod", import("@k8ts/instruments").Kind.Version<"v1", import("@k8ts/instruments").Kind.Group<"">>>>>;
-        get volume(): Device.PodDevice;
-        constructor(props: DeviceMountProps);
-        submanifest(devicePath: string): CDK.VolumeDevice;
-    }
-    export {};
+import { Kind } from "@k8ts/instruments";
+import type { CDK } from "@k8ts/sample-interfaces";
+import type { Pod_Volume } from "../volume";
+import type { Pod_Device } from "../volume/devices";
+type Path_Rooted = `/${string}`;
+export type Container_Mount_Path = `${"" | "." | ".."}${Path_Rooted}`;
+export type Container_Mount = Container_Mount_Volume | Container_Mount_Device;
+export interface Container_Mount_Props {
+    readOnly?: boolean;
+    subPath?: string;
+    volume: Pod_Volume;
 }
+export declare class Container_Mount_Volume {
+    readonly props: Container_Mount_Props;
+    get kind(): Kind.SubKind<"VolumeMount", Kind.SubKind<"Container", Kind.Kind<"", "v1", "Pod">>>;
+    constructor(props: Container_Mount_Props);
+    get volume(): Pod_Volume<import("../volume").Pod_Volume_Backend<import("../..").Pv_VolumeMode>>;
+    protected __submanifest__(mountPath: string): CDK.VolumeMount;
+}
+export interface Container_Mount_Device_Props {
+    device: Pod_Device;
+}
+export declare class Container_Mount_Device {
+    readonly props: Container_Mount_Device_Props;
+    get kind(): Kind.SubKind<"DeviceMount", Kind.SubKind<"Container", Kind.Kind<"", "v1", "Pod">>>;
+    get volume(): Pod_Device;
+    constructor(props: Container_Mount_Device_Props);
+    protected __submanifest__(devicePath: string): CDK.VolumeDevice;
+}
+export {};
 //# sourceMappingURL=mounts.d.ts.map

package/dist/resources/pod/container/mounts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mounts.d.ts","sourceRoot":"","sources":["../../../../src/resources/pod/container/mounts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAE5C,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAClC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C,MAAM,MAAM,KAAK,GAAG,KAAK,CAAC,oBAAoB,GAAG,KAAK,CAAC,oBAAoB,CAAA;AAC3E,yBAAiB,KAAK,CAAC;IACnB,KAAK,WAAW,GAAG,IAAI,MAAM,EAAE,CAAA;IAC/B,MAAM,MAAM,IAAI,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,GAAG,WAAW,EAAE,CAAA;IAErD,MAAM,WAAW,KAAK;QAClB,QAAQ,CAAC,EAAE,OAAO,CAAA;QAClB,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,MAAM,EAAE,MAAM,CAAA;KACjB;IACD,MAAM,OAAO,oBAAoB;QAGjB,QAAQ,CAAC,KAAK,EAAE,KAAK;QAFjC,QAAQ,CAAC,IAAI,2PAA2B;oBAEnB,KAAK,EAAE,KAAK;QAEjC,IAAI,MAAM,WAET;QACD,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,GAAG,CAAC,WAAW;KAQlD;IAED,MAAM,WAAW,gBAAgB;QAC7B,MAAM,EAAE,MAAM,CAAA;KACjB;IAED,MAAM,OAAO,oBAAoB;QAKjB,QAAQ,CAAC,KAAK,EAAE,gBAAgB;QAJ5C,IAAI,2PAA2B;QAC/B,IAAI,MAAM,qBAET;oBACoB,KAAK,EAAE,gBAAgB;QAC5C,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC,YAAY;KAMpD;;CACJ"}
+{"version":3,"file":"mounts.d.ts","sourceRoot":"","sources":["../../../../src/resources/pod/container/mounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AACxC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAA;AAElD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACnD,KAAK,WAAW,GAAG,IAAI,MAAM,EAAE,CAAA;AAC/B,MAAM,MAAM,oBAAoB,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,GAAG,WAAW,EAAE,CAAA;AAErE,MAAM,MAAM,eAAe,GAAG,sBAAsB,GAAG,sBAAsB,CAAA;AAC7E,MAAM,WAAW,qBAAqB;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,UAAU,CAAA;CACrB;AACD,qBAAa,sBAAsB;IAKnB,QAAQ,CAAC,KAAK,EAAE,qBAAqB;IAJjD,IAAI,IAAI,uFAEP;gBAEoB,KAAK,EAAE,qBAAqB;IAEjD,IAAI,MAAM,sFAET;IACD,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,GAAG,CAAC,WAAW;CAQhE;AAED,MAAM,WAAW,4BAA4B;IACzC,MAAM,EAAE,UAAU,CAAA;CACrB;AAED,qBAAa,sBAAsB;IAOnB,QAAQ,CAAC,KAAK,EAAE,4BAA4B;IANxD,IAAI,IAAI,uFAEP;IACD,IAAI,MAAM,eAET;gBACoB,KAAK,EAAE,4BAA4B;IACxD,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC,YAAY;CAMlE"}