@nattyjs/orm 0.0.1-beta.43 → 0.0.1-beta.45

package/dist/index.cjs

@@ -169,9 +169,10 @@ function getColumnNameAndParams$1(config) {
   const params = new Array();
   const relationProps = /* @__PURE__ */ new Map();
   if (config.entity) {
-    for (const key of Object.keys(config.entity)) {
-      if (config.properties[key.toLowerCase()]) {
-        const paramValue = config.entity[key];
+    for (const key of Object.keys(config.properties)) {
+      const propName = config.properties[key];
+      if (config.entity[propName] !== void 0) {
+        const paramValue = config.entity[propName];
         if (!(Utils.isObject(paramValue) || Utils.isArray(paramValue))) {
           columnNames.push(key);
           params.push({
@@ -241,18 +242,22 @@ function getColumnNameAndParams(config) {
   if (config.entity) {
     let index = 1;
     let parameterCharacter = isMsSql ? "@" : "$";
-    for (const [key, value] of Object.entries(config.entity)) {
-      const paramProp = isMsSql ? key : index;
-      if (!(Utils.isObject(value) || Utils.isArray(value))) {
-        if (config.primaryKeys.indexOf(key) === -1)
-          sets.push(`${key}=${parameterCharacter}${paramProp}`);
-        else
-          whereClause.push(`${key}=${parameterCharacter}${paramProp}`);
-        index++;
-        params.push({
-          name: `${key}`,
-          value
-        });
+    for (const prop of Object.keys(config.properties)) {
+      const key = config.properties[prop];
+      const value = config.entity[key];
+      if (value !== void 0) {
+        const paramProp = isMsSql ? key : index;
+        if (!(Utils.isObject(value) || Utils.isArray(value))) {
+          if (config.primaryKeys.indexOf(key) === -1)
+            sets.push(`${key}=${parameterCharacter}${paramProp}`);
+          else
+            whereClause.push(`${key}=${parameterCharacter}${paramProp}`);
+          index++;
+          params.push({
+            name: `${key}`,
+            value
+          });
+        }
       }
     }
   }
@@ -842,27 +847,36 @@ class DbSet {
   }
   async add(entity) {
     const properties = this.getProperties();
-    this.changeTracker.addItem({
-      tableName: this.getTableName(this.type.name),
-      entity,
-      primaryKeys: this.getPrimaryKeys(this.type.name),
-      propsDbConfig: this.getPropsDbConfig(entity),
-      properties
-    }, EntityState.added);
+    this.changeTracker.addItem(
+      {
+        tableName: this.getTableName(this.type.name),
+        entity,
+        primaryKeys: this.getPrimaryKeys(this.type.name),
+        propsDbConfig: this.getPropsDbConfig(entity),
+        properties
+      },
+      EntityState.added
+    );
   }
   async update(entity) {
-    this.changeTracker.addItem({
-      tableName: this.getTableName(this.type.name),
-      entity,
-      primaryKeys: this.getPrimaryKeys(this.type.name),
-      propsDbConfig: this.getPropsDbConfig(entity)
-    }, EntityState.updated);
+    this.changeTracker.addItem(
+      {
+        tableName: this.getTableName(this.type.name),
+        entity,
+        primaryKeys: this.getPrimaryKeys(this.type.name),
+        propsDbConfig: this.getPropsDbConfig(entity)
+      },
+      EntityState.updated
+    );
   }
   async delete(expression) {
-    this.changeTracker.addItem({
-      tableName: this.getTableName(this.type.name),
-      whereClause: expression
-    }, EntityState.deleted);
+    this.changeTracker.addItem(
+      {
+        tableName: this.getTableName(this.type.name),
+        whereClause: expression
+      },
+      EntityState.deleted
+    );
   }
   async toList() {
     return await this.execute();
@@ -884,22 +898,30 @@ class DbSet {
     const props = core.entityContainer.getProperties(name || this.type.name);
     const jProps = {};
     if (props)
-      props.forEach((property) => jProps[property.name.toLowerCase()] = property.name);
+      props.forEach(
+        (property) => jProps[property.name.toLowerCase()] = property.name
+      );
     return jProps;
   }
   getPropsDbConfig(entity) {
     const propsDbConfig = core.entityContainer.getPropsDbConfig(this.type.name);
+    const properties = core.entityContainer.getProperties(this.type.name);
     const props = /* @__PURE__ */ new Map();
-    for (const propName of Object.keys(entity)) {
-      const dbFieldConfig = propsDbConfig.get(propName);
-      if (dbFieldConfig && (dbFieldConfig.oneToMany || dbFieldConfig.oneToOne)) {
-        const fieldRelationConfig = dbFieldConfig.oneToMany || dbFieldConfig.oneToOne;
-        props.set(propName, {
-          tableName: this.getTableName(fieldRelationConfig.model.name),
-          primaryKeys: this.getPrimaryKeys(fieldRelationConfig.model.name),
-          foreignKey: fieldRelationConfig.foreignKey,
-          properties: this.getProperties(fieldRelationConfig.model.name)
-        });
+    if (properties && Array.isArray(properties)) {
+      for (const property of properties) {
+        if (entity[property.name]) {
+          const propName = entity[property.name];
+          const dbFieldConfig = propsDbConfig.get(propName);
+          if (dbFieldConfig && (dbFieldConfig.oneToMany || dbFieldConfig.oneToOne)) {
+            const fieldRelationConfig = dbFieldConfig.oneToMany || dbFieldConfig.oneToOne;
+            props.set(propName, {
+              tableName: this.getTableName(fieldRelationConfig.model.name),
+              primaryKeys: this.getPrimaryKeys(fieldRelationConfig.model.name),
+              foreignKey: fieldRelationConfig.foreignKey,
+              properties: this.getProperties(fieldRelationConfig.model.name)
+            });
+          }
+        }
       }
     }
     return props;

package/dist/index.mjs

@@ -152,9 +152,10 @@ function getColumnNameAndParams$1(config) {
   const params = new Array();
   const relationProps = /* @__PURE__ */ new Map();
   if (config.entity) {
-    for (const key of Object.keys(config.entity)) {
-      if (config.properties[key.toLowerCase()]) {
-        const paramValue = config.entity[key];
+    for (const key of Object.keys(config.properties)) {
+      const propName = config.properties[key];
+      if (config.entity[propName] !== void 0) {
+        const paramValue = config.entity[propName];
         if (!(Utils.isObject(paramValue) || Utils.isArray(paramValue))) {
           columnNames.push(key);
           params.push({
@@ -224,18 +225,22 @@ function getColumnNameAndParams(config) {
   if (config.entity) {
     let index = 1;
     let parameterCharacter = isMsSql ? "@" : "$";
-    for (const [key, value] of Object.entries(config.entity)) {
-      const paramProp = isMsSql ? key : index;
-      if (!(Utils.isObject(value) || Utils.isArray(value))) {
-        if (config.primaryKeys.indexOf(key) === -1)
-          sets.push(`${key}=${parameterCharacter}${paramProp}`);
-        else
-          whereClause.push(`${key}=${parameterCharacter}${paramProp}`);
-        index++;
-        params.push({
-          name: `${key}`,
-          value
-        });
+    for (const prop of Object.keys(config.properties)) {
+      const key = config.properties[prop];
+      const value = config.entity[key];
+      if (value !== void 0) {
+        const paramProp = isMsSql ? key : index;
+        if (!(Utils.isObject(value) || Utils.isArray(value))) {
+          if (config.primaryKeys.indexOf(key) === -1)
+            sets.push(`${key}=${parameterCharacter}${paramProp}`);
+          else
+            whereClause.push(`${key}=${parameterCharacter}${paramProp}`);
+          index++;
+          params.push({
+            name: `${key}`,
+            value
+          });
+        }
       }
     }
   }
@@ -825,27 +830,36 @@ class DbSet {
   }
   async add(entity) {
     const properties = this.getProperties();
-    this.changeTracker.addItem({
-      tableName: this.getTableName(this.type.name),
-      entity,
-      primaryKeys: this.getPrimaryKeys(this.type.name),
-      propsDbConfig: this.getPropsDbConfig(entity),
-      properties
-    }, EntityState.added);
+    this.changeTracker.addItem(
+      {
+        tableName: this.getTableName(this.type.name),
+        entity,
+        primaryKeys: this.getPrimaryKeys(this.type.name),
+        propsDbConfig: this.getPropsDbConfig(entity),
+        properties
+      },
+      EntityState.added
+    );
   }
   async update(entity) {
-    this.changeTracker.addItem({
-      tableName: this.getTableName(this.type.name),
-      entity,
-      primaryKeys: this.getPrimaryKeys(this.type.name),
-      propsDbConfig: this.getPropsDbConfig(entity)
-    }, EntityState.updated);
+    this.changeTracker.addItem(
+      {
+        tableName: this.getTableName(this.type.name),
+        entity,
+        primaryKeys: this.getPrimaryKeys(this.type.name),
+        propsDbConfig: this.getPropsDbConfig(entity)
+      },
+      EntityState.updated
+    );
   }
   async delete(expression) {
-    this.changeTracker.addItem({
-      tableName: this.getTableName(this.type.name),
-      whereClause: expression
-    }, EntityState.deleted);
+    this.changeTracker.addItem(
+      {
+        tableName: this.getTableName(this.type.name),
+        whereClause: expression
+      },
+      EntityState.deleted
+    );
   }
   async toList() {
     return await this.execute();
@@ -867,22 +881,30 @@ class DbSet {
     const props = entityContainer.getProperties(name || this.type.name);
     const jProps = {};
     if (props)
-      props.forEach((property) => jProps[property.name.toLowerCase()] = property.name);
+      props.forEach(
+        (property) => jProps[property.name.toLowerCase()] = property.name
+      );
     return jProps;
   }
   getPropsDbConfig(entity) {
     const propsDbConfig = entityContainer.getPropsDbConfig(this.type.name);
+    const properties = entityContainer.getProperties(this.type.name);
     const props = /* @__PURE__ */ new Map();
-    for (const propName of Object.keys(entity)) {
-      const dbFieldConfig = propsDbConfig.get(propName);
-      if (dbFieldConfig && (dbFieldConfig.oneToMany || dbFieldConfig.oneToOne)) {
-        const fieldRelationConfig = dbFieldConfig.oneToMany || dbFieldConfig.oneToOne;
-        props.set(propName, {
-          tableName: this.getTableName(fieldRelationConfig.model.name),
-          primaryKeys: this.getPrimaryKeys(fieldRelationConfig.model.name),
-          foreignKey: fieldRelationConfig.foreignKey,
-          properties: this.getProperties(fieldRelationConfig.model.name)
-        });
+    if (properties && Array.isArray(properties)) {
+      for (const property of properties) {
+        if (entity[property.name]) {
+          const propName = entity[property.name];
+          const dbFieldConfig = propsDbConfig.get(propName);
+          if (dbFieldConfig && (dbFieldConfig.oneToMany || dbFieldConfig.oneToOne)) {
+            const fieldRelationConfig = dbFieldConfig.oneToMany || dbFieldConfig.oneToOne;
+            props.set(propName, {
+              tableName: this.getTableName(fieldRelationConfig.model.name),
+              primaryKeys: this.getPrimaryKeys(fieldRelationConfig.model.name),
+              foreignKey: fieldRelationConfig.foreignKey,
+              properties: this.getProperties(fieldRelationConfig.model.name)
+            });
+          }
+        }
       }
     }
     return props;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nattyjs/orm",
-  "version": "0.0.1-beta.43",
+  "version": "0.0.1-beta.45",
   "description": "",
   "module": "./dist/index.mjs",
   "main": "./dist/index.cjs",
@@ -19,9 +19,9 @@
   "dependencies": {
     "pg": "8.16.0",
     "mssql": "^9.1.1",
-    "@nattyjs/core": "0.0.1-beta.43",
-    "@nattyjs/common": "0.0.1-beta.43",
-    "@nattyjs/entity": "0.0.1-beta.43",
-    "@nattyjs/types": "0.0.1-beta.43"
+    "@nattyjs/core": "0.0.1-beta.45",
+    "@nattyjs/common": "0.0.1-beta.45",
+    "@nattyjs/entity": "0.0.1-beta.45",
+    "@nattyjs/types": "0.0.1-beta.45"
   }
 }