@simitgroup/simpleapp-generator 1.6.6-n-alpha → 1.6.6-p-alpha

package/src/index.ts

@@ -1,149 +1,167 @@
 #! /usr/bin/env node
-import { error } from "console"
-import * as fw from  './framework'
-import * as generate from './generate'
-import { chmod } from "fs"
-const program =  require("commander") // add this line
-const Fieldtypes= require( './type')
+import { error } from 'console';
+import * as fw from './framework';
+import * as generate from './generate';
+import { chmod } from 'fs';
+const program = require('commander'); // add this line
+const Fieldtypes = require('./type');
 // const generate= require( './generate')
 
-const fs = require( 'fs')
+const fs = require('fs');
 // const  createproject =require( './createproject')
-const ps =  require( "child_process")
-const capitalizeFirstLetter= require( './libs')
-const {Logger, ILogObj} = require( "tslog");
+const ps = require('child_process');
+const capitalizeFirstLetter = require('./libs');
+const { Logger, ILogObj } = require('tslog');
 
-const log :typeof Logger= new Logger();
+const log: typeof Logger = new Logger();
 
-const figlet = require("figlet");
+const figlet = require('figlet');
 // const program = new Command();
-const pj = require('../package.json')
+const pj = require('../package.json');
 
-let version=pj.version
+let version = pj.version;
 program
   .version(version)
-  .description("An simpleapp CLI tool for generate frontend (vuejs) and backend(nestjs) codes")  
-  .option("-c, --config-file <value>", 'configuration file')
-  .option("-g, --generate-type <value>", 'generate type init, backend, frontend')
+  .description(
+    'An simpleapp CLI tool for generate frontend (vuejs) and backend(nestjs) codes'
+  )
+  .option('-c, --config-file <value>', 'configuration file')
+  .option(
+    '-g, --generate-type <value>',
+    'generate type init, backend, frontend'
+  )
   .parse(process.argv);
 
-let path=''
+let path = '';
 const options = program.opts();
 console.log(figlet.textSync(`SimpleApp Generator`));
 console.log(figlet.textSync(`${version}`));
