@stepzen/transpiler 0.0.30 → 0.0.34

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 StepZen
+Copyright (c) 2021, 2022 StepZen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/lib/actions/configure.js

@@ -19,8 +19,8 @@ exports.default = async (source, silent = false, answers = {}) => {
         const filePath = path.join(source, y);
         const file = fs.readFileSync(filePath, "utf8");
         const asYAML = yaml.parse(file);
-        debug('stepzen:transpiler')(`Adding config.yaml ${filePath}`);
-        debug('stepzen:transpiler')(`Contents: ${JSON.stringify(asYAML, null, 2)}`);
+        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);
         }
@@ -37,8 +37,8 @@ exports.default = async (source, silent = false, answers = {}) => {
             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)}`);
+            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;) {
@@ -46,7 +46,9 @@ exports.default = async (source, silent = false, answers = {}) => {
                         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] : "" } };
+                            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));
@@ -57,8 +59,8 @@ exports.default = async (source, silent = false, answers = {}) => {
                                 [key]: answer[name][key],
                             },
                         };
-                        debug('stepzen:transpiler')(`Question: ${JSON.stringify(question, null, 2)}`);
-                        debug('stepzen:transpiler')(`Answer: ${JSON.stringify(configset, null, 2)}`);
+                        debug("stepzen:transpiler")(`Question: ${JSON.stringify(question, null, 2)}`);
+                        debug("stepzen:transpiler")(`Answer: ${JSON.stringify(configset, null, 2)}`);
                         config.configurationset.push(Object.assign({}, configset));
                     }
                 }
@@ -79,7 +81,7 @@ exports.default = async (source, silent = false, answers = {}) => {
         }
         finally { if (e_1) throw e_1.error; }
     }
-    debug('stepzen:transpiler')(`Configuration: ${JSON.stringify(config, null, 2)}`);
+    debug("stepzen:transpiler")(`Configuration: ${JSON.stringify(config, null, 2)}`);
     // OK now let's collate everything into shared configurations
     const obj = {};
     for (const c of config.configurationset) {

package/lib/actions/lint.js

@@ -14,15 +14,15 @@ exports.default = async (source, options = {
     }
     let extensions = options.extensions;
     if (!extensions) {
-        const response = await node_fetch_1.default('https://www.steprz.net/directives.graphql');
+        const response = await node_fetch_1.default("https://www.steprz.net/directives.graphql");
         extensions = await response.text();
     }
     const stitched = stitch_1.default(source);
-    const index = path.join(stitched, 'index.graphql');
-    const graphql = fs.readFileSync(index, 'utf8');
+    const index = path.join(stitched, "index.graphql");
+    const graphql = fs.readFileSync(index, "utf8");
     const tmp = path.join(os.tmpdir(), `stepzen-lint-${Date.now()}`);
     fs.ensureDirSync(tmp);
-    const lintFile = path.join(tmp, 'index.graphql');
+    const lintFile = path.join(tmp, "index.graphql");
     fs.writeFileSync(lintFile, `${extensions}${os.EOL}${os.EOL}${graphql}`);
     shell.exec(`npx graphql-schema-linter ${lintFile}`, { silent: true }, (code, stdout, stderr) => {
         console.log(stdout);

package/lib/actions/merge.js

@@ -28,14 +28,12 @@ exports.default = async (original, imported, options = {
     if (!options.answers)
         options.answers = {};
     if (!options.output)
-        options.output = `stepzen-tmp-${Date.now()}`;
+        options.output = path.join(os.tmpdir(), `stepzen-tmp-${Date.now()}`);
     if (!options.silent)
         options.silent = false;
     // To stop things like
     // C:\Users\Darren\AppData\Local\Temp\stepzen-tmp-config-1638293497187\C:\Users\Darren\AppData\Local\Temp\stepzen-tmp-1638293496286
-    const regex = new RegExp(os.tmpdir(), 'gi');
-    options.output = options.output.replace(regex, '');
-    options.output = path.join(os.tmpdir(), options.output);
+    options.output = merge_helpers_1.dedupeTempFolder(options.output);
     // Ensure original, importing and output directories exist
     if (!fs.existsSync(original))
         throw new Error(`Cannot find original directory ${original}`);
@@ -45,7 +43,7 @@ exports.default = async (original, imported, options = {
     // Copy the original into the output.
     fs.copySync(original, options.output);
     // Ensure an index.graphql exists
-    const outputIndex = path.join(options.output, 'index.graphql');
+    const outputIndex = path.join(options.output, "index.graphql");
     if (!fs.existsSync(outputIndex)) {
         fs.writeFileSync(outputIndex, BLANK_INDEX_TEMPLATE);
     }
@@ -109,21 +107,23 @@ exports.default = async (original, imported, options = {
     cleaned.original.forEach((a) => {
         // eslint-disable-next-line
         const file = path.join(options.output, a.file);
-        fs.ensureFileSync(file);
-        fs.writeFileSync(file, print_1.default(a.ast));
+        const deduped = merge_helpers_1.dedupeTempFolder(file);
+        fs.ensureFileSync(deduped);
+        fs.writeFileSync(deduped, print_1.default(a.ast));
     });
     cleaned.imported.forEach((a) => {
         // eslint-disable-next-line
         const file = path.join(options.output, imported.name, a.file);
-        fs.ensureFileSync(file);
-        fs.writeFileSync(file, print_1.default(a.ast));
+        const deduped = merge_helpers_1.dedupeTempFolder(file);
+        fs.ensureFileSync(deduped);
+        fs.writeFileSync(deduped, print_1.default(a.ast));
     });
     // Make sure all files are referenced in @sdl
     set_files_in_sdl_1.default(options.output);
     // Generate configuration
     const config = await merge_helpers_1.getConfiguration([options.output, imported.source], options.silent, options.answers);
     if (config) {
-        const configFile = path.join(options.output, 'config.yaml');
+        const configFile = path.join(options.output, "config.yaml");
         fs.writeFileSync(configFile, config);
     }
     // Return a merged schema!

package/lib/actions/stitch.js

@@ -17,7 +17,7 @@ exports.default = (source, output = path.join(os.tmpdir(), `stepzen-tmp-${Date.n
     let ast;
     let files = [];
     // If there's an index.graphQL - get files argument in @sdl directive
-    const sourceIndex = path.join(source, 'index.graphql');
+    const sourceIndex = path.join(source, "index.graphql");
     if (fs.existsSync(sourceIndex)) {
         const index = fs.readFileSync(sourceIndex, "utf8");
         ast = graphql_1.parse(index);
@@ -76,11 +76,11 @@ exports.default = (source, output = path.join(os.tmpdir(), `stepzen-tmp-${Date.n
     // Format
     stitched = prettier.format(stitched, { parser: "graphql" });
     // Write to output folder
-    const outputIndex = path.join(output, 'index.graphql');
+    const outputIndex = path.join(output, "index.graphql");
     fs.writeFileSync(outputIndex, stitched);
     // Copy config if exists, too
-    const sourceConfig = path.join(source, 'config.yaml');
-    const outputConfig = path.join(output, 'config.yaml');
+    const sourceConfig = path.join(source, "config.yaml");
+    const outputConfig = path.join(output, "config.yaml");
     if (fs.existsSync(sourceConfig)) {
         fs.copyFileSync(sourceConfig, outputConfig);
     }

package/lib/actions/transpile.js

@@ -45,11 +45,11 @@ exports.default = async (source) => {
     }
     // See whether to transpile GraphQL
     const graphqlFiles = glob.sync("**/*.graphql", { cwd: source });
-    let original = '';
-    let mutated = '';
+    let original = "";
+    let mutated = "";
     if (graphqlFiles.length > 0) {
         const stitched = await stitch_1.default(source);
-        const index = path.join(stitched, 'index.graphql');
+        const index = path.join(stitched, "index.graphql");
         const graphql = fs.readFileSync(index, "utf8");
         let ast = graphql_1.parse(graphql);
         original = graphql_1.parse(graphql);
@@ -62,6 +62,6 @@ exports.default = async (source) => {
     return {
         config,
         schema: mutated,
-        transpiled: transpiledConfig || transpiledGraphQL
+        transpiled: transpiledConfig || transpiledGraphQL,
     };
 };

package/lib/actions/validate.js

@@ -19,7 +19,7 @@ exports.default = (source, options = {
         throw new Error(`Cannot find index.graphql in ${source}`);
     }
     // Get the index.graphql file
-    const file = path.join(source, 'index.graphql');
+    const file = path.join(source, "index.graphql");
     const index = fs.readFileSync(file, "utf8");
     // Parse
     let ast = graphql_1.parse(`${constants_1.EXPERIMENTAL_EXTENSIONS}${os.EOL}${options.extensions}${os.EOL}${index}`, {

package/lib/mutations/config/envvars.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = async (config) => {
     const envvars = Object.keys(process.env)
-        .filter(key => {
+        .filter((key) => {
         return key.startsWith(`STEPZEN_`);
     })
         .reduce((obj, key) => {
@@ -10,7 +10,7 @@ exports.default = async (config) => {
         return obj;
     }, {});
     for (const [key, value] of Object.entries(envvars)) {
-        const regex = new RegExp(key, 'g');
+        const regex = new RegExp(key, "g");
         config = config.replace(regex, `${value}`);
     }
     return config;

package/lib/mutations/config/index.js

@@ -1,6 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const envvars_1 = require("./envvars");
-exports.default = [
-    envvars_1.default,
-];
+exports.default = [envvars_1.default];

package/lib/utils/constants.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.STEPZEN_DOMAIN = exports.EXPERIMENTAL_EXTENSIONS = void 0;
 const dotenv = require("dotenv");
 dotenv.config();
-const { STEPZEN_DOMAIN: ENV_VAR_STEPZEN_DOMAIN, } = process.env;
+const { STEPZEN_DOMAIN: ENV_VAR_STEPZEN_DOMAIN } = process.env;
 exports.EXPERIMENTAL_EXTENSIONS = `
 directive @experimental(
   debug: Boolean
@@ -12,4 +12,4 @@ directive @experimental(
   setter: String
 ) on OBJECT | FIELD_DEFINITION
 `;
-exports.STEPZEN_DOMAIN = ENV_VAR_STEPZEN_DOMAIN || 'stepzen.io';
+exports.STEPZEN_DOMAIN = ENV_VAR_STEPZEN_DOMAIN || "stepzen.io";

package/lib/utils/merge-helpers.d.ts

@@ -1,4 +1,5 @@
 import { GraphQLSchema } from "graphql";
+export declare const dedupeTempFolder: (dirpath: string) => string;
 export declare const findQueryMutationInSchema: (name: string, files: any) => Boolean;
 export declare const findTypeInSchema: (name: string, files: any) => Boolean;
 export declare const getConfiguration: (directories: string[], silent?: boolean, answers?: any) => Promise<string | boolean>;

package/lib/utils/merge-helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeTypeFromSchema = exports.removeQueryMutationFromSchema = exports.mergeTypeIntoSchema = exports.mergeQueryMutationIntoSchema = exports.getSchema = exports.getExtensions = exports.getConfiguration = exports.findTypeInSchema = exports.findQueryMutationInSchema = void 0;
+exports.removeTypeFromSchema = exports.removeQueryMutationFromSchema = exports.mergeTypeIntoSchema = exports.mergeQueryMutationIntoSchema = exports.getSchema = exports.getExtensions = exports.getConfiguration = exports.findTypeInSchema = exports.findQueryMutationInSchema = exports.dedupeTempFolder = void 0;
 const graphql_1 = require("graphql");
 const utilities_1 = require("graphql/utilities");
 const node_fetch_1 = require("node-fetch");
@@ -8,10 +8,19 @@ const fs = require("fs-extra");
 const glob = require("glob");
 const os = require("os");
 const path = require("path");
+const lodash_1 = require("lodash");
 const graphql_helpers_1 = require("../utils/graphql-helpers");
 const constants_1 = require("./constants");
 const configure_1 = require("../actions/configure");
 const transpile_1 = require("../actions/transpile");
+const dedupeTempFolder = (dirpath) => {
+    do {
+        dirpath = lodash_1.replace(dirpath, os.tmpdir(), '');
+    } while (dirpath.includes(os.tmpdir()));
+    dirpath = path.join(os.tmpdir(), dirpath);
+    return dirpath;
+};
+exports.dedupeTempFolder = dedupeTempFolder;
 const findQueryMutationInSchema = (name, files) => {
     for (const file of files) {
         let found = false;
@@ -56,7 +65,8 @@ const getConfiguration = async (directories, silent = false, answers = {}) => {
         ];
         for (const config of configs) {
             const configFolder = path.join(directory, config);
-            const writeFolder = path.join(tmp, directory, config);
+            let writeFolder = path.join(tmp, directory, config);
+            writeFolder = exports.dedupeTempFolder(writeFolder);
             const content = fs.readFileSync(configFolder, "utf8");
             fs.ensureFileSync(writeFolder);
             fs.writeFileSync(writeFolder, content);
@@ -68,7 +78,7 @@ const getConfiguration = async (directories, silent = false, answers = {}) => {
 };
 exports.getConfiguration = getConfiguration;
 const getExtensions = async () => {
-    const domain = constants_1.STEPZEN_DOMAIN.replace('.io', '.net');
+    const domain = constants_1.STEPZEN_DOMAIN.replace(".io", ".net");
     const response = await node_fetch_1.default(`https://www.${domain}/directives.graphql`);
     const text = await response.text();
     return text;

package/lib/utils/set-files-in-sdl.js

@@ -10,7 +10,7 @@ exports.default = (source) => {
     const files = glob
         .sync("**/*.graphql", { cwd: source })
         .filter((file) => file !== "index.graphql");
-    const output = path.join(source, 'index.graphql');
+    const output = path.join(source, "index.graphql");
     const index = fs.readFileSync(output, "utf8");
     let ast = graphql_1.parse(index);
     ast = graphql_1.visit(ast, {

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

@@ -6,11 +6,11 @@ const fs = require("fs");
 const path = require("path");
 const yaml = require("yaml");
 const STEPZEN_DEFAULTS = [
-    'fedex_default',
-    'holidayapi_default',
-    'ipapi_default',
-    'owm_default',
-    'ups_default',
+    "fedex_default",
+    "holidayapi_default",
+    "ipapi_default",
+    "owm_default",
+    "ups_default",
 ];
 exports.default = (ast, source) => {
     var _a;
@@ -28,11 +28,11 @@ exports.default = (ast, source) => {
     configs = lodash_1.uniq(configs);
     configs = lodash_1.filter(configs, (config) => !STEPZEN_DEFAULTS.includes(config));
     if (configs.length > 0) {
-        const sourceConfig = path.join(source, 'config.yaml');
+        const sourceConfig = path.join(source, "config.yaml");
         if (!fs.existsSync(sourceConfig)) {
-            throw new Error('No config.yaml found');
+            throw new Error("No config.yaml found");
         }
-        const content = fs.readFileSync(sourceConfig, 'utf8');
+        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) => {

package/lib/validators/index.js

@@ -1,6 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_exists_1 = require("./config-exists");
-exports.default = [
-    config_exists_1.default,
-];
+exports.default = [config_exists_1.default];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stepzen/transpiler",
   "description": "The StepZen transpiler",
-  "version": "0.0.30",
+  "version": "0.0.34",
   "author": "Darren Waddell <darren@stepzen.com>",
   "license": "MIT",
   "files": [
@@ -16,18 +16,18 @@
     "test": "rm -rf lib && tsc -b && nyc --extension .ts mocha --forbid-only \"test/**/*.test.ts\""
   },
   "dependencies": {
-    "@graphql-tools/merge": "^6.2.13",
-    "debug": "^4.3.1",
+    "@graphql-tools/merge": "^6.2.17",
+    "debug": "^4.3.2",
     "dotenv": "^10.0.0",
     "fs-extra": "^9.1.0",
     "glob": "^7.1.6",
-    "graphql": "^15.5.0",
+    "graphql": "^15.7.2",
     "has-flag": "^5.0.0",
-    "inquirer": "^8.0.0",
+    "inquirer": "^8.2.0",
     "lodash": "^4.17.21",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "^2.6.6",
     "prettier": "^2.2.1",
-    "shelljs": "^0.8.4",
+    "shelljs": "^0.8.5",
     "yaml": "^1.10.2"
   },
   "devDependencies": {