@cntwg/xml-lib-js 0.0.16 → 0.0.17

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+#### *v0.0.17*
+
+Pre-release version.
+
+> fixed error in `TXmlContentRootElement` class constructor that caused failure on `TXmlContentContainer` class initiation with `options => autoBindRoot = "false"`;
+> - some fixes in `xmldoc-lib.js` module.
+
 #### *v0.0.16*
 
 Pre-release version.

package/lib/xmldoc-lib.js

@@ -1,4 +1,4 @@
-// [v0.1.045-20220906]
+// [v0.1.047-20220907]
 
 // === module init block ===
 
@@ -146,7 +146,7 @@ class TXmlAttributesMapper {
 class TXmlElementController {
   #_host = null;
   #_options = null;
-  #_p_opts = null;
+  #_parseOptions = null;
   #_attributes = null;
   #_name = null;
 
@@ -162,24 +162,24 @@ class TXmlElementController {
       this.#_host = obj;
     } else {
       if (proxyModeEnable) {
-        let msg = [
-          'TXmlElementController in "proxyMode":', XML_TE_NOBJ_EMSG,
-        ].join(' ');
-        throw new TypeError(msg);
+        throw new TypeError(
+          `TXmlElementController in "proxyMode": ${XML_TE_NOBJ_EMSG}`
+        );
       };
       this.#_host = {};
     };
     // set parser options
     let { parseOptions: _parseOptions } = _options;
-    if (!isPlainObject(_parseOptions)) _parseOptions = {};
+    if (!isPlainObject(_parseOptions)) {
+      _options.parseOptions = _parseOptions = {};
+    };
     let { settings: _settings } = _parseOptions;
     if (!isPlainObject(_settings)) {
       _parseOptions.settings = _settings = {};
       // // TODO: set defaults
     };
     // save parser options
-    _options.parseOptions = _parseOptions;
-    this.#_p_opts = _parseOptions;
+    this.#_parseOptions = _parseOptions;
     // save options
     _options.proxyModeEnable = proxyModeEnable;
     this.#_options = _options;
@@ -193,8 +193,11 @@ class TXmlElementController {
 
   get name(){
     let result = '';
-    if (this.#_p_opts.settings.compact) {
-      result = xObj.readXObjParam(this.#_host, this.#_p_opts.settings.nameKey);
+    if (this.#_parseOptions.settings.compact) {
+      result = xObj.readXObjParam(
+        this.#_host,
+        this.#_parseOptions.settings.nameKey
+      );
     } else {
       // TODO: read name of element in non-compact mode
     };
@@ -202,11 +205,11 @@ class TXmlElementController {
   }
 
   get textValue(){
-    return xObj.readXObjParam(this.#_host, this.#_p_opts.settings.textKey);
+    return xObj.readXObjParam(this.#_host, this.#_parseOptions.settings.textKey);
   }
 
   set textValue(value){
-    xObj.writeXObjParam(this.#_host, value, this.#_p_opts.settings.textKey);
+    xObj.writeXObjParam(this.#_host, value, this.#_parseOptions.settings.textKey);
   }
 
   hasAttribute(name){
@@ -239,13 +242,13 @@ class TXmlElementController {
       return xObj.writeXObjParam(
         this.#_host,
         value[0],
-        this.#_p_opts.settings.textKey,
+        this.#_parseOptions.settings.textKey,
       );
     } else if (val_size > 1) {
       if (xObj.writeXObjParam(
         this.#_host,
         value[1],
-        this.#_p_opts.settings.textKey,
+        this.#_parseOptions.settings.textKey,
       )) {
         return this.#_attributes.setAttribute(XML_LANG_ATTR_TNAME, value[0]);
       };
@@ -321,9 +324,12 @@ class TXmlElementController {
     ) {
       return null;
     };
-    let result = xObj.addXObjElement(this.#_host, name);
-    if (!result.isSucceed) return null;
-    return new TXmlElementController(result.item, this.#_options);
+    const result = xObj.addXObjElement(this.#_host, name);
+    return (
+      result.isSucceed
+      ? new TXmlElementController(result.item, this.#_options)
+      : null
+    );
   }
 
   delChild(value){
@@ -389,10 +395,9 @@ class TXmlElementsListController {
       this.#_host = obj;
     } else {
       if (proxyModeEnable) {
-        let msg = [
-          'TXmlElementsListController in "proxyMode":', XML_TE_NARR_EMSG,
-        ].join(' ');
-        throw new TypeError(msg);
+        throw new TypeError(
+          `TXmlElementsListController in "proxyMode": ${XML_TE_NARR_EMSG}`
+        );
       } else {
         // // TODO: split a plain object and class instances
         this.#_host = [];
@@ -441,7 +446,8 @@ class TXmlElementsListController {
 
   isValidItem(obj){
     return (
-      (this.#_options.isNullItemsAllowed && obj === null) || isPlainObject(obj)
+      (this.#_options.isNullItemsAllowed && obj === null)
+      || isPlainObject(obj)
     );
   }
 
@@ -559,9 +565,6 @@ class TXmlContentDeclaration {
   constructor(obj, opt){
     // check <obj>-param
     if (!isPlainObject(obj)) {
-      /*let msg = [
-        'TXmlContentDeclaration :', XML_TE_NOBJ_EMSG,
-      ].join(' ');*/
       throw new TypeError(`TXmlContentDeclaration : ${XML_TE_NOBJ_EMSG}`);
     };
     // load options
@@ -651,7 +654,7 @@ class TXmlContentRootElement extends TXmlElementController {
       const len = entries.length;
       if (len === 0) {
         rootItem = xObj.insertXObjElement(obj, rootETagName, false);
-      } else if (autoBindRoot) {
+      } else {
         const {
           declarationKey,
           attributesKey,
@@ -684,14 +687,16 @@ class TXmlContentRootElement extends TXmlElementController {
         if (targetKey === '') {
           rootItem = xObj.insertXObjElement(obj, rootETagName, false);
         } else {
-          rootItem = obj[targetKey];
-          rootETagName = targetKey;
-          if (!isPlainObject(rootItem)) {
-            rootItem = xObj.insertXObjElement(obj, rootETagName, false);
+          if (autoBindRoot) {
+            rootItem = obj[targetKey];
+            rootETagName = targetKey;
+            if (!isPlainObject(rootItem)) {
+              rootItem = xObj.insertXObjElement(obj, rootETagName, false);
+            };
+          } else {
+            throw new TypeError(`TXmlContentRootElement : ${XML_TE_NROOT_EMSG}`);
           };
         };
-      } else {
-        throw new TypeError(`TXmlContentRootElement : ${XML_TE_NROOT_EMSG}`);
       };
     } else if (!isPlainObject(rootItem)) {
       rootItem = xObj.insertXObjElement(obj, rootETagName, false);
@@ -782,40 +787,30 @@ class TXmlContentContainer {
   }
 
   _bindContent(obj, opt){
-    //console.log('CHECK: TXmlContentContainer._bindContent() => was called...');
     const _options = isPlainObject(opt) ? opt : this.#_options;
     let isSUCCEED = false;
     if (isPlainObject(obj)) {
-      let { rootETagName, parseOptions } = _options;
-      rootETagName = (
-        typeof rootETagName === 'string' ? rootETagName.trim() : ''
-      );
-      //if (rootETagName !== '' && isPlainObject(obj[rootETagName])) {
-        //console.log('CHECK: TXmlContentContainer._bindContent() => rootETagName:['+rootETagName+']');
-        if (!(parseOptions instanceof TXmlContentParseOptions)) {
-          parseOptions = new TXmlContentParseOptions(parseOptions);
-          _options.parseOptions = parseOptions;
-        };
-        const _docDecl = new TXmlContentDeclaration(obj, _options);
-        const _docRoot = new TXmlContentRootElement(obj, _options);
-        // // TODO: check elements
-        isSUCCEED = true;
-        if (isSUCCEED) {
-          // save options
-          this.#_options = _options;
-          // save parser options
-          this.#_parseOptions = parseOptions;
-          // save content
-          this.#_content = obj;
-          // bind refs to controllers
-          this.#_docDecl = _docDecl;
-          this.#_docRoot = _docRoot;
-        };
-      //};
+      let { parseOptions } = _options;
+      if (!(parseOptions instanceof TXmlContentParseOptions)) {
+        parseOptions = new TXmlContentParseOptions(parseOptions);
+        _options.parseOptions = parseOptions;
+      };
+      const _docDecl = new TXmlContentDeclaration(obj, _options);
+      const _docRoot = new TXmlContentRootElement(obj, _options);
+      // // TODO: check elements
+      isSUCCEED = true;
+      if (isSUCCEED) {
+        // save options
+        this.#_options = _options;
+        // save parser options
+        this.#_parseOptions = parseOptions;
+        // save content
+        this.#_content = obj;
+        // bind refs to controllers
+        this.#_docDecl = _docDecl;
+        this.#_docRoot = _docRoot;
+      };
     };
-    //console.log('CHECK: TXmlContentContainer.constructor() => _content => '+JSON.stringify(this.#_content, null, 2));
-    //console.log('CHECK: TXmlContentContainer._bindContent() => result:['+isSUCCEED+']');
-    //console.log('CHECK: TXmlContentContainer._bindContent() => was left...');
     return isSUCCEED;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cntwg/xml-lib-js",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "description": "A library for handling an XML-documents",
   "author": "ygracs <cs70th-om@rambler.ru>",
   "license": "MIT",