@simitgroup/simpleapp-generator 1.6.6-d-alpha → 1.6.6-e-alpha

package/ReleaseNote.md

@@ -1,3 +1,6 @@
+[1.6.6e-alpha]
+1. Fix jsonpath import method
+
 [1.6.6d-alpha]
 1. fix new project cannot run
 

package/package.json

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

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

@@ -1,14 +1,14 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-02-23
- * Author: Ks Tan
+ * last change 2024-07-10
+ * Author: Yong Xiang
  */
 import { UserContext } from '../commons/user.context'
 import * as sharelibs from '../sharelibs'
 import { Injectable } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
-import * as jsonpath from 'jsonpath'
+import jsonpath from 'jsonpath'
 import { Model } from 'mongoose';
 import {<%= it.typename%>JsonSchema } from '../jsonschemas/<%= it.doctype %>.jsonschema'
 import { SimpleAppService } from './simpleapp.processor';
@@ -65,14 +65,13 @@ export class <%= it.typename %>Processor extends SimpleAppService<<%= it.typenam
    reCalculateValue(data:<%= it.typename %>){
     //console.log('trigger new recalculate')    
     const $data = data;
-    const jsopbj= new jsonpath['JSONPath']()
     <% if(it.jsonschema['x-simpleapp-config']['formulas']){ %>
         <%Object.keys(it.jsonschema['x-simpleapp-config']['formulas']).forEach(function(index) { %>
           <% let fml = it.jsonschema['x-simpleapp-config']['formulas'][index] %>
           // <%~ JSON.stringify(fml) %>
-          //const tmp = jsopbj.query(vdata,fieldpath).filter((item:string)=>item!='')
+          //const tmp = jsonpath.query(vdata,fieldpath).filter((item:string)=>item!='')
           
-          jsopbj.apply($data, '<%~ fml.jsonPath %>', function($item:any) { return <%~fml.formula %> });
+          jsonpath.apply($data, '<%~ fml.jsonPath %>', function($item:any) { return <%~fml.formula %> });
 
         <%}) %>
       <%} %>

package/templates/basic/nuxt/simpleapp.generate.client.ts.eta

@@ -1,13 +1,13 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-02-23
- * Author: Ks Tan
+ * last change 2024-07-10
+ * Author: Yong Xiang
  */
 import _ from 'lodash'
 import {SchemaType,NotificationStatus} from '~/types'
 import * as sharelibs from '../sharelibs'
-import * as jsonpath from 'jsonpath'
+import jsonpath from 'jsonpath'
 import { SimpleAppClient } from "./SimpleAppClient";
 import {
   <%Object.keys(it.models).forEach(function(modelname) { %>  Default<%=modelname%>,  <%})%>

package/templates/nest/src/simpleapp/generate/processors/autoinc.processor.ts.eta

@@ -1,14 +1,14 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-02-23
- * Author: Ks Tan
+ * last change 2024-07-10
+ * Author: Yong Xiang
  */
 import { UserContext } from '../commons/user.context';
 import * as sharelibs from '../sharelibs';
 import { Injectable,Inject } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
-import * as jsonpath from 'jsonpath';
+import jsonpath from 'jsonpath';
 import { Model } from 'mongoose';
 import { AutoincreamentJsonSchema } from '../jsonschemas/autoinc.jsonschema';
 import { SimpleAppService } from './simpleapp.processor';
@@ -31,7 +31,6 @@ export class AutoincreamentProcessor extends SimpleAppService<Autoincreament> {
 
   reCalculateValue(data: Autoincreament) {
     //console.log('trigger new recalculate')
-    const jsopbj = new jsonpath['JSONPath']();
   }
 
   async runGenerateNextNo(

package/templates/nest/src/simpleapp/generate/processors/branch.processor.ts.eta

@@ -1,8 +1,8 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-02-23
- * Author: Ks Tan
+ * last change 2024-07-10
+ * Author: Yong Xiang
  */
 import { UserContext } from '../commons/user.context';
 import * as sharelibs from '../sharelibs';
@@ -12,7 +12,7 @@ import {
   InternalServerErrorException,
 } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
-import * as jsonpath from 'jsonpath';
+import jsonpath from 'jsonpath';
 import { Model } from 'mongoose';
 import { BranchJsonSchema } from '../jsonschemas/branch.jsonschema';
 import { SimpleAppService } from './simpleapp.processor';
@@ -54,7 +54,6 @@ export class BranchProcessor extends SimpleAppService<Branch> {
 
   reCalculateValue(data: Branch) {
     //console.log('trigger new recalculate')
-    const jsopbj = new jsonpath['JSONPath']();
   }
 
   /***************************** additional execute *****************************************/

package/templates/nest/src/simpleapp/generate/processors/docno.processor.ts.eta

@@ -1,14 +1,14 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-02-23
- * Author: Ks Tan
+ * last change 2024-07-10
+ * Author: Yong Xiang
  */
 import { UserContext } from '../commons/user.context';
 import * as sharelibs from '../sharelibs';
 import { Injectable,Inject } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
-import * as jsonpath from 'jsonpath';
+import jsonpath from 'jsonpath';
 import { Model } from 'mongoose';
 import { DocnoformatJsonSchema } from '../jsonschemas/docno.jsonschema';
 import { SimpleAppService } from './simpleapp.processor';
@@ -38,7 +38,6 @@ export class DocnoformatProcessor extends SimpleAppService<Docnoformat> {
 
   reCalculateValue(data: Docnoformat) {
     //console.log('trigger new recalculate')
-    const jsopbj = new jsonpath['JSONPath']();
   }
 
   /***************************** additional execute *****************************************/

package/templates/nest/src/simpleapp/generate/processors/org.processor.ts.eta

@@ -1,14 +1,14 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-02-23
- * Author: Ks Tan
+ * last change 2024-07-10
+ * Author: Yong Xiang
  */
 import { UserContext } from '../commons/user.context';
 import * as sharelibs from '../sharelibs';
 import { Injectable, Inject, BadRequestException } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
-import * as jsonpath from 'jsonpath';
+import jsonpath from 'jsonpath';
 import { Model } from 'mongoose';
 import { OrganizationJsonSchema } from '../jsonschemas/org.jsonschema';
 import { SimpleAppService } from './simpleapp.processor';
@@ -56,7 +56,6 @@ export class OrganizationProcessor extends SimpleAppService<Organization> {
   }
   reCalculateValue(data: Organization) {
     //console.log('trigger new recalculate')
-    const jsopbj = new jsonpath['JSONPath']();
   }
 
   /***************************** additional execute *****************************************/

package/templates/nest/src/simpleapp/generate/processors/perm.processor.ts.eta

@@ -1,15 +1,15 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-02-23
- * Author: Ks Tan
+ * last change 2024-07-10
+ * Author: Yong Xiang
  */
 import { UserContext } from '../commons/user.context';
 import * as sharelibs from '../sharelibs';
 
 import { Injectable, Inject } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
-import * as jsonpath from 'jsonpath';
+import jsonpath from 'jsonpath';
 import { Model, PipelineStage } from 'mongoose';
 import { PermissionJsonSchema } from '../jsonschemas/perm.jsonschema';
 import { SimpleAppService } from './simpleapp.processor';
@@ -32,7 +32,6 @@ export class PermissionProcessor extends SimpleAppService<Permission> {
 
   reCalculateValue(data: Permission) {
     //console.log('trigger new recalculate')
-    const jsopbj = new jsonpath['JSONPath']();
   }
 
   async runListUser(appuser: UserContext) {

package/templates/nest/src/simpleapp/generate/processors/sysmsg.processor.ts.eta

@@ -1,14 +1,14 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-02-23
- * Author: Ks Tan
+ * last change 2024-07-10
+ * Author: Yong Xiang
  */
 import { UserContext } from '../commons/user.context';
 import * as sharelibs from '../sharelibs';
 import { Injectable,Inject } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
-import * as jsonpath from 'jsonpath';
+import jsonpath from 'jsonpath';
 import { Model } from 'mongoose';
 import { SystemmessageJsonSchema } from '../jsonschemas/sysmsg.jsonschema';
 import { SimpleAppService } from './simpleapp.processor';
@@ -31,7 +31,6 @@ export class SystemmessageProcessor extends SimpleAppService<Systemmessage> {
 
   reCalculateValue(data: Systemmessage) {
     //console.log('trigger new recalculate')
-    const jsopbj = new jsonpath['JSONPath']();
   }
 
   /***************************** additional execute *****************************************/

package/templates/nest/src/simpleapp/generate/processors/tenant.processor.ts.eta

@@ -1,14 +1,14 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-02-23
- * Author: Ks Tan
+ * last change 2024-07-10
+ * Author: Yong Xiang
  */
 import { UserContext } from '../commons/user.context';
 import * as sharelibs from '../sharelibs';
 import { Injectable,Inject } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
-import * as jsonpath from 'jsonpath';
+import jsonpath from 'jsonpath';
 import { Model } from 'mongoose';
 import { TenantJsonSchema } from '../jsonschemas/tenant.jsonschema';
 import { SimpleAppService } from './simpleapp.processor';
@@ -37,7 +37,6 @@ export class TenantProcessor extends SimpleAppService<Tenant> {
 
   reCalculateValue(data: Tenant) {
     //console.log('trigger new recalculate')
-    const jsopbj = new jsonpath['JSONPath']();
   }
 
   /***************************** additional execute *****************************************/

package/templates/nest/src/simpleapp/generate/processors/webhook.processor.ts.eta

@@ -1,14 +1,14 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-02-23
- * Author: Ks Tan
+ * last change 2024-07-10
+ * Author: Yong Xiang
  */
 import { UserContext } from '../commons/user.context';
 import * as sharelibs from '../sharelibs';
 import { Injectable,  InternalServerErrorException, } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
-import * as jsonpath from 'jsonpath';
+import jsonpath from 'jsonpath';
 import { Model } from 'mongoose';
 import { WebhookJsonSchema } from '../jsonschemas/webhook.jsonschema';
 import { SimpleAppService } from './simpleapp.processor';
@@ -62,7 +62,6 @@ export class WebhookProcessor extends SimpleAppService<Webhook> {
   reCalculateValue(data: Webhook) {
     //console.log('trigger new recalculate')
     const $data = data;
-    const jsopbj = new jsonpath['JSONPath']();
   }
 
   async beforeCreate(appuser: UserContext, data: types.Webhook) {

package/templates/nuxt/nuxt.config.ts._eta

@@ -1,138 +1,160 @@
 /**
  * This file was automatically generated by simpleapp generator. 
  * --remove-this-line-to-prevent-override--
- * last change 2023-10-28
- * Author: Ks Tan
+ * last change 2024-07-10
+ * Author: Yong Xiang
  */
 import path from 'path'
 export default defineNuxtConfig({
-  colorMode: {
-    classSuffix: ''
+    colorMode: {
+        classSuffix: ''
 
-  },  
-  
-  runtimeConfig:{     
-    public:{
-      APP_URL: process.env.APP_URL,
-      API_URL: process.env.API_URL,
-      DEBUGDATA: process.env.DEBUGDATA,   
-      PROJECT_NAME: process.env.PROJECT_NAME,     
-    }
-  },
-  vite: {
-    vue: {
-        script: {
-            defineModel: true,
-            propsDestructure: true
+    },
+
+    runtimeConfig: {
+        public: {
+            APP_URL: process.env.APP_URL,
+            API_URL: process.env.API_URL,
+            DEBUGDATA: process.env.DEBUGDATA,
+            PROJECT_NAME: process.env.PROJECT_NAME,
+        }
+    },
+    vite: {
+        vue: {
+            script: {
+                defineModel: true,
+                propsDestructure: true
+            }
+        },
+        server: {
+            // Uncomment for remote development hmr
+            // hmr: {
+            //     protocol: 'wss',
+            //     clientPort: 443,
+            //     path: 'hmr/',
+            // }
         }
-    }
-},
-app: {
-  // pageTransition: {
-    // name: 'slide-fade',
-    // mode: 'out-in',
-    // css: false,
-    
-  // },
-  // layoutTransition: { name: 'layout', mode: 'default' }
-},
-tailwindcss: {
-    // Options
-  },
-devServer: {
-    host: "0.0.0.0",
-},
-  modules: [
-    // "@hebilicious/authjs-nuxt",
-    '@nuxtjs/color-mode',
-    '@nuxtjs/device',
-    '@nuxtjs/i18n',
-    'dayjs-nuxt',
-    '@sidebase/nuxt-auth',
-    'nuxt-primevue',
-    '@nuxtjs/apollo',
-    // '@nuxtjs/pwa', //cannot turn on, will cause nuxt cant start
-    // "nuxt-security",     //temporary avoid nuxt-security cause cors
-    '@vueuse/nuxt',     
-    '@nuxtjs/tailwindcss',
-    ['@pinia/nuxt',{
-      autoImports: [
-        // automatically imports `defineStore`
-        'defineStore', // import { defineStore } from 'pinia'
-        ['defineStore', 'definePiniaStore'], // import { defineStore as definePiniaStore } from 'pinia'
-      ],
-    }],
-  ],  
-  dayjs:{
-    plugins: [ 'utc', 'duration']
-  },
-  device: {
-    refreshOnResize: true
-  },
-  i18n: {
-    lazy: true,
-    langDir: "lang/",
-    strategy: "no_prefix",
-    locales: [    
-      {
-        code: "en",
-        iso: "en",
-        name: "English",
-        file: "en.ts",
-      },
-      {
-        code: "cn",
-        iso: "cn",
-        name: "Chinese",
-        file: "cn.ts",
-      
-      },
+
+    },
+
+    hooks: {
+        // Uncomment for remote development hmr
+        // 'vite:extendConfig': (config) =>
+        // {
+        //     if (typeof config.server?.hmr === 'object') {
+        //         config.server.hmr.protocol = 'wss';
+        //         config.server.hmr.clientPort = 443;
+        //         config.server.hmr.path = "hmr/";
+        //     }
+        // }
+    },
+
+    app: {
+        // pageTransition: {
+        // name: 'slide-fade',
+        // mode: 'out-in',
+        // css: false,
+
+        // },
+        // layoutTransition: { name: 'layout', mode: 'default' }
+    },
+    tailwindcss: {
+        // Options
+    },
+    devServer: {
+        host: "0.0.0.0",
+    },
+    modules: [
+        // "@hebilicious/authjs-nuxt",
+        '@nuxtjs/color-mode',
+        '@nuxtjs/device',
+        '@nuxtjs/i18n',
+        'dayjs-nuxt',
+        '@sidebase/nuxt-auth',
+        'nuxt-primevue',
+        '@nuxtjs/apollo',
+        // '@nuxtjs/pwa', //cannot turn on, will cause nuxt cant start
+        // "nuxt-security",     //temporary avoid nuxt-security cause cors
+        '@vueuse/nuxt',
+        '@nuxtjs/tailwindcss',
+        ['@pinia/nuxt', {
+            autoImports: [
+                // automatically imports `defineStore`
+                'defineStore', // import { defineStore } from 'pinia'
+                ['defineStore', 'definePiniaStore'], // import { defineStore as definePiniaStore } from 'pinia'
+            ],
+        }],
     ],
-    defaultLocale: "en",    
-  },
-  apollo: {
-    clients: {
-      default: {
-        httpEndpoint: process.env.API_URL
-      }
+    dayjs: {
+        plugins: ['utc', 'duration']
+    },
+    device: {
+        refreshOnResize: true
+    },
+    i18n: {
+        lazy: true,
+        langDir: "lang/",
+        strategy: "no_prefix",
+        locales: [
+            {
+                code: "en",
+                iso: "en",
+                name: "English",
+                file: "en.ts",
+            },
+            {
+                code: "cn",
+                iso: "cn",
+                name: "Chinese",
+                file: "cn.ts",
+
+            },
+        ],
+        defaultLocale: "en",
     },
-  },
-  primevue: {
-    
-    options: {
-      ripple: true,
-      inputStyle: 'filled',
-    
-    }, 
-    components: {
-      include: '*',      
-      // exclude: ['chart']
-    }, 
-    directives: {
-      include: ['Ripple', 'Tooltip','Badge','FocusTrap']
+    apollo: {
+        clients: {
+            default: {
+                httpEndpoint: process.env.API_URL
+            }
+        },
     },
-    cssLayerOrder: 'tailwind-base, primevue, tailwind-utilities',
-    importPT: { as: 'SimpleAppPT', from:  path.resolve(__dirname,'./assets/primevue/passthrough.ts') },
-    
+    primevue: {
+
+        options: {
+            ripple: true,
+            inputStyle: 'filled',
+
+        },
+        components: {
+            include: '*',
+            // exclude: ['chart']
+        },
+        directives: {
+            include: ['Ripple', 'Tooltip', 'Badge', 'FocusTrap']
+        },
+        cssLayerOrder: 'tailwind-base, primevue, tailwind-utilities',
+        importPT: { as: 'SimpleAppPT', from: path.resolve(__dirname, './assets/primevue/passthrough.ts') },
 
-  },
-  // pinia: {
 
-  // },
-  auth: {
-    globalAppMiddleware: false
-  },
-  // security: {
+    },
+    // pinia: {
+
+    // },
+    auth: {
+        globalAppMiddleware: false
+    },
+    // security: {
     // corsHandler:{
-      //  origin: '*' //| 'null' | (string | RegExp)[] | ((origin: string) => boolean);
-      // methods?: '*' | HTTPMethod[];
-      // allowHeaders?: '*' | string[];
-      // exposeHeaders?: '*' | string[];
-      // credentials?: boolean;
-      // maxAge?: string | false;
-      // preflight?: {
-      //     statusCode?: number;
-      // };
+    //  origin: '*' //| 'null' | (string | RegExp)[] | ((origin: string) => boolean);
+    // methods?: '*' | HTTPMethod[];
+    // allowHeaders?: '*' | string[];
+    // exposeHeaders?: '*' | string[];
+    // credentials?: boolean;
+    // maxAge?: string | false;
+    // preflight?: {
+    //     statusCode?: number;
+    // };
     // },
     // headers: {      
     //   contentSecurityPolicy: {
@@ -140,24 +162,22 @@ devServer: {
     //   },
     // },
     //csrf: true,   // been force to off csrf cash it crash with nuxt-auth
-  // },
-  ssr: false,
-  // content: [
-  //     "./index.html",
-  //     "./src/**/*.{vue,js,ts,jsx,tsx}",
-  //     "./node_modules/primevue/**/*.{vue,js,ts,jsx,tsx}"
-  // ],
-  css: [ 
-    'primeicons/primeicons.css',
-    path.resolve(__dirname,'./assets/css/style.css'),
-    path.resolve(__dirname,'./assets/css/listview.css'),
-    path.resolve(__dirname,'./assets/css/calendar.css'),
-    ],        
-  },
-  
-  // devtools: { enabled: true },
-  // build: {
-  //               // transpile: ["primevue"]
-  //       },  
+    // },
+    ssr: false,
+    // content: [
+    //     "./index.html",
+    //     "./src/**/*.{vue,js,ts,jsx,tsx}",
+    //     "./node_modules/primevue/**/*.{vue,js,ts,jsx,tsx}"
+    // ],
+    css: [
+        'primeicons/primeicons.css',
+        path.resolve(__dirname, './assets/css/style.css'),
+        path.resolve(__dirname, './assets/css/listview.css'),
+        path.resolve(__dirname, './assets/css/calendar.css'),
+    ],
 
-)
+    // devtools: { enabled: true },
+    // build: {
+    //               // transpile: ["primevue"]
+    //       }, 
+})