5htp-core 0.6.2-94 → 0.6.2-95

package/client/components/Rte/Editor.tsx

@@ -81,6 +81,8 @@ import ToolbarPlugin from './ToolbarPlugin';
 
 export const EMPTY_STATE = '{"root":{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1}],"direction":null,"format":"","indent":0,"type":"root","version":1}}';
 
+import './style.less';
+
 /*----------------------------------
 - TYPES
 ----------------------------------*/

package/client/components/Rte/index.tsx

@@ -11,7 +11,6 @@ import type { TToolbarDisplay } from './ToolbarPlugin';
 
 // Special componets
 import type TEditor from './Editor';
-import './style.less';
 
 /*----------------------------------
 - TYPES

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.6.2-94",
+	"version": "0.6.2-95",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",

package/server/app/service/index.ts

@@ -46,7 +46,7 @@ export type StartedServicesIndex = {
 
 export type TServiceArgs<TService extends AnyService> = [
     parent: AnyService | 'self',
-    getConfig: null | undefined | ((instance: TService) => {}),
+    config: null | undefined | TService['config'],
     app: TService['app'] | 'self'
 ]
 
@@ -122,7 +122,7 @@ export default abstract class Service<
     TConfig extends {}, 
     THooks extends THooksList,
     TApplication extends Application,
-    TParent extends AnyService | Application = Application
+    TParent extends AnyService
 > {
 
     public started?: Promise<void>;
@@ -136,18 +136,17 @@ export default abstract class Service<
     public app: TApplication;
     public config: TConfig = {} as TConfig;
 
-    public constructor(...[parent, getConfig, app]: TServiceArgs<AnyService>) {
+    public constructor(...[parent, config, app]: TServiceArgs<AnyService>) {
 
         this.parent = parent;
         if (this.parent === 'self') 
-            this.parent = this;
+            this.parent = this as unknown as TParent;
 
         this.app = app === 'self'
             ? this as unknown as TApplication
             : app
 
-        if (typeof getConfig === 'function')
-            this.config = getConfig(this);
+        this.config = config || {};
         
     }
 

package/server/services/auth/router/index.ts

@@ -7,9 +7,11 @@
 // Core
 import { 
     default as Router, Request as ServerRequest, Response as ServerResponse, TAnyRoute,
-    RouterService, TRouterServiceArgs
+    RouterService
 } from '@server/services/router';
 
+import type { TRouterServiceArgs } from '@server/services/router/service';
+
 // Specific
 import type { default as UsersService, TUserRole } from '..';
 import UsersRequestService from './request';

package/server/services/disks/driver.ts

@@ -58,6 +58,10 @@ export default abstract class FsDriver<
     TBucketName = keyof Config["buckets"]
 > extends Service<Config, {}, Application> {
 
+    public constructor( config: Config, app: Application ) {
+        super(app, config, app);
+    }
+
     public abstract mount(): Promise<void>;
 
     public abstract getFileUrl(

package/server/services/disks/drivers/s3/index.ts

@@ -50,9 +50,9 @@ export default class S3Driver<
 
     public s3: AWS.S3; 
 
-    public constructor(...args: TServiceArgs) {
+    public constructor( config: TConfig, app: Application ) {
 
-        super(...args);
+        super(app, config, app);
 
         AWS.config.update({
             accessKeyId: this.config.accessKeyId,

package/server/services/disks/index.ts

@@ -37,7 +37,7 @@ export default class DisksManager<
     MountpointList extends Services,
     TConfig extends Config,
     TApplication extends Application
-> extends Service<TConfig, Hooks, TApplication> {
+> extends Service<TConfig, Hooks, TApplication, TApplication> {
 
     public default!: Driver;
 
@@ -50,10 +50,17 @@ export default class DisksManager<
         super(...args);
 
         const drivers = this.config.drivers;
+
+        console.log('drivers', args);
         
         if (Object.keys( drivers ).length === 0)
             throw new Error("At least one disk driver should be mounted.");
 
+        // Bind current instance of the service as parent
+        /*for (const driverId in drivers) {
+            drivers[driverId].parent = this;
+        }*/
+
         const defaultDisk = drivers[ this.config.default ];
         if (defaultDisk === undefined)
             console.log(`Default disk "${this.config.default as string}" not mounted.`);

