@blazedpath/commons 0.0.9 → 0.0.10

package/blz-base/index.js

@@ -536,7 +536,7 @@ module.exports = {
 		},
 		transform: async function (callContext, transformationName, source, writer) {
 			let transformation = _metadata[transformationName];
-			let transformationExecutor = require('../sources/' + transformation.sourceFileName);
+			let transformationExecutor = require(Path.join(_metadata.appPath,'../sources/', transformation.sourceFileName));
 			if (source) {
 				if (source._blz_reader) { // reader
 					let reader = source;
@@ -579,7 +579,7 @@ module.exports = {
 		writer: function (callContext, functionName, extraArgs) {
 			let fn
 			try {
-				fn = require('../sources/' + module.exports.ensureDashedFormat(functionName) + '.js')
+				fn = require(Path.join(_metadata.appPath,'../sources/',module.exports.ensureDashedFormat(functionName) + '.js'))
 			}
 			catch (err) {
 				throw this.error('InvalidFunction', { functionName: functionName });
@@ -742,7 +742,7 @@ module.exports = {
 		internalCall: async function (callContext, functionName, args) {
 			let fn = null;
 			try {
-				fn = require('../sources/' + module.exports.ensureDashedFormat(functionName) + '.js')
+				fn = require(Path.join(_metadata.appPath,'../sources/', module.exports.ensureDashedFormat(functionName) + '.js'))
 			}
 			catch (err) {
 				throw this.error('InvalidFunction', { functionName: functionName });

package/blz-rds-mysql/index.js

@@ -18,26 +18,26 @@ process.on('exit', async function () {
 });
 
 module.exports = {
-    Backend: {
-        syntaxis: require("./syntaxis.json"),
-        executeProcedure,
-        executeSql: async function (connection, sql, parameters, options = {}) {
-            if (sql.indexOf("call") != -1) {
-                return await executeProcedure(connection, sql, parameters);
-            } else if (_.has(options, "bulkInsert")) {
-                return await executeBulkInsert(connection, sql, parameters, options);
-            } else if (_.has(options, "bulkMerge")) {
-                return await executeBulkMerge(connection, sql, parameters, options);
-            } else if (_.has(options, "queryOne") || _.has(options, "query")) {
-                return await executeQuery(connection, sql, parameters, options);
-            } else {
-                return await executeNonQuery(connection, sql, parameters, options);
-            }
-        },
-        beginTransaction,
-        close,
-        createRdsConnection,
-        commitTransaction,
-        rollbackTransaction,
-    }
+
+    syntaxis: require("./syntaxis.json"),
+    executeProcedure,
+    executeSql: async function (connection, sql, parameters, options = {}) {
+        if (sql.indexOf("call") != -1) {
+            return await executeProcedure(connection, sql, parameters);
+        } else if (_.has(options, "bulkInsert")) {
+            return await executeBulkInsert(connection, sql, parameters, options);
+        } else if (_.has(options, "bulkMerge")) {
+            return await executeBulkMerge(connection, sql, parameters, options);
+        } else if (_.has(options, "queryOne") || _.has(options, "query")) {
+            return await executeQuery(connection, sql, parameters, options);
+        } else {
+            return await executeNonQuery(connection, sql, parameters, options);
+        }
+    },
+    beginTransaction,
+    close,
+    createRdsConnection,
+    commitTransaction,
+    rollbackTransaction,
+
 }

package/blz-rds-mysqlx/index.js

@@ -18,26 +18,26 @@ process.on('exit', async function () {
 });
 
 module.exports = {
-    Backend: {
-        syntaxis: require("./syntaxis.json"),
-        executeProcedure,
-        executeSql: async function (connection, sql, parameters, options = {}) {
-            if (sql.indexOf("call") != -1) {
-                return await executeProcedure(connection, sql, parameters);
-            } else if (_.has(options, "bulkInsert")) {
-                return await executeBulkInsert(connection, sql, parameters, options);
-            } else if (_.has(options, "bulkMerge")) {
-                return await executeBulkMerge(connection, sql, parameters, options);
-            } else if (_.has(options, "queryOne") || _.has(options, "query")) {
-                return await executeQuery(connection, sql, parameters, options);
-            } else {
-                return await executeNonQuery(connection, sql, parameters, options);
-            }
-        },
-        beginTransaction,
-        close,
-        createRdsConnection,
-        commitTransaction,
-        rollbackTransaction
-    }
+
+    syntaxis: require("./syntaxis.json"),
+    executeProcedure,
+    executeSql: async function (connection, sql, parameters, options = {}) {
+        if (sql.indexOf("call") != -1) {
+            return await executeProcedure(connection, sql, parameters);
+        } else if (_.has(options, "bulkInsert")) {
+            return await executeBulkInsert(connection, sql, parameters, options);
+        } else if (_.has(options, "bulkMerge")) {
+            return await executeBulkMerge(connection, sql, parameters, options);
+        } else if (_.has(options, "queryOne") || _.has(options, "query")) {
+            return await executeQuery(connection, sql, parameters, options);
+        } else {
+            return await executeNonQuery(connection, sql, parameters, options);
+        }
+    },
+    beginTransaction,
+    close,
+    createRdsConnection,
+    commitTransaction,
+    rollbackTransaction
+
 }

package/blz-rds-oracle/index.js

@@ -354,191 +354,191 @@ const rowsToArray = function (columns, rows) {
 }
 
 module.exports = {
-    Backend: {
-        syntaxis: require('./syntaxis.json'),
-        createRdsConnection: async function (connection) {
-            try {
-                let oraPool = await getPool(connection);
-                let oraConnection = await oraPool.getConnection();
-                return oraConnection;
-            }
-            catch (err) {
-                throw err;
-            }
-        },
-        executeSql: async function (connection, sql, parameters, options) {
-            if (_.has(options, "bulkInsert")) {
-                return await this._executeBulkInsert(connection, sql, parameters, options);
-            } else if (_.has(options, "bulkMerge")) {
-                return await this._executeBulkMerge(connection, sql, parameters, options);
-            } else {
-                return await this._executeSql(connection, sql, parameters, options);
-            }
-        },
-        _executeSql: async function (connection, sql, parameters, options) {
-            try {
-                let oraParameters = getOraParameters(parameters, options);
-                let oraOptions = getOraOptions(options)
-                let oraResult = await connection.execute(sql, oraParameters, oraOptions);
-                const result = await getResult(parameters, oraResult, options);
-                return result;
-            } catch (err) {
-                throw err
-            }
-        },
-        _executeBulkInsert: async function (connection, sql, rows, options) {
-            let autoincremental = null
-            if (options.autoincrementalData && options.autoincrementalData.pkColumnName) {
-                autoincremental = {
-                    name: options.autoincrementalData.pkColumnName,
-                    alias: options.autoincrementalData.pkColumnAlias,
-                    sequence: options.autoincrementalData.sequenceName,
-                    type: options.autoincrementalData.pkColumnType
-                }
+
+    syntaxis: require('./syntaxis.json'),
+    createRdsConnection: async function (connection) {
+        try {
+            let oraPool = await getPool(connection);
+            let oraConnection = await oraPool.getConnection();
+            return oraConnection;
+        }
+        catch (err) {
+            throw err;
+        }
+    },
+    executeSql: async function (connection, sql, parameters, options) {
+        if (_.has(options, "bulkInsert")) {
+            return await this._executeBulkInsert(connection, sql, parameters, options);
+        } else if (_.has(options, "bulkMerge")) {
+            return await this._executeBulkMerge(connection, sql, parameters, options);
+        } else {
+            return await this._executeSql(connection, sql, parameters, options);
+        }
+    },
+    _executeSql: async function (connection, sql, parameters, options) {
+        try {
+            let oraParameters = getOraParameters(parameters, options);
+            let oraOptions = getOraOptions(options)
+            let oraResult = await connection.execute(sql, oraParameters, oraOptions);
+            const result = await getResult(parameters, oraResult, options);
+            return result;
+        } catch (err) {
+            throw err
+        }
+    },
+    _executeBulkInsert: async function (connection, sql, rows, options) {
+        let autoincremental = null
+        if (options.autoincrementalData && options.autoincrementalData.pkColumnName) {
+            autoincremental = {
+                name: options.autoincrementalData.pkColumnName,
+                alias: options.autoincrementalData.pkColumnAlias,
+                sequence: options.autoincrementalData.sequenceName,
+                type: options.autoincrementalData.pkColumnType
             }
-            const _sql = autoincremental ?
-                'INSERT INTO ' + options.rdsTable.tableName +
-                ' (' + autoincremental.name + ',' + options.setsFields.join(', ') +
-                ') VALUES ( ' + autoincremental.sequence + '.NEXTVAL, ' + options.setsFields.map((field) => ':' + field).join(', ') + ' ) ' +
-                ' RETURNING ' + autoincremental.name + ' INTO :' + autoincremental.name
-                : sql + '(' + options.setsFields.map((field) => ':' + field).join(', ') + ' ) '
+        }
+        const _sql = autoincremental ?
+            'INSERT INTO ' + options.rdsTable.tableName +
+            ' (' + autoincremental.name + ',' + options.setsFields.join(', ') +
+            ') VALUES ( ' + autoincremental.sequence + '.NEXTVAL, ' + options.setsFields.map((field) => ':' + field).join(', ') + ' ) ' +
+            ' RETURNING ' + autoincremental.name + ' INTO :' + autoincremental.name
+            : sql + '(' + options.setsFields.map((field) => ':' + field).join(', ') + ' ) '
 
-            // solve max size for string fields
-            const columnsCount = options.columns.length
-            for (let i = 0; i < columnsCount; i++) {
-                const column = options.columns[i]
-                if (column.type === 'string') {
-                    column.size = rows.reduce((max, row) => { return !row[i] ? 0 : row[i].length > max ? row[i].length : max }, 0)
-                }
+        // solve max size for string fields
+        const columnsCount = options.columns.length
+        for (let i = 0; i < columnsCount; i++) {
+            const column = options.columns[i]
+            if (column.type === 'string') {
+                column.size = rows.reduce((max, row) => { return !row[i] ? 0 : row[i].length > max ? row[i].length : max }, 0)
             }
-            const bindDefs = {}
-            for (const column of options.columns) {
-                const bindDef = { type: getDbType(column.type) }
-                if (column.type === 'string') {
-                    bindDef.maxSize = column.size
-                }
-                bindDefs[column.name] = bindDef
+        }
+        const bindDefs = {}
+        for (const column of options.columns) {
+            const bindDef = { type: getDbType(column.type) }
+            if (column.type === 'string') {
+                bindDef.maxSize = column.size
             }
+            bindDefs[column.name] = bindDef
+        }
+        if (autoincremental) {
+            bindDefs[autoincremental.name] = { type: getDbType(autoincremental.type), dir: oracledb.BIND_OUT }
+        }
+        const oraOptions = getOraOptions(options, bindDefs)
+        const data = rowsToArray(options.columns, rows)
+        try {
+            const result = await connection.executeMany(_sql, data, oraOptions)
             if (autoincremental) {
-                bindDefs[autoincremental.name] = { type: getDbType(autoincremental.type), dir: oracledb.BIND_OUT }
-            }
-            const oraOptions = getOraOptions(options, bindDefs)
-            const data = rowsToArray(options.columns, rows)
-            try {
-                const result = await connection.executeMany(_sql, data, oraOptions)
-                if (autoincremental) {
-                    const ids = []
-                    for (const i in result.outBinds) {
-                        ids.push(result.outBinds[i][autoincremental.name][0])
-                    }
-                    return { rowsAffected: result.rowsAffected, ids }
-                } else {
-                    return { rowsAffected: result.rowsAffected }
+                const ids = []
+                for (const i in result.outBinds) {
+                    ids.push(result.outBinds[i][autoincremental.name][0])
                 }
-            } catch (err) {
-                console.log(err)
-                throw err
+                return { rowsAffected: result.rowsAffected, ids }
+            } else {
+                return { rowsAffected: result.rowsAffected }
             }
-        },
-        _executeBulkMerge: async function (connection, sql, rows, options) {
-            // example: https://stackoverflow.com/questions/67881781/how-to-execute-multiple-merge-into-query-on-oracle-db-from-node-js
-            let autoincremental = null
-            if (options.autoincrementalData && options.autoincrementalData.pkColumnName) {
-                autoincremental = {
-                    name: options.autoincrementalData.pkColumnName,
-                    alias: options.autoincrementalData.pkColumnAlias,
-                    sequence: options.autoincrementalData.sequenceName,
-                    type: options.autoincrementalData.pkColumnType
-                }
+        } catch (err) {
+            console.log(err)
+            throw err
+        }
+    },
+    _executeBulkMerge: async function (connection, sql, rows, options) {
+        // example: https://stackoverflow.com/questions/67881781/how-to-execute-multiple-merge-into-query-on-oracle-db-from-node-js
+        let autoincremental = null
+        if (options.autoincrementalData && options.autoincrementalData.pkColumnName) {
+            autoincremental = {
+                name: options.autoincrementalData.pkColumnName,
+                alias: options.autoincrementalData.pkColumnAlias,
+                sequence: options.autoincrementalData.sequenceName,
+                type: options.autoincrementalData.pkColumnType
             }
-            const _sql = []
-            _sql.push('MERGE INTO ' + options.rdsTable.tableName + ' t USING (')
-            _sql.push('SELECT ')
-            let first = true
+        }
+        const _sql = []
+        _sql.push('MERGE INTO ' + options.rdsTable.tableName + ' t USING (')
+        _sql.push('SELECT ')
+        let first = true
+        for (const column of options.columns) {
+            _sql.push((first ? '' : ', ') + ':' + column.name + ' AS ' + column.name)
+            first = false
+        }
+        _sql.push('FROM DUAL')
+        _sql.push(') s ON (')
+        first = true
+        for (const field of options.mergeFields) {
+            _sql.push((first ? '' : ' AND ') + 't.' + field + ' = s.' + field)
+            first = false
+        }
+        _sql.push(')')
+        _sql.push('WHEN MATCHED THEN UPDATE SET ')
+        first = true
+        for (const column of options.columns) {
+            if (options.mergeFields.includes(column.name)) continue
+            _sql.push((first ? '' : ',') + 't.' + column.name + ' = s.' + column.name)
+            first = false
+        }
+        _sql.push('WHEN NOT MATCHED THEN INSERT (')
+        if (autoincremental) {
+            _sql.push(autoincremental.name)
             for (const column of options.columns) {
-                _sql.push((first ? '' : ', ') + ':' + column.name + ' AS ' + column.name)
-                first = false
+                _sql.push(',' + column.name)
+            }
+            _sql.push(') VALUES (')
+            _sql.push(autoincremental.sequence + '.NEXTVAL')
+            for (const column of options.columns) {
+                _sql.push(',s.' + column.name)
             }
-            _sql.push('FROM DUAL')
-            _sql.push(') s ON (')
+        } else {
             first = true
-            for (const field of options.mergeFields) {
-                _sql.push((first ? '' : ' AND ') + 't.' + field + ' = s.' + field)
+            for (const column of options.columns) {
+                _sql.push((first ? '' : ',') + column.name)
                 first = false
             }
-            _sql.push(')')
-            _sql.push('WHEN MATCHED THEN UPDATE SET ')
+            _sql.push(') VALUES (')
             first = true
             for (const column of options.columns) {
-                if (options.mergeFields.includes(column.name)) continue
-                _sql.push((first ? '' : ',') + 't.' + column.name + ' = s.' + column.name)
+                _sql.push((first ? '' : ',') + 's.' + column.name)
                 first = false
             }
-            _sql.push('WHEN NOT MATCHED THEN INSERT (')
-            if (autoincremental) {
-                _sql.push(autoincremental.name)
-                for (const column of options.columns) {
-                    _sql.push(',' + column.name)
-                }
-                _sql.push(') VALUES (')
-                _sql.push(autoincremental.sequence + '.NEXTVAL')
-                for (const column of options.columns) {
-                    _sql.push(',s.' + column.name)
-                }
-            } else {
-                first = true
-                for (const column of options.columns) {
-                    _sql.push((first ? '' : ',') + column.name)
-                    first = false
-                }
-                _sql.push(') VALUES (')
-                first = true
-                for (const column of options.columns) {
-                    _sql.push((first ? '' : ',') + 's.' + column.name)
-                    first = false
-                }
-            }
-            _sql.push(')')
-            const mergeSql = _sql.join(' ')
+        }
+        _sql.push(')')
+        const mergeSql = _sql.join(' ')
 
-            // solve max size for string fields
-            const columnsCount = options.columns.length
-            for (let i = 0; i < columnsCount; i++) {
-                const column = options.columns[i]
-                if (column.type === 'string') {
-                    column.size = rows.reduce((max, row) => { return !row[i] ? 0 : row[i].length > max ? row[i].length : max }, 0)
-                }
-            }
-            const bindDefs = {}
-            for (const column of options.columns) {
-                const bindDef = { type: getDbType(column.type) }
-                if (column.type === 'string') {
-                    bindDef.maxSize = column.size
-                }
-                bindDefs[column.name] = bindDef
+        // solve max size for string fields
+        const columnsCount = options.columns.length
+        for (let i = 0; i < columnsCount; i++) {
+            const column = options.columns[i]
+            if (column.type === 'string') {
+                column.size = rows.reduce((max, row) => { return !row[i] ? 0 : row[i].length > max ? row[i].length : max }, 0)
             }
-            const oraOptions = getOraOptions(options, bindDefs)
-            const data = rowsToArray(options.columns, rows)
-            try {
-                const result = await connection.executeMany(mergeSql, data, oraOptions)
-                return { rowsAffected: result.rowsAffected }
-            } catch (err) {
-                console.log(err)
-                throw err
+        }
+        const bindDefs = {}
+        for (const column of options.columns) {
+            const bindDef = { type: getDbType(column.type) }
+            if (column.type === 'string') {
+                bindDef.maxSize = column.size
             }
-        },
-        close(nativeConnection) {
-            return nativeConnection.close();
-        },
-        beginTransaction(nativeConnection) {
-            //se utiliza la variable isTransactionRequest
-        },
-        commitTransaction(nativeConnection) {
-            return nativeConnection.commit();
-        },
-        rollbackTransaction(nativeConnection) {
-            return nativeConnection.rollback();
+            bindDefs[column.name] = bindDef
+        }
+        const oraOptions = getOraOptions(options, bindDefs)
+        const data = rowsToArray(options.columns, rows)
+        try {
+            const result = await connection.executeMany(mergeSql, data, oraOptions)
+            return { rowsAffected: result.rowsAffected }
+        } catch (err) {
+            console.log(err)
+            throw err
         }
+    },
+    close(nativeConnection) {
+        return nativeConnection.close();
+    },
+    beginTransaction(nativeConnection) {
+        //se utiliza la variable isTransactionRequest
+    },
+    commitTransaction(nativeConnection) {
+        return nativeConnection.commit();
+    },
+    rollbackTransaction(nativeConnection) {
+        return nativeConnection.rollback();
     }
 
+
 };

package/blz-rds-postgres/index.js

@@ -18,26 +18,26 @@ process.on('exit', async function () {
 });
 
 module.exports = {
-    Backend: {
-        syntaxis: require('./syntaxis.json'),
-        executeProcedure,
-        executeSql: async function (connection, sql, parameters, options = {}) {
-            if (sql.indexOf("call") != -1) {
-                return await executeProcedure(connection, sql, parameters);
-            } else if (_.has(options, "bulkInsert")) {
-                return await executeBulkInsert(connection, sql, parameters, options);
-            } else if (_.has(options, "bulkMerge")) {
-                return await executeBulkMerge(connection, sql, parameters, options);
-            } else if (_.has(options, "queryOne") || _.has(options, "query")) {
-                return await executeQuery(connection, sql, parameters, options);
-            } else {
-                return await executeNonQuery(connection, sql, parameters, options);
-            }
-        },
-        beginTransaction,
-        close,
-        createRdsConnection,
-        commitTransaction,
-        rollbackTransaction
-    }
+
+    syntaxis: require('./syntaxis.json'),
+    executeProcedure,
+    executeSql: async function (connection, sql, parameters, options = {}) {
+        if (sql.indexOf("call") != -1) {
+            return await executeProcedure(connection, sql, parameters);
+        } else if (_.has(options, "bulkInsert")) {
+            return await executeBulkInsert(connection, sql, parameters, options);
+        } else if (_.has(options, "bulkMerge")) {
+            return await executeBulkMerge(connection, sql, parameters, options);
+        } else if (_.has(options, "queryOne") || _.has(options, "query")) {
+            return await executeQuery(connection, sql, parameters, options);
+        } else {
+            return await executeNonQuery(connection, sql, parameters, options);
+        }
+    },
+    beginTransaction,
+    close,
+    createRdsConnection,
+    commitTransaction,
+    rollbackTransaction
+
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blazedpath/commons",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "commos library for blazedpath applications",
   "main": "index.js",
   "types": "dist/index.d.ts",