db-crud-api 0.1.7 → 0.1.9

package/lib/api-execute.js

@@ -18,7 +18,7 @@ export default class apiExecute {
 
     // Post (any operation like get/put/patch/delete...)
     async execute(reqOpe) {
-        const _dbOpe = dbOpe.prepareRun(this.#schema, reqOpe);
+        const _dbOpe = dbOpe.prepareExecute(this.#schema, reqOpe);
         return await dbOpe.runQuery(this.#connection, _dbOpe);
     }
 

package/lib/api-factory.js

@@ -13,7 +13,7 @@ export function newROApi(tablePath) {
     return new apiRO(tablePath);
 }
 
-export function newExecuteXApi(command) {
+export function newExecuteApi(command) {
     return new apiExecute(command);
 }
 

package/lib/db-operations.js

@@ -54,7 +54,7 @@ export function prepareSchema(obj, objType) {
 
     if (obj == undefined || typeof obj !== 'string') throw new TypeError('prepareSchema: wrong obj');
     if (objType !== undefined && objType !== 'T' && objType !== 'SP') throw new TypeError('prepareSchema: wrong objType, must be "T" or "SP"');
-    const objPath = obj.trimStart().Split(' ')[0];
+    const objPath = obj.trimStart().split(' ')[0];
 
     // split objPath to serverName,dbName,objName
     let serverName = undefined;
@@ -112,20 +112,20 @@ export function prepareSchema(obj, objType) {
     // store procedure
     if (objType === "SP") {
         if (!objName || objName.length == 0) {
-            if (!schema.servers[serverName].databases[dbName] || !Object.keys(schema.servers[serverName].databases[dbName].storeprocedures)[0]) throw new TypeError('missing default storeprocedure in dbSchema');
-            objName = Object.keys(schema.servers[serverName].databases[dbName].storeprocedures)[0];
+            if (!schema.servers[serverName].databases[dbName] || !Object.keys(schema.servers[serverName].databases[dbName].procedures)[0]) throw new TypeError('missing default procedure in dbSchema');
+            objName = Object.keys(schema.servers[serverName].databases[dbName].procedures)[0];
         }
         else { // add storeprocedure to schema
-            if (!schema.servers[serverName].databases[dbName].storeprocedures) { schema.servers[serverName].databases[dbName].storeprocedures = {} };
-            if (!schema.servers[serverName].databases[dbName].storeprocedures[objName]) { schema.servers[serverName].databases[dbName].storeprocedures[objName] = {} }
+            if (!schema.servers[serverName].databases[dbName].procedures) { schema.servers[serverName].databases[dbName].procedures = {} };
+            if (!schema.servers[serverName].databases[dbName].procedures[objName]) { schema.servers[serverName].databases[dbName].procedures[objName] = {command: obj} }
         }
-        if (!schema.servers[serverName].databases[dbName].storeprocedures[objName].realName) { schema.servers[serverName].databases[dbName].storeprocedures[objName].realName = objName } // add realName
+        if (!schema.servers[serverName].databases[dbName].procedures[objName].realName) { schema.servers[serverName].databases[dbName].procedures[objName].realName = objName } // add realName
     }
 
     // return tSchema
     return {
         table: (objType == undefined || objType === 'T') ? schema.servers[serverName].databases[dbName].tables[objName] : undefined,
-        command:  (objType === 'SP') ? schema.servers[serverName].databases[dbName].storeprocedure[objName] : undefined,
+        procedure:  (objType === 'SP') ? schema.servers[serverName].databases[dbName].procedures[objName] : undefined,
         database: schema.servers[serverName].databases[dbName],
         server: schema.servers[serverName]
     }
@@ -133,67 +133,8 @@ export function prepareSchema(obj, objType) {
 }
 
 export function prepareTableSchema(tablePath) {
-    // eg. tablePath = 'systemName.dbName.tableName' or 'dbName.tableName' or 'tablename' or 'systemNme..tableName'
-    if (!tablePath || typeof tablePath !== 'string') throw new TypeError('wrong tablePath');
-
-    // split tablePath to serverName,dbName,tableName
-    let serverName = undefined;
-    let dbName = undefined;
-    let tableName = undefined;
-    const tablePathArray = tablePath.split('.');
-    if (tablePathArray.length > 2) {
-        serverName = tablePathArray[0]
-        dbName = tablePathArray[1]
-        tableName = tablePathArray[2]
-    }
-    else if (tablePathArray.length > 1) {
-        dbName = tablePathArray[0]
-        tableName = tablePathArray[1]
-    }
-    else if (tablePathArray.length > 0) {
-        tableName = tablePathArray[0]
-    }
-
-    // server
-    if (!serverName || serverName.length == 0) {
-        if (!schema.servers || !Object.keys(schema.servers)[0]) throw new TypeError('missing default server in dbSchema');
-        serverName = Object.keys(schema.servers)[0];
-    }
-    else { // add server to schema 
-        if (!schema.servers) { schema.servers = {} };
-        if (!schema.servers[serverName]) { schema.servers[serverName] = {} };
-    }
-    if (!schema.servers[serverName].realName) { schema.servers[serverName].realName = serverName } // add realName
-
-    // database
-    if (!dbName || dbName.length == 0) {
-        if (!schema.servers[serverName].databases || !Object.keys(schema.servers[serverName].databases)[0]) throw new TypeError('missing default database in dbSchema');
-        dbName = Object.keys(schema.servers[serverName].databases)[0];
-    }
-    else { // add db to schema
-        if (!schema.servers[serverName].databases) { schema.servers[serverName].databases = {} };
-        if (!schema.servers[serverName].databases[dbName]) { schema.servers[serverName].databases[dbName] = {} };
-    }
-    if (!schema.servers[serverName].databases[dbName].realName) { schema.servers[serverName].databases[dbName].realName = dbName } // add realName
-
-    // table
-    if (!tableName || tableName.length == 0) {
-        if (!schema.servers[serverName].databases[dbName] || !Object.keys(schema.servers[serverName].databases[dbName].tables)[0]) throw new TypeError('missing default table in dbSchema');
-        tableName = Object.keys(schema.servers[serverName].databases[dbName].tables)[0];
-    }
-    else { // add table to schema
-        if (!schema.servers[serverName].databases[dbName].tables) { schema.servers[serverName].databases[dbName].tables = {} };
-        if (!schema.servers[serverName].databases[dbName].tables[tableName]) { schema.servers[serverName].databases[dbName].tables[tableName] = {} }
-    }
-    if (!schema.servers[serverName].databases[dbName].tables[tableName].realName) { schema.servers[serverName].databases[dbName].tables[tableName].realName = tableName } // add realName
-
-    // return tSchema
-    return {
-        table: schema.servers[serverName].databases[dbName].tables[tableName],
-        database: schema.servers[serverName].databases[dbName],
-        server: schema.servers[serverName]
-    }
-
+    // alias for prepareSchema (will be removed soon)
+    return prepareSchema(tablePath, "T")
 }
 
 export function prepareRun(tSchema, reqOpe) {
@@ -376,22 +317,19 @@ export function prepareDeleteById(tSchema, idValue) {
     }
 };
 
-export function prepareExecute(reqOpe) {
+export function prepareExecute(pSchema, reqOpe) {
     let _reqOpe = [];
     let _result = [];
     if (Array.isArray(reqOpe)) _reqOpe.push(...reqOpe);
     else _reqOpe.push(reqOpe);
     _reqOpe.forEach(function (_ope) {
-        if (_ope?.execute) {
-            if (!_ope.execute.command) throw new Error('Request sintax error, missing "execute.command" property.')
-            _result.push({
-                execute: {
-                    command: _ope.execute.command,
-                    params: _ope.execute.params
-                }
-            });
-        }
-        else throw new Error('Request sintax error, missing "execute" property.');
+        _result.push({
+            execute: {
+                schema: pSchema,
+                command: pSchema.command,
+                params: _ope.params
+            }
+        });
     });
     if (_result.length > 1) return _result;
     if (_result.length = 1) return _result[0];

package/lib/mssql.js

@@ -232,8 +232,8 @@ function deleteToSql(dbOpe, sqlRequest) {
 function executeToSql(dbOpe, sqlRequest) {
     let result = "execute ";
 
-    if (dbOpe.execute.command) {
-        result += dbOpe.execute.command;
+    if (dbOpe.execute.schema.procedure) {
+        result += dbOpe.execute.schema.procedure.command;
     }
     else { throw new Error('command is missing.'); }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "db-crud-api",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "type": "module",
   "description": "CRUD api for database tables",
   "main": "index.js",