oak-domain 4.0.2 → 4.0.3

package/lib/compiler/localeBuilder.d.ts

@@ -1,27 +1,27 @@
-/// <reference types="node" />
-import { Hash } from 'crypto';
-/**
- * 这个类的作用是把项目和所有相关的模块下的locales编译成为src/data/i18n中的数据
- */
-export default class LocaleBuilder {
-    asLib: boolean;
-    dependencies: string[];
-    pwd: string;
-    locales: Record<string, [string, string, string, object]>;
-    hash: Hash;
-    constructor(asLib?: boolean);
-    /**
-     * 将locales输出成为data/i18n.ts中的数据
-     * 如果有Dependency需要引出来
-     */
-    private outputDataFile;
-    /**
-     * 这里不能直接用require, webpack貌似有缓存
-     * @param filepath
-     */
-    private readLocaleFileContent;
-    private parseFile;
-    private traverse;
-    private buildproject;
-    build(watch?: boolean): void;
-}
+/// <reference types="node" />
+import { Hash } from 'crypto';
+/**
+ * 这个类的作用是把项目和所有相关的模块下的locales编译成为src/data/i18n中的数据
+ */
+export default class LocaleBuilder {
+    asLib: boolean;
+    dependencies: string[];
+    pwd: string;
+    locales: Record<string, [string, string, string, object]>;
+    hash: Hash;
+    constructor(asLib?: boolean);
+    /**
+     * 将locales输出成为data/i18n.ts中的数据
+     * 如果有Dependency需要引出来
+     */
+    private outputDataFile;
+    /**
+     * 这里不能直接用require, webpack貌似有缓存
+     * @param filepath
+     */
+    private readLocaleFileContent;
+    private parseFile;
+    private traverse;
+    private buildProject;
+    build(watch?: boolean): void;
+}

package/lib/compiler/localeBuilder.js

@@ -153,18 +153,20 @@ class LocaleBuilder {
             }
         });
     }
-    buildproject(root, src, watch) {
+    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 pagePath = (0, path_1.join)(src ? 'src' : 'es', 'pages');
+        const pageAbsolutePath = (0, path_1.join)(root, pagePath); //编译i18时font中的componentPath缺少根目录导致编译不出
+        if (fs_1.default.existsSync(pageAbsolutePath)) {
+            this.traverse(name, 'p', pagePath, pageAbsolutePath, 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 componentPath = (0, path_1.join)(src ? 'src' : 'es', 'components');
+        const componentAbsolutePath = (0, path_1.join)(root, componentPath);
+        if (fs_1.default.existsSync(componentAbsolutePath)) {
+            this.traverse(name, 'c', componentPath, componentAbsolutePath, false, 'locales', watch);
         }
-        const localePath = (0, path_1.join)(root, src ? 'src' : 'lib', 'locales');
+        const localePath = (0, path_1.join)(root, src ? 'src' : 'es', 'locales');
         if (fs_1.default.existsSync(localePath)) {
             const files = fs_1.default.readdirSync(localePath);
             files.forEach((file) => {
@@ -201,11 +203,11 @@ class LocaleBuilder {
         }
     }
     build(watch) {
-        this.buildproject(this.pwd, true, watch);
+        this.buildProject(this.pwd, true, watch);
         if (!this.asLib) {
             // 如果不是lib，把front里的数据也处理掉
             const fbPath = (0, path_1.join)(this.pwd, 'node_modules', 'oak-frontend-base');
-            this.buildproject(fbPath, false, watch);
+            this.buildProject(fbPath, false, watch);
         }
         this.outputDataFile();
     }

package/lib/compiler/routerBuilder.d.ts

@@ -1 +1 @@
-export declare function buildRouter(projectDir: string, startupDir: string, watch?: boolean): void;
+export declare function buildRouter(projectDir: string, startupDir: string, watch?: boolean): void;

package/lib/compiler/routerBuilder.js

@@ -114,6 +114,7 @@ function makeWebAllRouters(namespaceDir, projectDir, routerFileDir) {
                 }
             }
         }
+        let firstPage;
         const children = Object.values(pages).filter((ele) => ele.hasWeb).map(({ path, oakDisablePulldownRefresh }) => {
             const properties = [
                 factory.createPropertyAssignment('path', factory.createStringLiteral(path)),
@@ -126,10 +127,15 @@ function makeWebAllRouters(namespaceDir, projectDir, routerFileDir) {
                     ]))]))
             ];
             if (first2 === path) {
-                properties.push(factory.createPropertyAssignment('isFirst', factory.createTrue()));
+                const firstProperties = [...properties];
+                firstProperties.push(factory.createPropertyAssignment('isFirst', factory.createTrue()));
+                firstPage = factory.createObjectLiteralExpression(firstProperties, true);
             }
             return factory.createObjectLiteralExpression(properties, true);
         });
