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

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

@@ -0,0 +1,119 @@
+/**
+ * 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 = Object.keys(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;
+  }
+
+  <% Object.entries(miniAppWhitelistApis).forEach(([action, value]) => { %>
+    <% if (value !== true && typeof value !== 'object') { return; } %>
+
+    <% 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 if(action === 'current') { %>
+      async <%= action %>() {
+        return this.bridge.callApi(this.resourceName, "<%= action %>");
+      }
+    <% } 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,228 @@
+<% 
+  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 = Object.keys(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 %>"
+
+    <% Object.entries(miniAppWhitelistApis).forEach(([action, value]) => { %>
+      <% if (value !== true && typeof value !== 'object') { return; } %>
+
+
+      <% 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 if(action === 'current') { %>
+    
+    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 { %>
+        <% 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,
+      )

package/templates/basic/nuxt/jsonschema.ts.eta

@@ -0,0 +1,7 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-02-23
+ * Author: Ks Tan
+ */
+export const <%= it.typename%>JsonSchema = <%~ JSON.stringify(it.jsonschema) %>

package/templates/basic/nuxt/resource-bridge.editable.service.ts.eta

@@ -0,0 +1,40 @@
+/**
+ * This file was automatically generated by simpleapp generator.
+ * you may change it, it won't override
+ * 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 pascalName = upperFirstCase(it.resourceName);
+  const kebabName = camelToKebab(it.resourceName);
+  const apiName = it.typename.toUpperCase() + 'Api';
+  const typeActionName = 'MiniApp' + pascalName + 'Actions';
+
+  const miniAppWhitelistApis = it.jsonschema['x-simpleapp-config']?.miniApp?.whitelist || {};
+  const hasMiniAppWhitelistedApi = Object.keys(miniAppWhitelistApis).length > 0;
+%>
+
+import { MiniApp<%= pascalName %>BridgeService } from "../../../services/resources/<%= kebabName %>-bridge.service";
+import type { <%= typeActionName %> } from "../../../services/resources/<%= kebabName %>-bridge.service";
+import { MiniAppBridgeMessageApi } from "../../../types/bridge.type";
+
+export class MiniApp<%= pascalName %>BridgeEditableService extends MiniApp<%= pascalName %>BridgeService {
+  <% Object.entries(miniAppWhitelistApis).forEach(([action, value]) => { %>
+    <% if (value !== true && typeof value !== 'object') { return; } %>
+
+    <% if(action === 'current') { %>
+      protected override async handleCurrent(message: MiniAppBridgeMessageApi<<%= typeActionName %>>): Promise<any> {
+        return {};
+      }
+    <% } %>
+  <% }) %>
+}

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

@@ -0,0 +1,165 @@
+/**
+ * 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 = 'MiniApp' + pascalName + 'Actions';
+
+  const miniAppWhitelistApis = it.jsonschema['x-simpleapp-config']?.miniApp?.whitelist || {};
+  const hasMiniAppWhitelistedApi = Object.keys(miniAppWhitelistApis).length > 0;
+%>
+
+import { <%= apiName %> } from "~/simpleapp/generate/openapi";
+import { MiniAppBridgeMessageApi } from "../../types/bridge.type";
+
+const actions = <%~ JSON.stringify(Object.keys(miniAppWhitelistApis), null, 2) %> as const;
+
+export type <%= typeActionName %> = (typeof actions)[number];
+
+export class MiniApp<%= pascalName %>BridgeService {
+  protected api!: <%= apiName %>;
+
+  constructor() {
+    this.api = new <%= apiName %>(getAxiosConfig());
+  }
+
+  async handleApi(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
+    <% if(hasMiniAppWhitelistedApi) { %>
+      const handlers = this.getHandlers();
+
+      const handler = handlers[message.params.action];
+      if (!handler) {
+        throw new Error(`ERR_UNKNOWN_ACTION: ${message.params.action}`);
+      }
+
+      return await handler(message);
+    <% } else { %>
+      throw new Error(`ERR_NOT_SUPPORTED`);
+    <% } %>
+  }
+
+  private getHandlers(): Record<
+    <%= typeActionName %>,
+    (message: MiniAppBridgeMessageApi<<%= typeActionName %>>) => Promise<any>
+  > {
+    <% if(hasMiniAppWhitelistedApi) { %>
+      return {
+        <% Object.entries(miniAppWhitelistApis).forEach(([action, value]) => { %>
+          <% if (value !== true && typeof value !== 'object') { return; } %>
+
+          <%
+            const handlerName = "handle" + upperFirstCase(action);
+          %>
+          <%= action %>: this.<%= handlerName %>.bind(this),
+        <% }) %>
+      };
+    <% } else { %>
+      throw new Error(`ERR_NOT_SUPPORTED`);
+    <% } %>
+  }
+
+  /****************************************** API Action *****************************************/
+
+  <% Object.entries(miniAppWhitelistApis).forEach(([action, value]) => { %>
+    <% if (value !== true && typeof value !== 'object') { return; } %>
+
+    <% if(action === 'list') { %>
+      protected async handleList(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
+        return (await this.api!.runSearch({})).data;
+      }
+    <% } else if(action === 'detail') { %>
+      protected async handleDetail(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
+        if (!message.params.resource.id) throw new Error("ERR_MISSING_ID");
+        return (await this.api!.runFindOne(message.params.resource.id)).data;
+      }
+    <% } else if(action === 'create') { %>
+      protected async handleCreate(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
+        if (!message.params.body) throw new Error("ERR_MISSING_BODY");
+        return (await this.api!.runCreate(message.params.body as any)).data;
+      }
+    <% } else if(action === 'update') { %>
+      protected async handleUpdate(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
+        if (!message.params.resource.id) throw new Error("ERR_MISSING_ID");
+        if (!message.params.body) throw new Error("ERR_MISSING_BODY");
+
+        return (
+          await this.api!.runUpdate(
+            message.params.resource.id,
+            // TODO: Type
+            message.params.body as any,
+          )
+        ).data;
+      }
+    <% } else if(action === 'patch') { %>
+      protected async handlePatch(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
+        if (!message.params.resource.id) throw new Error("ERR_MISSING_ID");
+        if (!message.params.body) throw new Error("ERR_MISSING_BODY");
+
+        return (
+          await this.api!.runPatch(
+            message.params.resource.id,
+            // TODO: Type
+            message.params.body as any,
+          )
+        ).data;
+      }
+    <% } else if(action === 'delete') { %>
+      protected async handleDelete(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
+        if (!message.params.resource.id) throw new Error("ERR_MISSING_ID");
+
+        return (await this.api!.runDelete(message.params.resource.id)).data;
+      }
+    <% } else if(action === 'autoComplete') { %>
+      protected async handleAutoComplete(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
+        return (await this.api!.autoComplete(message.params.query ?? "", {})).data;
+      }
+    <% } else if(action === 'current') { %>
+      protected async handleCurrent(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
+        return {};
+      }
+    <% } else { %>
+      protected async handle<%= upperFirstCase(action) %>(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
+        <% const apiSetting = it.apiSettings.find(item => item.action === action); %>
+        <% if (apiSetting) { %>
+          const queryParams = message.params?.queryParams;
+
+          <% const hasBody = ['post', 'put', 'patch'].includes(apiSetting.method); %>
+          <% if (hasBody) { %>
+            if (!message.params.body) throw new Error("ERR_MISSING_BODY");
+          <% } %>
+          <% 
+            const paramMatches = apiSetting.entryPoint.match(/:([\w]+)/g) || [];
+            const paramNames = paramMatches.map(p => p.replace(':', ''));
+            paramNames.forEach(name => {
+              if (name === 'id') {
+          %>
+            if (!message.params.resource.id) throw new Error("ERR_MISSING_ID");
+          <%   } else { %>
+            if (!queryParams?.<%= name %>) throw new Error("ERR_MISSING_QUERY_PARAM: <%= name %>");
+          <%   }
+            });
+            
+            // prepare args for the function call
+            const args = paramNames.map(name => (
+              name === 'id' 
+                ? 'message.params.resource.id' 
+                : `queryParams?.${name}`
+            ));
+            if (hasBody) args.push('message.params.body');
+          %>
+
+          return (await this.api!.run<%= upperFirstCase(action) %>(<%= args.join(', ') %>)).data;
+        <% } %>
+      }
+    <% } %>
+  <% }) %>
+}

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

