5htp-core 0.5.1-4 → 0.5.1-6

package/package.json

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

package/src/client/components/Table/index.tsx

@@ -170,11 +170,11 @@ export default function Liste<TRow extends TDonneeInconnue>({
 
                     render = (
                         <div class="row sp-05">
-                            {cell.map((item, i) => (
+                            {cell.map((item, i) => typeof item === 'string' ? (
                                 <span class={"badge bg light" + ((i % 7) + 1)}>
                                     {item}
                                 </span>
-                            ))}
+                            ) : item)}
                         </div>
                     )
 

package/src/client/components/inputv3/file/index.less

@@ -5,14 +5,16 @@
     position: relative;
     overflow: hidden;
 
-    border-radius: @radius;
-    border: dashed 3px var(--cLine);
-    background: @cBgPage + #090909;
-
-    padding: @spacing;
-    width: 100%;
-    min-height: 200px;
-    height: 14.15rem;
+    &.box {
+        border-radius: @radius;
+        border: dashed 3px var(--cLine);
+        background: @cBgPage + #090909;
+    
+        padding: @spacing;
+        width: 100%;
+        min-height: 200px;
+        height: 14.15rem;
+    }
 
     .preview,
     .indication,

package/src/client/components/inputv3/file/index.tsx

@@ -6,7 +6,7 @@ import React from 'react';
 import { ComponentChild } from 'preact';
 
 // Composants généraux
-import Bouton from '@client/components/button';
+import Button, { Props as BtnProps } from '@client/components/button';
 
 // Core libs
 import { InputWrapper } from '../base';
@@ -67,6 +67,7 @@ export type Props = {
     emptyText?: ComponentChild,
     className?: string,
     previewUrl?: string,
+    button?: boolean | BtnProps,
 
     // Actions
     onChange: (file: FileToUpload | undefined) => void
@@ -85,11 +86,12 @@ export default (props: Props) => {
     let {
         // Input
         value: file,
-        className,
+        className: customClassName,
 
         // Display
         emptyText = 'Click here to select a File',
         previewUrl: previewUrlInit,
+        button,
 
         // Actions
         onChange
@@ -97,7 +99,13 @@ export default (props: Props) => {
 
     const [previewUrl, setPreviewUrl] = React.useState<string | undefined>(previewUrlInit);
 
-    className = 'input upload ' + (className === undefined ? '' : ' ' + className);
+    let className = 'input upload';
+
+    if (!button)
+        className += ' box';
+
+    if (customClassName !== undefined)
+        className += ' ' + customClassName;
 
     /*----------------------------------
     - ACTIONS
@@ -131,33 +139,49 @@ export default (props: Props) => {
 
             <div class={className}>
 
-                {file && <>
-                    <div class="preview">
-
-                        {previewUrl ? (
-                            <img src={previewUrl} />
-                        ) : typeof file === 'string' ? <>
+                {button ? <> 
+
+                    <Button type="secondary" 
+                        {...button === true ? {} : button}
+                    >
+                        {emptyText}
+                    </Button>
+                
+                </> : <>
+
+                    {file && <>
+                        <div class="preview">
+
+                            {previewUrl ? (
+                                <img src={previewUrl} />
+                            ) : typeof file === 'string' ? <>
+                                <strong>A file has been selected</strong>
+                            </> : file ? <>
+                                <strong>{file.name}</strong>
+                            </> : null}
+                        </div>
+
+                        <div class="row actions sp-05">
+
+                            {typeof file === 'string' && <>
+                                <Button type="secondary" icon="eye" shape="pill" size="s" link={file} />
+                            </>}
+                            
+                            <Button class='bg error' icon="trash" shape="pill" size="s"  
+                                async onClick={() => onChange(undefined)} />
+                        </div>
+                    </>}
+
+                    <div class="indication col al-center">
+                        {typeof file === 'string' ? <>
                             <strong>A file has been selected</strong>
                         </> : file ? <>
                             <strong>{file.name}</strong>
-                        </> : null}
-                    </div>
-
-                    <div class="row actions sp-05">
-
-                        {typeof file === 'string' && <>
-                            <Bouton type="secondary" icon="eye" shape="pill" size="s" link={file} />
-                        </>}
-                        
-                        <Bouton class='bg error' icon="trash" shape="pill" size="s"  
-                            async onClick={() => onChange(undefined)} />
+                        </> : emptyText}
                     </div>
+                
                 </>}
 
-                <div class="indication col al-center">
-                    {emptyText}
-                </div>
-
                 <input type="file" onChange={selectFile} />
             </div>
         </InputWrapper>

package/src/server/services/database/index.ts

@@ -255,8 +255,9 @@ export default class SQL extends Service<Config, Hooks, Application, Services> {
         }).join(' ').trim();
     }
 
-    public equalities = (data: TObjetDonnees, keys = Object.keys(data)) => 
-        keys.map(k => '' + k + ' = ' + this.esc( data[k] ))
+    public equalities = (data: TObjetDonnees, forStorage: boolean = false) => {
+        return Object.keys(data).map(k => '' + k + ' = ' + this.esc( data[k], forStorage ))
+    }
 
     /*----------------------------------
     - OPERATIONS: LOW LEVELf
@@ -380,7 +381,7 @@ export default class SQL extends Service<Config, Hooks, Application, Services> {
         }
 
         // Create equalities
-        const egalitesData = this.equalities(data).join(', ')
+        const egalitesData = this.equalities(data, true).join(', ')
         const egalitesWhere = this.equalities(where).join(' AND ')
 
         // Build query

package/src/server/services/disks/driver.ts

@@ -71,7 +71,7 @@ export default abstract class FsDriver<
         bucketName: TBucketName, 
         filename: string, 
         options: TReadFileOptions
-    ): Promise<string>;
+    ): Promise<Buffer>;
 
     public abstract createReadStream( bucketName: TBucketName, filename: string );
 

package/src/server/services/disks/drivers/local/index.ts

@@ -76,7 +76,9 @@ export default class LocalFS<
         bucketName: TBucketName, 
         filename: string
     ) {
-        throw new Error("Method not available for local files.");
+        const bucketDir = this.config.buckets[bucketName];
+        const fullPath = path.join( this.rootDir, bucketDir, filename || '.' );
+        return fullPath;
     }
 
     public async readDir( bucketName: TBucketName, dirname?: string ) {
@@ -135,7 +137,7 @@ export default class LocalFS<
         const fullPath = path.join( this.rootDir, bucketDir, filename );
 
         this.config.debug && console.log(`readFile ${fullPath}`);
-        return fs.readFileSync( fullPath ).toString();
+        return fs.readFileSync( fullPath );
     }
 
     public createReadStream( bucketName: TBucketName, filename: string ) {

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

@@ -605,8 +605,8 @@ declare type Routes = {
         } else {
 
             // For debugging HTTP errors
-            if (this.app.env.profile === "dev")
-                console.warn(e);
+            /*if (this.app.env.profile === "dev")
+                console.warn(e);*/
 
             await this.app.runHook('error.' + code, e, request);
         }

package/src/server/services/router/request/index.ts

@@ -24,7 +24,21 @@ import ServerResponse from '../response';
 - TYPES
 ----------------------------------*/
 
-const localeFilter = (input: any) => typeof input === 'string' && ISO6391.validate(input) ? input : undefined;
+const localeFilter = (input: any) => {
+
+    // Data type
+    if (typeof input !== 'string')
+        return;
+
+    // Extract ISO code
+    let lang = input.trim().split(/[-_]/)[0].toLowerCase();
+    
+    // Check size
+    if (!ISO6391.validate(lang))
+        return;
+
+    return lang.toUpperCase();
+}
 
 export type UploadedFile = With<FileToUpload, 'md5'|'ext'>
 

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

@@ -310,8 +310,15 @@ export default class ServerResponse<
         }
 
         // envoi filename
-        const file = await disk.readFile('data', filename, {});
+        const file = await disk.readFile('data', filename, {
+            encoding: 'buffer'
+        });
         this.data = file;
+        
+
+        // Mimetype
+        this.headers['Content-Type'] = 'image/jpeg';
+
         return this.end();
     }
 

package/src/server/utils/rte.ts

@@ -29,7 +29,7 @@ type LexicalState = {
     root: LexicalNode
 }
 
-type LexicalNode = {
+export type LexicalNode = {
     version: number,
     type: string,
     children?: LexicalNode[],

package/src/server/utils/slug.ts

@@ -37,31 +37,43 @@ export class Slug {
 
         // Check if already existing
         if (SQL !== undefined) {
-
-            const escapedSlug = escapeStringRegexp(slug);
-
-            const duplicates = await SQL.selectVal<number>(`
-                SELECT 
-                    IF( ${column} LIKE ${SQL.esc(slug)},
-                        1,
-                        CAST(SUBSTRING_INDEX(slug, '-', -1) AS UNSIGNED)
-                    ) AS duplicates
-                FROM ${table} 
-                WHERE 
-                    ${column} LIKE ${SQL.esc(slug)}
-                    OR
-                    ${column} REGEXP '^${escapedSlug}-[0-9]+$'
-                ORDER BY duplicates DESC
-                LIMIT 1
-            `);
-
-            if (duplicates && duplicates > 0)
-                slug += `-${duplicates + 1}`;
+            slug = await this.Correct(slug, SQL, table, column);
         }
 
         return slug;
     }
 
+    public async Correct( 
+        slug: string, 
+        SQL: SQL, 
+        table: string, 
+        column: string 
+    ) {
+        
+        const escapedSlug = escapeStringRegexp(slug);
+
+        const duplicates = await SQL.selectVal<number>(`
+            SELECT 
+                IF( ${column} LIKE ${SQL.esc(slug)},
+                    1,
+                    CAST(SUBSTRING_INDEX(slug, '-', -1) AS UNSIGNED)
+                ) AS duplicates
+            FROM ${table} 
+            WHERE 
+                ${column} LIKE ${SQL.esc(slug)}
+                OR
+                ${column} REGEXP '^${escapedSlug}-[0-9]+$'
+            ORDER BY duplicates DESC
+            LIMIT 1
+        `);
+
+        if (duplicates && duplicates > 0)
+            slug += `-${duplicates + 1}`;
+
+        return slug;
+
+    }
+
 }
 
 export default new Slug;