@simitgroup/simpleapp-generator 2.0.1-v-alpha → 2.0.1-x-alpha

package/dist/index2.js

@@ -0,0 +1,118 @@
+#! /usr/bin/env node
+"use strict";
+var _a, _b, _c, _d;
+Object.defineProperty(exports, "__esModule", { value: true });
+const console_1 = require("console");
+const program = require("commander"); // add this line
+const Fieldtypes = require('./type');
+const generator = require('./generate');
+const fs = require('fs');
+const createproject = require('./createproject');
+const { exec } = require("child_process");
+const capitalizeFirstLetter = require('./libs');
+const { Logger, ILogObj } = require("tslog");
+const log = new Logger();
+const figlet = require("figlet");
+// const program = new Command();
+const pj = require('../package.json');
+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 content such as:{"definationsFolder":"./definations", "backendFolder":"./nestproject/src/docs", "frontendFolder":"./nuxt/server"}')
+    // .option("-s, --definations-folder <value>", "load defination files from which folder")
+    // .option("-b, --backend-folder <value>", "Create backend code at which folder")
+    // .option("-f, --frontend-folder <value>", "Create frontend code at which folder")
+    // .option("-i, --openapi3-yaml <value>", 'openapi3.yaml generated by backend server')  
+    .parse(process.argv);
+const options = program.opts();
+console.log(figlet.textSync(`SimpleApp Generator ${version}`));
+// console.log(options)
+let path = '';
+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 console_1.error;
+}
+const configs = require(path);
+console.log("configurations: ", configs);
+const definationsFolder = (_a = configs.definationsFolder) !== null && _a !== void 0 ? _a : options.definationsFolder;
+const backendFolder = (_b = configs.backendFolder) !== null && _b !== void 0 ? _b : options.backendFolder;
+const frontendFolder = (_c = configs.frontendFolder) !== null && _c !== void 0 ? _c : options.frontendFolder;
+const openapi3Yaml = (_d = configs.openapi3Yaml) !== null && _d !== void 0 ? _d : options.openapi3Yaml;
+const runGenNext = async (callback) => {
+    let isnestready = false;
+    if (!fs.existsSync(backendFolder)) {
+        console.log("Nest does not exists, begin install nodejs environment tools: [pnpm, @nestjs/cli, @openapitools/openapi-generator-cli, nuxi]");
+        isnestready = await exec("npm install -g pnpm @nestjs/cli @openapitools/openapi-generator-cli nuxi", async (a, b, c) => {
+            console.log("result of environment tools:", a, b, c);
+            console.log(`Install new nest backend: 'nest new -p pnpm ${backendFolder}'`);
+            return await exec(`nest new -p pnpm ${backendFolder}`, (a, b, c) => {
+                console.log("new nest result", a, b, c);
+                return true;
+            });
+        });
+    }
+    else {
+        isnestready = true;
+    }
+    if (isnestready) {
+        if (!fs.existsSync(`${backendFolder}/.env`)) {
+            log.info(`initial nest configuratoin for simpleapp generator`);
+            await createNest(backendFolder, callback);
+        }
+        else {
+            log.warn(`.env file exists, skip nest initialization`);
+            callback();
+        }
+    }
+    else {
+        log.error('nest not ready, which shouldnot continue');
+        throw console_1.error;
+    }
+};
+const runGenNuxt = async (callback) => {
+    if (!fs.existsSync(frontendFolder)) {
+        log.error(`${frontendFolder} does not exists, please run "npx nuxi@latest init ${frontendFolder}"`);
+    }
+    else if (!fs.existsSync(`${frontendFolder}/.env`)) {
+        log.info(`initial nuxt configuratoin for simpleapp generator`);
+        createNuxt(frontendFolder, callback);
+    }
+    else {
+        log.warn(`.env file exists, skip nuxt initialization`);
+        callback();
+    }
+};
+const generateCode = async () => {
+    await runGenNext(async () => {
+        log.info("runGenNext (backen) done");
+        await runGenNuxt(async () => {
+            log.info("runGenNuxt (frontend) done");
+            generator.initialize(definationsFolder, backendFolder, frontendFolder);
+            exec(`cd ${frontendFolder};npx prettier --write "./pages/**/*.vue" "./simpleapp/**/*" `);
+            exec(`cd ${backendFolder};npx run format `);
+            if (openapi3Yaml != '') {
+                exec(`openapi-generator-cli generate -i ${openapi3Yaml} -o ${frontendFolder}/simpleapp/openapi -g typescript-axios --skip-validate-spec`, (error, stdout, stderr) => {
+                    if (error) {
+                        log.error(stderr);
+                    }
+                });
+            }
+        });
+    });
+};
+log.info("generate code: ");
+generateCode();
+// pnpm exec prettier ./src/docs  --write
+// 	pnpm exec prettier ./apiclients  --write
+//# sourceMappingURL=index2.js.map

