k8ts 0.2.0 → 0.4.1

package/dist/runner/exporter/loader.js

@@ -11,6 +11,7 @@ const immutable_1 = require("immutable");
 const error_1 = require("../../error");
 const meta_1 = require("./meta");
 class ResourceLoader extends emittery_1.default {
+    _options;
     constructor(_options) {
         super();
         this._options = _options;
@@ -22,15 +23,18 @@ class ResourceLoader extends emittery_1.default {
         });
     }
     async load(input) {
-        let resources = (0, immutable_1.List)();
-        (0, doddle_1.seq)(input).drain().pull();
-        for (let res of input.__node__.resources) {
-            const origin = res.origin;
-            if (!origin.isChildOf(origin)) {
-                throw new error_1.MakeError(`Resource ${res} is not a child of the input file ${input}`);
+        // TODO: Handle ORIGINS that are referenced but not passed to the runner
+        const parentOrigin = input.__node__;
+        const addResource = async (res) => {
+            if (resources.has(res)) {
+                return;
             }
-            if (instruments_1.ForwardRef.is(res)) {
-                throw new error_1.MakeError(`Resource ${res} is a forward reference`);
+            if (!res.isRoot) {
+                return;
+            }
+            const origin = res.origin;
+            if (!origin.isChildOf(parentOrigin)) {
+                return;
             }
             const event = {
                 isExported: res.meta.has(`#${meta_1.k8ts_namespace}is-exported`),
@@ -38,10 +42,29 @@ class ResourceLoader extends emittery_1.default {
             };
             this._attachSourceAnnotations(event);
             await this.emit("load", event);
-            resources = resources.push(res);
+            resources = resources.add(res);
+        };
+        let resources = (0, immutable_1.Set)();
+        // We execute the main FILE iterable to load all the resources attached to the origin
+        (0, doddle_1.seq)(input).drain().pull();
+        for (let res of input.__node__.resources) {
+            if (instruments_1.ForwardRef.is(res)) {
+                throw new error_1.MakeError(`Resource ${res} is a forward reference`);
+            }
+            await addResource(res);
+        }
+        // Some resources might appear as dependencies to sub-resources that
+        // haven't loaded. We can acquire them by getting all the needed resources
+        for (const resource of resources.toArray()) {
+            for (const relation of resource.recursiveRelationsSubtree) {
+                await addResource(relation.needed);
+            }
+        }
+        // The lazy sections might have attached more resources to the origin
+        for (const resource of parentOrigin.resources) {
+            await addResource(resource);
         }
         return resources.toArray();
     }
 }
 exports.ResourceLoader = ResourceLoader;
-//# sourceMappingURL=loader.js.map

package/dist/runner/exporter/manifester.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manifester.d.ts","sourceRoot":"","sources":["../../../src/runner/exporter/manifester.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAiB,MAAM,mBAAmB,CAAA;AAC7E,OAAO,QAAQ,MAAM,UAAU,CAAA;AAK/B,MAAM,WAAW,iBAAiB;IAC9B,GAAG,CAAC,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,UAAW,SAAQ,QAAQ,CAAC,qBAAqB,CAAC;IAC/C,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,iBAAiB;IAGxD,OAAO,CAAC,0BAA0B;IAelC,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,SAAS;IAOjB,OAAO,CAAC,4BAA4B;IAY9B,QAAQ,CAAC,GAAG,EAAE,YAAY;CAMnC;AACD,MAAM,WAAW,uBAAuB;IACpC,QAAQ,EAAE,YAAY,CAAA;CACzB;AAED,MAAM,WAAW,qBAAqB;IAClC,QAAQ,EAAE,uBAAuB,CAAA;CACpC"}
+{"version":3,"file":"manifester.d.ts","sourceRoot":"","sources":["../../../src/runner/exporter/manifester.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAC9D,OAAO,QAAQ,MAAM,UAAU,CAAA;AAK/B,MAAM,WAAW,iBAAiB;IAC9B,GAAG,CAAC,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,UAAW,SAAQ,QAAQ,CAAC,qBAAqB,CAAC;IAC/C,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,iBAAiB;IAGxD,OAAO,CAAC,0BAA0B;IAelC,OAAO,CAAC,mBAAmB;YAgBb,SAAS;IAOvB,OAAO,CAAC,4BAA4B;IAU9B,QAAQ,CAAC,GAAG,EAAE,YAAY;CAMnC;AACD,MAAM,WAAW,uBAAuB;IACpC,QAAQ,EAAE,YAAY,CAAA;CACzB;AAED,MAAM,WAAW,qBAAqB;IAClC,QAAQ,EAAE,uBAAuB,CAAA;CACpC"}

package/dist/runner/exporter/manifester.js

@@ -4,12 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Manifester = void 0;
-const instruments_1 = require("@k8ts/instruments");
 const emittery_1 = __importDefault(require("emittery"));
 const lodash_1 = require("lodash");
 const version_1 = require("../../version");
 const meta_1 = require("./meta");
 class Manifester extends emittery_1.default {
+    _options;
     constructor(_options) {
         super();
         this._options = _options;
@@ -44,15 +44,13 @@ class Manifester extends emittery_1.default {
         const clone = (0, lodash_1.cloneDeep)(manifest);
         return (0, lodash_1.cloneDeepWith)(clone, _cleanKeys);
     }
-    _generate(resource) {
-        const manifest = resource["manifest"]();
+    async _generate(resource) {
+        const manifest = await resource["manifest"]();
         const noNullish = this._cleanNullishValues(manifest);
         const noEmpty = this._cleanSpecificEmptyObjects(noNullish);
         return noEmpty;
     }
     _attachProductionAnnotations(resource) {
-        const origin = resource.origin;
-        const entry = instruments_1.TraceEmbedder.get(resource);
         const loc = resource.trace.format({
             cwd: this._options.cwd
         });
@@ -64,9 +62,8 @@ class Manifester extends emittery_1.default {
     async generate(res) {
         this._attachProductionAnnotations(res);
         await this.emit("manifest", { resource: res });
-        const manifest = this._generate(res.entity);
+        const manifest = await this._generate(res.entity);
         return manifest;
     }
 }
 exports.Manifester = Manifester;
-//# sourceMappingURL=manifester.js.map

package/dist/runner/exporter/meta.js

@@ -2,4 +2,3 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.k8ts_namespace = void 0;
 exports.k8ts_namespace = "k8ts.org/";
-//# sourceMappingURL=meta.js.map

package/dist/runner/exporter/progress-shower.js

@@ -14,6 +14,7 @@ function typedOnAny(target, handler) {
     });
 }
 class ProgressShower {
+    _options;
     constructor(_options) {
         this._options = _options;
     }
@@ -65,4 +66,3 @@ class ProgressShower {
     }
 }
 exports.ProgressShower = ProgressShower;
-//# sourceMappingURL=progress-shower.js.map

package/dist/runner/exporter/saver.js

@@ -8,10 +8,11 @@ const emittery_1 = __importDefault(require("emittery"));
 const promises_1 = require("fs/promises");
 const path_1 = require("path");
 class ManifestSaver extends emittery_1.default {
+    _options;
+    _encoder = new TextEncoder();
     constructor(_options) {
         super();
         this._options = _options;
-        this._encoder = new TextEncoder();
     }
     _splat(manifests) {
         return manifests.join("\n---\n");
@@ -46,4 +47,3 @@ class ManifestSaver extends emittery_1.default {
     }
 }
 exports.ManifestSaver = ManifestSaver;
-//# sourceMappingURL=saver.js.map

package/dist/runner/exporter/serializer.js

@@ -10,6 +10,7 @@ const js_yaml_1 = require("js-yaml");
 const _imports_1 = require("../../_imports");
 const error_1 = require("../../error");
 class YamlSerializer extends emittery_1.default {
+    _options;
     constructor(_options) {
         super();
         this._options = _options;
@@ -44,4 +45,3 @@ class YamlSerializer extends emittery_1.default {
     }
 }
 exports.YamlSerializer = YamlSerializer;
-//# sourceMappingURL=serializer.js.map

package/dist/runner/exporter/stage.js

@@ -33,10 +33,6 @@ var __runInitializers = (this && this.__runInitializers) || function (thisArg, i
     }
     return useValue ? value : void 0;
 };
-var __setFunctionName = (this && this.__setFunctionName) || function (f, name, prefix) {
-    if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
-    return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -53,7 +49,17 @@ let Stage = (() => {
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
-    var Stage = _classThis = class {
+    var Stage = class {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            Stage = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        stage;
+        text;
         constructor(stage) {
             this.stage = stage;
             this.text = `${stage.toUpperCase()}`;
@@ -77,18 +83,9 @@ let Stage = (() => {
             }
         }
     };
-    __setFunctionName(_classThis, "Stage");
-    (() => {
-        const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
-        __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
-        Stage = _classThis = _classDescriptor.value;
-        if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-        __runInitializers(_classThis, _classExtraInitializers);
-    })();
     return Stage = _classThis;
 })();
 exports.Stage = Stage;
 function stage(stage) {
     return new Stage(stage);
 }
-//# sourceMappingURL=stage.js.map

package/dist/runner/exporter/trace-embedder.d.ts

@@ -1 +1,2 @@
+export {};
 //# sourceMappingURL=trace-embedder.d.ts.map

package/dist/runner/exporter/trace-embedder.js

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

package/dist/runner/index.js

@@ -15,4 +15,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./runner"), exports);
-//# sourceMappingURL=index.js.map

package/dist/runner/proverbs.d.ts

@@ -1 +1,2 @@
+export {};
 //# sourceMappingURL=proverbs.d.ts.map

package/dist/runner/proverbs.js

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

package/dist/runner/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/runner/runner.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAE9B,OAAO,EAAa,gBAAgB,EAAE,eAAe,EAAkB,MAAM,YAAY,CAAA;AAKzF,MAAM,WAAW,aAAc,SAAQ,gBAAgB;IACnD,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,QAAQ,EAAE,eAAe,CAAA;CAC5B;AAED,qBAAa,MAAM;IACH,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,aAAa;IAE9C,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;CAgCxC"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/runner/runner.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAE9B,OAAO,EAAa,gBAAgB,EAAE,eAAe,EAAkB,MAAM,YAAY,CAAA;AAKzF,MAAM,WAAW,aAAc,SAAQ,gBAAgB;IACnD,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,QAAQ,EAAE,eAAe,CAAA;CAC5B;AAED,qBAAa,MAAM;IACH,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,aAAa;IAE9C,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;CAmCxC"}

package/dist/runner/runner.js

@@ -14,12 +14,16 @@ const meta_1 = require("./exporter/meta");
 const proverbs_1 = require("./silly/proverbs");
 const summarizer_1 = require("./summarizer");
 class Runner {
+    _options;
     constructor(_options) {
         this._options = _options;
     }
     async run(input) {
-        const proverbs = await proverbs_1.Proverbs.make(paths_1.proverbsPath);
-        console.log(chalk_1.default.italic.magentaBright(proverbs.random));
+        try {
+            const proverbs = await proverbs_1.Proverbs.make(paths_1.proverbsPath);
+            console.log(chalk_1.default.italic.magentaBright(proverbs.random));
+        }
+        catch { }
         const gitInfo = await instruments_1.GitTrace.make({
             cwd: this._options.cwd
         });
@@ -48,4 +52,3 @@ class Runner {
     }
 }
 exports.Runner = Runner;
-//# sourceMappingURL=runner.js.map

package/dist/runner/silly/proverbs.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Proverbs = void 0;
 const promises_1 = require("fs/promises");
 class Proverbs {
+    _proverbs;
     constructor(_proverbs) {
         this._proverbs = _proverbs;
     }
@@ -17,4 +18,3 @@ class Proverbs {
     }
 }
 exports.Proverbs = Proverbs;
-//# sourceMappingURL=proverbs.js.map

package/dist/runner/summarizer.d.ts

@@ -1,4 +1,4 @@
-import { NeedsEdge, Origin, ResourceNode } from "@k8ts/instruments";
+import { Origin, Relation, ResourceNode } from "@k8ts/instruments";
 import { AssembledResult } from "./exporter";
 export interface SummarizerOptions {
     printOptions?: boolean;
@@ -7,7 +7,7 @@ export declare class Summarizer {
     private readonly _options;
     private _post;
     constructor(_options: SummarizerOptions);
-    _formatRefFromTo(node: ResourceNode, edge: NeedsEdge<ResourceNode>): `K8TS_TOK_${string}`;
+    _formatRefFromTo(node: ResourceNode, edge: Relation<ResourceNode>): `K8TS_TOK_${string}`;
     private _token;
     private _resource;
     private _resources;

package/dist/runner/summarizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"summarizer.d.ts","sourceRoot":"","sources":["../../src/runner/summarizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,SAAS,EACT,MAAM,EAEN,YAAY,EAEf,MAAM,mBAAmB,CAAA;AAI1B,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC5C,MAAM,WAAW,iBAAiB;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAA;CACzB;AACD,qBAAa,UAAU;IAEP,OAAO,CAAC,QAAQ,CAAC,QAAQ;IADrC,OAAO,CAAC,KAAK,CAA0B;gBACV,QAAQ,EAAE,iBAAiB;IACxD,gBAAgB,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,CAAC,YAAY,CAAC;IAIlE,OAAO,CAAC,MAAM;IAQd,OAAO,CAAC,SAAS;IAmBjB,OAAO,CAAC,UAAU;IAoBlB,OAAO,CAAC,KAAK;IAgBb,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,WAAW;IAenB,MAAM,CAAC,MAAM,EAAE,eAAe;IAgB9B,KAAK,CAAC,GAAG,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,YAAY,EAAE,CAAA;KAAE,EAAE;CAU7D"}
+{"version":3,"file":"summarizer.d.ts","sourceRoot":"","sources":["../../src/runner/summarizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,MAAM,EAEN,QAAQ,EACR,YAAY,EAEf,MAAM,mBAAmB,CAAA;AAI1B,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC5C,MAAM,WAAW,iBAAiB;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAA;CACzB;AACD,qBAAa,UAAU;IAEP,OAAO,CAAC,QAAQ,CAAC,QAAQ;IADrC,OAAO,CAAC,KAAK,CAA0B;gBACV,QAAQ,EAAE,iBAAiB;IACxD,gBAAgB,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,CAAC,YAAY,CAAC;IAIjE,OAAO,CAAC,MAAM;IAQd,OAAO,CAAC,SAAS;IAmBjB,OAAO,CAAC,UAAU;IAoBlB,OAAO,CAAC,KAAK;IAgBb,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,WAAW;IAenB,MAAM,CAAC,MAAM,EAAE,eAAe;IAgB9B,KAAK,CAAC,GAAG,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,YAAY,EAAE,CAAA;KAAE,EAAE;CAU7D"}

package/dist/runner/summarizer.js

@@ -6,9 +6,10 @@ const metadata_1 = require("@k8ts/metadata");
 const immutable_1 = require("immutable");
 const js_yaml_1 = require("js-yaml");
 class Summarizer {
+    _options;
+    _post = new instruments_1.TextPostProcessor();
     constructor(_options) {
         this._options = _options;
-        this._post = new instruments_1.TextPostProcessor();
     }
     _formatRefFromTo(node, edge) {
         return this._token((0, instruments_1.pretty) `${edge}`);
@@ -29,7 +30,7 @@ class Summarizer {
         })
             .toArray()
             .pull();
-        const depends = resource.needs
+        const depends = resource.relations
             .map(x => this._formatRefFromTo(resource, x))
             .toArray()
             .pull();
@@ -112,4 +113,3 @@ class Summarizer {
     }
 }
 exports.Summarizer = Summarizer;
-//# sourceMappingURL=summarizer.js.map