@simitgroup/simpleapp-generator 2.0.3-k-alpha → 2.0.3-m-alpha

package/ReleaseNote.md

@@ -1,3 +1,9 @@
+[2.0.3m-alpha]
+1. Extract BridgeResourceAccessorBase for extensibility
+
+[2.0.3l-alpha]
+1. Remove docnoformat form and page templates
+
 [2.0.3k-alpha]
 1. Update sharelibs imports to @simtrain/shared package
 

package/package.json

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

package/templates/miniAppJsSdk/src/services/{bridge-resource-accessor.service.ts.eta → bridge-resource-accessor-base.service.ts.eta}

@@ -34,11 +34,11 @@ import { MiniAppBridgeService } from "./bridge.service";
     const { pascalName, kebabName, hasMiniAppWhitelistedApi } = getMiniAppInfo(it.modules[i]);
   %>
   <% if(hasMiniAppWhitelistedApi) { %>
-    import { MiniApp<%= pascalName %>BridgeService } from "../services/resources/<%= kebabName %>-bridge.service";
+    import { MiniApp<%= pascalName %>BridgeService } from "./resources/<%= kebabName %>-bridge.service";
   <% } %>
 <% } %>
 
-export class MiniAppBridgeResourceAccessor {
+export class MiniAppBridgeResourceAccessorBase {
   protected bridge: MiniAppBridgeService;
   protected instances: Partial<MiniAppResourceMap> = {};
 

package/templates/miniAppJsSdk/src/services/bridge-resource-accessor.service.ts._eta

@@ -0,0 +1,10 @@
+import { MiniAppBridgeResourceAccessorBase } from "./bridge-resource-accessor-base.service";
+
+export class MiniAppBridgeResourceAccessor extends MiniAppBridgeResourceAccessorBase {
+  protected customInstances: Partial<{
+  }> = {};
+
+  constructor() {
+    super();
+  }
+}

package/templates/nuxt/simpleapp/generate/features/miniApp/bridge/services/{bridge-resource-accessor.service.ts.eta → bridge-resource-accessor-base.service.ts.eta}

@@ -36,7 +36,7 @@ import { MiniAppResourceMap } from "../types/resource-mapper.type";
   <% } %>
 <% } %>
 
