@sqb/oracle 4.20.6 → 4.21.0

package/package.json

@@ -1,36 +1,31 @@
 {
   "name": "@sqb/oracle",
   "description": "SQB serialization extension for Oracle database",
-  "version": "4.20.6",
+  "version": "4.21.0",
   "author": "Panates",
   "license": "Apache-2.0",
   "dependencies": {
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.20.6",
-    "@sqb/connect": "^4.20.6",
-    "@sqb/oracle-dialect": "^4.20.6",
+    "@sqb/builder": "^4.21.0",
+    "@sqb/connect": "^4.21.0",
+    "@sqb/oracle-dialect": "^4.21.0",
     "oracledb": ">= 6.4.0"
   },
   "type": "module",
+  "module": "./index.js",
+  "types": "./index.d.ts",
   "exports": {
     ".": {
-      "import": {
-        "types": "./types/index.d.ts",
-        "default": "./esm/index.js"
-      },
-      "require": {
-        "types": "./types/index.d.cts",
-        "default": "./cjs/index.js"
-      },
-      "default": "./esm/index.js"
+      "types": "./index.d.ts",
+      "default": "./index.js"
     },
     "./package.json": "./package.json"
   },
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "types": "./types/index.d.ts",
+  "engines": {
+    "node": ">=20.0"
+  },
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>",
     "Ilker Gurelli <i.gurelli@panates.com>"
@@ -40,17 +35,6 @@
     "url": "https://github.com/panates/sqb.git",
     "directory": "packages/oracle"
   },
