@firestartr/cli 1.43.2-snapshot2 → 1.43.2

package/build/index.js

@@ -282292,44 +282292,92 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
 
 
 
+
+
 const lazy_loader_log = src_default()('firestartr:renderer:lazy_loader');
-async function loadClaim(claimRef, org, defaults, patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, cwd, existingRefs = {}) {
+// We need to ensure the grep command is a gnu version
+let IS_GNU_GREP = false;
+let GREP_ON_CHECK = false;
+// this loop is for avoid race conditions
+// once a check is running no more checks
+async function waitForCheck() {
+    const f_wait = () => new Promise((timeOut) => setTimeout(timeOut, 10));
+    do {
+        await f_wait();
+    } while (GREP_ON_CHECK);
+}
+function checkGrep() {
+    return new Promise((ok, ko) => {
+        // idempotency: already checked
+        if (IS_GNU_GREP)
+            return ok();
+        // a check is already running no new checks
+        if (GREP_ON_CHECK)
+            return waitForCheck();
+        lazy_loader_log('Checking the grep command');
+        GREP_ON_CHECK = true;
+        const handler = (0,external_node_child_process_namespaceObject.spawn)('grep', ['--version']);
+        handler.on('close', (code) => {
+            GREP_ON_CHECK = false;
+            if (code === 0) {
+                lazy_loader_log('Grep is a gnu grep');
+                IS_GNU_GREP = true;
+                ok();
+            }
+            else {
+                ko('Lazy evaluation needs a gnu-grep command');
+            }
+        });
+    });
+}
+async function loadClaim(claimRef, org, defaults = loadClaimDefaults(), patchClaim = loader_patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, cwd, existingRefs = {}) {
+    await checkGrep();
     let result = existingRefs;
     lazy_loader_log(`Load reference ${claimRef}`);
     initVirtualClaims(org);
     lazy_loader_log(`Load reference (parts) ${claimRef.split(/-/)[0]} ${claimRef.replace(/^[^-]+-/, '')}`);
     // cargas datos con grep
-    const claimData = await lazyGetClaim(claimRef.split(/-/)[0], claimRef.replace(/^[^-]+-/, ''), org, cwd);
-    // const claim: any = patchClaim(common.io.fromYaml(claimData), defaults);
-    const claim = catalog_common.io.fromYaml(claimData);
     try {
-        validateClaim(claim, base[`${claim.kind}Schema`]);
-        await optionalValidation(claim);
-    }
-    catch (error) {
-        throw new Error(`Error when validating claim ${claimRef}: ${error}`);
-    }
-    result[claimRef] = {};
-    result[claimRef]['claim'] = claim;
-    result[claimRef]['claimPath'] = VisitedClaims[claimRef];
-    if (VisitedClaims[claimRef] === 'virtual') {
-        result = await setVirtualClaimAdditionalData(result, claim, claimRef);
-    }
-    else {
-        result = await setNonVirtualClaimAdditionalData(result, claim, claimRef, loadInitializers, loadGlobals, loadOverrides, loadNormalizers);
-    }
-    const claimKind = claim.kind;
-    const references = extractAllRefs(catalog_common.io.toYaml(claim));
-    for (const ref of references) {
-        if (!result[ref]) {
-            const resolvedReferences = await loadClaim(ref, org, defaults, patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, cwd, result);
-            result = lodash_default().merge(result, resolvedReferences);
+        const claimData = await lazyGetClaim(claimRef.split(/-/)[0], claimRef.replace(/^[^-]+-/, ''), org, cwd);
+        const claim = patchClaim(catalog_common.io.fromYaml(claimData), defaults);
+        try {
+            validateClaim(claim, base[`${claim.kind}Schema`]);
+            await optionalValidation(claim);
         }
+        catch (error) {
+            let errorMsg = '';
+            for (const data of error) {
+                errorMsg = `${errorMsg}
+- ${data.dataPath}: ${data.message}`;
+            }
+            throw new Error(`Error when validating claim ${claimRef}: ${errorMsg}`);
+        }
+        result[claimRef] = {};
+        result[claimRef]['claim'] = claim;
+        result[claimRef]['claimPath'] = VisitedClaims[claimRef];
+        if (VisitedClaims[claimRef] === 'virtual') {
+            result = await setVirtualClaimAdditionalData(result, claim, claimRef);
+        }
+        else {
+            result = await setNonVirtualClaimAdditionalData(result, claim, claimRef, loadInitializers, loadGlobals, loadOverrides, loadNormalizers);
+        }
+        const claimKind = claim.kind;
+        const references = extractAllRefs(catalog_common.io.toYaml(claim));
+        for (const ref of references) {
+            if (!result[ref]) {
+                const resolvedReferences = await loadClaim(ref, org, defaults, patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, cwd, result);
+                result = lodash_default().merge(result, resolvedReferences);
+            }
+        }
+    }
+    catch (err) {
+        throw `Lazy Loading: ${err}`;
     }
     return result;
 }
 const LoadedClaims = {};
 const VisitedClaims = {};
+const DuplicatedClaims = {};
 async function lazyGetClaim(kind, name, org, cwd) {
     const indice = `${kind}-${name}`;
     lazy_loader_log(`Lazy loading ${kind}-${name} with index ${indice}`);
@@ -282372,14 +282420,14 @@ async function getClaimsByName(name, cwd = '.') {
             }
         });
         handler.on('close', () => {
-            Promise.all(entradas.map((entrada) => {
+            return Promise.all(entradas.map((entrada) => {
                 return loadRawClaim(entrada);
             }))
                 .then(() => {
                 ok();
             })
-                .catch(() => {
-                ko();
+                .catch((err) => {
+                ko(err);
             });
         });
     });
@@ -282393,9 +282441,17 @@ async function loadRawClaim(entry) {
             if (!('kind' in claim && 'name' in claim)) {
                 lazy_loader_log(`Invalid claim file ${entry}`);
             }
-            LoadedClaims[`${claim.kind}-${claim.name}`] = data;
-            VisitedClaims[`${claim.kind}-${claim.name}`] = entry;
-            ok();
+            else {
+                const claimKey = `${claim.kind}-${claim.name}`;
+                if (Object.keys(DuplicatedClaims).includes(claimKey) &&
+                    DuplicatedClaims[claimKey] !== entry) {
+                    return ko(`Duplicated claim ${claimKey} found files: ${DuplicatedClaims[claimKey]} and ${entry}`);
+                }
+                LoadedClaims[claimKey] = data;
+                VisitedClaims[claimKey] = entry;
+                DuplicatedClaims[claimKey] = entry;
+                ok();
+            }
         });
     });
 }
