oak-domain 1.0.0 → 1.0.3

package/lib/compiler/schemalBuilder.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -978,7 +982,7 @@ function constructSchema(statements, entity) {
         factory.createModifier(ts.SyntaxKind.ExportKeyword)
     ], factory.createIdentifier('Schema'), undefined, factory.createIntersectionTypeNode([
         factory.createTypeLiteralNode(members.concat(members2)),
-        factory.createMappedTypeNode(undefined, factory.createTypeParameterDeclaration(factory.createIdentifier("A"), factory.createTypeReferenceNode(factory.createIdentifier("ExpressionKey"), undefined), undefined), undefined, factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword), undefined)
+        factory.createMappedTypeNode(undefined, factory.createTypeParameterDeclaration(undefined, factory.createIdentifier("A"), factory.createTypeReferenceNode(factory.createIdentifier("ExpressionKey"), undefined), undefined), undefined, factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword), undefined)
     ])));
 }
 /**
@@ -1099,7 +1103,7 @@ function constructFilter(statements, entity) {
         eumUnionTypeNode && eumUnionTypeNode.push(factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword));
     }
     statements.push(factory.createTypeAliasDeclaration(undefined, undefined, factory.createIdentifier('AttrFilter'), ReversePointerRelations[entity] ? [
-        factory.createTypeParameterDeclaration(factory.createIdentifier("E"), undefined)
+        factory.createTypeParameterDeclaration(undefined, factory.createIdentifier("E"), undefined)
     ] : undefined, factory.createTypeLiteralNode(members)));
     /**
      *
@@ -1121,7 +1125,7 @@ function constructFilter(statements, entity) {
         types.push(factory.createTypeReferenceNode('FulltextFilter'));
     }
     statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Filter"), ReversePointerRelations[entity] ? [
-        factory.createTypeParameterDeclaration(factory.createIdentifier("E"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("Q_EnumValue"), [
+        factory.createTypeParameterDeclaration(undefined, factory.createIdentifier("E"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("Q_EnumValue"), [
             factory.createUnionTypeNode(eumUnionTypeNode)
         ]))
     ] : undefined, factory.createTypeReferenceNode(factory.createIdentifier("MakeFilter"), [factory.createIntersectionTypeNode(types)])));
@@ -1660,14 +1664,14 @@ function constructActions(statements, entity) {
     var e_9, _a, e_10, _b, e_11, _c, e_12, _d, e_13, _e, e_14, _f, e_15, _g, e_16, _h, e_17, _j;
     // Selection
     statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("SelectOperation"), [
-        factory.createTypeParameterDeclaration(factory.createIdentifier("P"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("Projection"), undefined))
+        factory.createTypeParameterDeclaration(undefined, factory.createIdentifier("P"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("Projection"), undefined))
     ], factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
         factory.createLiteralTypeNode(factory.createStringLiteral("select")),
         factory.createTypeReferenceNode(factory.createIdentifier("P"), undefined),
         factory.createTypeReferenceNode(factory.createIdentifier("Filter"), undefined),
         factory.createTypeReferenceNode(factory.createIdentifier("Sorter"), undefined)
     ])), factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Selection"), [
-        factory.createTypeParameterDeclaration(factory.createIdentifier("P"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("Projection"), undefined))
+        factory.createTypeParameterDeclaration(undefined, factory.createIdentifier("P"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("Projection"), undefined))
     ], factory.createTypeReferenceNode(factory.createIdentifier("Omit"), [
         factory.createTypeReferenceNode(factory.createIdentifier("SelectOperation"), [
             factory.createTypeReferenceNode(factory.createIdentifier("P"), undefined)
@@ -2282,7 +2286,7 @@ function outputSubQuery(outputDir, printer) {
             // 如果是建立 base，这里要加上额外可能的对象信息
             inUnionTypeNode.push(factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword));
         }
-        statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier(identifier), undefined, factory.createMappedTypeNode(undefined, factory.createTypeParameterDeclaration(factory.createIdentifier("K"), factory.createUnionTypeNode([
+        statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier(identifier), undefined, factory.createMappedTypeNode(undefined, factory.createTypeParameterDeclaration(undefined, factory.createIdentifier("K"), factory.createUnionTypeNode([
             factory.createLiteralTypeNode(factory.createStringLiteral("$in")),
             factory.createLiteralTypeNode(factory.createStringLiteral("$nin"))
         ]), undefined), undefined, factory.createToken(ts.SyntaxKind.QuestionToken), factory.createUnionTypeNode(inUnionTypeNode), undefined)));

package/lib/store/TriggerExecutor.js

@@ -107,7 +107,7 @@ var TriggerExecutor = /** @class */ (function (_super) {
     }
     TriggerExecutor.prototype.registerChecker = function (checker) {
         var entity = checker.entity, action = checker.action, checkFn = checker.checker, type = checker.type;
-        var triggerName = "".concat(entity).concat(action, "\u6743\u9650\u68C0\u67E5-").concat(this.counter++);
+        var triggerName = "".concat(String(entity)).concat(action, "\u6743\u9650\u68C0\u67E5-").concat(this.counter++);
         var trigger = {
             checkerType: type,
             name: triggerName,
@@ -221,7 +221,7 @@ var TriggerExecutor = /** @class */ (function (_super) {
                     case 3:
                         count = _h.sent();
                         if (count > 0) {
-                            throw new Error("\u5BF9\u8C61".concat(entity, "\u7684\u884C\u300C").concat(JSON.stringify(operation), "\u300D\u4E0A\u5DF2\u7ECF\u5B58\u5728\u672A\u5B8C\u6210\u7684\u8DE8\u4E8B\u52A1\u7EA6\u675F"));
+                            throw new Error("\u5BF9\u8C61".concat(String(entity), "\u7684\u884C\u300C").concat(JSON.stringify(operation), "\u300D\u4E0A\u5DF2\u7ECF\u5B58\u5728\u672A\u5B8C\u6210\u7684\u8DE8\u4E8B\u52A1\u7EA6\u675F"));
                         }
                         return [3 /*break*/, 4];
                     case 4:

package/lib/store/relation.js

@@ -47,8 +47,10 @@ function judgeRelation(schema, entity, attr) {
     }
     else if ((attributes.hasOwnProperty("".concat(attr, "Id")))) {
         var _e = attributes["".concat(attr, "Id")], type = _e.type, ref = _e.ref;
-        (0, assert_1.default)(type === 'ref');
-        return ref;
+        if (type === 'ref') {
+            return ref;
+        }
+        return 1;
     }
     else if (attributes.hasOwnProperty('entity')
         && attributes.hasOwnProperty('entityId')

package/lib/types/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "1.0.0",
+    "version": "1.0.3",
     "author": {
         "name": "XuChang"
     },
@@ -28,8 +28,8 @@
         "cross-env": "^7.0.2",
         "fs-extra": "^10.0.0",
         "mocha": "^8.2.1",
-        "ts-node": "^9.1.1",
-        "typescript": "4.5.5"
+        "ts-node": "~10.9.1",
+        "typescript": "~4.7.4"
     },
     "dependencies": {
         "dayjs": "^1.11.4",