@cheetah.js/orm 0.1.121 → 0.1.125

package/dist/domain/base-entity.js

@@ -138,9 +138,10 @@ class BaseEntity {
     serializeWithEntity(entity) {
         const data = {};
         const allProperties = new Set(Object.keys(entity.properties));
+        const allRelations = new Set((entity.relations || []).map((relation) => relation.propertyKey));
         const hidePropertiesSet = new Set(entity.hideProperties);
         for (const key in this) {
-            if (this.shouldSkipProperty(key, allProperties, hidePropertiesSet)) {
+            if (this.shouldSkipProperty(key, allProperties, allRelations, hidePropertiesSet)) {
                 continue;
             }
             data[key] = this[key];
@@ -159,11 +160,11 @@ class BaseEntity {
         }
         return data;
     }
-    shouldSkipProperty(key, allProperties, hideProperties) {
+    shouldSkipProperty(key, allProperties, allRelations, hideProperties) {
         if (this.isInternalProperty(key)) {
             return true;
         }
-        if (!allProperties.has(key)) {
+        if (!allProperties.has(key) && !allRelations.has(key)) {
             return true;
         }
         return hideProperties.has(key);

package/dist/orm.service.d.ts

@@ -4,9 +4,6 @@ export declare class OrmService {
     private orm;
     private storage;
     private allEntities;
-    private resolveLiteralDefault;
-    private resolveEnumDefault;
-    private resolveDefaultValue;
     constructor(orm: Orm, storage: EntityStorage, entityFile?: string);
     private discoverRelationshipTypes;
     private discoverEnumTypes;

package/dist/orm.service.js

@@ -50,59 +50,6 @@ const ts_morph_1 = require("ts-morph");
 const orm_1 = require("./orm");
 const globby = __importStar(require("globby"));
 let OrmService = class OrmService {
-    resolveLiteralDefault(initializer) {
-        const kind = initializer.getKind();
-        if (kind === ts_morph_1.SyntaxKind.StringLiteral)
-            return initializer.getText();
-        if (kind === ts_morph_1.SyntaxKind.NumericLiteral)
-            return parseFloat(initializer.getText());
-        if (kind === ts_morph_1.SyntaxKind.TrueKeyword)
-            return true;
-        if (kind === ts_morph_1.SyntaxKind.FalseKeyword)
-            return false;
-        if (kind !== ts_morph_1.SyntaxKind.ArrayLiteralExpression)
-            return;
-        const elements = initializer.getElements();
-        return elements
-            .map((element) => {
-            const kind = element.getKind();
-            if (kind === ts_morph_1.SyntaxKind.StringLiteral ||
-                kind === ts_morph_1.SyntaxKind.NumericLiteral ||
-                kind === ts_morph_1.SyntaxKind.TrueKeyword ||
-                kind === ts_morph_1.SyntaxKind.FalseKeyword ||
-                kind === ts_morph_1.SyntaxKind.ArrayLiteralExpression) {
-                return this.resolveLiteralDefault(element);
-            }
-            else if (kind === ts_morph_1.SyntaxKind.PropertyAccessExpression) {
-                return this.resolveEnumDefault(element);
-            }
-            return undefined;
-        })
-            .filter((value) => typeof value !== 'undefined');
-    }
-    resolveEnumDefault(initializer) {
-        if (initializer.getKind() !== ts_morph_1.SyntaxKind.PropertyAccessExpression)
-            return;
-        const [enumName, memberName] = initializer.getText().split('.');
-        if (!enumName || !memberName)
-            return;
-        const enumDeclaration = initializer.getSourceFile().getEnum(enumName) ||
-            initializer.getSourceFile().getProject().getSourceFiles()
-                .map(file => file.getEnum(enumName))
-                .find(item => item);
-        if (!enumDeclaration)
-            return;
-        const member = enumDeclaration.getMember(memberName);
-        if (!member)
-            return;
-        const value = member.getValue();
-        return typeof value === 'undefined' ? member.getName() : value;
-    }
-    resolveDefaultValue(initializer) {
-        const value = this.resolveLiteralDefault(initializer) ??
-            this.resolveEnumDefault(initializer);
-        return value;
-    }
     constructor(orm, storage, entityFile) {
         this.orm = orm;
         this.storage = storage;
@@ -127,9 +74,19 @@ let OrmService = class OrmService {
                             nullables.push(propertyName);
                         }
                         if (initializer) {
-                            const defaultValue = this.resolveDefaultValue(initializer);
-                            if (typeof defaultValue !== 'undefined') {
-                                defaults[propertyName] = defaultValue;
+                            const initializerKind = initializer.getKind();
+                            switch (initializerKind) {
+                                case ts_morph_1.SyntaxKind.StringLiteral:
+                                    defaults[propertyName] = initializer.getText();
+                                    break;
+                                case ts_morph_1.SyntaxKind.NumericLiteral:
+                                    defaults[propertyName] = parseFloat(initializer.getText());
+                                    break;
+                                case ts_morph_1.SyntaxKind.NewExpression:
+                                case ts_morph_1.SyntaxKind.CallExpression:
+                                    break;
+                                default:
+                                    break;
                             }
                         }
                         this.allEntities.set(classDeclaration.getName(), { nullables, defaults });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cheetah.js/orm",
-  "version": "0.1.121",
+  "version": "0.1.125",
   "description": "A simple ORM for Cheetah.js",
   "type": "commonjs",
   "main": "dist/index.js",
@@ -55,5 +55,5 @@
     "bun",
     "value-object"
   ],
-  "gitHead": "04085d38962dd22e3967a52f00a7a9fa67746c6e"
+  "gitHead": "b93f774dc0f732549b22d724616e683819683b80"
 }