@@ -20,8 +20,9 @@ import {AxiosResponse} from 'axios'
       import * as <%=libs[l].importAs %> from '<%=libs[l].importFrom %>'
   <%}%>
 <%}%>
-// import { JSONSchema7 } from 'json-schema';
 import * as openapi from '../openapi';
+import { CustomFieldDataModeEnum } from "../features/customField/enums/common";
+
 
 export type {
       <%= it.typename%> ,
@@ -57,10 +58,14 @@ export class <%= capitalizeFirstLetter(it.name)%>Client extends SimpleAppClient<
     const apiobj = getDocumentApi('<%=it.name %>')
     super(apiobj,'<%= it.doctype %>','<%=it.name %>')
     this.event=$event
-    this.listen=$listen    
-    this.setNew();      
-
-    this.processCustomField();  
+    this.listen=$listen
+    
+    <% if(it.customField.isEnable) { %>
+      // FLAG::CUSTOM_FIELD
+      this.prepareCustomFieldJsonSchema(); 
+    <% } %>
+     
+    this.setNew();
   }
 
   override setWatchChange = ()=>{
@@ -72,13 +77,15 @@ export class <%= capitalizeFirstLetter(it.name)%>Client extends SimpleAppClient<
       }               
     },{deep:true})
 
-    <% if(!['Plugins', 'Plugininstallations', 'Customfield'].includes(capitalizeFirstLetter(it.name))) { %>
+
+    <% if(it.customField.isEnable) { %>
+      // FLAG::CUSTOM_FIELD
       const { $customFieldStore, $appPluginsStore } = useNuxtApp();
       if (!this._customFieldWatch) {
         this._customFieldWatch = watch(
           [() => $customFieldStore.data, () => $appPluginsStore.installedPlugins],
           ([newCustomField, newPlugins], [oldCustomField, oldPlugins]) => {
-            this.processCustomField();
+            this.prepareCustomFieldJsonSchema();
           },
           { immediate: false, deep: true },
         );
@@ -88,8 +95,19 @@ export class <%= capitalizeFirstLetter(it.name)%>Client extends SimpleAppClient<
   }
 
   override setNew = ()=>{         
-    const newdata = Default<%= it.typename%>(randomUUID())
-    this.setData(newdata)
+    const defaultData = Default<%= it.typename%>(randomUUID())
+    
+    <% if(it.customField.isEnable) { %>
+      // FLAG::CUSTOM_FIELD
+      const data = this.prepareCustomFieldData(
+        CustomFieldDataModeEnum.DEFAULT,
+        defaultData,
+      );
+    <% } else { %>
+      const data = defaultData;
+    <% } %>
+
+    this.setData(data);
     this.setWatchChange()
     return true
   }

package/templates/miniAppJsSdk/src/index.ts.eta

@@ -0,0 +1,28 @@
+/**
+ * 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';
+import { MiniAppBridgeResourceAccessor } from './services/bridge-resource-accessor.service';
+import { MiniAppBridgeMessageNavigate } from './types/bridge.type';
+
+export class SimtrainEcoMiniAppJsSdk extends MiniAppBridgeResourceAccessor {
+  public ui = {
+    navigateTo: (target: string, id?: string, query?: string) => {
+      const message: MiniAppBridgeMessageNavigate = {
+        type: MINI_APP_BRIDGE_MESSAGES.NAVIGATE,
+        params: { target, id, query }
+      };
+
+      window.parent.postMessage(message, '*');
+    }
+  };
+
+  constructor() {
+    super();
+    console.log('Hello from SimtrainEcoMiniAppJsSdk !!!');
+  }
+}