@stepzen/sdk 0.9.35 → 0.9.39

package/lib/commands/upload.js

@@ -6,6 +6,7 @@ const node_fetch_1 = require("node-fetch");
 const constants_1 = require("../shared/constants");
 const payloads_1 = require("../shared/payloads");
 const request_1 = require("../shared/request");
+const transpiling_1 = require("../shared/transpiling");
 const validation_1 = require("../shared/validation");
 exports.default = async (details, account) => {
     const headers = request_1.getRequestHeaders(account);
@@ -13,7 +14,14 @@ exports.default = async (details, account) => {
     switch (details.type) {
         case "configurationset":
             await validation_1.validateConfigurationset(details.file);
-            payload = await payloads_1.generateYamlPayload(details.file);
+            const transpiled = await transpiling_1.transpileConfigurationset(details.file);
+            debug("stepzen:transpiler")(transpiled);
+            if (transpiled) {
+                payload = await payloads_1.generateYamlPayload(transpiled);
+            }
+            else {
+                payload = await payloads_1.generateYamlPayload(details.file);
+            }
             break;
         case "schema":
             await validation_1.validateSchema(details.directory);

package/lib/shared/payloads.js

@@ -9,6 +9,7 @@ const FormData = require("form-data");
 const fs = require("fs");
 const glob = require("glob");
 const os = require("os");
+const path = require("path");
 // This function takes a (yaml) file path
 // and creates a FormData payload, containing the yaml content as 'yaml'
 const generateYamlPayload = async (file) => {
@@ -18,6 +19,8 @@ const generateYamlPayload = async (file) => {
             if (!fs.existsSync(file)) {
                 reject(new Error(`File does not exist: ${file}`));
             }
+            const content = fs.readFileSync(file, 'utf8');
+            debug("stepzen:generate-yaml-payload")(content);
             payload.append("yaml", fs.readFileSync(file));
             resolve(payload);
         }
@@ -39,7 +42,7 @@ const generateZipPayload = async (directory, data, filters) => {
             }
         }
         // Store it in /tmp. Create a WriteStream
-        const filepath = `${os.tmpdir()}/stepzen-payload-${Date.now()}.zip`;
+        const filepath = path.join(os.tmpdir(), `stepzen-payload-${Date.now()}.zip`);
         const output = fs.createWriteStream(filepath);
         // We're making a zip file
         const archive = archiver("zip", {
@@ -62,7 +65,7 @@ const generateZipPayload = async (directory, data, filters) => {
                 const include = filters.some((filter) => file.match(filter));
                 if (include) {
                     debug("stepzen:archive")(file);
-                    archive.file(`${directory}/${file}`, { name: file });
+                    archive.file(path.join(directory, file), { name: file });
                 }
             });
         }

package/lib/shared/request.js

@@ -2,13 +2,15 @@
 // Copyright (c) 2020,2021, StepZen, Inc.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRequestHeaders = void 0;
+const os = require("os");
 const { version } = require("../../package.json");
 const getRequestHeaders = (settings) => {
+    const userAgent = `stepzen-cli/${version} ${os.platform()}/${os.arch()}/${os.release()}`;
     return {
         authorization: `Apikey ${settings.adminkey}`,
         host: `${settings.account}.${settings.domain}`,
         "stepzen-cli-version": version,
-        "user-agent": `stepzen-cli/${version}`,
+        "user-agent": userAgent,
     };
 };
 exports.getRequestHeaders = getRequestHeaders;

package/lib/shared/transpiling.d.ts

@@ -1 +1 @@
-export declare const transpileConfig: (file: string | undefined) => string | undefined;
+export declare const transpileConfigurationset: (file: string | undefined) => Promise<string | undefined>;

package/lib/shared/transpiling.js

@@ -1,25 +1,29 @@
 "use strict";
 // Copyright (c) 2020,2021, StepZen, Inc.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transpileConfig = void 0;
+exports.transpileConfigurationset = void 0;
+const dotenv = require("dotenv");
 const fs = require("fs-extra");
 const os = require("os");
-const { transpile } = require('@stepzen/transpiler');
-const transpileConfig = (file) => {
+const path = require("path");
+const { transpile } = require("@stepzen/transpiler");
+const transpileConfigurationset = async (file) => {
     if (!file) {
         return;
     }
-    const tmp = `${os.tmpdir()}/stepzen-transpiler-${Date.now()}`;
+    const source = file.substring(0, file.lastIndexOf("/"));
+    dotenv.config({ path: path.resolve(source, ".env") });
+    const tmp = path.join(os.tmpdir(), `stepzen-transpiler-${Date.now()}`);
+    const configPath = path.join(tmp, 'config.yaml');
     fs.ensureDirSync(tmp);
-    fs.copyFileSync(file, `${tmp}/config.yaml`);
-    fs.writeFileSync(`${tmp}/index.graphql`, '');
-    const result = transpile(tmp);
+    fs.copyFileSync(file, configPath);
+    const result = await transpile(tmp);
     if (result.transpiled) {
         fs.emptyDirSync(tmp);
-        fs.writeFileSync(`${tmp}/config.yaml`, result.config);
-        return `${tmp}/config.yaml`;
+        fs.writeFileSync(configPath, result.config);
+        return configPath;
     }
     fs.removeSync(tmp);
     return;
 };
-exports.transpileConfig = transpileConfig;
+exports.transpileConfigurationset = transpileConfigurationset;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stepzen/sdk",
-  "version": "0.9.35",
+  "version": "0.9.39",
   "license": "MIT",
   "author": "Darren Waddell <darren@stepzen.com>",
   "homepage": "https://stepzen.com",
@@ -18,7 +18,7 @@
     "test": "tsc -b && nyc --extension .ts mocha --config test/mocha.opts.json"
   },
   "dependencies": {
-    "@stepzen/transpiler": "0.0.23",
+    "@stepzen/transpiler": "0.0.24",
     "archiver": "^5.3.0",
     "debug": "^4.3.1",
     "form-data": "^4.0.0",