refactor: fixes, file structure

example/index.ts

@@ -1,4 +1,4 @@
-import SfmcAPI from "../dist";
+import SfmcAPI from "../src";
 
 // just importing env variables - you can skip this part
 import dotenv from "dotenv";
@@ -15,18 +15,13 @@ const config = {
 
 const someFunction = async () => {
   const sfmc = SfmcAPI(config);
-
-  const result = await sfmc
-    .dataExtension("DataExtensionName")
-    .get()
+
+  const result = await sfmc.dataExtension("DataExtensionName").get();
   console.log(result);
 
   const resultSoap = await sfmc
     .dataExtension("DataExtensionName")
-    .soap
-    .get(["Name", "Name2"], {
-      queryAllAccounts: true,
-    })
+    .soap.get(["Name", "Name2"])
     .where("Name", "equals", "test");
 
   console.log(resultSoap);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sfmc-ts",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "repository": {
     "type": "git",
     "url": "https://github.com/bxxf/sfmc-ts"

src/utils/data-extension.ts

@@ -1,8 +1,8 @@
 import { SfmcHelper } from "../sfmc-ts";
-import { SfmcQueryBuilder, SfmcQueryBuilderWhere } from "./query-builder";
+import { SfmcQueryBuilder, SfmcQueryBuilderWhere } from "./rest/query-builder";
 
 import fetch from "node-fetch";
-import { ISoapRequest, SfmcDataExtensionSoap } from "./soap/soap-client";
+import { SfmcDataExtensionSoap } from "./soap/soap-client";
 import { SoapQueryBuilder } from "./soap/soap-query-builder";
 
 /**

src/utils/query-builder.ts → src/utils/rest/query-builder.ts

@@ -1,8 +1,8 @@
 import type { ApiResponse, ComparisonOperator } from "sfmc-ts";
 
 import fetch from "node-fetch";
-import { SfmcFilter as Filter } from "./filter";
-import { SfmcHelper } from "../sfmc-ts";
+import { SfmcFilter as Filter } from "../rest/filter";
+import { SfmcHelper } from "../../sfmc-ts";
 
 export class SfmcQueryBuilder {
   private helper: SfmcHelper;
@@ -140,8 +140,11 @@ export class SfmcQueryBuilder {
       return response.then(async (res) => {
         if (res.ok) {
           const data = await res.json();
+
           const valuesArray = data.items?.length
-            ? (data as ApiResponse).items.map((item: any) => item.values)
+            ? (data as ApiResponse).items.map((item: any) => {
+                return { ...item.values, ...item.keys };
+              })
             : [];
           return valuesArray;
         } else {

src/models/soap/create.ts → src/utils/soap/actions/create.ts

@@ -1,4 +1,4 @@
-import { SfmcDataExtensionField } from "../../utils/soap/soap-client";
+import { SfmcDataExtensionField } from "../soap-client";
 
 export const createDataExtensionBody = (objectKey: string, xml: string) => `
 <CreateRequest xmlns="http://exacttarget.com/wsdl/partnerAPI">

src/models/soap/retrieve.ts → src/utils/soap/actions/retrieve.ts

@@ -1,4 +1,4 @@
-import { ISoapGetOptions } from "../../utils/soap/soap-client";
+import { ISoapGetOptions } from "../soap-client";
 
 export const retrieveDataExtensionBody = (
   objectKey: string,

src/utils/soap/soap-client.ts

@@ -4,10 +4,10 @@ import { parseStringPromise } from "xml2js";
 import {
   createDataExtensionBody,
   createFieldsXml,
-} from "../../models/soap/create";
+} from "./actions/create";
 
-import { deleteDataExtensionBody } from "../../models/soap/delete";
-import { retrieveDataExtensionBody } from "../../models/soap/retrieve";
+import { deleteDataExtensionBody } from "./actions/delete";
+import { retrieveDataExtensionBody } from "./actions/retrieve";
 import { SfmcSoapFilter, createFilterXml } from "./soap-filter";
 import { SfmcHelper } from "../../sfmc-ts";
 

tests/sfmc.test.ts

@@ -1,7 +1,7 @@
 import nock from "nock";
 import { ComparisonEnum } from "../src/index";
 import { SfmcHelper } from "../src/sfmc-ts";
-import { SfmcQueryBuilder } from "../src/utils/query-builder";
+import { SfmcQueryBuilder } from "../src/utils/rest/query-builder";
 import { apiConfig, authResponse, authRequestBody } from "./mock-data";
 import { SfmcDataExtensionSoap } from "../src/utils/soap/soap-client";