@stepzen/transpiler 0.20.1 → 0.21.0-beta.2

package/lib/actions/configure.d.ts

@@ -1,3 +1,12 @@
+/**
+ * Get effective StepZen endpoint configuration for a directory:
+ * Traverse the file system starting at `source` and
+ *  - merge all `config.yaml` files (discarding unrecognized properties)
+ *  - merge all `config` sections from `stepzen.config.json` files
+ *
+ * Possibly, interactive: if `silent` is `false` and there are non-empty
+ * `config` sections in `stepzen.config.json` files.
+ */
 declare const _default: (source: string, silent?: boolean, answers?: any) => Promise<string | false>;
 export default _default;
 //# sourceMappingURL=configure.d.ts.map

package/lib/actions/configure.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configure.d.ts","sourceRoot":"","sources":["../../src/actions/configure.ts"],"names":[],"mappings":"iCAO8B,MAAM,8BAA2B,GAAG;AAAlE,wBA6HC"}
+{"version":3,"file":"configure.d.ts","sourceRoot":"","sources":["../../src/actions/configure.ts"],"names":[],"mappings":"AAOA;;;;;;;;GAQG;iCAC2B,MAAM,8BAA2B,GAAG;AAAlE,wBA+JC"}

package/lib/actions/configure.js

@@ -1,129 +1,134 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const debug = require("debug");
 const fs = require("fs-extra");
 const glob = require("glob");
 const inquirer = require("inquirer");
 const path = require("path");
 const yaml = require("yaml");
