@simitgroup/simpleapp-generator 2.0.2-q-alpha → 2.0.2-r-alpha

package/ReleaseNote.md

@@ -1,3 +1,8 @@
+[2.0.2r-alpha]
+
+1. Fix define types on controller fulltextsearch and setStatus
+2. Define paramType on json to update define type on service file
+
 [2.0.2q-alpha]
 
 1. Added 'schema' on the TypeScript type

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "2.0.2q-alpha",
+  "version": "2.0.2r-alpha",
   "description": "frontend nuxtjs and backend nests code generator using jsonschema.",
   "main": "dist/index.js",
   "scripts": {

package/templates/basic/nest/controller.ts.eta

@@ -119,8 +119,8 @@ export class <%= it.typename %>Controller extends SimpleAppController<
   async fulltextsearch(
     @AppUser() appuser: UserContext,
     @Body() data: schemas.TextSearchBody,
-  ) {
-    return await this._fulltextsearch(appuser, data);
+  ): Promise<schemas.<%= it.typename %>[]> {
+    return (await this._fulltextsearch(appuser, data)) as schemas.<%= it.typename %>[];
   }
 <%}%>
 
@@ -271,7 +271,7 @@ export class <%= it.typename %>Controller extends SimpleAppController<
   @ApiBody({ description: 'Document data', type: Object })
   @Roles(Role.SuperAdmin,Role.<%= `${it.typename}_${statusname}`%>)
   <%~ drawMiniAppScope(statusname) %>
-  async setStatus<%=capitalizeFirstLetter(statusname)%>(@AppUser() appuser: UserContext,@Param('id') id: string, @Body() data:any,){
+  async setStatus<%=capitalizeFirstLetter(statusname)%>(@AppUser() appuser: UserContext,@Param('id') id: string, @Body() data:schemas.<%= it.typename %>,){
           return await this.service.setDocumentStatus(appuser,id,data,'<%=statusname%>',)
   }
 <%}%>

package/templates/basic/nest/default.ts.eta

@@ -8,7 +8,7 @@ import * as schema from './<%= camelToKebab(it.resourceName) %>.schema'
 
 <%Object.keys(it.models).forEach(function(modelname) { %>    
 
-export const Default<%= toTypeName(it.resourceName ,modelname) %> = (uuid:string) : <%= toTypeName(it.resourceName ,modelname) %> | undefined =>{
+export const Default<%= toTypeName(it.resourceName ,modelname) %> = (uuid:string) : schema.<%= toTypeName(it.resourceName ,modelname) %> | undefined =>{
     <% let model = it.models[modelname].model%>    
     <% if(model['_id'] && model['code'] && model['label']){%>
       let data: schema.<%= toTypeName(it.resourceName ,modelname) %> | undefined

package/templates/basic/nest/service.ts.eta

@@ -87,14 +87,7 @@ export class <%= it.typename %>Service extends SimpleAppService<schema.<%= it.ty
           <% let fml = it.jsonschema['x-simpleapp-config']['formulas'][index] %>
           // <%~ JSON.stringify(fml) %>
           //const tmp = jsonpath.query(vdata,fieldpath).filter((item:string)=>item!='')
-          <%
-            const m = String(fml.jsonPath || '').match(/^\$\.(\w+)\[\*\]/);
-            const prop = m ? m[1] : '';
-            const pascalProp = prop ? (prop[0].toUpperCase() + prop.slice(1)) : '';
-            const itemType = m ? `schema.${it.typename}${pascalProp}` : 'unknown';
-          %>
-          
-            jsonpath.apply($data, '<%~ fml.jsonPath %>', function ($item: <%= itemType %>) {
+            jsonpath.apply($data, '<%~ fml.jsonPath %>', function ($item: schema.<%= fml?.paramType || it.typename %>) {
               return <%~ fml.formula %>
             })
         <%}) %>