package/dist/index2.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index2.js","sourceRoot":"","sources":["../src/index2.ts"],"names":[],"mappings":"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"}

package/dist/installdependency.js

@@ -0,0 +1,20 @@
+#!/bin/bash
+"use strict";
+npm;
+install - g;
+pnpm;
+/cli @openapitools/openapi - generator - cli;
+nuxi;
+nest;
+new  - p;
+pnpm;
+$backendFolder;
+npx;
+nuxi;
+init;
+$;
+{
+    frontendFolder;
+}
+";
+//# sourceMappingURL=installdependency.js.map

package/dist/installdependency.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"installdependency.js","sourceRoot":"","sources":["../src/installdependency.ts"],"names":[],"mappings":";;AACA,GAAG,CAAA;AAAC,OAAO,GAAE,CAAC,CAAA;AAAC,IAAI,CAAA;AAAQ,0BAA0B,GAAC,SAAS,GAAC,GAAG,CAAA;AAAC,IAAI,CAAA;AACxE,IAAI,CAAA;AAAC,IAAI,AAAD,GAAE,CAAC,CAAA;AAAC,IAAI,CAAA;AAAC,cAAc,CAAA;AAC/B,GAAG,CAAA;AAAC,IAAI,CAAA;AAAQ,IAAI,CAAA;AAAC,CAAC,CAAA;AAAA;IAAC,cAAc,CAAA;CAAC;AAAA,CAAC,CAAA"}

package/dist/installnest.js

@@ -0,0 +1,2 @@
+"use strict";
+//# sourceMappingURL=installnest.js.map

package/dist/installnest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"installnest.js","sourceRoot":"","sources":["../src/installnest.ts"],"names":[],"mappings":""}

package/dist/installnuxt.js

@@ -0,0 +1,2 @@
+"use strict";
+//# sourceMappingURL=installnuxt.js.map

package/dist/installnuxt.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"installnuxt.js","sourceRoot":"","sources":["../src/installnuxt.ts"],"names":[],"mappings":""}

package/dist/processors/groupsbuilder.js

@@ -0,0 +1,2 @@
+"use strict";
+//# sourceMappingURL=groupsbuilder.js.map

package/dist/processors/groupsbuilder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"groupsbuilder.js","sourceRoot":"","sources":["../../src/processors/groupsbuilder.ts"],"names":[],"mappings":""}

package/dist/schematype/baseschema.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.baseschema = void 0;
+const type_1 = require("../type");
+exports.baseschema = {
+    'type': 'object',
+    'x-simpleapp-config': {
+        isolationType: type_1.IsolationType.org,
+        schemaType: type_1.SupportedSchemaType.baseschema,
+        documentType: '',
+        documentName: ''
+    },
+    properties: {
+        _id: { type: 'string', description: "system field" },
+        tenantId: { type: 'integer', default: 1, description: "system field" },
+        orgId: { type: 'integer', default: 1, description: "system field" },
+        branchId: { type: 'integer', default: 1, description: "system field" },
+        created: { type: 'string', description: "system field" },
+        updated: { type: 'string', description: "system field" },
+        createdby: { type: 'string', description: "system field" },
+        updatedby: { type: 'string', description: "system field" },
+    },
+    definitions: {}
+};
+//# sourceMappingURL=baseschema.js.map

