@carbonorm/carbonnode 1.4.4 → 1.5.0

package/scripts/generateRestBindings.cjs

@@ -26,7 +26,7 @@ var MySQLDump = /** @class */ (function () {
     function MySQLDump() {
     }
     MySQLDump.buildCNF = function (cnfFile) {
-        if (cnfFile === void 0) { cnfFile = null; }
+        if (cnfFile === void 0) { cnfFile = ''; }
         if (this.mysqlcnf !== '') {
             return this.mysqlcnf;
         }
@@ -39,7 +39,9 @@ var MySQLDump = /** @class */ (function () {
             '',
         ];
         cnf.push("");
-        cnfFile !== null && cnfFile !== void 0 ? cnfFile : (cnfFile = path.join(process.cwd(), '/mysql.cnf'));
+        if ('' === cnfFile) {
+            cnfFile = path.join(process.cwd(), '/mysql.cnf');
+        }
         try {
             fs.writeFileSync(cnfFile, cnf.join('\n'));
             fs.chmodSync(cnfFile, 488);
@@ -52,14 +54,13 @@ var MySQLDump = /** @class */ (function () {
         return (this.mysqlcnf = cnfFile);
     };
     MySQLDump.MySQLDump = function (mysqldump, data, schemas, outputFile, otherOption, specificTable) {
-        if (mysqldump === void 0) { mysqldump = null; }
+        if (mysqldump === void 0) { mysqldump = 'mysqldump'; }
         if (data === void 0) { data = false; }
         if (schemas === void 0) { schemas = true; }
-        if (outputFile === void 0) { outputFile = null; }
+        if (outputFile === void 0) { outputFile = ''; }
         if (otherOption === void 0) { otherOption = ''; }
-        if (specificTable === void 0) { specificTable = null; }
-        specificTable = specificTable || '';
-        if (outputFile === null) {
+        if (specificTable === void 0) { specificTable = ''; }
+        if (outputFile === '') {
             outputFile = path.join(process.cwd(), 'mysqldump.sql');
         }
         if (!data && !schemas) {
@@ -68,7 +69,7 @@ var MySQLDump = /** @class */ (function () {
         var defaultsExtraFile = this.buildCNF();
         var hexBlobOption = data ? '--hex-blob ' : '--no-data ';
         var createInfoOption = schemas ? '' : ' --no-create-info ';
-        var cmd = "".concat(mysqldump || 'mysqldump', " --defaults-extra-file=\"").concat(defaultsExtraFile, "\" ").concat(otherOption, " --skip-add-locks --single-transaction --quick ").concat(createInfoOption).concat(hexBlobOption).concat(this.DB_NAME, " ").concat(specificTable, " > '").concat(outputFile, "'");
+        var cmd = "".concat(mysqldump, " --defaults-extra-file=\"").concat(defaultsExtraFile, "\" ").concat(otherOption, " --skip-add-locks --single-transaction --quick ").concat(createInfoOption).concat(hexBlobOption).concat(this.DB_NAME, " ").concat(specificTable, " > '").concat(outputFile, "'");
         this.executeAndCheckStatus(cmd);
         return (this.mysqldump = outputFile);
     };
@@ -79,11 +80,10 @@ var MySQLDump = /** @class */ (function () {
             var stdout = execSync(command, { encoding: 'utf-8' });
             output.push(stdout);
         }
-        catch (error) {
-            console.log("The command >>  ".concat(command, " \n\t returned with a status code (").concat(error.status, "). Expecting 0 for success."));
-            console.log("Command output::\t ".concat(error.stdout));
+        catch (e) {
+            console.log("Command output::", e);
             if (exitOnFailure) {
-                process.exit(error.status);
+                process.exit(1);
             }
         }
     };
@@ -170,8 +170,8 @@ var parseSQLToTypeScript = function (sql) {
             var localColumn = foreignKeyMatch[2];
             var foreignTable = foreignKeyMatch[3];
             var foreignColumn = foreignKeyMatch[4];
-            var onDeleteAction = foreignKeyMatch[6] || null;
-            var onUpdateAction = foreignKeyMatch[8] || null;
+            var onDeleteAction = foreignKeyMatch[6] || '';
+            var onUpdateAction = foreignKeyMatch[8] || '';
             references.push({
                 TABLE: tableName,
                 CONSTRAINT: constraintName,
@@ -186,6 +186,7 @@ var parseSQLToTypeScript = function (sql) {
             TABLE_NAME: tableName,
             TABLE_DEFINITION: tableMatch[0],
             TABLE_CONSTRAINT: references,
+            REST_URL_EXPRESSION: argMap['--restUrlExpression'] || '"/rest/"',
             TABLE_NAME_SHORT: tableName.replace(MySQLDump.DB_PREFIX, ''),
             TABLE_NAME_LOWER: tableName.toLowerCase(),
             TABLE_NAME_UPPER: tableName.toUpperCase(),
@@ -244,12 +245,15 @@ var parseSQLToTypeScript = function (sql) {
                 console.log("Foreign table ".concat(foreignTable, " not found for ").concat(ref.TABLE, ".").concat(ref.CONSTRAINT));
                 continue;
             }
-            if (!tableData[foreignTable].TABLE_REFERENCED_BY) {
+            if (!('TABLE_REFERENCED_BY' in tableData[foreignTable])) {
                 tableData[foreignTable].TABLE_REFERENCED_BY = {};
             }
+            // @ts-ignore
             if (!tableData[foreignTable].TABLE_REFERENCED_BY[foreignColumn]) {
+                // @ts-ignore
                 tableData[foreignTable].TABLE_REFERENCED_BY[foreignColumn] = [];
             }
+            // @ts-ignore
             tableData[foreignTable].TABLE_REFERENCED_BY[foreignColumn].push({
                 TABLE: tableName,
                 COLUMN: columnName,
@@ -258,9 +262,12 @@ var parseSQLToTypeScript = function (sql) {
             if (!tableData[tableName].TABLE_REFERENCES) {
                 tableData[tableName].TABLE_REFERENCES = {};
             }
+            // @ts-ignore
             if (!tableData[tableName].TABLE_REFERENCES[columnName]) {
+                // @ts-ignore
                 tableData[tableName].TABLE_REFERENCES[columnName] = [];
             }
+            // @ts-ignore
             tableData[tableName].TABLE_REFERENCES[columnName].push({
                 TABLE: foreignTable,
                 COLUMN: foreignColumn,
@@ -296,7 +303,7 @@ var wsLiveUpdatesTemplate = fs.readFileSync(path.resolve(__dirname, 'assets/hand
 fs.writeFileSync(path.join(MySQLDump.OUTPUT_DIR, 'WsLiveUpdates.ts'), Handlebars.compile(wsLiveUpdatesTemplate)(tableData));
 var template = fs.readFileSync(path.resolve(__dirname, 'assets/handlebars/Table.ts.handlebars'), 'utf-8');
 var testTemplate = fs.readFileSync(path.resolve(__dirname, 'assets/handlebars/Table.test.ts.handlebars'), 'utf-8');
-Object.values(tableData.TABLES).map(function (tableData, key) {
+Object.values(tableData.TABLES).forEach(function (tableData) {
     var tableName = tableData.TABLE_NAME_SHORT_PASCAL_CASE;
     fs.writeFileSync(path.join(MySQLDump.OUTPUT_DIR, tableName + '.ts'), Handlebars.compile(template)(tableData));
     fs.writeFileSync(path.join(MySQLDump.OUTPUT_DIR, tableName + '.test.ts'), Handlebars.compile(testTemplate)(tableData));

package/scripts/generateRestBindings.ts

@@ -14,7 +14,7 @@ for (let i = 0; i < args.length; i += 2) {
 }
 
 const createDirIfNotExists = dir =>
-    !fs.existsSync(dir) ? fs.mkdirSync(dir, { recursive: true }) : undefined;
+    !fs.existsSync(dir) ? fs.mkdirSync(dir, {recursive: true}) : undefined;
 
 class MySQLDump {
 
@@ -29,7 +29,7 @@ class MySQLDump {
     static RELATIVE_OUTPUT_DIR = argMap['--output'] || '/src/api/rest';
     static OUTPUT_DIR = path.join(process.cwd(), MySQLDump.RELATIVE_OUTPUT_DIR);
 
-    static buildCNF(cnfFile = null) {
+    static buildCNF(cnfFile: string = '') {
 
         if (this.mysqlcnf !== '') {
 
@@ -46,10 +46,13 @@ class MySQLDump {
             '',
         ];
 
-
         cnf.push(``);
 
-        cnfFile ??= path.join(process.cwd(), '/mysql.cnf');
+        if ('' === cnfFile) {
+
+            cnfFile = path.join(process.cwd(), '/mysql.cnf');
+
+        }
 
         try {
 
@@ -71,10 +74,9 @@ class MySQLDump {
 
     }
 
-    static MySQLDump(mysqldump = null, data = false, schemas = true, outputFile = null, otherOption = '', specificTable = null) {
-        specificTable = specificTable || '';
+    static MySQLDump(mysqldump: string = 'mysqldump', data = false, schemas = true, outputFile = '', otherOption = '', specificTable: string = '') {
 
-        if (outputFile === null) {
+        if (outputFile === '') {
             outputFile = path.join(process.cwd(), 'mysqldump.sql');
         }
 
@@ -88,7 +90,7 @@ class MySQLDump {
 
         const createInfoOption = schemas ? '' : ' --no-create-info ';
 
-        const cmd = `${mysqldump || 'mysqldump'} --defaults-extra-file="${defaultsExtraFile}" ${otherOption} --skip-add-locks --single-transaction --quick ${createInfoOption}${hexBlobOption}${this.DB_NAME} ${specificTable} > '${outputFile}'`;
+        const cmd = `${mysqldump} --defaults-extra-file="${defaultsExtraFile}" ${otherOption} --skip-add-locks --single-transaction --quick ${createInfoOption}${hexBlobOption}${this.DB_NAME} ${specificTable} > '${outputFile}'`;
 
         this.executeAndCheckStatus(cmd);
 
@@ -96,7 +98,7 @@ class MySQLDump {
 
     }
 
-    static executeAndCheckStatus(command, exitOnFailure = true, output = []) {
+    static executeAndCheckStatus(command: string, exitOnFailure = true, output: any[] = []) {
 
         try {
 
@@ -104,18 +106,17 @@ class MySQLDump {
 
             output.push(stdout);
 
-        } catch (error) {
-
-            console.log(`The command >>  ${command} \n\t returned with a status code (${error.status}). Expecting 0 for success.`);
+        } catch (e) {
 
-            console.log(`Command output::\t ${error.stdout}`);
+            console.log(`Command output::`, e);
 
             if (exitOnFailure) {
 
-                process.exit(error.status);
+                process.exit(1);
 
             }
 
+
         }
 
     }
@@ -220,7 +221,6 @@ const parseSQLToTypeScript = (sql: string) => {
         let columnMatch;
 
 
-
         const columnDefinitionsLines = columnDefinitions.split('\n');
 
         columnDefinitionsLines.forEach(line => {
@@ -253,8 +253,8 @@ const parseSQLToTypeScript = (sql: string) => {
             const localColumn = foreignKeyMatch[2];
             const foreignTable = foreignKeyMatch[3];
             const foreignColumn = foreignKeyMatch[4];
-            const onDeleteAction = foreignKeyMatch[6] || null;
-            const onUpdateAction = foreignKeyMatch[8] || null;
+            const onDeleteAction = foreignKeyMatch[6] || '';
+            const onUpdateAction = foreignKeyMatch[8] || '';
 
             references.push({
                 TABLE: tableName,
@@ -272,6 +272,7 @@ const parseSQLToTypeScript = (sql: string) => {
             TABLE_NAME: tableName,
             TABLE_DEFINITION: tableMatch[0],
             TABLE_CONSTRAINT: references,
+            REST_URL_EXPRESSION: argMap['--restUrlExpression'] || '"/rest/"',
             TABLE_NAME_SHORT: tableName.replace(MySQLDump.DB_PREFIX, ''),
             TABLE_NAME_LOWER: tableName.toLowerCase(),
             TABLE_NAME_UPPER: tableName.toUpperCase(),
@@ -284,7 +285,7 @@ const parseSQLToTypeScript = (sql: string) => {
             TYPE_VALIDATION: {},
             REGEX_VALIDATION: {},
             TABLE_REFERENCES: {},
-            TABLE_REFERENCED_BY:{},
+            TABLE_REFERENCED_BY: {},
         };
 
         for (const colName in columns) {
@@ -326,14 +327,17 @@ const parseSQLToTypeScript = (sql: string) => {
             continue;
         }
 
-        if (!tableData[foreignTable].TABLE_REFERENCED_BY) {
+        if (!('TABLE_REFERENCED_BY' in tableData[foreignTable])) {
             tableData[foreignTable].TABLE_REFERENCED_BY = {};
         }
 
+        // @ts-ignore
         if (!tableData[foreignTable].TABLE_REFERENCED_BY[foreignColumn]) {
+            // @ts-ignore
             tableData[foreignTable].TABLE_REFERENCED_BY[foreignColumn] = [];
         }
 
+        // @ts-ignore
         tableData[foreignTable].TABLE_REFERENCED_BY[foreignColumn].push({
             TABLE: tableName,
             COLUMN: columnName,
@@ -344,10 +348,13 @@ const parseSQLToTypeScript = (sql: string) => {
             tableData[tableName].TABLE_REFERENCES = {};
         }
 
+        // @ts-ignore
         if (!tableData[tableName].TABLE_REFERENCES[columnName]) {
+            // @ts-ignore
             tableData[tableName].TABLE_REFERENCES[columnName] = [];
         }
 
+        // @ts-ignore
         tableData[tableName].TABLE_REFERENCES[columnName].push({
             TABLE: foreignTable,
             COLUMN: foreignColumn,
@@ -390,7 +397,7 @@ const template = fs.readFileSync(path.resolve(__dirname, 'assets/handlebars/Tabl
 
 const testTemplate = fs.readFileSync(path.resolve(__dirname, 'assets/handlebars/Table.test.ts.handlebars'), 'utf-8');
 
-Object.values(tableData.TABLES).map((tableData, key) => {
+Object.values(tableData.TABLES).forEach((tableData) => {
 
     const tableName = tableData.TABLE_NAME_SHORT_PASCAL_CASE
 

package/src/api/restRequest.ts

@@ -44,7 +44,9 @@ export function TestRestfulResponse(response: AxiosResponse | any, success: ((r:
 
 }
 
-export function removeInvalidKeys<iRestObject>(request: any, c6Tables: { [key: string]: (iC6RestfulModel & { [key: string]: any }) }): iRestObject {
+export function removeInvalidKeys<iRestObject>(request: any, c6Tables: {
+    [key: string]: (iC6RestfulModel & { [key: string]: any })
+}): iRestObject {
 
     let intersection: iRestObject = {} as iRestObject
 
@@ -300,6 +302,7 @@ export interface iC6Object {
             { [key: string]: string | number }
     },
     PREFIX: string,
+
     [key: string]: any
 }
 
@@ -324,6 +327,7 @@ interface iRest<CustomAndRequiredFields extends { [key: string]: any }, RestTabl
     C6: iC6Object,
     axios?: AxiosInstance,
     restURL?: string,
+    withCredentials?: boolean,
     tableName: RestShortTableNames | RestShortTableNames[],
     requestMethod: iRestMethods,
     clearCache?: () => void,
@@ -362,6 +366,7 @@ export default function restApi<
       C6,
       axios = axiosInstance,
       restURL = '/rest/',
+    withCredentials = true,
       tableName,
       requestMethod = GET,
       queryCallback = {},
@@ -676,42 +681,45 @@ export default function restApi<
 
                 const axiosActiveRequest: AxiosPromise<ResponseDataType> = axios[requestMethod.toLowerCase()]<ResponseDataType>(
                     restRequestUri,
-                    (() => {
+                    {
+                        withCredentials: withCredentials,
+                        ...((() => {
 
-                        if (requestMethod === GET) {
+                            if (requestMethod === GET) {
 
-                            return {
-                                params: query
-                            }
+                                return {
+                                    params: query
+                                }
 
-                        } else if (requestMethod === POST) {
+                            } else if (requestMethod === POST) {
 
-                            if (undefined !== request?.dataInsertMultipleRows) {
+                                if (undefined !== request?.dataInsertMultipleRows) {
 
-                                return request.dataInsertMultipleRows.map(data =>
-                                    convertForRequestBody<typeof data>(data, fullTableList, C6, (message) => toast.error(message, toastOptions)));
+                                    return request.dataInsertMultipleRows.map(data =>
+                                        convertForRequestBody<typeof data>(data, fullTableList, C6, (message) => toast.error(message, toastOptions)));
 
-                            }
+                                }
 
-                            return convertForRequestBody<RestTableInterfaces>(query as RestTableInterfaces, fullTableList, C6,(message) => toast.error(message, toastOptions))
+                                return convertForRequestBody<RestTableInterfaces>(query as RestTableInterfaces, fullTableList, C6, (message) => toast.error(message, toastOptions))
 
-                        } else if (requestMethod === PUT) {
+                            } else if (requestMethod === PUT) {
 
-                            return convertForRequestBody<RestTableInterfaces>(query as RestTableInterfaces, fullTableList, C6,(message) => toast.error(message, toastOptions))
+                                return convertForRequestBody<RestTableInterfaces>(query as RestTableInterfaces, fullTableList, C6, (message) => toast.error(message, toastOptions))
 
-                        } else if (requestMethod === DELETE) {
+                            } else if (requestMethod === DELETE) {
 
-                            return {
-                                data: convertForRequestBody<RestTableInterfaces>(query as RestTableInterfaces, fullTableList, C6,(message) => toast.error(message, toastOptions))
-                            }
+                                return {
+                                    data: convertForRequestBody<RestTableInterfaces>(query as RestTableInterfaces, fullTableList, C6, (message) => toast.error(message, toastOptions))
+                                }
 
-                        } else {
+                            } else {
 
-                            throw new Error('The request method (' + requestMethod + ') was not recognized.')
+                                throw new Error('The request method (' + requestMethod + ') was not recognized.')
 
-                        }
+                            }
 
-                    })()
+                        })())
+                    }
                 );
 
                 if (cachingConfirmed) {