-let continueexecute = true
-if(options.generateType && options.generateType=='init'){
-  continueexecute=false
-  
-    fw.prepareProject(()=>{
-      chmod(process.cwd()+'/build.sh',0o755,()=>{
-        process.exit(1)
-    })  
-  })
-  
-  
+let continueexecute = true;
+if (options.generateType && options.generateType == 'init') {
+  continueexecute = false;
+
+  fw.prepareProject(() => {
+    chmod(process.cwd() + '/build.sh', 0o755, () => {
+      process.exit(1);
+    });
+  });
+} else if (!options.configFile) {
+  log.error(
+    'Config file parameter is required. Example: simpleapp-generator -c ./config.json'
+  );
+  throw 'Undefine configuration file';
+} else if (options.configFile && options.configFile[0] == '/') {
+  path = options.configFile;
+} else if (options.configFile) {
+  path = process.cwd() + '/' + options.configFile;
+} else {
+  log.error(
+    'undefine configuration file, use command simpleapp-generator -c <configfilename.json>'
+  );
+  throw error;
 }
-else if(!options.configFile){
-    log.error("Config file parameter is required. Example: simpleapp-generator -c ./config.json")
-    throw "Undefine configuration file"
-  }
-  else if(options.configFile && options.configFile[0]=='/'){
-    path=options.configFile
-  }
-  else if(options.configFile){
-    path=process.cwd()+'/'+options.configFile
-  }else{
-    log.error("undefine configuration file, use command simpleapp-generator -c <configfilename.json>")  
-    throw error
-  }
 
-if(continueexecute){
-    
-    const configs = require(path)
-    // console.log("configurations: ",configs)
-    const jsonschemaFolder = configs.jsonschemaFolder
-    const bpmnFolder = configs.bpmnFolder
-    const backendFolder = configs.backendFolder 
-    const frontendFolder = configs.frontendFolder   
+if (continueexecute) {
+  const configs = require(path);
+  // console.log("configurations: ",configs)
+  const jsonschemaFolder = configs.jsonschemaFolder;
+  const bpmnFolder = configs.bpmnFolder;
+  const backendFolder = configs.backendFolder;
+  const frontendFolder = configs.frontendFolder;
 
+  const run = async () => {
+    fw.setConfiguration(configs);
+    fw.runCreateNuxt(() => {
+      fw.runCreateNest(() => {
+        fw.prepareNest(() => {
+          fw.prepareNuxt(() => {
+            // generate.initialize(jsonschemaFolder,configs.groupFolder,bpmnFolder,backendFolder,frontendFolder,()=>{
+            generate.run(configs, ['nest', 'nuxt'], () => {
+              fw.prettyNuxt();
+              fw.prettyNest();
+            });
+          });
+        });
+      });
+    });
+  };
 
+  const runUpdateMiniAppJsSdk = async () => {
+    fw.setConfiguration(configs);
+    generate.run(configs, ['miniAppJsSdk'], () => {
+      fw.prettyMiniAppJsSdk();
+    });
+  };
 
-  const run = async()=>{
-      fw.setConfiguration(configs)
-      fw.runCreateNuxt(()=>{
-          fw.runCreateNest(()=>{
-              fw.prepareNest(()=>{
-                  fw.prepareNuxt(()=>{
-                      // generate.initialize(jsonschemaFolder,configs.groupFolder,bpmnFolder,backendFolder,frontendFolder,()=>{                        
-                        generate.run(configs,['nest','nuxt'],()=>{
-                          fw.prettyNuxt()    
-                          fw.prettyNest()                                                
-                      })                    
-                  })                
-              })            
-          })
-      })
-  }
-  const reGenFrontend = async()=>{
-    fw.setConfiguration(configs)
-    generate.run(configs,['nuxt'],()=>{
-      fw.prettyNuxt()                                      
-    })  
-  }
-  const reGenBackend = async()=>{
-    fw.setConfiguration(configs)
-    generate.run(configs,['nest'],()=>{
-      fw.prettyNest()                                                
-    })  
-  }
+  const runUpdateMiniAppStreamlitSdk = async () => {
+    fw.setConfiguration(configs);
+    generate.run(configs, ['miniAppStreamlitSdk'], () => {
+      fw.prettyMiniAppStreamlitSdk();
+    });
+  };
 
-  const runbackend = async()=>{
-    fw.setConfiguration(configs)
-    fw.setConfiguration(configs)
-        fw.runCreateNest(()=>{
-            fw.prepareNest(()=>{
-                    // generate.run(jsonschemaFolder,configs.groupFolder,bpmnFolder,backendFolder,frontendFolder,()=>{
-                      generate.run(configs,['nest'],()=>{
-                        fw.prettyNest()                                                
-                    })                    
-          })                
-        
-      })
-  }
+  const reGenFrontend = async () => {
+    fw.setConfiguration(configs);
+    generate.run(configs, ['nuxt'], () => {
+      fw.prettyNuxt();
+    });
+  };
+  const reGenBackend = async () => {
+    fw.setConfiguration(configs);
+    generate.run(configs, ['nest'], () => {
+      fw.prettyNest();
+    });
+  };
 
-  const runfrontend = async()=>{
-    fw.setConfiguration(configs)
-    fw.runCreateNuxt(()=>{
-                fw.prepareNuxt(()=>{
-                    // generate.initialize(jsonschemaFolder,configs.groupFolder,bpmnFolder,backendFolder,frontendFolder,()=>{
-                    generate.run(configs,['nuxt'],()=>{
-                        fw.prettyNuxt()    
-                    })                    
-        })
-    })
-  }
+  const runbackend = async () => {
+    fw.setConfiguration(configs);
+    fw.setConfiguration(configs);
+    fw.runCreateNest(() => {
+      fw.prepareNest(() => {
+        // generate.run(jsonschemaFolder,configs.groupFolder,bpmnFolder,backendFolder,frontendFolder,()=>{
+        generate.run(configs, ['nest'], () => {
+          fw.prettyNest();
+        });
+      });
+    });
+  };
 
+  const runfrontend = async () => {
+    fw.setConfiguration(configs);
+    fw.runCreateNuxt(() => {
+      fw.prepareNuxt(() => {
+        // generate.initialize(jsonschemaFolder,configs.groupFolder,bpmnFolder,backendFolder,frontendFolder,()=>{
+        generate.run(configs, ['nuxt'], () => {
+          fw.prettyNuxt();
+        });
+      });
+    });
+  };
 
-  switch(options.generateType){  
+  switch (options.generateType) {
     case 'updatefrontend':
-      reGenFrontend()
-    break;
+      reGenFrontend();
+      break;
     case 'updatebackend':
-      reGenBackend()
-    break;
+      reGenBackend();
+      break;
     case 'frontend':
-      runfrontend()
-    break;
+      runfrontend();
+      break;
     case 'backend':
-      runbackend()
-    break;
+      runbackend();
+      break;
+    case 'updateMiniAppJsSdk':
+      runUpdateMiniAppJsSdk();
+      break;
+    case 'updateMiniAppStreamlitSdk':
+      runUpdateMiniAppStreamlitSdk();
+      break;
     case 'all':
-      run()
-    break;
+      run();
+      break;
     default:
-      log.error("unknown generate type")
-    break;
-
+      log.error('unknown generate type');
+      break;
   }
-
-}
+}

package/src/type.ts

@@ -69,6 +69,11 @@ export type ModuleObject = {
   schema:SimpleAppJSONSchema7
 }
 export type TypeGenerateDocumentVariable ={
+  /**
+   * Resource Name should be a readable name with camelCase. 
+   * Ex: studentSummary
+   */
+  resourceName: string;
 name: string
 doctype: string
 models: ChildModels

package/templates/basic/miniAppJsSdk/resource-bridge.service.ts.eta

@@ -0,0 +1,117 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2025-06-18
+ * Author: --
+ */
+
+<% 
+  const upperFirstCase = (value) => {
+    return value.charAt(0).toUpperCase() + value.slice(1);
+  }
+
+  const pascalName = upperFirstCase(it.resourceName);
+  const apiName = it.typename.toUpperCase() + 'Api';
+  const typeActionName = pascalName + 'Actions';
+
+  const miniAppWhitelistApis = it.jsonschema['x-simpleapp-config']?.miniApp?.whitelist || [];
+  const hasMiniAppWhitelistedApi = miniAppWhitelistApis.length > 0;
+%>
+
+import { MiniAppBridgeService } from "../bridge.service";
+
+export class MiniApp<%= pascalName %>BridgeService {
+  private bridge: MiniAppBridgeService;
+
+  private resourceName = "<%= it.resourceName %>";
+
+  constructor(bridge: MiniAppBridgeService) {
+    this.bridge = bridge;
+  }
+
+  <% for (let i = 0; i < miniAppWhitelistApis.length; i++) { %>
+    <%
+      const action = miniAppWhitelistApis[i];
+    %>
+
+    <% if(action === 'list') { %>
+      async list() {
+        return this.bridge.callApi(this.resourceName, "list");
+      }
+    <% } else if(action === 'detail') { %>
+      async detail(id: string) {
+        return this.bridge.callApi(this.resourceName, "detail", { id });
+      }
+    <% } else if(action === 'create') { %>
+     async create(data: any) {
+        return this.bridge.callApi(this.resourceName, "create", { body: data });
+      }
+    <% } else if(action === 'update') { %>
+      async update(id: string, data: any) {
+        return this.bridge.callApi(this.resourceName, "update", { id, body: data });
+      }
+    <% } else if(action === 'patch') { %>
+      async patch(id: string, data: any) {
+        return this.bridge.callApi(this.resourceName, "patch", { id, body: data });
+      }
+    <% } else if(action === 'delete') { %>
+      async delete(id: string) {
+        return this.bridge.callApi(this.resourceName, "delete", { id });
+      }
+    <% } else if(action === 'autoComplete') { %>
+      async autoComplete(query: string, data: any) {
+        return this.bridge.callApi(this.resourceName, "autoComplete", {
+          query,
+          body: data,
+        });
+      }
+    <% } else { %>
+      <% const apiSetting = it.apiSettings.find(item => item.action === action); %>
+      <% if (apiSetting) { %>
+        <% const hasBody = ['post', 'put', 'patch'].includes(apiSetting.method); %>
+
+        <% 
+          const paramMatches = apiSetting.entryPoint.match(/:([\w]+)/g) || [];
+          const paramNames = paramMatches.map(p => p.replace(':', ''));
+
+          const args = paramNames.map(name => {
+            return `${name}: string`;
+          });
+
+          const output = [];
+          const queryParams = [];
+
+          for (let i = 0; i < paramNames.length; i++) {
+            const name = paramNames[i];
+            if (name === 'id') {
+              output.push(`id: ${name}`);
+            } else {
+              queryParams.push(`${name}: ${name}`);
+            }
+          }
+
+          if (queryParams.length > 0) {
+            output.push(`queryParams: {\n  ${queryParams.join(',\n  ')}\n}`);
+          }
+
+          if (hasBody) {
+            args.push('data: any');
+            output.push('body: data');
+          }
+        %>
+          
+        async <%= action %>(<%= args.join(', ') %>) {
+          return this.bridge.callApi(this.resourceName, "<%= action %>", {
+            <%= output.join(',\n  ') %>
+          });
+        }
+      <% } %>
+    <% } %>
+  <% } %>
+
+  openOnScreenForm(id?: string) {
+    this.bridge.openOnScreenResourceForm(this.resourceName, {
+      id,
+    });
+  }
+}

package/templates/basic/miniAppStreamlitSdk/resource-bridge.service.ts.eta

@@ -0,0 +1,213 @@
+<% 
+  const upperFirstCase = (value) => {
+    return value.charAt(0).toUpperCase() + value.slice(1);
+  }
+
+  const pascalName = upperFirstCase(it.resourceName);
+  const apiName = it.typename.toUpperCase() + 'Api';
+  const typeActionName = pascalName + 'Actions';
+
+  const miniAppWhitelistApis = it.jsonschema['x-simpleapp-config']?.miniApp?.whitelist || [];
+  const hasMiniAppWhitelistedApi = miniAppWhitelistApis.length > 0;
+%>
+
+from streamlit_javascript import st_javascript
+from ..helper import Helper
+from typing import Optional
+from ..api_option import ApiOption
+from streamlit.components.v1 import html
+import json
+
+
+class <%= pascalName %>:
+    _resource_name = "<%= it.resourceName %>"
+
+    <% for (let i = 0; i < miniAppWhitelistApis.length; i++) { %>
+      <%
+        const action = miniAppWhitelistApis[i];
+      %>
+
+      <% if(action === 'list') { %>
+
+    def <%= action %>(self, options: Optional[ApiOption] = {}):
+      action = "<%= action %>"
+      request_key = Helper.get_api_key(
+        "request", resource=self._resource_name, action=action, options=options
+      )
+
+      st_javascript(
+        f"window.parent.callApi('{self._resource_name}', '{action}')",
+        key=request_key,
+        on_change=lambda: Helper.set_api_response(
+            resource=self._resource_name, action=action, options=options
+        ),
+      )
+      <% } else if(action === 'detail') { %>
+
+    def <%= action %>(self, id: str, options: Optional[ApiOption] = {}):
+      action = "<%= action %>"
+      request_key = Helper.get_api_key(
+        "request", resource=self._resource_name, action=action, options=options
+      )
+      payload = json.dumps({"id": id})
+
+      st_javascript(
+        f"window.parent.callApi('{self._resource_name}', '{action}', {payload})",
+        key=request_key,
+        on_change=lambda: Helper.set_api_response(
+            resource=self._resource_name, action=action, options=options
+        ),
+      )
+      <% } else if(action === 'create') { %>
+
+    def <%= action %>(self, data = {}, options: Optional[ApiOption] = {}):
+      action = "<%= action %>"
+      request_key = Helper.get_api_key(
+        "request", resource=self._resource_name, action=action, options=options
+      )
+      payload = json.dumps({"body": data})
+
+      st_javascript(
+        f"window.parent.callApi('{self._resource_name}', '{action}', {payload})",
+        key=request_key,
+        on_change=lambda: Helper.set_api_response(
+            resource=self._resource_name, action=action, options=options
+        ),
+      )
+      <% } else if(action === 'update') { %>
+
+    def <%= action %>(self, id: str, data = {}, options: Optional[ApiOption] = {}):
+      action = "<%= action %>"
+      request_key = Helper.get_api_key(
+        "request", resource=self._resource_name, action=action, options=options
+      )
+      payload = json.dumps({"id": id, "body": data})
+
+      st_javascript(
+        f"window.parent.callApi('{self._resource_name}', '{action}', {payload})",
+        key=request_key,
+        on_change=lambda: Helper.set_api_response(
+            resource=self._resource_name, action=action, options=options
+        ),
+      )
+      <% } else if(action === 'patch') { %>
+
+    def <%= action %>(self, id: str, data = {}, options: Optional[ApiOption] = {}):
+      action = "<%= action %>"
+      request_key = Helper.get_api_key(
+        "request", resource=self._resource_name, action=action, options=options
+      )
+      payload = json.dumps({"id": id, "body": data})
+
+      st_javascript(
+        f"window.parent.callApi('{self._resource_name}', '{action}', {payload})",
+        key=request_key,
+        on_change=lambda: Helper.set_api_response(
+            resource=self._resource_name, action=action, options=options
+        ),
+      )
+      <% } else if(action === 'delete') { %>
+
+    def <%= action %>(self, id: str, options: Optional[ApiOption] = {}):
+      action = "<%= action %>"
+      request_key = Helper.get_api_key(
+        "request", resource=self._resource_name, action=action, options=options
+      )
+      payload = json.dumps({"id": id})
+      st_javascript(
+        f"window.parent.callApi('{self._resource_name}', '{action}', {payload})",
+        key=request_key,
+        on_change=lambda: Helper.set_api_response(
+            resource=self._resource_name, action=action, options=options
+        ),
+      )
+      <% } else if(action === 'autoComplete') { %>
+
+    def <%= action %>(self, query: str, data = {}, options: Optional[ApiOption] = {}):
+      action = "<%= action %>"
+      request_key = Helper.get_api_key(
+        "request", resource=self._resource_name, action=action, options=options
+      )
+
+      payload = json.dumps({"query": query, "body": data})
+      st_javascript(
+        f"window.parent.callApi('{self._resource_name}', '{action}', {payload})",
+        key=request_key,
+        on_change=lambda: Helper.set_api_response(
+            resource=self._resource_name, action=action, options=options
+        ),
+      )
+      <% } else { %>
+        <% const apiSetting = it.apiSettings.find(item => item.action === action); %>
+        <% if (apiSetting) { %>
+          <% const hasBody = ['post', 'put', 'patch'].includes(apiSetting.method); %>
+
+          <% 
+            const paramMatches = apiSetting.entryPoint.match(/:([\w]+)/g) || [];
+            const paramNames = paramMatches.map(p => p.replace(':', ''));
+
+            const args = paramNames.map(name => {
+              return `${name}: str`;
+            });
+
+
+            const output = [];
+            const queryParams = [];
+
+            for (let i = 0; i < paramNames.length; i++) {
+              const name = paramNames[i];
+              if (name === 'id') {
+                output.push(`'id': ${name}`)
+              } else {
+                queryParams.push(`'${name}': ${name}`)
+              }
+            }
+
+            if (queryParams.length > 0) {
+              output.push(`'queryParams': { ${queryParams.join(', ')} }`);
+            }
+
+            if (hasBody) {
+              args.push('data = {}');
+              output.push("'body': data");
+            }
+
+            args.push('options: Optional[ApiOption] = {}')
+          %>
+
+    def <%= action %>(self, <%= args.join(', ') %>):
+      action = "<%= action %>"
+      request_key = Helper.get_api_key(
+        "request", resource=self._resource_name, action=action, options=options
+      )
+      payload = json.dumps({ <%~ output.join(', ') %> })
+
+      st_javascript(
+        f"window.parent.callApi('{self._resource_name}', '{action}', {payload})",
+        key=request_key,
+        on_change=lambda: Helper.set_api_response(
+            resource=self._resource_name, action=action, options=options
+        ),
+      )
+        <% } %>
+      <% } %>
+    <% } %>
+
+    def response(self, action: str, options: Optional[ApiOption] = {}):
+      return Helper.get_api_response(
+          resource=self._resource_name, action=action, options=options
+      )
+
+    def openOnScreenForm(self, id: Optional[str] = None):
+      id_js = f"'{id}'" if id else "undefined"
+
+      html(
+          f"""
+          <script>
+              window.parent.openOnScreenResourceForm('{self._resource_name}', {{
+                  id: {id_js}
+              }});
+          </script>
+          """,
+          height=0,
+      )