package/dist/schematype/baseschema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"baseschema.js","sourceRoot":"","sources":["../../src/schematype/baseschema.ts"],"names":[],"mappings":";;;AAAA,kCAAoE;AACvD,QAAA,UAAU,GAAc;IACjC,MAAM,EAAC,QAAQ;IACf,oBAAoB,EAAC;QACnB,aAAa,EAAE,oBAAa,CAAC,GAAG;QAChC,UAAU,EAAE,0BAAmB,CAAC,UAAU;QAC1C,YAAY,EAAE,EAAE;QAChB,YAAY,EAAE,EAAE;KACjB;IACD,UAAU,EAAC;QACP,GAAG,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC,WAAW,EAAC,cAAc,EAAC;QAC9C,QAAQ,EAAC,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,WAAW,EAAC,cAAc,EAAC;QAC9D,KAAK,EAAC,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,WAAW,EAAC,cAAc,EAAC;QAC3D,QAAQ,EAAC,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,WAAW,EAAC,cAAc,EAAC;QAC9D,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC,WAAW,EAAC,cAAc,EAAC;QAClD,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC,WAAW,EAAC,cAAc,EAAC;QAClD,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC,WAAW,EAAC,cAAc,EAAC;QACpD,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC,WAAW,EAAC,cAAc,EAAC;KACvD;IACD,WAAW,EAAC,EAAE;CACf,CAAA"}

package/dist/schematype/default.js

@@ -0,0 +1,2 @@
+"use strict";
+//# sourceMappingURL=default.js.map

package/dist/schematype/default.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"default.js","sourceRoot":"","sources":["../../src/schematype/default.ts"],"names":[],"mappings":""}

package/dist/schematype/index.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transaction = exports.baseschema = exports.primarymasterdata = exports.simplemasterdata = void 0;
+var simplemasterdata_1 = require("./simplemasterdata");
+Object.defineProperty(exports, "simplemasterdata", { enumerable: true, get: function () { return simplemasterdata_1.simplemasterdata; } });
+var primarymasterdata_1 = require("./primarymasterdata");
+Object.defineProperty(exports, "primarymasterdata", { enumerable: true, get: function () { return primarymasterdata_1.primarymasterdata; } });
+var baseschema_1 = require("./baseschema");
+Object.defineProperty(exports, "baseschema", { enumerable: true, get: function () { return baseschema_1.baseschema; } });
+var transaction_1 = require("./transaction");
+Object.defineProperty(exports, "transaction", { enumerable: true, get: function () { return transaction_1.transaction; } });
+//# sourceMappingURL=index.js.map

package/dist/schematype/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/schematype/index.ts"],"names":[],"mappings":";;;AAAA,uDAAmD;AAA3C,oHAAA,gBAAgB,OAAA;AACxB,yDAAqD;AAA7C,sHAAA,iBAAiB,OAAA;AACzB,2CAAuC;AAA/B,wGAAA,UAAU,OAAA;AAClB,6CAAyC;AAAjC,0GAAA,WAAW,OAAA"}

package/dist/schematype/primarymasterdata.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.primarymasterdata = void 0;
+const type_1 = require("../type");
+exports.primarymasterdata = {
+    type: "object",
+    "x-simpleapp-config": {
+        isolationType: type_1.IsolationType.org,
+        pageType: "crud",
+        generateDocumentNumber: true,
+        schemaType: type_1.SupportedSchemaType.primarymasterdata,
+        documentType: '',
+        documentName: '',
+    },
+    properties: {
+        _id: { type: 'string', description: "system field" },
+        tenantId: { type: 'integer', default: 1, description: "system field" },
+        orgId: { type: 'integer', default: 1, description: "system field" },
+        branchId: { type: 'integer', default: 1, description: "system field" },
+        created: { type: 'string', description: "system field" },
+        updated: { type: 'string', description: "system field" },
+        createdby: { type: 'string', description: "system field" },
+        updatedby: { type: 'string', description: "system field" },
+        docNoFormat: {
+            type: "object",
+            "x-foreignkey": "docnoformat",
+            properties: { _id: { "type": "string" }, label: { "type": "string" } },
+            description: "system field"
+        },
+    },
+    definitions: {
+        foreignkey: {
+            type: "object",
+            properties: { _id: { "type": "string" }, label: { "type": "string" }, code: { "type": "string" } }
+        }
+    },
+};
+//# sourceMappingURL=primarymasterdata.js.map

