oak-domain 3.0.2 → 3.0.4

package/lib/compiler/env.js

@@ -1,35 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAK_EXTERNAL_LIBS_FILEPATH = exports.SYSTEM_RESERVE_ENTITIES = exports.INT_LITERL_DEFAULT_WIDTH = exports.NUMERICAL_LITERL_DEFAULT_SCALE = exports.NUMERICAL_LITERL_DEFAULT_PRECISION = exports.STRING_LITERAL_MAX_LENGTH = exports.ENTITY_NAME_MAX_LENGTH = exports.RESERVED_ENTITY_NAMES = exports.ACTION_CONSTANT_IN_OAK_DOMAIN = exports.TYPE_PATH_IN_OAK_DOMAIN = exports.ENTITY_PATH_IN_OAK_DOMAIN = exports.ENTITY_PATH_IN_OAK_GENERAL_BUSINESS = exports.LIB_PATH = exports.LIB_OAK_DOMAIN = void 0;
-var tslib_1 = require("tslib");
-var path_1 = tslib_1.__importDefault(require("path"));
+const tslib_1 = require("tslib");
+const path_1 = tslib_1.__importDefault(require("path"));
 exports.LIB_OAK_DOMAIN = 'oak-domain';
-var LIB_OAK_GENERAL_BUSINESS = 'oak-general-business';
-var LIB_PATH = function () { return 'lib'; };
+const LIB_OAK_GENERAL_BUSINESS = 'oak-general-business';
+const LIB_PATH = () => 'lib';
 exports.LIB_PATH = LIB_PATH;