+/**
+ * Get effective StepZen endpoint configuration for a directory:
+ * Traverse the file system starting at `source` and
+ *  - merge all `config.yaml` files (discarding unrecognized properties)
+ *  - merge all `config` sections from `stepzen.config.json` files
+ *
+ * Possibly, interactive: if `silent` is `false` and there are non-empty
+ * `config` sections in `stepzen.config.json` files.
+ */
 exports.default = async (source, silent = false, answers = {}) => {
-    var e_1, _a, e_2, _b;
-    var _c, _d, _e, _f;
-    let config = {
+    const config = {
         configurationset: [],
         ruleset: [],
+        access: undefined,
+        deployment: undefined,
     };
+    debug('stepzen:transpiler:config')(`getting effective config for ${source}`);
     // Now let's parse and add any config.yamls
+    let configYamlCount = 0;
     for (const y of glob.sync('**/config.yaml', { cwd: source })) {
         const filePath = path.join(source, y);
         const file = fs.readFileSync(filePath, 'utf8');
         let asYAML;
         try {
-            asYAML = yaml.parse(file);
+            asYAML = yaml.parse(file, { schema: 'failsafe' });
         }
         catch (error) {
-            debug('stepzen:transpiler')(`error parsing ${filePath}: ${error} -> ignoring this file`);
+            debug('stepzen:transpiler:config')(`Ignoring an invalid config.yaml ${filePath}.` +
+                ` YAML parse error: ${error}`);
             continue;
         }
         if (!asYAML) {
-            debug('stepzen:transpiler')(`Ignoring an empty config.yaml ${filePath}`);
+            debug('stepzen:transpiler:config')(`ignoring an empty config.yaml ${filePath}`);
             continue;
         }
-        debug('stepzen:transpiler')(`Adding config.yaml ${filePath}`);
-        debug('stepzen:transpiler')(`Contents: ${JSON.stringify(asYAML, null, 2)}`);
-        if (asYAML.configurationset) {
-            config.configurationset = config.configurationset.concat(asYAML.configurationset);
-        }
-        if (asYAML.ruleset) {
-            config.ruleset = config.ruleset.concat(asYAML.ruleset);
-        }
+        configYamlCount += 1;
+        debug('stepzen:transpiler:config')(`adding config.yaml ${filePath}:\n${JSON.stringify(asYAML, null, 2)}`);
+        // strip away any non-recognized properties
+        Object.entries(asYAML).forEach(([keyAsAny, value]) => {
+            if (Object.prototype.hasOwnProperty.call(config, keyAsAny)) {
+                const key = keyAsAny;
+                config[key] = Array.isArray(config[key])
+                    ? config[key].concat(value)
+                    : value;
+            }
+            else {
+                debug('stepzen:transpiler:config')(`ignoring unrecognized config property ${keyAsAny}`);
+            }
+        });
     }
-    try {
-        // Now let's build configs from questions
-        for (var _g = tslib_1.__asyncValues(glob.sync('**/stepzen.config.json', {
-            cwd: source,
-        })), _h; _h = await _g.next(), !_h.done;) {
-            const j = _h.value;
-            const filePath = path.join(source, j);
-            const file = fs.readFileSync(filePath, 'utf8');
-            const asJSON = JSON.parse(file);
-            debug('stepzen:transpiler')(`Adding stepzen.config.json ${filePath}`);
-            debug('stepzen:transpiler')(`Contents: ${JSON.stringify(asJSON, null, 2)}`);
-            if ((_c = asJSON.config) === null || _c === void 0 ? void 0 : _c.questions) {
-                try {
-                    for (var _j = (e_2 = void 0, tslib_1.__asyncValues((_d = asJSON.config) === null || _d === void 0 ? void 0 : _d.questions)), _k; _k = await _j.next(), !_k.done;) {
-                        const question = _k.value;
-                        const [name, key] = question.name.split('.');
-                        let answer = {};
-                        if (silent) {
-                            answer = {
-                                [name]: { [key]: ((_e = answers[name]) === null || _e === void 0 ? void 0 : _e[key]) ? (_f = answers[name]) === null || _f === void 0 ? void 0 : _f[key] : '' },
-                            };
-                        }
-                        else {
-                            answer = await inquirer.prompt(Object.assign({ type: 'password' }, question));
-                        }
-                        const configset = {
-                            configuration: {
-                                name,
-                                [key]: answer[name][key],
-                            },
-                        };
-                        debug('stepzen:transpiler')(`Question: ${JSON.stringify(question, null, 2)}`);
-                        debug('stepzen:transpiler')(`Answer: ${JSON.stringify(configset, null, 2)}`);
-                        config.configurationset.push(Object.assign({}, configset));
-                    }
+    debug('stepzen:transpiler:config')(`done adding **/config.yaml files (processed: ${configYamlCount})`);
+    // Now let's build configs from questions
+    let configJsonCount = 0;
+    for await (const j of glob.sync('**/stepzen.config.json', {
+        cwd: source,
+    })) {
+        const filePath = path.join(source, j);
+        const file = fs.readFileSync(filePath, 'utf8');
+        const asJSON = JSON.parse(file);
+        configJsonCount += 1;
+        debug('stepzen:transpiler:config')(`adding stepzen.config.json ${filePath}:` +
+            `\n${JSON.stringify(asJSON, null, 2)}`);
+        if (asJSON.config?.questions) {
+            for await (const question of asJSON.config?.questions) {
+                const [name, key] = question.name.split('.');
+                let answer = {};
+                if (silent) {
+                    answer = {
+                        [name]: { [key]: answers[name]?.[key] ? answers[name]?.[key] : '' },
+                    };
                 }
-                catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                finally {
-                    try {
-                        if (_k && !_k.done && (_b = _j.return)) await _b.call(_j);
-                    }
-                    finally { if (e_2) throw e_2.error; }
+                else {
+                    answer = await inquirer.prompt({
+                        type: 'password',
+                        ...question,
+                    });
                 }
+                const configset = {
+                    configuration: {
+                        name,
+                        [key]: answer[name][key],
+                    },
+                };
+                debug('stepzen:transpiler:config')(`question: ${JSON.stringify(question, null, 2)}`);
+                debug('stepzen:transpiler:config')(`answer: ${JSON.stringify(configset, null, 2)}`);
+                config.configurationset.push({ ...configset });
             }
         }
     }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (_h && !_h.done && (_a = _g.return)) await _a.call(_g);
-        }
-        finally { if (e_1) throw e_1.error; }
-    }
-    debug('stepzen:transpiler')(`Configuration: ${JSON.stringify(config, null, 2)}`);
+    debug('stepzen:transpiler:config')(`done adding **/stepzen.config.json files (processed: ${configJsonCount})`);
+    debug('stepzen:transpiler:config')(`combined content of all config files:` +
+        `\n${JSON.stringify(config, null, 2)}`);
     // OK now let's collate everything into shared configurations
-    const obj = {};
-    for (const c of config.configurationset) {
-        const name = c.configuration.name;
-        if (!obj[name])
-            obj[name] = {};
-        for (const [key, value] of Object.entries(c.configuration)) {
-            if (key === name)
-                continue;
-            obj[name][key] = value;
+    const configurationset = [];
+    {
+        const obj = {};
+        for (const c of config.configurationset) {
+            const name = c.configuration.name;
+            if (!obj[name])
+                obj[name] = {};
+            for (const [key, value] of Object.entries(c.configuration)) {
+                if (key === name)
+                    continue;
+                obj[name][key] = value;
+            }
+        }
+        for (const configuration of Object.keys(obj)) {
+            configurationset.push({
+                configuration: { ...obj[configuration] },
+            });
         }
     }
     // Now convert back into StepZen format
-    const structured = {
-        configurationset: [],
-        ruleset: [],
-    };
-    for (const configuration of Object.keys(obj)) {
-        structured.configurationset.push({
-            configuration: Object.assign({}, obj[configuration]),
-        });
-    }
-    structured.ruleset = [...config.ruleset];
+    const structured = Object.fromEntries(Object.entries({ ...config, configurationset }).filter(([_key, value]) => Array.isArray(value) ? value.length > 0 : value !== undefined));
     // Return YAML, if appropriate
-    if (structured.configurationset.length === 0)
-        delete structured.configurationset;
-    if (structured.ruleset.length === 0)
-        delete structured.ruleset;
-    if (structured.configurationset || structured.ruleset) {
-        return yaml.stringify(structured);
+    if (Object.keys(structured).length > 0) {
+        const configYamlStr = yaml.stringify(structured);
+        debug('stepzen:transpiler:config')(`effective config:\n${configYamlStr}`);
+        return configYamlStr;
     }
+    debug('stepzen:transpiler:config')(`Could not find any of the supported properties in the config:` +
+        ` [ '${Object.keys(config).join(`', '`)}' ].` +
+        ` Retuning 'false' meaning 'effective config is empty'.`);
     return false;
 };
 //# sourceMappingURL=configure.js.map

package/lib/actions/configure.js.map

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

package/lib/actions/merge.js

@@ -115,10 +115,16 @@ exports.default = async (original, imported, options = {
         // Clean up the files. Remove empty Query / Mutation types, filter out now-empty files
         const cleaned = {
             original: details.original
-                .map(item => (Object.assign(Object.assign({}, item), { ast: (0, strip_empty_queries_and_mutations_1.default)(item.ast) })))
+                .map(item => ({
+                ...item,
+                ast: (0, strip_empty_queries_and_mutations_1.default)(item.ast),
+            }))
                 .filter(item => item.ast.definitions.length > 0),
             imported: details.imported
-                .map(item => (Object.assign(Object.assign({}, item), { ast: (0, strip_empty_queries_and_mutations_1.default)(item.ast) })))
+                .map(item => ({
+                ...item,
+                ast: (0, strip_empty_queries_and_mutations_1.default)(item.ast),
+            }))
                 .filter(item => item.ast.definitions.length > 0),
         };
         // Write the files to the output directory

package/lib/actions/merge.js.map

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

package/lib/actions/stitch.js

@@ -23,9 +23,8 @@ exports.default = (source, output = path.join(os.tmpdir(), `stepzen-tmp-${Date.n
         ast = (0, graphql_1.parse)(index);
         ast = (0, graphql_1.visit)(ast, {
             Directive(node) {
-                var _a;
                 if (node.name.value === 'sdl') {
-                    const list = (_a = node.arguments) === null || _a === void 0 ? void 0 : _a.find((arg) => arg.name.value === 'files');
+                    const list = node.arguments?.find((arg) => arg.name.value === 'files');
                     // If we find a 'files' argument, we copy the list, and remove the argument
                     if (list) {
                         const copy = (0, lodash_1.clone)(list.value);

package/lib/actions/stitch.js.map

@@ -1 +1 @@
-{"version":3,"file":"stitch.js","sourceRoot":"","sources":["../../src/actions/stitch.ts"],"names":[],"mappings":";;AAAA,mCAAuC;AACvC,qCAA2C;AAC3C,+BAA8B;AAC9B,6BAA4B;AAC5B,yBAAwB;AACxB,6BAA4B;AAC5B,qCAAoC;AAEpC,8FAAkF;AAElF,kBAAe,CACb,MAAc,EACd,SAAiB,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,eAAe,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,EACpE,EAAE;IACF,6CAA6C;IAC7C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,gCAAgC,MAAM,EAAE,CAAC,CAAA;IAC3D,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;IAExB,uBAAuB;IACvB,IAAI,GAAQ,CAAA;IACZ,IAAI,KAAK,GAAa,EAAE,CAAA;IAExB,qEAAqE;IACrE,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAEtD,IAAI,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;QAC9B,MAAM,KAAK,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;QAClD,GAAG,GAAG,IAAA,eAAK,EAAC,KAAK,CAAC,CAAA;QAClB,GAAG,GAAG,IAAA,eAAK,EAAC,GAAG,EAAE;YACf,SAAS,CAAC,IAAI;;gBACZ,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,KAAK,EAAE;oBAC7B,MAAM,IAAI,GAAG,MAAA,IAAI,CAAC,SAAS,0CAAE,IAAI,CAC/B,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,KAAK,OAAO,CACzC,CAAA;oBACD,2EAA2E;oBAC3E,IAAI,IAAI,EAAE;wBACR,MAAM,IAAI,GAAQ,IAAA,cAAK,EAAC,IAAI,CAAC,KAAK,CAAC,CAAA;wBACnC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE;4BAC9B,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;yBACjC;wBACD,MAAM,OAAO,GAAQ,IAAA,kBAAS,EAAC,IAAI,CAAC,CAAA;wBACpC,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAC1C,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,KAAK,OAAO,CACzC,CAAA;wBACD,OAAO,OAAO,CAAA;qBACf;iBACF;YACH,CAAC;SACF,CAAC,CAAA;KACH;SAAM;QACL,MAAM,OAAO,GAAG,IAAI;aACjB,IAAI,CAAC,cAAc,EAAE,EAAC,GAAG,EAAE,MAAM,EAAC,CAAC;aACnC,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE;YACpB,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,GAAG,MAAM,IAAI,IAAI,EAAE,EAAE,MAAM,CAAC,CAAA;YAC5D,OAAO,OAAO,CAAA;QAChB,CAAC,CAAC,CAAA;QACJ,GAAG,GAAG,IAAA,eAAK,EAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;KAClC;IAED,uBAAuB;IACvB,GAAG,GAAG,IAAA,eAAK,EAAC,GAAG,EAAE;QACf,SAAS,CAAC,IAAI;YACZ,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,KAAK;gBAAE,OAAO,IAAI,CAAA;QAC5C,CAAC;KACF,CAAC,CAAA;IAEF,4BAA4B;IAC5B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QACpC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAA;SAC5C;KACF;IAED,+BAA+B;IAC/B,MAAM,OAAO,GAAG,IAAA,eAAK,EAAC,GAAG,CAAC,CAAA;IAC1B,IAAI,QAAQ,GAAG,GAAG,OAAO,GAAG,EAAE,CAAC,GAAG,EAAE,CAAA;IACpC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QACpC,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAC7C,QAAQ,IAAI,GAAG,OAAO,GAAG,EAAE,CAAC,GAAG,EAAE,CAAA;KAClC;IAED,kCAAkC;IAClC,QAAQ,GAAG,IAAA,yCAA2B,EAAC,QAAQ,CAAC,CAAA;IAEhD,SAAS;IACT,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAC,MAAM,EAAE,SAAS,EAAC,CAAC,CAAA;IAEzD,yBAAyB;IACzB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IACtD,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;IAEvC,6BAA6B;IAC7B,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IACrD,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAErD,IAAI,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;QAC/B,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;KAC5C;IAED,uBAAuB;IACvB,OAAO,MAAM,CAAA;AACf,CAAC,CAAA"}
+{"version":3,"file":"stitch.js","sourceRoot":"","sources":["../../src/actions/stitch.ts"],"names":[],"mappings":"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"}

package/lib/actions/transpile.d.ts

@@ -1,6 +1,6 @@
 declare const _default: (source: string) => Promise<{
-    config: any;
-    schema: any;
+    config: string | false;
+    schema: string;
     transpiled: boolean;
 }>;
 export default _default;

package/lib/actions/transpile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transpile.d.ts","sourceRoot":"","sources":["../../src/actions/transpile.ts"],"names":[],"mappings":"iCAY8B,MAAM;;;;;AAApC,wBAyDC"}
+{"version":3,"file":"transpile.d.ts","sourceRoot":"","sources":["../../src/actions/transpile.ts"],"names":[],"mappings":"iCAa8B,MAAM;;;;;AAApC,wBAkDC"}

package/lib/actions/transpile.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const graphql_1 = require("graphql");
 const dotenv = require("dotenv");
+const debug = require("debug");
 const fs = require("fs");
 const glob = require("glob");
 const path = require("path");
@@ -11,33 +11,24 @@ const stitch_1 = require("../actions/stitch");
 const configure_1 = require("./configure");
 const config_1 = require("../mutations/config");
 exports.default = async (source) => {
-    var e_1, _a;
     // Ensure source and output directories exist
     if (!fs.existsSync(source)) {
         throw new Error(`Cannot find source directory ${source}`);
     }
     // Load env vars, from working and source directories
+    debug('stepzen:dotenv')(`loading .env from ${process.cwd()}, at transpiler/src/actions/transpile.ts:24`);
     dotenv.config();
+    debug('stepzen:dotenv')(`loading .env from ${path.resolve(source)}` +
+        `, at transpiler/src/actions/transpile.ts:29`);
     dotenv.config({ path: path.resolve(source, '.env') });
     // State of whether we've transpiled or not
     let transpiledConfig = false;
-    let transpiledGraphQL = false;
     // See whether to transpile config
     let config = await (0, configure_1.default)(source, true);
     const configCopy = config;
     if (config) {
-        try {
-            for (var configMutations_1 = tslib_1.__asyncValues(config_1.default), configMutations_1_1; configMutations_1_1 = await configMutations_1.next(), !configMutations_1_1.done;) {
-                const mutation = configMutations_1_1.value;
-                config = await mutation(config);
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (configMutations_1_1 && !configMutations_1_1.done && (_a = configMutations_1.return)) await _a.call(configMutations_1);
-            }
-            finally { if (e_1) throw e_1.error; }
+        for await (const mutation of config_1.default) {
+            config = await mutation(config);
         }
     }
     if (configCopy !== config) {
@@ -45,24 +36,17 @@ exports.default = async (source) => {
     }
     // See whether to transpile GraphQL
     const graphqlFiles = glob.sync('**/*.graphql', { cwd: source });
-    let original = '';
-    let mutated = '';
+    let schema = '';
     if (graphqlFiles.length > 0) {
         const stitched = await (0, stitch_1.default)(source);
         const index = path.join(stitched, 'index.graphql');
         const graphql = fs.readFileSync(index, 'utf8');
-        let ast = (0, graphql_1.parse)(graphql);
-        original = (0, graphql_1.parse)(graphql);
-        // you can transpile schema ast here
-        mutated = (0, print_1.default)(ast);
-        if ((0, print_1.default)(original) !== mutated) {
-            transpiledGraphQL = true;
-        }
+        schema = (0, print_1.default)((0, graphql_1.parse)(graphql));
     }
     return {
         config,
-        schema: mutated,
-        transpiled: transpiledConfig || transpiledGraphQL,
+        schema,
+        transpiled: transpiledConfig,
     };
 };
 //# sourceMappingURL=transpile.js.map

package/lib/actions/transpile.js.map

@@ -1 +1 @@
-{"version":3,"file":"transpile.js","sourceRoot":"","sources":["../../src/actions/transpile.ts"],"names":[],"mappings":";;;AAAA,qCAA2C;AAC3C,iCAAgC;AAChC,yBAAwB;AACxB,6BAA4B;AAC5B,6BAA4B;AAE5B,4CAAoC;AACpC,8CAAsC;AACtC,2CAAmC;AAEnC,gDAAiD;AAEjD,kBAAe,KAAK,EAAE,MAAc,EAAE,EAAE;;IACtC,6CAA6C;IAC7C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,gCAAgC,MAAM,EAAE,CAAC,CAAA;KAC1D;IAED,qDAAqD;IACrD,MAAM,CAAC,MAAM,EAAE,CAAA;IACf,MAAM,CAAC,MAAM,CAAC,EAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,EAAC,CAAC,CAAA;IAEnD,2CAA2C;IAC3C,IAAI,gBAAgB,GAAG,KAAK,CAAA;IAC5B,IAAI,iBAAiB,GAAG,KAAK,CAAA;IAE7B,kCAAkC;IAClC,IAAI,MAAM,GAAQ,MAAM,IAAA,mBAAS,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IAC/C,MAAM,UAAU,GAAG,MAAM,CAAA;IAEzB,IAAI,MAAM,EAAE;;YACV,KAA6B,IAAA,oBAAA,sBAAA,gBAAe,CAAA,qBAAA;gBAAjC,MAAM,QAAQ,4BAAA,CAAA;gBACvB,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAA;aAChC;;;;;;;;;KACF;IAED,IAAI,UAAU,KAAK,MAAM,EAAE;QACzB,gBAAgB,GAAG,IAAI,CAAA;KACxB;IAED,mCAAmC;IACnC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAC,GAAG,EAAE,MAAM,EAAC,CAAC,CAAA;IAC7D,IAAI,QAAQ,GAAQ,EAAE,CAAA;IACtB,IAAI,OAAO,GAAQ,EAAE,CAAA;IAErB,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;QAC3B,MAAM,QAAQ,GAAG,MAAM,IAAA,gBAAM,EAAC,MAAM,CAAC,CAAA;QAErC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAA;QAElD,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAE9C,IAAI,GAAG,GAAiB,IAAA,eAAK,EAAC,OAAO,CAAC,CAAA;QACtC,QAAQ,GAAG,IAAA,eAAK,EAAC,OAAO,CAAC,CAAA;QAEzB,oCAAoC;QAEpC,OAAO,GAAG,IAAA,eAAK,EAAC,GAAG,CAAC,CAAA;QAEpB,IAAI,IAAA,eAAK,EAAC,QAAQ,CAAC,KAAK,OAAO,EAAE;YAC/B,iBAAiB,GAAG,IAAI,CAAA;SACzB;KACF;IAED,OAAO;QACL,MAAM;QACN,MAAM,EAAE,OAAO;QACf,UAAU,EAAE,gBAAgB,IAAI,iBAAiB;KAClD,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"transpile.js","sourceRoot":"","sources":["../../src/actions/transpile.ts"],"names":[],"mappings":";;AAAA,qCAA2C;AAC3C,iCAAgC;AAChC,+BAA8B;AAC9B,yBAAwB;AACxB,6BAA4B;AAC5B,6BAA4B;AAE5B,4CAAoC;AACpC,8CAAsC;AACtC,2CAAmC;AAEnC,gDAAiD;AAEjD,kBAAe,KAAK,EAAE,MAAc,EAAE,EAAE;IACtC,6CAA6C;IAC7C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,gCAAgC,MAAM,EAAE,CAAC,CAAA;KAC1D;IAED,qDAAqD;IACrD,KAAK,CAAC,gBAAgB,CAAC,CACrB,qBAAqB,OAAO,CAAC,GAAG,EAAE,6CAA6C,CAChF,CAAA;IACD,MAAM,CAAC,MAAM,EAAE,CAAA;IACf,KAAK,CAAC,gBAAgB,CAAC,CACrB,qBAAqB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACzC,6CAA6C,CAChD,CAAA;IACD,MAAM,CAAC,MAAM,CAAC,EAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,EAAC,CAAC,CAAA;IAEnD,2CAA2C;IAC3C,IAAI,gBAAgB,GAAG,KAAK,CAAA;IAE5B,kCAAkC;IAClC,IAAI,MAAM,GAAG,MAAM,IAAA,mBAAS,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IAC1C,MAAM,UAAU,GAAG,MAAM,CAAA;IAEzB,IAAI,MAAM,EAAE;QACV,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,gBAAe,EAAE;YAC5C,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAA;SAChC;KACF;IAED,IAAI,UAAU,KAAK,MAAM,EAAE;QACzB,gBAAgB,GAAG,IAAI,CAAA;KACxB;IAED,mCAAmC;IACnC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAC,GAAG,EAAE,MAAM,EAAC,CAAC,CAAA;IAC7D,IAAI,MAAM,GAAG,EAAE,CAAA;IAEf,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;QAC3B,MAAM,QAAQ,GAAG,MAAM,IAAA,gBAAM,EAAC,MAAM,CAAC,CAAA;QACrC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAA;QAClD,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAC9C,MAAM,GAAG,IAAA,eAAK,EAAC,IAAA,eAAK,EAAC,OAAO,CAAC,CAAC,CAAA;KAC/B;IAED,OAAO;QACL,MAAM;QACN,MAAM;QACN,UAAU,EAAE,gBAAgB;KAC7B,CAAA;AACH,CAAC,CAAA"}

package/lib/mutations/config/envvars.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"envvars.d.ts","sourceRoot":"","sources":["../../../src/mutations/config/envvars.ts"],"names":[],"mappings":"iCAA8B,MAAM,KAAG,QAAQ,MAAM,CAAC;AAAtD,wBAgBC"}
+{"version":3,"file":"envvars.d.ts","sourceRoot":"","sources":["../../../src/mutations/config/envvars.ts"],"names":[],"mappings":"iCAE8B,MAAM,KAAG,QAAQ,MAAM,CAAC;AAAtD,wBA8BC"}

package/lib/mutations/config/envvars.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const debug = require("debug");
 exports.default = async (config) => {
     const envvars = Object.keys(process.env)
         .filter(key => {
@@ -9,10 +10,18 @@ exports.default = async (config) => {
         obj[key] = process.env[key];
         return obj;
     }, {});
+    let replacements = 0;
+    debug('stepzen:transpiler:config')(`STEPZEN_* env vars available for replacement:` +
+        ` ${JSON.stringify(envvars, undefined, 2)}`);
     for (const [key, value] of Object.entries(envvars)) {
         const regex = new RegExp(key, 'g');
-        config = config.replace(regex, `${value}`);
+        config = config.replace(regex, (match, offset) => {
+            replacements += 1;
+            debug('stepzen:transpiler:config')(`replacing ${match} at offset ${offset}`);
+            return `${value}`;
+        });
     }
+    debug('stepzen:transpiler:config')(`total replacements made: ${replacements}`);
     return config;
 };
 //# sourceMappingURL=envvars.js.map

package/lib/mutations/config/envvars.js.map

@@ -1 +1 @@
-{"version":3,"file":"envvars.js","sourceRoot":"","sources":["../../../src/mutations/config/envvars.ts"],"names":[],"mappings":";;AAAA,kBAAe,KAAK,EAAE,MAAc,EAAmB,EAAE;IACvD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;SACrC,MAAM,CAAC,GAAG,CAAC,EAAE;QACZ,OAAO,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;IACnC,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,GAAQ,EAAE,GAAG,EAAE,EAAE;QACxB,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC3B,OAAO,GAAG,CAAA;IACZ,CAAC,EAAE,EAAE,CAAC,CAAA;IAER,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QAClD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QAClC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,KAAK,EAAE,CAAC,CAAA;KAC3C;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA"}
+{"version":3,"file":"envvars.js","sourceRoot":"","sources":["../../../src/mutations/config/envvars.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,kBAAe,KAAK,EAAE,MAAc,EAAmB,EAAE;IACvD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;SACrC,MAAM,CAAC,GAAG,CAAC,EAAE;QACZ,OAAO,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;IACnC,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,GAAQ,EAAE,GAAG,EAAE,EAAE;QACxB,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC3B,OAAO,GAAG,CAAA;IACZ,CAAC,EAAE,EAAE,CAAC,CAAA;IAER,IAAI,YAAY,GAAG,CAAC,CAAA;IACpB,KAAK,CAAC,2BAA2B,CAAC,CAChC,+CAA+C;QAC7C,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAC9C,CAAA;IAED,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QAClD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QAClC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC/C,YAAY,IAAI,CAAC,CAAA;YACjB,KAAK,CAAC,2BAA2B,CAAC,CAChC,aAAa,KAAK,cAAc,MAAM,EAAE,CACzC,CAAA;YACD,OAAO,GAAG,KAAK,EAAE,CAAA;QACnB,CAAC,CAAC,CAAA;KACH;IAED,KAAK,CAAC,2BAA2B,CAAC,CAAC,4BAA4B,YAAY,EAAE,CAAC,CAAA;IAE9E,OAAO,MAAM,CAAA;AACf,CAAC,CAAA"}

package/lib/utils/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,uBAAuB,yIAOnC,CAAA;AAED,eAAO,MAAM,cAAc,QAAyC,CAAA"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,uBAAuB,yIAOnC,CAAA;AAED,eAAO,MAAM,cAAc,QAAyC,CAAA"}

package/lib/utils/constants.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.STEPZEN_DOMAIN = exports.EXPERIMENTAL_EXTENSIONS = void 0;
 const dotenv = require("dotenv");
+const debug = require("debug");
+debug('stepzen:dotenv')(`loading .env from ${process.cwd()}, at transpiler/src/utils/constants.ts`);
 dotenv.config();
 const { STEPZEN_DOMAIN: ENV_VAR_STEPZEN_DOMAIN } = process.env;
 exports.EXPERIMENTAL_EXTENSIONS = `

package/lib/utils/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":";;;AAAA,iCAAgC;AAEhC,MAAM,CAAC,MAAM,EAAE,CAAA;AAEf,MAAM,EAAC,cAAc,EAAE,sBAAsB,EAAC,GAAG,OAAO,CAAC,GAAG,CAAA;AAE/C,QAAA,uBAAuB,GAAG;;;;;;;CAOtC,CAAA;AAEY,QAAA,cAAc,GAAG,sBAAsB,IAAI,YAAY,CAAA"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":";;;AAAA,iCAAgC;AAChC,+BAA8B;AAE9B,KAAK,CAAC,gBAAgB,CAAC,CACrB,qBAAqB,OAAO,CAAC,GAAG,EAAE,wCAAwC,CAC3E,CAAA;AACD,MAAM,CAAC,MAAM,EAAE,CAAA;AAEf,MAAM,EAAC,cAAc,EAAE,sBAAsB,EAAC,GAAG,OAAO,CAAC,GAAG,CAAA;AAE/C,QAAA,uBAAuB,GAAG;;;;;;;CAOtC,CAAA;AAEY,QAAA,cAAc,GAAG,sBAAsB,IAAI,YAAY,CAAA"}

package/lib/utils/dedupe-query-and-mutation-types.js

@@ -45,7 +45,10 @@ exports.default = (schema) => {
     // with all the concatenated queries
     if (queries.length > 0) {
         const mutated = (0, graphql_helpers_1.cloneDeep)(ast);
-        const query = Object.assign(Object.assign({}, queryTemplate), { fields: queries });
+        const query = {
+            ...queryTemplate,
+            fields: queries,
+        };
         mutated.definitions.push(query);
         ast = mutated;
     }
@@ -53,7 +56,10 @@ exports.default = (schema) => {
     // with all the concatenated mutations
     if (mutations.length > 0) {
         const mutated = (0, graphql_helpers_1.cloneDeep)(ast);
-        const query = Object.assign(Object.assign({}, mutationTemplate), { fields: mutations });
+        const query = {
+            ...mutationTemplate,
+            fields: mutations,
+        };
         mutated.definitions.push(query);
         ast = mutated;
     }

package/lib/utils/dedupe-query-and-mutation-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"dedupe-query-and-mutation-types.js","sourceRoot":"","sources":["../../src/utils/dedupe-query-and-mutation-types.ts"],"names":[],"mappings":";;AAAA,qCAAyD;AAEzD,8DAAkD;AAElD,kBAAe,CAAC,MAAc,EAAU,EAAE;IACxC,IAAI,GAAG,GAAiB,IAAA,eAAK,EAAC,MAAM,CAAC,CAAA;IAErC,IAAI,OAAO,GAAQ,EAAE,CAAA;IACrB,IAAI,SAAS,GAAQ,EAAE,CAAA;IAEvB,0DAA0D;IAC1D,sBAAsB;IACtB,yCAAyC;IACzC,GAAG,GAAG,IAAA,eAAK,EAAC,GAAG,EAAE;QACf,oBAAoB,EAAE;YACpB,KAAK,CAAC,IAAI;gBACR,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,OAAO,EAAE;oBAC5D,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;oBACrC,OAAO,IAAI,CAAA;iBACZ;gBACD,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,UAAU,EAAE;oBAC/D,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;oBACzC,OAAO,IAAI,CAAA;iBACZ;YACH,CAAC;SACF;KACF,CAAC,CAAA;IAEF,8CAA8C;IAC9C,MAAM,aAAa,GAAG;QACpB,IAAI,EAAE,sBAAsB;QAC5B,WAAW,EAAE,SAAS;QACtB,IAAI,EAAE,EAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAC;QACpC,UAAU,EAAE,EAAE;QACd,UAAU,EAAE,EAAE;QACd,MAAM,EAAE,EAAE;KACX,CAAA;IAED,iDAAiD;IACjD,MAAM,gBAAgB,GAAG;QACvB,IAAI,EAAE,sBAAsB;QAC5B,WAAW,EAAE,SAAS;QACtB,IAAI,EAAE,EAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAC;QACvC,UAAU,EAAE,EAAE;QACd,UAAU,EAAE,EAAE;QACd,MAAM,EAAE,EAAE;KACX,CAAA;IAED,gDAAgD;IAChD,oCAAoC;IACpC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACtB,MAAM,OAAO,GAAQ,IAAA,2BAAS,EAAC,GAAG,CAAC,CAAA;QACnC,MAAM,KAAK,mCACN,aAAa,KAChB,MAAM,EAAE,OAAO,GAChB,CAAA;QACD,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC/B,GAAG,GAAG,OAAO,CAAA;KACd;IAED,kDAAkD;IAClD,sCAAsC;IACtC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QACxB,MAAM,OAAO,GAAQ,IAAA,2BAAS,EAAC,GAAG,CAAC,CAAA;QACnC,MAAM,KAAK,mCACN,gBAAgB,KACnB,MAAM,EAAE,SAAS,GAClB,CAAA;QACD,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC/B,GAAG,GAAG,OAAO,CAAA;KACd;IAED,OAAO,IAAA,eAAK,EAAC,GAAG,CAAC,CAAA;AACnB,CAAC,CAAA"}
+{"version":3,"file":"dedupe-query-and-mutation-types.js","sourceRoot":"","sources":["../../src/utils/dedupe-query-and-mutation-types.ts"],"names":[],"mappings":";;AAAA,qCAAyD;AAEzD,8DAAkD;AAElD,kBAAe,CAAC,MAAc,EAAU,EAAE;IACxC,IAAI,GAAG,GAAiB,IAAA,eAAK,EAAC,MAAM,CAAC,CAAA;IAErC,IAAI,OAAO,GAAQ,EAAE,CAAA;IACrB,IAAI,SAAS,GAAQ,EAAE,CAAA;IAEvB,0DAA0D;IAC1D,sBAAsB;IACtB,yCAAyC;IACzC,GAAG,GAAG,IAAA,eAAK,EAAC,GAAG,EAAE;QACf,oBAAoB,EAAE;YACpB,KAAK,CAAC,IAAI;gBACR,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,OAAO,EAAE;oBAC5D,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;oBACrC,OAAO,IAAI,CAAA;iBACZ;gBACD,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,UAAU,EAAE;oBAC/D,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;oBACzC,OAAO,IAAI,CAAA;iBACZ;YACH,CAAC;SACF;KACF,CAAC,CAAA;IAEF,8CAA8C;IAC9C,MAAM,aAAa,GAAG;QACpB,IAAI,EAAE,sBAAsB;QAC5B,WAAW,EAAE,SAAS;QACtB,IAAI,EAAE,EAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAC;QACpC,UAAU,EAAE,EAAE;QACd,UAAU,EAAE,EAAE;QACd,MAAM,EAAE,EAAE;KACX,CAAA;IAED,iDAAiD;IACjD,MAAM,gBAAgB,GAAG;QACvB,IAAI,EAAE,sBAAsB;QAC5B,WAAW,EAAE,SAAS;QACtB,IAAI,EAAE,EAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAC;QACvC,UAAU,EAAE,EAAE;QACd,UAAU,EAAE,EAAE;QACd,MAAM,EAAE,EAAE;KACX,CAAA;IAED,gDAAgD;IAChD,oCAAoC;IACpC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACtB,MAAM,OAAO,GAAQ,IAAA,2BAAS,EAAC,GAAG,CAAC,CAAA;QACnC,MAAM,KAAK,GAAG;YACZ,GAAG,aAAa;YAChB,MAAM,EAAE,OAAO;SAChB,CAAA;QACD,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC/B,GAAG,GAAG,OAAO,CAAA;KACd;IAED,kDAAkD;IAClD,sCAAsC;IACtC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QACxB,MAAM,OAAO,GAAQ,IAAA,2BAAS,EAAC,GAAG,CAAC,CAAA;QACnC,MAAM,KAAK,GAAG;YACZ,GAAG,gBAAgB;YACnB,MAAM,EAAE,SAAS;SAClB,CAAA;QACD,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC/B,GAAG,GAAG,OAAO,CAAA;KACd;IAED,OAAO,IAAA,eAAK,EAAC,GAAG,CAAC,CAAA;AACnB,CAAC,CAAA"}

package/lib/utils/merge-helpers.js

@@ -102,7 +102,9 @@ const getSchema = async (directory) => {
 exports.getSchema = getSchema;
 const mergeQueryMutationIntoSchema = (type, files) => {
     files = files.map((file) => {
-        return Object.assign(Object.assign({}, file), { ast: (0, graphql_1.visit)(file.ast, {
+        return {
+            ...file,
+            ast: (0, graphql_1.visit)(file.ast, {
                 FieldDefinition(node) {
                     if (node.name.value === type.name.value) {
                         const directives = (0, graphql_helpers_1.cloneDeep)(type.directives);
@@ -111,14 +113,17 @@ const mergeQueryMutationIntoSchema = (type, files) => {
                         return mutated;
                     }
                 },
-            }) });
+            }),
+        };
     });
     return files;
 };
 exports.mergeQueryMutationIntoSchema = mergeQueryMutationIntoSchema;
 const mergeTypeIntoSchema = (type, files) => {
     files = files.map((file) => {
-        return Object.assign(Object.assign({}, file), { ast: (0, graphql_1.visit)(file.ast, {
+        return {
+            ...file,
+            ast: (0, graphql_1.visit)(file.ast, {
                 ObjectTypeDefinition(node) {
                     if (node.name.value === type.name.value) {
                         const directives = (0, graphql_helpers_1.cloneDeep)(type.directives);
@@ -129,33 +134,40 @@ const mergeTypeIntoSchema = (type, files) => {
                         return mutated;
                     }
                 },
-            }) });
+            }),
+        };
     });
     return files;
 };
 exports.mergeTypeIntoSchema = mergeTypeIntoSchema;
 const removeQueryMutationFromSchema = (name, files) => {
     files = files.map((file) => {
-        return Object.assign(Object.assign({}, file), { ast: (0, graphql_1.visit)(file.ast, {
+        return {
+            ...file,
+            ast: (0, graphql_1.visit)(file.ast, {
                 FieldDefinition(node) {
                     if (node.name.value === name) {
                         return null;
                     }
                 },
-            }) });
+            }),
+        };
     });
     return files;
 };
 exports.removeQueryMutationFromSchema = removeQueryMutationFromSchema;
 const removeTypeFromSchema = (name, files) => {
     files = files.map((file) => {
-        return Object.assign(Object.assign({}, file), { ast: (0, graphql_1.visit)(file.ast, {
+        return {
+            ...file,
+            ast: (0, graphql_1.visit)(file.ast, {
                 ObjectTypeDefinition(node) {
                     if (node.name.value === name) {
                         return null;
                     }
                 },
-            }) });
+            }),
+        };
     });
     return files;
 };

package/lib/utils/merge-helpers.js.map

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

package/lib/utils/strip-empty-queries-and-mutations.js

@@ -28,13 +28,12 @@ exports.default = (ast) => {
     ast = (0, graphql_1.visit)(ast, {
         ObjectTypeDefinition: {
             enter(node) {
-                var _a, _b;
                 if (node.name.kind === 'Name' && node.name.value === 'Query') {
-                    if (((_a = node.fields) === null || _a === void 0 ? void 0 : _a.length) === 0)
+                    if (node.fields?.length === 0)
                         return null;
                 }
                 if (node.name.kind === 'Name' && node.name.value === 'Mutation') {
-                    if (((_b = node.fields) === null || _b === void 0 ? void 0 : _b.length) === 0)
+                    if (node.fields?.length === 0)
                         return null;
                 }
             },

package/lib/utils/strip-empty-queries-and-mutations.js.map

@@ -1 +1 @@
-{"version":3,"file":"strip-empty-queries-and-mutations.js","sourceRoot":"","sources":["../../src/utils/strip-empty-queries-and-mutations.ts"],"names":[],"mappings":";;AAAA,qCAA2C;AAE3C,uDAA2C;AAE3C,kBAAe,CAAC,GAAiB,EAAgB,EAAE;IACjD,iEAAiE;IACjE,GAAG,GAAG,IAAA,eAAK,EAAC,GAAG,EAAE;QACf,oBAAoB,EAAE;YACpB,KAAK,CAAC,IAAI;gBACR,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,OAAO,EAAE;oBAC5D,MAAM,OAAO,GAAQ,IAAA,2BAAS,EAAC,IAAI,CAAC,CAAA;oBACpC,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE;wBACpD,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,CAAA;oBACvC,CAAC,CAAC,CAAA;oBACF,OAAO,OAAO,CAAA;iBACf;gBACD,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,UAAU,EAAE;oBAC/D,MAAM,OAAO,GAAQ,IAAA,2BAAS,EAAC,IAAI,CAAC,CAAA;oBACpC,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE;wBACpD,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,WAAW,CAAA;oBACzC,CAAC,CAAC,CAAA;oBACF,OAAO,OAAO,CAAA;iBACf;YACH,CAAC;SACF;KACF,CAAC,CAAA;IAEF,gDAAgD;IAChD,GAAG,GAAG,IAAA,eAAK,EAAC,GAAG,EAAE;QACf,oBAAoB,EAAE;YACpB,KAAK,CAAC,IAAI;;gBACR,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,OAAO,EAAE;oBAC5D,IAAI,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,MAAM,MAAK,CAAC;wBAAE,OAAO,IAAI,CAAA;iBAC3C;gBACD,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,UAAU,EAAE;oBAC/D,IAAI,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,MAAM,MAAK,CAAC;wBAAE,OAAO,IAAI,CAAA;iBAC3C;YACH,CAAC;SACF;KACF,CAAC,CAAA;IAEF,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA"}
+{"version":3,"file":"strip-empty-queries-and-mutations.js","sourceRoot":"","sources":["../../src/utils/strip-empty-queries-and-mutations.ts"],"names":[],"mappings":";;AAAA,qCAA2C;AAE3C,uDAA2C;AAE3C,kBAAe,CAAC,GAAiB,EAAgB,EAAE;IACjD,iEAAiE;IACjE,GAAG,GAAG,IAAA,eAAK,EAAC,GAAG,EAAE;QACf,oBAAoB,EAAE;YACpB,KAAK,CAAC,IAAI;gBACR,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,OAAO,EAAE;oBAC5D,MAAM,OAAO,GAAQ,IAAA,2BAAS,EAAC,IAAI,CAAC,CAAA;oBACpC,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE;wBACpD,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,CAAA;oBACvC,CAAC,CAAC,CAAA;oBACF,OAAO,OAAO,CAAA;iBACf;gBACD,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,UAAU,EAAE;oBAC/D,MAAM,OAAO,GAAQ,IAAA,2BAAS,EAAC,IAAI,CAAC,CAAA;oBACpC,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE;wBACpD,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,WAAW,CAAA;oBACzC,CAAC,CAAC,CAAA;oBACF,OAAO,OAAO,CAAA;iBACf;YACH,CAAC;SACF;KACF,CAAC,CAAA;IAEF,gDAAgD;IAChD,GAAG,GAAG,IAAA,eAAK,EAAC,GAAG,EAAE;QACf,oBAAoB,EAAE;YACpB,KAAK,CAAC,IAAI;gBACR,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,OAAO,EAAE;oBAC5D,IAAI,IAAI,CAAC,MAAM,EAAE,MAAM,KAAK,CAAC;wBAAE,OAAO,IAAI,CAAA;iBAC3C;gBACD,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,UAAU,EAAE;oBAC/D,IAAI,IAAI,CAAC,MAAM,EAAE,MAAM,KAAK,CAAC;wBAAE,OAAO,IAAI,CAAA;iBAC3C;YACH,CAAC;SACF;KACF,CAAC,CAAA;IAEF,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA"}

package/lib/validators/config-exists/index.js

@@ -13,13 +13,11 @@ const STEPZEN_DEFAULTS = [
     'ups_default',
 ];
 exports.default = (ast, source) => {
-    var _a;
     let configs = [];
     (0, graphql_1.visit)(ast, {
         Argument(node) {
-            var _a, _b;
-            const name = (_a = node.name) === null || _a === void 0 ? void 0 : _a.value;
-            const value = (_b = node.value) === null || _b === void 0 ? void 0 : _b.value;
+            const name = node.name?.value;
+            const value = node.value?.value;
             if (name === 'configuration') {
                 configs = configs.concat(value);
             }
@@ -35,9 +33,8 @@ exports.default = (ast, source) => {
         const content = fs.readFileSync(sourceConfig, 'utf8');
         const asYaml = yaml.parse(content);
         for (const config of configs) {
-            const found = (_a = asYaml === null || asYaml === void 0 ? void 0 : asYaml.configurationset) === null || _a === void 0 ? void 0 : _a.find((c) => {
-                var _a;
-                return ((_a = c === null || c === void 0 ? void 0 : c.configuration) === null || _a === void 0 ? void 0 : _a.name) === config;
+            const found = asYaml?.configurationset?.find((c) => {
+                return c?.configuration?.name === config;
             });
             if (!found) {
                 throw new Error(`Could not find configuration item for "${config}"`);

package/lib/validators/config-exists/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/validators/config-exists/index.ts"],"names":[],"mappings":";;AAAA,qCAA2C;AAC3C,mCAAmC;AACnC,yBAAwB;AACxB,6BAA4B;AAC5B,6BAA4B;AAE5B,MAAM,gBAAgB,GAAG;IACvB,eAAe;IACf,oBAAoB;IACpB,eAAe;IACf,aAAa;IACb,aAAa;CACd,CAAA;AAED,kBAAe,CAAC,GAAiB,EAAE,MAAc,EAAE,EAAE;;IACnD,IAAI,OAAO,GAAQ,EAAE,CAAA;IAErB,IAAA,eAAK,EAAC,GAAG,EAAE;QACT,QAAQ,CAAC,IAAS;;YAChB,MAAM,IAAI,GAAG,MAAA,IAAI,CAAC,IAAI,0CAAE,KAAK,CAAA;YAC7B,MAAM,KAAK,GAAG,MAAA,IAAI,CAAC,KAAK,0CAAE,KAAK,CAAA;YAE/B,IAAI,IAAI,KAAK,eAAe,EAAE;gBAC5B,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;aAChC;QACH,CAAC;KACF,CAAC,CAAA;IAEF,OAAO,GAAG,IAAA,aAAI,EAAC,OAAO,CAAC,CAAA;IACvB,OAAO,GAAG,IAAA,eAAM,EAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;IAEvE,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACtB,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;QAErD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;SACxC;QAED,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAA;QACrD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAElC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,MAAM,KAAK,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,gBAAgB,0CAAE,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE;;gBACtD,OAAO,CAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,aAAa,0CAAE,IAAI,MAAK,MAAM,CAAA;YAC1C,CAAC,CAAC,CAAA;YAEF,IAAI,CAAC,KAAK,EAAE;gBACV,MAAM,IAAI,KAAK,CAAC,0CAA0C,MAAM,GAAG,CAAC,CAAA;aACrE;SACF;KACF;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/validators/config-exists/index.ts"],"names":[],"mappings":";;AAAA,qCAA2C;AAC3C,mCAAmC;AACnC,yBAAwB;AACxB,6BAA4B;AAC5B,6BAA4B;AAE5B,MAAM,gBAAgB,GAAG;IACvB,eAAe;IACf,oBAAoB;IACpB,eAAe;IACf,aAAa;IACb,aAAa;CACd,CAAA;AAED,kBAAe,CAAC,GAAiB,EAAE,MAAc,EAAE,EAAE;IACnD,IAAI,OAAO,GAAQ,EAAE,CAAA;IAErB,IAAA,eAAK,EAAC,GAAG,EAAE;QACT,QAAQ,CAAC,IAAS;YAChB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,KAAK,CAAA;YAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,KAAK,CAAA;YAE/B,IAAI,IAAI,KAAK,eAAe,EAAE;gBAC5B,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;aAChC;QACH,CAAC;KACF,CAAC,CAAA;IAEF,OAAO,GAAG,IAAA,aAAI,EAAC,OAAO,CAAC,CAAA;IACvB,OAAO,GAAG,IAAA,eAAM,EAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;IAEvE,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACtB,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;QAErD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;SACxC;QAED,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAA;QACrD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAElC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,MAAM,KAAK,GAAG,MAAM,EAAE,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE;gBACtD,OAAO,CAAC,EAAE,aAAa,EAAE,IAAI,KAAK,MAAM,CAAA;YAC1C,CAAC,CAAC,CAAA;YAEF,IAAI,CAAC,KAAK,EAAE;gBACV,MAAM,IAAI,KAAK,CAAC,0CAA0C,MAAM,GAAG,CAAC,CAAA;aACrE;SACF;KACF;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stepzen/transpiler",
   "description": "The StepZen transpiler",
-  "version": "0.20.1",
+  "version": "0.21.0-beta.2",
   "author": "Darren Waddell <darren@stepzen.com>",
   "license": "MIT",
   "files": [
@@ -25,12 +25,12 @@
     "debug": "^4.3.4",
     "dotenv": "^10.0.0",
     "fs-extra": "^9.1.0",
-    "glob": "^7.2.0",
+    "glob": "^7.2.3",
     "graphql": "^15.8.0",
-    "inquirer": "^8.2.2",
+    "inquirer": "^8.2.4",
     "lodash": "^4.17.21",
     "node-fetch": "^2.6.7",
-    "prettier": "^2.6.2",
+    "prettier": "^2.7.1",
     "shelljs": "^0.8.5",
     "yaml": "^1.10.2"
   },
@@ -53,5 +53,5 @@
     "nyc": "^14.1.1",
     "ts-node": "^10.8.2"
   },
-  "gitHead": "08ab10b35669b20016025078c4e79f58fc5b52b3"
+  "gitHead": "58b85cc37fa990639bf7170d4224cf51cc1f7ad1"
 }

package/src/actions/configure.ts

@@ -5,47 +5,75 @@ import * as inquirer from 'inquirer'
 import * as path from 'path'
 import * as yaml from 'yaml'
 
+/**
+ * Get effective StepZen endpoint configuration for a directory:
+ * Traverse the file system starting at `source` and
+ *  - merge all `config.yaml` files (discarding unrecognized properties)
+ *  - merge all `config` sections from `stepzen.config.json` files
+ *
+ * Possibly, interactive: if `silent` is `false` and there are non-empty
+ * `config` sections in `stepzen.config.json` files.
+ */
 export default async (source: string, silent = false, answers: any = {}) => {
-  let config: any = {
-    configurationset: [],
-    ruleset: [],
+  const config = {
+    configurationset: [] as any[],
+    ruleset: [] as any[],
+    access: undefined as any,
+    deployment: undefined as any,
   }
 
+  debug('stepzen:transpiler:config')(`getting effective config for ${source}`)
+
   // Now let's parse and add any config.yamls
+  let configYamlCount = 0
   for (const y of glob.sync('**/config.yaml', {cwd: source})) {
     const filePath = path.join(source, y)
 
     const file = fs.readFileSync(filePath, 'utf8')
     let asYAML
     try {
-      asYAML = yaml.parse(file)
+      asYAML = yaml.parse(file, {schema: 'failsafe'})
     } catch (error) {
-      debug('stepzen:transpiler')(
-        `error parsing ${filePath}: ${error} -> ignoring this file`,
+      debug('stepzen:transpiler:config')(
+        `Ignoring an invalid config.yaml ${filePath}.` +
+          ` YAML parse error: ${error}`,
       )
       continue
     }
 
     if (!asYAML) {
-      debug('stepzen:transpiler')(`Ignoring an empty config.yaml ${filePath}`)
-      continue
-    }
-
-    debug('stepzen:transpiler')(`Adding config.yaml ${filePath}`)
-    debug('stepzen:transpiler')(`Contents: ${JSON.stringify(asYAML, null, 2)}`)
-
-    if (asYAML.configurationset) {
-      config.configurationset = config.configurationset.concat(
-        asYAML.configurationset,
+      debug('stepzen:transpiler:config')(
+        `ignoring an empty config.yaml ${filePath}`,
       )
+      continue
     }
 
-    if (asYAML.ruleset) {
-      config.ruleset = config.ruleset.concat(asYAML.ruleset)
-    }
+    configYamlCount += 1
+    debug('stepzen:transpiler:config')(
+      `adding config.yaml ${filePath}:\n${JSON.stringify(asYAML, null, 2)}`,
+    )
+
+    // strip away any non-recognized properties
+    Object.entries(asYAML).forEach(([keyAsAny, value]) => {
+      if (Object.prototype.hasOwnProperty.call(config, keyAsAny)) {
+        const key = keyAsAny as keyof typeof config
+        config[key] = Array.isArray(config[key])
+          ? config[key].concat(value)
+          : value
+      } else {
+        debug('stepzen:transpiler:config')(
+          `ignoring unrecognized config property ${keyAsAny}`,
+        )
+      }
+    })
   }
 
+  debug('stepzen:transpiler:config')(
+    `done adding **/config.yaml files (processed: ${configYamlCount})`,
+  )
+
   // Now let's build configs from questions
+  let configJsonCount = 0
   for await (const j of glob.sync('**/stepzen.config.json', {
     cwd: source,
   })) {
@@ -54,8 +82,11 @@ export default async (source: string, silent = false, answers: any = {}) => {
     const file = fs.readFileSync(filePath, 'utf8')
     const asJSON = JSON.parse(file)
 
-    debug('stepzen:transpiler')(`Adding stepzen.config.json ${filePath}`)
-    debug('stepzen:transpiler')(`Contents: ${JSON.stringify(asJSON, null, 2)}`)
+    configJsonCount += 1
+    debug('stepzen:transpiler:config')(
+      `adding stepzen.config.json ${filePath}:` +
+        `\n${JSON.stringify(asJSON, null, 2)}`,
+    )
 
     if (asJSON.config?.questions) {
       for await (const question of asJSON.config?.questions) {
@@ -81,11 +112,11 @@ export default async (source: string, silent = false, answers: any = {}) => {
           },
         }
 
-        debug('stepzen:transpiler')(
-          `Question: ${JSON.stringify(question, null, 2)}`,
+        debug('stepzen:transpiler:config')(
+          `question: ${JSON.stringify(question, null, 2)}`,
         )
-        debug('stepzen:transpiler')(
-          `Answer: ${JSON.stringify(configset, null, 2)}`,
+        debug('stepzen:transpiler:config')(
+          `answer: ${JSON.stringify(configset, null, 2)}`,
         )
 
         config.configurationset.push({...configset})
@@ -93,41 +124,53 @@ export default async (source: string, silent = false, answers: any = {}) => {
     }
   }
 
-  debug('stepzen:transpiler')(
-    `Configuration: ${JSON.stringify(config, null, 2)}`,
+  debug('stepzen:transpiler:config')(
+    `done adding **/stepzen.config.json files (processed: ${configJsonCount})`,
+  )
+
+  debug('stepzen:transpiler:config')(
+    `combined content of all config files:` +
+      `\n${JSON.stringify(config, null, 2)}`,
   )
 
   // OK now let's collate everything into shared configurations
-  const obj: any = {}
-  for (const c of config.configurationset) {
-    const name = c.configuration.name
-    if (!obj[name]) obj[name] = {}
-    for (const [key, value] of Object.entries(c.configuration)) {
-      if (key === name) continue
-      obj[name][key] = value
+  const configurationset = []
+  {
+    const obj: any = {}
+    for (const c of config.configurationset) {
+      const name = c.configuration.name
+      if (!obj[name]) obj[name] = {}
+      for (const [key, value] of Object.entries(c.configuration)) {
+        if (key === name) continue
+        obj[name][key] = value
+      }
+    }
+
+    for (const configuration of Object.keys(obj)) {
+      configurationset.push({
+        configuration: {...obj[configuration]},
+      })
     }
   }
 
   // Now convert back into StepZen format
-  const structured: any = {
-    configurationset: [],
-    ruleset: [],
-  }
-  for (const configuration of Object.keys(obj)) {
-    structured.configurationset.push({
-      configuration: {...obj[configuration]},
-    })
-  }
-  structured.ruleset = [...config.ruleset]
+  const structured = Object.fromEntries(
+    Object.entries({...config, configurationset}).filter(([_key, value]) =>
+      Array.isArray(value) ? value.length > 0 : value !== undefined,
+    ),
+  )
 
   // Return YAML, if appropriate
-  if (structured.configurationset.length === 0)
-    delete structured.configurationset
-  if (structured.ruleset.length === 0) delete structured.ruleset
-
-  if (structured.configurationset || structured.ruleset) {
-    return yaml.stringify(structured)
+  if (Object.keys(structured).length > 0) {
+    const configYamlStr = yaml.stringify(structured)
+    debug('stepzen:transpiler:config')(`effective config:\n${configYamlStr}`)
+    return configYamlStr
   }
 
+  debug('stepzen:transpiler:config')(
+    `Could not find any of the supported properties in the config:` +
+      ` [ '${Object.keys(config).join(`', '`)}' ].` +
+      ` Retuning 'false' meaning 'effective config is empty'.`,
+  )
   return false
 }

package/src/actions/transpile.ts

@@ -1,5 +1,6 @@
 import {DocumentNode, parse} from 'graphql'
 import * as dotenv from 'dotenv'
+import * as debug from 'debug'
 import * as fs from 'fs'
 import * as glob from 'glob'
 import * as path from 'path'
@@ -17,15 +18,21 @@ export default async (source: string) => {
   }
 
   // Load env vars, from working and source directories
+  debug('stepzen:dotenv')(
+    `loading .env from ${process.cwd()}, at transpiler/src/actions/transpile.ts:24`,
+  )
   dotenv.config()
+  debug('stepzen:dotenv')(
+    `loading .env from ${path.resolve(source)}` +
+      `, at transpiler/src/actions/transpile.ts:29`,
+  )
   dotenv.config({path: path.resolve(source, '.env')})
 
   // State of whether we've transpiled or not
   let transpiledConfig = false
-  let transpiledGraphQL = false
 
   // See whether to transpile config
-  let config: any = await configure(source, true)
+  let config = await configure(source, true)
   const configCopy = config
 
   if (config) {
@@ -40,31 +47,18 @@ export default async (source: string) => {
 
   // See whether to transpile GraphQL
   const graphqlFiles = glob.sync('**/*.graphql', {cwd: source})
-  let original: any = ''
-  let mutated: any = ''
+  let schema = ''
 
   if (graphqlFiles.length > 0) {
     const stitched = await stitch(source)
-
     const index = path.join(stitched, 'index.graphql')
-
     const graphql = fs.readFileSync(index, 'utf8')
-
-    let ast: DocumentNode = parse(graphql)
-    original = parse(graphql)
-
-    // you can transpile schema ast here
-
-    mutated = print(ast)
-
-    if (print(original) !== mutated) {
-      transpiledGraphQL = true
-    }
+    schema = print(parse(graphql))
   }
 
   return {
     config,
-    schema: mutated,
-    transpiled: transpiledConfig || transpiledGraphQL,
+    schema,
+    transpiled: transpiledConfig,
   }
 }

package/src/mutations/config/envvars.ts

@@ -1,3 +1,5 @@
+import * as debug from 'debug'
+
 export default async (config: string): Promise<string> => {
   const envvars = Object.keys(process.env)
     .filter(key => {
@@ -8,10 +10,24 @@ export default async (config: string): Promise<string> => {
       return obj
     }, {})
 
+  let replacements = 0
+  debug('stepzen:transpiler:config')(
+    `STEPZEN_* env vars available for replacement:` +
+      ` ${JSON.stringify(envvars, undefined, 2)}`,
+  )
+
   for (const [key, value] of Object.entries(envvars)) {
     const regex = new RegExp(key, 'g')
-    config = config.replace(regex, `${value}`)
+    config = config.replace(regex, (match, offset) => {
+      replacements += 1
+      debug('stepzen:transpiler:config')(
+        `replacing ${match} at offset ${offset}`,
+      )
+      return `${value}`
+    })
   }
 
+  debug('stepzen:transpiler:config')(`total replacements made: ${replacements}`)
+
   return config
 }

package/src/utils/constants.ts

@@ -1,5 +1,9 @@
 import * as dotenv from 'dotenv'
+import * as debug from 'debug'
 
+debug('stepzen:dotenv')(
+  `loading .env from ${process.cwd()}, at transpiler/src/utils/constants.ts`,
+)
 dotenv.config()
 
 const {STEPZEN_DOMAIN: ENV_VAR_STEPZEN_DOMAIN} = process.env