@firestartr/cli 1.39.2-SNAPSHOT → 1.39.3-SNAPSHOT

package/build/index.js

@@ -287249,37 +287249,27 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
 
 
 const lazy_loader_log = src_default()('firestartr:renderer:lazy_loader');
-async function loadClaim(claimRef, defaults, patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, cwd) {
-    try {
-        let result = {};
-        // cargas datos con grep
-        const claimData = await lazyGetClaim(claimRef.split(/-/)[0], claimRef.replace(/^[^-]+-/, ''), cwd);
-        const claim = patchClaim(catalog_common.io.fromYaml(claimData), defaults);
-        result[claimRef] = {};
-        result[claimRef]['claim'] = claim;
-        result[claimRef]['claimPath'] = VisitedClaims[claimRef];
-        result[claimRef]['initializers'] = await loadInitializers(claim);
-        result[claimRef]['globals'] = await loadGlobals(claim);
-        result[claimRef]['overrides'] = loadOverrides(claim);
-        result[claimRef]['normalizers'] = await loadNormalizers(claim, result[claimRef]['claimPath']);
-        const claimKind = claim.kind;
-        const references = extractAllRefs(claimData);
-        for (const ref of references) {
-            if (!result[ref]) {
-                const resolvedReferences = await loadClaim(ref, defaults, patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, cwd);
-                result = lodash_default().merge(result, resolvedReferences);
-            }
-        }
-        return result;
-    }
-    catch (e) {
-        if (e.message.indexOf(claimRef) > -1) {
-            throw new Error(`Error when loading main claim ${claimRef}: ${e.message}`);
-        }
-        else {
-            throw new Error(`Error when loading dependency: ${e.message}`);
+async function loadClaim(claimRef, defaults, patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, cwd, existingRefs = {}) {
+    let result = existingRefs;
+    // cargas datos con grep
+    const claimData = await lazyGetClaim(claimRef.split(/-/)[0], claimRef.replace(/^[^-]+-/, ''), cwd);
+    const claim = patchClaim(catalog_common.io.fromYaml(claimData), defaults);
+    result[claimRef] = {};
+    result[claimRef]['claim'] = claim;
+    result[claimRef]['claimPath'] = VisitedClaims[claimRef];
+    result[claimRef]['initializers'] = await loadInitializers(claim);
+    result[claimRef]['globals'] = await loadGlobals(claim);
+    result[claimRef]['overrides'] = loadOverrides(claim);
+    result[claimRef]['normalizers'] = await loadNormalizers(claim, result[claimRef]['claimPath']);
+    const claimKind = claim.kind;
+    const references = extractAllRefs(claimData);
+    for (const ref of references) {
+        if (!result[ref]) {
+            const resolvedReferences = await loadClaim(ref, defaults, patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, cwd, result);
+            result = lodash_default().merge(result, resolvedReferences);
         }
     }
+    return result;
 }
 const LoadedClaims = {};
 const VisitedClaims = {};
@@ -293186,7 +293176,7 @@ async function runRenderer(globalsPath, initializersPath, claimsPath, crsPath, c
     });
     let claimRefsList = [];
     if (claimRefs) {
-        claimRefsList = claimRefs.replace(/\s/, '').split(',');
+        claimRefsList = claimRefs.replace(/\s/g, '').split(',');
     }
     await renderer_render(catalogApp, firestartrApp, validateReferentialIntegrity === 'enabled' ? true : false, claimRefsList);
     catalogApp.synth();

package/build/packages/cdk8s_renderer/src/loader/lazy_loader.d.ts

@@ -2,4 +2,4 @@ import { InitializerPatches } from '../initializers/base';
 import { GlobalSection } from '../globals/base';
 import { OverriderPatches } from '../overriders/base';
 import { Normalizer } from '../normalizers/base';
-export declare function loadClaim(claimRef: string, defaults: any, patchClaim: (claim: any, defaults: any) => any, loadInitializers: (claim: any) => Promise<InitializerPatches[]>, loadGlobals: (claim: any) => Promise<GlobalSection[]>, loadOverrides: (claim: any) => OverriderPatches[], loadNormalizers: (claim: any, path: string) => Promise<Normalizer[]>, cwd?: string): Promise<{}>;
+export declare function loadClaim(claimRef: string, defaults: any, patchClaim: (claim: any, defaults: any) => any, loadInitializers: (claim: any) => Promise<InitializerPatches[]>, loadGlobals: (claim: any) => Promise<GlobalSection[]>, loadOverrides: (claim: any) => OverriderPatches[], loadNormalizers: (claim: any, path: string) => Promise<Normalizer[]>, cwd?: string, existingRefs?: any): Promise<any>;

package/build/packages/github/src/branches.d.ts

@@ -428,7 +428,7 @@ export declare function getBranch(repo: string, branch: string, owner?: string):
                 verified_at: string;
             };
         };
-        author: {
+        author: Record<string, never> | {
             name?: string;
             email?: string;
             login: string;
@@ -451,8 +451,8 @@ export declare function getBranch(repo: string, branch: string, owner?: string):
             site_admin: boolean;
             starred_at?: string;
             user_view_type?: string;
-        } | Record<string, never>;
-        committer: {
+        };
+        committer: Record<string, never> | {
             name?: string;
             email?: string;
             login: string;
@@ -475,7 +475,7 @@ export declare function getBranch(repo: string, branch: string, owner?: string):
             site_admin: boolean;
             starred_at?: string;
             user_view_type?: string;
-        } | Record<string, never>;
+        };
         parents: {
             sha: string;
             url: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestartr/cli",
-  "version": "1.39.2-SNAPSHOT+PR934",
+  "version": "1.39.3-SNAPSHOT+PR934",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",