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

package/templates/nuxt/simpleapp/generate/clients/SimpleAppClient.ts.eta

@@ -13,10 +13,13 @@ import {
   NotificationStatus,
   SchemaType,
   FormActions,
+  DynamicObject,
 } from "~/types";
 import { getValidateService } from "~/simpleapp/generate/sharelibs/validate";
-import { SimpleAppCustomFieldClient } from "./SimpleAppCustomFieldClient";
 import { WatchHandle } from "vue";
+import { CustomFieldService } from "../features/customField/services/CustomFieldService";
+import { CustomFieldDataMode } from "../features/customField/types/common";
+import { CustomFieldDataModeEnum } from "../features/customField/enums/common";
 
 // import { useToast, } from 'primevue/usetoast';
 // import type {  ToastMessageOptions } from 'primevue/toast';
@@ -50,8 +53,10 @@ export class SimpleAppClient<
   protected errorlist = ref({});
   protected completeformula = true;
   protected axios;
-  private _customFieldClient = new SimpleAppCustomFieldClient();
+
+  // FLAG::CUSTOM_FIELD
   protected _customFieldWatch: WatchHandle | null = null;
+  private _customFieldService = new CustomFieldService();
 
   constructor(apiobj: TApi, doctype: string, docname: string) {
     this.docapi = apiobj;
@@ -76,24 +81,29 @@ export class SimpleAppClient<
     return false;
   } //if there is readonly attribute in data, will override it at processor and client
   setData = (data: any) => {
-    // this.data.value = data;
-    // TODO: TS ERROR
-    data.more = this._customFieldClient.processCustomFieldData(
-      // @ts-ignore
-      this.schema.properties?.["more"],
-      data.createdBy == "",
-      data.more,
-    );
-
     Object.assign(this.data.value, data);
   };
 