-export class MiniAppBridgeResourceAccessor {
+export class MiniAppBridgeResourceAccessorBase {
   protected instances: Partial<MiniAppResourceMap> = {};
 
   protected miniAppCode: string = "";

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

@@ -0,0 +1,6 @@
+import { MiniAppBridgeResourceAccessorBase } from "./bridge-resource-accessor-base.service";
+
+export class MiniAppBridgeResourceAccessor extends MiniAppBridgeResourceAccessorBase {
+  protected customInstances: Partial<{
+  }> = {};
+}

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

@@ -5,29 +5,25 @@
  * Author: --
  */
 
+import { AxiosError } from "axios";
 import { SimpleAppDocumentType } from "~/types";
+import { MINI_APP_BRIDGE_MESSAGES } from "../constants/common.constant";
+import { MINI_APP_API_CUSTOM_RESOURCES } from "../constants/custom-resource.constant";
+import { MINI_APP_API_RESOURCES } from "../constants/resource.constant";
 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,
-      message.params.options,
-    );
+    goTo(message.params.target, message.params.id, message.params.query, message.params.options);
   }
 
   handleBridgeNavigateCurrentMiniApp(
@@ -48,9 +44,7 @@ export class MiniAppBridgeService extends MiniAppBridgeResourceAccessor {
     goTo(targetUrl, undefined, message.params.query, message.params.options);
   }
 
-  handleBridgeOpenOnScreenResourceForm(
-    message: MiniAppBridgeMessageOpenOnScreenResourceForm,
-  ) {
+  handleBridgeOpenOnScreenResourceForm(message: MiniAppBridgeMessageOpenOnScreenResourceForm) {
     if (message.params.resource.id) {
       onScreenEditDocument(
         message.params.resource.name as SimpleAppDocumentType,
@@ -108,10 +102,8 @@ export class MiniAppBridgeService extends MiniAppBridgeResourceAccessor {
                         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 ?? "",
+                        statusCode: (err.response.data as any)?.statusCode ?? "",
+                        statusMessage: (err.response.data as any)?.statusMessage ?? "",
                       }
                     : {},
                   status: err.response.status,
@@ -129,11 +121,11 @@ export class MiniAppBridgeService extends MiniAppBridgeResourceAccessor {
 
   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}`);
+      if (!MINI_APP_API_CUSTOM_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/components/form/FormDocnoformat.vue._eta

@@ -1,240 +0,0 @@
-<template>
-  <div>
-    <title v-if="id">{{ data.docNoFormatName ?? data.docNoFormatNo }}</title>
-
-    <SimpleAppForm #default="o" :document="doc">
-      <SimpleAppFormToolBar
-        :document="doc"
-        @on="actionListener"
-      ></SimpleAppFormToolBar>
-      <div class="grid grid-cols-1 lg:grid-cols-2 gap-4 p-2">
-        <SimpleAppInput
-          :input-type="SimpleAppInputType.autocomplete"
-          :setting="o.getField('#/properties/branch')"
-          v-model="data.branch"
-        />
-        <SimpleAppInput
-          :readonly="!doc.isNew()"
-          :input-type="SimpleAppInputType.select"
-          :setting="o.getField('#/properties/docNoType')"
-          :options="
-            getAllDocFormats().map((item) => ({
-              label: docNoTypeMapping[item.docType] || item.docType,
-              value: item.docType,
-            }))
-          "
-          v-model="data.docNoType"
-        />
-
-        <SimpleAppInput
-          :input-type="SimpleAppInputType.text"
-          :setting="o.getField('#/properties/docNoFormatNo')"
-          v-model="data.docNoFormatNo"
-        />
-
-        <SimpleAppInput
-          :input-type="SimpleAppInputType.text"
-          :setting="o.getField('#/properties/docNoFormatName')"
-          v-model="data.docNoFormatName"
-        />
-
-        <SimpleAppInput
-          :input-type="SimpleAppInputType.checkbox"
-          :setting="o.getField('#/properties/active')"
-          v-model="data.active"
-        />
-        <SimpleAppInput
-          :input-type="SimpleAppInputType.checkbox"
-          :setting="o.getField('#/properties/default')"
-          v-model="data.default"
-        />
-
-        <SimpleAppInput
-          :input-type="SimpleAppInputType.text"
-          :setting="o.getField('#/properties/docNoPattern')"
-          v-model="data.docNoPattern"
-          @keyup="updateSample"
-          :description="sample"
-          v-tooltip="'Examples: PO-[00000], SI{YY}/[000], SI{YYMM}/[000]'"
-        />
-
-        <SimpleAppInput
-          :input-type="SimpleAppInputType.number"
-          :setting="o.getField('#/properties/nextNumber')"
-          v-model="data.nextNumber"
-        />
-      </div>
-    </SimpleAppForm>
-    <DebugDocumentData v-model="data" :label="doc.getDocName()" />
-    <DataTable
-      :value="formatParams"
-      class="p-datatable-sm mt-6"
-      stripedRows
-      responsiveLayout="scroll"
-    >
-      <template #header>
-        <div class="text-sm font-semibold">Format Parameters</div>
-      </template>
-      <Column
-        field="placeholder"
-        header="Placeholder"
-        style="width: 30%"
-        class="text-xs"
-      />
-      <Column field="description" header="Description" class="text-xs" />
-    </DataTable>
-  </div>
-</template>
-
-<script setup lang="ts">
-/**
- * This file was automatically generated by simpleapp generator.
- * last change 2024-02-16
- * Author: Ks Tan
- */
-import { SimpleAppInputType, FormCrudEvent } from "~/types";
-import { DocumentNoFormat  } from "~/simpleapp/generate/openapi";
-import { DocumentnoformatDoc } from "~/simpleapp/docs/DocumentnoformatDoc";
-
-const props = defineProps<{
-  _id?: string;
-  doc?: DocumentnoformatDoc;
-  paras?: Partial<DocumentNoFormat>;
-}>();
-
-const doc = props.doc ?? useNuxtApp().$DocumentnoformatDoc()
-const data = doc.getReactiveData();
-const sample = ref("");
-const emits = defineEmits(["after"]);
-const id = computed(() => props._id ?? "");
-
-/************ start default methods ****************/
-
-const newData = () => {
-  doc.setNew();
-  delete data.value.branch;
-};
-
-const formatParams = [
-  {
-    placeholder: "[0000]",
-    description: "0001 displays the transaction numbering.",
-  },
-  {
-    placeholder: "{YYYY}",
-    description: "Displays 4-digit current year (e.g., 2025-9999).",
-  },
-  {
-    placeholder: "{YY}",
-    description: "Displays 2-digit current year (e.g., 25).",
-  },
-  {
-    placeholder: "{MM}",
-    description: "Displays 2-digit current month (e.g., 01-12).",
-  },
-  { placeholder: "{ddd}", description: "Displays current day (e.g., Tue)." },
-  {
-    placeholder: "{DD}",
-    description: "Displays 2-digit day of the month (e.g., 01-31).",
-  },
-  {
-    placeholder: "{YYMM}",
-    description: "Displays 2-digit year and 2-digit month (e.g., 2504).",
-  },
-  {
-    placeholder: "{YYYYMM}",
-    description: "Displays 4-digit year and 2-digit month (e.g., 202504).",
-  },
-];
-
-const getRecord = async () => {
-  if (id.value && id.value != "new") {
-    await doc.getById(id.value);
-  } else {
-    newData();
-  }
-};
-
-const docNoTypeMapping: Record<string, string> = {
-  CN: "Credit Note",
-  ANNOUNCEMENT: "Announcement",
-  ENROLL: "Enrolment",
-  INV: "Invoice",
-  PAY: "Payment",
-  REFUND: "Refund",
-  STU: "Student",
-  TEACHER: "Teacher",
-  TUITION: "Tuition Class",
-};
-
-getRecord();
-watch(id, async () => await getRecord());
-/************ end default methods ****************/
-
-const actionListener = async (actionName: string) => {
-  emits("after", actionName, data.value);
-};
-
-onMounted(async () => {
-  await actionListener(FormCrudEvent.mount);
-  setTimeout(() => {
-    updateSample();
-  }, 300);
-});
-/************ start api methods ****************/
-
-// const runListDocFormats = async () => {
-//   const data = {
-//     id: id.value,
-//   };
-//   const result = await doc.runListDocFormats(
-//     doctype,
-
-//     data,
-//   );
-// };
-/************ end api methods ****************/
-const updateSample = () => {
-  sample.value = "Format Sample: " + previewDocNo();
-};
-
-const previewDocNo = (): string => {
-  const pattern = data.value.docNoPattern;
-  if (pattern) {
-    const numberReg: RegExp = /\[(.*?)\]/g;
-    const dateReg: RegExp = /\{(.*?)\}/g;
-    let newvalue = pattern;
-    const numberpattern = pattern.match(numberReg);
-    const datepattern = pattern.match(dateReg);
-
-    if (numberpattern && numberpattern.length > 0) {
-      const numberlength = numberpattern[0]
-        .replace("[", "")
-        .replace("]", "").length;
-
-      let nextnumber = (data.value.nextNumber ?? 0).toString();
-
-      const numberdiff = numberlength - nextnumber.length;
-
-      for (let n = 0; n < numberdiff; n++) {
-        nextnumber = "0" + nextnumber;
-      }
-      newvalue = newvalue.replace(numberpattern[0], nextnumber);
-    }
-
-    if (datepattern && datepattern.length > 0) {
-      for (let d = 0; d < datepattern.length; d++) {
-        const dpattern = datepattern[d];
-        const date = new Date();
-        const formatteddate = getDayJs()().format(
-          dpattern.replace("{", "").replace("}", ""),
-        );
-        newvalue = newvalue.replace(dpattern, formatteddate);
-      }
-    }
-    return newvalue;
-  } else {
-    return "";
-  }
-};
-</script>

package/templates/nuxt/pages/[xorg]/docnoformat/[id].vue.eta

@@ -1,37 +0,0 @@
-<template>
-  <LazyFormDocnoformat :_id="_id" @after="after" />
-</template>
-
-<script setup lang="ts">
-/**
- * This file was automatically generated by simpleapp generator.
- * last change 2023-09-09
- * author: Ks Tan
- */
-
-import { Docnoformat } from "~/simpleapp/generate/types";
-const doc = useNuxtApp().$DocnoformatDoc();
-
-const props = defineProps<{ _id: string }>();
-const after = (actionName: string, data: Docnoformat) => {
-  switch (actionName) {
-    case "new":
-      goTo(doc.getDocName(), "new");
-      break;
-    case "create":
-      goTo(doc.getDocName(), data._id);
-      refreshDocumentList(doc.getDocName());
-      useNuxtApp().$event("CloseDialog", doc.getDocName().toLowerCase());
-      break;
-    case "update":
-      refreshDocumentList(doc.getDocName());
-      useNuxtApp().$event("CloseDialog", doc.getDocName().toLowerCase());
-      break;
-    case "delete":
-      goTo(doc.getDocName(), "new");
-      refreshDocumentList(doc.getDocName());
-      useNuxtApp().$event("CloseDialog", doc.getDocName().toLowerCase());
-      break;
-  }
-};
-</script>