k8ts 0.8.1 → 0.9.2

package/dist/runner/summarizer.js.map

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

package/dist/version.d.ts

@@ -1,2 +1,3 @@
-export declare const version = "0.0.1";
+import { version } from "../package.json";
+export { version };
 //# sourceMappingURL=version.d.ts.map

package/dist/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,UAAU,CAAA"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,CAAA"}

package/dist/version.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
-exports.version = "0.0.1";
+const package_json_1 = require("../package.json");
+Object.defineProperty(exports, "version", { enumerable: true, get: function () { return package_json_1.version; } });
 //# sourceMappingURL=version.js.map

package/dist/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG,OAAO,CAAA"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;;AAAA,kDAAyC;AAChC,wFADA,sBAAO,OACA"}

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "k8ts",
-  "version": "0.8.1",
+  "version": "0.9.2",
   "description": "Powerful framework for building Kubernetes manifests in TypeScript.",
   "keywords": [
+    "k8ts",
     "kubernetes",
     "typescript",
     "manifests",
@@ -35,10 +36,10 @@
       "types": "./dist/index.d.ts"
     },
     "./kinds": {
-      "require": "./dist/kinds.js",
-      "import": "./dist/kinds.js",
-      "default": "./dist/kinds.js",
-      "types": "./dist/kinds.d.ts"
+      "require": "./dist/kinds/index.js",
+      "import": "./dist/kinds/index.js",
+      "default": "./dist/kinds/index.js",
+      "types": "./dist/kinds/index.d.ts"
     }
   },
   "main": "dist/index.js",
@@ -62,13 +63,11 @@
     "test:coverage": "jest --coverage"
   },
   "dependencies": {
-    "cdk8s": "^2.69.48",
+    "@k8ts/sample-interfaces": "0.1.2",
     "chalk": "4.1.2",
-    "constructs": "^10.4.2",
     "dayjs": "^1.11.13",
-    "doddle": "^5.2.0",
+    "doddle": "^7.2.0",
     "emittery": "0.13.1",
-    "immutable": "^5.0.3",
     "ip-address": "^10.0.1",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
@@ -79,17 +78,13 @@
     "what-are-you": "^0.1.12"
   },
   "devDependencies": {
-    "@datreeio/datree-cdk8s": "^1.3.5",
-    "@k8ts/instruments": "^0.6.0",
-    "@k8ts/metadata": "^0.4.15",
-    "@swc/core": "^1.11.11",
-    "@swc/jest": "^0.2.37",
+    "@k8ts/instruments": "^0.6.2",
+    "@k8ts/metadata": "^0.5.2",
     "@types/chalk": "^2.2.4",
     "@types/jest": "^29.5.12",
     "@types/js-yaml": "^4",
     "@types/lodash": "^4.17.16",
     "@types/node": "20.9.1",
-    "cdk8s-cli": "^2.200.7",
     "declare-it": "^2.1.0",
     "jest": "^29.7.0",
     "npm-run-all": "^4.1.5",
@@ -101,10 +96,9 @@
     "yamprint": "^0.8.4"
   },
   "peerDependencies": {
-    "@k8ts/instruments": "^0.6.0",
-    "@k8ts/metadata": "^0.4.15"
+    "@k8ts/instruments": "^0.6.2",
+    "@k8ts/metadata": "^0.5.2"
   },
-  "packageManager": "yarn@4.1.1",
   "engines": {
     "node": ">=16.0.0"
   }

package/src/default-world.ts