@@ -282617,7 +282673,7 @@ async function loadClaims(claimsPath = config_getPath('claims')) {
     await crawler_crawl(claimsPath, (entry) => {
         return isYamlFile.test(entry);
     }, async (entry, data) => {
-        const claim = patchClaim(catalog_common.io.fromYaml(data), defaultsClaims);
+        const claim = loader_patchClaim(catalog_common.io.fromYaml(data), defaultsClaims);
         if (!('kind' in claim && 'name' in claim)) {
             throw new Error(`Invalid claim file ${entry}`);
         }
@@ -282654,7 +282710,7 @@ function loadClaimDefaults() {
  * - The patched claim
  *
  */
-function patchClaim(claim, defaultsClaims) {
+function loader_patchClaim(claim, defaultsClaims) {
     if (defaultsClaims[claim.kind]) {
         const jsonPatchOps = fast_json_patch.compare(claim, defaultsClaims[claim.kind])
             .filter((jp) => {
@@ -282798,7 +282854,7 @@ async function loadClaimsList(claimRefList, claimsPath = config_getPath('claims'
     };
     const defaults = loadClaimDefaults();
     for (const claimRef of claimRefList) {
-        const renderedClaimData = await loadClaim(claimRef, getOrg(), defaults, patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, claimsPath);
+        const renderedClaimData = await loadClaim(claimRef, getOrg(), defaults, loader_patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, claimsPath);
         data.renderClaims = lodash_default().merge(data.renderClaims, renderedClaimData);
     }
     const crClaimReferences = [];
@@ -284378,7 +284434,7 @@ class FeaturesOverrider extends OverriderPatches {
     }
     async __patches(claim, _previousCR) {
         const featureName = this.featureName;
-        const featureVersion = this.featureVersion;
+        const featureVersion = this.featureVersion || this.featureRef;
         const featureArgs = this.featureArgs;
         const fSetUpAndRunRenderer = function (cr) {
             return this.setUpAndRunRenderer(cr);

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: Record<string, never> | {
+        author: {
             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;
-        };
-        committer: Record<string, never> | {
+        } | Record<string, never>;
+        committer: {
             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.43.2-snapshot2+PR1060",
+  "version": "1.43.2",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",