baja-lite 1.0.7 → 1.0.16

package/es/sqlite.d.ts

@@ -23,14 +23,11 @@ export declare abstract class SqliteRemoteClass implements SqliteRemoteInterface
      */
     abstract setMod(name: string): void;
     abstract trace: boolean;
-    execute(dbName: string, sql?: string | undefined, params?: any): Promise<{
-        affectedRows: number;
-        insertId: bigint;
-    }>;
-    pluck<One_Row_Many_Column = any>(dbName: string, sql?: string | undefined, params?: any): Promise<One_Row_Many_Column | null>;
-    get<One_Row_Many_Column = any>(dbName: string, sql?: string | undefined, params?: any): Promise<One_Row_Many_Column | null>;
-    raw<Many_Row_One_Column = any>(dbName: string, sql?: string | undefined, params?: any): Promise<Many_Row_One_Column[]>;
-    query<Many_Row_Many_Column = any>(dbName: string, sql?: string | undefined, params?: any): Promise<Many_Row_Many_Column[]>;
+    execute(inData: Uint8Array): Promise<Uint8Array>;
+    pluck(inData: Uint8Array): Promise<Uint8Array>;
+    get(inData: Uint8Array): Promise<Uint8Array>;
+    raw(inData: Uint8Array): Promise<Uint8Array>;
+    query(inData: Uint8Array): Promise<Uint8Array>;
     initDB(dbName: string): Promise<void>;
     export(dbName: string): Promise<void>;
     restore(dbName: string): Promise<void>;

package/es/sqlite.js

@@ -1,14 +1,16 @@
-import { logger } from './sql';
+import { extensionCodec, logger } from './sql';
 import Sqlstring from 'sqlstring';
