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

package/ReleaseNote.md

@@ -1,3 +1,7 @@
+[2.0.2q-alpha]
+
+1. Added 'schema' on the TypeScript type
+
 [2.0.2p-alpha]
 
 1. Added explicit return types in generated controller endpoints to improve TypeScript type safety and resolve ESLint `no-unsafe-return` warnings

package/package.json

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

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

@@ -100,7 +100,7 @@ export class <%= it.typename %>Controller extends SimpleAppController<
   @ApiOperation({ operationId: 'runSearch' })
   <%~ drawMiniAppScope('list') %>
   async search(@AppUser() appuser: UserContext,@Body() data: schemas.SearchBody, @Res({ passthrough: true }) res: Response): Promise<schemas.<%= it.typename %>[]> {
-    return await this._search(appuser,data, res)
+    return (await this._search(appuser, data, res)) as schemas.<%= it.typename %>[];
   }
 
 <% if(simpleappconfig.search !==undefined){%>
@@ -170,7 +170,7 @@ export class <%= it.typename %>Controller extends SimpleAppController<
   @Query('keyword') keyword:string,
   @Body() data: schemas.<%=it.typename%>,
   ): Promise<schemas.<%= it.typename %>AutoComplete[]> {
-    return this._autocomplete(appuser, keyword,data);
+    return (await this._autocomplete(appuser, keyword, data)) as schemas.<%= it.typename %>AutoComplete[];
   }
 
   @Post()
@@ -222,7 +222,7 @@ export class <%= it.typename %>Controller extends SimpleAppController<
   <%~ drawMiniAppScope('patchMany') %>
   async patchMany(@AppUser() appuser: UserContext, @Body() patchManyData: schemas.PatchManyRequest<schemas.<%= it.typename%>>
   ): Promise<schemas.UpdateManyResponse> {
-    return await this._patchMany(appuser, patchManyData);
+    return (await this._patchMany(appuser, patchManyData)) as schemas.UpdateManyResponse;
   }
 
   @Patch(':id')
@@ -260,7 +260,7 @@ export class <%= it.typename %>Controller extends SimpleAppController<
   @ApiOperation({ operationId: 'runDelete' })
   <%~ drawMiniAppScope('delete') %>
   async delete(@AppUser() appuser: UserContext,@Param('id') id: string): Promise<schemas.<%= it.typename %>> {
-    return this._delete(appuser,id);
+    return (await this._delete(appuser, id)) as schemas.<%= it.typename %>;
   }
 
 /***************************** start status control api definitions *****************************************/

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

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

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

@@ -87,9 +87,15 @@ 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: schema.<%= it.typename %>) {
-              return <%~fml.formula %>
+            jsonpath.apply($data, '<%~ fml.jsonPath %>', function ($item: <%= itemType %>) {
+              return <%~ fml.formula %>
             })
         <%}) %>
       <%} %>