@adobe/acc-js-sdk 1.1.26 → 1.1.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/acc-js-sdk",
-  "version": "1.1.26",
+  "version": "1.1.28",
   "description": "ACC Javascript SDK",
   "main": "src/index.js",
   "homepage": "https://github.com/adobe/acc-js-sdk#readme",

package/src/application.js

@@ -95,7 +95,8 @@ class SchemaCache {
         if (schema === undefined) {
             schema = await this._client.application._getSchema(schemaId);
             if (!schema) schema = null; // null = not found
-            this._schemas[schemaId] = schema;
+            if (!schemaId.startsWith("temp:group:"))
+                this._schemas[schemaId] = schema;
         }
         return schema;
     }

package/src/client.js

@@ -1740,16 +1740,55 @@ class Client {
     async getSchema(schemaId, representation, internal) {
         var entity = await this._entityCache.get("xtk:schema", schemaId);
         if (!entity) {
-          entity = await this.getEntityIfMoreRecent("xtk:schema", schemaId, "xml", internal);
-          if (entity) {
-            const impls = DomUtil.getAttributeAsString(entity, "implements");
-            if (impls === "xtk:persist" && schemaId !== "xtk:session" && schemaId !== "xtk:persist") {
-                // Ensure xtk:persist is present by loading the xtk:session schema
-                await this.getSchema("xtk:session", "xml", true);
+              // special case of "temp:group:*" schemas for nms:group
+              // Schema "temp:group:*" is not cached because life cycle of this kind of schema is not the same as the others schemas
+              if (schemaId.startsWith("temp:group:")) {
+                  const parts = schemaId.split(":");
+                  let queryDef = {
+                    "schema": "nms:group",
+                    "operation": "get",
+                    "select": {
+                      "node": [
+                        { "expr": "@id" },
+                        { "expr": "extension" }
+                      ]
+                    },
+                    "where": {
+                      "condition": [
+                        { "expr": "@id=" + XtkCaster.asLong(parts[2]) }
+                      ]
+                    }
+                  };
+                  // Convert to current representation
+                  queryDef = this._convertToRepresentation(queryDef, "SimpleJson", "xml");
+                  const query = this.NLWS.xml.xtkQueryDef.create(queryDef);
+                  try {
+                      const groupSchema = await query.executeQuery();
+                      const extension = DomUtil.findElement(groupSchema, "extension");
+                      if (extension) {
+                          entity = extension;
+                      } else {
+                          entity = null;
+                      }
+                  } catch (ex) {
+                      if (ex.name == 'CampaignException' && ex.errorCode == 'SOP-330011') {
+                          entity = null;
+                      } else {
+                          throw ex;
+                      }
+                  }
+              } else {
+                  entity = await this.getEntityIfMoreRecent("xtk:schema", schemaId, "xml", internal);
+                  if (entity) {
+                      const impls = DomUtil.getAttributeAsString(entity, "implements");
+                      if (impls === "xtk:persist" && schemaId !== "xtk:session" && schemaId !== "xtk:persist") {
+                        // Ensure xtk:persist is present by loading the xtk:session schema
+                        await this.getSchema("xtk:session", "xml", true);
+                      }
+                      await this._entityCache.put("xtk:schema", schemaId, entity);
+                      await this._methodCache.put(entity);
+                  }
             }
-            await this._entityCache.put("xtk:schema", schemaId, entity);
-            await this._methodCache.put(entity);
-          }
         }
         entity = this._toRepresentation(entity, representation);
         return entity;

package/src/domUtil.js

@@ -380,13 +380,22 @@ class DomUtil {
         return doc;
     }
 
+    // Get the text of a node. Will return the text if the xml node contains
+    // only text and cdata nodes. Otherwise will return null
     static _getTextIfTextNode(xml) {
-        const child = xml.firstChild;
+        let child = xml.firstChild;
         if (!child) return null;                   // no children
         if (xml.hasAttributes()) return null;      // no attributes
-        if (child.nextSibling) return null;        // more than 1 child
-        if (child.nodeType !== 3 && child.nodeType !== 4) return null;
-        const text = child.nodeValue;
+        let text = "";
+        while (child) {
+            // if child node is not text or cdata, it means we have a mix
+            // of text children and non-text children => we do not consider
+            // the xml node to be a text-only node
+            if (child.nodeType !== 3 && child.nodeType !== 4) 
+                return null;
+            text = text + child.nodeValue;
+            child = child.nextSibling;
+        }
         return text;
     }
 

package/test/application.test.js

@@ -1499,6 +1499,66 @@ describe('Application', () => {
                 const isoA3 = await recipient.root.findNode("country/@isoA3");
                 expect(isoA3).toBeFalsy();
             });
+
+            it("Should not cache temp:group: schemas", async () => {
+                const client = await Mock.makeClient();
+                client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);
+                await client.NLWS.xtkSession.logon();
+               
+                client._transport.mockReturnValueOnce(Mock.GET_XTK_QUERY_SCHEMA_RESPONSE);
+                client._transport.mockReturnValueOnce(Promise.resolve(`<?xml version='1.0'?>
+                      <SOAP-ENV:Envelope xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:ns='urn:xtk:queryDef' xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'>
+                        <SOAP-ENV:Body>
+                            <ExecuteQueryResponse xmlns='urn:xtk:queryDef' SOAP-ENV:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'>
+                                <pdomOutput xsi:type='ns:Element' SOAP-ENV:encodingStyle='http://xml.apache.org/xml-soap/literalxml'>
+                                <group expirationDate="" folder-id="1199" id="2200" label="testlist" name="LST260" schema="nms:recipient" type="1">
+                                  <extension label="email is not empty" mappingType="sql" name="query" namespace="temp">
+                                    <element advanced="false" dataSource="nms:extAccount:ffda" label="email is not empty" name="query" pkSequence="" sqltable="grp2200" unbound="false">
+                                      <compute-string expr=""/>
+                                      <key internal="true" name="internal">
+                                        <keyfield xpath="@id"/>
+                                      </key>
+                                      <attribute advanced="false" belongsTo="@id" label="Primary key" length="0" name="id" notNull="false" sql="true" sqlname="uId" type="uuid" xml="false"/>
+                                      <element advanced="false" externalJoin="true" label="Targeting dimension" name="target" revLink="" target="nms:recipient" type="link" unbound="false">
+                                        <join xpath-dst="@id" xpath-src="@id"/>
+                                      </element>
+                                    </element>
+                                  </extension>
+                                </group>
+                                </pdomOutput>
+                            </ExecuteQueryResponse>
+                        </SOAP-ENV:Body>
+                      </SOAP-ENV:Envelope>`));
+                const group = await client.application.getSchema('temp:group:2200');
+                expect(group.label).toBe("email is not empty");
+
+                // return updated schema with label changed
+                client._transport.mockReturnValueOnce(Promise.resolve(`<?xml version='1.0'?>
+                      <SOAP-ENV:Envelope xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:ns='urn:xtk:queryDef' xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'>
+                        <SOAP-ENV:Body>
+                            <ExecuteQueryResponse xmlns='urn:xtk:queryDef' SOAP-ENV:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'>
+                                <pdomOutput xsi:type='ns:Element' SOAP-ENV:encodingStyle='http://xml.apache.org/xml-soap/literalxml'>
+                                <group expirationDate="" folder-id="1199" id="2200" label="testlist" name="LST260" schema="nms:recipient" type="1">
+                                  <extension label="email is empty" mappingType="sql" name="query" namespace="temp">
+                                    <element advanced="false" dataSource="nms:extAccount:ffda" label="email is empty" name="query" pkSequence="" sqltable="grp2200" unbound="false">
+                                      <compute-string expr=""/>
+                                      <key internal="true" name="internal">
+                                        <keyfield xpath="@id"/>
+                                      </key>
+                                      <attribute advanced="false" belongsTo="@id" label="Primary key" length="0" name="id" notNull="false" sql="true" sqlname="uId" type="uuid" xml="false"/>
+                                      <element advanced="false" externalJoin="true" label="Targeting dimension" name="target" revLink="" target="nms:recipient" type="link" unbound="false">
+                                        <join xpath-dst="@id" xpath-src="@id"/>
+                                      </element>
+                                    </element>
+                                  </extension>
+                                </group>
+                                </pdomOutput>
+                            </ExecuteQueryResponse>
+                        </SOAP-ENV:Body>
+                      </SOAP-ENV:Envelope>`));
+                const group2 = await client.application.getSchema('temp:group:2200');
+                expect(group2.label).toBe("email is empty");
+            });
         });
 
         describe("Ref nodes", () => {

package/test/client.test.js

@@ -434,6 +434,129 @@ describe('ACC Client', function () {
             await client.NLWS.xtkSession.logoff();
         });
 
+        it("Should return temp group schema definition", async () => {
+            const client = await Mock.makeClient();
+            client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);
+            await client.NLWS.xtkSession.logon();
+           
+            client._transport.mockReturnValueOnce(Mock.GET_XTK_QUERY_SCHEMA_RESPONSE);
+            client._transport.mockReturnValueOnce(Promise.resolve(`<?xml version='1.0'?>
+              <SOAP-ENV:Envelope xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:ns='urn:xtk:queryDef' xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'>
+              <SOAP-ENV:Body>
+              <ExecuteQueryResponse xmlns='urn:xtk:queryDef' SOAP-ENV:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'>
+                  <pdomOutput xsi:type='ns:Element' SOAP-ENV:encodingStyle='http://xml.apache.org/xml-soap/literalxml'>
+                  <group expirationDate="" folder-id="1199" id="2200" label="testlist" name="LST260" schema="nms:recipient" type="1">
+                    <extension label="email is not empty" mappingType="sql" name="query" namespace="temp">
+                      <element advanced="false" dataSource="nms:extAccount:ffda" label="email is not empty" name="query" pkSequence="" sqltable="grp2200" unbound="false">
+                        <compute-string expr=""/>
+                        <key internal="true" name="internal">
+                          <keyfield xpath="@id"/>
+                        </key>
+                        <attribute advanced="false" belongsTo="@id" label="Primary key" length="0" name="id" notNull="false" sql="true" sqlname="uId" type="uuid" xml="false"/>
+                        <element advanced="false" externalJoin="true" label="Targeting dimension" name="target" revLink="" target="nms:recipient" type="link" unbound="false">
+                          <join xpath-dst="@id" xpath-src="@id"/>
+                        </element>
+                      </element>
+                    </extension>
+                    <desc><![CDATA[]]></desc>
+                    <folder _cs="Lists" fullName="/Profiles and Targets/Lists/" id="1199"/>
+                  </group>
+                  </pdomOutput></ExecuteQueryResponse>
+              </SOAP-ENV:Body>
+              </SOAP-ENV:Envelope>`));
+          
+            var schema = await client.getSchema("temp:group:2200");
+            expect(schema["namespace"]).toBe("temp");
+            expect(schema["name"]).toBe("query");
+            expect(schema["element"].label).toBe("email is not empty");
+
+            // Update label of first element
+            client._transport.mockReturnValueOnce(Promise.resolve(`<?xml version='1.0'?>
+              <SOAP-ENV:Envelope xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:ns='urn:xtk:queryDef' xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'>
+              <SOAP-ENV:Body>
+              <ExecuteQueryResponse xmlns='urn:xtk:queryDef' SOAP-ENV:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'>
+                  <pdomOutput xsi:type='ns:Element' SOAP-ENV:encodingStyle='http://xml.apache.org/xml-soap/literalxml'>
+                  <group expirationDate="" folder-id="1199" id="2200" label="testlist" name="LST260" schema="nms:recipient" type="1">
+                    <extension label="email is not empty" mappingType="sql" name="query" namespace="temp">
+                      <element advanced="false" dataSource="nms:extAccount:ffda" label="email is empty" name="query" pkSequence="" sqltable="grp2200" unbound="false">
+                        <compute-string expr=""/>
+                        <key internal="true" name="internal">
+                          <keyfield xpath="@id"/>
+                        </key>
+                        <attribute advanced="false" belongsTo="@id" label="Primary key" length="0" name="id" notNull="false" sql="true" sqlname="uId" type="uuid" xml="false"/>
+                        <element advanced="false" externalJoin="true" label="Targeting dimension" name="target" revLink="" target="nms:recipient" type="link" unbound="false">
+                          <join xpath-dst="@id" xpath-src="@id"/>
+                        </element>
+                      </element>
+                    </extension>
+                    <desc><![CDATA[]]></desc>
+                    <folder _cs="Lists" fullName="/Profiles and Targets/Lists/" id="1199"/>
+                  </group>
+                  </pdomOutput></ExecuteQueryResponse>
+              </SOAP-ENV:Body>
+              </SOAP-ENV:Envelope>`));
+             var schema = await client.getSchema("temp:group:2200");
+             expect(schema["namespace"]).toBe("temp");
+             expect(schema["name"]).toBe("query");
+             //check that we have the updated label
+             expect(schema["element"].label).toBe("email is empty");
+        });
+
+        it("Should return null when temp group schema definition is empty", async () => {
+            const client = await Mock.makeClient();
+            client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);
+            await client.NLWS.xtkSession.logon();
+           
+            client._transport.mockReturnValueOnce(Mock.GET_XTK_QUERY_SCHEMA_RESPONSE);
+            client._transport.mockReturnValueOnce(Promise.resolve(`<?xml version='1.0'?>
+                <SOAP-ENV:Envelope xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:ns='urn:xtk:queryDef' xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'>
+                  <SOAP-ENV:Body>
+                    <ExecuteQueryResponse xmlns='urn:xtk:queryDef' SOAP-ENV:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'>
+                      <pdomOutput xsi:type='ns:Element' SOAP-ENV:encodingStyle='http://xml.apache.org/xml-soap/literalxml'>
+                        <group />
+                      </pdomOutput></ExecuteQueryResponse>
+                  </SOAP-ENV:Body>
+                </SOAP-ENV:Envelope>`));
+           
+            var schema = await client.getSchema("temp:group:2200");
+            expect(schema).toBeNull();
+        });
+
+        it("Should return null when temp group schema definition does not exist", async () => {
+            const client = await Mock.makeClient();
+            client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);
+            await client.NLWS.xtkSession.logon();
+          
+            client._transport.mockReturnValueOnce(Mock.GET_XTK_QUERY_SCHEMA_RESPONSE);
+            client._transport.mockReturnValueOnce(Promise.resolve(`<?xml version='1.0' encoding='UTF-8'?>
+                <SOAP-ENV:Envelope xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/' xmlns:ns='http://xml.apache.org/xml-soap'>
+                  <SOAP-ENV:Body>
+                    <SOAP-ENV:Fault>
+                        <faultcode>faultcode</faultcode>
+                        <faultstring>SOP-330011</faultstring>
+                        <detail>"Error while executing the method 'ExecuteQuery' of service 'xtk:queryDef'."</detail>
+                    </SOAP-ENV:Fault>
+                  </SOAP-ENV:Body>
+                </SOAP-ENV:Envelope>`));
+                
+            var schema = await client.getSchema("temp:group:2200");
+            expect(schema).toBeNull();
+        });
+
+        it("Should rethrow exception when exception is not related to not existing group", async () => {
+            const client = await Mock.makeClient();
+            client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);
+            await client.NLWS.xtkSession.logon();
+            
+            client._transport.mockReturnValueOnce(Mock.GET_XTK_QUERY_SCHEMA_RESPONSE);
+            client._transport.mockReturnValueOnce(Mock.GET_XTK_SESSION_SCHEMA_RESPONSE);
+
+            try {
+                var schema = await client.getSchema("temp:group:2200");
+                expect(schema).toBe('not be called')
+            } catch (ex) {}
+        });
+      
         it("Should return sys enum definition", async () => {
             const client = await Mock.makeClient({ representation: "BadgerFish" });
             client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);
@@ -3874,7 +3997,9 @@ describe('ACC Client', function () {
             const schema = client.newSchema(xml);
             const jobs = schema.root.children["jobs"];
             expect(jobs.target).toBe("xtk:job");
-            await expect(jobs.linkTarget()).rejects.toThrow("Cannot read property 'getSchema' of null");
+            // node 14 throws "Cannot read property 'getSchema' of null"
+            // node 16+ throws "Cannot read properties of null (reading 'getSchema')"
+            await expect(jobs.linkTarget()).rejects.toThrow(/Cannot read (.*getSchema.*of null)|(.*of null.*getSchema)/);
         });
     });
 });

package/test/domUtil.test.js

@@ -958,4 +958,21 @@ describe('DomUtil', function() {
             expect(new XPathElement(".").isParent()).toBe(false);
         })
     });
+
+    it("Should handle content made of CDATA text", () => {
+        const xml = DomUtil.parse(`<delivery>
+        <source><![CDATA[<head></head>]]></source>
+        </delivery>`);
+        const json = DomUtil.toJSON(xml, "SimpleJson");
+        expect(json.$source).toBe("<head></head>")
+    });
+    it("Should handle content made of multiple CDATA text", () => {
+        const xml = DomUtil.parse(`<delivery>
+        <source><![CDATA[<head>]]><![CDATA[</head>]]></source>
+        </delivery>`);
+        const json = DomUtil.toJSON(xml, "SimpleJson");
+        expect(json.$source).toBe("<head></head>")
+    });
 });
+
+