Skip to content

refactor: Remove ixml refs in ProgramCall#104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abmusse merged 1 commit into from
Feb 21, 2020
Merged

refactor: Remove ixml refs in ProgramCall #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion lib/Deprecated.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@
// previous versions, but will throw a warning message. When we no longer want to support calling
// these methods through these deprecated class names, we can simple disable this file.

/* eslint-disable max-classes-per-file */

const deprecate = require('depd');

const iPgmDeprecate = deprecate('iPgm');
Expand DownExpand Up@@ -66,6 +68,11 @@ class iPgm {
* @param {*} inDs
*/
addParam(data, type, options, inDs) {
if (!Array.isArray(data) && !type) {
iPgmDeprecate('defaulting parameter type to 1024a has been deprecated. You should specify a type instead.');
// eslint-disable-next-line no-param-reassign
type = '1024a';
}
iPgmDeprecate('As of v1.0, \'iPgm.addParam()\' is deprecated. Please use \'ProgramCall.addParam()\' instead.');
return this.ProgramCall.addParam(data, type, options, inDs);
}
Expand All@@ -76,7 +83,12 @@ class iPgm {
* @param {string} type
* @param {object} [options]
*/
addReturn(data, type, options) {
addReturn(data, type = '1024a', options) {
if (!type) {
iPgmDeprecate('defaulting return type to 1024a has been deprecated. You should specify a type instead.');
// eslint-disable-next-line no-param-reassign
type = '1024a';
}
iPgmDeprecate('As of v1.0, \'iPgm.addReturn()\' is deprecated. Please use \'ProgramCall.addParam()\' instead.');
return this.ProgramCall.addReturn(data, type, options);
}
Expand Down
70 changes: 44 additions & 26 deletions lib/ProgramCall.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,25 +16,18 @@
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

const iXml = require('./ixml');

class ProgramCall {
/**
* @description creates a new ProgramCall object
* @constructor
* @param {string} program
* @param {object} [options]
*/
constructor(program, options) {
if (options && typeof options === 'object') {
// add options if they exist, or empty string if they don't
this.xml = iXml.iXmlNodePgmOpen(program,
options.lib !== undefined ? options.lib : '',
options.func !== undefined ? options.func : '',
options.error !== undefined ? options.error : '');
} else {
this.xml = iXml.iXmlNodePgmOpen(program, '', '', '');
}
constructor(program, options = {}) {
this.xml = `<pgm name='${program}'`;
if (options.lib) this.xml += ` lib='${options.lib}'`;
if (options.func) this.xml += ` func='${options.func}'`;
this.xml += ` error='${options.error || 'fast'}'>`;
}

/**
Expand All@@ -51,28 +44,46 @@ class ProgramCall {
opt = type;
} else {
opt = options;
Comment thread
kadler marked this conversation as resolved.
if (!type) {
throw new Error('Specifying the parameter type is required.');
}
}

if (!inDs) { // In recursive mode, if it is an element in DS, then no <parm> or </parm> needed.
this.xml += iXml.iXmlNodeParmOpen(opt);
this.xml += '<parm';
if (opt && typeof opt === 'object') { // append <param> options
if (opt.io) { this.xml += ` io='${opt.io}'`; }
if (opt.by) { this.xml += ` by='${opt.by}'`; }
}
this.xml += '>';
}

if (Array.isArray(data)) { // If it is a struct parameter, recursivly parse its children.
if (opt) {
this.xml += iXml.iXmlNodeDsOpen(opt.dim, opt.dou, opt.len, opt.data);
} else {
this.xml += iXml.iXmlNodeDsOpen('', '', '', '');
if (Array.isArray(data)) { // If it is a struct parameter, recursively parse its children.
this.xml += '<ds';
if (opt && typeof opt === 'object') { // append <ds> options
if (opt.dim) { this.xml += ` dim='${opt.dim}'`; }
if (opt.dou) { this.xml += ` dou='${opt.dou}'`; }
if (opt.len) { this.xml += ` len='${opt.len}'`; }
if (opt.data) { this.xml += ` data='${opt.data}'`; }
}
this.xml += '>';

for (let i = 0; i < data.length; i += 1) {
this.addParam(data[i][0], data[i][1], data[i][2], true);
}
this.xml += iXml.iXmlNodeDsClose();
this.xml += '</ds>';
} else { // A simple parameter
this.xml += iXml.iXmlNodeDataOpen(type, opt) + data + iXml.iXmlNodeDataClose();
this.xml += `<data type='${type}'`;
if (opt && typeof opt === 'object') { // append <data> options
Object.keys(opt).forEach((key) => {
this.xml += ` ${key}='${opt[key]}'`;
});
}
this.xml += `>${data}</data>`;
}

if (!inDs) { // In recursive mode, if it is an element in DS, then no <parm> or </parm> needed.
this.xml += iXml.iXmlNodeParmClose();
this.xml += '</parm>';
}
}

Expand All@@ -83,21 +94,28 @@ class ProgramCall {
* @param {object} [options]
*/
addReturn(data, type, options = null) {
this.xml += iXml.iXmlNodeReturnOpen();
if (!type) {
throw new Error('Specifying the return type is required.');
}
this.xml += '<return>';

if (options && typeof options === 'object') {
this.xml += iXml.iXmlNodeDataOpen(type, options);
this.xml += `<data type='${type}'`;
Object.keys(options).forEach((key) => {
this.xml += ` ${key}='${options[key]}'`;
});
} else {
this.xml += iXml.iXmlNodeDataOpen(type);
this.xml += `<data type='${type}'`;
}
this.xml += data + iXml.iXmlNodeDataClose() + iXml.iXmlNodeReturnClose();
this.xml += `>${data}</data></return>`;
}

/**
* @description returns the current program XML
* @returns {string} - the generated program XML
*/
toXML() {
return this.xml + iXml.iXmlNodePgmClose();
return `${this.xml}</pgm>`;
}
}

Expand Down
29 changes: 0 additions & 29 deletions lib/ixml.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,49 +35,20 @@ module.exports.iXmlNodeScriptOpen = () => '<myscript>';

module.exports.iXmlNodeScriptClose = () => '</myscript>';

module.exports.iXmlNodePgmOpen = (xname, xlib, xfunc, xerror) => `<pgm${iXmlAttrDefault('name', xname, 'undefined')}${iXmlAttrDefault('lib', xlib, '')}${iXmlAttrDefault('func', xfunc, '')}${iXmlAttrDefault('error', xerror, 'fast')}>`;

module.exports.iXmlNodePgmClose = () => '</pgm>';

module.exports.iXmlNodeParmOpen = (opt) => {
if (!(opt && typeof opt === 'object')) {
return '<parm>';
}

const io = (opt.io) ? iXmlAttrDefault('io', opt.io, '') : '';
const by = (opt.by) ? iXmlAttrDefault('by', opt.by, '') : '';

return `<parm${io}${by}>`;
};

module.exports.iXmlNodeParmClose = () => '</parm>';

module.exports.iXmlNodeReturnOpen = () => '<return>';

module.exports.iXmlNodeReturnClose = () => '</return>';

module.exports.iXmlNodeOverlayOpen = (xio, xoffset, xtop) => `<overlay${iXmlAttrDefault('io', xio, 'both')}${iXmlAttrDefault('offset', xoffset, '')}${iXmlAttrDefault('top', xtop, '')}>`;

module.exports.iXmlNodeOverlayClose = () => '</overlay>';

module.exports.iXmlNodeDsOpen = (xdim, xdou, xlen, xdata) => `<ds${iXmlAttrDefault('dim', xdim, '')}${iXmlAttrDefault('dou', xdou, '')}${iXmlAttrDefault('len', xlen, '')}${iXmlAttrDefault('data', xdata, '')}>`;

module.exports.iXmlNodeDsClose = () => '</ds>';

module.exports.iXmlNodeDataOpen = (xtype, options) => {
let result = `<data${iXmlAttrDefault('type', xtype, '1024a')}`;

if (options && typeof options === 'object') {
Object.keys(options).forEach((key) => {
result += iXmlAttrDefault(key, options[key], '1024a');
});
}

result += '>';
return result;
};

module.exports.iXmlNodeDataClose = () => '</data>';

module.exports.iXmlNodeCmdOpen = (xexec, xhex, xbefore, xafter, xerror) => `<cmd${iXmlAttrDefault('exec', xexec, 'system')}${iXmlAttrDefault('hex', xhex, '')}${iXmlAttrDefault('before', xbefore, '')}${iXmlAttrDefault('after', xafter, '')}${iXmlAttrDefault('error', xerror, 'fast')}>`;

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
refactor: Remove ixml refs in ProgramCall by abmusse · Pull Request #104 · IBM/nodejs-itoolkit · GitHub
Skip to content
refactor: Remove ixml refs in ProgramCall#104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

abmusse
merged 1 commit into

from

Feb 21, 2020
 Merged


refactor: Remove ixml refs in ProgramCall
#104
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 13 additions & 1 deletion
lib/Deprecated.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@
// previous versions, but will throw a warning message. When we no longer want to support calling
// these methods through these deprecated class names, we can simple disable this file.

/* eslint-disable max-classes-per-file */

const deprecate = require('depd');

const iPgmDeprecate = deprecate('iPgm');
Expand DownExpand Up@@ -66,6 +68,11 @@ class iPgm {
 * @param {*} inDs
 */
 addParam(data, type, options, inDs) {
 if (!Array.isArray(data) && !type) {
 iPgmDeprecate('defaulting parameter type to 1024a has been deprecated. You should specify a type instead.');
 // eslint-disable-next-line no-param-reassign
 type = '1024a';
 }
 iPgmDeprecate('As of v1.0, \'iPgm.addParam()\' is deprecated. Please use \'ProgramCall.addParam()\' instead.');
 return this.ProgramCall.addParam(data, type, options, inDs);
 }
Expand All@@ -76,7 +83,12 @@ class iPgm {
 * @param {string} type
 * @param {object} [options]
 */
 addReturn(data, type, options) {
 addReturn(data, type = '1024a', options) {
 if (!type) {
 iPgmDeprecate('defaulting return type to 1024a has been deprecated. You should specify a type instead.');
 // eslint-disable-next-line no-param-reassign
 type = '1024a';
 }
 iPgmDeprecate('As of v1.0, \'iPgm.addReturn()\' is deprecated. Please use \'ProgramCall.addParam()\' instead.');
 return this.ProgramCall.addReturn(data, type, options);
 }
Expand Down

70 changes: 44 additions & 26 deletions
lib/ProgramCall.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,25 +16,18 @@
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

const iXml = require('./ixml');

class ProgramCall {
 /**
 * @description creates a new ProgramCall object
 * @constructor
 * @param {string} program
 * @param {object} [options]
 */
 constructor(program, options) {
 if (options && typeof options === 'object') {
 // add options if they exist, or empty string if they don't
 this.xml = iXml.iXmlNodePgmOpen(program,
 options.lib !== undefined ? options.lib : '',
 options.func !== undefined ? options.func : '',
 options.error !== undefined ? options.error : '');
 } else {
 this.xml = iXml.iXmlNodePgmOpen(program, '', '', '');
 }
 constructor(program, options = {}) {
 this.xml = `<pgm name='${program}'`;
 if (options.lib) this.xml += ` lib='${options.lib}'`;
 if (options.func) this.xml += ` func='${options.func}'`;
 this.xml += ` error='${options.error || 'fast'}'>`;
 }

 /**
Expand All@@ -51,28 +44,46 @@ class ProgramCall {
 opt = type;
 } else {
 opt = options;
Comment thread
kadler marked this conversation as resolved.

 if (!type) {
 throw new Error('Specifying the parameter type is required.');
 }
 }

 if (!inDs) { // In recursive mode, if it is an element in DS, then no <parm> or </parm> needed.
 this.xml += iXml.iXmlNodeParmOpen(opt);
 this.xml += '<parm';
 if (opt && typeof opt === 'object') { // append <param> options
 if (opt.io) { this.xml += ` io='${opt.io}'`; }
 if (opt.by) { this.xml += ` by='${opt.by}'`; }
 }
 this.xml += '>';
 }

 if (Array.isArray(data)) { // If it is a struct parameter, recursivly parse its children.
 if (opt) {
 this.xml += iXml.iXmlNodeDsOpen(opt.dim, opt.dou, opt.len, opt.data);
 } else {
 this.xml += iXml.iXmlNodeDsOpen('', '', '', '');
 if (Array.isArray(data)) { // If it is a struct parameter, recursively parse its children.
 this.xml += '<ds';
 if (opt && typeof opt === 'object') { // append <ds> options
 if (opt.dim) { this.xml += ` dim='${opt.dim}'`; }
 if (opt.dou) { this.xml += ` dou='${opt.dou}'`; }
 if (opt.len) { this.xml += ` len='${opt.len}'`; }
 if (opt.data) { this.xml += ` data='${opt.data}'`; }
 }
 this.xml += '>';

 for (let i = 0; i < data.length; i += 1) {
 this.addParam(data[i][0], data[i][1], data[i][2], true);
 }
 this.xml += iXml.iXmlNodeDsClose();
 this.xml += '</ds>';
 } else { // A simple parameter
 this.xml += iXml.iXmlNodeDataOpen(type, opt) + data + iXml.iXmlNodeDataClose();
 this.xml += `<data type='${type}'`;
 if (opt && typeof opt === 'object') { // append <data> options
 Object.keys(opt).forEach((key) => {
 this.xml += ` ${key}='${opt[key]}'`;
 });
 }
 this.xml += `>${data}</data>`;
 }

 if (!inDs) { // In recursive mode, if it is an element in DS, then no <parm> or </parm> needed.
 this.xml += iXml.iXmlNodeParmClose();
 this.xml += '</parm>';
 }
 }

Expand All@@ -83,21 +94,28 @@ class ProgramCall {
 * @param {object} [options]
 */
 addReturn(data, type, options = null) {
 this.xml += iXml.iXmlNodeReturnOpen();
 if (!type) {
 throw new Error('Specifying the return type is required.');
 }
 this.xml += '<return>';

 if (options && typeof options === 'object') {
 this.xml += iXml.iXmlNodeDataOpen(type, options);
 this.xml += `<data type='${type}'`;
 Object.keys(options).forEach((key) => {
 this.xml += ` ${key}='${options[key]}'`;
 });
 } else {
 this.xml += iXml.iXmlNodeDataOpen(type);
 this.xml += `<data type='${type}'`;
 }
 this.xml += data + iXml.iXmlNodeDataClose() + iXml.iXmlNodeReturnClose();
 this.xml += `>${data}</data></return>`;
 }

 /**
 * @description returns the current program XML
 * @returns {string} - the generated program XML
 */
 toXML() {
 return this.xml + iXml.iXmlNodePgmClose();
 return `${this.xml}</pgm>`;
 }
}

Expand Down

29 changes: 0 additions & 29 deletions
lib/ixml.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,49 +35,20 @@ module.exports.iXmlNodeScriptOpen = () => '<myscript>';

module.exports.iXmlNodeScriptClose = () => '</myscript>';

module.exports.iXmlNodePgmOpen = (xname, xlib, xfunc, xerror) => `<pgm${iXmlAttrDefault('name', xname, 'undefined')}${iXmlAttrDefault('lib', xlib, '')}${iXmlAttrDefault('func', xfunc, '')}${iXmlAttrDefault('error', xerror, 'fast')}>`;

module.exports.iXmlNodePgmClose = () => '</pgm>';

module.exports.iXmlNodeParmOpen = (opt) => {
 if (!(opt && typeof opt === 'object')) {
 return '<parm>';
 }

 const io = (opt.io) ? iXmlAttrDefault('io', opt.io, '') : '';
 const by = (opt.by) ? iXmlAttrDefault('by', opt.by, '') : '';

 return `<parm${io}${by}>`;
};

module.exports.iXmlNodeParmClose = () => '</parm>';

module.exports.iXmlNodeReturnOpen = () => '<return>';

module.exports.iXmlNodeReturnClose = () => '</return>';

module.exports.iXmlNodeOverlayOpen = (xio, xoffset, xtop) => `<overlay${iXmlAttrDefault('io', xio, 'both')}${iXmlAttrDefault('offset', xoffset, '')}${iXmlAttrDefault('top', xtop, '')}>`;

module.exports.iXmlNodeOverlayClose = () => '</overlay>';

module.exports.iXmlNodeDsOpen = (xdim, xdou, xlen, xdata) => `<ds${iXmlAttrDefault('dim', xdim, '')}${iXmlAttrDefault('dou', xdou, '')}${iXmlAttrDefault('len', xlen, '')}${iXmlAttrDefault('data', xdata, '')}>`;

module.exports.iXmlNodeDsClose = () => '</ds>';

module.exports.iXmlNodeDataOpen = (xtype, options) => {
 let result = `<data${iXmlAttrDefault('type', xtype, '1024a')}`;

 if (options && typeof options === 'object') {
 Object.keys(options).forEach((key) => {
 result += iXmlAttrDefault(key, options[key], '1024a');
 });
 }

 result += '>';
 return result;
};

module.exports.iXmlNodeDataClose = () => '</data>';

module.exports.iXmlNodeCmdOpen = (xexec, xhex, xbefore, xafter, xerror) => `<cmd${iXmlAttrDefault('exec', xexec, 'system')}${iXmlAttrDefault('hex', xhex, '')}${iXmlAttrDefault('before', xbefore, '')}${iXmlAttrDefault('after', xafter, '')}${iXmlAttrDefault('error', xerror, 'fast')}>`;

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
refactor: Remove ixml refs in ProgramCall by abmusse · Pull Request #104 · IBM/nodejs-itoolkit · GitHub
Skip to content
refactor: Remove ixml refs in ProgramCall#104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

abmusse
merged 1 commit into

from

Feb 21, 2020
 Merged


refactor: Remove ixml refs in ProgramCall
#104
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 13 additions & 1 deletion
lib/Deprecated.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@
// previous versions, but will throw a warning message. When we no longer want to support calling
// these methods through these deprecated class names, we can simple disable this file.

/* eslint-disable max-classes-per-file */

const deprecate = require('depd');

const iPgmDeprecate = deprecate('iPgm');
Expand DownExpand Up@@ -66,6 +68,11 @@ class iPgm {
 * @param {*} inDs
 */
 addParam(data, type, options, inDs) {
 if (!Array.isArray(data) && !type) {
 iPgmDeprecate('defaulting parameter type to 1024a has been deprecated. You should specify a type instead.');
 // eslint-disable-next-line no-param-reassign
 type = '1024a';
 }
 iPgmDeprecate('As of v1.0, \'iPgm.addParam()\' is deprecated. Please use \'ProgramCall.addParam()\' instead.');
 return this.ProgramCall.addParam(data, type, options, inDs);
 }
Expand All@@ -76,7 +83,12 @@ class iPgm {
 * @param {string} type
 * @param {object} [options]
 */
 addReturn(data, type, options) {
 addReturn(data, type = '1024a', options) {
 if (!type) {
 iPgmDeprecate('defaulting return type to 1024a has been deprecated. You should specify a type instead.');
 // eslint-disable-next-line no-param-reassign
 type = '1024a';
 }
 iPgmDeprecate('As of v1.0, \'iPgm.addReturn()\' is deprecated. Please use \'ProgramCall.addParam()\' instead.');
 return this.ProgramCall.addReturn(data, type, options);
 }
Expand Down

70 changes: 44 additions & 26 deletions
lib/ProgramCall.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,25 +16,18 @@
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

const iXml = require('./ixml');

class ProgramCall {
 /**
 * @description creates a new ProgramCall object
 * @constructor
 * @param {string} program
 * @param {object} [options]
 */
 constructor(program, options) {
 if (options && typeof options === 'object') {
 // add options if they exist, or empty string if they don't
 this.xml = iXml.iXmlNodePgmOpen(program,
 options.lib !== undefined ? options.lib : '',
 options.func !== undefined ? options.func : '',
 options.error !== undefined ? options.error : '');
 } else {
 this.xml = iXml.iXmlNodePgmOpen(program, '', '', '');
 }
 constructor(program, options = {}) {
 this.xml = `<pgm name='${program}'`;
 if (options.lib) this.xml += ` lib='${options.lib}'`;
 if (options.func) this.xml += ` func='${options.func}'`;
 this.xml += ` error='${options.error || 'fast'}'>`;
 }

 /**
Expand All@@ -51,28 +44,46 @@ class ProgramCall {
 opt = type;
 } else {
 opt = options;
Comment thread
kadler marked this conversation as resolved.

 if (!type) {
 throw new Error('Specifying the parameter type is required.');
 }
 }

 if (!inDs) { // In recursive mode, if it is an element in DS, then no <parm> or </parm> needed.
 this.xml += iXml.iXmlNodeParmOpen(opt);
 this.xml += '<parm';
 if (opt && typeof opt === 'object') { // append <param> options
 if (opt.io) { this.xml += ` io='${opt.io}'`; }
 if (opt.by) { this.xml += ` by='${opt.by}'`; }
 }
 this.xml += '>';
 }

 if (Array.isArray(data)) { // If it is a struct parameter, recursivly parse its children.
 if (opt) {
 this.xml += iXml.iXmlNodeDsOpen(opt.dim, opt.dou, opt.len, opt.data);
 } else {
 this.xml += iXml.iXmlNodeDsOpen('', '', '', '');
 if (Array.isArray(data)) { // If it is a struct parameter, recursively parse its children.
 this.xml += '<ds';
 if (opt && typeof opt === 'object') { // append <ds> options
 if (opt.dim) { this.xml += ` dim='${opt.dim}'`; }
 if (opt.dou) { this.xml += ` dou='${opt.dou}'`; }
 if (opt.len) { this.xml += ` len='${opt.len}'`; }
 if (opt.data) { this.xml += ` data='${opt.data}'`; }
 }
 this.xml += '>';

 for (let i = 0; i < data.length; i += 1) {
 this.addParam(data[i][0], data[i][1], data[i][2], true);
 }
 this.xml += iXml.iXmlNodeDsClose();
 this.xml += '</ds>';
 } else { // A simple parameter
 this.xml += iXml.iXmlNodeDataOpen(type, opt) + data + iXml.iXmlNodeDataClose();
 this.xml += `<data type='${type}'`;
 if (opt && typeof opt === 'object') { // append <data> options
 Object.keys(opt).forEach((key) => {
 this.xml += ` ${key}='${opt[key]}'`;
 });
 }
 this.xml += `>${data}</data>`;
 }

 if (!inDs) { // In recursive mode, if it is an element in DS, then no <parm> or </parm> needed.
 this.xml += iXml.iXmlNodeParmClose();
 this.xml += '</parm>';
 }
 }

Expand All@@ -83,21 +94,28 @@ class ProgramCall {
 * @param {object} [options]
 */
 addReturn(data, type, options = null) {
 this.xml += iXml.iXmlNodeReturnOpen();
 if (!type) {
 throw new Error('Specifying the return type is required.');
 }
 this.xml += '<return>';

 if (options && typeof options === 'object') {
 this.xml += iXml.iXmlNodeDataOpen(type, options);
 this.xml += `<data type='${type}'`;
 Object.keys(options).forEach((key) => {
 this.xml += ` ${key}='${options[key]}'`;
 });
 } else {
 this.xml += iXml.iXmlNodeDataOpen(type);
 this.xml += `<data type='${type}'`;
 }
 this.xml += data + iXml.iXmlNodeDataClose() + iXml.iXmlNodeReturnClose();
 this.xml += `>${data}</data></return>`;
 }

 /**
 * @description returns the current program XML
 * @returns {string} - the generated program XML
 */
 toXML() {
 return this.xml + iXml.iXmlNodePgmClose();
 return `${this.xml}</pgm>`;
 }
}

Expand Down

29 changes: 0 additions & 29 deletions
lib/ixml.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,49 +35,20 @@ module.exports.iXmlNodeScriptOpen = () => '<myscript>';

module.exports.iXmlNodeScriptClose = () => '</myscript>';

module.exports.iXmlNodePgmOpen = (xname, xlib, xfunc, xerror) => `<pgm${iXmlAttrDefault('name', xname, 'undefined')}${iXmlAttrDefault('lib', xlib, '')}${iXmlAttrDefault('func', xfunc, '')}${iXmlAttrDefault('error', xerror, 'fast')}>`;

module.exports.iXmlNodePgmClose = () => '</pgm>';

module.exports.iXmlNodeParmOpen = (opt) => {
 if (!(opt && typeof opt === 'object')) {
 return '<parm>';
 }

 const io = (opt.io) ? iXmlAttrDefault('io', opt.io, '') : '';
 const by = (opt.by) ? iXmlAttrDefault('by', opt.by, '') : '';

 return `<parm${io}${by}>`;
};

module.exports.iXmlNodeParmClose = () => '</parm>';

module.exports.iXmlNodeReturnOpen = () => '<return>';

module.exports.iXmlNodeReturnClose = () => '</return>';

module.exports.iXmlNodeOverlayOpen = (xio, xoffset, xtop) => `<overlay${iXmlAttrDefault('io', xio, 'both')}${iXmlAttrDefault('offset', xoffset, '')}${iXmlAttrDefault('top', xtop, '')}>`;

module.exports.iXmlNodeOverlayClose = () => '</overlay>';

module.exports.iXmlNodeDsOpen = (xdim, xdou, xlen, xdata) => `<ds${iXmlAttrDefault('dim', xdim, '')}${iXmlAttrDefault('dou', xdou, '')}${iXmlAttrDefault('len', xlen, '')}${iXmlAttrDefault('data', xdata, '')}>`;

module.exports.iXmlNodeDsClose = () => '</ds>';

module.exports.iXmlNodeDataOpen = (xtype, options) => {
 let result = `<data${iXmlAttrDefault('type', xtype, '1024a')}`;

 if (options && typeof options === 'object') {
 Object.keys(options).forEach((key) => {
 result += iXmlAttrDefault(key, options[key], '1024a');
 });
 }

 result += '>';
 return result;
};

module.exports.iXmlNodeDataClose = () => '</data>';

module.exports.iXmlNodeCmdOpen = (xexec, xhex, xbefore, xafter, xerror) => `<cmd${iXmlAttrDefault('exec', xexec, 'system')}${iXmlAttrDefault('hex', xhex, '')}${iXmlAttrDefault('before', xbefore, '')}${iXmlAttrDefault('after', xafter, '')}${iXmlAttrDefault('error', xerror, 'fast')}>`;

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
refactor: Remove ixml refs in ProgramCall by abmusse · Pull Request #104 · IBM/nodejs-itoolkit · GitHub
Skip to content
refactor: Remove ixml refs in ProgramCall#104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

abmusse
merged 1 commit into

from

Feb 21, 2020
 Merged


refactor: Remove ixml refs in ProgramCall
#104
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 13 additions & 1 deletion
lib/Deprecated.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@
// previous versions, but will throw a warning message. When we no longer want to support calling
// these methods through these deprecated class names, we can simple disable this file.

/* eslint-disable max-classes-per-file */

const deprecate = require('depd');

const iPgmDeprecate = deprecate('iPgm');
Expand DownExpand Up@@ -66,6 +68,11 @@ class iPgm {
 * @param {*} inDs
 */
 addParam(data, type, options, inDs) {
 if (!Array.isArray(data) && !type) {
 iPgmDeprecate('defaulting parameter type to 1024a has been deprecated. You should specify a type instead.');
 // eslint-disable-next-line no-param-reassign
 type = '1024a';
 }
 iPgmDeprecate('As of v1.0, \'iPgm.addParam()\' is deprecated. Please use \'ProgramCall.addParam()\' instead.');
 return this.ProgramCall.addParam(data, type, options, inDs);
 }
Expand All@@ -76,7 +83,12 @@ class iPgm {
 * @param {string} type
 * @param {object} [options]
 */
 addReturn(data, type, options) {
 addReturn(data, type = '1024a', options) {
 if (!type) {
 iPgmDeprecate('defaulting return type to 1024a has been deprecated. You should specify a type instead.');
 // eslint-disable-next-line no-param-reassign
 type = '1024a';
 }
 iPgmDeprecate('As of v1.0, \'iPgm.addReturn()\' is deprecated. Please use \'ProgramCall.addParam()\' instead.');
 return this.ProgramCall.addReturn(data, type, options);
 }
Expand Down

70 changes: 44 additions & 26 deletions
lib/ProgramCall.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,25 +16,18 @@
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

const iXml = require('./ixml');

class ProgramCall {
 /**
 * @description creates a new ProgramCall object
 * @constructor
 * @param {string} program
 * @param {object} [options]
 */
 constructor(program, options) {
 if (options && typeof options === 'object') {
 // add options if they exist, or empty string if they don't
 this.xml = iXml.iXmlNodePgmOpen(program,
 options.lib !== undefined ? options.lib : '',
 options.func !== undefined ? options.func : '',
 options.error !== undefined ? options.error : '');
 } else {
 this.xml = iXml.iXmlNodePgmOpen(program, '', '', '');
 }
 constructor(program, options = {}) {
 this.xml = `<pgm name='${program}'`;
 if (options.lib) this.xml += ` lib='${options.lib}'`;
 if (options.func) this.xml += ` func='${options.func}'`;
 this.xml += ` error='${options.error || 'fast'}'>`;
 }

 /**
Expand All@@ -51,28 +44,46 @@ class ProgramCall {
 opt = type;
 } else {
 opt = options;
Comment thread
kadler marked this conversation as resolved.

 if (!type) {
 throw new Error('Specifying the parameter type is required.');
 }
 }

 if (!inDs) { // In recursive mode, if it is an element in DS, then no <parm> or </parm> needed.
 this.xml += iXml.iXmlNodeParmOpen(opt);
 this.xml += '<parm';
 if (opt && typeof opt === 'object') { // append <param> options
 if (opt.io) { this.xml += ` io='${opt.io}'`; }
 if (opt.by) { this.xml += ` by='${opt.by}'`; }
 }
 this.xml += '>';
 }

 if (Array.isArray(data)) { // If it is a struct parameter, recursivly parse its children.
 if (opt) {
 this.xml += iXml.iXmlNodeDsOpen(opt.dim, opt.dou, opt.len, opt.data);
 } else {
 this.xml += iXml.iXmlNodeDsOpen('', '', '', '');
 if (Array.isArray(data)) { // If it is a struct parameter, recursively parse its children.
 this.xml += '<ds';
 if (opt && typeof opt === 'object') { // append <ds> options
 if (opt.dim) { this.xml += ` dim='${opt.dim}'`; }
 if (opt.dou) { this.xml += ` dou='${opt.dou}'`; }
 if (opt.len) { this.xml += ` len='${opt.len}'`; }
 if (opt.data) { this.xml += ` data='${opt.data}'`; }
 }
 this.xml += '>';

 for (let i = 0; i < data.length; i += 1) {
 this.addParam(data[i][0], data[i][1], data[i][2], true);
 }
 this.xml += iXml.iXmlNodeDsClose();
 this.xml += '</ds>';
 } else { // A simple parameter
 this.xml += iXml.iXmlNodeDataOpen(type, opt) + data + iXml.iXmlNodeDataClose();
 this.xml += `<data type='${type}'`;
 if (opt && typeof opt === 'object') { // append <data> options
 Object.keys(opt).forEach((key) => {
 this.xml += ` ${key}='${opt[key]}'`;
 });
 }
 this.xml += `>${data}</data>`;
 }

 if (!inDs) { // In recursive mode, if it is an element in DS, then no <parm> or </parm> needed.
 this.xml += iXml.iXmlNodeParmClose();
 this.xml += '</parm>';
 }
 }

Expand All@@ -83,21 +94,28 @@ class ProgramCall {
 * @param {object} [options]
 */
 addReturn(data, type, options = null) {
 this.xml += iXml.iXmlNodeReturnOpen();
 if (!type) {
 throw new Error('Specifying the return type is required.');
 }
 this.xml += '<return>';

 if (options && typeof options === 'object') {
 this.xml += iXml.iXmlNodeDataOpen(type, options);
 this.xml += `<data type='${type}'`;
 Object.keys(options).forEach((key) => {
 this.xml += ` ${key}='${options[key]}'`;
 });
 } else {
 this.xml += iXml.iXmlNodeDataOpen(type);
 this.xml += `<data type='${type}'`;
 }
 this.xml += data + iXml.iXmlNodeDataClose() + iXml.iXmlNodeReturnClose();
 this.xml += `>${data}</data></return>`;
 }

 /**
 * @description returns the current program XML
 * @returns {string} - the generated program XML
 */
 toXML() {
 return this.xml + iXml.iXmlNodePgmClose();
 return `${this.xml}</pgm>`;
 }
}

Expand Down

29 changes: 0 additions & 29 deletions
lib/ixml.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,49 +35,20 @@ module.exports.iXmlNodeScriptOpen = () => '<myscript>';

module.exports.iXmlNodeScriptClose = () => '</myscript>';

module.exports.iXmlNodePgmOpen = (xname, xlib, xfunc, xerror) => `<pgm${iXmlAttrDefault('name', xname, 'undefined')}${iXmlAttrDefault('lib', xlib, '')}${iXmlAttrDefault('func', xfunc, '')}${iXmlAttrDefault('error', xerror, 'fast')}>`;

module.exports.iXmlNodePgmClose = () => '</pgm>';

module.exports.iXmlNodeParmOpen = (opt) => {
 if (!(opt && typeof opt === 'object')) {
 return '<parm>';
 }

 const io = (opt.io) ? iXmlAttrDefault('io', opt.io, '') : '';
 const by = (opt.by) ? iXmlAttrDefault('by', opt.by, '') : '';

 return `<parm${io}${by}>`;
};

module.exports.iXmlNodeParmClose = () => '</parm>';

module.exports.iXmlNodeReturnOpen = () => '<return>';

module.exports.iXmlNodeReturnClose = () => '</return>';

module.exports.iXmlNodeOverlayOpen = (xio, xoffset, xtop) => `<overlay${iXmlAttrDefault('io', xio, 'both')}${iXmlAttrDefault('offset', xoffset, '')}${iXmlAttrDefault('top', xtop, '')}>`;

module.exports.iXmlNodeOverlayClose = () => '</overlay>';

module.exports.iXmlNodeDsOpen = (xdim, xdou, xlen, xdata) => `<ds${iXmlAttrDefault('dim', xdim, '')}${iXmlAttrDefault('dou', xdou, '')}${iXmlAttrDefault('len', xlen, '')}${iXmlAttrDefault('data', xdata, '')}>`;

module.exports.iXmlNodeDsClose = () => '</ds>';

module.exports.iXmlNodeDataOpen = (xtype, options) => {
 let result = `<data${iXmlAttrDefault('type', xtype, '1024a')}`;

 if (options && typeof options === 'object') {
 Object.keys(options).forEach((key) => {
 result += iXmlAttrDefault(key, options[key], '1024a');
 });
 }

 result += '>';
 return result;
};

module.exports.iXmlNodeDataClose = () => '</data>';

module.exports.iXmlNodeCmdOpen = (xexec, xhex, xbefore, xafter, xerror) => `<cmd${iXmlAttrDefault('exec', xexec, 'system')}${iXmlAttrDefault('hex', xhex, '')}${iXmlAttrDefault('before', xbefore, '')}${iXmlAttrDefault('after', xafter, '')}${iXmlAttrDefault('error', xerror, 'fast')}>`;

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
refactor: Remove ixml refs in ProgramCall by abmusse · Pull Request #104 · IBM/nodejs-itoolkit · GitHub
Skip to content
refactor: Remove ixml refs in ProgramCall#104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

abmusse
merged 1 commit into

from

Feb 21, 2020
 Merged


refactor: Remove ixml refs in ProgramCall
#104
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 13 additions & 1 deletion
lib/Deprecated.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@
// previous versions, but will throw a warning message. When we no longer want to support calling
// these methods through these deprecated class names, we can simple disable this file.

/* eslint-disable max-classes-per-file */

const deprecate = require('depd');

const iPgmDeprecate = deprecate('iPgm');
Expand DownExpand Up@@ -66,6 +68,11 @@ class iPgm {
 * @param {*} inDs
 */
 addParam(data, type, options, inDs) {
 if (!Array.isArray(data) && !type) {
 iPgmDeprecate('defaulting parameter type to 1024a has been deprecated. You should specify a type instead.');
 // eslint-disable-next-line no-param-reassign
 type = '1024a';
 }
 iPgmDeprecate('As of v1.0, \'iPgm.addParam()\' is deprecated. Please use \'ProgramCall.addParam()\' instead.');
 return this.ProgramCall.addParam(data, type, options, inDs);
 }
Expand All@@ -76,7 +83,12 @@ class iPgm {
 * @param {string} type
 * @param {object} [options]
 */
 addReturn(data, type, options) {
 addReturn(data, type = '1024a', options) {
 if (!type) {
 iPgmDeprecate('defaulting return type to 1024a has been deprecated. You should specify a type instead.');
 // eslint-disable-next-line no-param-reassign
 type = '1024a';
 }
 iPgmDeprecate('As of v1.0, \'iPgm.addReturn()\' is deprecated. Please use \'ProgramCall.addParam()\' instead.');
 return this.ProgramCall.addReturn(data, type, options);
 }
Expand Down

70 changes: 44 additions & 26 deletions
lib/ProgramCall.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,25 +16,18 @@
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

const iXml = require('./ixml');

class ProgramCall {
 /**
 * @description creates a new ProgramCall object
 * @constructor
 * @param {string} program
 * @param {object} [options]
 */
 constructor(program, options) {
 if (options && typeof options === 'object') {
 // add options if they exist, or empty string if they don't
 this.xml = iXml.iXmlNodePgmOpen(program,
 options.lib !== undefined ? options.lib : '',
 options.func !== undefined ? options.func : '',
 options.error !== undefined ? options.error : '');
 } else {
 this.xml = iXml.iXmlNodePgmOpen(program, '', '', '');
 }
 constructor(program, options = {}) {
 this.xml = `<pgm name='${program}'`;
 if (options.lib) this.xml += ` lib='${options.lib}'`;
 if (options.func) this.xml += ` func='${options.func}'`;
 this.xml += ` error='${options.error || 'fast'}'>`;
 }

 /**
Expand All@@ -51,28 +44,46 @@ class ProgramCall {
 opt = type;
 } else {
 opt = options;
Comment thread
kadler marked this conversation as resolved.

 if (!type) {
 throw new Error('Specifying the parameter type is required.');
 }
 }

 if (!inDs) { // In recursive mode, if it is an element in DS, then no <parm> or </parm> needed.
 this.xml += iXml.iXmlNodeParmOpen(opt);
 this.xml += '<parm';
 if (opt && typeof opt === 'object') { // append <param> options
 if (opt.io) { this.xml += ` io='${opt.io}'`; }
 if (opt.by) { this.xml += ` by='${opt.by}'`; }
 }
 this.xml += '>';
 }

 if (Array.isArray(data)) { // If it is a struct parameter, recursivly parse its children.
 if (opt) {
 this.xml += iXml.iXmlNodeDsOpen(opt.dim, opt.dou, opt.len, opt.data);
 } else {
 this.xml += iXml.iXmlNodeDsOpen('', '', '', '');
 if (Array.isArray(data)) { // If it is a struct parameter, recursively parse its children.
 this.xml += '<ds';
 if (opt && typeof opt === 'object') { // append <ds> options
 if (opt.dim) { this.xml += ` dim='${opt.dim}'`; }
 if (opt.dou) { this.xml += ` dou='${opt.dou}'`; }
 if (opt.len) { this.xml += ` len='${opt.len}'`; }
 if (opt.data) { this.xml += ` data='${opt.data}'`; }
 }
 this.xml += '>';

 for (let i = 0; i < data.length; i += 1) {
 this.addParam(data[i][0], data[i][1], data[i][2], true);
 }
 this.xml += iXml.iXmlNodeDsClose();
 this.xml += '</ds>';
 } else { // A simple parameter
 this.xml += iXml.iXmlNodeDataOpen(type, opt) + data + iXml.iXmlNodeDataClose();
 this.xml += `<data type='${type}'`;
 if (opt && typeof opt === 'object') { // append <data> options
 Object.keys(opt).forEach((key) => {
 this.xml += ` ${key}='${opt[key]}'`;
 });
 }
 this.xml += `>${data}</data>`;
 }

 if (!inDs) { // In recursive mode, if it is an element in DS, then no <parm> or </parm> needed.
 this.xml += iXml.iXmlNodeParmClose();
 this.xml += '</parm>';
 }
 }

Expand All@@ -83,21 +94,28 @@ class ProgramCall {
 * @param {object} [options]
 */
 addReturn(data, type, options = null) {
 this.xml += iXml.iXmlNodeReturnOpen();
 if (!type) {
 throw new Error('Specifying the return type is required.');
 }
 this.xml += '<return>';

 if (options && typeof options === 'object') {
 this.xml += iXml.iXmlNodeDataOpen(type, options);
 this.xml += `<data type='${type}'`;
 Object.keys(options).forEach((key) => {
 this.xml += ` ${key}='${options[key]}'`;
 });
 } else {
 this.xml += iXml.iXmlNodeDataOpen(type);
 this.xml += `<data type='${type}'`;
 }
 this.xml += data + iXml.iXmlNodeDataClose() + iXml.iXmlNodeReturnClose();
 this.xml += `>${data}</data></return>`;
 }

 /**
 * @description returns the current program XML
 * @returns {string} - the generated program XML
 */
 toXML() {
 return this.xml + iXml.iXmlNodePgmClose();
 return `${this.xml}</pgm>`;
 }
}

Expand Down

29 changes: 0 additions & 29 deletions
lib/ixml.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,49 +35,20 @@ module.exports.iXmlNodeScriptOpen = () => '<myscript>';

module.exports.iXmlNodeScriptClose = () => '</myscript>';

module.exports.iXmlNodePgmOpen = (xname, xlib, xfunc, xerror) => `<pgm${iXmlAttrDefault('name', xname, 'undefined')}${iXmlAttrDefault('lib', xlib, '')}${iXmlAttrDefault('func', xfunc, '')}${iXmlAttrDefault('error', xerror, 'fast')}>`;

module.exports.iXmlNodePgmClose = () => '</pgm>';

module.exports.iXmlNodeParmOpen = (opt) => {
 if (!(opt && typeof opt === 'object')) {
 return '<parm>';
 }

 const io = (opt.io) ? iXmlAttrDefault('io', opt.io, '') : '';
 const by = (opt.by) ? iXmlAttrDefault('by', opt.by, '') : '';

 return `<parm${io}${by}>`;
};

module.exports.iXmlNodeParmClose = () => '</parm>';

module.exports.iXmlNodeReturnOpen = () => '<return>';

module.exports.iXmlNodeReturnClose = () => '</return>';

module.exports.iXmlNodeOverlayOpen = (xio, xoffset, xtop) => `<overlay${iXmlAttrDefault('io', xio, 'both')}${iXmlAttrDefault('offset', xoffset, '')}${iXmlAttrDefault('top', xtop, '')}>`;

module.exports.iXmlNodeOverlayClose = () => '</overlay>';

module.exports.iXmlNodeDsOpen = (xdim, xdou, xlen, xdata) => `<ds${iXmlAttrDefault('dim', xdim, '')}${iXmlAttrDefault('dou', xdou, '')}${iXmlAttrDefault('len', xlen, '')}${iXmlAttrDefault('data', xdata, '')}>`;

module.exports.iXmlNodeDsClose = () => '</ds>';

module.exports.iXmlNodeDataOpen = (xtype, options) => {
 let result = `<data${iXmlAttrDefault('type', xtype, '1024a')}`;

 if (options && typeof options === 'object') {
 Object.keys(options).forEach((key) => {
 result += iXmlAttrDefault(key, options[key], '1024a');
 });
 }

 result += '>';
 return result;
};

module.exports.iXmlNodeDataClose = () => '</data>';

module.exports.iXmlNodeCmdOpen = (xexec, xhex, xbefore, xafter, xerror) => `<cmd${iXmlAttrDefault('exec', xexec, 'system')}${iXmlAttrDefault('hex', xhex, '')}${iXmlAttrDefault('before', xbefore, '')}${iXmlAttrDefault('after', xafter, '')}${iXmlAttrDefault('error', xerror, 'fast')}>`;

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
refactor: Remove ixml refs in ProgramCall by abmusse · Pull Request #104 · IBM/nodejs-itoolkit · GitHub
Skip to content
refactor: Remove ixml refs in ProgramCall#104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

abmusse
merged 1 commit into

from

Feb 21, 2020
 Merged


refactor: Remove ixml refs in ProgramCall
#104
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 13 additions & 1 deletion
lib/Deprecated.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@
// previous versions, but will throw a warning message. When we no longer want to support calling
// these methods through these deprecated class names, we can simple disable this file.

/* eslint-disable max-classes-per-file */

const deprecate = require('depd');

const iPgmDeprecate = deprecate('iPgm');
Expand DownExpand Up@@ -66,6 +68,11 @@ class iPgm {
 * @param {*} inDs
 */
 addParam(data, type, options, inDs) {
 if (!Array.isArray(data) && !type) {
 iPgmDeprecate('defaulting parameter type to 1024a has been deprecated. You should specify a type instead.');
 // eslint-disable-next-line no-param-reassign
 type = '1024a';
 }
 iPgmDeprecate('As of v1.0, \'iPgm.addParam()\' is deprecated. Please use \'ProgramCall.addParam()\' instead.');
 return this.ProgramCall.addParam(data, type, options, inDs);
 }
Expand All@@ -76,7 +83,12 @@ class iPgm {
 * @param {string} type
 * @param {object} [options]
 */
 addReturn(data, type, options) {
 addReturn(data, type = '1024a', options) {
 if (!type) {
 iPgmDeprecate('defaulting return type to 1024a has been deprecated. You should specify a type instead.');
 // eslint-disable-next-line no-param-reassign
 type = '1024a';
 }
 iPgmDeprecate('As of v1.0, \'iPgm.addReturn()\' is deprecated. Please use \'ProgramCall.addParam()\' instead.');
 return this.ProgramCall.addReturn(data, type, options);
 }
Expand Down

70 changes: 44 additions & 26 deletions
lib/ProgramCall.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,25 +16,18 @@
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

const iXml = require('./ixml');

class ProgramCall {
 /**
 * @description creates a new ProgramCall object
 * @constructor
 * @param {string} program
 * @param {object} [options]
 */
 constructor(program, options) {
 if (options && typeof options === 'object') {
 // add options if they exist, or empty string if they don't
 this.xml = iXml.iXmlNodePgmOpen(program,
 options.lib !== undefined ? options.lib : '',
 options.func !== undefined ? options.func : '',
 options.error !== undefined ? options.error : '');
 } else {
 this.xml = iXml.iXmlNodePgmOpen(program, '', '', '');
 }
 constructor(program, options = {}) {
 this.xml = `<pgm name='${program}'`;
 if (options.lib) this.xml += ` lib='${options.lib}'`;
 if (options.func) this.xml += ` func='${options.func}'`;
 this.xml += ` error='${options.error || 'fast'}'>`;
 }

 /**
Expand All@@ -51,28 +44,46 @@ class ProgramCall {
 opt = type;
 } else {
 opt = options;
Comment thread
kadler marked this conversation as resolved.

 if (!type) {
 throw new Error('Specifying the parameter type is required.');
 }
 }

 if (!inDs) { // In recursive mode, if it is an element in DS, then no <parm> or </parm> needed.
 this.xml += iXml.iXmlNodeParmOpen(opt);
 this.xml += '<parm';
 if (opt && typeof opt === 'object') { // append <param> options
 if (opt.io) { this.xml += ` io='${opt.io}'`; }
 if (opt.by) { this.xml += ` by='${opt.by}'`; }
 }
 this.xml += '>';
 }

 if (Array.isArray(data)) { // If it is a struct parameter, recursivly parse its children.
 if (opt) {
 this.xml += iXml.iXmlNodeDsOpen(opt.dim, opt.dou, opt.len, opt.data);
 } else {
 this.xml += iXml.iXmlNodeDsOpen('', '', '', '');
 if (Array.isArray(data)) { // If it is a struct parameter, recursively parse its children.
 this.xml += '<ds';
 if (opt && typeof opt === 'object') { // append <ds> options
 if (opt.dim) { this.xml += ` dim='${opt.dim}'`; }
 if (opt.dou) { this.xml += ` dou='${opt.dou}'`; }
 if (opt.len) { this.xml += ` len='${opt.len}'`; }
 if (opt.data) { this.xml += ` data='${opt.data}'`; }
 }
 this.xml += '>';

 for (let i = 0; i < data.length; i += 1) {
 this.addParam(data[i][0], data[i][1], data[i][2], true);
 }
 this.xml += iXml.iXmlNodeDsClose();
 this.xml += '</ds>';
 } else { // A simple parameter
 this.xml += iXml.iXmlNodeDataOpen(type, opt) + data + iXml.iXmlNodeDataClose();
 this.xml += `<data type='${type}'`;
 if (opt && typeof opt === 'object') { // append <data> options
 Object.keys(opt).forEach((key) => {
 this.xml += ` ${key}='${opt[key]}'`;
 });
 }
 this.xml += `>${data}</data>`;
 }

 if (!inDs) { // In recursive mode, if it is an element in DS, then no <parm> or </parm> needed.
 this.xml += iXml.iXmlNodeParmClose();
 this.xml += '</parm>';
 }
 }

Expand All@@ -83,21 +94,28 @@ class ProgramCall {
 * @param {object} [options]
 */
 addReturn(data, type, options = null) {
 this.xml += iXml.iXmlNodeReturnOpen();
 if (!type) {
 throw new Error('Specifying the return type is required.');
 }
 this.xml += '<return>';

 if (options && typeof options === 'object') {
 this.xml += iXml.iXmlNodeDataOpen(type, options);
 this.xml += `<data type='${type}'`;
 Object.keys(options).forEach((key) => {
 this.xml += ` ${key}='${options[key]}'`;
 });
 } else {
 this.xml += iXml.iXmlNodeDataOpen(type);
 this.xml += `<data type='${type}'`;
 }
 this.xml += data + iXml.iXmlNodeDataClose() + iXml.iXmlNodeReturnClose();
 this.xml += `>${data}</data></return>`;
 }

 /**
 * @description returns the current program XML
 * @returns {string} - the generated program XML
 */
 toXML() {
 return this.xml + iXml.iXmlNodePgmClose();
 return `${this.xml}</pgm>`;
 }
}

Expand Down

29 changes: 0 additions & 29 deletions
lib/ixml.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,49 +35,20 @@ module.exports.iXmlNodeScriptOpen = () => '<myscript>';

module.exports.iXmlNodeScriptClose = () => '</myscript>';

module.exports.iXmlNodePgmOpen = (xname, xlib, xfunc, xerror) => `<pgm${iXmlAttrDefault('name', xname, 'undefined')}${iXmlAttrDefault('lib', xlib, '')}${iXmlAttrDefault('func', xfunc, '')}${iXmlAttrDefault('error', xerror, 'fast')}>`;

module.exports.iXmlNodePgmClose = () => '</pgm>';

module.exports.iXmlNodeParmOpen = (opt) => {
 if (!(opt && typeof opt === 'object')) {
 return '<parm>';
 }

 const io = (opt.io) ? iXmlAttrDefault('io', opt.io, '') : '';
 const by = (opt.by) ? iXmlAttrDefault('by', opt.by, '') : '';

 return `<parm${io}${by}>`;
};

module.exports.iXmlNodeParmClose = () => '</parm>';

module.exports.iXmlNodeReturnOpen = () => '<return>';

module.exports.iXmlNodeReturnClose = () => '</return>';

module.exports.iXmlNodeOverlayOpen = (xio, xoffset, xtop) => `<overlay${iXmlAttrDefault('io', xio, 'both')}${iXmlAttrDefault('offset', xoffset, '')}${iXmlAttrDefault('top', xtop, '')}>`;

module.exports.iXmlNodeOverlayClose = () => '</overlay>';

module.exports.iXmlNodeDsOpen = (xdim, xdou, xlen, xdata) => `<ds${iXmlAttrDefault('dim', xdim, '')}${iXmlAttrDefault('dou', xdou, '')}${iXmlAttrDefault('len', xlen, '')}${iXmlAttrDefault('data', xdata, '')}>`;

module.exports.iXmlNodeDsClose = () => '</ds>';

module.exports.iXmlNodeDataOpen = (xtype, options) => {
 let result = `<data${iXmlAttrDefault('type', xtype, '1024a')}`;

 if (options && typeof options === 'object') {
 Object.keys(options).forEach((key) => {
 result += iXmlAttrDefault(key, options[key], '1024a');
 });
 }

 result += '>';
 return result;
};

module.exports.iXmlNodeDataClose = () => '</data>';

module.exports.iXmlNodeCmdOpen = (xexec, xhex, xbefore, xafter, xerror) => `<cmd${iXmlAttrDefault('exec', xexec, 'system')}${iXmlAttrDefault('hex', xhex, '')}${iXmlAttrDefault('before', xbefore, '')}${iXmlAttrDefault('after', xafter, '')}${iXmlAttrDefault('error', xerror, 'fast')}>`;

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
refactor: Remove ixml refs in ProgramCall by abmusse · Pull Request #104 · IBM/nodejs-itoolkit · GitHub
Skip to content
refactor: Remove ixml refs in ProgramCall#104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

abmusse
merged 1 commit into

from

Feb 21, 2020
 Merged


refactor: Remove ixml refs in ProgramCall
#104
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 13 additions & 1 deletion
lib/Deprecated.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@
// previous versions, but will throw a warning message. When we no longer want to support calling
// these methods through these deprecated class names, we can simple disable this file.

/* eslint-disable max-classes-per-file */

const deprecate = require('depd');

const iPgmDeprecate = deprecate('iPgm');
Expand DownExpand Up@@ -66,6 +68,11 @@ class iPgm {
 * @param {*} inDs
 */
 addParam(data, type, options, inDs) {
 if (!Array.isArray(data) && !type) {
 iPgmDeprecate('defaulting parameter type to 1024a has been deprecated. You should specify a type instead.');
 // eslint-disable-next-line no-param-reassign
 type = '1024a';
 }
 iPgmDeprecate('As of v1.0, \'iPgm.addParam()\' is deprecated. Please use \'ProgramCall.addParam()\' instead.');
 return this.ProgramCall.addParam(data, type, options, inDs);
 }
Expand All@@ -76,7 +83,12 @@ class iPgm {
 * @param {string} type
 * @param {object} [options]
 */
 addReturn(data, type, options) {
 addReturn(data, type = '1024a', options) {
 if (!type) {
 iPgmDeprecate('defaulting return type to 1024a has been deprecated. You should specify a type instead.');
 // eslint-disable-next-line no-param-reassign
 type = '1024a';
 }
 iPgmDeprecate('As of v1.0, \'iPgm.addReturn()\' is deprecated. Please use \'ProgramCall.addParam()\' instead.');
 return this.ProgramCall.addReturn(data, type, options);
 }
Expand Down

70 changes: 44 additions & 26 deletions
lib/ProgramCall.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,25 +16,18 @@
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

const iXml = require('./ixml');

class ProgramCall {
 /**
 * @description creates a new ProgramCall object
 * @constructor
 * @param {string} program
 * @param {object} [options]
 */
 constructor(program, options) {
 if (options && typeof options === 'object') {
 // add options if they exist, or empty string if they don't
 this.xml = iXml.iXmlNodePgmOpen(program,
 options.lib !== undefined ? options.lib : '',
 options.func !== undefined ? options.func : '',
 options.error !== undefined ? options.error : '');
 } else {
 this.xml = iXml.iXmlNodePgmOpen(program, '', '', '');
 }
 constructor(program, options = {}) {
 this.xml = `<pgm name='${program}'`;
 if (options.lib) this.xml += ` lib='${options.lib}'`;
 if (options.func) this.xml += ` func='${options.func}'`;
 this.xml += ` error='${options.error || 'fast'}'>`;
 }

 /**
Expand All@@ -51,28 +44,46 @@ class ProgramCall {
 opt = type;
 } else {
 opt = options;
Comment thread
kadler marked this conversation as resolved.

 if (!type) {
 throw new Error('Specifying the parameter type is required.');
 }
 }

 if (!inDs) { // In recursive mode, if it is an element in DS, then no <parm> or </parm> needed.
 this.xml += iXml.iXmlNodeParmOpen(opt);
 this.xml += '<parm';
 if (opt && typeof opt === 'object') { // append <param> options
 if (opt.io) { this.xml += ` io='${opt.io}'`; }
 if (opt.by) { this.xml += ` by='${opt.by}'`; }
 }
 this.xml += '>';
 }

 if (Array.isArray(data)) { // If it is a struct parameter, recursivly parse its children.
 if (opt) {
 this.xml += iXml.iXmlNodeDsOpen(opt.dim, opt.dou, opt.len, opt.data);
 } else {
 this.xml += iXml.iXmlNodeDsOpen('', '', '', '');
 if (Array.isArray(data)) { // If it is a struct parameter, recursively parse its children.
 this.xml += '<ds';
 if (opt && typeof opt === 'object') { // append <ds> options
 if (opt.dim) { this.xml += ` dim='${opt.dim}'`; }
 if (opt.dou) { this.xml += ` dou='${opt.dou}'`; }
 if (opt.len) { this.xml += ` len='${opt.len}'`; }
 if (opt.data) { this.xml += ` data='${opt.data}'`; }
 }
 this.xml += '>';

 for (let i = 0; i < data.length; i += 1) {
 this.addParam(data[i][0], data[i][1], data[i][2], true);
 }
 this.xml += iXml.iXmlNodeDsClose();
 this.xml += '</ds>';
 } else { // A simple parameter
 this.xml += iXml.iXmlNodeDataOpen(type, opt) + data + iXml.iXmlNodeDataClose();
 this.xml += `<data type='${type}'`;
 if (opt && typeof opt === 'object') { // append <data> options
 Object.keys(opt).forEach((key) => {
 this.xml += ` ${key}='${opt[key]}'`;
 });
 }
 this.xml += `>${data}</data>`;
 }

 if (!inDs) { // In recursive mode, if it is an element in DS, then no <parm> or </parm> needed.
 this.xml += iXml.iXmlNodeParmClose();
 this.xml += '</parm>';
 }
 }

Expand All@@ -83,21 +94,28 @@ class ProgramCall {
 * @param {object} [options]
 */
 addReturn(data, type, options = null) {
 this.xml += iXml.iXmlNodeReturnOpen();
 if (!type) {
 throw new Error('Specifying the return type is required.');
 }
 this.xml += '<return>';

 if (options && typeof options === 'object') {
 this.xml += iXml.iXmlNodeDataOpen(type, options);
 this.xml += `<data type='${type}'`;
 Object.keys(options).forEach((key) => {
 this.xml += ` ${key}='${options[key]}'`;
 });
 } else {
 this.xml += iXml.iXmlNodeDataOpen(type);
 this.xml += `<data type='${type}'`;
 }
 this.xml += data + iXml.iXmlNodeDataClose() + iXml.iXmlNodeReturnClose();
 this.xml += `>${data}</data></return>`;
 }

 /**
 * @description returns the current program XML
 * @returns {string} - the generated program XML
 */
 toXML() {
 return this.xml + iXml.iXmlNodePgmClose();
 return `${this.xml}</pgm>`;
 }
}

Expand Down

29 changes: 0 additions & 29 deletions
lib/ixml.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,49 +35,20 @@ module.exports.iXmlNodeScriptOpen = () => '<myscript>';

module.exports.iXmlNodeScriptClose = () => '</myscript>';

module.exports.iXmlNodePgmOpen = (xname, xlib, xfunc, xerror) => `<pgm${iXmlAttrDefault('name', xname, 'undefined')}${iXmlAttrDefault('lib', xlib, '')}${iXmlAttrDefault('func', xfunc, '')}${iXmlAttrDefault('error', xerror, 'fast')}>`;

module.exports.iXmlNodePgmClose = () => '</pgm>';

module.exports.iXmlNodeParmOpen = (opt) => {
 if (!(opt && typeof opt === 'object')) {
 return '<parm>';
 }

 const io = (opt.io) ? iXmlAttrDefault('io', opt.io, '') : '';
 const by = (opt.by) ? iXmlAttrDefault('by', opt.by, '') : '';

 return `<parm${io}${by}>`;
};

module.exports.iXmlNodeParmClose = () => '</parm>';

module.exports.iXmlNodeReturnOpen = () => '<return>';

module.exports.iXmlNodeReturnClose = () => '</return>';

module.exports.iXmlNodeOverlayOpen = (xio, xoffset, xtop) => `<overlay${iXmlAttrDefault('io', xio, 'both')}${iXmlAttrDefault('offset', xoffset, '')}${iXmlAttrDefault('top', xtop, '')}>`;

module.exports.iXmlNodeOverlayClose = () => '</overlay>';

module.exports.iXmlNodeDsOpen = (xdim, xdou, xlen, xdata) => `<ds${iXmlAttrDefault('dim', xdim, '')}${iXmlAttrDefault('dou', xdou, '')}${iXmlAttrDefault('len', xlen, '')}${iXmlAttrDefault('data', xdata, '')}>`;

module.exports.iXmlNodeDsClose = () => '</ds>';

module.exports.iXmlNodeDataOpen = (xtype, options) => {
 let result = `<data${iXmlAttrDefault('type', xtype, '1024a')}`;

 if (options && typeof options === 'object') {
 Object.keys(options).forEach((key) => {
 result += iXmlAttrDefault(key, options[key], '1024a');
 });
 }

 result += '>';
 return result;
};

module.exports.iXmlNodeDataClose = () => '</data>';

module.exports.iXmlNodeCmdOpen = (xexec, xhex, xbefore, xafter, xerror) => `<cmd${iXmlAttrDefault('exec', xexec, 'system')}${iXmlAttrDefault('hex', xhex, '')}${iXmlAttrDefault('before', xbefore, '')}${iXmlAttrDefault('after', xafter, '')}${iXmlAttrDefault('error', xerror, 'fast')}>`;

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
refactor: Remove ixml refs in ProgramCall by abmusse · Pull Request #104 · IBM/nodejs-itoolkit · GitHub
Skip to content
refactor: Remove ixml refs in ProgramCall#104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

abmusse
merged 1 commit into

from

Feb 21, 2020
 Merged


refactor: Remove ixml refs in ProgramCall
#104
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 13 additions & 1 deletion
lib/Deprecated.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@
// previous versions, but will throw a warning message. When we no longer want to support calling
// these methods through these deprecated class names, we can simple disable this file.

/* eslint-disable max-classes-per-file */

const deprecate = require('depd');

const iPgmDeprecate = deprecate('iPgm');
Expand DownExpand Up@@ -66,6 +68,11 @@ class iPgm {
 * @param {*} inDs
 */
 addParam(data, type, options, inDs) {
 if (!Array.isArray(data) && !type) {
 iPgmDeprecate('defaulting parameter type to 1024a has been deprecated. You should specify a type instead.');
 // eslint-disable-next-line no-param-reassign
 type = '1024a';
 }
 iPgmDeprecate('As of v1.0, \'iPgm.addParam()\' is deprecated. Please use \'ProgramCall.addParam()\' instead.');
 return this.ProgramCall.addParam(data, type, options, inDs);
 }
Expand All@@ -76,7 +83,12 @@ class iPgm {
 * @param {string} type
 * @param {object} [options]
 */
 addReturn(data, type, options) {
 addReturn(data, type = '1024a', options) {
 if (!type) {
 iPgmDeprecate('defaulting return type to 1024a has been deprecated. You should specify a type instead.');
 // eslint-disable-next-line no-param-reassign
 type = '1024a';
 }
 iPgmDeprecate('As of v1.0, \'iPgm.addReturn()\' is deprecated. Please use \'ProgramCall.addParam()\' instead.');
 return this.ProgramCall.addReturn(data, type, options);
 }
Expand Down

70 changes: 44 additions & 26 deletions
lib/ProgramCall.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,25 +16,18 @@
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

const iXml = require('./ixml');

class ProgramCall {
 /**
 * @description creates a new ProgramCall object
 * @constructor
 * @param {string} program
 * @param {object} [options]
 */
 constructor(program, options) {
 if (options && typeof options === 'object') {
 // add options if they exist, or empty string if they don't
 this.xml = iXml.iXmlNodePgmOpen(program,
 options.lib !== undefined ? options.lib : '',
 options.func !== undefined ? options.func : '',
 options.error !== undefined ? options.error : '');
 } else {
 this.xml = iXml.iXmlNodePgmOpen(program, '', '', '');
 }
 constructor(program, options = {}) {
 this.xml = `<pgm name='${program}'`;
 if (options.lib) this.xml += ` lib='${options.lib}'`;
 if (options.func) this.xml += ` func='${options.func}'`;
 this.xml += ` error='${options.error || 'fast'}'>`;
 }

 /**
Expand All@@ -51,28 +44,46 @@ class ProgramCall {
 opt = type;
 } else {
 opt = options;
Comment thread
kadler marked this conversation as resolved.

 if (!type) {
 throw new Error('Specifying the parameter type is required.');
 }
 }

 if (!inDs) { // In recursive mode, if it is an element in DS, then no <parm> or </parm> needed.
 this.xml += iXml.iXmlNodeParmOpen(opt);
 this.xml += '<parm';
 if (opt && typeof opt === 'object') { // append <param> options
 if (opt.io) { this.xml += ` io='${opt.io}'`; }
 if (opt.by) { this.xml += ` by='${opt.by}'`; }
 }
 this.xml += '>';
 }

 if (Array.isArray(data)) { // If it is a struct parameter, recursivly parse its children.
 if (opt) {
 this.xml += iXml.iXmlNodeDsOpen(opt.dim, opt.dou, opt.len, opt.data);
 } else {
 this.xml += iXml.iXmlNodeDsOpen('', '', '', '');
 if (Array.isArray(data)) { // If it is a struct parameter, recursively parse its children.
 this.xml += '<ds';
 if (opt && typeof opt === 'object') { // append <ds> options
 if (opt.dim) { this.xml += ` dim='${opt.dim}'`; }
 if (opt.dou) { this.xml += ` dou='${opt.dou}'`; }
 if (opt.len) { this.xml += ` len='${opt.len}'`; }
 if (opt.data) { this.xml += ` data='${opt.data}'`; }
 }
 this.xml += '>';

 for (let i = 0; i < data.length; i += 1) {
 this.addParam(data[i][0], data[i][1], data[i][2], true);
 }
 this.xml += iXml.iXmlNodeDsClose();
 this.xml += '</ds>';
 } else { // A simple parameter
 this.xml += iXml.iXmlNodeDataOpen(type, opt) + data + iXml.iXmlNodeDataClose();
 this.xml += `<data type='${type}'`;
 if (opt && typeof opt === 'object') { // append <data> options
 Object.keys(opt).forEach((key) => {
 this.xml += ` ${key}='${opt[key]}'`;
 });
 }
 this.xml += `>${data}</data>`;
 }

 if (!inDs) { // In recursive mode, if it is an element in DS, then no <parm> or </parm> needed.
 this.xml += iXml.iXmlNodeParmClose();
 this.xml += '</parm>';
 }
 }

Expand All@@ -83,21 +94,28 @@ class ProgramCall {
 * @param {object} [options]
 */
 addReturn(data, type, options = null) {
 this.xml += iXml.iXmlNodeReturnOpen();
 if (!type) {
 throw new Error('Specifying the return type is required.');
 }
 this.xml += '<return>';

 if (options && typeof options === 'object') {
 this.xml += iXml.iXmlNodeDataOpen(type, options);
 this.xml += `<data type='${type}'`;
 Object.keys(options).forEach((key) => {
 this.xml += ` ${key}='${options[key]}'`;
 });
 } else {
 this.xml += iXml.iXmlNodeDataOpen(type);
 this.xml += `<data type='${type}'`;
 }
 this.xml += data + iXml.iXmlNodeDataClose() + iXml.iXmlNodeReturnClose();
 this.xml += `>${data}</data></return>`;
 }

 /**
 * @description returns the current program XML
 * @returns {string} - the generated program XML
 */
 toXML() {
 return this.xml + iXml.iXmlNodePgmClose();
 return `${this.xml}</pgm>`;
 }
}

Expand Down

29 changes: 0 additions & 29 deletions
lib/ixml.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,49 +35,20 @@ module.exports.iXmlNodeScriptOpen = () => '<myscript>';

module.exports.iXmlNodeScriptClose = () => '</myscript>';

module.exports.iXmlNodePgmOpen = (xname, xlib, xfunc, xerror) => `<pgm${iXmlAttrDefault('name', xname, 'undefined')}${iXmlAttrDefault('lib', xlib, '')}${iXmlAttrDefault('func', xfunc, '')}${iXmlAttrDefault('error', xerror, 'fast')}>`;

module.exports.iXmlNodePgmClose = () => '</pgm>';

module.exports.iXmlNodeParmOpen = (opt) => {
 if (!(opt && typeof opt === 'object')) {
 return '<parm>';
 }

 const io = (opt.io) ? iXmlAttrDefault('io', opt.io, '') : '';
 const by = (opt.by) ? iXmlAttrDefault('by', opt.by, '') : '';

 return `<parm${io}${by}>`;
};

module.exports.iXmlNodeParmClose = () => '</parm>';

module.exports.iXmlNodeReturnOpen = () => '<return>';

module.exports.iXmlNodeReturnClose = () => '</return>';

module.exports.iXmlNodeOverlayOpen = (xio, xoffset, xtop) => `<overlay${iXmlAttrDefault('io', xio, 'both')}${iXmlAttrDefault('offset', xoffset, '')}${iXmlAttrDefault('top', xtop, '')}>`;

module.exports.iXmlNodeOverlayClose = () => '</overlay>';

module.exports.iXmlNodeDsOpen = (xdim, xdou, xlen, xdata) => `<ds${iXmlAttrDefault('dim', xdim, '')}${iXmlAttrDefault('dou', xdou, '')}${iXmlAttrDefault('len', xlen, '')}${iXmlAttrDefault('data', xdata, '')}>`;

module.exports.iXmlNodeDsClose = () => '</ds>';

module.exports.iXmlNodeDataOpen = (xtype, options) => {
 let result = `<data${iXmlAttrDefault('type', xtype, '1024a')}`;

 if (options && typeof options === 'object') {
 Object.keys(options).forEach((key) => {
 result += iXmlAttrDefault(key, options[key], '1024a');
 });
 }

 result += '>';
 return result;
};

module.exports.iXmlNodeDataClose = () => '</data>';

module.exports.iXmlNodeCmdOpen = (xexec, xhex, xbefore, xafter, xerror) => `<cmd${iXmlAttrDefault('exec', xexec, 'system')}${iXmlAttrDefault('hex', xhex, '')}${iXmlAttrDefault('before', xbefore, '')}${iXmlAttrDefault('after', xafter, '')}${iXmlAttrDefault('error', xerror, 'fast')}>`;

Expand Down