@k8ts/instruments 0.11.3 → 0.12.0

package/dist/utils/{_string/pretty-objects.js → phrase-renderer/phrases.js}

@@ -44,9 +44,9 @@ exports.quantity = quantity;
 exports.dest = dest;
 exports.ref = ref;
 const chalk_1 = __importDefault(require("chalk"));
-const displayers_1 = require("../displayers");
+const display_1 = require("../mixin/display");
 let Attr = (() => {
-    let _classDecorators = [(0, displayers_1.displayers)({
+    let _classDecorators = [(0, display_1.display)({
             simple: s => s.text,
             pretty: attr => chalk_1.default.yellowBright(attr.text)
         })];
@@ -71,7 +71,7 @@ let Attr = (() => {
 })();
 exports.Attr = Attr;
 let Verb = (() => {
-    let _classDecorators = [(0, displayers_1.displayers)({
+    let _classDecorators = [(0, display_1.display)({
             simple: s => s.text,
             pretty: verb => chalk_1.default.bgGreen.bold.white(` ${verb.text} `)
         })];
@@ -96,7 +96,7 @@ let Verb = (() => {
 })();
 exports.Verb = Verb;
 let Quantity = (() => {
-    let _classDecorators = [(0, displayers_1.displayers)({
+    let _classDecorators = [(0, display_1.display)({
             simple: s => `${s.num} ${s.noun}`,
             pretty(self) {
                 const { num, noun } = self;
@@ -127,7 +127,7 @@ let Quantity = (() => {
 })();
 exports.Quantity = Quantity;
 let RefName = (() => {
-    let _classDecorators = [(0, displayers_1.displayers)({
+    let _classDecorators = [(0, display_1.display)({
             simple: s => s.name,
             pretty: refName => chalk_1.default.bgGrey.bold.white(` ${refName.name} `)
         })];
@@ -152,7 +152,7 @@ let RefName = (() => {
 })();
 exports.RefName = RefName;
 let Dest = (() => {
-    let _classDecorators = [(0, displayers_1.displayers)({
+    let _classDecorators = [(0, display_1.display)({
             simple: s => s.text,
             pretty: dest => chalk_1.default.blueBright(dest.text)
         })];
@@ -191,4 +191,4 @@ function dest(text) {
 function ref(name) {
     return new RefName(name);
 }
-//# sourceMappingURL=pretty-objects.js.map
+//# sourceMappingURL=phrases.js.map

package/dist/utils/phrase-renderer/phrases.js.map

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

package/dist/utils/{_string/post-processor.d.ts → phrase-renderer/renderer.d.ts}

@@ -1,7 +1,7 @@
-export declare class TextPostProcessor {
+export declare class PhraseRenderer {
     private tokens;
     private _genToken;
     token(text: string): `K8TS_TOK_${string}`;
     render(text: string): string;
 }
-//# sourceMappingURL=post-processor.d.ts.map
+//# sourceMappingURL=renderer.d.ts.map

package/dist/utils/phrase-renderer/renderer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../../src/utils/phrase-renderer/renderer.ts"],"names":[],"mappings":"AACA,qBAAa,cAAc;IACvB,OAAO,CAAC,MAAM,CAA+B;IAC7C,OAAO,CAAC,SAAS;IAQjB,KAAK,CAAC,IAAI,EAAE,MAAM;IAMlB,MAAM,CAAC,IAAI,EAAE,MAAM;CAOtB"}

package/dist/utils/{_string/post-processor.js → phrase-renderer/renderer.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TextPostProcessor = void 0;
-class TextPostProcessor {
+exports.PhraseRenderer = void 0;
+class PhraseRenderer {
     tokens = new Map();
     _genToken() {
         const randomKey = Math.random().toString(36).slice(2, 8);
@@ -24,5 +24,5 @@ class TextPostProcessor {
         return result;
     }
 }
-exports.TextPostProcessor = TextPostProcessor;
-//# sourceMappingURL=post-processor.js.map
+exports.PhraseRenderer = PhraseRenderer;
+//# sourceMappingURL=renderer.js.map

package/dist/utils/phrase-renderer/renderer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/utils/phrase-renderer/renderer.ts"],"names":[],"mappings":";;;AACA,MAAa,cAAc;IACf,MAAM,GAAG,IAAI,GAAG,EAAqB,CAAA;IACrC,SAAS;QACb,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QACxD,MAAM,KAAK,GAAG,YAAY,SAAS,EAAe,CAAA;QAClD,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,SAAS,EAAE,CAAA;QAC3B,CAAC;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IACD,KAAK,CAAC,IAAY;QACd,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,CAAA;QAC9B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;QAC5B,OAAO,KAAK,CAAA;IAChB,CAAC;IAED,MAAM,CAAC,IAAY;QACf,IAAI,MAAM,GAAG,IAAI,CAAA;QACjB,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YACjD,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;QAC5C,CAAC;QACD,OAAO,MAAM,CAAA;IACjB,CAAC;CACJ;AAvBD,wCAuBC"}

package/dist/utils/types.d.ts

@@ -0,0 +1,2 @@
+export type StringRecordLike<T = Record<string, string>> = Record<keyof T, string>;
+//# sourceMappingURL=types.d.ts.map

package/dist/utils/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,gBAAgB,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAA"}

package/dist/utils/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/dist/utils/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":""}

package/dist/utils/util.d.ts

@@ -0,0 +1,6 @@
+export declare function cleanBody<T>(body: T): Omit<T, "metadata" | "apiVersion" | "kind">;
+export type SourcedPropertyDescriptor = PropertyDescriptor & {
+    source: object;
+};
+export declare function getDeepPropertyDescriptor(obj: any, propertyKey: string | symbol): SourcedPropertyDescriptor | undefined;
+//# sourceMappingURL=util.d.ts.map

package/dist/utils/util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/utils/util.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,UAAU,GAAG,YAAY,GAAG,MAAM,CAAC,CAGjF;AACD,MAAM,MAAM,yBAAyB,GAAG,kBAAkB,GAAG;IACzD,MAAM,EAAE,MAAM,CAAA;CACjB,CAAA;AACD,wBAAgB,yBAAyB,CACrC,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,MAAM,GAAG,MAAM,GAC7B,yBAAyB,GAAG,SAAS,CAavC"}

package/dist/utils/util.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cleanBody = cleanBody;
+exports.getDeepPropertyDescriptor = getDeepPropertyDescriptor;
+function cleanBody(body) {
+    const { metadata, apiVersion, kind, ...rest } = body;
+    return rest;
+}
+function getDeepPropertyDescriptor(obj, propertyKey) {
+    let current = obj;
+    while (current) {
+        const descriptor = Object.getOwnPropertyDescriptor(current, propertyKey);
+        if (descriptor) {
+            return {
+                ...descriptor,
+                source: current
+            };
+        }
+        current = Object.getPrototypeOf(current);
+    }
+    return undefined;
+}
+//# sourceMappingURL=util.js.map

package/dist/utils/util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/utils/util.ts"],"names":[],"mappings":";;AAAA,8BAGC;AAID,8DAgBC;AAvBD,SAAgB,SAAS,CAAI,IAAO;IAChC,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,IAAW,CAAA;IAC3D,OAAO,IAAI,CAAA;AACf,CAAC;AAID,SAAgB,yBAAyB,CACrC,GAAQ,EACR,WAA4B;IAE5B,IAAI,OAAO,GAAG,GAAG,CAAA;IACjB,OAAO,OAAO,EAAE,CAAC;QACb,MAAM,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;QACxE,IAAI,UAAU,EAAE,CAAC;YACb,OAAO;gBACH,GAAG,UAAU;gBACb,MAAM,EAAE,OAAO;aAClB,CAAA;QACL,CAAC;QACD,OAAO,GAAG,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;IAC5C,CAAC;IACD,OAAO,SAAS,CAAA;AACpB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k8ts/instruments",
-  "version": "0.11.3",
+  "version": "0.12.0",
   "description": "A collection of utilities and core components for k8ts.",
   "keywords": [
     "k8ts",
@@ -64,6 +64,7 @@
     "doddle": "^7.3.1",
     "eventemitter3": "^5.0.1",
     "ip-address": "^10.0.1",
+    "js-yaml": "^4.1.1",
     "lodash": "^4.17.21",
     "parjs": "^1.3.9",
     "pathlib-js": "^1.5.0",
@@ -71,11 +72,12 @@
     "simple-git": "^3.27.0",
     "stacktracey": "^2.1.8",
     "timezone-enum": "^1.0.4",
-    "what-are-you": "^0.2.0"
+    "what-are-you": "^0.3.0"
   },
   "devDependencies": {
-    "@k8ts/metadata": "^0.10.2",
+    "@k8ts/metadata": "^0.11.0",
     "@types/jest": "^30.0.0",
+    "@types/js-yaml": "^4.0.9",
     "@types/lodash": "^4.17.16",
     "@types/node": "22",
     "declare-it": "^2.1.0",
@@ -89,7 +91,7 @@
     "yamprint": "^0.8.4"
   },
   "peerDependencies": {
-    "@k8ts/metadata": "^0.10.2"
+    "@k8ts/metadata": "^0.11.0"
   },
   "engines": {
     "node": ">=16.0.0"

package/src/core/graph/entity.ts

@@ -1,56 +1,40 @@
 import { getNiceClassName, type AnyCtor } from "what-are-you"
-import type { Node } from "./node"
+import { K8tsGraphError } from "./error"
+import type { Vertex } from "./vertex"
 export type LiteralModes = "simple" | "pretty" | "prefix"
 
 let globalEntityId = 0
 
-type AbsCtor<T> = abstract new (...args: any[]) => any
-export type RefLike = {
-    get ref(): {
-        kind: string
-        name: string
-        namespace?: string
-    }
+export type EntityRef = {
     kind: any
-    name: string
-    assert<Inst extends RefLike>(cls: abstract new (...args: any[]) => Inst): Inst
-    is<Inst extends RefLike>(cls: abstract new (...args: any[]) => Inst): this is Inst
+    equals(other: any): boolean
+    cast<Inst extends EntityRef>(cls: abstract new (...args: any[]) => Inst): Inst
 }
-export abstract class Entity<
-    _Node extends Node<_Node, _Ent> = Node<any, any>,
-    _Ent extends Entity<_Node, _Ent> = Entity<any, any>,
-    _EntRefType extends RefLike = RefLike
-> {
-    abstract get ref(): RefLike["ref"]
+export abstract class EntityBase<
+    _Node extends Vertex<_Node, _Ent> = Vertex<any, any>,
+    _Ent extends EntityBase<_Node, _Ent> = EntityBase<any, any>,
+    _EntRefType extends EntityRef = EntityRef
+> implements EntityRef
+{
+    protected __kids__(): Iterable<_EntRefType> {
+        return []
+    }
     abstract readonly kind: any
-    private readonly _ID = (() => {
-        return globalEntityId++
-    })()
-    abstract readonly node: _Node
-    abstract readonly name: string
-    assert<Inst extends _EntRefType>(cls: AnyCtor<Inst>): Inst {
-        if (this.is(cls)) {
+
+    abstract get __vertex__(): _Node
+
+    cast<Inst extends _EntRefType>(cls: AnyCtor<Inst>): Inst {
+        if (this instanceof cls) {
             return this as any as Inst
         }
-        throw new Error(
+        throw new K8tsGraphError(
             `This Resource ${this} is not compatible with the class ${getNiceClassName(cls)}.`
         )
     }
-    is<K extends this["kind"]>(kind: K): this is { kind: K }
-    is<Inst extends _EntRefType = _EntRefType>(cls: AnyCtor<Inst>): this is Inst
-    is(cls: any): boolean {
-        if (typeof cls === "function") {
-            return this instanceof cls
-        }
-        return this.kind.equals(cls)
-    }
-    abstract equals(other: any): boolean
 
-    protected __kids__(): Iterable<_EntRefType> {
-        return []
-    }
+    abstract equals(other: any): boolean
 
-    protected __parent__(): _EntRefType | undefined {
+    protected get __parent__(): _EntRefType | undefined {
         return undefined
     }
 

package/src/core/graph/error.ts

@@ -0,0 +1,7 @@
+export class K8tsGraphError extends Error {
+    override name = "K8tsGraphError" as const
+    constructor(message: string, fields: Record<string, any> & { cause?: Error } = {}) {
+        super(message)
+        Object.assign(this, fields)
+    }
+}

package/src/core/graph/index.ts

@@ -1,5 +1,5 @@
-export { Entity } from "./entity"
-export { Node } from "./node"
+export { EntityBase } from "./entity"
 export * from "./origin"
 export { Relation } from "./relation"
 export * from "./resource"
+export { Vertex } from "./vertex"

package/src/core/graph/origin/dummy.ts

@@ -0,0 +1,23 @@
+import type { DummyResource } from "../resource"
+import { OriginEntity } from "./origin"
+/**
+ * Used as the Origin of {@link DummyResource} resources. These resources are never manifested by
+ * k8ts. They're expected to already exist in the target cluster.
+ */
+export class NullOrigin extends OriginEntity {
+    get kind() {
+        return "[k8ts] External"
+    }
+    get namespace() {
+        return undefined
+    }
+    private constructor() {
+        super("External", {})
+    }
+
+    protected get __parent__(): OriginEntity | undefined {
+        return undefined
+    }
+
+    static instance = new NullOrigin()
+}

package/src/core/graph/origin/events.ts

@@ -1,79 +1,40 @@
 import { doddle } from "doddle"
-import EventEmitter from "eventemitter3"
-import type { Manifest } from "../../manifest"
-import type { Rsc_Entity, Rsc_Top } from "../resource"
-import type { Origin_Entity } from "./entity"
+import type { K8tsManifest } from "../../manifest"
+import type { K8sResource, ResourceEntity } from "../resource"
+import type { OriginEntity } from "./origin"
 
-export function OriginEventsEmitter() {
-    const em = new EventEmitter<Origin_EventMap>()
-    return em
-}
-
-export function SubscribeFn(self: Origin_Entity, em: EventEmitter<Origin_EventMap>) {
-    function on<EventKey extends keyof Origin_EventMap>(
-        event: EventKey,
-        listener: (data: Origin_EventMap[EventKey]) => void
-    ): void
-    function on(
-        listener: <EventKey extends keyof Origin_EventMap>(
-            event: EventKey,
-            data: Origin_EventMap[EventKey]
-        ) => void
-    ): void
-    function on<
-        K extends keyof Origin_EventMap,
-        HandledMap extends {
-            [key2 in K]: (data: Origin_EventMap[key2]) => void
-        }
-    >(handlers: HandledMap): void
-    function on(a?: any, b?: any) {
-        if (typeof a === "function") {
-            for (const eventName of originEventNames) {
-                em.on(eventName as any, (data: any) => a(eventName as any, data))
-            }
-        } else if (typeof a === "string") {
-            return em.on(a as any, b)
-        } else if (typeof a === "object") {
-            const handlers = a as any
-            for (const key of Object.keys(handlers) as (keyof Origin_EventMap)[]) {
-                em.on(key, handlers[key]!)
-            }
-        }
-    }
-    return on
-}
-export interface Origin_EventMap {
+export interface OriginEventMap {
     "resource/exported": {
-        readonly origin: Origin_Entity
-        readonly resource: Rsc_Top
+        readonly origin: OriginEntity
+        readonly resource: K8sResource
     }
     "resource/attached": {
-        readonly origin: Origin_Entity
-        readonly resource: Rsc_Entity
+        readonly origin: OriginEntity
+        readonly resource: ResourceEntity
     }
     "resource/manifested": {
-        readonly origin: Origin_Entity
-        readonly manifest: Manifest
-        readonly resource: Rsc_Top
+        readonly origin: OriginEntity
+        readonly manifest: K8tsManifest
+        readonly resource: K8sResource
     }
     "resource/loaded": {
-        readonly origin: Origin_Entity
-        readonly resource: Rsc_Top
+        readonly origin: OriginEntity
+        readonly resource: K8sResource
     }
     "resource/serialized": {
-        readonly origin: Origin_Entity
-        readonly resource: Rsc_Top
-        readonly manifest: Manifest
+        readonly origin: OriginEntity
+        readonly resource: K8sResource
+        readonly manifest: K8tsManifest
         content: string
     }
     "origin/attached": {
-        readonly origin: Origin_Entity
-        readonly child: Origin_Entity
+        readonly origin: OriginEntity
+        readonly child: OriginEntity
     }
 }
 
 export const originEventNames = doddle(() => {
-    // Forces type checking the event names basded on the Origin_EventMap
+    // Forces type checking the event names basded on the OriginEventMap
     const obj = {
         "resource/exported": true,
         "resource/attached": true,
@@ -81,6 +42,6 @@ export const originEventNames = doddle(() => {
         "resource/loaded": true,
         "resource/serialized": true,
         "origin/attached": true
-    } satisfies Record<keyof Origin_EventMap, true>
-    return Object.keys(obj) as (keyof Origin_EventMap)[]
+    } satisfies Record<keyof OriginEventMap, true>
+    return Object.keys(obj) as (keyof OriginEventMap)[]
 }).pull()

package/src/core/graph/origin/exporter.ts

@@ -1,16 +1,17 @@
 import { doddlify, seq } from "doddle"
-import { Rsc_FwRef_Exports, Rsc_Ref, Rsc_Top } from "../resource"
-import { FwRef } from "../resource/reference/fw-ref"
-import { Origin_Entity } from "./entity"
-import type { Origin_Props } from "./node"
-export interface Origin_Exporter_Props extends Origin_Props {}
+import { K8tsGraphError } from "../error"
+import { ForwardExports, K8sResource, ResourceRef } from "../resource"
+import { ForwardRef } from "../resource/forward/ref"
+import { OriginEntity } from "./origin"
+import type { Origin_Props } from "./props"
+export interface OriginExporter_Props extends Origin_Props {}
 
-/** Base class for Origins that export resources via the {@link Rsc_FwRef_Exports} mechanism. */
-export abstract class Origin_Exporter<
-    Props extends Origin_Exporter_Props = Origin_Exporter_Props
-> extends Origin_Entity<Props> {
+/** Base class for Origins that export resources via the {@link ForwardExports} mechanism. */
+export abstract class ExporterOrigin<
+    Props extends OriginExporter_Props = OriginExporter_Props
+> extends OriginEntity<Props> {
     constructor(
-        private readonly _parent: Origin_Entity,
+        private readonly _parent: OriginEntity,
         name: string,
         props: Props
     ) {
@@ -19,40 +20,41 @@ export abstract class Origin_Exporter<
         this._parent["__attach_kid__"](this)
     }
 
-    protected abstract __exports__(): Iterable<Rsc_Ref>
+    protected abstract __exports__(): Iterable<ResourceRef>
 
-    protected __parent__() {
+    protected get __parent__() {
         return this._parent
     }
 
     @doddlify
-    get resources(): Iterable<Rsc_Ref> {
+    get resources(): Iterable<ResourceRef> {
         const self = this
-        const boundExports = self.__binder__().bind(self.__exports__.bind(self))
-        const allEmitted = new Set<Rsc_Ref>()
+        const boundExports = self.__binder__.bind(self.__exports__.bind(self))
+        const allEmitted = new Set<ResourceRef>()
         const attachedResources = seq(() => super.resources).cache()
         return seq(function* () {
-            for (const em of boundExports() as Rsc_Top[]) {
-                if (FwRef.is(em)) {
-                    throw new Error(
-                        `FwRef ${em} cannot be directly exported from ChildOrigin ${self.name}`
+            for (const resource of boundExports() as K8sResource[]) {
+                if (ForwardRef.is(resource)) {
+                    throw new K8tsGraphError(
+                        `FwRef ${resource} cannot be directly exported from ChildOrigin ${self.name}`
                     )
                 }
-                if (em instanceof Origin_Entity || Rsc_FwRef_Exports.is(em)) {
+                if (resource instanceof OriginEntity || ForwardExports.is(resource)) {
                     // Skip Origin entities. Later we go over attachedResources and after evaluating
                     // these exports, any resources attached to child Origins will be included.
                     continue
                 }
 
-                allEmitted.add(em)
-                if (em["__origin__"]().equals(self)) {
+                allEmitted.add(resource)
+                if (resource["__origin__"].equals(self)) {
                     // Means it's being exported for the first time
+                    resource.metadata.add("#k8ts.org/exported", "true")
                     self.__emit__("resource/exported", {
                         origin: self,
-                        resource: em
+                        resource: resource
                     })
                 }
-                yield em
+                yield resource
             }
             for (const resource of attachedResources) {
                 if (!allEmitted.has(resource)) {

package/src/core/graph/origin/index.ts

@@ -1,7 +1,9 @@
-export * from "./entity"
+export * from "./dummy"
 export * from "./events"
 export * from "./exporter"
-export * from "./external"
 export * from "./kind-map"
-export * from "./node"
+export * from "./origin"
+export * from "./props"
+export * from "./template"
 export * from "./tracker"
+export * from "./vertex"