package/server/services/router/index.ts

@@ -104,7 +104,7 @@ export type Config<
 
 // Set it as a function, so when we instanciate the services, we can callthis.router to pass the router instance in roiuter services
 type TRouterServicesList = {
-    [serviceName: string]: RouterService<TServerRouter>
+    [serviceName: string]: RouterService
 }
 
 export type Hooks = {
@@ -127,7 +127,7 @@ export default class ServerRouter<
     TServices extends TRouterServicesList,
     TConfig extends Config<TServices>,
 >
-    extends Service<TConfig, Hooks, TApplication> implements BaseRouter {
+    extends Service<TConfig, Hooks, TApplication, TApplication> implements BaseRouter {
 
     public disks = this.use<DisksManager>('Core/Disks', { optional: true });
     
@@ -175,7 +175,9 @@ export default class ServerRouter<
 
         // Detect router services
         for (const serviceName in this.config.plugins) {
-            this.app.register( this.config.plugins[serviceName] )
+            const service = this.config.plugins[serviceName];
+            service.parent = this;
+            this.app.register( service )
         }
 
          // Use require to avoid circular references
@@ -373,10 +375,10 @@ export default class ServerRouter<
             req: Request,
             res: Response,
             next: NextFunction,
-            requestContext: TRouterContext
+            requestContext: TRouterContext<this>
         ) => void
     ) {
-        return (context: TRouterContext) => new Promise((resolve) => {
+        return (context: TRouterContext<this>) => new Promise((resolve) => {
             
             context.request.res.on('finish', function() {
                 //console.log('the response has been sent', request.res.statusCode);

package/server/services/router/response/index.ts

@@ -12,7 +12,7 @@ import express from 'express';
 
 // Core
 import { Application } from '@server/app';
-import type { default as ServerRouter, TServerRouter } from '@server/services/router';
+import type { RouterService, default as ServerRouter, TServerRouter } from '@server/services/router';
 import ServerRequest from '@server/services/router/request';
 import { TRoute, TAnyRoute, TDomainsList } from '@common/router';
 import { NotFound, Forbidden, Anomaly } from '@common/errors';
@@ -62,7 +62,9 @@ export type TRouterContextServices<
     // Custom context via servuces
     // For each roiuter service, return the request service (returned by roiuterService.requestService() )
     {
-        [serviceName in keyof TPlugins]: TRouter["config"]["plugins"]//TPlugins[serviceName]
+        [serviceName in keyof TPlugins]: TPlugins[serviceName] extends RouterService 
+            ? ReturnType<TPlugins[serviceName]["requestService"]> 
+            : TPlugins[serviceName]
     }
 )
 
@@ -215,7 +217,7 @@ export default class ServerResponse<
         return this;
     }
 
-    public async render( page: Page, context: TRouterContext, additionnalData: {} ) {
+    public async render( page: Page, context: TRouterContext<TRouter>, additionnalData: {} ) {
 
         // Set page in context for the client side
         context.page = page;

package/server/services/router/service.ts

@@ -11,7 +11,10 @@ import type { default as Router } from '.';
 import type ServerRequest from './request';
 import type RequestService from './request/service';
 
-export type TRouterServiceArgs = TServiceArgs<RouterService>;
+export type TRouterServiceArgs = [
+    getConfig: TServiceArgs<RouterService>[1],
+    app: Application,
+];
 
 /*----------------------------------
 - SERVICE
@@ -20,10 +23,10 @@ export default abstract class RouterService<
     TConfig extends {} = {}
 > extends Service<TConfig, {}, Application> {
 
-    public constructor( ...args: TRouterServiceArgs) {
-        super(...args);
+    public constructor( ...[config, app]: TRouterServiceArgs) {
+        super(app, config, app);
     }
 
-    public abstract requestService( request: ServerRequest<Router> ): RequestService | null;
+    public abstract requestService( request: ServerRequest<RouterService> ): RequestService | {} | null;
 
 }

package/types/icons.d.ts

@@ -1 +1 @@
-export type TIcones = "times"|"solid/spinner-third"|"long-arrow-right"|"check-circle"|"rocket"|"user-circle"|"plane-departure"|"plus-circle"|"comments-alt"|"chart-bar"|"crosshairs"|"arrow-right"|"user-shield"|"shield-alt"|"chart-line"|"money-bill-wave"|"star"|"link"|"file-alt"|"long-arrow-left"|"calendar-alt"|"paper-plane"|"at"|"phone"|"brands/linkedin"|"search"|"lightbulb"|"magnet"|"user-plus"|"sack-dollar"|"info-circle"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"user"|"brands/whatsapp"|"plus"|"minus"|"trash"|"check"|"clock"|"cog"|"ellipsis-h"|"play"|"stop"|"regular/shield-check"|"angle-down"|"angle-up"|"solid/crown"|"eye"|"pen"|"file"|"envelope"|"coins"|"download"|"exclamation-circle"|"times-circle"|"bars"|"arrow-left"|"meh-rolling-eyes"|"minus-circle"|"chevron-left"|"bolt"|"key"|"power-off"|"comment-alt"|"external-link"|"question-circle"|"wind"|"broom"|"brands/google"|"copy"|"solid/check-circle"|"solid/exclamation-triangle"|"solid/times-circle"|"hourglass"|"users"|"bug"|"binoculars"|"building"|"briefcase"|"map-marker-alt"|"graduation-cap"|"coin"|"plug"|"angle-left"|"angle-right"|"arrow-to-bottom"|"magic"|"solid/magic"|"map-marker"|"fire"|"globe"|"industry"|"calendar"|"code"|"bold"|"italic"|"underline"|"font"|"strikethrough"|"subscript"|"superscript"|"empty-set"|"horizontal-rule"|"page-break"|"image"|"table"|"poll"|"columns"|"sticky-note"|"caret-right"|"unlink"|"align-left"|"align-center"|"align-right"|"align-justify"|"indent"|"outdent"|"list-ul"|"check-square"|"h1"|"h2"|"h3"|"h4"|"list-ol"|"paragraph"|"quote-left"
+export type TIcones = "solid/spinner-third"|"rocket"|"user-circle"|"plane-departure"|"long-arrow-right"|"plus-circle"|"comments-alt"|"crosshairs"|"arrow-right"|"user-shield"|"shield-alt"|"chart-line"|"money-bill-wave"|"star"|"link"|"file-alt"|"long-arrow-left"|"magnet"|"search"|"times"|"at"|"plus"|"minus"|"trash"|"brands/linkedin"|"play"|"stop"|"paper-plane"|"regular/shield-check"|"angle-down"|"check"|"clock"|"cog"|"ellipsis-h"|"lightbulb"|"phone"|"angle-up"|"envelope"|"solid/crown"|"eye"|"pen"|"file"|"user-plus"|"sack-dollar"|"info-circle"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"download"|"brands/google"|"brands/whatsapp"|"crown"|"check-circle"|"exclamation-circle"|"times-circle"|"key"|"arrow-left"|"minus-circle"|"external-link"|"wind"|"broom"|"solid/check-circle"|"solid/exclamation-triangle"|"solid/times-circle"|"hourglass"|"building"|"briefcase"|"map-marker-alt"|"graduation-cap"|"angle-left"|"angle-right"|"coins"|"plug"|"coin"|"question-circle"|"arrow-to-bottom"|"magic"|"user"|"meh-rolling-eyes"|"unlink"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"code"|"font"|"empty-set"|"horizontal-rule"|"page-break"|"image"|"table"|"poll"|"columns"|"sticky-note"|"caret-right"|"list-ul"|"check-square"|"h1"|"h2"|"h3"|"h4"|"list-ol"|"paragraph"|"quote-left"|"align-left"|"align-center"|"align-right"|"align-justify"|"indent"|"outdent"