mandarina-server 1.6.5 → 2.0.0

package/build/cli/index.js

@@ -5,6 +5,8 @@ var createProject_1 = require("./createProject");
 var watch_1 = require("./watch");
 var deploy_1 = require("./deploy");
 var genFiles_1 = require("./gen-files/genFiles");
+var prisma2_1 = require("./gen-files/prisma2");
+console.log('cesar');
 //@ts-ignore
 var _a = process.argv, nodeDir = _a[0], dir = _a[1], cmd = _a[2], args = _a.slice(3);
 switch (cmd) {
@@ -15,6 +17,9 @@ switch (cmd) {
     case 'gen-files':
         genFiles_1.genFile();
         break;
+    case 'gen-prisma2':
+        prisma2_1.genFile();
+        break;
     case 'deploy':
         deploy_1.deploy();
         break;

package/build/cli/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";;;AACA,iDAA8C;AAC9C,iCAA8B;AAC9B,mCAAgC;AAChC,iDAA6C;AAE7C,YAAY;AACN,IAAA,iBAA2C,EAA1C,eAAO,EAAE,WAAG,EAAE,WAAG,EAAE,kBAAuB,CAAA;AAEjD,QAAQ,GAAG,EAAE;IACX,KAAK,QAAQ;QACX,IAAM,OAAO,GAAG,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,WAAW,CAAA;QAC9C,6BAAa,CAAC,OAAO,CAAC,CAAA;QACtB,MAAK;IACP,KAAK,WAAW;QACd,kBAAO,EAAE,CAAA;QACT,MAAM;IACR,KAAK,QAAQ;QACX,eAAM,EAAE,CAAA;QACR,MAAM;IACR,KAAK,OAAO;QACV,aAAK,EAAE,CAAA;QACP,MAAM;IACR,KAAK,SAAS;QACZ,OAAO,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAA;QAC5D,MAAK;IACP;QACE,OAAO,CAAC,IAAI,CAAC,aAAW,GAAG,gFAAsE,CAAC,CAAA;CACrG;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8EE"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";;;AACA,iDAA8C;AAC9C,iCAA8B;AAC9B,mCAAgC;AAChC,iDAA6C;AAC7C,+CAA0D;AAE1D,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;AAEpB,YAAY;AACN,IAAA,iBAA2C,EAA1C,eAAO,EAAE,WAAG,EAAE,WAAG,EAAE,kBAAuB,CAAA;AAEjD,QAAQ,GAAG,EAAE;IACX,KAAK,QAAQ;QACX,IAAM,OAAO,GAAG,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,WAAW,CAAA;QAC9C,6BAAa,CAAC,OAAO,CAAC,CAAA;QACtB,MAAK;IACP,KAAK,WAAW;QACd,kBAAO,EAAE,CAAA;QACT,MAAM;IACR,KAAK,aAAa;QAChB,iBAAU,EAAE,CAAA;QACZ,MAAM;IACR,KAAK,QAAQ;QACX,eAAM,EAAE,CAAA;QACR,MAAM;IACR,KAAK,OAAO;QACV,aAAK,EAAE,CAAA;QACP,MAAM;IACR,KAAK,SAAS;QACZ,OAAO,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAA;QAC5D,MAAK;IACP;QACE,OAAO,CAAC,IAAI,CAAC,aAAW,GAAG,gFAAsE,CAAC,CAAA;CACrG;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8EE"}

package/build/cli/utils.d.ts

@@ -1,5 +1,8 @@
 export declare const getConfig: () => ConfigInterface;
 export interface ConfigInterface {
+    database: {
+        url: string;
+    };
     prisma: {
         port: string;
         host: string;
@@ -21,5 +24,6 @@ export interface ConfigDirInterface {
     actions?: string[];
     generated: string;
     prisma: string;
+    prisma2: string;
 }
 export declare const loadSchemas: (dir: ConfigDirInterface) => void;

package/build/cli/utils.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mandarina-server",
-  "version": "1.6.5",
+  "version": "2.0.0",
   "description": "Mandarina for server side",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/src/Action/CustomAction.ts

@@ -1,10 +1,8 @@
-import {ErrorFromServerMapper, Schema} from "mandarina/build/Schema/Schema";
+import {ErrorFromServerMapper, Permission, Schema} from "mandarina/build/Schema/Schema";
 import {TableInstanceNotFound} from "../Errors/TableInstanceNotFound";
 import {UniqueActionError} from "../Errors/UniqueActionError";
-
-import {Permission} from "mandarina/build/Schema/Schema";
 import Mandarina from "../Mandarina";
-
+import {Hook} from "../Table/Table";
 
 
 export class CustomAction {
@@ -15,7 +13,10 @@ export class CustomAction {
     public name: string;
     public options: ActionOptions
     public actions: ActionInterface
-
+    protected static hook: Hook
+    static setGlobalHook = (hook: Hook) => {
+        CustomAction.hook = hook
+    }
 
     /**
      *
@@ -73,6 +74,13 @@ export class CustomAction {
                         console.log('*****************************************************************************')
                         //throw new Error(`Action "${action}" not allowed for this user`)
                     }
+                    if (CustomAction.hook) {
+                        context.schemaName= this.name
+                        context.name= action
+                        await CustomAction.hook(_, args, context, info)
+                        delete context.schemaName
+                        delete context.name
+                    }
                     return await actions[action].action(_, args, context, info)
 
                 };

package/src/Table/Table.ts

@@ -30,7 +30,11 @@ export class Table {
     public schema: Schema;
     public name: string;
     public options: TableSchemaOptions & TableShapeOptions;
+    protected static hooks: Hooks= {}
 
+    static setGlobalHooks = (hooks: Hooks) => {
+        Table.hooks = hooks
+    }
 
     constructor(schema: Schema, tableOptions?: TableShapeOptions) {
         Table.instances = Table.instances || {};
@@ -88,14 +92,15 @@ export class Table {
     //Insert where option in to the query
     // static dotConcat = (a: string | undefined, b: string) => a ? `${a}.${b}` : b;
     getDefaultActions(type: operationType) {
+        console.log('getDefaultActions22')
         // OperationName for query is user or users, for mutation are createUser, updateUser ....
         const operationNames: string[] = Object.values(this.schema.names[type]);
         const resultResolvers: { [resolverName: string]: (_: any, args: any, context: Context, info: any) => void } = {};
         operationNames.forEach((operationName: string) => {
             if (!this.shouldHasManyUpdate()) return
             resultResolvers[operationName] = async (_: any, args: any = {}, context: Context, info: GraphQLResolveInfo) => {
+
                 context.originalArgs=args
-                bm()
                 const user = await Mandarina.config.getUser(context)
                 const subOperationName: ActionType | string = operationName.substr(0, 6)
                 const action: ActionType = <ActionType>(['create', 'update', 'delete'].includes(subOperationName) ? subOperationName : 'read')
@@ -103,6 +108,8 @@ export class Table {
                 const capitalizedAction = capitalize(action)
                 await this.callHook(this.name, 'beforeValidate', _, args, context, info);
                 const isSingleMutation = operationName === this.schema.names.mutation.update || operationName === this.schema.names.mutation.create
+                // @ts-ignore
+
                 let {query, queryString, fields} = this.insertWhereIntoInfo(info, user, isSingleMutation, action, operationName)
                 if (type === 'mutation') {
                     // if (errors.length > 0) {
@@ -182,7 +189,6 @@ export class Table {
                     context.result = result
                     await this.callHook(this.name, 'afterQuery', _, args, context, info);
                 }
-                bm(`${operationName} ${type} over ${this.name}`)
                 return result;
             }
         });
@@ -190,6 +196,7 @@ export class Table {
     }
 
     insertWhereIntoInfo = (info: GraphQLResolveInfo, user: UserType | null| undefined, isSingleMutation = false, action: ActionType, operationName: string) => {
+        console.log('insertWhereIntoInfo')
         const field: string[] = []
         const fields = new Set<string>()
         let required = false
@@ -228,10 +235,13 @@ export class Table {
                             originalWhereString = print(originalWhereObj.value)
                             required = true
                         }
+                        console.log('where',where)
                         const newWhereString = stringifyObject(where, {singleQuotes: false})
+                        console.log('newWhereString',newWhereString)
                         let finalWhereString = originalWhereString ? `{AND:[${originalWhereString},${newWhereString}]}` : newWhereString
                         if (originalWhereObj) {
                             originalWhereObj.value = parseValue(new Source(finalWhereString))
+                            console.log('originalWhereObj',originalWhereObj)
                         } else {
                             clone.arguments.push({
                                 kind: 'Argument',
@@ -281,6 +291,7 @@ export class Table {
             let prefix = ''
             if (name.indexOf('before') === 0) prefix = 'before'
             if (name.indexOf('after') === 0) prefix = 'after'
+            const globalHookHandler = Table.hooks[name];
             const hookHandler = this.options.hooks && this.options.hooks[name];
             if ( args.data && prefix) {
                 const fields = Object.keys( args.data)
@@ -320,6 +331,11 @@ export class Table {
                     }
                 }
             }
+            if (globalHookHandler) {
+                context.schemaName=schemaName
+                context.name=name
+                await globalHookHandler(_, args, context, info);
+            }
             if (hookHandler) {
                 await hookHandler(_, args, context, info);
             }
@@ -374,25 +390,26 @@ export interface Hook {
 
 export type operationType = "mutation" | "query"
 
+export type Hooks={
+    beforeValidate?: Hook
+    afterValidate?: Hook
+    validationFailed?: Hook
+    beforeCreate?: Hook
+    beforeDelete?: Hook
+    beforeUpdate?: Hook
+    beforeSave?: Hook
+    afterCreate?: Hook
+    afterDelete?: Hook
+    afterUpdate?: Hook
+
+    // Query operation hooks
+    beforeQuery?: Hook
+    afterQuery?: Hook
+}
 
 export interface TableSchemaOptions {
     virtual?: boolean
-    hooks?: {
-        beforeValidate?: Hook
-        afterValidate?: Hook
-        validationFailed?: Hook
-        beforeCreate?: Hook
-        beforeDelete?: Hook
-        beforeUpdate?: Hook
-        beforeSave?: Hook
-        afterCreate?: Hook
-        afterDelete?: Hook
-        afterUpdate?: Hook
-
-        // Query operation hooks
-        beforeQuery?: Hook
-        afterQuery?: Hook
-    }
+    hooks?: Hooks
     filters?: Filter[]
 }
 
@@ -406,7 +423,7 @@ export interface TableShapeOptions extends TableSchemaOptions {
 }
 
 
-type HookName =
+export type HookName =
     'beforeValidate'
     | 'afterValidate'
     | 'validationFailed'
@@ -419,10 +436,10 @@ type HookName =
     | 'beforeQuery'
     | 'afterQuery'
 
-let time = new Date().getTime()
+// let time = new Date().getTime()
 
-export function bm(description = '',...args:any) {
-    description && console.info(description,...args, new Date().getTime() - time)
-    time = new Date().getTime()
-
-}
+// export function bm(description = '',...args:any) {
+//     description && console.info(description,...args, new Date().getTime() - time)
+//     time = new Date().getTime()
+//
+// }

package/src/cli/gen-files/prisma2.ts

@@ -0,0 +1,277 @@
+import {getConfig, loadSchemas} from "../utils";
+import {createDir} from "./genFilesUtils";
+import {Table} from "../..";
+import {Schema} from "mandarina";
+import {isRequired} from "mandarina/build/Schema/utils";
+import path from "path";
+import fs from "fs";
+import {FieldDefinition} from "mandarina/build/Schema/Schema";
+
+const prisma2Models: { [schemaName: string]: { [fieldName: string]: string } } = {}
+const processed: { [schemaName: string]: { [schemaName: string]: { [fieldName: string]: true } } } = {}
+const processedSubSchemas: string[] = []
+export const genFile = () => {
+    const config = getConfig()
+    loadSchemas(config.dir)
+    createDir(config.dir.prisma2)
+    for (const schemaName in Table.instances) {
+        const schema = Schema.getInstance(schemaName)
+        getPrisma2Model(schema)
+    }
+    let prisma = `generator client {
+  provider = "prisma-client-js"
+}
+
+datasource db {
+  provider = "postgresql"
+  url      = env("DATABASE_URL")
+}
+`
+    Object.keys(prisma2Models).forEach(modelName => {
+        const model = prisma2Models[modelName]
+        prisma += `model ${modelName} {\n `
+        Object.keys(model).forEach(fieldName => {
+            const field = model[fieldName]
+            prisma += `\t${fieldName} ${field}\n`
+        })
+        prisma += `}\n\n`
+    })
+    const prismaDir = path.join(process.cwd(), config.dir.prisma2,)
+    const fileAbs = `${prismaDir}/schema.prisma`;
+    fs.writeFileSync(fileAbs, prisma);
+
+}
+
+const getPrisma2Model = (schema: Schema) => {
+    prisma2Models[schema.name] = prisma2Models[schema.name] || {}
+    for (const key of schema.keys) {
+        if (key === 'id') {
+            c++
+            prisma2Models[schema.name].id = `String                 @id @default(cuid()) //`;
+        } else {
+            const fieldDefinition = schema.getPathDefinition(key)
+            let required = fieldDefinition.isArray || isRequired(fieldDefinition)
+            const fieldType = getGraphQLType(fieldDefinition, key, required);
+            const unique = fieldDefinition.table.unique ? '@unique' : ''
+            let createdAt = '', updatedAt = ''
+            let defaultValue = ''
+            if (fieldDefinition.table.default !== undefined) {
+                const wrapper = (fieldDefinition.type === String) ? '"' : ''
+                defaultValue = `@default(${wrapper}${fieldDefinition.table.default}${wrapper})`
+            }
+            if ((fieldDefinition.table.createdAt === true || (fieldDefinition.table.createdAt !== false && key === 'createdAt'))) {
+                createdAt = `@default(now())`
+            }
+            if ((fieldDefinition.table.updatedAt === true || (fieldDefinition.table.updatedAt !== false && key === 'updatedAt'))) {
+                createdAt = `@default(now())`
+            }
+
+            if (fieldDefinition.table.default !== undefined) {
+                const wrapper = (fieldDefinition.type === String) ? '"' : ''
+                defaultValue = `@default(${wrapper}${fieldDefinition.table.default}${wrapper})`
+            }
+            if (fieldDefinition.isTable) {
+                getPrismaModelAModelB(schema, fieldDefinition)
+                if (!processedSubSchemas.includes(fieldDefinition.type) ) {
+                    processedSubSchemas.push(fieldDefinition.type)
+                    getPrisma2Model(Schema.getInstance(fieldDefinition.type))
+                }
+            }else{
+                prisma2Models[schema.name][key] = `${fieldType} ${unique} ${createdAt} ${updatedAt} ${defaultValue}`;
+
+            }
+        }
+    }// end for
+}
+
+let c=0
+const getPrismaModelAModelB = (schema: Schema, fieldDefinition: FieldDefinition) => {
+    if (!fieldDefinition.isTable) {
+        throw new Error(`Relation must be an array`)
+    }
+    processed[schema.name] = processed[schema.name] || {}
+    processed[schema.name][fieldDefinition.type] = processed[schema.name][fieldDefinition.type] || {}
+    prisma2Models[fieldDefinition.type] = prisma2Models[fieldDefinition.type] || {}
+    prisma2Models[schema.name] = prisma2Models[schema.name] || {}
+    c++
+    const childSchema = Schema.getInstance(fieldDefinition.type)
+    const children = childSchema.keys.filter(fieldName => childSchema.getPathDefinition(fieldName).type === schema.name)
+
+    if (!processed[schema.name][fieldDefinition.type][fieldDefinition.key]) {
+        if (schema.name === fieldDefinition.type) {
+            if (fieldDefinition.isArray) {
+                throw new Error(`DO THIS`)
+            }else{
+                if (fieldDefinition.isArray) {
+                    throw new Error(`DO THIS`)
+                }else{
+                    const child = schema.getPathDefinition(fieldDefinition.key)
+
+                    if (getRelation(fieldDefinition)!==getRelation(child)){
+                        throw new Error(`Relation must be the same`)
+                    }
+                    const relation = getRelationName(fieldDefinition, child) || `${schema.name}To${schema.name}`
+                    const fields=`p2${fieldDefinition.key}Id`
+                    prisma2Models[schema.name][fieldDefinition.key] = `${schema.name}? ${buildRelation(relation, fields)} //SELF: 1 - 1 ((${c}))`;
+                    prisma2Models[schema.name][fields] = `String? @unique //SELF: 1 - 1 ((${c}))`;
+                    prisma2Models[schema.name][`p2Predecessor${schema.name}`] = `${schema.name}? ${buildRelation(relation)}//SELF: 1 - 1 ((${c}))`;
+
+                }
+            }
+        } else {
+            if (children.length === 0) {
+                const relation = getRelationName(fieldDefinition)
+                if (fieldDefinition.isArray) {
+                    //relation many to one
+                    prisma2Models[schema.name][fieldDefinition.key] = `${fieldDefinition.type}[] ${buildRelation(relation)}//CREATE: n - 1 ((${c}))`;
+                    const fields=`p2${relation}${schema.name}Id`
+                    prisma2Models[fieldDefinition.type][`p2${relation}${schema.name}`] = `${schema.name}? ${buildRelation(relation, fields)}  //=>CREATE: n - 1 ((${c}))`;
+                    prisma2Models[fieldDefinition.type][fields] = `String? //=>CREATE: 1 - n ((${c}))`;
+                } else {
+                    if (!fieldDefinition.table?.relation?.type) {
+                        throw new Error(`Relation must be defined ONE_TO_ONE || ONE_TO_MANY- ${schema.name}.${fieldDefinition.key}`)
+                    }
+                    if (fieldDefinition.table?.relation?.type === 'ONE_TO_ONE') {
+                        const fields=`p2${relation}${schema.name}Id`
+                        prisma2Models[schema.name][fieldDefinition.key] = `${fieldDefinition.type}? ${buildRelation(relation)}//INLINE : 1 - 1 ((${c}))`;
+                        prisma2Models[fieldDefinition.type][`p2${relation}${schema.name}`] = `${schema.name}?  ${buildRelation(relation,fields)} //=>INLINE: 1 - 1 ((${c}))`;
+                        prisma2Models[fieldDefinition.type][fields] = `String?  @unique //=>INLINE: 1 - 1 ((${c}))`;
+                    }else if (fieldDefinition.table?.relation?.type === 'ONE_TO_MANY') {
+                        const fields=`p2${relation}${fieldDefinition.type}Id`
+                        prisma2Models[schema.name][fieldDefinition.key] = `${fieldDefinition.type}? ${buildRelation(relation,fields)}//CREATE: 1 - n ((${c}))`;
+                        prisma2Models[schema.name][fields] = `String? //=>CREATE: 1 - n ((${c}))`;
+                        prisma2Models[fieldDefinition.type][`p2${relation}${schema.name}`] = `${schema.name}[]  ${buildRelation(relation)} //=>CREATE: 1 - n ((${c}))`;
+                    }else{
+                        throw new Error(`many to one does no exists for create - ${schema.name}.${fieldDefinition.key}`)
+                    }
+                }
+            } else if (children.length >= 1) {
+                let child: FieldDefinition
+                if (children.length === 1) {
+                    child = childSchema.getPathDefinition(children[0])
+                } else {
+                    const childName = children.find(childName => getRelation(childSchema.getPathDefinition(childName)) === getRelation(fieldDefinition))
+                    if (!childName) {
+                        throw new Error(`Relation not found111`)
+                    }
+                    child = childSchema.getPathDefinition(childName)
+                }
+                if (!child) {
+                    throw new Error(`Relation not found222`)
+                }
+
+                if (child.isArray) { // means that the parent is the array (because fieldDefinition.isArray is array then child is the gran children which is really the parent)
+                    const relation = getRelationName(fieldDefinition,child)
+                    if (fieldDefinition.isArray) {
+                        //relation many to many
+                        prisma2Models[schema.name][fieldDefinition.key] = `${fieldDefinition.type}[]  ${buildRelation(relation)} //n - n ((${c}))`;
+                        prisma2Models[fieldDefinition.type][child.key] = `${child.type}[] ${buildRelation(relation)} //=>n - n ((${c}))`;
+                    } else {
+                        //relation one to many
+                        const relation = getRelationName(fieldDefinition,child)
+                        const fields=`p2${relation}${fieldDefinition.type}Id`
+                        prisma2Models[schema.name][fieldDefinition.key] = `${fieldDefinition.type}?   ${buildRelation(relation, fields)} //n - 1 ((${c}))`;
+                        prisma2Models[schema.name][fields] = `String?  //n - 1 ((${c}))`;
+                        prisma2Models[fieldDefinition.type][child.key] = `${schema.name} [] ${buildRelation(relation)}//=>n - 1 ((${c}))`;
+
+                    }
+                } else {
+                    const relation = getRelationName(fieldDefinition,child)
+                    if (fieldDefinition.isArray) {
+                        //relation many to many
+                        const fields=`p2${relation}${schema.name}Id`
+                        prisma2Models[schema.name][fieldDefinition.key] = `${fieldDefinition.type}[] ${buildRelation(relation)}//1 - n ((${c}))`;
+                        prisma2Models[fieldDefinition.type][child.key] = `${schema.name}?  ${buildRelation(relation,fields)} //=>n - 1 ((${c}))`;
+                        prisma2Models[fieldDefinition.type][fields] = `String?  //=>n - 1 ((${c}))`;
+
+                    } else {
+                        if (!fieldDefinition.table?.relation?.owner && !child.table?.relation?.owner) {
+                            throw new Error(`Relation must be defined a owner - ${schema.name}.${fieldDefinition.key}`)
+                        }
+                        if (fieldDefinition.table?.relation?.owner && child.table?.relation?.owner) {
+                            throw new Error(`Relation booth can not be a owner - ${schema.name}.${fieldDefinition.key}`)
+                        }
+                        if (fieldDefinition.table?.relation?.owner) {
+                            const fields = `p2${relation}${schema.name}Id`
+                            prisma2Models[schema.name][fieldDefinition.key] = `${fieldDefinition.type}? ${buildRelation(relation)}//OWNER 1 - 1 ((${c}))`;
+                            prisma2Models[fieldDefinition.type][child.key] = `${schema.name}?  ${buildRelation(relation, fields)} //OWNER =>1 - 1 ((${c}))`;
+                            prisma2Models[fieldDefinition.type][fields] = `String?  @unique //OWNER =>1 - 1 ((${c}))`;
+                        }else{
+                            const fields = `p2${relation}${fieldDefinition.type}Id`
+                            prisma2Models[schema.name][fieldDefinition.key] = `${fieldDefinition.type}? ${buildRelation(relation, fields)}//OWNED 1 - 1 ((${c}))`;
+                            prisma2Models[schema.name][fields] = `String?  @unique ${buildRelation(relation)} //OWNED =>1 - 1 ((${c}))`;
+                            prisma2Models[fieldDefinition.type][child.key] = `${child.type}? //OWNED =>1 - 1 ((${c}))`;
+                        }
+                    }
+                }
+                processed[fieldDefinition.type] = processed[fieldDefinition.type] || {}
+                processed[fieldDefinition.type][schema.name] = processed[fieldDefinition.type][schema.name] || {}
+                processed[fieldDefinition.type][schema.name][child.key] = true
+            } else {
+                throw new Error(`Relation must be have name`)
+            }
+        }
+    }
+}
+
+
+
+function getRelation(fieldDefinition: FieldDefinition) {
+    if (!fieldDefinition.table.relation) return ''
+    if (typeof fieldDefinition.table.relation === 'string') {
+        return fieldDefinition.table.relation
+    }
+    return fieldDefinition.table.relation.name || ''
+}
+
+const getGraphQLType = (def: FieldDefinition, key: string, required: boolean): string => {
+    const optional = !def.isArray && !required ? '?' : ''
+    switch (true) {
+        case (!def.isArray && !def.isTable && def.type.name === 'String'):
+            return `String${optional}`;
+
+        case (!def.isArray && !def.isTable && def.type.name === 'Boolean'):
+            return `Boolean${optional}`;
+
+        case (!def.isArray && !def.isTable && def.type.name === 'Number'):
+            return `Float${optional}`;
+
+        case (!def.isArray && !def.isTable && def.type.name === 'Integer'):
+            return `Int${optional}`;
+        case (!def.isArray && !def.isTable && def.type.name === 'Date'):
+            return `DateTime${optional}`;
+        case (def.isArray && def.isTable):
+            return `${def.type}[]`
+        case (def.isArray && !def.isTable):
+            const scalarName = getGraphQLType({...def, isArray: false}, key, def.isArray && required)
+            return `${scalarName}[]`
+        default:
+            return def.type + optional;
+    }
+}
+
+function buildRelation(relation: string, fields?: string){
+    if (!relation && !fields) return ''
+    if (!relation) return `@relation(fields: [${fields}],  references: [id])`
+    if (fields){
+        return `@relation("${relation}", fields: [${fields}],  references: [id])`
+    }
+    return `@relation("${relation}")`
+
+}
+
+const getRelationName = (def1: FieldDefinition, def2?:FieldDefinition) => {
+    const n1=getRelation(def1)
+    if (!def2){
+        if (!n1){
+            return ''
+        }
+        return n1
+    }
+    const n2=getRelation(def2)
+    if (n1!==n2){
+        throw new Error(`Relation name must be equal ${n1} ${n2}`)
+    }
+    if (!n1) return ""
+    return n1
+}

package/src/cli/index.ts

@@ -3,6 +3,9 @@ import {createProject} from "./createProject";
 import {watch} from "./watch";
 import {deploy} from "./deploy";
 import {genFile} from "./gen-files/genFiles";
+import {genFile as genPrisma2} from "./gen-files/prisma2";
+
+console.log('cesar')
 
 //@ts-ignore
 const [nodeDir, dir, cmd, ...args] = process.argv
@@ -15,6 +18,9 @@ switch (cmd) {
   case 'gen-files':
     genFile()
     break;
+  case 'gen-prisma2':
+    genPrisma2()
+    break;
   case 'deploy':
     deploy()
     break;

package/src/cli/utils.js

@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadSchemas = exports.getConfig = void 0;
 var fs_1 = __importDefault(require("fs"));
 var path_1 = __importDefault(require("path"));
-exports.getConfig = function () {
+var getConfig = function () {
     var rawData;
     try {
         rawData = fs_1.default.readFileSync(path_1.default.join(process.cwd(), 'mandarina.json'), 'utf8');
@@ -34,6 +35,7 @@ exports.getConfig = function () {
     }
     return (config);
 };
+exports.getConfig = getConfig;
 var walkSync = function (dir, fileList) {
     var files = fs_1.default.readdirSync(dir);
     fileList = fileList || [];
@@ -49,7 +51,7 @@ var walkSync = function (dir, fileList) {
     });
     return fileList;
 };
-exports.loadSchemas = function (dir) {
+var loadSchemas = function (dir) {
     var tables = [];
     var schemas = [];
     var actions = [];
@@ -88,4 +90,5 @@ exports.loadSchemas = function (dir) {
         }
     });
 };
+exports.loadSchemas = loadSchemas;
 //# sourceMappingURL=utils.js.map

package/src/cli/utils.js.map

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

package/src/cli/utils.ts

@@ -46,8 +46,11 @@ const walkSync = function (dir: string, fileList: string[]) {
 };
 
 export interface ConfigInterface {
-    prisma:{
-        port:string,
+    database: {
+        url: string,
+    }
+    prisma: {
+        port: string,
         host: string,
         database?: string,
         stage?: string,
@@ -58,7 +61,7 @@ export interface ConfigInterface {
     }
     secret?: string
     customSettings: {
-        [props:string]: any
+        [props: string]: any
     }
 }
 
@@ -68,6 +71,7 @@ export interface ConfigDirInterface {
     actions?: string[]
     generated: string
     prisma: string
+    prisma2: string
 }
 
 export const loadSchemas = (dir: ConfigDirInterface) => {

package/tmp/client/components/Common/Cells/CellDateTime.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("mandarina/build/Schema/utils");
+const react_1 = __importDefault(require("react"));
+const utils_2 = require("../../../../lib/utils");
+const ConfigurationContext_1 = require("../ConfigurationContext");
+// @ts-ignore //TODO: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/27805
+const CellDateTime = ConfigurationContext_1.withConfiguration(({ columnIndex, rowIndex, data, field, configuration }) => {
+    const dates = utils_1.get(data[rowIndex], field.split('.'));
+    return dates.map((d, i) => {
+        const [h, t] = utils_2.showDateTime(dates, configuration.locale.dateFormat).split(', ');
+        return react_1.default.createElement("span", { key: i },
+            h,
+            react_1.default.createElement("br", null),
+            t);
+    });
+});
+exports.default = CellDateTime;
+//# sourceMappingURL=CellDateTime.js.map