Fix formatting

enums/index.ts

@@ -1,3 +1,2 @@
-
-export {AuthScope} from "./auth_scope";
-export {WebhookTopic} from "./webhook_topic";
+export { AuthScope } from "./auth_scope";
+export { WebhookTopic } from "./webhook_topic";

index.ts

@@ -5,9 +5,9 @@ import * as Options from "./options";
 import * as Infrastructure from "./infrastructure";
 
 export {
- Enums, 
- Models, 
- Options, 
+ Enums,
+ Models,
+ Options,
  Infrastructure,
 };
 
@@ -30,7 +30,7 @@ export {
 
 // Export auth functions at the top level
 export {
- authorize, 
+ authorize,
  buildAuthorizationUrl,
  isAuthenticProxyRequest,
  isAuthenticRequest,

infrastructure/base_service.ts

@@ -1,90 +1,77 @@
 import uri = require("jsuri");
 import fetch from "node-fetch";
-import {ShopifyError} from "./shopify_error";
-
-declare var require: any;
+import { resolve } from "path"; 
+import { ShopifyError } from "./shopify_error";
 
 //Get package.json from 2-levels up as this file will be in dist/infrastructure.
-const version = require("../../package.json").version;
+const version = require(resolve(__dirname, "../../package.json")).version;
 
-export class BaseService
-{
- constructor(private shopDomain: string, private accessToken: string, private resource: string)
- {
+export class BaseService {
+ constructor(private shopDomain: string, private accessToken: string, private resource: string) {
  //Ensure resource starts with admin/
- if (! /^[\/]?admin\//ig.test(resource))
- {
+ if (! /^[\/]?admin\//ig.test(resource)) {
  this.resource = "admin/" + resource;
  }
  }
-
- public static buildDefaultHeaders()
- {
+
+ public static buildDefaultHeaders() {
  const headers = {
  "Accept": "application/json",
  "User-Agent": `Shopify Prime ${version} (https://github.com/nozzlegear/shopify-prime)`
  }
- 
+
  return headers;
  }
-
- protected async createRequest<T>(method: "GET" | "POST" | "PUT" | "DELETE", path: string, rootElement?: string, payload?: Object)
- {
+
+ protected async createRequest<T>(method: "GET" | "POST" | "PUT" | "DELETE", path: string, rootElement?: string, payload?: Object) {
  method = method.toUpperCase() as any;
- 
+
  const options = {
  headers: BaseService.buildDefaultHeaders(),
  method: method,
  body: undefined as string,
  };
-
- if (this.accessToken)
- {
+
+ if (this.accessToken) {
  options.headers["X-Shopify-Access-Token"] = this.accessToken;
  }
- 
+
  const url = new uri(this.shopDomain);
  url.protocol("https");
- 
+
  //Ensure no erroneous double slashes in path and that it doesn't end in /.json
  url.path(`${this.resource}/${path}`.replace(/\/+/ig, "/").replace(/\/\.json/ig, ".json"));
-
- if ((method === "GET" || method === "DELETE") && payload)
- {
- for (const prop in payload)
- {
+
+ if ((method === "GET" || method === "DELETE") && payload) {
+ for (const prop in payload) {
  const value = payload[prop];
- 
+
  //Shopify expects qs array values to be joined by a comma, e.g. fields=field1,field2,field3
  url.addQueryParam(prop, Array.isArray(value) ? value.join(",") : value);
  }
  }
- else if (payload)
- {
+ else if (payload) {
  options.body = JSON.stringify(payload);
- 
+
  options.headers["Content-Type"] = "application/json";
  }
- 
+
  //Fetch will only throw an exception when there is a network-related error, not when Shopify returns a non-200 response.
  const result = await fetch(url.toString(), options);
  let json = await result.text() as any;
-
- try
- {
+
+ try {
  json = JSON.parse(json);
  }
- catch (e)
- {
+ catch (e) {
  //Set ok to false to throw an error with the body's text.
  result.ok = false;
  }
-
- if (!result.ok)
- {
+
+ if (!result.ok) {
  throw new ShopifyError(result, json);
  }
- 
- return rootElement ? json[rootElement] as T : json as T; 
+
+ return rootElement ? json[rootElement] as T : json as T;
  }
 }

infrastructure/index.ts

@@ -1,3 +1,3 @@
-export {BaseService} from "./base_service";
-export {ShopifyError} from "./shopify_error";
-export {ShopifyObject} from "./shopify_object";
+export { BaseService } from "./base_service";
+export { ShopifyError } from "./shopify_error";
+export { ShopifyObject } from "./shopify_object";

infrastructure/shopify_error.ts

@@ -1,51 +1,44 @@
-import {Response as Response} from "node-fetch";
+import { Response as Response } from "node-fetch";
 
-export class ShopifyError extends Error
-{
- constructor(response: Response, public body: {errors: string | {[index: string] : string | string[]}})
- {
+export class ShopifyError extends Error {
+ constructor(response: Response, public body: { errors: string | { [index: string]: string | string[] } }) {
  super();
- 
+
  this.statusCode = response.status;
  this.statusText = response.statusText;
  this.message = `[Shopify Prime] ${this.statusCode} ${this.statusText}. `;
- 
+
  // Errors can be any of the following: 
  // 1. { errors: "some error message"}
  // 2. { errors: { "order" : "some error message" } }
  // 3. { errors: { "order" : [ "some error message" ] } }
- 
+
  let errors = body.errors;
-
- if (!errors)
- {
+
+ if (!errors) {
  return;
  }
-
- if (typeof errors === "string")
- {
+
+ if (typeof errors === "string") {
  // errors is #1
  this.errors["generic"] = [errors];
  }
- else if (typeof errors === "object")
- {
- for (const property in errors)
- {
+ else if (typeof errors === "object") {
+ for (const property in errors) {
  const value = errors[property];
- 
+
  this.errors[property] = Array.isArray(value) ? value : [value];
  }
  }
  }
-
- public get isShopifyPrime()
- {
+
+ public get isShopifyPrime() {
  return true;
  }
- 
+
  public statusCode: number;
- 
+
  public statusText: string;
- 
- public errors: {[index: string]: string[]} = {};
+
+ public errors: { [index: string]: string[] } = {};
 }

infrastructure/shopify_object.ts

@@ -1,5 +1,4 @@
-export interface ShopifyObject 
-{
+export interface ShopifyObject {
  /**
  * The object's id.
  */

models/charge.ts

@@ -1,4 +1,4 @@
-import {ShopifyObject} from "../infrastructure";
+import { ShopifyObject } from "../infrastructure";
 
 /**
  * Represents a one-time application charge.
@@ -8,37 +8,37 @@ export interface Charge extends ShopifyObject {
  * The URL that the customer should be sent to, to accept or decline the application charge.
  */
  confirmation_url?: string;
- 
+
  /**
  * The date and time when the application charge was created.
  */
  created_at?: string;
- 
+
  /**
  * The name of the application charge, e.g. "Super Expensive One-time Charge".
  */
  name: string;
- 
+
  /**
  * The price of the application charge. Note: Shopify returns this value as a string.
  */
  price: string | number;
- 
+
  /**
  * The URL the customer is sent to once they accept/decline a charge.
  */
  return_url?: string;
- 
+
  /**
  * The status of the charge.
  */
  status?: "pending" | "accepted" | "active" | "cancelled" | "declined" | "expired";
- 
+
  /**
  * Whether or not the application charge is a test transaction.
  */
  test?: boolean;
- 
+
  /**
  * The date and time when the recurring application charge was last updated.
  */

models/index.ts

@@ -1,6 +1,6 @@
-export {Shop} from "./shop";
-export {Order} from "./order";
-export {Charge} from "./charge";
-export {Webhook} from "./webhook";
-export {ScriptTag} from "./script_tag";
-export {UsageCharge} from "./usage_charge";
+export { Shop } from "./shop";
+export { Order } from "./order";
+export { Charge } from "./charge";
+export { Webhook } from "./webhook";
+export { ScriptTag } from "./script_tag";
+export { UsageCharge } from "./usage_charge";