package/dist/schematype/primarymasterdata.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"primarymasterdata.js","sourceRoot":"","sources":["../../src/schematype/primarymasterdata.ts"],"names":[],"mappings":";;;AAAA,kCAAoE;AACvD,QAAA,iBAAiB,GAAc;IACxC,IAAI,EAAC,QAAQ;IACb,oBAAoB,EAAC;QACnB,aAAa,EAAE,oBAAa,CAAC,GAAG;QAChC,QAAQ,EAAC,MAAM;QACf,sBAAsB,EAAC,IAAI;QAC3B,UAAU,EAAE,0BAAmB,CAAC,iBAAiB;QACjD,YAAY,EAAC,EAAE;QACf,YAAY,EAAC,EAAE;KAChB;IACD,UAAU,EAAC;QACP,GAAG,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC,WAAW,EAAC,cAAc,EAAC;QAC9C,QAAQ,EAAC,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,WAAW,EAAC,cAAc,EAAC;QAC9D,KAAK,EAAC,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,WAAW,EAAC,cAAc,EAAC;QAC3D,QAAQ,EAAC,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,WAAW,EAAC,cAAc,EAAC;QAC9D,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC,WAAW,EAAC,cAAc,EAAC;QAClD,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC,WAAW,EAAC,cAAc,EAAC;QAClD,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC,WAAW,EAAC,cAAc,EAAC;QACpD,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC,WAAW,EAAC,cAAc,EAAC;QACpD,WAAW,EAAE;YACX,IAAI,EAAE,QAAQ;YACd,cAAc,EAAC,aAAa;YAC5B,UAAU,EAAE,EAAC,GAAG,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,EAAC,KAAK,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,EAAC;YAC/D,WAAW,EAAC,cAAc;SAC3B;KACH;IACD,WAAW,EAAC;QACX,UAAU,EAAE;YACV,IAAI,EAAC,QAAQ;YACb,UAAU,EAAE,EAAC,GAAG,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,EAAC,KAAK,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,EAAC,IAAI,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,EAAC;SACzF;KACF;CACF,CAAA"}

package/dist/schematype/simple.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.simpleschema = void 0;
+exports.simpleschema = {
+    'type': 'object',
+    'x-simpleapp-config': {
+        isolationType: 'org',
+        schemaType: 'simple',
+        documentType: '',
+        documentName: '',
+        foreignKeys: {}
+    },
+    "properties": {
+        _id: { type: 'string' },
+        tenantId: { type: 'integer', default: 1 },
+        orgId: { type: 'integer', default: 1 },
+        branchId: { type: 'integer', default: 1 },
+        created: { type: 'string' },
+        updated: { type: 'string' },
+        createdby: { type: 'string' },
+        updatedby: { type: 'string' },
+    }
+};
+//# sourceMappingURL=simple.js.map

package/dist/schematype/simple.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"simple.js","sourceRoot":"","sources":["../../src/schematype/simple.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG;IACxB,MAAM,EAAC,QAAQ;IACf,oBAAoB,EAAC;QACnB,aAAa,EAAE,KAAK;QACpB,UAAU,EAAE,QAAQ;QACpB,YAAY,EAAE,EAAE;QAChB,YAAY,EAAE,EAAE;QAChB,WAAW,EAAC,EAAE;KACf;IACD,YAAY,EAAC;QACT,GAAG,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACnB,QAAQ,EAAC,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC;QACnC,KAAK,EAAC,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC;QAChC,QAAQ,EAAC,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC;QACnC,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACvB,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACvB,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACzB,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;KAC5B;CACF,CAAA"}