@@ -0,0 +1,66 @@
+import type { Resource_Core_Ref } from "@k8ts/instruments"
+import type { AnyCtor } from "what-are-you"
+import { World } from "./origins"
+import {
+    ClusterRole,
+    ClusterRoleBinding,
+    ConfigMap,
+    CronJob,
+    Deployment,
+    Namespace,
+    Pv,
+    Pvc,
+    Secret,
+    Service,
+    ServiceAccount
+} from "./resources"
+
+// const defaultKinds = [
+//     v1.Service._,
+//     v1.ConfigMap._,
+//     v1.Secret._,
+//     v1.PersistentVolume._,
+//     v1.PersistentVolumeClaim._,
+//     v1.Namespace._,
+//     v1.ServiceAccount._,
+//     apps.v1.Deployment._,
+//     //apps.v1.StatefulSet._,
+//     //apps.v1.DaemonSet._,
+//     //apps.v1.ReplicaSet._,
+//     //apps.v1.ControllerRevision._,
+//     storage.v1.StorageClass._,
+//     //storage.v1.VolumeAttachment._,
+//     batch.v1.CronJob._,
+//     batch.v1.Job._,
+//     gateway.v1.Gateway._,
+//     //gateway.v1.GatewayClass._,
+//     gateway.v1.HttpRoute._,
+//     // gateway.v1.TlsRoute._,
+//     // gateway.v1.TcpRoute._,
+//     // metrics.v1beta1.NodeMetrics._,
+//     // metrics.v1beta1.PodMetrics._,
+//     //rbac.v1.Role._,
+//     //rbac.v1.RoleBinding._,
+//     rbac.v1.ClusterRole._,
+//     rbac.v1.ClusterRoleBinding._
+//     //networking.v1.NetworkPolicy._
+// ] as const
+
+const defaultKindPairs = [
+    Service,
+    Deployment,
+    ConfigMap,
+    Secret,
+    Pv,
+    Pvc,
+    Namespace,
+    CronJob,
+    ServiceAccount,
+    ClusterRole,
+    ClusterRoleBinding
+] as const
+export function K8ts<MoreKinds extends AnyCtor<Resource_Core_Ref>>(...extraKinds: MoreKinds[]) {
+    return new World("K8ts", {
+        kinds: [...defaultKindPairs]
+    })
+}

package/src/env/env.ts

@@ -1,14 +1,20 @@
-import { Map, type MapOf } from "immutable"
+import { merge } from "@k8ts/metadata/util"
+import type { CDK } from "@k8ts/sample-interfaces"
+import { seq } from "doddle"
 import { isObject } from "what-are-you"
-import type { CDK } from "../_imports"
 import { MakeError } from "../error"
-import { api } from "../kinds"
-import type { EnvVarFrom, InputEnv, InputEnvMapping } from "./types"
+import { v1 } from "../kinds/index"
+import {
+    toInputEnv,
+    type EnvVarFrom,
+    type InputEnv,
+    type InputEnvMap,
+    type InputEnvMapping,
+    type InputEnvValue
+} from "./types"
 import { isValidEnvVarName } from "./validate-name"
