tally-xml-tdl 1.25.2 → 1.27.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tally-xml-tdl",
-  "version": "1.25.2",
+  "version": "1.27.1",
   "description": "Simple, clean TDL and XML extraction and manipulation tools for Tally",
   "type": "module",
   "main": "src/index.js",
@@ -30,8 +30,7 @@
     "url": "https://github.com/keshavsoft/tally-xml-tdl/issues"
   },
   "dependencies": {
-    "@keshavsoft/api-tree": "^6.1.0",
-    "fast-xml-parser": "^5.11.1",
+    "@keshavsoft/api-tree": "^11.1.1",
     "tally-spec": "^1.0.0"
   }
-}
+}

package/src/index.js

@@ -1,3 +1,2 @@
-import app from "./v25/index.js";
-
-export default app;
+export { default } from "./v27/index.js";
+export * from "./v27/index.js";

package/src/v25/engine/{execution → dispatchTally/buildXml}/buildXml.js

@@ -1,9 +1,8 @@
 import { collectionTemplate, dataTemplate } from "./templates.js";
 
-const startFunc = ({ inEndpoint, inParam, inArgs }) => {
+const startFunc = ({ inEndpoint, inParam }) => {
     const localEndpoint = inEndpoint;
     const localParam = inParam;
-    const localArgs = inArgs || [];
 
     if (localEndpoint?.reportId) {
         let staticVars = "";
@@ -16,11 +15,7 @@ const startFunc = ({ inEndpoint, inParam, inArgs }) => {
 
         if (localEndpoint.staticVariables) {
             staticVars += localEndpoint.staticVariables;
-        }
-
-        if (localArgs[0] && typeof localArgs[0] === "string") {
-            staticVars += localArgs[0];
-        }
+        };
 
         return dataTemplate
             .replace("{{ID}}", localEndpoint.reportId)
@@ -38,11 +33,7 @@ const startFunc = ({ inEndpoint, inParam, inArgs }) => {
         if (localParam.fromDate && localParam.toDate) {
             staticVars += `<SVFROMDATE TYPE="Date">${localParam.fromDate}</SVFROMDATE><SVTODATE TYPE="Date">${localParam.toDate}</SVTODATE>`;
         }
-    }
-
-    if (localArgs.length >= 2 && localArgs[0] && localArgs[1]) {
-        staticVars += `<SVFROMDATE TYPE="Date">${localArgs[0]}</SVFROMDATE><SVTODATE TYPE="Date">${localArgs[1]}</SVTODATE>`;
-    }
+    };
 
     const tdlMessage = localEndpoint?.tdl || "";
 

package/src/v25/engine/{execution/dispatchTally.js → dispatchTally/index.js}

@@ -1,22 +1,18 @@
-import buildXml from "./buildXml.js";
+import buildXml from "./buildXml/buildXml.js";
 import transport from "./transport.js";
 import parseResponse from "./parseResponse.js";
 
-const startFunc = async ({ inEndpoint, inParam, inArgs, inUrl }) => {
+const startFunc = async ({ inEndpoint, inParam }) => {
     const localEndpoint = inEndpoint;
     const localParam = inParam;
-    const localArgs = inArgs;
-    const localUrl = inUrl;
 
     const xml = buildXml({
         inEndpoint: localEndpoint,
-        inParam: localParam,
-        inArgs: localArgs
+        inParam: localParam
     });
 
     const rawResponse = await transport({
-        inXml: xml,
-        inUrl: localUrl
+        inXml: xml
     });
 
     const parsedJson = parseResponse({

package/src/v25/engine/{execution → dispatchTally}/transport.js

@@ -1,6 +1,6 @@
-const startFunc = async ({ inXml, inUrl }) => {
+const startFunc = async ({ inXml }) => {
     const localXml = inXml;
-    const localUrl = inUrl || "http://localhost:9000";
+    const localUrl = "http://localhost:9000";
 
     const response = await fetch(localUrl, {
         method: "POST",

package/src/v25/engine/{execution/index.js → index.js}

@@ -1,11 +1,10 @@
-import validateInput from "./validateInput.js";
-import getEndpointSpec from "./getEndpointSpec.js";
-import dispatchTally from "./dispatchTally.js";
+import validateInput from "./validateInput/index.js";
+import getEndpointSpec from "./getEndpointSpec/index.js";
+import dispatchTally from "./dispatchTally/index.js";
 
-const startFunc = async ({ inRoutePath, inParam, inArgs, inSource }) => {
+const startFunc = async ({ inRoutePath, inParam, inSource }) => {
     const localRoutePath = inRoutePath;
     const localParam = inParam;
-    const localArgs = inArgs;
     const localSource = inSource;
 
     const param = validateInput({
@@ -19,9 +18,8 @@ const startFunc = async ({ inRoutePath, inParam, inArgs, inSource }) => {
 
     return await dispatchTally({
         inEndpoint: endpoint,
-        inParam: param,
-        inArgs: localArgs
+        inParam: param
     });
 };
 
-export default startFunc;
+export default startFunc;

package/src/v25/index.js

@@ -1,7 +1,7 @@
 import apiTree from "@keshavsoft/api-tree";
 import { source, apiPaths } from "tally-spec";
 
-import execute from "./engine/execution/index.js";
+import execute from "./engine/index.js";
 
 const app = apiTree(source, apiPaths, execute);
 

package/src/v26/engine/dispatchTally/buildXml/buildXml.js

@@ -0,0 +1,45 @@
+import { collectionTemplate, dataTemplate } from "./templates.js";
+
+const startFunc = ({ inEndpoint, inParam }) => {
+    const localEndpoint = inEndpoint;
+    const localParam = inParam;
+
+    if (localEndpoint?.reportId) {
+        let staticVars = "";
+
+        if (typeof localParam === "string" && localParam.length > 0) {
+            staticVars += `<SVCURRENTCOMPANY>${localParam}</SVCURRENTCOMPANY>`;
+        } else if (typeof localParam === "object" && localParam?.company) {
+            staticVars += `<SVCURRENTCOMPANY>${localParam.company}</SVCURRENTCOMPANY>`;
+        }
+
+        if (localEndpoint.staticVariables) {
+            staticVars += localEndpoint.staticVariables;
+        };
+
+        return dataTemplate
+            .replace("{{ID}}", localEndpoint.reportId)
+            .replace("{{STATICVARIABLES}}", staticVars);
+    }
+
+    let staticVars = "";
+
+    if (typeof localParam === "string" && localParam.length > 0) {
+        staticVars += `<SVCURRENTCOMPANY>${localParam}</SVCURRENTCOMPANY>`;
+    } else if (typeof localParam === "object" && localParam) {
+        if (localParam.company) {
+            staticVars += `<SVCURRENTCOMPANY>${localParam.company}</SVCURRENTCOMPANY>`;
+        }
+        if (localParam.fromDate && localParam.toDate) {
+            staticVars += `<SVFROMDATE TYPE="Date">${localParam.fromDate}</SVFROMDATE><SVTODATE TYPE="Date">${localParam.toDate}</SVTODATE>`;
+        }
+    };
+
+    const tdlMessage = localEndpoint?.tdl || "";
+
+    return collectionTemplate
+        .replace("{{STATICVARIABLES}}", staticVars)
+        .replace("{{TDLMESSAGE}}", tdlMessage);
+};
+
+export default startFunc;

package/src/v26/engine/dispatchTally/buildXml/templates.js

@@ -0,0 +1,42 @@
+const collectionTemplate = `<ENVELOPE>
+    <HEADER>
+        <VERSION>1</VERSION>
+        <TALLYREQUEST>Export</TALLYREQUEST>
+        <TYPE>Collection</TYPE>
+        <ID>TDLID</ID>
+    </HEADER>
+    <BODY>
+        <DESC>
+            <STATICVARIABLES>
+                <SVEXPORTFORMAT>$$SysName:XML</SVEXPORTFORMAT>
+                {{STATICVARIABLES}}
+            </STATICVARIABLES>
+            <TDL>
+                <TDLMESSAGE>
+                    <COLLECTION NAME="TDLID">
+                        {{TDLMESSAGE}}
+                    </COLLECTION>
+                </TDLMESSAGE>
+            </TDL>
+        </DESC>
+    </BODY>
+</ENVELOPE>`;
+
+const dataTemplate = `<ENVELOPE>
+    <HEADER>
+        <VERSION>1</VERSION>
+        <TALLYREQUEST>Export</TALLYREQUEST>
+        <TYPE>Data</TYPE>
+        <ID>{{ID}}</ID>
+    </HEADER>
+    <BODY>
+        <DESC>
+            <STATICVARIABLES>
+                <SVEXPORTFORMAT>$$SysName:XML</SVEXPORTFORMAT>
+                {{STATICVARIABLES}}
+            </STATICVARIABLES>
+        </DESC>
+    </BODY>
+</ENVELOPE>`;
+
+export { collectionTemplate, dataTemplate };

package/src/v26/engine/dispatchTally/index.js

@@ -0,0 +1,25 @@
+import buildXml from "./buildXml/buildXml.js";
+import transport from "./transport.js";
+import parseResponse from "./parseResponse.js";
+
+const startFunc = async ({ inEndpoint, inParam }) => {
+    const localEndpoint = inEndpoint;
+    const localParam = inParam;
+
+    const xml = buildXml({
+        inEndpoint: localEndpoint,
+        inParam: localParam
+    });
+
+    const rawResponse = await transport({
+        inXml: xml
+    });
+
+    const parsedJson = parseResponse({
+        inXml: rawResponse
+    });
+
+    return parsedJson;
+};
+
+export default startFunc;

package/src/v26/engine/dispatchTally/parseResponse.js

@@ -0,0 +1,13 @@
+import { XMLParser } from "fast-xml-parser";
+
+const startFunc = ({ inXml }) => {
+    const localXml = inXml;
+
+    const parser = new XMLParser({
+        ignoreAttributes: false
+    });
+
+    return parser.parse(localXml);
+};
+
+export default startFunc;

package/src/v26/engine/dispatchTally/transport.js

@@ -0,0 +1,16 @@
+const startFunc = async ({ inXml }) => {
+    const localXml = inXml;
+    const localUrl = "http://localhost:9000";
+
+    const response = await fetch(localUrl, {
+        method: "POST",
+        headers: {
+            "Content-Type": "text/xml"
+        },
+        body: localXml
+    });
+
+    return await response.text();
+};
+
+export default startFunc;

package/src/v26/engine/getEndpointSpec/index.js

@@ -0,0 +1,12 @@
+const startFunc = ({ inSource, inRoutePath }) => {
+    const localSource = inSource;
+    const localRoutePath = inRoutePath;
+
+    const endpoint = localRoutePath
+        .split(".")
+        .reduce((current, key) => current?.[key], localSource);
+
+    return endpoint;
+};
+
+export default startFunc;

package/src/v26/engine/index.js

@@ -0,0 +1,25 @@
+import validateInput from "./validateInput/index.js";
+import getEndpointSpec from "./getEndpointSpec/index.js";
+import dispatchTally from "./dispatchTally/index.js";
+
+const startFunc = async ({ inRoutePath, inParam, inSource }) => {
+    const localRoutePath = inRoutePath;
+    const localParam = inParam;
+    const localSource = inSource;
+
+    const param = validateInput({
+        inParam: localParam
+    });
+
+    const endpoint = getEndpointSpec({
+        inSource: localSource,
+        inRoutePath: localRoutePath
+    });
+
+    return await dispatchTally({
+        inEndpoint: endpoint,
+        inParam: param
+    });
+};
+
+export default startFunc;

package/src/v26/engine/validateInput/index.js

@@ -0,0 +1,19 @@
+const startFunc = ({ inParam }) => {
+    const localParam = inParam;
+
+    if (localParam === undefined || localParam === null) {
+        return "";
+    }
+
+    if (typeof localParam === "string") {
+        return localParam.trim();
+    }
+
+    if (typeof localParam === "object") {
+        return localParam;
+    }
+
+    return String(localParam);
+};
+
+export default startFunc;

package/src/v26/index.js

@@ -0,0 +1,10 @@
+import apiTree, { createCaller } from "@keshavsoft/api-tree";
+import { source, apiPaths } from "tally-spec";
+
+import execute from "./engine/index.js";
+
+const app = apiTree(source, apiPaths, execute);
+const call = createCaller({ inSource: source, inExecutor: execute });
+
+export default app;
+export { app, call };

package/src/v27/engine/dispatchTally/buildXml/buildXml.js

@@ -0,0 +1,45 @@
+import { collectionTemplate, dataTemplate } from "./templates.js";
+
+const startFunc = ({ inEndpoint, inParam }) => {
+    const localEndpoint = inEndpoint;
+    const localParam = inParam;
+
+    if (localEndpoint?.reportId) {
+        let staticVars = "";
+
+        if (typeof localParam === "string" && localParam.length > 0) {
+            staticVars += `<SVCURRENTCOMPANY>${localParam}</SVCURRENTCOMPANY>`;
+        } else if (typeof localParam === "object" && localParam?.company) {
+            staticVars += `<SVCURRENTCOMPANY>${localParam.company}</SVCURRENTCOMPANY>`;
+        }
+
+        if (localEndpoint.staticVariables) {
+            staticVars += localEndpoint.staticVariables;
+        };
+
+        return dataTemplate
+            .replace("{{ID}}", localEndpoint.reportId)
+            .replace("{{STATICVARIABLES}}", staticVars);
+    }
+
+    let staticVars = "";
+
+    if (typeof localParam === "string" && localParam.length > 0) {
+        staticVars += `<SVCURRENTCOMPANY>${localParam}</SVCURRENTCOMPANY>`;
+    } else if (typeof localParam === "object" && localParam) {
+        if (localParam.company) {
+            staticVars += `<SVCURRENTCOMPANY>${localParam.company}</SVCURRENTCOMPANY>`;
+        }
+        if (localParam.fromDate && localParam.toDate) {
+            staticVars += `<SVFROMDATE TYPE="Date">${localParam.fromDate}</SVFROMDATE><SVTODATE TYPE="Date">${localParam.toDate}</SVTODATE>`;
+        }
+    };
+
+    const tdlMessage = localEndpoint?.tdl || "";
+
+    return collectionTemplate
+        .replace("{{STATICVARIABLES}}", staticVars)
+        .replace("{{TDLMESSAGE}}", tdlMessage);
+};
+
+export default startFunc;

package/src/v27/engine/dispatchTally/buildXml/templates.js

@@ -0,0 +1,42 @@
+const collectionTemplate = `<ENVELOPE>
+    <HEADER>
+        <VERSION>1</VERSION>
+        <TALLYREQUEST>Export</TALLYREQUEST>
+        <TYPE>Collection</TYPE>
+        <ID>TDLID</ID>
+    </HEADER>
+    <BODY>
+        <DESC>
+            <STATICVARIABLES>
+                <SVEXPORTFORMAT>$$SysName:XML</SVEXPORTFORMAT>
+                {{STATICVARIABLES}}
+            </STATICVARIABLES>
+            <TDL>
+                <TDLMESSAGE>
+                    <COLLECTION NAME="TDLID">
+                        {{TDLMESSAGE}}
+                    </COLLECTION>
+                </TDLMESSAGE>
+            </TDL>
+        </DESC>
+    </BODY>
+</ENVELOPE>`;
+
+const dataTemplate = `<ENVELOPE>
+    <HEADER>
+        <VERSION>1</VERSION>
+        <TALLYREQUEST>Export</TALLYREQUEST>
+        <TYPE>Data</TYPE>
+        <ID>{{ID}}</ID>
+    </HEADER>
+    <BODY>
+        <DESC>
+            <STATICVARIABLES>
+                <SVEXPORTFORMAT>$$SysName:XML</SVEXPORTFORMAT>
+                {{STATICVARIABLES}}
+            </STATICVARIABLES>
+        </DESC>
+    </BODY>
+</ENVELOPE>`;
+
+export { collectionTemplate, dataTemplate };

package/src/v27/engine/dispatchTally/index.js

@@ -0,0 +1,20 @@
+import buildXml from "./buildXml/buildXml.js";
+import transport from "./transport.js";
+
+const startFunc = async ({ inEndpoint, inParam }) => {
+    const localEndpoint = inEndpoint;
+    const localParam = inParam;
+
+    const xml = buildXml({
+        inEndpoint: localEndpoint,
+        inParam: localParam
+    });
+
+    const rawResponse = await transport({
+        inXml: xml
+    });
+
+    return rawResponse;
+};
+
+export default startFunc;

package/src/v27/engine/dispatchTally/transport.js

@@ -0,0 +1,16 @@
+const startFunc = async ({ inXml }) => {
+    const localXml = inXml;
+    const localUrl = "http://localhost:9000";
+
+    const response = await fetch(localUrl, {
+        method: "POST",
+        headers: {
+            "Content-Type": "text/xml"
+        },
+        body: localXml
+    });
+
+    return await response.text();
+};
+
+export default startFunc;

package/src/v27/engine/getEndpointSpec/index.js

@@ -0,0 +1,12 @@
+const startFunc = ({ inSource, inRoutePath }) => {
+    const localSource = inSource;
+    const localRoutePath = inRoutePath;
+
+    const endpoint = localRoutePath
+        .split(".")
+        .reduce((current, key) => current?.[key], localSource);
+
+    return endpoint;
+};
+
+export default startFunc;

package/src/v27/engine/index.js

@@ -0,0 +1,25 @@
+import validateInput from "./validateInput/index.js";
+import getEndpointSpec from "./getEndpointSpec/index.js";
+import dispatchTally from "./dispatchTally/index.js";
+
+const startFunc = async ({ inRoutePath, inParam, inSource }) => {
+    const localRoutePath = inRoutePath;
+    const localParam = inParam;
+    const localSource = inSource;
+
+    const param = validateInput({
+        inParam: localParam
+    });
+
+    const endpoint = getEndpointSpec({
+        inSource: localSource,
+        inRoutePath: localRoutePath
+    });
+
+    return await dispatchTally({
+        inEndpoint: endpoint,
+        inParam: param
+    });
+};
+
+export default startFunc;

package/src/v27/engine/validateInput/index.js

@@ -0,0 +1,19 @@
+const startFunc = ({ inParam }) => {
+    const localParam = inParam;
+
+    if (localParam === undefined || localParam === null) {
+        return "";
+    }
+
+    if (typeof localParam === "string") {
+        return localParam.trim();
+    }
+
+    if (typeof localParam === "object") {
+        return localParam;
+    }
+
+    return String(localParam);
+};
+
+export default startFunc;

package/src/v27/index.js

@@ -0,0 +1,10 @@
+import apiTree, { createCaller } from "@keshavsoft/api-tree";
+import { source, apiPaths } from "tally-spec";
+
+import execute from "./engine/index.js";
+
+const app = apiTree(source, apiPaths, execute);
+const call = createCaller({ inSource: source, inExecutor: execute });
+
+export default app;
+export { app, call };