nestjs-typeorm3-kit 0.1.7 → 0.2.0

package/dist/module/decorator/index.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChildModule = ChildModule;
-const validate_module_keys_util_1 = require("@nestjs/common/utils/validate-module-keys.util");
 const constants_1 = require("@nestjs/common/constants");
+const validate_module_keys_util_1 = require("@nestjs/common/utils/validate-module-keys.util");
 const swagger_1 = require("@nestjs/swagger");
-const PREFIX_METADATA = '__prefix___';
 function fixPath(strInput) {
     let path = strInput;
     const regex = new RegExp('//', 'g');
@@ -22,30 +21,200 @@ const toPascalCase = (str) => {
         .replace(new RegExp(/\s/, 'g'), '')
         .replace(new RegExp(/\w/), s => s.toUpperCase());
 };
+const SCOPED_IMPORTS = Symbol('child-module:scoped-imports');
+const scopedModuleCache = new WeakMap();
+const scopedDynamicCache = new WeakMap();
+function pathOf(moduleType) {
+    const path = Reflect.getMetadata(constants_1.MODULE_PATH, moduleType);
+    return typeof path === 'string' ? fixPath(path) : '';
+}
+function isDynamicModule(item) {
+    return !!item && typeof item === 'object' && 'module' in item;
+}
+function isForwardReference(item) {
+    return !!item && typeof item === 'object' && 'forwardRef' in item;
+}
+function scopeModule(moduleType, parentPath) {
+    if (!parentPath) {
+        return moduleType;
+    }
+    let byPath = scopedModuleCache.get(moduleType);
+    const existing = byPath === null || byPath === void 0 ? void 0 : byPath.get(parentPath);
+    if (existing) {
+        return existing;
+    }
+    if (!byPath) {
+        byPath = new Map();
+        scopedModuleCache.set(moduleType, byPath);
+    }
+    class ScopedModule {
+        constructor(...args) {
+            return Reflect.construct(moduleType, args, new.target);
+        }
+    }
+    Object.setPrototypeOf(ScopedModule.prototype, moduleType.prototype);
+    byPath.set(parentPath, ScopedModule);
+    Object.defineProperty(ScopedModule, 'name', { value: moduleType.name });
+    for (const key of Reflect.getMetadataKeys(moduleType)) {
+        Reflect.defineMetadata(key, Reflect.getMetadata(key, moduleType), ScopedModule);
+    }
+    const path = fixPath(`${parentPath}/${pathOf(moduleType)}`);
+    Reflect.defineMetadata(constants_1.MODULE_PATH, path ? `/${path}` : '', ScopedModule);
+    const imports = Reflect.getMetadata('imports', moduleType);
+    if (imports) {
+        const importParentPath = Reflect.getMetadata(SCOPED_IMPORTS, moduleType) ? parentPath : path;
+        const scoped = scopeLists(imports, Reflect.getMetadata('exports', moduleType), importParentPath);
+        Reflect.defineMetadata('imports', scoped.imports, ScopedModule);
+        Reflect.defineMetadata(SCOPED_IMPORTS, true, ScopedModule);
+        if (scoped.exports) {
+            Reflect.defineMetadata('exports', scoped.exports, ScopedModule);
+        }
+    }
+    return ScopedModule;
+}
+function scopeDynamicModule(item, parentPath) {
+    if (!parentPath) {
+        return item;
+    }
+    let byPath = scopedDynamicCache.get(item);
+    const existing = byPath === null || byPath === void 0 ? void 0 : byPath.get(parentPath);
+    if (existing) {
+        return existing;
+    }
+    if (!byPath) {
+        byPath = new Map();
+        scopedDynamicCache.set(item, byPath);
+    }
+    const scoped = Object.fromEntries(Object.entries(item));
+    byPath.set(parentPath, scoped);
+    scoped.module = scopeModule(item.module, parentPath);
+    if (item.imports) {
+        const importParentPath = item[SCOPED_IMPORTS]
+            ? parentPath
+            : fixPath(pathOf(scoped.module));
+        const lists = scopeLists(item.imports, item.exports, importParentPath);
+        scoped.imports = lists.imports;
+        if (lists.exports) {
+            scoped.exports = lists.exports;
+        }
+        scoped[SCOPED_IMPORTS] = true;
+    }
+    return scoped;
+}
+function scopeImport(item, parentPath) {
+    if (!parentPath) {
+        return item;
+    }
+    if (typeof item === 'function') {
+        return scopeModule(item, parentPath);
+    }
+    if (item instanceof Promise) {
+        return item.then(resolved => scopeImport(resolved, parentPath));
+    }
+    if (isDynamicModule(item)) {
+        return scopeDynamicModule(item, parentPath);
+    }
+    if (isForwardReference(item)) {
+        return {
+            forwardRef: () => scopeImport(item.forwardRef(), parentPath),
+        };
+    }
+    return item;
+}
+function scopeLists(imports, exports, parentPath) {
+    if (!parentPath) {
+        return { imports, exports };
+    }
+    const scopedByOriginal = new Map();
+    const remember = (item, scoped) => {
+        if (typeof item === 'function' && typeof scoped === 'function') {
+            scopedByOriginal.set(item, scoped);
+        }
+        else if (isDynamicModule(item) && isDynamicModule(scoped)) {
+            scopedByOriginal.set(item.module, scoped.module);
+        }
+    };
+    const scopedImports = imports.map(item => {
+        if (item instanceof Promise) {
+            return item.then(resolved => {
+                const scoped = scopeImport(resolved, parentPath);
+                remember(resolved, scoped);
+                return scoped;
+            });
+        }
+        const scoped = scopeImport(item, parentPath);
+        remember(item, scoped);
+        return scoped;
+    });
+    if (!exports) {
+        return { imports: scopedImports };
+    }
+    const hasForwardImports = imports.some(isForwardReference);
+    const hasPromiseImports = imports.some(item => item instanceof Promise);
+    const scopedExports = exports.map(item => {
+        var _a;
+        if (isForwardReference(item)) {
+            return { forwardRef: () => scopeImport(item.forwardRef(), parentPath) };
+        }
+        if (typeof item === 'function') {
+            const direct = scopedByOriginal.get(item);
+            if (direct)
+                return direct;
+            if (hasForwardImports || hasPromiseImports) {
+                return {
+                    forwardRef: () => {
+                        const resolved = scopedByOriginal.get(item);
+                        if (resolved)
+                            return resolved;
+                        const matches = imports.some(ref => {
+                            if (!isForwardReference(ref))
+                                return false;
+                            const resolved = ref.forwardRef();
+                            return resolved === item || (isDynamicModule(resolved) && resolved.module === item);
+                        });
+                        return matches ? scopeModule(item, parentPath) : item;
+                    },
+                };
+            }
+            return item;
+        }
+        if (isDynamicModule(item)) {
+            return (_a = scopedByOriginal.get(item.module)) !== null && _a !== void 0 ? _a : item;
+        }
+        return item;
+    });
+    return { imports: scopedImports, exports: scopedExports };
+}
 function ChildModule(childMetadata) {
-    let { prefix = '', ...metadata } = childMetadata;
+    const { prefix = '', ...metadata } = childMetadata || {};
     const propsKeys = Object.keys(metadata);
     (0, validate_module_keys_util_1.validateModuleKeys)(propsKeys);
     return target => {
-        console.log('=====ChildModule=====');
-        for (const property in metadata) {
-            if (metadata.hasOwnProperty(property)) {
-                Reflect.defineMetadata(property, metadata[property], target);
-            }
-        }
+        var _a;
         const defPrefix = fixPath(prefix);
-        Reflect.defineMetadata(constants_1.MODULE_PATH, defPrefix ? '/' + defPrefix : defPrefix, target);
-        const data = metadata['imports'] || [];
-        data.forEach(item => {
-            const childPath = Reflect.getMetadata(constants_1.MODULE_PATH, item) || '';
-            const mixPath = fixPath(defPrefix + childPath);
-            Reflect.defineMetadata(constants_1.MODULE_PATH, mixPath ? '/' + mixPath : mixPath, item);
-        });
-        const controllers = metadata['controllers'] || [];
-        controllers.forEach(ctr => {
+        const scoped = metadata.imports
+            ? scopeLists(metadata.imports, metadata.exports, defPrefix)
+            : undefined;
+        for (const property of Object.keys(metadata)) {
+            const value = property === 'imports'
+                ? scoped === null || scoped === void 0 ? void 0 : scoped.imports
+                : property === 'exports'
+                    ? ((_a = scoped === null || scoped === void 0 ? void 0 : scoped.exports) !== null && _a !== void 0 ? _a : metadata.exports)
+                    : metadata[property];
+            Reflect.defineMetadata(property, value, target);
+        }
+        if (metadata.imports) {
+            Reflect.defineMetadata(SCOPED_IMPORTS, true, target);
+        }
+        Reflect.defineMetadata(constants_1.MODULE_PATH, defPrefix ? `/${defPrefix}` : defPrefix, target);
+        const controllers = metadata.controllers || [];
+        for (const ctr of controllers) {
+            if (!ctr) {
+                continue;
+            }
             const groupName = prefix ? `[${toPascalCase(prefix)}] ${ctr.name}` : `[API]${ctr.name}`;
             (0, swagger_1.ApiTags)(groupName)(ctr);
-        });
+        }
     };
 }
 //# sourceMappingURL=index.js.map

package/dist/module/decorator/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/module/decorator/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/module/decorator/index.ts"],"names":[],"mappings":"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"}

package/dist/repository/config/constants.d.ts

@@ -1,5 +1,6 @@
 export declare const ENTITY_METADATA_KEY = "custom-repo:entity";
 export declare const DEFAULT_CONNECTION_NAME = "default";
+export declare const DEFAULT_DATA_SOURCE_NAME = "default";
 export declare const DEF_REPO_DYNAMIC_PROVIDERS = "DEF_REPO_DYNAMIC_PROVIDERS";
 export declare const DEF_REPOSITORY_OPTIONS = "DEF_REPOSITORY_OPTIONS";
 //# sourceMappingURL=constants.d.ts.map

package/dist/repository/config/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/repository/config/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,uBAAuB,CAAC;AACxD,eAAO,MAAM,uBAAuB,YAAY,CAAC;AACjD,eAAO,MAAM,0BAA0B,+BAA+B,CAAC;AACvE,eAAO,MAAM,sBAAsB,2BAA2B,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/repository/config/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,uBAAuB,CAAC;AACxD,eAAO,MAAM,uBAAuB,YAAY,CAAC;AACjD,eAAO,MAAM,wBAAwB,YAAY,CAAC;AAClD,eAAO,MAAM,0BAA0B,+BAA+B,CAAC;AACvE,eAAO,MAAM,sBAAsB,2BAA2B,CAAC"}

package/dist/repository/config/constants.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEF_REPOSITORY_OPTIONS = exports.DEF_REPO_DYNAMIC_PROVIDERS = exports.DEFAULT_CONNECTION_NAME = exports.ENTITY_METADATA_KEY = void 0;
+exports.DEF_REPOSITORY_OPTIONS = exports.DEF_REPO_DYNAMIC_PROVIDERS = exports.DEFAULT_DATA_SOURCE_NAME = exports.DEFAULT_CONNECTION_NAME = exports.ENTITY_METADATA_KEY = void 0;
 exports.ENTITY_METADATA_KEY = 'custom-repo:entity';
 exports.DEFAULT_CONNECTION_NAME = 'default';
+exports.DEFAULT_DATA_SOURCE_NAME = 'default';
 exports.DEF_REPO_DYNAMIC_PROVIDERS = 'DEF_REPO_DYNAMIC_PROVIDERS';
 exports.DEF_REPOSITORY_OPTIONS = 'DEF_REPOSITORY_OPTIONS';
 //# sourceMappingURL=constants.js.map

package/dist/repository/config/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/repository/config/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,mBAAmB,GAAG,oBAAoB,CAAC;AAC3C,QAAA,uBAAuB,GAAG,SAAS,CAAC;AACpC,QAAA,0BAA0B,GAAG,4BAA4B,CAAC;AAC1D,QAAA,sBAAsB,GAAG,wBAAwB,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/repository/config/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,mBAAmB,GAAG,oBAAoB,CAAC;AAC3C,QAAA,uBAAuB,GAAG,SAAS,CAAC;AACpC,QAAA,wBAAwB,GAAG,SAAS,CAAC;AACrC,QAAA,0BAA0B,GAAG,4BAA4B,CAAC;AAC1D,QAAA,sBAAsB,GAAG,wBAAwB,CAAC"}

package/dist/repository/config/types.d.ts

@@ -1,8 +1,8 @@
 import { EntityManager, EntityTarget, FindOneOptions, ObjectLiteral, QueryRunner, Repository as TypeOrmRepository } from "typeorm";
 export interface Repository extends Function {
-    new (target: EntityTarget<any>, manager: EntityManager, queryRunner?: QueryRunner): TypeOrmRepository<ObjectLiteral>;
+    new (target: EntityTarget<any>, manager: EntityManager, queryRunner?: QueryRunner): TypeOrmRepository<any>;
 }
-export declare class RepositoryWrapper<Entity> extends TypeOrmRepository<Entity> {
+export declare class RepositoryWrapper<Entity extends ObjectLiteral> extends TypeOrmRepository<Entity> {
     findOne(options?: FindOneOptions<Entity>): Promise<Entity | null>;
 }
 //# sourceMappingURL=types.d.ts.map

package/dist/repository/config/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/repository/config/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,YAAY,EACZ,cAAc,EACd,aAAa,EACb,WAAW,EACX,UAAU,IAAI,iBAAiB,EAChC,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,UAAW,SAAQ,QAAQ;IAC1C,KACE,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,EACzB,OAAO,EAAE,aAAa,EACtB,WAAW,CAAC,EAAE,WAAW,GACxB,iBAAiB,CAAC,aAAa,CAAC,CAAC;CACrC;AAED,qBAAa,iBAAiB,CAAC,MAAM,CAAE,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IACvD,OAAO,CACpB,OAAO,CAAC,EAAE,cAAc,CAAC,MAAM,CAAC,GAC/B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CAoB1B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/repository/config/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,YAAY,EAEZ,cAAc,EACd,aAAa,EACb,WAAW,EACX,UAAU,IAAI,iBAAiB,EAChC,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,UAAW,SAAQ,QAAQ;IAG1C,KACE,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,EACzB,OAAO,EAAE,aAAa,EACtB,WAAW,CAAC,EAAE,WAAW,GACxB,iBAAiB,CAAC,GAAG,CAAC,CAAC;CAC3B;AAED,qBAAa,iBAAiB,CAAC,MAAM,SAAS,aAAa,CAAE,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IAC7E,OAAO,CACpB,OAAO,CAAC,EAAE,cAAc,CAAC,MAAM,CAAC,GAC/B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CAkD1B"}

package/dist/repository/config/types.js

@@ -5,16 +5,45 @@ const typeorm_1 = require("typeorm");
 class RepositoryWrapper extends typeorm_1.Repository {
     async findOne(options) {
         const where = options === null || options === void 0 ? void 0 : options.where;
-        const primaryColumns = this.metadata.primaryColumns.map((col) => col.propertyName);
         if (!where || typeof where !== "object") {
             return null;
         }
-        for (const key of primaryColumns) {
-            if (where.hasOwnProperty(key)) {
-                if (where[key] === undefined) {
-                    return null;
+        const isUnsafe = (condition, metadata, prefix = "") => {
+            var _a, _b;
+            if (!condition || typeof condition !== "object") {
+                return true;
+            }
+            if (Array.isArray(condition)) {
+                return condition.length === 0 || condition.some(item => isUnsafe(item, metadata, prefix));
+            }
+            const keys = Object.keys(condition);
+            if (keys.length === 0) {
+                return true;
+            }
+            for (const key of keys) {
+                const path = prefix ? `${prefix}.${key}` : key;
+                const column = metadata.columns.some(col => (col.propertyPath || col.propertyName) === path);
+                const relation = (_a = metadata.relations) === null || _a === void 0 ? void 0 : _a.find(rel => rel.propertyPath === path);
+                const embedded = (_b = metadata.embeddeds) === null || _b === void 0 ? void 0 : _b.find(embed => embed.propertyPath === path);
+                if (!column && !relation && !embedded) {
+                    continue;
+                }
+                const value = condition[key];
+                if (value === undefined) {
+                    return true;
+                }
+                if ((relation || embedded) &&
+                    value !== null &&
+                    typeof value === "object" &&
+                    !(value instanceof typeorm_1.FindOperator) &&
+                    isUnsafe(value, relation ? relation.inverseEntityMetadata : metadata, embedded ? path : "")) {
+                    return true;
                 }
             }
+            return false;
+        };
+        if (isUnsafe(where, this.metadata)) {
+            return null;
         }
         return super.findOne(options);
     }

package/dist/repository/config/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/repository/config/types.ts"],"names":[],"mappings":";;;AAAA,qCAOiB;AAUjB,MAAa,iBAA0B,SAAQ,oBAAyB;IAC7D,KAAK,CAAC,OAAO,CACpB,OAAgC;QAEhC,MAAM,KAAK,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC;QAE7B,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,CACrD,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,CAC1B,CAAC;QAEF,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,KAAK,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;YACjC,IAAI,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC9B,IAAK,KAAa,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;oBACtC,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;CACF;AAvBD,8CAuBC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/repository/config/types.ts"],"names":[],"mappings":";;;AAAA,qCAQiB;AAYjB,MAAa,iBAAgD,SAAQ,oBAAyB;IACnF,KAAK,CAAC,OAAO,CACpB,OAAgC;QAEhC,MAAM,KAAK,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC;QAC7B,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,QAAQ,GAAG,CAAC,SAAkB,EAAE,QAA8B,EAAE,MAAM,GAAG,EAAE,EAAW,EAAE;;YAC5F,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;gBAChD,OAAO,IAAI,CAAC;YACd,CAAC;YACD,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC7B,OAAO,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;YAC5F,CAAC;YAED,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACpC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACtB,OAAO,IAAI,CAAC;YACd,CAAC;YACD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;gBAC/C,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC,CAAC;gBAC7F,MAAM,QAAQ,GAAG,MAAA,QAAQ,CAAC,SAAS,0CAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC;gBAC5E,MAAM,QAAQ,GAAG,MAAA,QAAQ,CAAC,SAAS,0CAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC;gBAChF,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACtC,SAAS;gBACX,CAAC;gBAED,MAAM,KAAK,GAAI,SAAqC,CAAC,GAAG,CAAC,CAAC;gBAC1D,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxB,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,IACE,CAAC,QAAQ,IAAI,QAAQ,CAAC;oBACtB,KAAK,KAAK,IAAI;oBACd,OAAO,KAAK,KAAK,QAAQ;oBACzB,CAAC,CAAC,KAAK,YAAY,sBAAY,CAAC;oBAChC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAC3F,CAAC;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;QAEF,IAAI,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;CACF;AArDD,8CAqDC"}

package/dist/repository/config/utils.d.ts

@@ -2,5 +2,5 @@ import { DataSource, DataSourceOptions } from 'typeorm';
 import { Repository } from './types';
 export declare function getDefRepositoryToken(repository: Repository, dataSource?: string | DataSource | DataSourceOptions): string | Repository;
 export declare function getEntityByRepository(repository: Repository): any;
-export declare function loadRepositoriesFromPath(pattern: string): Promise<any[]>;
+export declare function loadRepositoriesFromPath(pattern: string): Promise<Repository[]>;
 //# sourceMappingURL=utils.d.ts.map

package/dist/repository/config/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/repository/config/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAmC,MAAM,SAAS,CAAC;AAGzF,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAGrC,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,UAAU,EACtB,UAAU,GAAE,MAAM,GAAG,UAAU,GAAG,iBAA2C,uBAa9E;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,UAAU,OAO3D;AAoBD,wBAAsB,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAc9E"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/repository/config/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAmC,MAAM,SAAS,CAAC;AAGzF,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAGrC,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,UAAU,EACtB,UAAU,GAAE,MAAM,GAAG,UAAU,GAAG,iBAA2C,uBAa9E;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,UAAU,OAO3D;AAkBD,wBAAsB,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAgBrF"}

package/dist/repository/config/utils.js

@@ -51,7 +51,7 @@ function getDefRepositoryToken(repository, dataSource = constants_1.DEFAULT_CONN
         if (!connectionPrefix) {
             return repository;
         }
-        return `${connectionPrefix}${getToken(repository)}`;
+        return `${connectionPrefix}${repository.name}`;
     }
     return `${connectionPrefix}${repository.name}Repository`;
 }
@@ -62,32 +62,31 @@ function getEntityByRepository(repository) {
     }
     return entity;
 }
-function getToken(repository) {
-    return repository.name;
-}
 function getDataSourcePrefix(dataSource = constants_1.DEFAULT_CONNECTION_NAME) {
-    if (dataSource === constants_1.DEFAULT_CONNECTION_NAME) {
+    if (!dataSource || dataSource === constants_1.DEFAULT_CONNECTION_NAME) {
         return '';
     }
     if (typeof dataSource === 'string') {
         return dataSource + '_';
     }
-    if (dataSource.name === constants_1.DEFAULT_CONNECTION_NAME || !dataSource.name) {
+    const name = 'name' in dataSource ? dataSource.name : undefined;
+    if (!name || name === constants_1.DEFAULT_CONNECTION_NAME) {
         return '';
     }
-    return dataSource.name + '_';
+    return name + '_';
 }
 async function loadRepositoriesFromPath(pattern) {
-    const files = await (0, fast_glob_1.default)(pattern, { absolute: true });
-    const repositories = [];
+    const normalizedPattern = pattern.replace(/\\/g, '/');
+    const files = await (0, fast_glob_1.default)(normalizedPattern, { absolute: true });
+    const repositorySet = new Set();
     for (const file of files) {
-        const moduleExports = await Promise.resolve(`${file}`).then(s => __importStar(require(s)));
+        const moduleExports = (await Promise.resolve(`${file}`).then(s => __importStar(require(s))));
         for (const value of Object.values(moduleExports)) {
-            if (typeof value === 'function') {
-                repositories.push(value);
+            if (typeof value === 'function' && Reflect.hasMetadata(constants_1.ENTITY_METADATA_KEY, value)) {
+                repositorySet.add(value);
             }
         }
     }
-    return repositories;
+    return Array.from(repositorySet);
 }
 //# sourceMappingURL=utils.js.map

package/dist/repository/config/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/repository/config/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA,sDAeC;AAED,sDAOC;AAoBD,4DAcC;AAhED,qCAAyF;AAEzF,2CAA2E;AAE3E,0DAAiC;AAEjC,SAAgB,qBAAqB,CACnC,UAAsB,EACtB,aAAsD,mCAAuB;IAE7E,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;IACzD,IAAI,UAAU,YAAY,QAAQ,IAAI,UAAU,CAAC,SAAS,YAAY,oBAAiB,EAAE,CAAC;QACxF,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,OAAO,GAAG,gBAAgB,GAAG,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;IACtD,CAAC;IACD,OAAO,GAAG,gBAAgB,GAAG,UAAU,CAAC,IAAI,YAAY,CAAC;AAC3D,CAAC;AAED,SAAgB,qBAAqB,CAAC,UAAsB;IAC1D,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,+BAAmB,EAAE,UAAU,CAAC,CAAC;IACpE,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,eAAe,UAAU,CAAC,IAAI,sBAAsB,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,QAAQ,CAAC,UAAsB;IACtC,OAAO,UAAU,CAAC,IAAI,CAAC;AACzB,CAAC;AAED,SAAS,mBAAmB,CAC1B,aAAsD,mCAAuB;IAE7E,IAAI,UAAU,KAAK,mCAAuB,EAAE,CAAC;QAC3C,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QACnC,OAAO,UAAU,GAAG,GAAG,CAAC;IAC1B,CAAC;IACD,IAAI,UAAU,CAAC,IAAI,KAAK,mCAAuB,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QACpE,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,UAAU,CAAC,IAAI,GAAG,GAAG,CAAC;AAC/B,CAAC;AACM,KAAK,UAAU,wBAAwB,CAAC,OAAe;IAC5D,MAAM,KAAK,GAAG,MAAM,IAAA,mBAAQ,EAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAU,EAAE,CAAC;IAE/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,aAAa,GAAG,yBAAa,IAAI,uCAAC,CAAC;QACzC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;YACjD,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;gBAChC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/repository/config/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA,sDAeC;AAED,sDAOC;AAkBD,4DAgBC;AAhED,qCAAyF;AAEzF,2CAA2E;AAE3E,0DAAiC;AAEjC,SAAgB,qBAAqB,CACnC,UAAsB,EACtB,aAAsD,mCAAuB;IAE7E,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;IACzD,IAAI,UAAU,YAAY,QAAQ,IAAI,UAAU,CAAC,SAAS,YAAY,oBAAiB,EAAE,CAAC;QACxF,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,OAAO,GAAG,gBAAgB,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;IACjD,CAAC;IACD,OAAO,GAAG,gBAAgB,GAAG,UAAU,CAAC,IAAI,YAAY,CAAC;AAC3D,CAAC;AAED,SAAgB,qBAAqB,CAAC,UAAsB;IAC1D,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,+BAAmB,EAAE,UAAU,CAAC,CAAC;IACpE,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,eAAe,UAAU,CAAC,IAAI,sBAAsB,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,mBAAmB,CAC1B,aAAsD,mCAAuB;IAE7E,IAAI,CAAC,UAAU,IAAI,UAAU,KAAK,mCAAuB,EAAE,CAAC;QAC1D,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QACnC,OAAO,UAAU,GAAG,GAAG,CAAC;IAC1B,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,IAAI,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAChE,IAAI,CAAC,IAAI,IAAI,IAAI,KAAK,mCAAuB,EAAE,CAAC;QAC9C,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,IAAI,GAAG,GAAG,CAAC;AACpB,CAAC;AAEM,KAAK,UAAU,wBAAwB,CAAC,OAAe;IAC5D,MAAM,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,MAAM,IAAA,mBAAQ,EAAC,iBAAiB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IACpE,MAAM,aAAa,GAAG,IAAI,GAAG,EAAc,CAAC;IAE5C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QAEzB,MAAM,aAAa,GAAG,CAAC,yBAAa,IAAI,uCAAC,CAA4B,CAAC;QACtE,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;YACjD,IAAI,OAAO,KAAK,KAAK,UAAU,IAAI,OAAO,CAAC,WAAW,CAAC,+BAAmB,EAAE,KAAK,CAAC,EAAE,CAAC;gBACnF,aAAa,CAAC,GAAG,CAAC,KAA8B,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;AACnC,CAAC"}

package/dist/repository/decorator/index.d.ts

@@ -1,7 +1,7 @@
 import type { DataSource, DataSourceOptions, EntityTarget, ObjectLiteral } from 'typeorm';
-import { Repository } from '../config/types';
+import type { Repository } from '../config/types';
 export declare function DefEntityRepository(target: EntityTarget<ObjectLiteral>): (constructor: {
-    new (...args: any[]): any;
+    new (...args: any[]): unknown;
 }) => void;
 export declare function InjectRepo(repository: Repository, dataSource?: string | DataSource | DataSourceOptions): PropertyDecorator & ParameterDecorator;
 //# sourceMappingURL=index.d.ts.map

package/dist/repository/decorator/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/repository/decorator/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE1F,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAG7C,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,CAAC,aAAa,CAAC,IACpD,aAAa;IAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,CAAA;CAAE,UAG5D;AAED,wBAAgB,UAAU,CACxB,UAAU,EAAE,UAAU,EACtB,UAAU,GAAE,MAAM,GAAG,UAAU,GAAG,iBAA6B,0CAGhE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/repository/decorator/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE1F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAGlD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,CAAC,aAAa,CAAC,IAEpD,aAAa;IAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAA;CAAE,UAGhE;AAED,wBAAgB,UAAU,CACxB,UAAU,EAAE,UAAU,EACtB,UAAU,GAAE,MAAM,GAAG,UAAU,GAAG,iBAA2C,0CAG9E"}

package/dist/repository/decorator/index.js

@@ -10,7 +10,7 @@ function DefEntityRepository(target) {
         Reflect.defineMetadata(constants_1.ENTITY_METADATA_KEY, target, constructor);
     };
 }
-function InjectRepo(repository, dataSource = 'default') {
+function InjectRepo(repository, dataSource = constants_1.DEFAULT_CONNECTION_NAME) {
     return (0, common_1.Inject)((0, utils_1.getDefRepositoryToken)(repository, dataSource));
 }
 //# sourceMappingURL=index.js.map

package/dist/repository/decorator/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/repository/decorator/index.ts"],"names":[],"mappings":";;AAMA,kDAIC;AAED,gCAKC;AAjBD,2CAAwC;AAExC,mDAA0D;AAE1D,2CAAwD;AAExD,SAAgB,mBAAmB,CAAC,MAAmC;IACrE,OAAO,UAAU,WAA0C;QACzD,OAAO,CAAC,cAAc,CAAC,+BAAmB,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IACnE,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,UAAU,CACxB,UAAsB,EACtB,aAAsD,SAAS;IAE/D,OAAO,IAAA,eAAM,EAAC,IAAA,6BAAqB,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;AAC/D,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/repository/decorator/index.ts"],"names":[],"mappings":";;AAMA,kDAKC;AAED,gCAKC;AAlBD,2CAAwC;AAExC,mDAAmF;AAEnF,2CAAwD;AAExD,SAAgB,mBAAmB,CAAC,MAAmC;IAErE,OAAO,UAAU,WAA8C;QAC7D,OAAO,CAAC,cAAc,CAAC,+BAAmB,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IACnE,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,UAAU,CACxB,UAAsB,EACtB,aAAsD,mCAAuB;IAE7E,OAAO,IAAA,eAAM,EAAC,IAAA,6BAAqB,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;AAC/D,CAAC"}

package/dist/repository/module/index.d.ts

@@ -9,16 +9,13 @@ export interface DefRepositoryOptionsFactory {
     createDefRepositoryOptions(): Promise<DefRepositoryModuleOptions> | DefRepositoryModuleOptions;
 }
 export interface DefRepositoryModuleAsyncOptions extends Pick<ModuleMetadata, "imports"> {
-    useFactory?: (...args: any[]) => Promise<DefRepositoryModuleOptions> | DefRepositoryModuleOptions;
+    useFactory?: () => Promise<DefRepositoryModuleOptions> | DefRepositoryModuleOptions;
     useClass?: Type<DefRepositoryOptionsFactory>;
-    useExisting?: Type<DefRepositoryOptionsFactory>;
-    inject?: any[];
 }
 export declare class DefRepositoryModule {
-    static forFeature(repositories: Repository[], dataSource?: string | DataSource | DataSourceOptions): DynamicModule;
+    static forFeature(repositories?: Repository[], dataSource?: string | DataSource | DataSourceOptions): DynamicModule;
     static forRoot(options: DefRepositoryModuleOptions): Promise<DynamicModule>;
     static forRootAsync(options: DefRepositoryModuleAsyncOptions): Promise<DynamicModule>;
-    private static createAsyncProviders;
     private static resolveOptions;
     private static loadRepositories;
 }

package/dist/repository/module/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/repository/module/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAY,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAE/E,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAG7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAOlD,MAAM,WAAW,0BAA0B;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,iBAAiB,CAAC;CACtD;AAED,MAAM,WAAW,2BAA2B;IAC1C,0BAA0B,IACtB,OAAO,CAAC,0BAA0B,CAAC,GACnC,0BAA0B,CAAC;CAChC;AAED,MAAM,WAAW,+BACf,SAAQ,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC;IACvC,UAAU,CAAC,EAAE,CACX,GAAG,IAAI,EAAE,GAAG,EAAE,KACX,OAAO,CAAC,0BAA0B,CAAC,GAAG,0BAA0B,CAAC;IACtE,QAAQ,CAAC,EAAE,IAAI,CAAC,2BAA2B,CAAC,CAAC;IAC7C,WAAW,CAAC,EAAE,IAAI,CAAC,2BAA2B,CAAC,CAAC;IAChD,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;CAChB;AAsBD,qBAAa,mBAAmB;IAI9B,MAAM,CAAC,UAAU,CACf,YAAY,EAAE,UAAU,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,iBAAiB,GACnD,aAAa;WAQH,OAAO,CAClB,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,aAAa,CAAC;WAYZ,YAAY,CACvB,OAAO,EAAE,+BAA+B,GACvC,OAAO,CAAC,aAAa,CAAC;IAuBzB,OAAO,CAAC,MAAM,CAAC,oBAAoB;mBAmCd,cAAc;mBAiBd,gBAAgB;CAmBtC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/repository/module/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAY,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAE/E,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAO7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,MAAM,WAAW,0BAA0B;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,iBAAiB,CAAC;CACtD;AAED,MAAM,WAAW,2BAA2B;IAC1C,0BAA0B,IACtB,OAAO,CAAC,0BAA0B,CAAC,GACnC,0BAA0B,CAAC;CAChC;AAED,MAAM,WAAW,+BACf,SAAQ,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC;IACvC,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC,0BAA0B,CAAC,GAAG,0BAA0B,CAAC;IACpF,QAAQ,CAAC,EAAE,IAAI,CAAC,2BAA2B,CAAC,CAAC;CAC9C;AAqBD,qBAAa,mBAAmB;IAI9B,MAAM,CAAC,UAAU,CACf,YAAY,GAAE,UAAU,EAAO,EAC/B,UAAU,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,iBAAiB,GACnD,aAAa;WASH,OAAO,CAClB,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,aAAa,CAAC;WAcZ,YAAY,CACvB,OAAO,EAAE,+BAA+B,GACvC,OAAO,CAAC,aAAa,CAAC;mBA6BJ,cAAc;mBAiBd,gBAAgB;CAKtC"}