-  "engines": {
-    "node": ">=18.0"
-  },
-  "files": [
-    "bin/",
-    "cjs/",
-    "esm/",
-    "types/",
-    "LICENSE",
-    "README.md"
-  ],
   "keywords": [
     "sqb",
     "oracle",

package/cjs/helpers.js

@@ -1,33 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.clientConfigurationToDriver = clientConfigurationToDriver;
-const tslib_1 = require("tslib");
-const url_1 = tslib_1.__importDefault(require("url"));
-function clientConfigurationToDriver(config) {
-    const cfg = {
-        user: config.user,
-        password: config.password,
-        ...config.driverOptions,
-    };
-    if (config.host) {
-        let hostUrl = config.host || 'localhost';
-        if (!hostUrl.includes('://'))
-            hostUrl = 'oracle://' + hostUrl;
-        const parsed = url_1.default.parse(hostUrl, true);
-        const host = decodeURI(parsed.hostname || '');
-        const port = config.port || (parsed.port && parseInt(parsed.port, 10)) || 1521;
-        const database = config.database ||
-            (parsed.pathname && decodeURI(parsed.pathname.substring(1)));
-        cfg.connectString = `${host}:${port}${database ? '/' + database : ''}`;
-        if (!cfg.externalAuth) {
-            if (parsed.auth) {
-                const a = parsed.auth.split(':');
-                if (!cfg.user && a[0])
-                    cfg.user = a[0];
-                if (!cfg.password && a[1])
-                    cfg.password = a[1];
-            }
-        }
-    }
-    return cfg;
-}

package/cjs/index.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-require("@sqb/oracle-dialect");
-const connect_1 = require("@sqb/connect");
-const ora_adapter_js_1 = require("./ora-adapter.js");
-connect_1.AdapterRegistry.register(new ora_adapter_js_1.OraAdapter());

package/cjs/ora-adapter.js

@@ -1,64 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OraAdapter = void 0;
-const tslib_1 = require("tslib");
-require("@sqb/oracle-dialect");
-const fs = tslib_1.__importStar(require("node:fs"));
-const os = tslib_1.__importStar(require("node:os"));
-const node_path_1 = tslib_1.__importDefault(require("node:path"));
-const oracledb_1 = tslib_1.__importDefault(require("oracledb"));
-const helpers_js_1 = require("./helpers.js");
-const ora_connection_js_1 = require("./ora-connection.js");
-class OraAdapter {
-    driver = 'oracledb';
-    dialect = 'oracle';
-    features = {
-        cursor: true,
-        schema: true,
-        // fetchAsString: [DataType.DATE, DataType.TIMESTAMP, DataType.TIMESTAMPTZ]
-    };
-    async connect(config) {
-        if (!config.driverOptions?.direct)
-            initOracleClient();
-        const cfg = (0, helpers_js_1.clientConfigurationToDriver)(config);
-        // Get oracle connection
-        const connection = await oracledb_1.default.getConnection(cfg);
-        try {
-            /* Retrieve sessionId */
-            let sessionId;
-            const r = await connection.execute('select sid from v$mystat where rownum <= 1', [], {});
-            if (r && r.rows)
-                sessionId = r.rows[0][0];
-            const oracon = new ora_connection_js_1.OraConnection(connection, sessionId);
-            /* Set default schema */
-            if (config.schema)
-                await oracon.setSchema(config.schema);
-            return oracon;
-        }
-        catch (e) {
-            if (connection)
-                await connection.close();
-            throw e;
-        }
-    }
-}
-exports.OraAdapter = OraAdapter;
-let oracleClientInitialized = false;
-function initOracleClient() {
-    if (oracleClientInitialized)
-        return;
-    const libDirs = process.env.LD_LIBRARY_PATH || process.env.ORA_HOME;
-    if (libDirs) {
-        for (const libDir of libDirs.split(':')) {
-            if ((os.type() === 'Linux' &&
-                fs.existsSync(node_path_1.default.join(libDir, 'libclntsh.so'))) ||
-                (os.type() === 'Darwin' &&
-                    fs.existsSync(node_path_1.default.join(libDir, 'libclntsh.dylib'))) ||
-                (os.type() === 'Windows_NT' &&
-                    fs.existsSync(node_path_1.default.join(libDir, 'oci.dll')))) {
-                oracledb_1.default.initOracleClient({ libDir });
-                oracleClientInitialized = true;
-            }
-        }
-    }
-}

package/cjs/ora-connection.js

@@ -1,207 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OraConnection = exports.dataTypeNames = void 0;
-const tslib_1 = require("tslib");
-const assert_1 = tslib_1.__importDefault(require("assert"));
-const oracledb_1 = tslib_1.__importDefault(require("oracledb"));
-const ora_cursor_js_1 = require("./ora-cursor.js");
-exports.dataTypeNames = {
-    [oracledb_1.default.DB_TYPE_BFILE.name]: 'BFILE',
-    [oracledb_1.default.DB_TYPE_BINARY_DOUBLE.name]: 'BINARY_DOUBLE',
-    [oracledb_1.default.DB_TYPE_BINARY_FLOAT.name]: 'BINARY_FLOAT',
-    [oracledb_1.default.DB_TYPE_BINARY_INTEGER.name]: 'BINARY_INTEGER',
-    [oracledb_1.default.DB_TYPE_BLOB.name]: 'BLOB',
-    [oracledb_1.default.DB_TYPE_BOOLEAN.name]: 'BOOLEAN',
-    [oracledb_1.default.DB_TYPE_CHAR.name]: 'CHAR',
-    [oracledb_1.default.DB_TYPE_CLOB.name]: 'CLOB',
-    [oracledb_1.default.DB_TYPE_CURSOR.name]: 'CURSOR',
-    [oracledb_1.default.DB_TYPE_DATE.name]: 'DATE',
-    [oracledb_1.default.DB_TYPE_INTERVAL_DS.name]: 'INTERVAL_DS',
-    [oracledb_1.default.DB_TYPE_INTERVAL_YM.name]: 'INTERVAL_YM',
-    [oracledb_1.default.DB_TYPE_LONG.name]: 'LONG',
-    [oracledb_1.default.DB_TYPE_LONG_RAW.name]: 'LONG_RAW',
-    [oracledb_1.default.DB_TYPE_NCHAR.name]: 'NCHAR',
-    [oracledb_1.default.DB_TYPE_NCLOB.name]: 'NCLOB',
-    [oracledb_1.default.DB_TYPE_NUMBER.name]: 'NUMBER',
-    [oracledb_1.default.DB_TYPE_NVARCHAR.name]: 'NVARCHAR',
-    [oracledb_1.default.DB_TYPE_OBJECT.name]: 'OBJECT',
-    [oracledb_1.default.DB_TYPE_RAW.name]: 'RAW',
-    [oracledb_1.default.DB_TYPE_ROWID.name]: 'ROWID',
-    [oracledb_1.default.DB_TYPE_TIMESTAMP.name]: 'TIMESTAMP',
-    [oracledb_1.default.DB_TYPE_TIMESTAMP_LTZ.name]: 'TIMESTAMP_LTZ',
-    [oracledb_1.default.DB_TYPE_TIMESTAMP_TZ.name]: 'TIMESTAMP_TZ',
-    [oracledb_1.default.DB_TYPE_VARCHAR.name]: 'VARCHAR',
-};
-const fetchTypeMap = {
-    [oracledb_1.default.DB_TYPE_BFILE.name]: 'object',
-    [oracledb_1.default.DB_TYPE_BINARY_DOUBLE.name]: 'number',
-    [oracledb_1.default.DB_TYPE_BINARY_FLOAT.name]: 'number',
-    [oracledb_1.default.DB_TYPE_BINARY_INTEGER.name]: 'number',
-    [oracledb_1.default.DB_TYPE_BLOB.name]: 'object',
-    [oracledb_1.default.DB_TYPE_BOOLEAN.name]: 'boolean',
-    [oracledb_1.default.DB_TYPE_CHAR.name]: 'string',
-    [oracledb_1.default.DB_TYPE_CLOB.name]: 'object',
-    [oracledb_1.default.DB_TYPE_CURSOR.name]: 'object',
-    [oracledb_1.default.DB_TYPE_DATE.name]: 'Date',
-    [oracledb_1.default.DB_TYPE_INTERVAL_DS.name]: 'string',
-    [oracledb_1.default.DB_TYPE_INTERVAL_YM.name]: 'string',
-    [oracledb_1.default.DB_TYPE_LONG.name]: 'number',
-    [oracledb_1.default.DB_TYPE_LONG_RAW.name]: 'Buffer',
-    [oracledb_1.default.DB_TYPE_NCHAR.name]: 'string',
-    [oracledb_1.default.DB_TYPE_NCLOB.name]: 'object',
-    [oracledb_1.default.DB_TYPE_NUMBER.name]: 'number',
-    [oracledb_1.default.DB_TYPE_NVARCHAR.name]: 'string',
-    [oracledb_1.default.DB_TYPE_OBJECT.name]: 'object',
-    [oracledb_1.default.DB_TYPE_RAW.name]: 'Buffer',
-    [oracledb_1.default.DB_TYPE_ROWID.name]: 'number',
-    [oracledb_1.default.DB_TYPE_TIMESTAMP.name]: 'Date',
-    [oracledb_1.default.DB_TYPE_TIMESTAMP_LTZ.name]: 'Date',
-    [oracledb_1.default.DB_TYPE_TIMESTAMP_TZ.name]: 'Date',
-    [oracledb_1.default.DB_TYPE_VARCHAR.name]: 'string',
-};
-class OraConnection {
-    sessionId;
-    intlcon;
-    serverVersion;
-    _inTransaction = false;
-    constructor(conn, sessionId) {
-        this.sessionId = sessionId;
-        this.intlcon = conn;
-        this.serverVersion = '' + conn.oracleServerVersion;
-    }
-    async close() {
-        if (!this.intlcon)
-            return;
-        await this.intlcon.close();
-        this.intlcon = undefined;
-    }
-    async reset() {
-        return this.rollback();
-    }
-    async startTransaction() {
-        assert_1.default.ok(this.intlcon, 'Can not start transaction for a closed db session');
-        this._inTransaction = true;
-    }
-    async commit() {
-        assert_1.default.ok(this.intlcon, 'Can not commit transaction for a closed db session');
-        await this.intlcon.commit();
-        this._inTransaction = false;
-    }
-    async rollback() {
-        if (!this.intlcon)
-            return;
-        await this.intlcon.rollback();
-        this._inTransaction = false;
-    }
-    async test() {
-        assert_1.default.ok(this.intlcon, 'DB session is closed');
-        await this.intlcon.execute('select 1 from dual', [], {});
-    }
-    async getSchema() {
-        assert_1.default.ok(this.intlcon, 'DB session is closed');
-        const r = await this.intlcon.execute("select sys_context( 'userenv', 'current_schema' ) from dual", [], {
-            autoCommit: true,
-        });
-        if (r && r.rows && r.rows[0])
-            return r.rows[0][0];
-        return '';
-    }
-    async setSchema(schema) {
-        assert_1.default.ok(this.intlcon, 'Can not set schema of a closed db session');
-        await this.intlcon.execute('alter SESSION set CURRENT_SCHEMA = ' + schema, [], { autoCommit: true });
-    }
-    onGenerateQuery(prepared) {
-        prepared.dialect = 'oracle';
-        prepared.dialectVersion = this.serverVersion;
-    }
-    async execute(request) {
-        assert_1.default.ok(this.intlcon, 'Can not execute query with a closed db session');
-        const oraOptions = {
-            autoCommit: request.autoCommit,
-            resultSet: request.cursor,
-            outFormat: request.objectRows
-                ? oracledb_1.default.OUT_FORMAT_OBJECT
-                : oracledb_1.default.OUT_FORMAT_ARRAY,
-        };
-        if (request.cursor)
-            oraOptions.fetchArraySize = request.fetchRows;
-        else
-            oraOptions.maxRows = request.fetchRows;
-        const out = {};
-        this.intlcon.action = request.action || '';
-        let response = await this.intlcon.execute(request.sql, request.params || [], oraOptions);
-        if (response.rowsAffected)
-            out.rowsAffected = response.rowsAffected;
-        if (out.rowsAffected === 1 && request.returningFields) {
-            const m = request.sql.match(/\b(insert into|update)\b ("?\w+\.?\w+"?)/i);
-            if (m) {
-                const selectFields = request.returningFields.map(x => x.field + (x.alias ? ' as ' + x.alias : ''));
-                let sql = `select ${selectFields.join(',')} from ${m[2]}\n`;
-                if (m[1].toLowerCase() === 'insert into') {
-                    sql += "where rowid='" + response.lastRowid + "'";
-                    response = await this.intlcon.execute(sql);
-                }
-                // Emulate update ... returning
-                else if (m[1].toLowerCase() === 'update') {
-                    const m2 = request.sql.match(/where (.+)/);
-                    sql += m2 ? ' where ' + m2[1] : '';
-                    response = await this.intlcon.execute(sql, request.params || [], oraOptions);
-                }
-            }
-        }
-        let fields;
-        let rowNumberIdx = -1;
-        let rowNumberName = '';
-        if (response.metaData) {
-            fields = out.fields = [];
-            for (const [idx, v] of response.metaData.entries()) {
-                if (v.name.toLowerCase() === 'row$number') {
-                    rowNumberIdx = idx;
-                    rowNumberName = v.name;
-                    continue;
-                }
-                const fetchType = typeof v.fetchType === 'object' ? v.fetchType.num : v.fetchType;
-                const fieldInfo = {
-                    _inf: v,
-                    fieldName: v.name,
-                    dataType: v.dbTypeName || 'UNKNOWN',
-                    jsType: fetchTypeMap[fetchType || 2001],
-                };
-                if (v.dbTypeName === 'CHAR')
-                    fieldInfo.fixedLength = true;
-                // others
-                if (v.byteSize)
-                    fieldInfo.size = v.byteSize;
-                if (v.nullable)
-                    fieldInfo.nullable = v.nullable;
-                if (v.precision)
-                    fieldInfo.precision = v.precision;
-                fields.push(fieldInfo);
-            }
-        }
-        if (response.rows) {
-            out.rowType = request.objectRows ? 'object' : 'array';
-            out.rows = response.rows;
-            // remove row$number fields
-            if (out.rows && rowNumberIdx >= 0) {
-                for (const row of out.rows) {
-                    if (Array.isArray(row))
-                        row.splice(rowNumberIdx, 1);
-                    else
-                        delete row[rowNumberName];
-                }
-            }
-            return out;
-        }
-        if (response.resultSet) {
-            out.rowType = request.objectRows ? 'object' : 'array';
-            out.cursor = new ora_cursor_js_1.OraCursor(response.resultSet, {
-                rowType: request.objectRows ? 'object' : 'array',
-                rowNumberIdx,
-                rowNumberName,
-            });
-        }
-        return out;
-    }
-}
-exports.OraConnection = OraConnection;

package/cjs/ora-cursor.js

@@ -1,58 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OraCursor = void 0;
-class OraCursor {
-    _resultSet;
-    _rowType;
-    _rowNumberIdx;
-    _rowNumberName;
-    constructor(resultSet, opts) {
-        this._rowType = opts.rowType;
-        this._resultSet = resultSet;
-        this._rowNumberIdx = opts.rowNumberIdx;
-        this._rowNumberName = opts.rowNumberName;
-    }
-    get isClosed() {
-        return !this._resultSet;
-    }
-    get rowType() {
-        return this._rowType;
-    }
-    async close() {
-        if (!this._resultSet)
-            return;
-        const resultSet = this._resultSet;
-        return new Promise((resolve, reject) => {
-            resultSet.close(err => {
-                if (err)
-                    return reject(err);
-                this._resultSet = undefined;
-                resolve();
-            });
-        });
-    }
-    fetch(nRows) {
-        return new Promise((resolve, reject) => {
-            if (!this._resultSet)
-                return resolve(undefined);
-            const resultSet = this._resultSet;
-            resultSet.getRows(nRows, (err, rows) => {
-                if (err)
-                    return reject(err);
-                if (!(rows && rows.length))
-                    return resolve(undefined);
-                /* remove row$number fields */
-                if (this._rowNumberName) {
-                    for (const row of rows) {
-                        if (Array.isArray(row))
-                            row.splice(this._rowNumberIdx || 0, 1);
-                        else
-                            delete row[this._rowNumberName];
-                    }
-                }
-                resolve(rows);
-            });
-        });
-    }
-}
-exports.OraCursor = OraCursor;

package/cjs/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "commonjs"
-}

package/esm/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "module"
-}

package/types/index.d.cts

@@ -1 +0,0 @@
-import '@sqb/oracle-dialect';