@researchdatabox/redbox-core 0.0.0-bootstrap.0

package/dist/services/ConfigService.js

@@ -0,0 +1,379 @@
+"use strict";
+// Copyright (c) 2017 Queensland Cyber Infrastructure Foundation (http://www.qcif.edu.au/)
+//
+// GNU GENERAL PUBLIC LICENSE
+//    Version 2, June 1991
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Services = void 0;
+const CoreService_1 = require("../CoreService");
+const fs = __importStar(require("fs-extra"));
+const path_1 = require("path");
+const _ = __importStar(require("lodash"));
+var Services;
+(function (Services) {
+    /**
+     * Dynamic Configuration related functions...
+     *
+     * Author: <a href='https://github.com/shilob' target='_blank'>Shilo Banihit</a>
+     *
+     */
+    class Config extends CoreService_1.Services.Core.Service {
+        _exportedMethods = [
+            'getBrand',
+            'mergeHookConfig'
+        ];
+        getBrand(brandName, configBlock) {
+            const defaultBrand = _.get(sails, 'config.auth.defaultBrand', 'default');
+            const resolveFromBrandingAware = (name) => {
+                if (_.isFunction(_.get(sails, 'config.brandingAware')) && !_.isEmpty(name)) {
+                    const brandingConfig = sails.config.brandingAware(name);
+                    const configVal = _.get(brandingConfig, configBlock);
+                    if (!_.isUndefined(configVal)) {
+                        return configVal;
+                    }
+                }
+                return undefined;
+            };
+            let configVal = resolveFromBrandingAware(brandName);
+            if (_.isUndefined(configVal)) {
+                configVal = resolveFromBrandingAware(defaultBrand);
+            }
+            if (_.isUndefined(configVal)) {
+                configVal = _.get(sails.config.brandingConfigurationDefaults, configBlock);
+            }
+            if (_.isUndefined(configVal)) {
+                const legacyConfig = _.get(sails.config, configBlock, {});
+                configVal = _.get(legacyConfig, brandName);
+                if (_.isUndefined(configVal)) {
+                    configVal = _.get(legacyConfig, defaultBrand);
+                }
+            }
+            if (_.isUndefined(configVal)) {
+                return undefined;
+            }
+            return configVal;
+        }
+        mergeHookConfig(hookName, configMap = sails.config, config_dirs = ["form-config", "config"], branded_app_config_dirs = ["branded-config"], dontMergeFields = ["fields"]) {
+            const that = this;
+            let hook_root_dir = `${sails.config.appPath}/node_modules/${hookName}`;
+            let appPath = sails.config.appPath;
+            // check if the app path was launched from the hook directory, e.g. when launching tests.
+            if (!fs.pathExistsSync(hook_root_dir) && _.endsWith(sails.config.appPath, hookName)) {
+                hook_root_dir = sails.config.appPath;
+                appPath = appPath.substring(0, appPath.lastIndexOf(`/node_modules/${hookName}`));
+            }
+            const hook_log_header = hookName;
+            const origDontMerge = _.clone(dontMergeFields);
+            const concatArrsFn = function (objValue, srcValue, key) {
+                const dontMergeIndex = _.findIndex(dontMergeFields, (o) => {
+                    return _.isString(o) ? _.isEqual(o, key) : !_.isEmpty(o[key]);
+                });
+                if (dontMergeIndex != -1) {
+                    if (!_.isString(dontMergeFields[dontMergeIndex])) {
+                        const dontMergeFieldMap = dontMergeFields;
+                        if (dontMergeFieldMap[key] == "this_file") {
+                            return srcValue;
+                        }
+                        else {
+                            return objValue;
+                        }
+                    }
+                    return srcValue;
+                }
+                return undefined;
+            };
+            sails.log.verbose(`${hookName}::Merging branded app configuration...`);
+            _.each(branded_app_config_dirs, (branded_app_config_dir) => {
+                branded_app_config_dir = `${hook_root_dir}/${branded_app_config_dir}`;
+                sails.log.verbose(`${hook_log_header}::Looking at: ${branded_app_config_dir}`);
+                if (fs.pathExistsSync(branded_app_config_dir)) {
+                    const dirs = fs.readdirSync(branded_app_config_dir);
+                    _.each(dirs, (dir) => {
+                        const fullPath = (0, path_1.resolve)(branded_app_config_dir, dir);
+                        if (fs.statSync(fullPath).isDirectory()) {
+                            const brandName = (0, path_1.basename)(fullPath);
+                            // init-only directory will only create config entries. Intended for initialising config in a new environment that's managed either via API or screens once live.
+                            const initFiles = this.walkDirSync(`${fullPath}/init-only`, []);
+                            sails.log.verbose(hook_log_header + "::Processing:");
+                            sails.log.verbose(initFiles);
+                            _.each(initFiles, (file_path) => {
+                                const config_file = require(file_path);
+                                const configKey = (0, path_1.basename)(file_path);
+                                AppConfigService.createConfig(brandName, configKey, config_file).then((config) => { sails.log.verbose(hook_log_header + "::Configuration created:"); sails.log.verbose(config); })
+                                    .catch((error) => { sails.log.verbose(hook_log_header + "::Skipping creation of config as it already exists:"); sails.log.verbose(error); });
+                            });
+                            // Files in override directory are always updated (for config items without management screens)
+                            const overrideFiles = this.walkDirSync(`${fullPath}/override`, []);
+                            sails.log.verbose(hook_log_header + "::Processing:");
+                            sails.log.verbose(overrideFiles);
+                            _.each(overrideFiles, (file_path) => {
+                                const config_file = require(file_path);
+                                const configKey = (0, path_1.basename)(file_path);
+                                const brand = BrandingService.getBrand(brandName);
+                                AppConfigService.createOrUpdateConfig(brand, configKey, config_file).then((config) => {
+                                    sails.log.verbose(hook_log_header + "::Configuration created or updated:");
+                                    sails.log.verbose(config);
+                                });
+                            });
+                        }
+                        else {
+                            sails.log.verbose(hook_log_header + "::Skipping, Found file where we are only expecting directories:" + fullPath);
+                        }
+                    });
+                }
+                else {
+                    sails.log.verbose(hook_log_header + "::Skipping, directory not found:" + branded_app_config_dir);
+                }
+            });
+            sails.log.verbose(`${hook_log_header}::Merging branded app configuration...complete.`);
+            sails.log.verbose(`${hookName}::Merging configuration...`);
+            _.each(config_dirs, (config_dir) => {
+                config_dir = `${hook_root_dir}/${config_dir}`;
+                sails.log.verbose(`${hook_log_header}::Looking at: ${config_dir}`);
+                if (fs.pathExistsSync(config_dir)) {
+                    const files = this.walkDirSync(config_dir, []);
+                    sails.log.verbose(hook_log_header + "::Processing:");
+                    sails.log.verbose(files);
+                    _.each(files, (file_path) => {
+                        const config_file = require(file_path);
+                        // for overriding values...
+                        const hasCustomDontMerge = _.findKey(config_file, "_dontMerge");
+                        if (hasCustomDontMerge) {
+                            dontMergeFields = dontMergeFields.concat(config_file[hasCustomDontMerge]['_dontMerge']);
+                            _.unset(config_file[hasCustomDontMerge], "_dontMerge");
+                        }
+                        // for deleting values...
+                        const hasDeleteFields = _.findKey(config_file, "_delete");
+                        if (hasDeleteFields) {
+                            _.each(config_file[hasDeleteFields]['_delete'], (toDelete) => {
+                                _.unset(configMap[hasDeleteFields], toDelete);
+                            });
+                            _.unset(config_file[hasDeleteFields], "_delete");
+                        }
+                        _.mergeWith(configMap, config_file, concatArrsFn);
+                        dontMergeFields = _.clone(origDontMerge);
+                    });
+                }
+                else {
+                    sails.log.verbose(hook_log_header + "::Skipping, directory not found:" + config_dir);
+                }
+            });
+            sails.log.verbose(`${hook_log_header}::Merging configuration...complete.`);
+            sails.log.verbose(`${hook_log_header}::Merging Translation files...`);
+            const configWithOptions = sails.config;
+            this.mergeTranslationFiles(hook_root_dir, hook_log_header, configWithOptions.dontBackupCoreLanguageFilesWhenMerging);
+            //If assets directory exists, there must be some assets to copy over
+            if (fs.pathExistsSync(`${hook_root_dir}/assets/`)) {
+                sails.log.verbose(`${hook_log_header}::Copying assets...`);
+                fs.copySync(`${hook_root_dir}/assets/`, "assets/");
+                fs.copySync(`${hook_root_dir}/assets/`, ".tmp/public/");
+            }
+            //If assets directory exists, there must be some assets to copy over
+            if (fs.pathExistsSync(`${hook_root_dir}/views/`)) {
+                sails.log.verbose(`${hook_log_header}::Copying views...`);
+                fs.copySync(`${hook_root_dir}/views/`, "views/");
+            }
+            // check if the core exists when API definitions are present ...
+            if (fs.pathExistsSync(`${appPath}/api/core`) && fs.pathExistsSync(`${hook_root_dir}/api`) && !fs.pathExistsSync(`${hook_root_dir}/api/core`)) {
+                sails.log.verbose(`${hook_log_header}::Adding Symlink to API core... ${hook_root_dir}/api/core -> ${appPath}/api/core`);
+                // create core services symlink if not present
+                fs.ensureSymlinkSync(`${appPath}/api/core`, `${hook_root_dir}/api/core`);
+            }
+            sails.log.verbose(`${hook_log_header}::Adding custom API elements...`);
+            const apiDirs = ["services"];
+            const sailsDynamic = sails;
+            _.each(apiDirs, (apiType) => {
+                const files = this.walkDirSync(`${hook_root_dir}/api/${apiType}`, []);
+                if (!sailsDynamic[apiType]) {
+                    sailsDynamic[apiType] = {};
+                }
+                sails.log.verbose(`${hook_log_header}::Processing '${apiType}':`);
+                sails.log.verbose(JSON.stringify(files));
+                if (!_.isEmpty(files)) {
+                    _.each(files, (file) => {
+                        const apiDef = require(file);
+                        const globalName = (0, path_1.basename)(file, '.js');
+                        const apiElemName = globalName.toLowerCase();
+                        // TODO: deal with controllers or services in nested directories
+                        sailsDynamic[apiType][apiElemName] = apiDef;
+                        globalThis[globalName] = apiDef;
+                    });
+                }
+            });
+            const controllerDirs = ["controllers"];
+            _.each(controllerDirs, (apiType) => {
+                const files = that.walkDirSync(`${hook_root_dir}/api/${apiType}`, []);
+                sails.log.verbose(`${hook_log_header}::Processing '${apiType}':`);
+                sails.log.verbose(JSON.stringify(files));
+                if (!_.isEmpty(files)) {
+                    _.each(files, (file) => {
+                        const apiDef = require(file);
+                        const baseName = (0, path_1.basename)(file, '.js');
+                        const controllerName = (0, path_1.basename)(baseName, 'Controller');
+                        // sails[apiType][apiElemName] = apiDef;
+                        const sailsConfigWithControllers = sails.config;
+                        if (_.isEmpty(sailsConfigWithControllers.controllers)) {
+                            sailsConfigWithControllers.controllers = {};
+                        }
+                        if (_.isEmpty(sailsConfigWithControllers.controllers.moduleDefinitions)) {
+                            sailsConfigWithControllers.controllers.moduleDefinitions = {};
+                        }
+                        const moduleDefinitions = sailsConfigWithControllers.controllers.moduleDefinitions;
+                        _.forOwn(apiDef, (methodFn, methodName) => {
+                            if (!_.startsWith(methodName, '_') && _.isFunction(methodFn)) {
+                                sails.log.verbose(`Setting: ${controllerName}/${methodName}`);
+                                moduleDefinitions[`${controllerName}/${methodName}`] = methodFn;
+                            }
+                        });
+                    });
+                }
+            });
+            // for simple copying of API elements...
+            // Note: 'policies' removed - now loaded via api/hooks/redbox-core-loader
+            const apiCopyDirs = ['responses'];
+            for (const apiCopyDir of apiCopyDirs) {
+                const apiCopyFiles = this.walkDirSync(`${hook_root_dir}/api/${apiCopyDir}`, []);
+                if (!_.isEmpty(apiCopyFiles)) {
+                    for (const apiCopyFile of apiCopyFiles) {
+                        const dest = `${appPath}/api/${apiCopyDir}/${(0, path_1.basename)(apiCopyFile)}`;
+                        sails.log.verbose(`Copying ${apiCopyFile} to ${dest}`);
+                        fs.copySync(apiCopyFile, dest);
+                    }
+                }
+            }
+            sails.log.verbose(`${hook_log_header}::Adding custom API elements...completed.`);
+            sails.log.verbose(`${hookName}::Merge complete.`);
+        }
+        walkDirSync(dir, filelist = []) {
+            if (!fs.pathExistsSync(dir)) {
+                return filelist;
+            }
+            try {
+                const files = fs.readdirSync(dir).sort();
+                _.each(files, (file) => {
+                    const resolved = (0, path_1.resolve)(dir, file);
+                    if (fs.statSync(resolved).isDirectory()) {
+                        filelist = this.walkDirSync(resolved, filelist);
+                    }
+                    else {
+                        filelist.push(resolved);
+                    }
+                });
+            }
+            catch (e) {
+                sails.log.error(`Error walking directory: ${dir}`);
+                sails.log.error(e);
+            }
+            return filelist;
+        }
+        getDirsSync(srcPath) {
+            if (!fs.pathExistsSync(srcPath)) {
+                return [];
+            }
+            return fs.readdirSync(srcPath, { withFileTypes: true })
+                .filter(dirent => dirent.isDirectory())
+                .map(dirent => dirent.name);
+        }
+        mergeTranslationFiles(hook_root_dir, hook_log_header, overwriteOrig = false) {
+            const langCodes = this.getDirsSync(`${hook_root_dir}/locales`);
+            sails.log.verbose(`${hook_log_header}::Language codes to process: ${JSON.stringify(langCodes)}`);
+            for (const langCode of langCodes) {
+                const langBasePath = `locales/${langCode}/translation`;
+                const langJsonPath = `${langBasePath}.json`;
+                const langCsvPath = `${langBasePath}.csv`;
+                const language_file_path = (0, path_1.resolve)(`assets/${langJsonPath}`);
+                const hook_language_file_path = (0, path_1.resolve)(hook_root_dir, langJsonPath);
+                const hook_language_file_csv_path = (0, path_1.resolve)(hook_root_dir, langCsvPath);
+                const mergeFn = function () {
+                    // the actual merge
+                    if (fs.pathExistsSync(language_file_path) && fs.pathExistsSync(hook_language_file_path)) {
+                        sails.log.verbose(`${hook_log_header}::Merging '${langCode}' translation file...`);
+                        const mainTranslation = require(language_file_path);
+                        const hookTranslation = require(hook_language_file_path);
+                        _.merge(mainTranslation, hookTranslation);
+                        // if not overwriting the original, we save a copy of the 'core' version 
+                        if (!overwriteOrig) {
+                            const core_language_file_path = `assets/${langBasePath}-core.json`;
+                            if (!fs.pathExistsSync(core_language_file_path)) {
+                                fs.copySync(language_file_path, core_language_file_path);
+                            }
+                        }
+                        fs.writeFileSync(language_file_path, JSON.stringify(mainTranslation, null, 2));
+                    }
+                };
+                // check if the CSV version is there, and if so convert it
+                if (fs.pathExistsSync(hook_language_file_csv_path)) {
+                    // convert the CSV to JSON 
+                    this.csvToi18Next(hook_language_file_csv_path, hook_language_file_path, mergeFn);
+                }
+                else {
+                    mergeFn();
+                }
+            }
+        }
+        csvToi18Next(csvPath, jsonPath, cb) {
+            const csv = require('csv-parser');
+            const languageJson = {};
+            fs.createReadStream(csvPath)
+                .pipe(csv())
+                .on('data', (row) => {
+                languageJson[row.Key] = row.Message;
+            })
+                .on('end', () => {
+                let data = JSON.stringify(languageJson, null, "  ");
+                data = data.replace(/\\\\\\/g, '\\');
+                fs.writeFileSync(jsonPath, data);
+                cb();
+            });
+        }
+    }
+    Services.Config = Config;
+})(Services || (exports.Services = Services = {}));
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ConfigService.js","sourceRoot":"","sources":["../../src/services/ConfigService.ts"],"names":[],"mappings":"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"}