package/dist/schematype/simplemasterdata.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.simplemasterdata = void 0;
+const type_1 = require("../type");
+exports.simplemasterdata = {
+    type: "object",
+    "x-simpleapp-config": {
+        isolationType: type_1.IsolationType.org,
+        pageType: "crud",
+        schemaType: type_1.SupportedSchemaType.simplemasterdata,
+        documentType: '',
+        documentName: '',
+    },
+    properties: {
+        _id: { type: 'string' },
+        tenantId: { type: 'integer', default: 1, description: "system field" },
+        orgId: { type: 'integer', default: 1, description: "system field" },
+        branchId: { type: 'integer', default: 1, description: "system field" },
+        created: { type: 'string', description: "system field" },
+        updated: { type: 'string', description: "system field" },
+        createdby: { type: 'string', description: "system field" },
+        updatedby: { type: 'string', description: "system field" },
+    },
+    definitions: {
+        foreignkey: {
+            type: "object",
+            properties: { _id: { "type": "string" }, label: { "type": "string" }, code: { "type": "string" } }
+        }
+    },
+};
+//# sourceMappingURL=simplemasterdata.js.map

package/dist/schematype/simplemasterdata.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"simplemasterdata.js","sourceRoot":"","sources":["../../src/schematype/simplemasterdata.ts"],"names":[],"mappings":";;;AAAA,kCAAoE;AACvD,QAAA,gBAAgB,GAAc;IACvC,IAAI,EAAC,QAAQ;IACb,oBAAoB,EAAC;QACnB,aAAa,EAAE,oBAAa,CAAC,GAAG;QAChC,QAAQ,EAAC,MAAM;QACf,UAAU,EAAE,0BAAmB,CAAC,gBAAgB;QAChD,YAAY,EAAC,EAAE;QACf,YAAY,EAAC,EAAE;KAChB;IACD,UAAU,EAAC;QACP,GAAG,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACnB,QAAQ,EAAC,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,WAAW,EAAC,cAAc,EAAC;QAC9D,KAAK,EAAC,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,WAAW,EAAC,cAAc,EAAC;QAC3D,QAAQ,EAAC,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,WAAW,EAAC,cAAc,EAAC;QAC9D,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC,WAAW,EAAC,cAAc,EAAC;QAClD,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC,WAAW,EAAC,cAAc,EAAC;QAClD,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC,WAAW,EAAC,cAAc,EAAC;QACpD,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC,WAAW,EAAC,cAAc,EAAC;KACtD;IACD,WAAW,EAAC;QACX,UAAU,EAAE;YACV,IAAI,EAAC,QAAQ;YACb,UAAU,EAAE,EAAC,GAAG,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,EAAC,KAAK,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,EAAC,IAAI,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,EAAC;SACzF;KACF;CACF,CAAA"}