+import { encode, decode } from "@msgpack/msgpack";
 export class SqliteRemoteClass {
     constructor() {
         this.dbList = {};
     }
-    async execute(dbName, sql, params) {
+    async execute(inData) {
+        const [dbName, sql, params] = decode(inData);
+        logger.debug(sql, params ?? '');
         try {
-            logger.debug(sql, params ?? '');
             if (!sql) {
-                return { affectedRows: 0, insertId: 0n };
+                return encode({ affectedRows: 0, insertId: 0n }, { extensionCodec });
             }
             ;
             if (this.trace) {
@@ -19,7 +21,7 @@ export class SqliteRemoteClass {
                 logger.trace(result);
             }
             const { changes, lastInsertRowid } = result;
-            return { affectedRows: changes, insertId: lastInsertRowid ? BigInt(lastInsertRowid) : 0n };
+            return encode({ affectedRows: changes, insertId: lastInsertRowid ? BigInt(lastInsertRowid) : 0n }, { extensionCodec });
         }
         catch (error) {
             logger.error(`
@@ -30,17 +32,19 @@ export class SqliteRemoteClass {
             throw error;
         }
     }
-    async pluck(dbName, sql, params) {
+    async pluck(inData) {
+        const [dbName, sql, params] = decode(inData);
+        logger.debug(sql, params ?? '');
         try {
             logger.debug(sql, params ?? '');
             if (!sql) {
-                return null;
+                return encode(null);
             }
             ;
             if (this.trace) {
                 logger.trace(Sqlstring.format(sql, params));
             }
-            return this.dbList[dbName].prepare(sql).pluck().get(params ?? {});
+            return encode(this.dbList[dbName].prepare(sql).pluck().get(params ?? {}), { extensionCodec });
         }
         catch (error) {
             logger.error(`
@@ -51,17 +55,14 @@ export class SqliteRemoteClass {
             throw error;
         }
     }
-    async get(dbName, sql, params) {
+    async get(inData) {
+        const [dbName, sql, params] = decode(inData);
+        logger.debug(sql, params ?? '');
         try {
-            logger.debug(sql, params ?? '');
-            if (!sql) {
-                return null;
-            }
-            ;
             if (this.trace) {
                 logger.trace(Sqlstring.format(sql, params));
             }
-            return this.dbList[dbName].prepare(sql).get(params ?? {});
+            return encode(this.dbList[dbName].prepare(sql).get(params ?? {}), { extensionCodec });
         }
         catch (error) {
             logger.error(`
@@ -72,17 +73,18 @@ export class SqliteRemoteClass {
             throw error;
         }
     }
-    async raw(dbName, sql, params) {
+    async raw(inData) {
+        const [dbName, sql, params] = decode(inData);
+        logger.debug(sql, params ?? '');
         try {
-            logger.debug(sql, params ?? '');
             if (!sql) {
-                return [];
+                return encode([]);
             }
             ;
             if (this.trace) {
                 logger.trace(Sqlstring.format(sql, params));
             }
-            return this.dbList[dbName].prepare(sql).raw().all(params ?? {});
+            return encode(this.dbList[dbName].prepare(sql).raw().all(params ?? {}), { extensionCodec });
         }
         catch (error) {
             logger.error(`
@@ -93,17 +95,18 @@ export class SqliteRemoteClass {
             throw error;
         }
     }
-    async query(dbName, sql, params) {
+    async query(inData) {
+        const [dbName, sql, params] = decode(inData);
+        logger.debug(sql, params ?? '');
         try {
-            logger.debug(sql, params ?? '');
             if (!sql) {
-                return [];
+                encode([]);
             }
             ;
             if (this.trace) {
                 logger.trace(Sqlstring.format(sql, params));
             }
-            return this.dbList[dbName].prepare(sql).all(params ?? {});
+            return encode(this.dbList[dbName].prepare(sql).all(params ?? {}), { extensionCodec });
         }
         catch (error) {
             logger.error(`

package/es/test-mysql.js

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import 'reflect-metadata';
 import { Boot } from './boot';
-import { SqlService, Field, DB, DBType, SqlType, ColumnMode, } from './sql';
+import { SqlService, Field, DB, DBType, SqlType, ColumnMode, SelectResult, } from './sql';
 class AmaFuck2 {
 }
 __decorate([
@@ -31,6 +31,12 @@ AmaService2 = __decorate([
         tableName: 'ama_fuck', clz: AmaFuck2, dbType: DBType.Mysql
     })
 ], AmaService2);
+// interface Menu {
+//     resourceid: string;
+//     resourcepid: string;
+//     resourcename: string;
+//     children: Menu[];
+// }
 export async function go2() {
     await Boot({
         Mysql: {
@@ -44,7 +50,10 @@ export async function go2() {
         },
         log: 'info',
         columnMode: ColumnMode.HUMP,
-        sqlDir: 'E:/pro/baja-lite/xml'
+        sqlDir: 'E:/pro/baja-lite/xml',
+        sqlMap: {
+            ['test.test']: `SELECT * FROM cp_user {{#username}} WHERE username = :username {{/username}}`
+        }
     });
     const service = new AmaService2();
     await service.transaction({
@@ -96,13 +105,12 @@ export async function go2() {
             //     templateResult: TemplateResult.Many
             // })
             // console.log(44, rt4);
-            // const rt5 = await service.select<string>({
-            //     sql: `SELECT seller_sku FROM ama_fuck WHERE seller_sku LIKE CONCAT(:sku, '%');SELECT seller_sku FROM ama_fuck WHERE seller_sku LIKE CONCAT(:sku, '%');SELECT seller_sku FROM ama_fuck WHERE seller_sku LIKE CONCAT(:sku, '%')`,
-            //     params: { sku: 'SellerSKU4' },
-            //     selectResult: SelectResult.Many_Row_One_Column,
-            //     multiple: true
-            // })
-            // console.log(55, rt5);
+            const rt5 = await service.select({
+                sqlId: 'test.test',
+                params: { username: '1111' },
+                selectResult: SelectResult.RS_CS
+            });
+            console.log(55, rt5.length);
             // const rt6 = await service.stream().eq('sellerSku', 'SellerSKU1').excuteSelect({
             //     selectResult: SelectResult.Many_Row_Many_Column,
             // });
@@ -110,18 +118,18 @@ export async function go2() {
             return 1;
         }
     });
-    const data = await service.select({
-        sql: 'SELECT resourceid, resourcepid,resourcename FROM cp_resource ',
-        params: {
-            site: '1234',
-            matchInfo: { reportType: 'yyyy', id: '11' }
-        },
-        // mapper: [
-        //     ['site', ['info', 'bSist'], 989],
-        //     ['site', ['info2', 'bSist'], 33],
-        //     ['site', ['Bsite'], 0]
-        // ]
-    });
-    console.log(data);
+    // const data = await service.select<Menu>({
+    //     sql: 'SELECT resourceid, resourcepid,resourcename FROM cp_resource ',
+    //     params: {
+    //         site: '1234',
+    //         matchInfo: { reportType: 'yyyy', id: '11' }
+    //     },
+    //     // mapper: [
+    //     //     ['site', ['info', 'bSist'], 989],
+    //     //     ['site', ['info2', 'bSist'], 33],
+    //     //     ['site', ['Bsite'], 0]
+    //     // ]
+    // });
+    // console.log(data);
 }
 go2();

package/package.json

@@ -1,70 +1,70 @@
-{
-  "name": "baja-lite",
-  "version": "1.0.7",
-  "description": "some util for self",
-  "homepage": "https://github.com/void-soul/util-man",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/void-soul/util-man.git"
-  },
-  "license": "MIT",
-  "author": "void-soul",
-  "exports": {
-    ".": {
-      "types": "./es/index.d.ts",
-      "import": "./es/index.js",
-      "require": "./cjs/index.js"
-    },
-    "./*": "./*"
-  },
-  "bin": {
-    "baja": "./cjs/code.js"
-  },
-  "main": "./cjs/index.js",
-  "types": "./es/index.d.ts",
-  "scripts": {
-    "dist": "bun ./ci.ts",
-    "mysql": "bun --inspect ./src/test-mysql.ts",
-    "xml": "bun --inspect ./src/test-xml.ts",
-    "mysql2": "node inspect ./dist/cjs/test-mysql.js",
-    "sqlite": "node inspect ./dist/cjs/test-sqlite.js"
-  },
-  "dependencies": {
-    "@types/lodash.get": "^4.4.9",
-    "decimal.js": "10.4.3",
-    "html-parse-stringify": "3.0.1",
-    "iterare": "1.2.1",
-    "lodash.get": "^4.4.2",
-    "mustache": "4.2.0",
-    "pino": "9.2.0",
-    "pino-pretty": "11.2.1",
-    "reflect-metadata": "0.2.2",
-    "sql-formatter": "15.3.2",
-    "sqlstring": "2.3.3",
-    "tslib": "2.6.3"
-  },
-  "devDependencies": {
-    "@types/better-sqlite3": "7.6.10",
-    "@types/mustache": "4.2.5",
-    "@types/node": "20.14.9",
-    "@types/sqlstring": "2.3.2",
-    "@typescript-eslint/eslint-plugin": "7.14.1",
-    "@typescript-eslint/parser": "7.14.1",
-    "better-sqlite3": "11.0.0",
-    "ioredis": "5.4.1",
-    "mongodb": "6.7.0",
-    "mysql2": "3.10.1",
-    "redlock": "5.0.0-beta.2",
-    "shelljs": "0.8.5",
-    "typescript": "5.5.2"
-  },
-  "engines": {
-    "node": "20",
-    "npm": ">= 6.13.4",
-    "yarn": ">= 1.22.19"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "models": "./es/index.js"
-}
+{
+  "name": "baja-lite",
+  "version": "1.0.16",
+  "description": "some util for self",
+  "homepage": "https://github.com/void-soul/util-man",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/void-soul/util-man.git"
+  },
+  "license": "MIT",
+  "author": "void-soul",
+  "exports": {
+    ".": {
+      "types": "./es/index.d.ts",
+      "import": "./es/index.js",
+      "require": "./cjs/index.js"
+    },
+    "./*": "./*"
+  },
+  "bin": {
+    "baja": "./cjs/code.js"
+  },
+  "main": "./cjs/index.js",
+  "types": "./es/index.d.ts",
+  "scripts": {
+    "dist": "node ./ci.js",
+    "mysql": "bun --inspect ./src/test-mysql.ts",
+    "xml": "bun --inspect ./src/test-xml.ts",
+    "mysql2": "node inspect ./dist/cjs/test-mysql.js",
+    "sqlite": "node inspect ./dist/cjs/test-sqlite.js"
+  },
+  "dependencies": {
+    "@msgpack/msgpack": "3.0.0-beta2",
+    "@types/lodash.get": "4.4.9",
+    "@types/shelljs": "0.8.15",
+    "decimal.js": "10.4.3",
+    "html-parse-stringify": "3.0.1",
+    "iterare": "1.2.1",
+    "lodash.get": "4.4.2",
+    "mustache": "4.2.0",
+    "pino": "9.3.2",
+    "pino-pretty": "11.2.2",
+    "reflect-metadata": "0.2.2",
+    "sql-formatter": "15.3.2",
+    "sqlstring": "2.3.3",
+    "tslib": "2.6.3"
+  },
+  "devDependencies": {
+    "@types/better-sqlite3": "7.6.11",
+    "@types/mustache": "4.2.5",
+    "@types/node": "22.0.3",
+    "@types/sqlstring": "2.3.2",
+    "@typescript-eslint/eslint-plugin": "8.0.0",
+    "@typescript-eslint/parser": "8.0.0",
+    "better-sqlite3": "11.1.2",
+    "ioredis": "5.4.1",
+    "mongodb": "6.8.0",
+    "mysql2": "3.11.0",
+    "redlock": "5.0.0-beta.2",
+    "shelljs": "0.8.5",
+    "typescript": "5.5.4"
+  },
+  "engines": {
+    "node": ">=20"
+  },
+  "models": "./es/index.js",
+  "publishConfig": {
+    "access": "public"
+  }
+}

package/src/boot-remote.ts

@@ -1,4 +1,5 @@
-import { _primaryDB, _dao, logger, DBType, _sqlCache, _GlobalSqlOption, GlobalSqlOptionForWeb, _defOption, SqlCache, SqliteRemote, _Hump, ColumnMode } from './sql';
+import { getEnums } from './enum';
+import { _primaryDB, _dao, logger, DBType, _sqlCache, _GlobalSqlOption, GlobalSqlOptionForWeb, _defOption, SqlCache, SqliteRemote, _Hump, ColumnMode, _enums } from './sql';
 
 export const BootRomote = async function (options: GlobalSqlOptionForWeb) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption, options);
@@ -11,6 +12,9 @@ export const BootRomote = async function (options: GlobalSqlOptionForWeb) {
     globalThis[_dao] = {
         [DBType.SqliteRemote]: {},
     };
+    if (options.enums) {
+        globalThis[_enums] = getEnums(options.enums);
+    }
     if (options.SqliteRemote) {
         if (typeof options.SqliteRemote.db === 'string') {
             await options.SqliteRemote.service.initDB(options.SqliteRemote.db);

package/src/boot.ts

@@ -1,4 +1,5 @@
-import { _GlobalSqlOption, GlobalSqlOption, _EventBus, _defOption, logger, _sqlCache, SqlCache, _dao, DBType, _primaryDB, SqliteRemote, _fs, _path, Mysql, Sqlite, _Hump, ColumnMode } from './sql';
+import { getEnums } from './enum';
+import { _GlobalSqlOption, GlobalSqlOption, _enums, _EventBus, _defOption, logger, _sqlCache, SqlCache, _dao, DBType, _primaryDB, SqliteRemote, _fs, _path, Mysql, Sqlite, _Hump, ColumnMode } from './sql';
 
 export const Boot = async function (options: GlobalSqlOption) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption, options);
@@ -19,6 +20,9 @@ export const Boot = async function (options: GlobalSqlOption) {
         [DBType.SqliteRemote]: {},
         [DBType.Redis]: {}
     };
+    if (options.enums) {
+        globalThis[_enums] = getEnums(options.enums);
+    }
     if (options.Mysql) {
         const { createPool } = await import('mysql2/promise');
         if (options.Mysql['host']) {

package/src/code.ts

@@ -4,6 +4,7 @@ import fs from 'fs';
 import { start } from 'repl';
 import { createPool } from 'mysql2/promise';
 import mustache from 'mustache';
+import { mkdir } from 'shelljs';
 
 const lxMap = {
     tinyint: "number",
@@ -75,7 +76,10 @@ console.log(`
             "s": ["entity", "controller", "service", "sql", "module"]
         },
         "output": "{ClassName}Module",
-        "id"? : "uuidShort: true, notNull: true, uuid: true"
+        "id"? : "uuidShort: true, notNull: true, uuid: true",
+        "logicDeleteK"?: "逻辑删除字段名",
+        "logicDeleteV"?: "逻辑删除值",如果是字符串需要这样 logicDeleteV: "'0'"
+        "NotlogicDeleteV"?: "未逻辑删除值",如果是字符串需要这样 NotlogicDeleteV: "'0'"
     }
     command是生成命令，这里声明命令同时定义文件生成路径:可用下面的变量替换.同时必须有同名模板.
     路径是相对于项目根目录的
@@ -116,6 +120,8 @@ console.log(`
 
         modelName: 模块名称，可能为空字符串
         modelPath: 模块名称实际就影响访问路径，所以这里会直接拼好controller的模块访问路径，如果模块为空，则该属性就是空字符串,否则是 /模块名称/
+
+        logicDelete: 逻辑删除的查询条件，可以附加在sql条件的末尾，可能是空的
     -----
     命令 table1,table2,table3:模块名称
     table=. 表示扫描全库表
@@ -128,7 +134,21 @@ console.log(`
 try {
     const outputs = new Set<string>();
     const _configData = fs.readFileSync(config, { encoding: 'utf-8' }).toString();
-    const configData = JSON.parse(_configData);
+    const configData = JSON.parse(_configData) as {
+        host: string;
+        port: number;
+        user: string;
+        password: string;
+        database: string;
+        command: Record<string, string>;
+        commands: Record<string, string[]>;
+        output: string;
+        id: string;
+        logicDeleteK: string;
+        logicDeleteV: number;
+        NotlogicDeleteV: number;
+        tables: string;
+    };
     const templates = Object.fromEntries(fs.readdirSync(templatePath).map(r => [path.basename(r, '.mu'), fs.readFileSync(path.join(templatePath, r), { encoding: 'utf-8' }).toString()]));
     const pool = createPool({
         host: configData.host,
@@ -139,7 +159,7 @@ try {
     });
     async function getTables(tableName: string) {
         const conn = await pool.getConnection();
-        const params = [configData.database];
+        const params: (string | string[])[] = [configData.database];
         let sql = `
         SELECT TABLE_NAME tableName, IFNULL(TABLE_COMMENT, TABLE_NAME) title FROM information_schema.TABLES
         WHERE TABLE_SCHEMA= ? AND TABLE_TYPE = 'BASE TABLE'`;
@@ -165,12 +185,14 @@ try {
                 COLUMN_COMMENT \`comment\`
             FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=? AND TABLE_NAME = ?;
         `, [configData.database, tableName]);
+        let logicDelete = '';
         const columns = result.map(r => {
             if (r.id === 1) { r.id = true; }
             else delete r.id;
             if (r.notNull === 1) { r.notNull = true; }
             else delete r.notNull;
-            r.comment = `* ${r.comment ?? ''}(\`${tableName}.${r.name}\`)`;
+
+
             const fields = new Array<string>(`type:SqlType.${r.type}`);
             if (r.length !== null) { fields.push(`length:${r.length}`); }
             if (r.scale !== null) { fields.push(`scale:${r.scale}`); }
@@ -189,6 +211,12 @@ try {
             if (r.id === true && configData.id) {
                 fields.push(configData.id);
             }
+            if (r.name === configData.logicDeleteK) {
+                fields.push(`logicDelete: ${configData.logicDeleteV}`);
+                logicDelete = `AND ${r.name} = ${configData.NotlogicDeleteV}`;
+            }
+            if (r.comment) { fields.push(`comment: '${r.comment}'`); }
+            r.comment = r.comment ?? '';
             r.Type = lxMap[r.type];
             r.Field = `@Field({${fields.join(',')}})`;
             r.Name = r.name.replace(/_(\w)/g, (a: string, b: string) => b.toUpperCase());
@@ -196,7 +224,7 @@ try {
             return r;
         });
         conn.release();
-        return columns;
+        return { columns, logicDelete };
     }
     async function excute(command: string, input: string, modelName: string) {
         const tables = await getTables(input);
@@ -210,7 +238,7 @@ try {
         modelName ??= '';
         const modelPath = modelName ? `/${modelName}/` : '';
         for (const { tableName, title } of tables) {
-            const columns = await getColumns(tableName);
+            const { columns, logicDelete } = await getColumns(tableName);
             const className = tableName.replace(/_(\w)/g, (a: string, b: string) => b.toUpperCase());
             const ClassName = className.replace(/\w/, (v: string) => v.toUpperCase());
             const vueName = tableName.replace(/_/g, '-');
@@ -245,7 +273,9 @@ try {
                 IdNames_join: columns?.filter(i => i.id).map(i => i.Name).join(','),
 
                 modelName,
-                modelPath
+                modelPath,
+
+                logicDelete
             };
             const template = templates[command];
             if (!template) {
@@ -253,15 +283,16 @@ try {
                 return;
             }
             const txt = mustache.render(template, data, {}, ['<%', '%>']);
-            const fileName = configData.command[command].replace(/{([a-zA-Z]+)}/g, (a: string, b: string) => data[b]);
+            const fileName = configData.command[command]!.replace(/{([a-zA-Z]+)}/g, (a: string, b: string) => data[b]);
             const filePath = path.join(basepath, fileName);
             const dirname = path.dirname(filePath);
-            try {
-                fs.statSync(dirname);
-            } catch (error) {
-                fs.mkdirSync(dirname);
-                console.info(`[生成] ${dirname}`);
-            }
+            mkdir('-p', dirname);
+            // try {
+            //     fs.statSync(dirname);
+            // } catch (error) {
+            //     fs.mkdirSync(dirname);
+            //     console.info(`[生成] ${dirname}`);
+            // }
             try {
                 fs.statSync(filePath);
                 if (force === false) {

package/src/convert-xml.ts

@@ -1,3 +1,4 @@
+import LGet from 'lodash.get';
 export interface XML {
     type: 'tag' | 'text';
     name: string;
@@ -100,8 +101,7 @@ const convertParametersInner = function (change: string, convertString: string,
         for (let i = 0; i < _stringTarget.length; i++) {
             target = _stringTarget[i];
             const t = target!.replace(change + '{', '').replace('}', '');
-            let tempParamKey = eval('param.' + t);
-
+            let tempParamKey = LGet(param, t);
             if (tempParamKey !== undefined) {
                 const reg = new RegExp('\\' + change + '{' + t + '}', 'g');
 

package/src/enum.ts

@@ -1,8 +1,10 @@
+import { _enums } from "./sql";
+
 export class Enum {
   private _value: string;
   private _desc: string;
   private _config: string[];
-  constructor (value: string, desc: string, ...config: string[]) {
+  constructor(value: string, desc: string, ...config: string[]) {
     this._value = value;
     this._desc = desc;
     this._config = config;
@@ -15,9 +17,9 @@ export class Enum {
       return false;
     }
     if (typeof value === 'number') {
-      return this._value === `${ value }`;
+      return this._value === `${value}`;
     }
-    return this._value === `${ value }`;
+    return this._value === `${value}`;
   }
   value(): string {
     return this._value;
@@ -29,3 +31,41 @@ export class Enum {
     return this._config;
   }
 }
+export type EnumMap = Record<string, Enum>;
+export type GlobalArray = Record<string, Array<[string, string]>>;
+export type GlobalMap = Record<string, Record<string, string>>;
+export interface EnmuJson {
+  GlobalArray: GlobalArray;
+  GlobalMap: GlobalMap;
+}
+let configData: EnmuJson | null = null;
+export const getEnums = (GlobalValues?: EnumMap): EnmuJson => {
+  if (!GlobalValues) {
+    return globalThis[_enums];
+  }
+  if (configData) {
+    return configData;
+  }
+  const result: EnmuJson = {
+    GlobalArray: {},
+    GlobalMap: {}
+  };
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+  Object.keys(GlobalValues).forEach((item) => {
+    // const guess = /([\w\W]+)_([^_]+)$/.exec(item);
+    const guess = item.replace(new RegExp(`_${GlobalValues[item]!.value()}`, 'i'), '');
+    if (guess) {
+      if (!result.GlobalArray[guess]) {
+        result.GlobalArray[guess] = [];
+      }
+      result.GlobalArray[guess]!.push([GlobalValues[item]!.value(), GlobalValues[item]!.desc()]);
+
+      if (!result.GlobalMap[guess]) {
+        result.GlobalMap[guess] = {};
+      }
+      result.GlobalMap[guess]![GlobalValues[item]!.value()] = GlobalValues[item]!.desc();
+    }
+  });
+  configData = result;
+  return result;
+};