package/dist/services/ContrastService.d.ts

@@ -0,0 +1,77 @@
+import { Services as services } from '../CoreService';
+type TextSize = 'normal' | 'large';
+/**
+ * Represents a contrast ratio violation for a color pair
+ */
+export interface ContrastViolation {
+    /** Name identifier for the color pair */
+    pair: string;
+    /** Actual contrast ratio calculated */
+    ratio: number;
+    /** Minimum required ratio per WCAG AA */
+    required: number;
+    /** The two colors being compared [foreground, background] */
+    colors: [string, string];
+    /** Text size category affecting minimum ratio */
+    textSize: TextSize;
+}
+/**
+ * ContrastService
+ *
+ * Validate color contrast ratios using WCAG AA standards
+ * and provide suggestions for compliant color combinations.
+ *
+ * Usage: await ContrastService.validate(variablesMap)
+ * Returns: { valid: boolean, violations: ContrastViolation[] }
+ *
+ * Usage: await ContrastService.suggestCompliant(colorA, colorB)
+ * Returns: { suggested: string, originalRatio: number, newRatio: number }
+ */
+export declare namespace Services {
+    class Contrast extends services.Core.Service {
+        protected _exportedMethods: string[];
+        /**
+         * WCAG AA contrast requirements
+         * Normal text: 4.5:1, Large text: 3:1
+         */
+        private readonly WCAG_AA_NORMAL;
+        private readonly WCAG_AA_LARGE;
+        /**
+         * Convert hex color to RGB values
+         */
+        private hexToRgb;
+        /**
+         * Calculate relative luminance of a color
+         * Formula: https://www.w3.org/TR/WCAG21/#dfn-relative-luminance
+         */
+        getLuminance(color: string): number;
+        /**
+         * Calculate contrast ratio between two colors
+         * Formula: https://www.w3.org/TR/WCAG21/#dfn-contrast-ratio
+         */
+        calculateRatio(colorA: string, colorB: string): number;
+        /**
+         * Validate contrast ratios for defined color pairs
+         * Returns violations for pairs that don't meet WCAG AA standards
+         */
+        validate(variables: Record<string, string>): {
+            valid: boolean;
+            violations: ContrastViolation[];
+        };
+        /**
+         * Suggest a compliant color by adjusting the foreground color
+         * to meet contrast requirements with the background
+         */
+        suggestCompliant(foreground: string, background: string, textSize?: TextSize): {
+            suggested: string;
+            originalRatio: number;
+            newRatio: number;
+            adjustments: number;
+        };
+    }
+}
+declare global {
+    let ContrastService: Services.Contrast;
+}
+export {};
+//# sourceMappingURL=ContrastService.d.ts.map