+        if (firstPage) {
+            children.push(firstPage);
+        }
         if (notFound2) {
             children.push(factory.createObjectLiteralExpression([
                 factory.createPropertyAssignment('path', factory.createStringLiteral('*')),

package/lib/store/AsyncRowStore.js

@@ -1,176 +1,180 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AsyncContext = void 0;
-const tslib_1 = require("tslib");
-const action_1 = require("../actions/action");
-const assert_1 = tslib_1.__importDefault(require("assert"));
-/**
- * 服务器端执行的异步环境的底层抽象
- */
-class AsyncContext {
-    rowStore;
-    uuid;
-    opRecords;
-    scene;
-    headers;
-    clusterInfo;
-    opResult;
-    message;
-    events;
-    constructor(store) {
-        this.rowStore = store;
-        this.opRecords = [];
-        this.events = {
-            commit: [],
-            rollback: [],
-        };
-        this.opResult = {};
-    }
-    // 使一个上下文重新开始事务执行，清除历史数据（定时器中使用）
-    async restartToExecute(routine) {
-        const newContext = !this.uuid ? this : {
-            ...this,
-        }; // 这里可能有问题，继承的context对象中如果有对象属性会变成指针公用，但是估计目前是跑不到的。by Xc 20231215
-        if (newContext !== this) {
-            console.warn('restartToExecute跑出了非重用当前context的情况，请仔细调试');
-        }
-        newContext.opRecords = [];
-        newContext.events = {
-            commit: [],
-            rollback: [],
-        };
-        newContext.opResult = {};
-        await newContext.begin();
-        try {
-            await routine(newContext);
-            await newContext.commit();
-        }
-        catch (err) {
-            await newContext.rollback();
-            throw err;
-        }
-    }
-    getHeader(key) {
-        if (this.headers) {
-            return this.headers[key];
-        }
-    }
-    getScene() {
-        return this.scene;
-    }
-    setScene(scene) {
-        this.scene = scene;
-    }
-    resetEvents() {
-        this.events = {
-            commit: [],
-            rollback: [],
-        };
-    }
-    on(event, callback) {
-        this.uuid && this.events[event].push(callback);
-    }
-    saveOpRecord(entity, operation) {
-        const { action, data, filter, id } = operation;
-        switch (action) {
-            case 'create': {
-                this.opRecords.push({
-                    id,
-                    a: 'c',
-                    e: entity,
-                    d: data
-                });
-                break;
-            }
-            case 'remove': {
-                this.opRecords.push({
-                    id,
-                    a: 'r',
-                    e: entity,
-                    f: filter,
-                });
-                break;
-            }
-            default: {
-                (0, assert_1.default)(!action_1.readOnlyActions.includes(action));
-                this.opRecords.push({
-                    id,
-                    a: 'u',
-                    e: entity,
-                    d: data,
-                    f: filter,
-                });
-            }
-        }
-    }
-    /**
-     * 一个context中不应该有并发的事务，这里将事务串行化，使用的时候千万要注意不要自己等自己
-     * @param options
-     */
-    async begin(options) {
-        if (!this.uuid) {
-            this.uuid = await this.rowStore.begin(options);
-        }
-        else {
-            (0, assert_1.default)(false);
-        }
-    }
-    async commit() {
-        if (this.uuid) {
-            await this.rowStore.commit(this.uuid);
-            this.uuid = undefined;
-            const { commit: commitEvents } = this.events;
-            this.resetEvents();
-            for (const e of commitEvents) {
-                await e();
-            }
-        }
-    }
-    async rollback() {
-        if (this.uuid) {
-            await this.rowStore.rollback(this.uuid);
-            // console.log('rollback', this.uuid);
-            this.uuid = undefined;
-            const { rollback: rollbackEvents } = this.events;
-            this.resetEvents();
-            for (const e of rollbackEvents) {
-                await e();
-            }
-        }
-    }
-    async operate(entity, operation, option) {
-        const result = await this.rowStore.operate(entity, operation, this, option);
-        this.opResult = this.mergeMultipleResults([this.opResult, result]);
-        return result;
-    }
-    select(entity, selection, option) {
-        return this.rowStore.select(entity, selection, this, option);
-    }
-    aggregate(entity, aggregation, option) {
-        return this.rowStore.aggregate(entity, aggregation, this, option);
-    }
-    count(entity, selection, option) {
-        return this.rowStore.count(entity, selection, this, option);
-    }
-    exec(script, txnId) {
-        return this.rowStore.exec(script, txnId);
-    }
-    mergeMultipleResults(toBeMerged) {
-        return this.rowStore.mergeMultipleResults(toBeMerged);
-    }
-    getCurrentTxnId() {
-        return this.uuid;
-    }
-    getSchema() {
-        return this.rowStore.getSchema();
-    }
-    setMessage(message) {
-        this.message = message;
-    }
-    getMessage() {
-        return this.message;
-    }
-}
-exports.AsyncContext = AsyncContext;
-;
-;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AsyncContext = void 0;
+const tslib_1 = require("tslib");
+const action_1 = require("../actions/action");
+const assert_1 = tslib_1.__importDefault(require("assert"));
+/**
+ * 服务器端执行的异步环境的底层抽象
+ */
+class AsyncContext {
+    rowStore;
+    uuid;
+    opRecords;
+    scene;
+    headers;
+    clusterInfo;
+    opResult;
+    message;
+    events;
+    constructor(store) {
+        this.rowStore = store;
+        this.opRecords = [];
+        this.events = {
+            commit: [],
+            rollback: [],
+        };
+        this.opResult = {};
+    }
+    // 使一个上下文重新开始事务执行，清除历史数据（定时器中使用）
+    async restartToExecute(routine) {
+        const newContext = !this.uuid ? this : {
+            ...this,
+        }; // 这里可能有问题，继承的context对象中如果有对象属性会变成指针公用，但是估计目前是跑不到的。by Xc 20231215
+        if (newContext !== this) {
+            console.warn('restartToExecute跑出了非重用当前context的情况，请仔细调试');
+        }
+        newContext.opRecords = [];
+        newContext.events = {
+            commit: [],
+            rollback: [],
+        };
+        newContext.opResult = {};
+        await newContext.begin();
+        try {
+            await routine(newContext);
+            await newContext.commit();
+        }
+        catch (err) {
+            await newContext.rollback();
+            throw err;
+        }
+    }
+    getHeader(key) {
+        if (this.headers) {
+            return this.headers[key];
+        }
+    }
+    getScene() {
+        return this.scene;
+    }
+    setScene(scene) {
+        this.scene = scene;
+    }
+    resetEvents() {
+        this.events = {
+            commit: [],
+            rollback: [],
+        };
+    }
+    on(event, callback) {
+        this.uuid && this.events[event].push(callback);
+    }
+    saveOpRecord(entity, operation) {
+        const { action, data, filter, id } = operation;
+        switch (action) {
+            case 'create': {
+                this.opRecords.push({
+                    id,
+                    a: 'c',
+                    e: entity,
+                    d: data
+                });
+                break;
+            }
+            case 'remove': {
+                this.opRecords.push({
+                    id,
+                    a: 'r',
+                    e: entity,
+                    f: filter,
+                });
+                break;
+            }
+            default: {
+                (0, assert_1.default)(!action_1.readOnlyActions.includes(action));
+                this.opRecords.push({
+                    id,
+                    a: 'u',
+                    e: entity,
+                    d: data,
+                    f: filter,
+                });
+            }
+        }
+    }
+    /**
+     * 一个context中不应该有并发的事务，这里将事务串行化，使用的时候千万要注意不要自己等自己
+     * @param options
+     */
+    async begin(options) {
+        if (!this.uuid) {
+            this.uuid = await this.rowStore.begin(options);
+        }
+        else {
+            (0, assert_1.default)(false);
+        }
+    }
+    async commit() {
+        if (this.uuid) {
+            await this.rowStore.commit(this.uuid);
+            const { commit: commitEvents } = this.events;
+            for (const e of commitEvents) {
+                await e();
+            }
+            this.uuid = undefined;
+            this.resetEvents();
+            this.opRecords = [];
+            this.opResult = {};
+            this.message = '';
+        }
+    }
+    async rollback() {
+        if (this.uuid) {
+            await this.rowStore.rollback(this.uuid);
+            const { rollback: rollbackEvents } = this.events;
+            for (const e of rollbackEvents) {
+                await e();
+            }
+            this.uuid = undefined;
+            this.opRecords = [];
+            this.opResult = {};
+            this.resetEvents();
+        }
+    }
+    async operate(entity, operation, option) {
+        const result = await this.rowStore.operate(entity, operation, this, option);
+        this.opResult = this.mergeMultipleResults([this.opResult, result]);
+        return result;
+    }
+    select(entity, selection, option) {
+        return this.rowStore.select(entity, selection, this, option);
+    }
+    aggregate(entity, aggregation, option) {
+        return this.rowStore.aggregate(entity, aggregation, this, option);
+    }
+    count(entity, selection, option) {
+        return this.rowStore.count(entity, selection, this, option);
+    }
+    exec(script, txnId) {
+        return this.rowStore.exec(script, txnId);
+    }
+    mergeMultipleResults(toBeMerged) {
+        return this.rowStore.mergeMultipleResults(toBeMerged);
+    }
+    getCurrentTxnId() {
+        return this.uuid;
+    }
+    getSchema() {
+        return this.rowStore.getSchema();
+    }
+    setMessage(message) {
+        this.message = message;
+    }
+    getMessage() {
+        return this.message;
+    }
+}
+exports.AsyncContext = AsyncContext;
+;
+;