-var LEVEL_PREFIX = ['.', '..', '../..', '../../..', '../../../..'];
-var ENTITY_PATH_IN_OAK_GENERAL_BUSINESS = function () {
-    return "".concat(LIB_OAK_GENERAL_BUSINESS, "/").concat((0, exports.LIB_PATH)(), "/entities/");
+const LEVEL_PREFIX = ['.', '..', '../..', '../../..', '../../../..'];
+const ENTITY_PATH_IN_OAK_GENERAL_BUSINESS = () => {
+    return `${LIB_OAK_GENERAL_BUSINESS}/${(0, exports.LIB_PATH)()}/entities/`;
 };
 exports.ENTITY_PATH_IN_OAK_GENERAL_BUSINESS = ENTITY_PATH_IN_OAK_GENERAL_BUSINESS;
-var ENTITY_PATH_IN_OAK_DOMAIN = function () {
-    return "".concat(exports.LIB_OAK_DOMAIN, "/").concat((0, exports.LIB_PATH)(), "/entities/");
+const ENTITY_PATH_IN_OAK_DOMAIN = () => {
+    return `${exports.LIB_OAK_DOMAIN}/${(0, exports.LIB_PATH)()}/entities/`;
 };
 exports.ENTITY_PATH_IN_OAK_DOMAIN = ENTITY_PATH_IN_OAK_DOMAIN;
-var TYPE_PATH_IN_OAK_DOMAIN = function (level) {
-    if (level === void 0) { level = 2; }
+const TYPE_PATH_IN_OAK_DOMAIN = (level = 2) => {
     if (process.env.COMPLING_IN_DOMAIN) {
-        return "".concat(LEVEL_PREFIX[level], "/types/");
+        return `${LEVEL_PREFIX[level]}/types/`;
     }
-    return "".concat(exports.LIB_OAK_DOMAIN, "/").concat((0, exports.LIB_PATH)(), "/types/");
+    return `${exports.LIB_OAK_DOMAIN}/${(0, exports.LIB_PATH)()}/types/`;
 };
 exports.TYPE_PATH_IN_OAK_DOMAIN = TYPE_PATH_IN_OAK_DOMAIN;
-var ACTION_CONSTANT_IN_OAK_DOMAIN = function (level) {
-    if (level === void 0) { level = 2; }
+const ACTION_CONSTANT_IN_OAK_DOMAIN = (level = 2) => {
     if (process.env.COMPLING_IN_DOMAIN) {
-        return "".concat(LEVEL_PREFIX[level], "/actions/action");
+        return `${LEVEL_PREFIX[level]}/actions/action`;
     }
-    return "".concat(exports.LIB_OAK_DOMAIN, "/").concat((0, exports.LIB_PATH)(), "/actions/action");
+    return `${exports.LIB_OAK_DOMAIN}/${(0, exports.LIB_PATH)()}/actions/action`;
 };
 exports.ACTION_CONSTANT_IN_OAK_DOMAIN = ACTION_CONSTANT_IN_OAK_DOMAIN;
 // export const OUTPUT_PATH = 'app-domain/entities';
@@ -44,7 +42,7 @@ exports.INT_LITERL_DEFAULT_WIDTH = 4;
 exports.SYSTEM_RESERVE_ENTITIES = ['user', 'relation', 'oper', 'operEntity', 'modi', 'modiEntity',
     'userRelation', 'actionAuth', 'relationAuth', 'relation', 'userEntityGrant', 'i18n'];
 // 项目依赖的第三方oak lib配置文件所在的固定路径
-var OAK_EXTERNAL_LIBS_FILEPATH = function (path) {
+const OAK_EXTERNAL_LIBS_FILEPATH = (path) => {
     return path_1.default.join(path, 'config/oakExternalLib.json');
 };
 exports.OAK_EXTERNAL_LIBS_FILEPATH = OAK_EXTERNAL_LIBS_FILEPATH;

package/lib/compiler/localeBuilder.js

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var assert_1 = tslib_1.__importDefault(require("assert"));
-var ts = tslib_1.__importStar(require("typescript"));
-var factory = ts.factory;
-var path_1 = require("path");
-var crypto_1 = require("crypto");
-var fs_1 = tslib_1.__importDefault(require("fs"));
-var env_1 = require("./env");
-var string_1 = require("../utils/string");
+const tslib_1 = require("tslib");
+const assert_1 = tslib_1.__importDefault(require("assert"));
+const ts = tslib_1.__importStar(require("typescript"));
+const { factory } = ts;
+const path_1 = require("path");
+const crypto_1 = require("crypto");
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const env_1 = require("./env");
+const string_1 = require("../utils/string");
 /**
  * 将一个object展开编译为一棵语法树，只有string和object两种键值对象
  * @param data
  */
 function transferObjectToObjectLiteral(data) {
-    return factory.createObjectLiteralExpression(Object.keys(data).map(function (k) {
-        var type = typeof data[k];
+    return factory.createObjectLiteralExpression(Object.keys(data).map((k) => {
+        const type = typeof data[k];
         if (type === 'string') {
             return factory.createPropertyAssignment(factory.createStringLiteral(k), factory.createStringLiteral(data[k]));
         }
@@ -26,12 +26,17 @@ function transferObjectToObjectLiteral(data) {
 /**
  * 这个类的作用是把项目和所有相关的模块下的locales编译成为src/data/i18n中的数据
  */
-var LocaleBuilder = /** @class */ (function () {
-    function LocaleBuilder(asLib) {
-        var pwd = process.cwd();
+class LocaleBuilder {
+    asLib;
+    dependencies;
+    pwd;
+    locales; // key: namespace, value: [module, position, language, data]
+    hash;
+    constructor(asLib) {
+        const pwd = process.cwd();
         this.pwd = pwd;
         this.asLib = !!asLib;
-        var dependencyFile = (0, env_1.OAK_EXTERNAL_LIBS_FILEPATH)((0, path_1.join)(pwd, 'src'));
+        const dependencyFile = (0, env_1.OAK_EXTERNAL_LIBS_FILEPATH)((0, path_1.join)(pwd, 'src'));
         if (fs_1.default.existsSync(dependencyFile)) {
             this.dependencies = require(dependencyFile);
         }
@@ -45,20 +50,19 @@ var LocaleBuilder = /** @class */ (function () {
      * 将locales输出成为data/i18n.ts中的数据
      * 如果有Dependency需要引出来
      */
-    LocaleBuilder.prototype.outputDataFile = function () {
-        var _this = this;
-        var statements = [
-            factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, factory.createIdentifier("CreateOperationData"), factory.createIdentifier("I18n"))])), factory.createStringLiteral("../oak-app-domain/I18n/Schema"), undefined)
+    outputDataFile() {
+        const statements = [
+            factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, factory.createIdentifier("CreateOperationData"), factory.createIdentifier("I18n"))])), factory.createStringLiteral("../oak-app-domain/I18n/Schema"), undefined)
         ];
         if (this.dependencies) {
-            this.dependencies.forEach(function (ele, idx) { return statements.push(factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, factory.createIdentifier("i18ns".concat(idx)), undefined), factory.createStringLiteral("".concat(ele, "/lib/data/i18n")), undefined)); });
+            this.dependencies.forEach((ele, idx) => statements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, factory.createIdentifier(`i18ns${idx}`), undefined), factory.createStringLiteral(`${ele}/lib/data/i18n`), undefined)));
         }
-        statements.push(factory.createVariableStatement(undefined, factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("i18ns"), undefined, factory.createArrayTypeNode(factory.createTypeReferenceNode(factory.createIdentifier("I18n"), undefined)), factory.createArrayLiteralExpression(Object.keys(this.locales).map(function (k) {
-                var _a = tslib_1.__read(_this.locales[k], 4), module = _a[0], position = _a[1], language = _a[2], data = _a[3];
+        statements.push(factory.createVariableStatement(undefined, factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("i18ns"), undefined, factory.createArrayTypeNode(factory.createTypeReferenceNode(factory.createIdentifier("I18n"), undefined)), factory.createArrayLiteralExpression(Object.keys(this.locales).map((k) => {
+                const [module, position, language, data] = this.locales[k];
                 // 用哈希计算来保证id唯一性
-                var h = _this.hash.copy();
-                h.update("".concat(k, "-").concat(language));
-                var id = h.digest('hex');
+                const h = this.hash.copy();
+                h.update(`${k}-${language}`);
+                const id = h.digest('hex');
                 (0, assert_1.default)(id.length <= 36);
                 return factory.createObjectLiteralExpression([
                     factory.createPropertyAssignment(factory.createIdentifier("id"), factory.createStringLiteral(id)),
@@ -70,83 +74,84 @@ var LocaleBuilder = /** @class */ (function () {
                 ], true);
             }), true))], ts.NodeFlags.Const)));
         if (this.dependencies.length > 0) {
-            statements.push(factory.createExportAssignment(undefined, undefined, undefined, factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("i18ns"), factory.createIdentifier("concat")), undefined, this.dependencies.map(function (ele, idx) { return factory.createIdentifier("i18ns".concat(idx)); }))));
+            statements.push(factory.createExportAssignment(undefined, undefined, factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("i18ns"), factory.createIdentifier("concat")), undefined, this.dependencies.map((ele, idx) => factory.createIdentifier(`i18ns${idx}`)))));
         }
         else {
-            statements.push(factory.createExportAssignment(undefined, undefined, undefined, factory.createIdentifier("i18ns")));
+            statements.push(factory.createExportAssignment(undefined, undefined, factory.createIdentifier("i18ns")));
         }
-        var printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
-        var result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(statements), ts.createSourceFile("someFileName.ts", "", ts.ScriptTarget.Latest, false, ts.ScriptKind.TS));
-        var filename = (0, path_1.join)(this.pwd, 'src', 'data', 'i18n.ts');
-        var result2 = (0, string_1.unescapeUnicode)("// \u672C\u6587\u4EF6\u4E3A\u81EA\u52A8\u7F16\u8BD1\u4EA7\u751F\uFF0C\u8BF7\u52FF\u76F4\u63A5\u4FEE\u6539\n\n".concat(result));
+        const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
+        const result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(statements), ts.createSourceFile("someFileName.ts", "", ts.ScriptTarget.Latest, false, ts.ScriptKind.TS));
+        const filename = (0, path_1.join)(this.pwd, 'src', 'data', 'i18n.ts');
+        const result2 = (0, string_1.unescapeUnicode)(`// 本文件为自动编译产生，请勿直接修改\n\n${result}`);
         fs_1.default.writeFileSync(filename, result2, { flag: 'w' });
-    };
-    LocaleBuilder.prototype.parseFile = function (module, namespace, position, filename, filepath, watch) {
-        var _this = this;
-        var language = (filename.split('.')[0]).replace('_', '-'); // 历史原因，会命名成zh_CN.json
-        var data = require(filepath);
-        var ns = module ? "".concat(module, "-").concat(namespace) : (0, string_1.firstLetterLowerCase)(namespace);
+    }
+    parseFile(module, namespace, position, filename, filepath, watch) {
+        const language = (filename.split('.')[0]).replace('_', '-'); // 历史原因，会命名成zh_CN.json
+        const data = require(filepath);
+        const ns = module ? `${module}-${namespace}` : (0, string_1.firstLetterLowerCase)(namespace);
         this.locales[ns] = [module, position.replace(/\\/g, '/'), language, data];
         if (watch) {
-            fs_1.default.watch(filepath, function () {
-                var data = require(filepath);
-                _this.locales[ns] = [module, position.replace(/\\/g, '/'), language, data];
-                _this.outputDataFile();
+            fs_1.default.watch(filepath, () => {
+                const data = require(filepath);
+                this.locales[ns] = [module, position.replace(/\\/g, '/'), language, data];
+                this.outputDataFile();
             });
         }
-    };
-    LocaleBuilder.prototype.traverse = function (module, nsPrefix, position, dirPath, inLocale, localeFolderName, watch) {
-        var _this = this;
-        var files = fs_1.default.readdirSync(dirPath);
-        files.forEach(function (file) {
-            var filepath = (0, path_1.join)(dirPath, file);
-            var stat = fs_1.default.statSync(filepath);
+    }
+    traverse(module, nsPrefix, position, dirPath, inLocale, localeFolderName, watch) {
+        const files = fs_1.default.readdirSync(dirPath);
+        files.forEach((file) => {
+            const filepath = (0, path_1.join)(dirPath, file);
+            const stat = fs_1.default.statSync(filepath);
             if (stat.isFile() && inLocale && file.endsWith('.json')) {
-                _this.parseFile(module, nsPrefix, position, file, filepath, watch);
+                this.parseFile(module, nsPrefix, position, file, filepath, watch);
             }
             else if (stat.isDirectory() && !inLocale) {
-                var nsPrefix2 = nsPrefix ? "".concat(nsPrefix, "-").concat(file) : file;
-                var isLocaleFolder = file === localeFolderName;
-                _this.traverse(module, isLocaleFolder ? nsPrefix : nsPrefix2, isLocaleFolder ? position : (0, path_1.join)(position, file), (0, path_1.join)(dirPath, file), isLocaleFolder, localeFolderName, watch);
+                const nsPrefix2 = nsPrefix ? `${nsPrefix}-${file}` : file;
+                const isLocaleFolder = file === localeFolderName;
+                this.traverse(module, isLocaleFolder ? nsPrefix : nsPrefix2, isLocaleFolder ? position : (0, path_1.join)(position, file), (0, path_1.join)(dirPath, file), isLocaleFolder, localeFolderName, watch);
             }
         });
-    };
-    LocaleBuilder.prototype.buildproject = function (root, src, watch) {
-        var _this = this;
-        var packageJson = (0, path_1.join)(root, 'package.json');
-        var name = require(packageJson).name;
-        var pagePath = (0, path_1.join)(src ? 'src' : 'lib', 'pages');
-        this.traverse(name, 'p', pagePath, (0, path_1.join)(root, pagePath), false, 'locales', watch);
-        var componentPath = (0, path_1.join)(src ? 'src' : 'lib', 'components');
-        this.traverse(name, 'c', componentPath, (0, path_1.join)(root, componentPath), false, 'locales', watch);
-        var localePath = (0, path_1.join)(root, src ? 'src' : 'lib', 'locales');
+    }
+    buildproject(root, src, watch) {
+        const packageJson = (0, path_1.join)(root, 'package.json');
+        const { name } = require(packageJson);
+        const pagePath = (0, path_1.join)(src ? 'src' : 'lib', 'pages');
+        if (fs_1.default.existsSync(pagePath)) {
+            this.traverse(name, 'p', pagePath, (0, path_1.join)(root, pagePath), false, 'locales', watch);
+        }
+        const componentPath = (0, path_1.join)(src ? 'src' : 'lib', 'components');
+        if (fs_1.default.existsSync(componentPath)) {
+            this.traverse(name, 'c', componentPath, (0, path_1.join)(root, componentPath), false, 'locales', watch);
+        }
+        const localePath = (0, path_1.join)(root, src ? 'src' : 'lib', 'locales');
         if (fs_1.default.existsSync(localePath)) {
-            var files = fs_1.default.readdirSync(localePath);
-            files.forEach(function (file) {
-                var filepath = (0, path_1.join)(localePath, file);
-                var stat = fs_1.default.statSync(filepath);
+            const files = fs_1.default.readdirSync(localePath);
+            files.forEach((file) => {
+                const filepath = (0, path_1.join)(localePath, file);
+                const stat = fs_1.default.statSync(filepath);
                 if (stat.isDirectory()) {
-                    _this.traverse(name, "l-".concat(file), (0, path_1.join)('locales', file), (0, path_1.join)(localePath, file), true, file, watch);
+                    this.traverse(name, `l-${file}`, (0, path_1.join)('locales', file), (0, path_1.join)(localePath, file), true, file, watch);
                 }
             });
         }
         if (!this.asLib && src) {
             // 不是lib的话将oak-app-domain中的对象的locale也收集起来
-            var domainPath = (0, path_1.join)(root, 'src', 'oak-app-domain');
+            const domainPath = (0, path_1.join)(root, 'src', 'oak-app-domain');
             if (fs_1.default.existsSync(domainPath)) {
                 this.traverse('', '', 'oak-app-domain', domainPath, false, 'locales', watch);
             }
             // 还有web和wechatMp的目录            
-            var webSrcPath = (0, path_1.join)('web', 'src');
+            const webSrcPath = (0, path_1.join)('web', 'src');
             this.traverse(name, 'w', webSrcPath, (0, path_1.join)(root, webSrcPath), false, 'locales', watch);
             // 小程序可能有多于一个，按规范用wechatMp, wechatMp2这样命名
-            var wechatMpSrcPath = (0, path_1.join)('wechatMp', 'src');
+            const wechatMpSrcPath = (0, path_1.join)('wechatMp', 'src');
             this.traverse(name, 'wmp', wechatMpSrcPath, (0, path_1.join)(root, webSrcPath), false, 'locales', watch);
-            var iter = 1;
+            let iter = 1;
             while (true) {
-                var mpSrcPath = "".concat(wechatMpSrcPath).concat(iter);
+                const mpSrcPath = `${wechatMpSrcPath}${iter}`;
                 if (fs_1.default.existsSync((0, path_1.join)(root, mpSrcPath))) {
-                    this.traverse(name, "wmp".concat(iter), mpSrcPath, (0, path_1.join)(root, mpSrcPath), false, 'locales', watch);
+                    this.traverse(name, `wmp${iter}`, mpSrcPath, (0, path_1.join)(root, mpSrcPath), false, 'locales', watch);
                     iter++;
                 }
                 else {
@@ -154,16 +159,15 @@ var LocaleBuilder = /** @class */ (function () {
                 }
             }
         }
-    };
-    LocaleBuilder.prototype.build = function (watch) {
+    }
+    build(watch) {
         this.buildproject(this.pwd, true, watch);
         if (!this.asLib) {
             // 如果不是lib，把front里的数据也处理掉
-            var fbPath = (0, path_1.join)(this.pwd, 'node_modules', 'oak-frontend-base');
+            const fbPath = (0, path_1.join)(this.pwd, 'node_modules', 'oak-frontend-base');
             this.buildproject(fbPath, false, watch);
         }
         this.outputDataFile();
-    };
-    return LocaleBuilder;
-}());
+    }
+}
 exports.default = LocaleBuilder;

package/lib/compiler/schemalBuilder.d.ts

@@ -1,11 +1,27 @@
+/**
+ * 此函数不再使用
+ * @param map
+ */
 export declare function registerIgnoredForeignKeyMap(map: Record<string, string[]>): void;
+/**
+ * 此函数不再使用
+ * @param map
+ */
 export declare function registerFreeEntities(selectFreeEntities?: string[], createFreeEntities?: string[], updateFreeEntities?: string[]): void;
+/**
+ * 此函数不再使用
+ * @param map
+ */
 export declare function registerIgnoredRelationPathMap(map: Record<string, string[]>): void;
 /**
  * 很多路径虽然最后指向同一对象，但不能封掉，封了会导致查询的时候找不到对应的路径path
  * @param map
  */
 export declare function registerFixedDestinationPathMap(map: Record<string, string[]>): void;
+/**
+ * 此函数不再使用
+ * @param map
+ */
 export declare function registerDeducedRelationMap(map: Record<string, string>): void;
 export declare function analyzeEntities(inputDir: string, relativePath?: string): void;
 export declare function buildSchema(outputDir: string): void;