@simitgroup/simpleapp-generator 1.0.8 → 1.0.14

package/src/processors/jsonschemabuilder.ts

@@ -3,24 +3,46 @@ import { JSONSchema7, JSONSchema7Definition,JSONSchema7Array,JSONSchema7TypeName
 import * as js7 from 'json-schema';
 import { capitalizeFirstLetter } from '../libs';
 import {JsonSchemaProperties} from "../type"
+import { Logger, ILogObj } from "tslog";
+import $RefParser from "@apidevtools/json-schema-ref-parser";
+import {foreignkeys} from '../storage'
 // import { ConflictException } from '@nestjs/common';
 import {
   FieldModel,
   Fieldtypes,
   ChildModels,
   SchemaModel,
+  TypeForeignKey,
+  TypeForeignKeyCatalogue
 } from '../type';
 import { json } from 'stream/consumers';
-
+const log: Logger<ILogObj> = new Logger();
+const FIELD_AUTOCOMPLETE_CODE='field-autocomplete-code'
+const FIELD_AUTOCOMPLETE_NAME='field-autocomplete-name'
+const FOREIGNKEY_PROPERTY='x-foreignkey'
 let allmodels: ChildModels = {};
-export const readJsonSchemaBuilder = (
+let fullschema={}
+let fieldAutoCompleteCode=''
+let fieldAutoCompleteName=''
+
+export const readJsonSchemaBuilder = async (
   doctype: string,
   docname: string,
-  jsondata:JSONSchema7,
-): ChildModels => {
+  orijsondata:JSONSchema7,
+  allforeignkeys:TypeForeignKeyCatalogue
+) => {
+  
+  fieldAutoCompleteCode=''
+  fieldAutoCompleteName=''
   allmodels = {};
-  const validateddata: JSONSchema7 = { ...jsondata };
+  const validateddata: JSONSchema7 = { ...orijsondata };
   let schema: SchemaModel | SchemaModel[];
+  const  tmpjsondata = await $RefParser.dereference(orijsondata).then((schema)=>{
+    // console.log("schema",doctype, schema['properties']['category']? schema['properties']['category']:'')
+    return schema
+  })
+  const  jsondata:JSONSchema7 = {...tmpjsondata} as JSONSchema7
+
   
   if (jsondata && jsondata.type == 'object') {
     //no _id then need add
@@ -30,14 +52,22 @@ export const readJsonSchemaBuilder = (
   } else if (jsondata.type == 'array') {
     throw(`unsupport array type for ${docname}.${doctype}`)
   }
-
-  return allmodels;
+  if(fieldAutoCompleteCode=='') {
+    log.error(`you shall define 1 field with format:'${FIELD_AUTOCOMPLETE_CODE}'`)
+    throw "missing field format"
+  }
+  if(fieldAutoCompleteName=='') {
+    log.error(`you shall define 1 field with format: '${FIELD_AUTOCOMPLETE_NAME}'}`)
+    throw "missing field format"
+  }
+  
+  return Promise.resolve(allmodels);
 };
 
 
-const processObject = (doctype: string,
+const processObject =  (doctype: string,
   docname: string,
-  jsondata:JSONSchema7,) : SchemaModel =>{
+  jsondata:JSONSchema7,)  =>{
     if(!jsondata['properties']){      
       throw ("Invalid json schema {doctype}.{docname}, no 'properties' defined")
     }
@@ -79,14 +109,39 @@ const genSchema = (
     const objectitem:JSONSchema7= {} as JSONSchema7    
     Object.assign(objectitem,obj.items);
 
-    // Object.assign(objtmp,jsondata?[key]:{});
     const isrequired = requiredlist && requiredlist.includes(key);
-    // console.log('----', key, isrequired, obj);
     const newName: string = docname + capitalizeFirstLetter(key);
-    // console.log(key);
-    //need create sub model
-    // console.log("----",key,obj.type,objectitem.type)
+   if(obj.format && obj.format==FIELD_AUTOCOMPLETE_CODE){
+    fieldAutoCompleteCode=key
+   }
+   if(obj.format && obj.format==FIELD_AUTOCOMPLETE_NAME){
+    fieldAutoCompleteName=key
+   }
+  //  if (obj.type == 'object' && obj.items  ){
+  //   console.log("Refer to another object",docname,': ',key,obj,obj.items)
+    
+    // obj,obj.items
+    //foreignkeys
+    //FOREIGNKEY_PROPERTY
+    // newmodel[key] = 'Object';
+    // }
+    // else 
     if (obj.type == 'object') {
+      
+      if(obj[FOREIGNKEY_PROPERTY]){
+        console.warn("FOREIGNKEY_PROPERTY exists",FOREIGNKEY_PROPERTY,obj[FOREIGNKEY_PROPERTY])
+        const masterdatacollection = obj[FOREIGNKEY_PROPERTY]
+        const clientdatacollection = docname.toLowerCase()
+        const foreignkeyidentity= key+'._id'
+        if(!foreignkeys[masterdatacollection]){
+          let tmp:TypeForeignKey = {} as TypeForeignKey
+          tmp[clientdatacollection]=[foreignkeyidentity]
+          foreignkeys[masterdatacollection] = tmp
+        }else{
+          foreignkeys[masterdatacollection][clientdatacollection].push(foreignkeyidentity)
+        }
+                
+      }
       genSchema(newName, obj.type, obj.properties, obj.required);
       newmodel[key] = newName;
     } else if (obj.type == 'array' && obj.items && objectitem?.type == 'object') {
@@ -104,7 +159,7 @@ const genSchema = (
       // console.log(key,'--------newmodel',obj, newmodel[key]);
     }
   }
-  allmodels[docname] = { type: schematype, model: newmodel };
+  allmodels[docname] = { type: schematype, model: newmodel,codeField: fieldAutoCompleteCode ,nameField: fieldAutoCompleteName };
   return newmodel;
 };
 

package/src/storage.ts

@@ -0,0 +1,3 @@
+import { TypeForeignKeyCatalogue } from './type'
+
+export let foreignkeys:TypeForeignKeyCatalogue = {}

package/src/type.ts

@@ -1,6 +1,6 @@
 import { JSONSchema7, JSONSchema7Definition } from 'json-schema';
 export type ChildModels = {
-  [key: string]: { type: string; model: SchemaModel };
+  [key: string]: { type: string; model: SchemaModel,codeField:string,nameField:string };
 };
 export enum Fieldtypes {
   'string' = 'string',
@@ -35,8 +35,30 @@ export type JsonSchemaProperties= {
   // JSONSchema7Definition ,JSONSchema7
 }
 
-
+export type TypeForeignKeyCatalogue = {
+  [cataloguename:string]:TypeForeignKey
+}
+export type TypeForeignKey={
+  [collection:string]:string[]
+}
 export type ModuleObject = {
   doctype:string
   docname:string
+}
+export type TypeGenerateDocumentVariable ={
+name: string
+doctype: string
+models: ChildModels
+autocompletecode:string
+autocompletename:string
+schema: SchemaModel
+apiSchemaName: string
+typename: string
+fullApiSchemaName: string
+fullTypeName:string
+jsonschema: JSONSchema7
+bothEndCode: string
+frontEndCode: string
+backEndCode: string
+controllerCode:string
 }

package/templates/SimpleAppClient.eta

@@ -14,6 +14,7 @@ type crudType = {
 export class SimpleAppClient<
   TData extends { _id?: string },
   TApi extends crudType,
+  defaultTimeout:number = 5000;
 > {
   protected docapi;
   protected data = <Ref<TData>>ref({} as TData);
@@ -36,7 +37,7 @@ export class SimpleAppClient<
   };
 
   async getById(id: string) {
-    return await this.docapi.runFindOne(id).then((res: AxiosResponse) => {
+    return await this.docapi.runFindOne(id,{timeout:this.defaultTimeout}).then((res: AxiosResponse) => {
       // this.data.value = { ...res.data };
       Object.assign(this.data.value, res.data);
       return res;
@@ -48,7 +49,7 @@ export class SimpleAppClient<
       return await Promise.reject(errors);
     } else {
       return await this.docapi
-        .runCreate(this.data.value)
+        .runCreate(this.data.value,{timeout:this.defaultTimeout})
         .then((res: AxiosResponse) => {
           this.data.value = { ...res.data };
           return res;
@@ -62,17 +63,17 @@ export class SimpleAppClient<
       return await Promise.reject(errors);
     } else {
       return await this.docapi
-        .runUpdate(recordid, this.data.value)
+        .runUpdate(recordid, this.data.value,{timeout:this.defaultTimeout})
         .then((res: AxiosResponse) => {
           return res;
         });
     }
   }
   async delete(id: string) {
-    return await this.docapi.runDelete(id);
+    return await this.docapi.runDelete(id,{timeout:this.defaultTimeout});
   }
   async list() {
-    return await this.docapi.runList();
+    return await this.docapi.runList({timeout:this.defaultTimeout});
   }
   find() {}
   hook(type: string, data: TData) {
@@ -81,6 +82,10 @@ export class SimpleAppClient<
   }
   validateFailed() {
     const ajv = new Ajv({ allErrors: true });
+    ajv.addKeyword({
+      keyword:'autocompletesrc',
+      type:'string'
+    });
     addFormats(ajv);
     this.errorlist.value = {};
     this.hook('pre-validation', this.data.value);

package/templates/SimpleAppController.eta

@@ -20,6 +20,7 @@ type ServiceType = {
   findIdThenDelete: Function;
   findIdThenUpdate: Function;
   setData: Function;
+  getAutoComplete: Function;
 };
 
 // @ApiTags(doctype)
@@ -37,7 +38,9 @@ export class SimpleAppController<TService extends ServiceType, TApiSchema, T> {
   async _list() {
     return this.service.list();
   }
-  
+  async _autocomplete(keyword: string) {
+    return this.service.getAutoComplete(keyword);
+  }
   async _findOne(id: string) {
     const result = (await this.service.findById(id)) as TApiSchema;
 

package/templates/SimpleAppService.eta

@@ -3,7 +3,7 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 import Ajv from 'ajv';
 import addFormats from 'ajv-formats';
-
+import foreignkeys from '../dicts/foreignkeys.json';
 import {
   NotFoundException,
   InternalServerErrorException,
@@ -11,6 +11,11 @@ import {
 @Injectable()
 export class SimpleAppService<T extends { _id?: string }> {
   protected jsonschema = { type: 'object', properties: {}, required: [] };
+  protected documentIdentityCode = 'code';
+  protected documentIdentityName = 'label';
+  protected documentName = 'category';
+  protected documentType = 'CAT';
+  protected LIMITPERPAGE = 20;
   protected data: T = { _id: '' } as T;
   protected doc: Model<T>;
   protected errorlist = [];
@@ -21,7 +26,7 @@ export class SimpleAppService<T extends { _id?: string }> {
   setSchema = (newschema) => (this.jsonschema = newschema);
   getSchema = () => this.doc.schema.obj;
   getData = () => {
-    console.log('thisdata', this.data);
+    //console.log('thisdata', this.data);
     return this.data;
   };
   setData = (newdata: T) => {
@@ -41,11 +46,34 @@ export class SimpleAppService<T extends { _id?: string }> {
       throw new InternalServerErrorException(err.message);
     }
   }
+  async getAutoComplete(keyword: string) {
+    try {
+      const filter1 = {};
+      const filter2 = {};
+      filter1[this.documentIdentityCode] = { $regex: keyword };
+      filter2[this.documentIdentityName] = { $regex: keyword };
+      const filterobj = { $or: [filter1, filter2] };
+      const projections = {
+        id: `\$_id`,
+        label: `\$${this.documentIdentityCode}`,
+        name: `\$${this.documentIdentityName}`,
+      };
+      const products = await this.doc.find(filterobj, projections, {
+        limit: this.LIMITPERPAGE,
+      });
+      const productlist = products.map((p: T) => {
+        return p;
+      });
+      return productlist;
+    } catch (err) {
+      throw new InternalServerErrorException(err.message);
+    }
+  }
   async findById(id: string) {
     try {
-      console.log('findById', id);
+      //console.log('findById', id);
       this.data = await this.doc.findById(id);
-      console.log('findById done', this.data);
+      //console.log('findById done', this.data);
     } catch (err) {
       //error
       throw new InternalServerErrorException(err.message);
@@ -55,7 +83,7 @@ export class SimpleAppService<T extends { _id?: string }> {
       //data not found
       throw new NotFoundException('Document Not found:');
     }
-    console.log('this.data', this.data);
+    //console.log('this.data', this.data);
     return this.data;
     // return this;
   }
@@ -78,8 +106,14 @@ export class SimpleAppService<T extends { _id?: string }> {
     this.findIdThenUpdate(id, this.data);
   }
   async delete() {
+    
     const id: string = this.getRecordId();
-    this.findIdThenDelete(id);
+    const dependency = await this.getRelatedRecords(id);
+    if (!dependency) {
+     return await this.findIdThenDelete(id);
+    } else {
+      return dependency;
+    }
   }
   hook(type: string, data: T) {
     return true;
@@ -87,7 +121,12 @@ export class SimpleAppService<T extends { _id?: string }> {
   validateData(data: T) {
     const ajv = new Ajv({ allErrors: true });
     addFormats(ajv);
-
+    ajv.addFormat('field-autocomplete-code', /.*$/);
+    ajv.addFormat('field-autocomplete-name', /.*$/);
+    ajv.addKeyword({
+      keyword: 'x-foreignkey',
+      type: 'string',
+    });
     if (!this.hook('pre-validation', data)) {
       const erromsg: string[] = [];
       for (let i = 0; i < this.errorlist.length; i++) {
@@ -98,7 +137,7 @@ export class SimpleAppService<T extends { _id?: string }> {
     const validate = ajv.compile(this.jsonschema);
     const valid = validate(data);
     if (!valid) {
-      console.log(validate.errors);
+      //console.log(validate.errors);
       const erromsg: string[] = [];
       for (let i = 0; i < validate.errors.length; i++) {
         erromsg.push(validate.errors[i].message);
@@ -111,8 +150,14 @@ export class SimpleAppService<T extends { _id?: string }> {
   async findIdThenDelete(id: string) {
     // const data = await this.findById(id);
     try {
-      const deleteresult = await this.doc.findByIdAndDelete(id);
-      return deleteresult;
+      //console.log('deletedeletedeletedelete');
+      const dependency = await this.getRelatedRecords(id);
+      if (!dependency) {
+        const deleteresult = await this.doc.findByIdAndDelete(id);
+        return deleteresult;
+      } else {
+        return Promise.reject(dependency);
+      }
     } catch (err) {
       throw new InternalServerErrorException(err.message);
     }
@@ -122,13 +167,44 @@ export class SimpleAppService<T extends { _id?: string }> {
     // const existingdata = await this.findById(id);
 
     try {
-      console.log('findIdThenUpdate', id);
+      //console.log('findIdThenUpdate', id);
       this.validateData(data);
       // const result = await existingdata.doc.updateOne(data);
       const result = await this.doc.findByIdAndUpdate(id, data);
+
       return result;
     } catch (err) {
       throw new InternalServerErrorException(err.message);
     }
   }
+
+  //find what foreign key constraint
+  async getRelatedRecords(id: string) {
+    const foreignkeysettings = foreignkeys[this.documentName];
+    //console.log('foreignkeysettings', foreignkeysettings);
+    const propkeys = Object.getOwnPropertyNames(foreignkeysettings);
+
+    if (propkeys.length > 0) {
+      //console.log('Have properties');
+      for (let i = 0; i < propkeys.length; i++) {
+        const collectionname = propkeys[i];
+        //console.log('run ', i, collectionname);
+        const fobjs = foreignkeysettings[propkeys[i]];
+        const collection = this.doc.db.collection(collectionname);
+        //single schema may have multiple foreign key link here, loop all
+        for (let j = 0; j < fobjs.length; j++) {
+          const fkey = fobjs[j];
+          const filter = {};
+          filter[fkey] = id;
+          //console.log('getRelatedRecords get filter', collectionname, filter);
+          const result = await collection.findOne(filter);
+          //console.log('getRelatedRecords', result);
+          if (result) {
+            return Promise.reject(result);
+          }
+        }
+      }
+    }
+    return Promise.resolve(null);
+  }
 }

package/templates/basic/controller.eta

@@ -10,6 +10,7 @@ import {
   Post,
   Delete,
   Body,
+  Query,
   Param,
   Type,
 } from '@nestjs/common';
@@ -42,7 +43,20 @@ export class <%= it.typename %>Controller extends SimpleAppController<
   async list() {
     return this._list();
   }
-  
+  //autocomplete shall above :id
+  @Get('/autocomplete')
+  @ApiResponse({
+    status: 200,
+    description: 'Found',
+    type: ()=>[{id:'100',label:'label1'}],
+  })
+  @ApiResponse({ status: 500, description: 'Internal error' })
+  @ApiOperation({ operationId: 'autoComplete' })
+  async autoComplete(@Query('keyword') keyword: string) {
+    return this._autocomplete(keyword);
+  }
+
+
   @Get(':id')
   @ApiResponse({
     status: 200,
@@ -55,6 +69,8 @@ export class <%= it.typename %>Controller extends SimpleAppController<
   async findOne(@Param('id') id: string) {    
     return await this._findOne(id);
   }
+  
+
 
   @Post()
   @ApiResponse({

package/templates/basic/model.eta

@@ -30,6 +30,6 @@ const schemasetting = {
   <%}) %>
 };
 
-export const <%= it.doctype %>MongoSchema = new Schema(schemasetting)
+export const <%= it.doctype %>MongoSchema = new Schema(schemasetting,{collection: '<%= it.name %>'})
   .post('validate', (doc: <%= it.typename %>) => beforeSave(doc))
   .pre('save', () => {});

package/templates/basic/pageindex.vue.eta

@@ -0,0 +1,50 @@
+<template>
+<% let skipcolumns = ['_id','createdby','created','updatedby','updated','organization_id','branch_id','tenant_id','doctype'] %>
+    <div>    
+    <CrudSimple :document="doc"  title="<%= it.typename %>" #default="o" 
+    :listColumns="columns"> 
+    
+      <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
+        <% let obj=it.jsonschema.properties[key] %>        
+        <% if(skipcolumns.indexOf(key)>=0){ %>
+        <% } else if(obj.type=='boolean'){ %>
+            <SimpleAppCheckbox :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>
+        <% } else if(obj.type=='number' || obj.type=='integer'){ %>
+            <SimpleAppNumber :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+        <% } else if(obj.type=='array'  && obj.items && obj.items.type =='string' ){ %>              
+            <SimpleAppChip :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>
+        <% } else if(obj.type=='object'  && typeof obj['x-foreignkey']!='undefined'){ %>              
+            <SimpleAppAutocomplete :setting="o.getField('#/properties/<%= key %>')"
+                    v-model="data.<%= key %>" optionLabel="label" :remote-src="getAutocomplete('<%=obj['x-foreignkey']%>')"/>
+        <% } else if(obj.type=='string'){ %>            
+                <% if(obj.format=='date'){ %>
+                    <SimpleAppText type="<%=formattype%>" :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+                <% } else if(obj.format=='email'){ %>
+                    <SimpleAppText type="<%=formattype%>" :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+                <% } else if(obj.enum){ %>
+                    <SimpleAppRadio :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>
+                <% } else {%>
+                        <SimpleAppText :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+                <% }%>  
+        <% } else { %>           
+            <SimpleAppText  :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+        <% }%>
+      <%})%>   
+      
+    </CrudSimple>
+  </div>
+  </template>
+  <script setup lang="ts">
+  import { <%= it.typename %>Doc } from "../../simpleapp/simpleappdocs/<%= it.typename %>Doc";
+  const { $event, $listen } = useNuxtApp();
+  const doc = new <%= it.typename %>Doc($event, $listen);
+  const data = doc.getReactiveData();
+  const columns = [
+    <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
+        <%let obj=it.jsonschema.properties[key] %>
+        <%if(skipcolumns.indexOf(key)>=0){%>/* skip system columns <%=key%>*/
+        <%} else if(['string','number','integer'].indexOf(obj.type)>=0){%>'<%=key%>',<%}%>
+    <%})%>
+    ]
+  </script>
+  

package/templates/basic/pageindexwithid.vue.eta

@@ -0,0 +1 @@
+<template></template>

package/templates/basic/service.eta

@@ -13,6 +13,8 @@ import { <%Object.keys(it.models).forEach(function(key) { %> <%=key %>, <%})%> }
 
 @Injectable()
 export class <%= it.typename %>Service extends SimpleAppService<<%= it.typename %>> {
+  protected documentIdentityCode='<%~ it.autocompletecode %>'
+  protected documentIdentityName='<%~ it.autocompletename %>'
     constructor(@InjectModel('<%= it.name %>')  mydoc: Model<<%= it.typename %>>,
   ) {
     super(mydoc);

package/templates/basic/{apiclient.eta → simpleappclient.eta}

@@ -4,6 +4,7 @@
  * and regenerate this file.
  */
 import { SimpleAppClient } from "@simitgroup/simpleapp-vue-component/src/SimpleAppClient";
+
 // import { JSONSchema7 } from 'json-schema';
 import { Configuration,
       <%= it.doctype.toUpperCase()%>Api, 
@@ -18,11 +19,14 @@ import { Configuration,
 
 export class <%= it.typename%>Doc extends SimpleAppClient<<%= it.typename%>,<%= it.doctype.toUpperCase()%>Api>{
   public readonly schema= <%~ JSON.stringify(it.jsonschema) %>;
-
-  constructor() {    
-    const apiconfig = new Configuration({ basePath:  useRuntimeConfig().public.SIMPLEAPP_BACKEND_URL });
+  protected documentIdentityCode='<%~ it.autocompletecode %>'
+  protected documentIdentityName='<%~ it.autocompletename %>'
+  constructor(event:any,listen?:any) {    
+    const apiconfig = new Configuration({ basePath:  useRuntimeConfig().public.APP_URL+'/api' });
     const apiobj = new <%= it.doctype.toUpperCase()%>Api(apiconfig)
-    super(apiobj)
+    super(apiobj,'<%= it.doctype %>','<%=it.name %>')
+    this.event=event
+    this.listen=listen
     
     this.setNew();    
   }
@@ -30,9 +34,13 @@ export class <%= it.typename%>Doc extends SimpleAppClient<<%= it.typename%>,<%=
     const newdata =  {
         
         <%Object.keys(it.schema).forEach(function(key){%>      
-          <%let field=it.schema[key]%>      
-          <% if(field.type=='boolean' ){%> 
-              <%=key%> : <%=field.default%>,
+          <%let field=it.schema[key]%>                
+          <% if(typeof field.default !='undefined' && field.type=='string'){%> 
+            <%=key%> : '<%= field.default  %>',
+          <%} else if(typeof field.default !='undefined'){%> 
+            <%=key%> : <%= field.default  %>,
+          <%} else if(field.type=='boolean' ){%> 
+              <%=key%> :false ,
           <%} else if(typeof field=='string'){%>
             <%=key%> : <<%= field  %>>{},          
           <%} else if(field.type=='string'){%>

package/templates/nuxt/app.vue.eta

@@ -0,0 +1,8 @@
+<template>
+  <div>
+    <NuxtLayout>
+      <EventMonitor/>
+      <NuxtPage />
+    </NuxtLayout>
+    </div>
+</template>