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

package/ReleaseNote.md

@@ -1,3 +1,11 @@
+[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
+
 [2.0.2o-alpha]
 
 1. Revert date.generate.ts for universal use

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "2.0.2o-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

@@ -99,8 +99,8 @@ export class <%= it.typename %>Controller extends SimpleAppController<
   @ApiBody({ description: 'Data', type: schemas.SearchBody })
   @ApiOperation({ operationId: 'runSearch' })
   <%~ drawMiniAppScope('list') %>
-  async search(@AppUser() appuser: UserContext,@Body() data: schemas.SearchBody, @Res({ passthrough: true }) res: Response) {
-    return await this._search(appuser,data, res)
+  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)) as schemas.<%= it.typename %>[];
   }
 
 <% if(simpleappconfig.search !==undefined){%>
@@ -169,8 +169,8 @@ export class <%= it.typename %>Controller extends SimpleAppController<
   async autoComplete(@AppUser() appuser: UserContext,
   @Query('keyword') keyword:string,
   @Body() data: schemas.<%=it.typename%>,
-  ) {
-    return this._autocomplete(appuser, keyword,data);
+  ): Promise<schemas.<%= it.typename %>AutoComplete[]> {
+    return (await this._autocomplete(appuser, keyword, data)) as schemas.<%= it.typename %>AutoComplete[];
   }
 
   @Post()
@@ -220,8 +220,9 @@ export class <%= it.typename %>Controller extends SimpleAppController<
   @ApiBody({ description: 'Data', type: schemas.PatchManyRequest<schemas.<%= it.typename%>> })
   @ApiOperation({ operationId: 'runPatchMany' })
   <%~ drawMiniAppScope('patchMany') %>
-  async patchMany(@AppUser() appuser: UserContext, @Body() patchManyData: schemas.PatchManyRequest<schemas.<%= it.typename%>>) {
-    return await this._patchMany(appuser, patchManyData);
+  async patchMany(@AppUser() appuser: UserContext, @Body() patchManyData: schemas.PatchManyRequest<schemas.<%= it.typename%>>
+  ): Promise<schemas.UpdateManyResponse> {
+    return (await this._patchMany(appuser, patchManyData)) as schemas.UpdateManyResponse;
   }
 
   @Patch(':id')
@@ -258,8 +259,8 @@ export class <%= it.typename %>Controller extends SimpleAppController<
   @ApiResponse({ status: 500, description: 'Internal error' })
   @ApiOperation({ operationId: 'runDelete' })
   <%~ drawMiniAppScope('delete') %>
-  async delete(@AppUser() appuser: UserContext,@Param('id') id: string) {
-    return this._delete(appuser,id);
+  async delete(@AppUser() appuser: UserContext,@Param('id') id: string): Promise<schemas.<%= it.typename %>> {
+    return (await this._delete(appuser, id)) as schemas.<%= it.typename %>;
   }
 
 /***************************** start status control api definitions *****************************************/

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

@@ -8,10 +8,10 @@ import * as schema from './<%= camelToKebab(it.resourceName) %>.schema'
 
 <%Object.keys(it.models).forEach(function(modelname) { %>    
 
-export const Default<%= toTypeName(it.resourceName ,modelname) %> = (uuid:string)=>{
+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']){%>
-      const  data =  undefined
+      let data: schema.<%= toTypeName(it.resourceName ,modelname) %> | undefined
     <%} else{%>
      
     const  data  = {

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

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

package/templates/nuxt/app.vue.eta

@@ -31,9 +31,9 @@ watch(()=>useRoute().fullPath,async (newval,oldvalue)=>{
   if(getPathPara('xorg','')!=''){
   
     if(getCurrentXorg()===''){
-      goTo('/picktenant')
+      navigateTo('/picktenant')
     }else if(!getUserProfile()?.currentGroup){
-      navigateTo('pickgroup')
+      goTo('pickgroup')
     }
     setGraphqlServer()
   }  
@@ -56,9 +56,9 @@ onMounted(async()=>{
     const currentgroup = useCookie('currentGroup').value
     //if no xorg, no enforce pick group
     if(getCurrentXorg()===''){
-      goTo('/picktenant')
+      navigateTo('/picktenant')
     }else if(!currentgroup){
-      navigateTo('/pickgroup')
+      goTo('/pickgroup')
     }
     setGraphqlServer()
   }else{

package/templates/nuxt/server/api/auth/[...].ts.eta

@@ -72,10 +72,18 @@ export default NuxtAuthHandler({
                 token.accessToken = account.access_token;
                 token.refreshToken = account.refresh_token;
                 token.expiresAt = account.expires_at;
-            } else if (Date.now() < (<number>token.expiresAt) * 1000) {
                 return token;
-            }
-
+              }
+            
+              const buffer = 60;
+            
+              if (Date.now() < (<number>token.expiresAt - buffer) * 1000) {
+                return token;
+              }
+            
+              if (!token.refreshToken) {
+                return token;
+              }
             // try refresh token
             const response = await fetch(`${process.env.OAUTH2_CONFIGURL}/protocol/openid-connect/token`, {
                 headers: { "Content-Type": "application/x-www-form-urlencoded" },
@@ -92,7 +100,12 @@ export default NuxtAuthHandler({
 
             if(!response.ok) {
                 /** @todo handle refresh token failed */
-                return token
+                return {
+                    ...token,
+                    accessToken: null,
+                    expiresAt: 0,
+                    error: "RefreshAccessTokenError"
+                  };
             }
 
             return {
@@ -102,7 +115,7 @@ export default NuxtAuthHandler({
                 expiresAt: Math.floor(Date.now() / 1000 + newToken.expires_in),
                 // Fall back to old refresh token, but note that
                 // many providers may only allow using a refresh token once.
-                refreshToken: newToken.refresh_token ?? token.refresh_token,
+                refreshToken: newToken.refresh_token ?? token.refreshToken
             }
         },
         async session({ session, token, user }) {