package/dist/services/ContrastService.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ContrastService.d.ts","sourceRoot":"","sources":["../../src/services/ContrastService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,QAAQ,IAAI,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACtD,KAAK,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;AAEnC;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAC9B,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,uCAAuC;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,yCAAyC;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzB,iDAAiD;IACjD,QAAQ,EAAE,QAAQ,CAAC;CACtB;AAED;;;;;;;;;;;GAWG;AACH,yBAAiB,QAAQ,CAAC;IACtB,MAAa,QAAS,SAAQ,QAAQ,CAAC,IAAI,CAAC,OAAO;QAE/C,UAAmB,gBAAgB,EAAE,MAAM,EAAE,CAK3C;QAEF;;;WAGG;QACH,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAO;QACtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAO;QAErC;;WAEG;QACH,OAAO,CAAC,QAAQ;QAShB;;;WAGG;QACH,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;QAoBnC;;;WAGG;QACH,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;QAUtD;;;WAGG;QACH,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;YACzC,KAAK,EAAE,OAAO,CAAC;YACf,UAAU,EAAE,iBAAiB,EAAE,CAAC;SACnC;QA+DD;;;WAGG;QACH,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,GAAE,QAAmB,GAAG;YACrF,SAAS,EAAE,MAAM,CAAC;YAClB,aAAa,EAAE,MAAM,CAAC;YACtB,QAAQ,EAAE,MAAM,CAAC;YACjB,WAAW,EAAE,MAAM,CAAC;SACvB;KAiEJ;CACJ;AAED,OAAO,CAAC,MAAM,CAAC;IACX,IAAI,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC;CAC1C"}