@genesislcap/foundation-cli 14.436.0-FUI-2489.2 → 14.437.0

package/dist/plop/generators/dslApp/create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/plop/generators/dslApp/create.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAwBhD,eAAO,MAAM,qBAAqB,EAAE,mBAqDnC,CAAC"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/plop/generators/dslApp/create.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAyBhD,eAAO,MAAM,qBAAqB,EAAE,mBAqDnC,CAAC"}

package/dist/plop/generators/dslApp/create.js

@@ -4,6 +4,7 @@ exports.createDslAppGenerator = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const types_1 = require("../../../types");
+const types_2 = require("../../../types");
 const utils_1 = require("../../../utils");
 const fileSystem_1 = require("../../actions/fileSystem");
 const npm_1 = require("../../actions/npm");
@@ -31,7 +32,7 @@ exports.createDslAppGenerator = {
             prevAns = applyRuntimeArgs(prevAns);
             const seedList = (yield (0, tasks_1.downloadSeedList)('apps')).filter((seed) => { var _a; return (_a = seed.tags) === null || _a === void 0 ? void 0 : _a.includes(types_1.DslTag); });
             if (seedList.length === 0) {
-                throw new Error(`No compatible ${types_1.dslName.toLowerCase()} seeds found, unable to proceed.`);
+                throw new Error(`No compatible ${types_2.dslName.toLowerCase()} seeds found, unable to proceed.`);
             }
             let { appDirectory, appName, appSeed } = yield (0, dsl_1.default)(inquirer, prevAns, seedList);
             appSeed = yield (0, normalizers_1.seedSelectionNormalizer)(inquirer, appSeed);

package/dist/plop/generators/generatorChain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generatorChain.d.ts","sourceRoot":"","sources":["../../../src/plop/generators/generatorChain.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAGtE;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,cAAc,GACzB,MAAM,WAAW,EACjB,aAAa,MAAM,EACnB,YAAY,mBAAmB,EAAE,EACjC,SAAS,MAAM,EAAE,EACjB,UAAS,OAAoB,KAC5B,mBAsBF,CAAC;AAKF,eAAO,MAAM,sBAAsB,GAAI,WAAW,mBAAmB,wBAAc,CAAC"}
+{"version":3,"file":"generatorChain.d.ts","sourceRoot":"","sources":["../../../src/plop/generators/generatorChain.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAGtE;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,cAAc,GACzB,MAAM,WAAW,EACjB,aAAa,MAAM,EACnB,YAAY,mBAAmB,EAAE,EACjC,SAAS,MAAM,EAAE,EACjB,UAAS,OAAoB,KAC5B,mBAoBF,CAAC;AAKF,eAAO,MAAM,sBAAsB,GAAI,WAAW,mBAAmB,wBAAc,CAAC"}

package/dist/plop/generators/generatorChain.js

@@ -23,15 +23,14 @@ const generatorChain = (plop, description, generators, bypass, actions = [' Done
         /**
          * The answers from one iteration are used as previous answers input to the next, so we need to turn this rule off.
          */
+        /* eslint-disable no-await-in-loop */
         prompts(inquirer_1) {
             return tslib_1.__awaiter(this, arguments, void 0, function* (inquirer, prevAns = {}) {
                 let allAns = Object.assign({}, prevAns);
-                /* oxlint-disable no-await-in-loop -- plop generators must run in order with merged answers */
                 for (const generator of generators) {
                     const [data, outcome] = yield generator_1.GeneratorActions.run(generator, allAns, plop, bypass);
                     allAns = Object.assign(Object.assign({}, allAns), data);
                 }
-                /* oxlint-enable no-await-in-loop */
                 return allAns;
             });
         },

package/dist/plop/prompts/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/plop/prompts/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAc,WAAW,EAAgB,MAAM,aAAa,CAAC;AAMpE,MAAM,WAAW,OAAO;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,WAAW,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB;yBAGC,UAAU,QAAQ,EAClB,SAAS,OAAO,CAAC,OAAO,CAAM,EAC9B,UAAU,WAAW,EAAE,KACtB,OAAO,CAAC,OAAO,CAAC;AAJnB,wBA0DE"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/plop/prompts/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAc,WAAW,EAAE,MAAM,aAAa,CAAC;AAOtD,MAAM,WAAW,OAAO;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,WAAW,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB;yBAGC,UAAU,QAAQ,EAClB,SAAS,OAAO,CAAC,OAAO,CAAM,EAC9B,UAAU,WAAW,EAAE,KACtB,OAAO,CAAC,OAAO,CAAC;AAJnB,wBA0DE"}

package/dist/plop/prompts/app.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const seeds_1 = require("../../seeds");
+const seeds_2 = require("../../seeds");
 const store_1 = require("../../store");
 const utils_1 = require("../../utils");
 const messages_1 = require("../messages");
@@ -40,8 +41,8 @@ exports.default = (inquirer_1, ...args_1) => tslib_1.__awaiter(void 0, [inquirer
             name: 'seedDelivery',
             type: 'list',
             message: 'Seed delivery (Cloning requires an SSH key with a blank passphrase configured for your account)',
-            default: seeds_1.SeedDelivery.download,
-            choices: [seeds_1.SeedDelivery.download, seeds_1.SeedDelivery.clone],
+            default: seeds_2.SeedDelivery.download,
+            choices: [seeds_2.SeedDelivery.download, seeds_2.SeedDelivery.clone],
             when: (data) => !store_1.configStore.values.external && data.appSeed.type !== seeds_1.SeedSource.local,
         },
     ]);

package/dist/plop/prompts/dsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dsl.d.ts","sourceRoot":"","sources":["../../../src/plop/prompts/dsl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAK1C,MAAM,WAAW,OAAO;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,WAAW,CAAC;CACtB;yBAGC,UAAU,QAAQ,EAClB,SAAS,OAAO,CAAC,OAAO,CAAM,EAC9B,UAAU,WAAW,EAAE,KACtB,OAAO,CAAC,OAAO,CAAC;AAJnB,wBA+CE"}
+{"version":3,"file":"dsl.d.ts","sourceRoot":"","sources":["../../../src/plop/prompts/dsl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAM1C,MAAM,WAAW,OAAO;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,WAAW,CAAC;CACtB;yBAGC,UAAU,QAAQ,EAClB,SAAS,OAAO,CAAC,OAAO,CAAM,EAC9B,UAAU,WAAW,EAAE,KACtB,OAAO,CAAC,OAAO,CAAC;AAJnB,wBA+CE"}

package/dist/plop/prompts/dsl.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const utils_1 = require("../../utils");
+const utils_2 = require("../../utils");
 const messages_1 = require("../messages");
 const validators_1 = require("../validators");
 exports.default = (inquirer_1, ...args_1) => tslib_1.__awaiter(void 0, [inquirer_1, ...args_1], void 0, function* (inquirer, prevAns = {}, seedList) {
@@ -32,7 +33,7 @@ exports.default = (inquirer_1, ...args_1) => tslib_1.__awaiter(void 0, [inquirer
             name: 'appSeed',
             type: 'list',
             message: 'App seed',
-            choices: (0, utils_1.mapToSeedChoices)(seedList),
+            choices: (0, utils_2.mapToSeedChoices)(seedList),
         },
     ]);
     return {

package/dist/plop/validators/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plop/validators/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGnC,MAAM,MAAM,iBAAiB,GAAG,OAAO,GAAG,MAAM,CAAC;AAYjD,eAAO,MAAM,QAAQ,GAAI,OAAO,MAAM,KAAG,iBACwD,CAAC;AAElG,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,KAAG,iBAW3C,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,SAAS,OAAO,EAAE,KAAG,iBACS,CAAC;AAE1D,eAAO,MAAM,qBAAqB,GAAI,OAAO,MAAM,KAAG,iBAGL,CAAC;AAElD,eAAO,MAAM,sBAAsB,GAAI,OAAO,MAAM,KAAG,iBACU,CAAC;AAElE,eAAO,MAAM,QAAQ,GAAI,OAAO,MAAM,KAAG,iBAEuE,CAAC;AAEjH,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,KAAG,iBACI,CAAC;AAExD,eAAO,MAAM,iBAAiB,GAAI,OAAO,MAAM,KAAG,iBACY,CAAC;AAE/D,eAAO,MAAM,mBAAmB,GAAI,OAAO,MAAM,KAAG,iBACM,CAAC;AAE3D,eAAO,MAAM,sBAAsB,GAAI,OAAO,MAAM,KAAG,iBACkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plop/validators/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGnC,MAAM,MAAM,iBAAiB,GAAG,OAAO,GAAG,MAAM,CAAC;AAajD,eAAO,MAAM,QAAQ,GAAI,OAAO,MAAM,KAAG,iBACwD,CAAC;AAElG,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,KAAG,iBAW3C,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,SAAS,OAAO,EAAE,KAAG,iBACS,CAAC;AAE1D,eAAO,MAAM,qBAAqB,GAAI,OAAO,MAAM,KAAG,iBAGL,CAAC;AAElD,eAAO,MAAM,sBAAsB,GAAI,OAAO,MAAM,KAAG,iBACU,CAAC;AAElE,eAAO,MAAM,QAAQ,GAAI,OAAO,MAAM,KAAG,iBAEuE,CAAC;AAEjH,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,KAAG,iBACI,CAAC;AAExD,eAAO,MAAM,iBAAiB,GAAI,OAAO,MAAM,KAAG,iBACY,CAAC;AAE/D,eAAO,MAAM,mBAAmB,GAAI,OAAO,MAAM,KAAG,iBACM,CAAC;AAE3D,eAAO,MAAM,sBAAsB,GAAI,OAAO,MAAM,KAAG,iBACkB,CAAC"}

package/dist/plop/validators/index.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.baseDsPackageValidator = exports.npmPackageValidator = exports.npmTokenValidator = exports.websocketValidator = exports.password = exports.jfrogUsernameValidator = exports.githubUsernameOrEmail = exports.atLeastOne = exports.dslSafeName = exports.safeName = void 0;
 const reservedWords_1 = require("./reservedWords");
-const safeNameRegex = /^([a-zA-Z0-9-]+)$/;
+const safeNameRegex = /^([a-zA-Z0-9\-]+)$/;
 const leadingNumberRegex = /^([0-9])/;
 const githubUsernameRegex = /^([a-z\d]+-)*[a-z\d]+$/i;
-const jfrogUsernameRegex = /^([a-zA-Z0-9_\-.@]+)$/i;
-const emailAddressRegex = /^([\w_.\-+])+@([\w-]+\.)+([\w]{2,10})+$/;
+const jfrogUsernameRegex = /^([a-zA-Z0-9\_\-\.\@]+)$/i;
+const emailAddressRegex = /^([\w_\.\-\+])+\@([\w\-]+\.)+([\w]{2,10})+$/;
 const passwordRegex = /((?=.*\d)|(?=.*\W+))(?![.\n])(?=.*[A-Z])(?=.*[a-z]).*$/;
-const websocketRegex = /wss?:\/\/[-a-zA-Z0-9@:%._+~#=]{1,256}\b([-a-zA-Z0-9()@:%_+.~#?&/=]*)\b\/*$/;
-const npmTokenRegex = /^([a-zA-Z0-9_]+)$/;
+const websocketRegex = /wss?:\/\/[-a-zA-Z0-9@:%._\+~#=]{1,256}\b([-a-zA-Z0-9()@:%_\+.~#?&\/=]*)\b\/*$/;
+const npmTokenRegex = /^([a-zA-Z0-9\_]+)$/;
 const npmPackageRegex = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/;
 const safeName = (value) => safeNameRegex.test(value) || 'Name cannot have spaces or special characters other than dashes.';
 exports.safeName = safeName;

package/dist/task-runtime/task.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task.d.ts","sourceRoot":"","sources":["../../src/task-runtime/task.ts"],"names":[],"mappings":"AAKA,OAAO,EAAgB,QAAQ,EAAE,MAAM,UAAU,CAAC;AAElD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAI7C,qBAAa,IAAI;IAOb,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAPvB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA8C;IAClE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAW;IAEnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAGd,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,QAAQ,EAC/B,OAAO,GAAE,MAAM,EAAO;IA8CxB;;OAEG;IACH,OAAO,CAAC,OAAO;IAqCf;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;IAmBrB;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;IAsC1B;;OAEG;IACH,OAAO,KAAK,QAAQ,GAEnB;IAED,OAAO,CAAC,GAAG;IAIX,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,KAAK;IAoCb,OAAO,CAAC,SAAS;IAUjB,OAAO,CAAC,cAAc;CAQvB"}
+{"version":3,"file":"task.d.ts","sourceRoot":"","sources":["../../src/task-runtime/task.ts"],"names":[],"mappings":"AAKA,OAAO,EAAgB,QAAQ,EAAE,MAAM,UAAU,CAAC;AAElD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAI7C,qBAAa,IAAI;IAOb,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAPvB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA8C;IAClE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAW;IAEnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAGd,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,QAAQ,EAC/B,OAAO,GAAE,MAAM,EAAO;IA8CxB;;OAEG;IACH,OAAO,CAAC,OAAO;IAyCf;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;IAmBrB;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;IAsC1B;;OAEG;IACH,OAAO,KAAK,QAAQ,GAEnB;IAED,OAAO,CAAC,GAAG;IAIX,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,KAAK;IAoCb,OAAO,CAAC,SAAS;IAUjB,OAAO,CAAC,cAAc;CAQvB"}

package/dist/task-runtime/task.js

@@ -68,12 +68,17 @@ class Task {
             for (const exec of execs) {
                 let hasError = false;
                 const cwd = step.cwd;
-                const result = this.shell({
-                    command: exec.command,
-                    label: exec.label,
-                    cwd,
-                });
-                hasError = result.status !== 0;
+                try {
+                    const result = this.shell({
+                        command: exec.command,
+                        label: exec.label,
+                        cwd,
+                    });
+                    hasError = result.status !== 0;
+                }
+                catch (e) {
+                    throw e;
+                }
                 if (hasError) {
                     throw new Error(`Task "${this.fullname}" failed when executing command "${exec.command}" (cwd: ${(0, path_1.resolve)(cwd !== null && cwd !== void 0 ? cwd : this.workdir)})`);
                 }
@@ -111,14 +116,14 @@ class Task {
      * command and obtaining its result.
      */
     resolveEnvironment(parents) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         let env = (_a = this.runtime.manifest.env) !== null && _a !== void 0 ? _a : {};
         // add env from all parent tasks one by one
         for (const parent of parents) {
-            env = Object.assign(Object.assign({}, env), (_b = this.runtime.tryFindTask(parent)) === null || _b === void 0 ? void 0 : _b.env);
+            env = Object.assign(Object.assign({}, env), ((_c = (_b = this.runtime.tryFindTask(parent)) === null || _b === void 0 ? void 0 : _b.env) !== null && _c !== void 0 ? _c : {}));
         }
         // apply the task's environment last
-        env = Object.assign(Object.assign({}, env), this.task.env);
+        env = Object.assign(Object.assign({}, env), ((_d = this.task.env) !== null && _d !== void 0 ? _d : {}));
         const output = {};
         for (const [key, value] of Object.entries(env !== null && env !== void 0 ? env : {})) {
             if (value.startsWith('$(') && value.endsWith(')')) {
@@ -127,7 +132,7 @@ class Task {
                 if (result.status !== 0) {
                     const error = result.error
                         ? result.error.stack
-                        : ((_d = (_c = result.stderr) === null || _c === void 0 ? void 0 : _c.toString()) !== null && _d !== void 0 ? _d : 'unknown error');
+                        : ((_f = (_e = result.stderr) === null || _e === void 0 ? void 0 : _e.toString()) !== null && _f !== void 0 ? _f : 'unknown error');
                     throw new Error(`unable to evaluate environment variable ${key}=${value}: ${error}`);
                 }
                 output[key] = result.stdout.toString('utf-8').trim();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/foundation-cli",
   "description": "Genesis Foundation CLI",
-  "version": "14.436.0-FUI-2489.2",
+  "version": "14.437.0",
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
     "foundation-cli": "./bin/foundation-cli.js"
   },
   "devDependencies": {
-    "@genesislcap/foundation-ui": "14.436.0-FUI-2489.2",
+    "@genesislcap/foundation-ui": "14.437.0",
     "@types/configstore": "^5.0.1",
     "@types/fs-extra": "^9.0.12",
     "@types/klaw-sync": "^6.0.1",
@@ -69,5 +69,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "16309f873a08dfa541589cd172482677ff5dfd20"
+  "gitHead": "c30c777f0ab5e45f4e931a9cc1200ac85bcace35"
 }