package/dist/schematype/transaction.js

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transaction = void 0;
+const type_1 = require("../type");
+exports.transaction = {
+    type: "object",
+    "x-simpleapp-config": {
+        isolationType: type_1.IsolationType.org,
+        requiredRoles: [],
+        documentType: '',
+        documentName: '',
+        pageType: "crud",
+        uniqueKey: "documentNo",
+        documentTitle: "documentTitle",
+        generateDocumentNumber: true,
+        documentDate: "documentDate",
+        allStatus: [
+            { "status": "D", statusName: "Draft", "readOnly": true, "actions": ["confirm", "void"] },
+            { "status": "CO", statusName: "Confirmed", "readOnly": true, "actions": ["revert", "void"] },
+            { "status": "V", statusName: "Void", "readOnly": true, "actions": ["revert"] },
+        ],
+        additionalApis: [{
+                action: "confirm",
+                entrypoint: ":id/confirm",
+                requiredrole: [],
+                method: type_1.RESTMethods.post,
+                execute: "setDocumentStatus",
+                description: "confirm document and change status to CO"
+            }, {
+                action: "void",
+                entrypoint: ":id/void",
+                querypara: ["reason"],
+                requiredrole: [],
+                method: type_1.RESTMethods.post,
+                execute: "setDocumentStatus",
+                description: "confirm document and change status to V"
+            }, {
+                action: "revert",
+                entrypoint: ":id/revert",
+                requiredrole: [],
+                method: type_1.RESTMethods.post,
+                execute: "setDocumentStatus",
+                description: "revert document and change status to D"
+            }],
+        // simple => pure model and service(no page,api),
+        // default => force masterdata property,  
+        // transaction => force masterdata property
+        schemaType: type_1.SupportedSchemaType.transaction,
+    },
+    properties: {
+        _id: { type: 'string', description: "system field" },
+        tenantId: { type: 'integer', default: 1, description: "system field" },
+        orgId: { type: 'integer', default: 1, description: "system field" },
+        branchId: { type: 'integer', default: 1, description: "system field" },
+        created: { type: 'string', description: "system field" },
+        updated: { type: 'string', description: "system field" },
+        createdby: { type: 'string', description: "system field" },
+        updatedby: { type: 'string', description: "system field" },
+        docNoFormat: {
+            type: "object",
+            "x-foreignkey": "docnoformat",
+            properties: { _id: { "type": "string" }, label: { "type": "string" } },
+            description: "system field"
+        },
+        docStatus: { type: "string", description: "system field" }
+    },
+    definitions: {
+        foreignkey: {
+            type: "object",
+            properties: { _id: { "type": "string" }, label: { "type": "string" }, code: { "type": "string" } }
+        }
+    },
+};
+//# sourceMappingURL=transaction.js.map

package/dist/schematype/transaction.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../src/schematype/transaction.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/templates/nest/src/simple-app/_core/features/cron/cron-system/cron-system.service.ts.eta

@@ -15,25 +15,25 @@ export class CronSystemService extends SimpleAppCronBaseClass {
     super(robotUserService);
   }
 
-  @Cron('0 1 * * *')
+  //@Cron('0 1 * * *')
   async deleteApiLog() {
-    if (process.env.ON_CRONTAB == 'true') {
-      this.logger.debug('run CronSystemService.deleteApiLog 0 1 * * *')
+    //if (process.env.ON_CRONTAB == 'true') {
+      this.logger.debug('run CronSystemService.deleteApiLog')
       const today = new Date();
       const newDate = new Date(today.getTime());
       const cutoffdate = new Date(newDate.setDate(newDate.getDate() - 90)).toISOString();
       await this.apiEventModel.deleteMany({ created: { $lte: cutoffdate } });
-    }
+    //}
   }
 
-  @Cron('30 0 * * *')
+  //@Cron('30 0 * * *')
   async deleteQueueJob() {
-    if (process.env.ON_CRONTAB == 'true') {
-      this.logger.debug('run deleteQueueJob.deleteApiLog 30 0 * * *')
+    //if (process.env.ON_CRONTAB == 'true') {
+      this.logger.debug('run deleteQueueJob.deleteApiLog')
       const today = new Date();
       const newDate = new Date(today.getTime());
       const cutoffdate = new Date(newDate.setDate(newDate.getDate() - 90)).toISOString();
       await this.queueJobModel.deleteMany({ created: { $lte: cutoffdate } });
-    }
+    //}
   }
 }

package/templates/nest/src/simple-app/_core/features/queue/queue-option.ts.eta

@@ -0,0 +1,16 @@
+import { DefaultJobOptions } from 'bullmq';
+export const getDefaultQueueOption = ():DefaultJobOptions => ({
+  attempts: 1,
+  backoff: {
+    type: 'exponential',
+    delay: 3000,
+  },
+  delay: 1000,
+  removeOnComplete: {
+    age: 90 * 24 * 60 * 60, // 7,776,000 seconds (90 days)
+    count: 3000,
+  },
+  removeOnFail: {
+    count: 1000,
+  },
+})