-
-type _EnvBuilderMap = MapOf<InputEnvMapping>
 export class EnvBuilder {
-    constructor(private readonly _env: _EnvBuilderMap) {
+    constructor(private readonly _env: InputEnvMap) {
         for (const key of _env.keys()) {
             if (!isValidEnvVarName(key)) {
                 throw new MakeError("Invalid environment variable name", {
@@ -22,7 +28,7 @@ export class EnvBuilder {
         return this._env
     }
 
-    private _envFromSecret(value: EnvVarFrom<api.v1_.Secret>): CDK.EnvVarSource {
+    private _envFromSecret(value: EnvVarFrom<v1.Secret._>): CDK.EnvVarSource {
         return {
             secretKeyRef: {
                 name: value.$ref.name,
@@ -32,7 +38,7 @@ export class EnvBuilder {
         }
     }
 
-    private _envFromConfigMap(value: EnvVarFrom<api.v1_.ConfigMap>): CDK.EnvVarSource {
+    private _envFromConfigMap(value: EnvVarFrom<v1.ConfigMap._>): CDK.EnvVarSource {
         return {
             configMapKeyRef: {
                 name: value.$ref.name,
@@ -42,23 +48,29 @@ export class EnvBuilder {
         }
     }
 
+    *[Symbol.iterator](): IterableIterator<[string, InputEnvValue]> {
+        for (const entry of this._env.entries()) {
+            yield entry
+        }
+    }
+
     toEnvVars() {
-        return this.values
-            .map((value, key) => {
+        return seq(this)
+            .map(([key, value]) => {
                 if (!isObject(value)) {
                     return {
                         name: key,
                         value: `${value}`
                     }
                 }
-                const resourceValue = value as EnvVarFrom<api.v1_.Secret | api.v1_.ConfigMap>
+                const resourceValue = value as EnvVarFrom<v1.Secret._ | v1.ConfigMap._>
                 switch (resourceValue.$ref.kind) {
-                    case api.v1_.Secret:
+                    case v1.Secret._:
                         return {
                             name: key,
                             valueFrom: this._envFromSecret(resourceValue as any)
                         }
-                    case api.v1_.ConfigMap:
+                    case v1.ConfigMap._:
                         return {
                             name: key,
                             valueFrom: this._envFromConfigMap(resourceValue as any)
@@ -70,10 +82,10 @@ export class EnvBuilder {
                         })
                 }
             })
-            .valueSeq()
             .toArray()
+            .pull()
     }
-    private _withEnv(f: (env: _EnvBuilderMap) => _EnvBuilderMap) {
+    private _withEnv(f: (env: InputEnvMap) => InputEnvMap) {
         return new EnvBuilder(f(this._env))
     }
 
@@ -81,17 +93,17 @@ export class EnvBuilder {
     add(input: InputEnvMapping): EnvBuilder
     add(a: any, b?: any) {
         const pairs: [string, string][] = typeof a === "string" ? [[a, b]] : Object.entries(a)
-        const map = Map(pairs)
-        const existingKeys = map
-            .keySeq()
+        const map = new Map(pairs)
+        const existingKeys = seq(map.keys())
             .filter(k => this._env.has(k))
-            .toList()
-        if (existingKeys.size > 0) {
+            .toArray()
+            .pull()
+        if (existingKeys.length > 0) {
             throw new MakeError("Cannot overwrite existing keys using add", {
-                keys: existingKeys.toArray()
+                keys: existingKeys
             })
         }
-        return this._withEnv(env => env.merge(map) as any)
+        return this._withEnv(env => merge(env, map))
     }
 
     overwrite(name: string, value: string): EnvBuilder
@@ -100,26 +112,20 @@ export class EnvBuilder {
         if (typeof a === "string") {
             return this._withEnv(env => env.set(a, b))
         } else {
-            const map = Map(a as InputEnvMapping) as _EnvBuilderMap
-            return this._withEnv(env => env.merge(map) as any)
+            const map = toInputEnv(a)
+            return this._withEnv(env => merge(env, map))
         }
     }
 
     toObject() {
-        return this._env
-            .filter(v => v != null)
-            .map(x => `${x}`)
-            .toObject()
+        return seq(this)
+            .filter(([, v]) => v != null)
+            .toRecord(([k, v]) => [k, `${v}`])
+            .pull()
     }
 
     static make(env?: InputEnv) {
-        if (!env) {
-            return new EnvBuilder(Map({}))
-        }
-        if (env instanceof EnvBuilder) {
-            return env
-        }
-        return new EnvBuilder(Map(env ?? {}).filter(v => v != null) as _EnvBuilderMap)
+        return new EnvBuilder(toInputEnv(env ?? {}))
     }
 }
 

package/src/env/index.ts

@@ -1,2 +1,2 @@
 export { Env, EnvBuilder } from "./env"
-export { InputEnvMapping } from "./types"
+export type { InputEnvMapping } from "./types"

package/src/env/types.ts

@@ -1,17 +1,27 @@
-import type { Kind, Refable } from "@k8ts/instruments"
-import type { EnvBuilder } from "./env"
+import type { Kind, Resource_Core_Ref } from "@k8ts/instruments"
+import { EnvBuilder } from "./env"
 
 export type InputEnvValue = string | null | number | boolean | bigint | undefined | EnvVarFrom
 export type InputEnvMapping = Partial<Record<string, InputEnvValue>>
 export interface EnvVarFrom<_Kind extends Kind = Kind> {
-    $ref: Refable<_Kind>
+    $ref: Resource_Core_Ref<_Kind>
     key: string
     optional?: boolean
 }
 
-export type InputEnv = EnvBuilder | InputEnvMapping
+export type InputEnv = EnvBuilder | InputEnvMapping | InputEnvMap
 
+export function toInputEnv(env: InputEnv): InputEnvMap {
+    if (env instanceof EnvBuilder) {
+        return new Map(env["_env"])
+    }
+    if (env instanceof Map) {
+        return new Map(env)
+    }
+    return new Map(Object.entries(env))
+}
 export type EnvFrom<_Kind extends Kind = Kind> = {
-    $ref: Refable<_Kind>
+    $ref: Resource_Core_Ref<_Kind>
     prefix?: string
 }
+export type InputEnvMap = Map<string, InputEnvValue>

package/src/index.ts

@@ -1,9 +1,6 @@
-export { CDK } from "./_imports"
-export * from "./external"
-export * from "./file"
-export * as ScopedFactory from "./file/factory"
-export * from "./node"
+export type { CDK } from "@k8ts/sample-interfaces"
+export { K8ts } from "./default-world"
+export * from "./origins"
+export * from "./origins/file"
 export * from "./resources"
 export * from "./runner"
-export * from "./runner/exporter"
-export * from "./world"

package/src/kinds/apps.ts

@@ -0,0 +1,30 @@
+import { Kind } from "@k8ts/instruments"
+
+export namespace apps {
+    export const _ = Kind.group("apps")
+    export type _ = typeof _
+    export namespace v1 {
+        export const _ = apps._.version("v1")
+        export type _ = typeof _
+        export namespace Deployment {
+            export const _ = v1._.kind("Deployment")
+            export type _ = typeof _
+        }
+        export namespace StatefulSet {
+            export const _ = v1._.kind("StatefulSet")
+            export type _ = typeof _
+        }
+        export namespace DaemonSet {
+            export const _ = v1._.kind("DaemonSet")
+            export type _ = typeof _
+        }
+        export namespace ReplicaSet {
+            export const _ = v1._.kind("ReplicaSet")
+            export type _ = typeof _
+        }
+        export namespace ControllerRevision {
+            export const _ = v1._.kind("ControllerRevision")
+            export type _ = typeof _
+        }
+    }
+}

package/src/kinds/batch.ts

@@ -0,0 +1,18 @@
+import { Kind } from "@k8ts/instruments"
+
+export namespace batch {
+    export const _ = Kind.group("batch")
+    export type _ = typeof _
+    export namespace v1 {
+        export const _ = batch._.version("v1")
+        export type _ = typeof _
+        export namespace Job {
+            export const _ = v1._.kind("Job")
+            export type _ = typeof _
+        }
+        export namespace CronJob {
+            export const _ = v1._.kind("CronJob")
+            export type _ = typeof _
+        }
+    }
+}

package/src/kinds/default.ts

@@ -0,0 +1,81 @@
+import { Kind } from "@k8ts/instruments"
+
+const root = Kind.group("")
+type root = typeof root
+
+export namespace v1 {
+    export const _ = root.version("v1")
+    export type _ = typeof _
+
+    export namespace Pod {
+        export const _ = v1._.kind("Pod")
+        export type _ = typeof _
+
+        export namespace Container {
+            export const _ = Pod._.subkind("Container")
+            export type _ = typeof _
+            export namespace Port {
+                export const _ = Container._.subkind("Port")
+                export type _ = typeof _
+            }
+            export namespace EnvVar {
+                export const _ = Container._.subkind("EnvVar")
+                export type _ = typeof _
+            }
+            export namespace VolumeMount {
+                export const _ = Container._.subkind("VolumeMount")
+                export type _ = typeof _
+            }
+            export namespace DeviceMount {
+                export const _ = Container._.subkind("DeviceMount")
+                export type _ = typeof _
+            }
+        }
+
+        export namespace Volume {
+            export const _ = Pod._.subkind("Volume")
+            export type _ = typeof _
+        }
+        export namespace Device {
+            export const _ = Volume._.subkind("Device")
+            export type _ = typeof _
+        }
+    }
+
+    export namespace ConfigMap {
+        export const _ = v1._.kind("ConfigMap")
+        export type _ = typeof _
+    }
+    export namespace Secret {
+        export const _ = v1._.kind("Secret")
+        export type _ = typeof _
+    }
+    export namespace Service {
+        export const _ = v1._.kind("Service")
+        export type _ = typeof _
+    }
+    export namespace Node {
+        export const _ = v1._.kind("Node")
+        export type _ = typeof _
+    }
+    export namespace Namespace {
+        export const _ = v1._.kind("Namespace")
+        export type _ = typeof _
+    }
+    export namespace ServiceAccount {
+        export const _ = v1._.kind("ServiceAccount")
+        export type _ = typeof _
+    }
+    export namespace PersistentVolume {
+        export const _ = v1._.kind("PersistentVolume")
+        export type _ = typeof _
+    }
+    export namespace PersistentVolumeClaim {
+        export const _ = v1._.kind("PersistentVolumeClaim")
+        export type _ = typeof _
+    }
+    export namespace PodTemplate {
+        export const _ = v1._.kind("PodTemplate")
+        export type _ = typeof _
+    }
+}

package/src/kinds/gateway.ts

@@ -0,0 +1,30 @@
+import { Kind } from "@k8ts/instruments"
+
+export namespace gateway {
+    export const _ = Kind.group("gateway.networking.k8s.io")
+    export type _ = typeof _
+    export namespace v1 {
+        export const _ = gateway._.version("v1")
+        export type _ = typeof _
+        export namespace Gateway {
+            export const _ = v1._.kind("Gateway")
+            export type _ = typeof _
+        }
+        export namespace GatewayClass {
+            export const _ = v1._.kind("GatewayClass")
+            export type _ = typeof _
+        }
+        export namespace HttpRoute {
+            export const _ = v1._.kind("HTTPRoute")
+            export type _ = typeof _
+        }
+        export namespace TcpRoute {
+            export const _ = v1._.kind("TCPRoute")
+            export type _ = typeof _
+        }
+        export namespace TlsRoute {
+            export const _ = v1._.kind("TLSRoute")
+            export type _ = typeof _
+        }
+    }
+}

package/src/kinds/index.ts

@@ -0,0 +1,9 @@
+export * from "./apps"
+export * from "./batch"
+export * from "./default"
+
+export * from "./gateway"
+export * from "./metrics"
+export * from "./networking"
+export * from "./rbac"
+export * from "./storage"

package/src/kinds/metrics.ts

@@ -0,0 +1,18 @@
+import { Kind } from "@k8ts/instruments"
+
+export namespace metrics {
+    export const _ = Kind.group("metrics.k8s.io")
+    export type _ = typeof _
+    export namespace v1beta1 {
+        export const _ = metrics._.version("v1beta1")
+        export type _ = typeof _
+        export namespace NodeMetrics {
+            export const _ = v1beta1._.kind("NodeMetrics")
+            export type _ = typeof _
+        }
+        export namespace PodMetrics {
+            export const _ = v1beta1._.kind("PodMetrics")
+            export type _ = typeof _
+        }
+    }
+}

package/src/kinds/networking.ts

@@ -0,0 +1,14 @@
+import { Kind } from "@k8ts/instruments"
+
+export namespace networking {
+    export const _ = Kind.group("networking.k8s.io")
+    export type _ = typeof _
+    export namespace v1 {
+        export const _ = networking._.version("v1")
+        export type _ = typeof _
+        export namespace NetworkPolicy {
+            export const _ = v1._.kind("NetworkPolicy")
+            export type _ = typeof _
+        }
+    }
+}

package/src/kinds/rbac.ts

@@ -0,0 +1,26 @@
+import { Kind } from "@k8ts/instruments"
+
+export namespace rbac {
+    export const _ = Kind.group("rbac.authorization.k8s.io")
+    export type _ = typeof _
+    export namespace v1 {
+        export const _ = rbac._.version("v1")
+        export type _ = typeof _
+        export namespace Role {
+            export const _ = v1._.kind("Role")
+            export type _ = typeof _
+        }
+        export namespace ClusterRole {
+            export const _ = v1._.kind("ClusterRole")
+            export type _ = typeof _
+        }
+        export namespace RoleBinding {
+            export const _ = v1._.kind("RoleBinding")
+            export type _ = typeof _
+        }
+        export namespace ClusterRoleBinding {
+            export const _ = v1._.kind("ClusterRoleBinding")
+            export type _ = typeof _
+        }
+    }
+}

package/src/kinds/storage.ts

@@ -0,0 +1,18 @@
+import { Kind } from "@k8ts/instruments"
+
+export namespace storage {
+    export const _ = Kind.group("storage.k8s.io")
+    export type _ = typeof _
+    export namespace v1 {
+        export const _ = storage._.version("v1")
+        export type _ = typeof _
+        export namespace StorageClass {
+            export const _ = v1._.kind("StorageClass")
+            export type _ = typeof _
+        }
+        export namespace VolumeAttachment {
+            export const _ = v1._.kind("VolumeAttachment")
+            export type _ = typeof _
+        }
+    }
+}

package/src/origins/external.ts

@@ -0,0 +1,14 @@
+import { Origin_Entity, type Origin_Props, type Resource_Ctor_Of } from "@k8ts/instruments"
+
+export class Origin_External extends Origin_Entity {
+    get kind() {
+        return "External"
+    }
+    constructor(readonly _parent: Origin_Entity) {
+        super("External", {})
+    }
+
+    protected __parent__(): Origin_Entity<Origin_Props<Resource_Ctor_Of>> | undefined {
+        return this._parent
+    }
+}