-  async processCustomField() {
-    const resp = this._customFieldClient.processCustomField(this.doctype);
-     // TODO: TS ERROR
-    // @ts-ignore
-    this.schema.properties.more = resp.schema;
-    this.setData(this.data.value);
+  prepareCustomFieldJsonSchema() {
+    const resp = this._customFieldService.prepareCustomFieldJsonSchema(
+      this.docname,
+    );
+    this.schema.properties.more = resp;
+  }
+
+  prepareCustomFieldData<T extends DynamicObject>(
+    mode: CustomFieldDataMode,
+    data: T,
+  ) {
+    const customFieldData = this._customFieldService.prepareCustomFieldData(
+      this.docname,
+      mode,
+      this.schema.properties?.more,
+      data.more,
+    );
+
+    (data as any).more = customFieldData;
+    return data;
   }
 
   async getById(id?: string) {
@@ -102,10 +112,11 @@ export class SimpleAppClient<
     return await this.docapi
       .runFindOne(id, this.axios)
       .then((res: AxiosResponse) => {
-        // if(this.event){this.event('info:getById',res.data)}
-        // this.data.value = {} as TData;
-        // Object.assign(this.data.value, res.data);
-        this.setData(res.data);
+        const dataWithCustomField = this.prepareCustomFieldData(
+          CustomFieldDataModeEnum.EXISTING,
+          res.data,
+        );
+        this.setData(dataWithCustomField);
         this.setWatchChange();
         setTimeout(() => {
           this.ready = true;

package/templates/nuxt/simpleapp/generate/jsonSchemas/index.ts.eta

@@ -0,0 +1,11 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-02-23
+ * Author: Ks Tan
+ */
+ 
+<%for(let i=0; i<it.modules.length;i++){ %>
+<% const d = it.modules[i] %>      
+export * from './<%= d['doctype']%>.jsonschema'      
+<%}%>

package/templates/nuxt/simpleapp/generate/miniApp/bridge/constants/common.constant.ts.eta

@@ -0,0 +1,16 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2025-06-18
+ * Author: --
+ */
+
+export enum MINI_APP_BRIDGE_MESSAGES {
+  NAVIGATE = "NAVIGATE",
+  NAVIGATE_CURRENT_MINI_APP = "NAVIGATE_CURRENT_MINI_APP",
+  OPEN_ON_SCREEN_RESOURCE_FORM = "OPEN_ON_SCREEN_RESOURCE_FORM",
+  API = "API",
+  API_RESPONSE = "API_RESPONSE",
+  INIT = "INIT",
+  INIT_RESPONSE = "INIT_RESPONSE",
+}

package/templates/nuxt/simpleapp/generate/miniApp/bridge/constants/resource.constant.ts.eta

@@ -0,0 +1,46 @@
+/**
+ * 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 camelToKebab = (value) => {
+    return value.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
+  }
+
+  const getMiniAppInfo = (module) => {
+    const config = module.schema['x-simpleapp-config'];
+    const resourceName = config?.resourceName ?? config.documentName;
+
+    const pascalName = upperFirstCase(resourceName);
+    const kebabName = camelToKebab(resourceName);
+
+    const miniAppWhitelistApis = config?.miniApp?.whitelist || {};
+    const hasMiniAppWhitelistedApi = Object.keys(miniAppWhitelistApis).length > 0;
+
+    return {
+      resourceName, 
+      pascalName, 
+      kebabName,
+      hasMiniAppWhitelistedApi,
+      miniAppWhitelistApis,
+    }
+  }
+%>
+
+export const MINI_APP_API_RESOURCES = [
+  <% for (let i = 0; i < it.modules.length; i++) { %>
+    <%
+      const { resourceName, pascalName, hasMiniAppWhitelistedApi } = getMiniAppInfo(it.modules[i]);
+    %>
+    <% if(hasMiniAppWhitelistedApi) { %>
+      "<%= resourceName %>",
+    <% } %>
+  <% } %>
+];

package/templates/nuxt/simpleapp/generate/miniApp/bridge/services/bridge-resource-accessor.service.ts.eta

@@ -0,0 +1,63 @@
+/**
+ * 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 camelToKebab = (value) => {
+    return value.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
+  }
+
+  const getMiniAppInfo = (module) => {
+    const config = module.schema['x-simpleapp-config'];
+    const resourceName = config?.resourceName ?? config.documentName;
+
+    const pascalName = upperFirstCase(resourceName);
+    const kebabName = camelToKebab(resourceName);
+
+    const miniAppWhitelistApis = config?.miniApp?.whitelist || {};
+    const hasMiniAppWhitelistedApi = Object.keys(miniAppWhitelistApis).length > 0;
+
+    return {
+      resourceName, 
+      pascalName, 
+      kebabName,
+      hasMiniAppWhitelistedApi,
+      miniAppWhitelistApis,
+    }
+  }
+%>
+
+import { MiniAppResourceMap } from "../types/resource-mapper.type";
+<% for (let i = 0; i < it.modules.length; i++) { %>
+  <%
+    const { pascalName, kebabName, hasMiniAppWhitelistedApi } = getMiniAppInfo(it.modules[i]);
+  %>
+  <% if(hasMiniAppWhitelistedApi) { %>
+    import { MiniApp<%= pascalName %>BridgeEditableService } from "./editable/resources/<%= kebabName %>-bridge.editable.service";
+  <% } %>
+<% } %>
+
+export class MiniAppBridgeResourceAccessor {
+  protected instances: Partial<MiniAppResourceMap> = {};
+
+  <% for (let i = 0; i < it.modules.length; i++) { %>
+    <%
+      const { resourceName, pascalName, kebabName, hasMiniAppWhitelistedApi } = getMiniAppInfo(it.modules[i]);
+    %>
+    <% if(hasMiniAppWhitelistedApi) { %>
+      get <%= resourceName %>() {
+        if (!this.instances.<%= resourceName %>) {
+          this.instances.<%= resourceName %> = new MiniApp<%= pascalName %>BridgeEditableService();
+        }
+        return this.instances.<%= resourceName %>;
+      }
+    <% } %>
+  <% } %>
+}

package/templates/nuxt/simpleapp/generate/miniApp/bridge/services/bridge.service.ts.eta

@@ -0,0 +1,129 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2025-06-18
+ * Author: --
+ */
+
+import { SimpleAppDocumentType } from "~/types";
+import {
+  MiniAppBridgeMessageApi,
+  MiniAppBridgeMessageNavigate,
+  MiniAppBridgeMessageNavigateCurrentMiniApp,
+  MiniAppBridgeMessageOpenOnScreenResourceForm,
+} from "../types/bridge.type";
+import { AxiosError } from "axios";
+import { MINI_APP_BRIDGE_MESSAGES } from "../constants/common.constant";
+import { MiniAppResourceMap } from "../types/resource-mapper.type";
+import { MiniAppBridgeResourceAccessor } from "./bridge-resource-accessor.service";
+import { MINI_APP_API_RESOURCES } from "../constants/resource.constant";
+
+export class MiniAppBridgeService extends MiniAppBridgeResourceAccessor {
+  /**************************************** Bridge Handler ***************************************/
+
+  handleBridgeNavigate(message: MiniAppBridgeMessageNavigate) {
+    goTo(message.params.target, message.params.id, message.params.query);
+  }
+
+  handleBridgeNavigateCurrentMiniApp(
+    message: MiniAppBridgeMessageNavigateCurrentMiniApp,
+    pluginCode: string,
+  ) {
+    const target = message.params.target;
+    const { $appPluginsStore } = useNuxtApp();
+    let targetUrl = "";
+    if (target === "setting") {
+      targetUrl = $appPluginsStore.getPluginSettingPath(pluginCode);
+    } else {
+      targetUrl = $appPluginsStore.getPluginPageUrlPath(pluginCode, "");
+      targetUrl = targetUrl.replace(/^\/|\/$/g, "");
+      targetUrl = `${targetUrl}/${message.params.target}`;
+    }
+
+    goTo(targetUrl, undefined, message.params.query);
+  }
+
+  handleBridgeOpenOnScreenResourceForm(
+    message: MiniAppBridgeMessageOpenOnScreenResourceForm,
+  ) {
+    if (message.params.resource.id) {
+      onScreenEditDocument(
+        message.params.resource.name as SimpleAppDocumentType,
+        message.params.resource.id,
+      );
+      return;
+    }
+
+    onScreenAddDocument(message.params.resource.name as SimpleAppDocumentType, {
+      paras: message.params.data,
+    });
+    return;
+  }
+
+  async handleBridgeApi(
+    messageEvent: MessageEvent,
+    message: MiniAppBridgeMessageApi<any>,
+  ) {
+    try {
+      const data = await this.handleBridgeCallApi(message);
+
+      messageEvent.source?.postMessage(
+        {
+          type: MINI_APP_BRIDGE_MESSAGES.API_RESPONSE,
+          success: true,
+          requestId: message.requestId,
+          data,
+        },
+        {
+          targetOrigin: messageEvent.origin,
+        },
+      );
+    } catch (e) {
+      const err = e as AxiosError;
+
+      messageEvent.source?.postMessage(
+        {
+          type: MINI_APP_BRIDGE_MESSAGES.API_RESPONSE,
+          success: false,
+          requestId: message.requestId,
+          error: {
+            code: err.code,
+            message: err.message,
+            status: err.status,
+            response: err.response
+              ? {
+                  data: err.response?.data
+                    ? {
+                        data: (err.response.data as any)?.data ?? "",
+                        error: (err.response.data as any)?.error ?? "",
+                        message: (err.response.data as any)?.message ?? "",
+                        statusCode:
+                          (err.response.data as any)?.statusCode ?? "",
+                        statusMessage:
+                          (err.response.data as any)?.statusMessage ?? "",
+                      }
+                    : {},
+                  status: err.response.status,
+                  statusText: err.response.statusText,
+                }
+              : {},
+          },
+        },
+        {
+          targetOrigin: messageEvent.origin,
+        },
+      );
+    }
+  }
+
+  private async handleBridgeCallApi(message: MiniAppBridgeMessageApi<any>) {
+    const resourceName = message.params.resource.name;
+
+    if (!MINI_APP_API_RESOURCES.includes(resourceName)) {
+      throw new Error(`Unknown resource name: ${resourceName}`);
+    }
+
+    const bridge = this[resourceName as keyof MiniAppResourceMap];
+    return await bridge.handleApi(message);
+  }
+}

package/templates/nuxt/simpleapp/generate/miniApp/bridge/types/bridge.type.ts.eta

@@ -0,0 +1,81 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2025-06-18
+ * Author: --
+ */
+
+import { MINI_APP_BRIDGE_MESSAGES } from "../constants/common.constant";
+
+export type MiniAppResource = {
+  name: string;
+  id?: string;
+};
+
+/************************************* Bridge Message Type *************************************/
+
+export type MiniAppBridgeMessage<TAction> =
+  | MiniAppBridgeMessageNavigate
+  | MiniAppBridgeMessageNavigateCurrentMiniApp
+  | MiniAppBridgeMessageOpenOnScreenResourceForm
+  | MiniAppBridgeMessageApi<TAction>
+  | MiniAppBridgeMessageInitResponse;
+
+export type MiniAppBridgeMessageNavigate = {
+  type: typeof MINI_APP_BRIDGE_MESSAGES.NAVIGATE;
+  params: {
+    target: string;
+    id?: string;
+    query?: string;
+  };
+};
+
+export type MiniAppBridgeMessageNavigateCurrentMiniApp = {
+  type: typeof MINI_APP_BRIDGE_MESSAGES.NAVIGATE_CURRENT_MINI_APP;
+  params: {
+    target: string;
+    query?: string;
+  };
+};
+
+export type MiniAppBridgeMessageOpenOnScreenResourceForm = {
+  type: typeof MINI_APP_BRIDGE_MESSAGES.OPEN_ON_SCREEN_RESOURCE_FORM;
+  params: {
+    resource: MiniAppResource;
+    data?: any;
+  };
+};
+
+export type MiniAppBridgeMessageApi<TActions> = {
+  type: typeof MINI_APP_BRIDGE_MESSAGES.API;
+  requestId: string;
+  params: {
+    action: TActions;
+    resource: MiniAppResource;
+    /**
+     * For auto complete filter
+     */
+    query?: string;
+    /**
+     * For :id/:code/xxx
+     */
+    queryParams?: {
+      [key: string]: any;
+    };
+    body?: {
+      [key: string]: any;
+    };
+  };
+};
+
+export type MiniAppBridgeMessageApiResponse<TData> = {
+  type: typeof MINI_APP_BRIDGE_MESSAGES.API_RESPONSE;
+  requestId: string;
+  success: boolean;
+  data?: TData;
+  error?: any;
+};
+
+export type MiniAppBridgeMessageInitResponse = {
+  type: typeof MINI_APP_BRIDGE_MESSAGES.INIT_RESPONSE;
+};

package/templates/nuxt/simpleapp/generate/miniApp/bridge/types/resource-mapper.type.ts.eta

@@ -0,0 +1,55 @@
+/**
+ * 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 camelToKebab = (value) => {
+    return value.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
+  }
+
+  const getMiniAppInfo = (module) => {
+    const config = module.schema['x-simpleapp-config'];
+    const resourceName = config?.resourceName ?? config.documentName;
+
+    const pascalName = upperFirstCase(resourceName);
+    const kebabName = camelToKebab(resourceName);
+
+    const miniAppWhitelistApis = config?.miniApp?.whitelist || {};
+    const hasMiniAppWhitelistedApi = Object.keys(miniAppWhitelistApis).length > 0;
+
+    return {
+      resourceName, 
+      pascalName, 
+      kebabName,
+      hasMiniAppWhitelistedApi,
+      miniAppWhitelistApis,
+    }
+  }
+%>
+
+<% for (let i = 0; i < it.modules.length; i++) { %>
+  <%
+    const { pascalName, kebabName, hasMiniAppWhitelistedApi } = getMiniAppInfo(it.modules[i]);
+  %>
+  <% if(hasMiniAppWhitelistedApi) { %>
+    import { MiniApp<%= pascalName %>BridgeService } from "../services/resources/<%= kebabName %>-bridge.service";
+  <% } %>
+<% } %>
+
+export type MiniAppResourceMap = {
+  <% for (let i = 0; i < it.modules.length; i++) { %>
+    <%
+      const { resourceName, pascalName, hasMiniAppWhitelistedApi } = getMiniAppInfo(it.modules[i]);
+    %>
+    <% if(hasMiniAppWhitelistedApi) { %>
+      <%= resourceName %>: MiniApp<%= pascalName %>BridgeService;
+    <% } %>
+  <% } %>
+};

package/templates/nuxt/types/others.ts.eta

@@ -4,69 +4,78 @@
  * last change 2024-04-14
  * Author: Ks Tan
  */
-import {SimpleAppClient} from '~/simpleapp/generate/clients/SimpleAppClient'
-import { SimpleAppDocumentType } from './documentlist';
-export type NameValue={
-  name:string;
-  value:number
-}
-  export type ForeignKey = {
-    _id: string;
-    label: string;
-    code?: string
-    [key:string]: any
-  };
-  export type TextSearchBody = {
-    keyword: string;
-    fields?: string[];
-    sorts?: string[][];
-    lookup?: Record<string, string>;
-  };
+import { SimpleAppClient } from "~/simpleapp/generate/clients/SimpleAppClient";
+import { SimpleAppDocumentType } from "./documentlist";
 
-  export type DocumentMetaData =  {
-    docName:string
-    docType:string
-    page: string 
-    isolationType:string   
-    documentDate:string
-    docNumber:boolean
-    webhook:string[]|undefined
-    docClass: SimpleAppClient<any,any>
-    viewer?: Function
-  }
-  export type MenuData =  {
-    label: string
-    icon?: string
-    command?:Function
-    items?: MenuData[]
-    isolationType?:string
-    url?:string
-  }
-  export type RecentlyValue = {
-    docName:string
-    label:string
-    branchId:number
-    time:string
-  }
-  export type DocNoFormat ={
-    docNoFormatName: string
-    docNoFormatNo:string
-    docNoPattern:string
-    active: boolean
-    sample:string
-    }
-  
-  
-  export type RendererSetting ={
-    documentName:SimpleAppDocumentType,
-    [key:string]:any
-  }
-  export type SearchBody = {
-      
-      filter?:object;
-      
-      fields?: any[];
-      
-      sorts?: any[];
-      lookup?: {[key:string]:string};
-  }
+export type NameValue = {
+  name: string;
+  value: number;
+};
+
+export type ForeignKey = {
+  _id: string;
+  label: string;
+  code?: string;
+  [key: string]: any;
+};
+
+export type TextSearchBody = {
+  keyword: string;
+  fields?: string[];
+  sorts?: string[][];
+  lookup?: Record<string, string>;
+};
+
+export type DocumentMetaData = {
+  docName: string;
+  docType: string;
+  page: string;
+  isolationType: string;
+  documentDate: string;
+  docNumber: boolean;
+  webhook: string[] | undefined;
+  docClass: SimpleAppClient<any, any>;
+  viewer?: Function;
+};
+
+export type MenuData = {
+  label: string;
+  icon?: string;
+  command?: Function;
+  items?: MenuData[];
+  isolationType?: string;
+  url?: string;
+};
+
+export type RecentlyValue = {
+  docName: string;
+  label: string;
+  branchId: number;
+  time: string;
+};
+
+export type DocNoFormat = {
+  docNoFormatName: string;
+  docNoFormatNo: string;
+  docNoPattern: string;
+  active: boolean;
+  sample: string;
+};
+
+export type RendererSetting = {
+  documentName: SimpleAppDocumentType;
+  [key: string]: any;
+};
+
+export type SearchBody = {
+  filter?: object;
+
+  fields?: any[];
+
+  sorts?: any[];
+  lookup?: { [key: string]: string };
+};
+
+export type DynamicObject = {
+  [key: string]: any;
+};