@stepzen/transpiler 0.28.0-experimental.dd6fead → 0.28.0-experimental.f225ee8

package/lib/utils/merge-helpers.js

@@ -5,7 +5,7 @@ const debug = require("debug");
 const graphql_1 = require("graphql");
 const utilities_1 = require("graphql/utilities");
 const fetch_1 = require("@stepzen/fetch");
-const fs = require("fs-extra");
+const fsx = require("fs-extra");
 const glob = require("glob");
 const os = require("os");
 const path = require("path");
@@ -14,6 +14,7 @@ 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 rmtemp_1 = require("./rmtemp");
 const dedupeTempFolder = (dirpath) => {
     do {
         dirpath = (0, lodash_1.replace)(dirpath, os.tmpdir(), '');
@@ -25,7 +26,7 @@ exports.dedupeTempFolder = dedupeTempFolder;
 const findNextAvailableSubfolder = (folder, name) => {
     let subfolder = name;
     let counter = 1;
-    while (fs.existsSync(path.join(folder, subfolder))) {
+    while (fsx.existsSync(path.join(folder, subfolder))) {
         const suffix = `${counter++}`.padStart(2, '0');
         subfolder = `${name}-${suffix}`;
     }
@@ -68,24 +69,28 @@ const findTypeInSchema = (name, files) => {
 exports.findTypeInSchema = findTypeInSchema;
 const getConfiguration = async (directories, silent = false, answers = {}) => {
     const tmp = path.join(os.tmpdir(), `stepzen-tmp-config-${Date.now()}`);
-    fs.ensureDirSync(tmp);
-    for (const directory of directories) {
-        const configs = [
-            ...glob.sync('**/config.yaml', { cwd: directory }),
-            ...glob.sync('**/stepzen.config.json', { cwd: directory }),
-        ];
-        for (const config of configs) {
-            const configFolder = path.join(directory, config);
-            let writeFolder = path.join(tmp, directory, config);
-            writeFolder = (0, exports.dedupeTempFolder)(writeFolder);
-            const content = fs.readFileSync(configFolder, 'utf8');
-            fs.ensureFileSync(writeFolder);
-            fs.writeFileSync(writeFolder, content);
+    fsx.ensureDirSync(tmp);
+    try {
+        for (const directory of directories) {
+            const configs = [
+                ...glob.sync('**/config.yaml', { cwd: directory }),
+                ...glob.sync('**/stepzen.config.json', { cwd: directory }),
+            ];
+            for (const config of configs) {
+                const configFolder = path.join(directory, config);
+                let writeFolder = path.join(tmp, directory, config);
+                writeFolder = (0, exports.dedupeTempFolder)(writeFolder);
+                const content = fsx.readFileSync(configFolder, 'utf8');
+                fsx.ensureFileSync(writeFolder);
+                fsx.writeFileSync(writeFolder, content, { mode: 0o600 });
+            }
         }
+        const configuration = await (0, configure_1.default)(tmp, silent, answers);
+        return configuration;
+    }
+    finally {
+        (0, rmtemp_1.rmtemp)(tmp);
     }
-    const configuration = await (0, configure_1.default)(tmp, silent, answers);
-    fs.removeSync(tmp);
-    return configuration;
 };
 exports.getConfiguration = getConfiguration;
 const getExtensions = async () => {

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/rmtemp.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Verify that the given path is indeed inside the tmp folder,
+ * and delete it recursively suppressing any errors.
+ *
+ * If the given path is not inside the tmp folder, do nothing.
+ *
+ * @param {*} fileOrDirPath path to a temp file or folder to delete
+ */
+export declare const rmtemp: (fileOrDirPath?: string) => void;
+export default rmtemp;
+//# sourceMappingURL=rmtemp.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"rmtemp.d.ts","sourceRoot":"","sources":["../../src/utils/rmtemp.ts"],"names":[],"mappings":"AAYA;;;;;;;GAOG;AACH,eAAO,MAAM,MAAM,mBAAoB,MAAM,SAyB5C,CAAA;AAED,eAAe,MAAM,CAAA"}

package/lib/utils/rmtemp.js

@@ -0,0 +1,43 @@
+"use strict";
+// Copyright (c) 2020,2021,2022,2023, StepZen, Inc.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rmtemp = void 0;
+const fs = require("fs");
+const path = require("path");
+const os = require("os");
+const debug = require("debug");
+// ----------------------------------------------------------------------------
+//      THIS ENTIRE FILE IS COPIED FROM packages/cli/src/shared/rmtemp.ts
+// (because there is no effective way to share util classes between packages yet)
+// ----------------------------------------------------------------------------
+/**
+ * Verify that the given path is indeed inside the tmp folder,
+ * and delete it recursively suppressing any errors.
+ *
+ * If the given path is not inside the tmp folder, do nothing.
+ *
+ * @param {*} fileOrDirPath path to a temp file or folder to delete
+ */
+const rmtemp = (fileOrDirPath) => {
+    if (!fileOrDirPath) {
+        return;
+    }
+    // https://stackoverflow.com/a/45242825
+    const relative = path.relative(os.tmpdir(), fileOrDirPath);
+    const isInTemp = relative && !relative.startsWith('..') && !path.isAbsolute(relative);
+    if (isInTemp) {
+        try {
+            fs.rmSync(fileOrDirPath, { recursive: true, force: true });
+        }
+        catch (error) {
+            // ignore errors
+            debug('stepzen:rmtemp')(`WARN: caught an exception while deleting ${fileOrDirPath}: `, error);
+        }
+    }
+    else {
+        debug('stepzen:rmtemp')(`WARN: got a temp path ${fileOrDirPath} out of the TMP folder -- ignoring`);
+    }
+};
+exports.rmtemp = rmtemp;
+exports.default = exports.rmtemp;
+//# sourceMappingURL=rmtemp.js.map

package/lib/utils/rmtemp.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rmtemp.js","sourceRoot":"","sources":["../../src/utils/rmtemp.ts"],"names":[],"mappings":";AAAA,mDAAmD;;;AAEnD,yBAAwB;AACxB,6BAA4B;AAC5B,yBAAwB;AACxB,+BAA8B;AAE9B,+EAA+E;AAC/E,yEAAyE;AACzE,iFAAiF;AACjF,+EAA+E;AAE/E;;;;;;;GAOG;AACI,MAAM,MAAM,GAAG,CAAC,aAAsB,EAAE,EAAE;IAC/C,IAAI,CAAC,aAAa,EAAE;QAClB,OAAM;KACP;IAED,uCAAuC;IACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,CAAA;IAC1D,MAAM,QAAQ,GACZ,QAAQ,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;IAEtE,IAAI,QAAQ,EAAE;QACZ,IAAI;YACF,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE,EAAC,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC,CAAA;SACzD;QAAC,OAAO,KAAK,EAAE;YACd,gBAAgB;YAChB,KAAK,CAAC,gBAAgB,CAAC,CACrB,4CAA4C,aAAa,IAAI,EAC7D,KAAK,CACN,CAAA;SACF;KACF;SAAM;QACL,KAAK,CAAC,gBAAgB,CAAC,CACrB,yBAAyB,aAAa,oCAAoC,CAC3E,CAAA;KACF;AACH,CAAC,CAAA;AAzBY,QAAA,MAAM,UAyBlB;AAED,kBAAe,cAAM,CAAA"}

package/lib/utils/set-files-in-sdl.d.ts

@@ -1,6 +1,6 @@
-import { DirectiveNode, SchemaDefinitionNode } from 'graphql';
+import { ConstDirectiveNode, DirectiveNode, SchemaDefinitionNode } from 'graphql';
 import { DeepWriteable } from './graphql-helpers';
-export declare const createOrUpdateSdlDirective: (importedGraphQLFiles: readonly string[], allGraphQLFiles: readonly string[], origSdlDirective?: DeepWriteable<DirectiveNode>) => DeepWriteable<DirectiveNode>;
+export declare const createOrUpdateSdlDirective: (importedGraphQLFiles: readonly string[], allGraphQLFiles: readonly string[], origSdlDirective?: DeepWriteable<DirectiveNode>) => DeepWriteable<ConstDirectiveNode>;
 export declare const createSchemaElement: (importedGraphQLFiles: readonly string[], allGraphQLFiles: readonly string[]) => DeepWriteable<SchemaDefinitionNode>;
 declare const _default: (source: string, importedGraphQLFiles: readonly string[]) => void;
 export default _default;

package/lib/utils/set-files-in-sdl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"set-files-in-sdl.d.ts","sourceRoot":"","sources":["../../src/utils/set-files-in-sdl.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EAGb,oBAAoB,EAGrB,MAAM,SAAS,CAAA;AAGhB,OAAO,EAAY,aAAa,EAAC,MAAM,mBAAmB,CAAA;AAQ1D,eAAO,MAAM,0BAA0B,yBACf,SAAS,MAAM,EAAE,mBACtB,SAAS,MAAM,EAAE,qBACf,cAAc,aAAa,CAAC,iCA2DhD,CAAA;AAED,eAAO,MAAM,mBAAmB,yBACR,SAAS,MAAM,EAAE,mBACtB,SAAS,MAAM,EAAE,wCAuBnC,CAAA;iCAEuB,MAAM,wBAAwB,SAAS,MAAM,EAAE;AAAvE,wBA4CC"}
+{"version":3,"file":"set-files-in-sdl.d.ts","sourceRoot":"","sources":["../../src/utils/set-files-in-sdl.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,kBAAkB,EAClB,aAAa,EAIb,oBAAoB,EAIrB,MAAM,SAAS,CAAA;AAGhB,OAAO,EAAY,aAAa,EAAC,MAAM,mBAAmB,CAAA;AAQ1D,eAAO,MAAM,0BAA0B,yBACf,SAAS,MAAM,EAAE,mBACtB,SAAS,MAAM,EAAE,qBACf,cAAc,aAAa,CAAC,sCA2DhD,CAAA;AAED,eAAO,MAAM,mBAAmB,yBACR,SAAS,MAAM,EAAE,mBACtB,SAAS,MAAM,EAAE,wCAuBnC,CAAA;iCAEuB,MAAM,wBAAwB,SAAS,MAAM,EAAE;AAAvE,wBA4CC"}

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

@@ -16,23 +16,23 @@ const createOrUpdateSdlDirective = (importedGraphQLFiles, allGraphQLFiles, origS
     }
     else {
         sdlDirective = {
-            kind: 'Directive',
+            kind: graphql_1.Kind.DIRECTIVE,
             name: {
-                kind: 'Name',
+                kind: graphql_1.Kind.NAME,
                 value: 'sdl',
             },
             arguments: [
                 {
-                    kind: 'Argument',
+                    kind: graphql_1.Kind.ARGUMENT,
                     name: {
-                        kind: 'Name',
+                        kind: graphql_1.Kind.NAME,
                         value: 'files',
                     },
                     value: {
-                        kind: 'ListValue',
+                        kind: graphql_1.Kind.LIST,
                         values: [
                             {
-                                kind: 'StringValue',
+                                kind: graphql_1.Kind.STRING,
                                 value: constants_1.ALL_GRAPHQL_FILES,
                             },
                         ],
@@ -55,7 +55,7 @@ const createOrUpdateSdlDirective = (importedGraphQLFiles, allGraphQLFiles, origS
                 allGraphQLFiles.forEach(file => fileset.add(normalizePathSep(file)));
             }
             filesValueNodes.values = [...fileset].map(file => ({
-                kind: 'StringValue',
+                kind: graphql_1.Kind.STRING,
                 value: file,
             }));
         }
@@ -66,18 +66,18 @@ const createOrUpdateSdlDirective = (importedGraphQLFiles, allGraphQLFiles, origS
 exports.createOrUpdateSdlDirective = createOrUpdateSdlDirective;
 const createSchemaElement = (importedGraphQLFiles, allGraphQLFiles) => {
     const schemaElement = {
-        kind: 'SchemaDefinition',
+        kind: graphql_1.Kind.SCHEMA_DEFINITION,
         directives: [
             (0, exports.createOrUpdateSdlDirective)(importedGraphQLFiles, allGraphQLFiles),
         ],
         operationTypes: [
             {
-                kind: 'OperationTypeDefinition',
-                operation: 'query',
+                kind: graphql_1.Kind.OPERATION_TYPE_DEFINITION,
+                operation: graphql_1.OperationTypeNode.QUERY,
                 type: {
-                    kind: 'NamedType',
+                    kind: graphql_1.Kind.NAMED_TYPE,
                     name: {
-                        kind: 'Name',
+                        kind: graphql_1.Kind.NAME,
                         value: 'Query',
                     },
                 },

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

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stepzen/transpiler",
   "description": "The StepZen transpiler",
-  "version": "0.28.0-experimental.dd6fead",
+  "version": "0.28.0-experimental.f225ee8",
   "author": "Darren Waddell <darren@stepzen.com>",
   "license": "MIT",
   "files": [
@@ -22,29 +22,31 @@
     "posttest": "prettier . --check"
   },
   "dependencies": {
-    "@graphql-tools/merge": "^6.2.17",
-    "@stepzen/fetch": "0.28.0-experimental.dd6fead",
+    "@graphql-tools/merge": "^8.3.15",
+    "@stepzen/fetch": "0.28.0-experimental.f225ee8",
     "debug": "^4.3.4",
-    "dotenv": "^10.0.0",
+    "dotenv": "^16.0.3",
     "fs-extra": "^9.1.0",
     "glob": "^7.2.3",
-    "graphql": "^15.8.0",
-    "inquirer": "^8.2.4",
+    "graphql": "^16.6.0",
+    "inquirer": "^8.2.5",
     "lodash": "^4.17.21",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.3",
     "shelljs": "^0.8.5",
     "yaml": "^1.10.2"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "@types/fs-extra": "^9.0.11",
+    "@types/fs-extra": "^9.0.13",
     "@types/glob": "^7.2.0",
-    "@types/inquirer": "^7.3.1",
+    "@types/inquirer": "^8.2.5",
     "@types/lodash": "^4.14.168",
     "@types/mocha": "^8.2.2",
     "@types/mock-fs": "^4.13.0",
-    "@types/prettier": "^2.4.4",
-    "@types/shelljs": "^0.8.9",
+    "@types/node": "^14.18.36",
+    "@types/node-fetch": "^2.6.2",
+    "@types/prettier": "^2.7.2",
+    "@types/shelljs": "^0.8.11",
     "chai": "^4.3.4",
     "fancy-test": "^1.4.10",
     "mocha": "^9.0.1",
@@ -53,5 +55,5 @@
     "nyc": "^14.1.1",
     "ts-node": "^10.8.2"
   },
-  "gitHead": "dd6fead5f0980fa1f26a207c1bda398a214a3cfd"
+  "gitHead": "f225ee811bee33325d404a0ee11314f8161f6b19"
 }

package/src/actions/configure.ts

@@ -1,5 +1,5 @@
 import * as debug from 'debug'
-import * as fs from 'fs-extra'
+import * as fsx from 'fs-extra'
 import * as glob from 'glob'
 import * as inquirer from 'inquirer'
 import * as path from 'path'
@@ -29,7 +29,7 @@ export default async (source: string, silent = false, answers: any = {}) => {
   for (const y of glob.sync('**/config.yaml', {cwd: source})) {
     const filePath = path.join(source, y)
 
-    const file = fs.readFileSync(filePath, 'utf8')
+    const file = fsx.readFileSync(filePath, 'utf8')
     let asYAML
     try {
       asYAML = yaml.parse(file, {schema: 'failsafe'})
@@ -79,7 +79,7 @@ export default async (source: string, silent = false, answers: any = {}) => {
   })) {
     const filePath = path.join(source, j)
 
-    const file = fs.readFileSync(filePath, 'utf8')
+    const file = fsx.readFileSync(filePath, 'utf8')
     const asJSON = JSON.parse(file)
 
     configJsonCount += 1

package/src/actions/lint.ts

@@ -1,10 +1,11 @@
-import * as fs from 'fs-extra'
+import * as fsx from 'fs-extra'
 import * as os from 'os'
 import * as path from 'path'
 import * as shell from 'shelljs'
 
 import stitch from '../actions/stitch'
 import {getExtensions} from '../utils/merge-helpers'
+import {rmtemp} from '../utils/rmtemp'
 
 export default async (
   source: string,
@@ -14,7 +15,7 @@ export default async (
     extensions: '',
   },
 ) => {
-  if (!fs.existsSync(source)) {
+  if (!fsx.existsSync(source)) {
     throw new Error(`Cannot find source directory ${source}`)
   }
 
@@ -24,21 +25,23 @@ export default async (
     extensions = await getExtensions()
   }
 
-  const stitched = stitch(source)
-  const index = path.join(stitched, 'index.graphql')
-  const graphql = fs.readFileSync(index, 'utf8')
+  let stitched, tmp
+  try {
+    stitched = stitch(source)
+    const index = path.join(stitched, 'index.graphql')
+    const graphql = fsx.readFileSync(index, 'utf8')
 
-  const tmp = path.join(os.tmpdir(), `stepzen-lint-${Date.now()}`)
-  fs.ensureDirSync(tmp)
-  const lintFile = path.join(tmp, 'index.graphql')
-  fs.writeFileSync(lintFile, `${extensions}${os.EOL}${os.EOL}${graphql}`)
+    tmp = path.join(os.tmpdir(), `stepzen-lint-${Date.now()}`)
+    fsx.ensureDirSync(tmp, 0o700)
+    const lintFile = path.join(tmp, 'index.graphql')
+    fsx.writeFileSync(lintFile, `${extensions}${os.EOL}${os.EOL}${graphql}`)
 
-  shell.exec(
-    `npx graphql-schema-linter ${lintFile}`,
-    {silent: true},
-    (code, stdout, stderr) => {
-      console.log(stdout)
-      fs.removeSync(tmp)
-    },
-  )
+    const {stdout} = shell.exec(`npx graphql-schema-linter ${lintFile}`, {
+      silent: true,
+    })
+    console.log(stdout)
+  } finally {
+    rmtemp(stitched)
+    rmtemp(tmp)
+  }
 }

package/src/actions/merge.ts

@@ -1,4 +1,4 @@
-import * as fs from 'fs-extra'
+import * as fsx from 'fs-extra'
 import * as glob from 'glob'
 import {mergeTypeDefs} from '@graphql-tools/merge'
 import {parse, visit} from 'graphql'
@@ -23,6 +23,7 @@ import setFilesInSDL from '../utils/set-files-in-sdl'
 import stripEmptyQueriesAndMutations from '../utils/strip-empty-queries-and-mutations'
 import copyWorkspaceContent from '../utils/copy-workspace-content'
 import {ALL_GRAPHQL_FILES} from '../utils/constants'
+import {rmtemp} from '../utils/rmtemp'
 
 // It's safe to use this special placeholder value here: in case of a failure
 // in the merge / import process it will not reach the workspace folder.
@@ -41,34 +42,26 @@ type Query {
 }
 `.trim()
 
-export default async (
+export type MergeOptions = {
+  answers: any
+  output: string | null
+  silent: boolean
+  /** when `false` merge only covers config files and updates @sdl directrive */
+  mergeTypes?: boolean
+  /** merge behaviour when a schema with the given name exists in the source */
+  onConflict?: 'overwrite' | 'append'
+  extensions?: string
+}
+
+const doMerge = async (
   original: string,
   imported: {
     name: string
     source: string
   },
-  options: {
-    answers: any
-    output: string | null
-    silent: boolean
-    /** when `false` merge only covers config files and updates @sdl directrive */
-    mergeTypes?: boolean
-    /** merge behaviour when a schema with the given name exists in the source */
-    onConflict?: 'overwrite' | 'append'
-    extensions?: string
-  } = {
-    answers: {},
-    output: null,
-    silent: false,
-    mergeTypes: true,
-    onConflict: 'append',
-    extensions: '',
-  },
+  options: MergeOptions & {output: string},
 ) => {
-  // Make sure there is an output directory
   if (!options.answers) options.answers = {}
-  if (!options.output)
-    options.output = path.join(os.tmpdir(), `stepzen-tmp-${Date.now()}`)
   if (!options.silent) options.silent = false
   if (options.mergeTypes === undefined) options.mergeTypes = true
   if (options.onConflict === undefined) options.onConflict = 'append'
@@ -79,19 +72,19 @@ export default async (
   options.output = dedupeTempFolder(options.output)
 
   // Ensure original, importing and output directories exist
-  if (!fs.existsSync(original))
+  if (!fsx.existsSync(original))
     throw new Error(`Cannot find original directory ${original}`)
-  if (!fs.existsSync(imported.source))
+  if (!fsx.existsSync(imported.source))
     throw new Error(`Cannot find imported source directory ${imported.source}`)
-  fs.ensureDirSync(options.output)
+  fsx.ensureDirSync(options.output, 0o700)
 
   // Copy the original into the output.
   copyWorkspaceContent(original, options.output)
 
   // Ensure an index.graphql exists
   const outputIndex = path.join(options.output, 'index.graphql')
-  if (!fs.existsSync(outputIndex)) {
-    fs.writeFileSync(
+  if (!fsx.existsSync(outputIndex)) {
+    fsx.writeFileSync(
       outputIndex,
       options.mergeTypes
         ? // (2022-03-09, vluakshov) Not sure what'd break without the
@@ -132,11 +125,11 @@ export default async (
 
     const details = {
       original: glob.sync('**/*.graphql', {cwd: options.output}).map(file => {
-        const content = fs.readFileSync(`${options.output}/${file}`, 'utf8')
+        const content = fsx.readFileSync(`${options.output}/${file}`, 'utf8')
         return {ast: parse(content), file}
       }),
       imported: glob.sync('**/*.graphql', {cwd: imported.source}).map(file => {
-        const content = fs.readFileSync(`${imported.source}/${file}`, 'utf8')
+        const content = fsx.readFileSync(`${imported.source}/${file}`, 'utf8')
         return {ast: parse(content), file}
       }),
     }
@@ -197,8 +190,8 @@ export default async (
       const file = path.join(options.output as any, a.file)
       const deduped = dedupeTempFolder(file)
 
-      fs.ensureFileSync(deduped)
-      fs.writeFileSync(deduped, print(a.ast))
+      fsx.ensureFileSync(deduped)
+      fsx.writeFileSync(deduped, print(a.ast))
     })
 
     cleaned.imported.forEach(a => {
@@ -206,21 +199,21 @@ export default async (
       const file = path.join(options.output as any, targetSubfolder, a.file)
       const deduped = dedupeTempFolder(file)
 
-      fs.ensureFileSync(deduped)
-      fs.writeFileSync(deduped, print(a.ast))
-      importedGraphQLFiles.push(path.relative(options.output!, deduped))
+      fsx.ensureFileSync(deduped)
+      fsx.writeFileSync(deduped, print(a.ast))
+      importedGraphQLFiles.push(path.relative(options.output, deduped))
     })
   } else {
     glob.sync('**/*.graphql', {cwd: imported.source}).forEach(relativePath => {
       const importedFullPath = path.join(imported.source, relativePath)
       const targetFullPath = path.join(
-        options.output!,
+        options.output,
         targetSubfolder,
         relativePath,
       )
-      fs.ensureDirSync(path.dirname(targetFullPath))
-      fs.copyFileSync(importedFullPath, targetFullPath)
-      importedGraphQLFiles.push(path.relative(options.output!, targetFullPath))
+      fsx.ensureDirSync(path.dirname(targetFullPath))
+      fsx.copyFileSync(importedFullPath, targetFullPath)
+      importedGraphQLFiles.push(path.relative(options.output, targetFullPath))
     })
   }
 
@@ -235,9 +228,47 @@ export default async (
   )
   if (config) {
     const configFile = path.join(options.output, 'config.yaml')
-    fs.writeFileSync(configFile, config as string)
+    fsx.writeFileSync(configFile, config as string, {mode: 0o600})
   }
 
   // Return a merged schema!
   return options.output
 }
+
+const merge = (
+  original: string,
+  imported: {
+    name: string
+    source: string
+  },
+  options: MergeOptions = {
+    answers: {},
+    output: null,
+    silent: false,
+    mergeTypes: true,
+    onConflict: 'append',
+    extensions: '',
+  },
+) => {
+  // Make sure there is an output directory
+  if (options.output) {
+    return doMerge(
+      original,
+      imported,
+      options as MergeOptions & {output: string},
+    )
+  }
+
+  const output = path.join(os.tmpdir(), `stepzen-tmp-${Date.now()}`)
+  try {
+    return doMerge(original, imported, {...options, output})
+  } catch (error) {
+    // In case of an error delete the temp output folder created earlier so that
+    // it does not "leak". In case of a success, deleting the output folder is
+    // the caller responsibility.
+    rmtemp(output)
+    throw error
+  }
+}
+
+export default merge