@scefira/dfw 1.3.2 → 1.4.1

package/dist/esm/lib/APIManager.d.ts

@@ -1,9 +1,9 @@
 import type { DFWCore } from "#lib/DFWCore";
 import type { APIListener } from "#types/APIListener";
-export declare class APIManager {
+export declare class APIManager<TDFW extends DFWCore<any>> {
     private DFW;
-    constructor(DFW: DFWCore);
-    installAPILAyer(): void;
+    constructor(DFW: TDFW);
+    installAPILayer(): void;
     addListener(path: string, params: APIListener): void;
 }
 //# sourceMappingURL=APIManager.d.ts.map

package/dist/esm/lib/APIManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"APIManager.d.ts","sourceRoot":"","sources":["../../../src/lib/APIManager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAG5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAWtD,qBAAa,UAAU;IACnB,OAAO,CAAC,GAAG,CAAS;gBAER,GAAG,EAAE,OAAO;IAIjB,eAAe;IA8Df,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW;CA8FvD"}
+{"version":3,"file":"APIManager.d.ts","sourceRoot":"","sources":["../../../src/lib/APIManager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAWtD,qBAAa,UAAU,CAAC,IAAI,SAAS,OAAO,CAAC,GAAG,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAM;gBAEL,GAAG,EAAE,IAAI;IAId,eAAe;IA0Df,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW;CAyDvD"}

package/dist/esm/lib/APIManager.js

@@ -11,9 +11,9 @@ export class APIManager {
     constructor(DFW) {
         this.DFW = DFW;
     }
-    installAPILAyer() {
+    installAPILayer() {
         const config = this.DFW.config;
-        const APIRouter = this.DFW.RouterAPILevel;
+        const APIRouter = this.DFW.routerAPILevel;
         //// PASSPORT AND SESSION ////
         APIRouter.use(session({
             name: 'stk',
@@ -31,7 +31,7 @@ export class APIManager {
         APIRouter.use(passport.initialize());
         APIRouter.use(passport.session());
         if (config.session?.authenticators?.dfw !== false) {
-            passport.use('dfw', DFWPassportStrategy);
+            passport.use('dfw', DFWPassportStrategy(this.DFW));
         }
         passport.serializeUser(async ({ id }, done) => {
             done(null, id);
@@ -39,24 +39,20 @@ export class APIManager {
         passport.deserializeUser(async (idUser, done) => {
             done(null, { id: idUser });
         });
-        //// DFW SChema ////
+        //// DFW API Schema ////
         APIRouter.use(((req, res, next) => {
             const callbackStack = [];
             const dfw = {
                 db: this.DFW.db,
                 getSession: () => ({
                     isAuthenticated: req.isAuthenticated(),
-                    user: req.user
+                    user: req.user?.id
                 }),
                 addCallback: (cb) => {
                     callbackStack.push(cb);
                 }
             };
             req.dfw = dfw;
-            res.error = (message, status = 500) => {
-                res.status(status);
-                throw message;
-            };
             res.on('finish', () => {
                 callbackStack.forEach((cb) => cb());
             });
@@ -74,35 +70,8 @@ export class APIManager {
         // Body Parser
         if (['post', 'put', 'patch', 'delete'].includes(method) && params.disableBodyParser !== true)
             server[method](path, bodyParser.json());
-        if (params.validate) {
-            server[method](path, (req, res, next) => {
-                const bodySchema = params.validate?.body;
-                const querySchema = params.validate?.query;
-                if (bodySchema) {
-                    const result = bodySchema.safeParse(req.body);
-                    if (!result.success) {
-                        return res.status(400).json({
-                            error: 'Body validation failed',
-                            validation: result.error.format(),
-                        });
-                    }
-                    req.body = result.data;
-                }
-                if (querySchema) {
-                    const result = querySchema.safeParse(req.query);
-                    if (!result.success) {
-                        return res.status(400).json({
-                            error: 'Query validation failed',
-                            validation: result.error.format(),
-                        });
-                    }
-                    Object.assign(req.query, result.data);
-                }
-                next();
-            });
-        }
         // DFW native middleware
-        server[method](path, this.DFW.RouterAPILevel);
+        server[method](path, this.DFW.routerAPILevel);
         // file upload middleware
         if (params.upload)
             server[method](path, fileUpload(typeof params.upload === 'boolean' ? {} : params.upload));
@@ -114,11 +83,6 @@ export class APIManager {
         if (fn) {
             server[method](path, async (req, res, next) => {
                 try {
-                    // Setting up services
-                    params.services?.forEach((Service) => {
-                        const serviceInstance = new Service(req.dfw);
-                        req.dfw[serviceInstance.namespace] = serviceInstance;
-                    });
                     // calling the listener
                     const data = await fn(req.dfw, req, res);
                     if (params.callback) {

package/dist/esm/lib/APIManager.js.map

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

package/dist/esm/lib/DFWCore.d.ts

@@ -1,39 +1,58 @@
-import type { DFWRequestSchema } from "#types/DFWRequest";
+import type { DFWResponse } from "#types/DFWRequest";
 import type { APIListener, DFWRegisterItem, ListenerFn } from "#types/APIListener";
 import type { DFWConfig } from "#types/DFWConfig";
 import type { Express } from "express";
 import { Router } from "express";
-import { PrismaClient } from "@prisma/client";
-declare global {
-    namespace Express {
-        interface Request {
-            dfw: DFWRequestSchema;
-        }
-        interface Response {
-            error: (message: any, status?: number) => void;
-        }
-    }
-}
-export declare class DFWCore {
-    static MAIN_INSTANCE: DFWCore;
+import { type ServiceCtor, type ServiceInstance } from "#makers/makeService";
+import { type RepositoryCtor, type RepositoryInstance } from "#makers/makeRepository";
+export declare class DFWCore<TDatabase = any> {
     static DFW_DIR: string;
     static DFW_UPLOAD_DIR: string;
     readonly server: Express;
-    readonly RouterAPILevel: Router;
+    readonly routerAPILevel: Router;
     readonly tmpDir: string;
     readonly config: DFWConfig;
     private database;
     private APIManager;
-    constructor(config: DFWConfig);
-    start(): this;
-    addListener(path: string, listener: APIListener): void;
-    addListener(path: string, fn: ListenerFn): void;
+    constructor(db: TDatabase, config: DFWConfig);
+    start(): Promise<this>;
+    addListener(path: string, listener: APIListener<TDatabase>): void;
+    addListener(path: string, fn: ListenerFn<TDatabase>): void;
     /**
      * @param DFW
      * @param node
      * @param path
      */
     register(node: DFWRegisterItem, path?: string): void;
-    get db(): PrismaClient<import("@prisma/client").Prisma.PrismaClientOptions, never, import("@prisma/client/runtime/library").DefaultArgs>;
+    get db(): TDatabase;
+    makeListener: <TPrisma>(baseParams: Partial<APIListener<TPrisma>>) => {
+        (params: import("#types/APIListener").APIListenerWithoutMethod, fn: ListenerFn<TPrisma>): APIListener<TPrisma>;
+        (fn: ListenerFn<TPrisma>): APIListener<TPrisma>;
+    };
+    makeGuard: (fn: ListenerFn<TDatabase>) => (req: import("#types/DFWRequest").DFWRequest<TDatabase>, res: DFWResponse, next: (err?: any) => void) => Promise<void>;
+    makeService: <TDeps extends object, M extends object>(deps: TDeps, methods: M & ThisType<ServiceInstance<TDatabase, TDeps, M>>) => ServiceCtor<TDatabase, TDeps, M>;
+    makeRepository: <M extends object>(methods: M & ThisType<RepositoryInstance<M, TDatabase>>) => RepositoryCtor<M, TDatabase>;
+    listener: {
+        get: {
+            (params: import("#types/APIListener").APIListenerWithoutMethod, fn: ListenerFn<TDatabase>): APIListener<TDatabase>;
+            (fn: ListenerFn<TDatabase>): APIListener<TDatabase>;
+        };
+        post: {
+            (params: import("#types/APIListener").APIListenerWithoutMethod, fn: ListenerFn<TDatabase>): APIListener<TDatabase>;
+            (fn: ListenerFn<TDatabase>): APIListener<TDatabase>;
+        };
+        put: {
+            (params: import("#types/APIListener").APIListenerWithoutMethod, fn: ListenerFn<TDatabase>): APIListener<TDatabase>;
+            (fn: ListenerFn<TDatabase>): APIListener<TDatabase>;
+        };
+        delete: {
+            (params: import("#types/APIListener").APIListenerWithoutMethod, fn: ListenerFn<TDatabase>): APIListener<TDatabase>;
+            (fn: ListenerFn<TDatabase>): APIListener<TDatabase>;
+        };
+        patch: {
+            (params: import("#types/APIListener").APIListenerWithoutMethod, fn: ListenerFn<TDatabase>): APIListener<TDatabase>;
+            (fn: ListenerFn<TDatabase>): APIListener<TDatabase>;
+        };
+    };
 }
 //# sourceMappingURL=DFWCore.d.ts.map

package/dist/esm/lib/DFWCore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DFWCore.d.ts","sourceRoot":"","sources":["../../../src/lib/DFWCore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACnF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,MAAM,EAA4B,MAAM,SAAS,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAQ9C,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,OAAO,CAAC;QACd,UAAiB,OAAO;YACpB,GAAG,EAAE,gBAAgB,CAAA;SACxB;QAED,UAAiB,QAAQ;YACrB,KAAK,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;SACjD;KACJ;CACJ;AAED,qBAAa,OAAO;IAEhB,OAAc,aAAa,EAAE,OAAO,CAAA;IAEpC,OAAc,OAAO,SAAW;IAChC,OAAc,cAAc,SAA8B;IAE1D,SAAgB,MAAM,EAAE,OAAO,CAAmB;IAClD,SAAgB,cAAc,EAAE,MAAM,CAAY;IAElD,SAAgB,MAAM,EAAE,MAAM,CAAA;IAE9B,SAAgB,MAAM,EAAE,SAAS,CAAC;IAClC,OAAO,CAAC,QAAQ,CAAe;IAE/B,OAAO,CAAC,UAAU,CAAuB;gBAE7B,MAAM,EAAE,SAAS;IAqCtB,KAAK;IAQL,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,GAAG,IAAI;IACtD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,GAAG,IAAI;IAStD;;;;OAIG;IACI,QAAQ,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,GAAE,MAAW;IAcxD,IAAI,EAAE,mIAEL;CACJ"}
+{"version":3,"file":"DFWCore.d.ts","sourceRoot":"","sources":["../../../src/lib/DFWCore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACnF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,MAAM,EAA4B,MAAM,SAAS,CAAC;AAG3D,OAAO,EAAoC,KAAK,WAAW,EAAE,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAG/G,OAAO,EAA0C,KAAK,cAAc,EAAE,KAAK,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAM9H,qBAAa,OAAO,CAAC,SAAS,GAAG,GAAG;IAChC,OAAc,OAAO,SAAW;IAChC,OAAc,cAAc,SAA8B;IAE1D,SAAgB,MAAM,EAAE,OAAO,CAAmB;IAClD,SAAgB,cAAc,EAAE,MAAM,CAAY;IAElD,SAAgB,MAAM,EAAE,MAAM,CAAA;IAE9B,SAAgB,MAAM,EAAE,SAAS,CAAC;IAElC,OAAO,CAAC,QAAQ,CAAM;IAEtB,OAAO,CAAC,UAAU,CAAuB;gBAE7B,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS;IA8BrC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAWtB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAC,SAAS,CAAC,GAAG,IAAI;IACjE,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,CAAC,SAAS,CAAC,GAAG,IAAI;IASjE;;;;OAIG;IACI,QAAQ,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,GAAE,MAAW;IAcxD,IAAI,EAAE,IACsB,SAAS,CACpC;IAED,YAAY;;;MAAe;IAC3B,SAAS,kCAvGa,sDACd,EAAC,gBAAiB,EAAC,yBAA0B,mBAsGrB;IAEhC,WAAW,GAAI,KAAK,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EACjD,MAAM,KAAK,EACX,SAAS,CAAC,GAAG,QAAQ,CAAC,eAAe,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,KAC5D,WAAW,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAElC;IAED,cAAc,GAAI,CAAC,SAAS,MAAM,EAC9B,SAAS,CAAC,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,KACxD,cAAc,CAAC,CAAC,EAAE,SAAS,CAAC,CAE9B;IAEM,QAAQ;;;;;;;;;;;;;;;;;;;;;MAMd;CACJ"}

package/dist/esm/lib/DFWCore.js

@@ -1,18 +1,37 @@
 import { Router, default as ExpressServer } from "express";
-import { PrismaClient } from "@prisma/client";
-import chalk from "chalk";
-import fs from "fs";
 import { DFWUtils } from "#lib/DFWUtils";
 import { APIManager } from "#lib/APIManager";
+import { makeService as makeServiceHelper } from "#makers/makeService";
+import { makeListener } from "#makers/makeListener";
+import { makeGuard } from "#makers/makeGuard";
+import { makeRepository as makeRepositoryHelper } from "#makers/makeRepository";
 import cors from "cors";
+import chalk from "chalk";
+import fs from "fs";
 import nodejsPath from "path";
 export class DFWCore {
-    constructor(config) {
+    constructor(db, config) {
         this.server = ExpressServer();
-        this.RouterAPILevel = Router();
+        this.routerAPILevel = Router();
         this.APIManager = new APIManager(this);
+        this.makeListener = makeListener;
+        this.makeGuard = (makeGuard);
+        this.makeService = (deps, methods) => {
+            return makeServiceHelper(this, deps, methods);
+        };
+        this.makeRepository = (methods) => {
+            return makeRepositoryHelper(this, methods);
+        };
+        this.listener = {
+            get: makeListener({ method: 'get' }),
+            post: makeListener({ method: 'post' }),
+            put: makeListener({ method: 'put' }),
+            delete: makeListener({ method: 'delete' }),
+            patch: makeListener({ method: 'patch' }),
+        };
+        this.database = db;
         this.config = Object.freeze(config);
-        this.tmpDir = config.server?.tmpDir ?? `${DFWCore.DFW_DIR}/temp`;
+        this.tmpDir = config?.tmpDir ?? `${DFWCore.DFW_DIR}/temp`;
         if (!fs.existsSync(this.tmpDir))
             fs.mkdirSync(DFWCore.DFW_DIR);
         if (fs.existsSync(this.tmpDir)) {
@@ -23,30 +42,26 @@ export class DFWCore {
             fs.mkdirSync(this.tmpDir);
         }
         this.tmpDir = nodejsPath.normalize(fs.mkdtempSync(`${this.tmpDir}${nodejsPath.sep}`));
-        if (typeof config.prisma === 'function') {
-            this.database = config.prisma(this);
-        }
-        else {
-            this.database = new PrismaClient(config.prisma);
-        }
         if (fs.existsSync(DFWCore.DFW_DIR) == false) {
             fs.mkdirSync(DFWCore.DFW_DIR);
         }
-        if (config.server?.trustProxy)
-            this.server.set('trust proxy', config.server?.trustProxy);
+        if (config?.trustProxy)
+            this.server.set('trust proxy', config?.trustProxy);
         //// CORS ////
-        if (config.server?.cors) {
-            this.server.use(cors(config.server.cors));
+        if (config?.cors) {
+            this.server.use(cors(config.cors));
         }
-        this.APIManager.installAPILAyer();
-        DFWCore.MAIN_INSTANCE = this;
+        this.APIManager.installAPILayer();
     }
     start() {
-        const port = this.config.server?.port ?? 8080;
-        this.server.listen(port, () => {
-            DFWUtils.log(`Server listening on port ${chalk.yellow(port)}`);
+        const port = this.config?.port ?? 8080;
+        return new Promise((resolve, reject) => {
+            const srv = this.server.listen(port, () => {
+                DFWUtils.log(`Server listening on port ${chalk.yellow(port)}`);
+                resolve(this);
+            });
+            srv.on?.('error', (err) => reject(err));
         });
-        return this;
     }
     addListener(path, b) {
         if (typeof b === 'function') {

package/dist/esm/lib/DFWCore.js.map

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

package/dist/esm/lib/DFWPassportStrategy.d.ts

@@ -1,3 +1,4 @@
+import type { DFWCore } from "./DFWCore";
 import { Strategy } from "passport-local";
-export declare const DFWPassportStrategy: Strategy;
+export declare const DFWPassportStrategy: (DFW: DFWCore) => Strategy;
 //# sourceMappingURL=DFWPassportStrategy.d.ts.map

package/dist/esm/lib/DFWPassportStrategy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DFWPassportStrategy.d.ts","sourceRoot":"","sources":["../../../src/lib/DFWPassportStrategy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAIzC,eAAO,MAAM,mBAAmB,UAe9B,CAAA"}
+{"version":3,"file":"DFWPassportStrategy.d.ts","sourceRoot":"","sources":["../../../src/lib/DFWPassportStrategy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAIzC,eAAO,MAAM,mBAAmB,GAAI,KAAK,OAAO,aAe9C,CAAA"}

package/dist/esm/lib/DFWPassportStrategy.js

@@ -1,10 +1,10 @@
 import { Strategy } from "passport-local";
 import { DFWUtils } from "#lib/DFWUtils";
-import { DFWUserModule } from "#modules/DFWUserModule";
-export const DFWPassportStrategy = new Strategy(async (identifier, password, done) => {
+import { DFWUserRepository } from "#repositories/DFWUserRepository";
+export const DFWPassportStrategy = (DFW) => new Strategy(async (identifier, password, done) => {
     try {
-        const UserControl = new DFWUserModule();
-        const id = await UserControl.verifyPasswordAsync(identifier, password);
+        const { verifyPasswordAsync } = new DFWUserRepository(DFW);
+        const id = await verifyPasswordAsync(identifier, password);
         if (id) {
             return done(null, { id });
         }

package/dist/esm/lib/DFWPassportStrategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"DFWPassportStrategy.js","sourceRoot":"","sources":["../../../src/lib/DFWPassportStrategy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAEtD,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,QAAQ,CAAC,KAAK,EAAE,UAAkB,EAAE,QAAgB,EAAE,IAAI,EAAE,EAAE;IACjG,IAAI,CAAC;QACD,MAAM,WAAW,GAAG,IAAI,aAAa,EAAE,CAAA;QACvC,MAAM,EAAE,GAAG,MAAM,WAAW,CAAC,mBAAmB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAEtE,IAAI,EAAE,EAAE,CAAC;YACL,OAAO,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;QAC7B,CAAC;aAAM,CAAC;YACJ,MAAM,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;YAC/B,OAAO,IAAI,CAAC,eAAe,CAAC,CAAA;QAChC,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QAC/B,OAAO,IAAI,CAAC,CAAC,CAAC,CAAA;IAClB,CAAC;AACL,CAAC,CAAC,CAAA"}
+{"version":3,"file":"DFWPassportStrategy.js","sourceRoot":"","sources":["../../../src/lib/DFWPassportStrategy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,GAAY,EAAE,EAAE,CAAC,IAAI,QAAQ,CAAC,KAAK,EAAE,UAAkB,EAAE,QAAgB,EAAE,IAAI,EAAE,EAAE;IACnH,IAAI,CAAC;QACD,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAI,iBAAiB,CAAC,GAAG,CAAC,CAAA;QAC1D,MAAM,EAAE,GAAG,MAAM,mBAAmB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAE1D,IAAI,EAAE,EAAE,CAAC;YACL,OAAO,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;QAC7B,CAAC;aAAM,CAAC;YACJ,MAAM,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;YAC/B,OAAO,IAAI,CAAC,eAAe,CAAC,CAAA;QAChC,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QAC/B,OAAO,IAAI,CAAC,CAAC,CAAC,CAAA;IAClB,CAAC;AACL,CAAC,CAAC,CAAA"}

package/dist/esm/lib/DFWRepository.d.ts

@@ -0,0 +1,16 @@
+import { DFWCore } from "#lib/DFWCore";
+export declare class DFWRepository<TDatabase> {
+    private _dfw;
+    private _db;
+    get dfw(): DFWCore<TDatabase>;
+    get db(): TDatabase;
+    constructor(dfw: DFWCore<TDatabase>);
+    /**
+     *
+     * @param db
+     * @returns
+     */
+    use: (db: any) => this;
+    transaction: (cb: (tx: Omit<TDatabase, "$connect" | "$disconnect" | "$on" | "$transaction" | "$extends">) => Promise<any>) => Promise<any>;
+}
+//# sourceMappingURL=DFWRepository.d.ts.map

package/dist/esm/lib/DFWRepository.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DFWRepository.d.ts","sourceRoot":"","sources":["../../../src/lib/DFWRepository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,qBAAa,aAAa,CAAC,SAAS;IAChC,OAAO,CAAC,IAAI,CAAoB;IAChC,OAAO,CAAC,GAAG,CAAK;IAEhB,IAAI,GAAG,uBAEN;IAED,IAAI,EAAE,IACiB,SAAS,CAC/B;gBAEW,GAAG,EAAE,OAAO,CAAC,SAAS,CAAC;IAKnC;;;;OAIG;IACI,GAAG,GACN,IAAI,GAAG,KACR,IAAI,CAGN;IAEM,WAAW,GACd,IAAI,CACA,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,UAAU,GAAG,aAAa,GAAG,KAAK,GAAG,cAAc,GAAG,UAAU,CAAC,KACpF,OAAO,CAAC,GAAG,CAAC,kBAOpB;CACJ"}

package/dist/esm/lib/{DFWModule.js → DFWRepository.js}

@@ -1,13 +1,12 @@
 import { DFWCore } from "#lib/DFWCore";
-export class DFWModule {
+export class DFWRepository {
+    get dfw() {
+        return this._dfw;
+    }
     get db() {
         return this._db;
     }
-    get DFW() {
-        return DFWCore.MAIN_INSTANCE;
-    }
-    constructor(db) {
-        this._db = DFWCore.MAIN_INSTANCE.db;
+    constructor(dfw) {
         /**
          *
          * @param db
@@ -18,16 +17,15 @@ export class DFWModule {
             return this;
         };
         this.transaction = async (cb) => {
-            if (this.db.$transaction) {
-                return this.db.$transaction(cb);
+            if (this._db.$transaction) {
+                return this._db.$transaction(cb);
             }
             else {
-                return cb(this.db);
+                return cb(this._db);
             }
         };
-        if (db) {
-            this.use(db);
-        }
+        this._dfw = dfw;
+        this._db = dfw.db;
     }
 }
-//# sourceMappingURL=DFWModule.js.map
+//# sourceMappingURL=DFWRepository.js.map

package/dist/esm/lib/DFWRepository.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DFWRepository.js","sourceRoot":"","sources":["../../../src/lib/DFWRepository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,MAAM,OAAO,aAAa;IAItB,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,IAAI,CAAA;IACpB,CAAC;IAED,IAAI,EAAE;QACF,OAAO,IAAI,CAAC,GAAgB,CAAA;IAChC,CAAC;IAED,YAAY,GAAuB;QAKnC;;;;WAIG;QACI,QAAG,GAAG,CACT,EAAO,EACH,EAAE;YACN,IAAI,CAAC,GAAG,GAAG,EAAE,CAAA;YACb,OAAO,IAAI,CAAA;QACf,CAAC,CAAA;QAEM,gBAAW,GAAG,KAAK,EACtB,EAEiB,EACnB,EAAE;YACA,IAAI,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;gBACxB,OAAO,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;YACpC,CAAC;iBAAM,CAAC;gBACJ,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YACvB,CAAC;QACL,CAAC,CAAA;QA1BG,IAAI,CAAC,IAAI,GAAG,GAAG,CAAA;QACf,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,EAAE,CAAA;IACrB,CAAC;CAyBJ"}

package/dist/esm/lib/DFWService.d.ts

@@ -1,12 +1,12 @@
-import type { PrismaClient } from "@prisma/client";
-import type { DFWDatabase } from "#types/DFWDatabase";
-import type { DFWRequestSchema, DFWRequestSession } from "#types/DFWRequest";
-export declare abstract class DFWService {
-    abstract readonly namespace: string;
-    protected readonly db: PrismaClient;
-    protected readonly session: DFWRequestSession;
-    constructor(dfw: DFWRequestSchema);
-    protected buildTransaction: <T>(fn: (db: DFWDatabase) => Promise<T>) => Promise<T>;
-    protected buildMethod: <T>(fn: (db: PrismaClient) => Promise<T>) => Promise<T>;
+import { DFWCore } from "#lib/DFWCore";
+export declare class DFWService<TDatabase, TDeps extends object = {}> {
+    protected _dfw: DFWCore<TDatabase>;
+    protected _db: TDatabase;
+    protected _deps: TDeps;
+    get dfw(): DFWCore<TDatabase>;
+    get db(): TDatabase;
+    get deps(): TDeps;
+    constructor(dfw: DFWCore<TDatabase>, deps: TDeps);
+    transaction: <R = any, TTx extends TDatabase = TDatabase>(cb: (tx: TTx) => Promise<R>) => Promise<R>;
 }
 //# sourceMappingURL=DFWService.d.ts.map

package/dist/esm/lib/DFWService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DFWService.d.ts","sourceRoot":"","sources":["../../../src/lib/DFWService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE7E,8BAAsB,UAAU;IAC9B,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAEpC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,YAAY,CAAA;IACnC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAA;gBAEjC,GAAG,EAAE,gBAAgB;IAKjC,SAAS,CAAC,gBAAgB,GAAI,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,KAAG,OAAO,CAAC,CAAC,CAAC,CAIhF;IAED,SAAS,CAAC,WAAW,GAAI,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,YAAY,KAAK,OAAO,CAAC,CAAC,CAAC,KAAG,OAAO,CAAC,CAAC,CAAC,CAE5E;CAEF"}
+{"version":3,"file":"DFWService.d.ts","sourceRoot":"","sources":["../../../src/lib/DFWService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,qBAAa,UAAU,CAAC,SAAS,EAAE,KAAK,SAAS,MAAM,GAAG,EAAE;IAC1D,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IACnC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC;IACzB,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IAEvB,IAAI,GAAG,uBAEN;IAED,IAAI,EAAE,cAEL;IAED,IAAI,IAAI,UAEP;gBAEW,GAAG,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,KAAK;IAMzC,WAAW,GAChB,CAAC,GAAG,GAAG,EACP,GAAG,SAAS,SAAS,GAAG,SAAS,EAEjC,IAAI,CAAC,EAAE,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,KAC1B,OAAO,CAAC,CAAC,CAAC,CAOX;CACH"}

package/dist/esm/lib/DFWService.js

@@ -1,15 +1,27 @@
+import { DFWCore } from "#lib/DFWCore";
 export class DFWService {
-    constructor(dfw) {
-        this.buildTransaction = (fn) => {
-            return this.db.$transaction(async (db) => {
-                return fn(db);
-            });
-        };
-        this.buildMethod = (fn) => {
-            return fn(this.db);
+    get dfw() {
+        return this._dfw;
+    }
+    get db() {
+        return this._db;
+    }
+    get deps() {
+        return this._deps;
+    }
+    constructor(dfw, deps) {
+        this.transaction = async (cb) => {
+            const anyDb = this._db;
+            if (anyDb.$transaction) {
+                return anyDb.$transaction(cb);
+            }
+            else {
+                return cb(this._db);
+            }
         };
-        this.db = dfw.db;
-        this.session = dfw.getSession();
+        this._dfw = dfw;
+        this._db = dfw.db;
+        this._deps = deps;
     }
 }
 //# sourceMappingURL=DFWService.js.map

package/dist/esm/lib/DFWService.js.map

@@ -1 +1 @@
-{"version":3,"file":"DFWService.js","sourceRoot":"","sources":["../../../src/lib/DFWService.ts"],"names":[],"mappings":"AAIA,MAAM,OAAgB,UAAU;IAM9B,YAAY,GAAqB;QAKvB,qBAAgB,GAAG,CAAI,EAAmC,EAAc,EAAE;YAClF,OAAO,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBACvC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACL,CAAC,CAAA;QAES,gBAAW,GAAG,CAAI,EAAoC,EAAc,EAAE;YAC9E,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACpB,CAAC,CAAA;QAZC,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,UAAU,EAAE,CAAA;IACjC,CAAC;CAYF"}
+{"version":3,"file":"DFWService.js","sourceRoot":"","sources":["../../../src/lib/DFWService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,MAAM,OAAO,UAAU;IAKrB,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,GAAG,CAAC;IAClB,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,YAAY,GAAuB,EAAE,IAAW;QAMzC,gBAAW,GAAG,KAAK,EAIxB,EAA2B,EACf,EAAE;YACd,MAAM,KAAK,GAAQ,IAAI,CAAC,GAAG,CAAC;YAC5B,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;gBACvB,OAAO,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YAChC,CAAC;iBAAM,CAAC;gBACN,OAAO,EAAE,CAAC,IAAI,CAAC,GAAU,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC,CAAC;QAjBA,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC;QAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;CAeF"}

package/dist/esm/lib/DFWSessionStore.d.ts

@@ -3,7 +3,7 @@ import { Store } from "express-session";
 export declare class DFWSessionStore extends Store {
     private db;
     private cache;
-    constructor(DFW: DFWCore);
+    constructor(DFW: DFWCore<any>);
     get(sid: string, callback: (err: any, session?: any) => void): void;
     set(sid: string, sessionData: any, callback?: (err?: any) => void): void;
     destroy(sid: string, callback?: (err?: any) => void): void;

package/dist/esm/lib/DFWSessionStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DFWSessionStore.d.ts","sourceRoot":"","sources":["../../../src/lib/DFWSessionStore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAGxC,qBAAa,eAAgB,SAAQ,KAAK;IAEtC,OAAO,CAAC,EAAE,CAAc;IAExB,OAAO,CAAC,KAAK,CAA8B;gBAE/B,GAAG,EAAE,OAAO;IAMxB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;IA+BnE,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;IAmBxE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;CAc7D"}
+{"version":3,"file":"DFWSessionStore.d.ts","sourceRoot":"","sources":["../../../src/lib/DFWSessionStore.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAGxC,qBAAa,eAAgB,SAAQ,KAAK;IAEtC,OAAO,CAAC,EAAE,CAAc;IAExB,OAAO,CAAC,KAAK,CAA8B;gBAE/B,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC;IAM7B,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;IA+BnE,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;IAmBxE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;CAc7D"}

package/dist/esm/lib/DFWSessionStore.js.map

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

package/dist/esm/lib/DFWUtils.d.ts

@@ -1,5 +1,3 @@
-import type { ListenerFn } from "#types/APIListener";
-import type { DFWRequest, DFWResponse } from "#types/DFWRequest";
 import z from "zod";
 export declare class DFWUtils {
     static emailSchema: z.ZodEmail;
@@ -31,6 +29,5 @@ export declare class DFWUtils {
     static cuid(): string;
     static verifyPasswordAsync(encoded: string, test: string): Promise<boolean>;
     static encryptPasswordAsync(password: string): Promise<string>;
-    static makeGuard: (fn: ListenerFn) => (req: DFWRequest, res: DFWResponse, next: (err?: any) => void) => Promise<void>;
 }
 //# sourceMappingURL=DFWUtils.d.ts.map

package/dist/esm/lib/DFWUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DFWUtils.d.ts","sourceRoot":"","sources":["../../../src/lib/DFWUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAMjE,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB,qBAAa,QAAQ;IAEjB,OAAc,WAAW,aAAY;WAEvB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;WAI/B,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe;IAQ3D;;;OAGG;WACiB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/D;;;OAGG;WACW,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAK1D;;;OAGG;WACW,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAI5D;;OAEG;WACW,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAY1D;;OAEG;WACW,IAAI,IAAI,MAAM;WAId,IAAI,IAAI,MAAM;WAIR,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;WASpE,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAQ3E,OAAc,SAAS,GAAI,IAAI,UAAU,MACvB,KAAK,UAAU,EAAE,KAAK,WAAW,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,mBAQ7E;CAEJ"}
+{"version":3,"file":"DFWUtils.d.ts","sourceRoot":"","sources":["../../../src/lib/DFWUtils.ts"],"names":[],"mappings":"AAKA,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB,qBAAa,QAAQ;IAEjB,OAAc,WAAW,aAAY;WAEvB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;WAI/B,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe;IAQ3D;;;OAGG;WACiB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/D;;;OAGG;WACW,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAK1D;;;OAGG;WACW,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAI5D;;OAEG;WACW,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAY1D;;OAEG;WACW,IAAI,IAAI,MAAM;WAId,IAAI,IAAI,MAAM;WAIR,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;WASpE,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAO9E"}

package/dist/esm/lib/DFWUtils.js

@@ -1,4 +1,3 @@
-var _a;
 import chalk from "chalk";
 import { randomUUID } from "crypto";
 import { lookup } from "mime-types";
@@ -47,7 +46,7 @@ export class DFWUtils {
     static generateRandomHexString(len) {
         let maxlen = 8, min = Math.pow(16, Math.min(len, maxlen) - 1), max = Math.pow(16, Math.min(len, maxlen)) - 1, n = Math.floor(Math.random() * (max - min + 1)) + min, r = n.toString(16);
         while (r.length < len) {
-            r = r + _a.generateRandomHexString(len - maxlen);
+            r = r + DFWUtils.generateRandomHexString(len - maxlen);
         }
         return r;
     }
@@ -77,17 +76,5 @@ export class DFWUtils {
         });
     }
 }
-_a = DFWUtils;
 DFWUtils.emailSchema = z.email();
-DFWUtils.makeGuard = (fn) => {
-    return async (req, res, next) => {
-        try {
-            await fn(req.dfw, req, res);
-            next();
-        }
-        catch (err) {
-            next(err);
-        }
-    };
-};
 //# sourceMappingURL=DFWUtils.js.map