package/templates/nest/src/simple-app/_core/framework/base/simple-app.service.ts.eta

@@ -286,27 +286,24 @@ export class SimpleAppService<T extends SchemaFields> {
 
   async fullTextSearch(appuser: UserContext, body: TextSearchBody) {
     try {
+      //{filters:string[],fields:string[]}
       const isolationFilter = { ...this.getIsolationFilter(appuser) };
       this.polishIsolationFilter(isolationFilter);
       const keyword = body.keyword;
-
+      // console.log("bodybody",body)
       // Prepare regex filter
       const orConditions: any[] = [];
-      if (body.fields && body.fields.length > 0) {
-        body.fields.forEach((field: string) => {
-          if (field != 'defaultPrice' && field != 'amount' && field != 'active' && field != 'updated') {
+      const regex = new RegExp(keyword, 'i')
+
+      if (body.filters && body.filters.length > 0) {
+        body.filters.forEach((field: string) => {        
             orConditions.push({
-              [field]: { $regex: keyword, $options: 'i' },
-            });
-          } else {
-            if (!isNaN(Number(keyword)) && (field == 'defaultPrice' || field == 'amount')) {
-              orConditions.push({
-                [field]: { $gte: keyword },
-              });
-            }
-          }
+              [field]: { $regex: regex },
+            });          
         });
       }
+
+
       const filter = {
         $or: orConditions,
       };
@@ -318,7 +315,7 @@ export class SimpleAppService<T extends SchemaFields> {
 
       const fields = body.fields || {};
       const sorts = body.sorts || {};
-
+      // console.log("newfilters",JSON.stringify(newfilters),fields)
       // Ensure `this.doc` is a Mongoose model or similar
       const results = await this.doc.find(newfilters, fields).sort(sorts).exec();
 
@@ -499,7 +496,7 @@ export class SimpleAppService<T extends SchemaFields> {
         errormsg.push(this.errorlist[i].message);
       }
 
-      throw new BadRequestException('Before validation hook failed', errormsg as HttpExceptionOptions);
+      throw new BadRequestException(errormsg as HttpExceptionOptions, 'Before validation hook failed');
     }
 
     let validate;
@@ -513,7 +510,7 @@ export class SimpleAppService<T extends SchemaFields> {
     if (!valid) {
       this.logger.error(JSON.stringify(data));
       this.logger.error(JSON.stringify(validate.errors), 'validate errors:');
-      throw new BadRequestException('Data validation failed', validate.errors as HttpExceptionOptions);
+      throw new BadRequestException(validate.errors as HttpExceptionOptions, 'Data validation failed');
     }
   }
 
@@ -1089,7 +1086,7 @@ export class SimpleAppService<T extends SchemaFields> {
 
     if (!unionresult) {
       this.logger.error('foreign key control failed ', 'identifyForeignKeys');
-      throw new InternalServerErrorException('Foreignkey check execution error', pipelines as HttpExceptionOptions);
+      throw new InternalServerErrorException(pipelines as HttpExceptionOptions, 'Foreignkey check execution error');
     } else {
       const searchresult: any = {};
       unionresult.forEach((item) => {
@@ -1099,7 +1096,7 @@ export class SimpleAppService<T extends SchemaFields> {
           searchresult[item.collection] = [item._id];
         }
       });
-      this.logger.debug(unionresult, this.documentType + ' search Result');
+      this.logger.debug(this.documentType + ' search Result', unionresult);
 
       //search is it all foreign key exists in db
       for (let i = 0; i < collections.length; i++) {

package/templates/nest/src/simple-app/_core/framework/schemas/simple-app.schema.ts.eta

@@ -143,6 +143,7 @@ export class DynamicParam {
 export class TextSearchBody {
   keyword: string;
   fields?: string[];
+  filters?: string[];
   sorts?: string[][];
   lookup?: Record<string, string>;
 }