@stepzen/transpiler 0.0.27 → 0.0.31

package/lib/actions/lint.js

@@ -20,7 +20,7 @@ exports.default = async (source, options = {
     const stitched = stitch_1.default(source);
     const index = path.join(stitched, 'index.graphql');
     const graphql = fs.readFileSync(index, 'utf8');
-    const tmp = path.join(os.tmpdir(), 'stepzen-lint-${Date.now()}');
+    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}`);

package/lib/actions/merge.js

@@ -31,6 +31,9 @@ exports.default = async (original, imported, options = {
         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
+    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}`);

package/lib/actions/stitch.js

@@ -8,7 +8,7 @@ const os = require("os");
 const path = require("path");
 const prettier = require("prettier");
 const dedupe_query_and_mutation_types_1 = require("../utils/dedupe-query-and-mutation-types");
-exports.default = (source, output = path.join(os.tmpdir(), 'stepzen-tmp-${Date.now()}')) => {
+exports.default = (source, output = path.join(os.tmpdir(), `stepzen-tmp-${Date.now()}`)) => {
     // Ensure source and output directories exist
     if (!fs.existsSync(source))
         throw new Error(`Cannot find source directory ${source}`);

package/lib/actions/validate.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const graphql_1 = require("graphql");
 const fs = require("fs-extra");
+const os = require("os");
 const path = require("path");
 const ensure_query_and_mutation_types_1 = require("../utils/ensure-query-and-mutation-types");
 const constants_1 = require("../utils/constants");
@@ -21,7 +22,7 @@ exports.default = (source, options = {
     const file = path.join(source, 'index.graphql');
     const index = fs.readFileSync(file, "utf8");
     // Parse
-    let ast = graphql_1.parse(`${constants_1.EXPERIMENTAL_EXTENSIONS}\n${options.extensions}\n${index}`, {
+    let ast = graphql_1.parse(`${constants_1.EXPERIMENTAL_EXTENSIONS}${os.EOL}${options.extensions}${os.EOL}${index}`, {
         noLocation: true,
     });
     // We make an exception for 'no type Query' or 'no type Mutation'

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");
@@ -12,6 +12,13 @@ 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) => {
+    const regex = new RegExp(os.tmpdir(), 'gi');
+    dirpath = dirpath.replace(regex, '');
+    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 +63,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);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stepzen/transpiler",
   "description": "The StepZen transpiler",
-  "version": "0.0.27",
+  "version": "0.0.31",
   "author": "Darren Waddell <darren@stepzen.com>",
   "license": "MIT",
   "files": [