@snowtop/ent 0.2.0-alpha.8 → 0.2.0

package/core/base.d.ts

@@ -86,6 +86,7 @@ interface JoinOptions<T2 extends Data = Data, K2 = keyof T2> {
     tableName: string;
     alias?: string;
     clause: clause.Clause<T2, K2>;
+    type?: "inner" | "outer" | "left" | "right";
 }
 export interface QueryDataOptions<T extends Data = Data, K = keyof T> {
     distinct?: boolean;

package/core/query_impl.js

@@ -36,7 +36,24 @@ function getJoinInfo(join, clauseIdx = 1) {
             ? `${join.tableName} ${join.alias}`
             : join.tableName;
         valuesUsed += join.clause.values().length;
-        return `JOIN ${joinTable} ON ${join.clause.clause(clauseIdx)}`;
+        let joinType;
+        switch (join.type) {
+            case "left":
+                joinType = "LEFT JOIN";
+                break;
+            case "right":
+                joinType = "RIGHT JOIN";
+                break;
+            case "outer":
+                joinType = "FULL OUTER JOIN";
+                break;
+            case "inner":
+                joinType = "INNER JOIN";
+                break;
+            default:
+                joinType = "JOIN";
+        }
+        return `${joinType} ${joinTable} ON ${join.clause.clause(clauseIdx)}`;
     })
         .join(" ");
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.2.0-alpha.8",
+  "version": "0.2.0",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",

package/schema/struct_field.js

@@ -36,8 +36,7 @@ class StructField extends field_1.BaseField {
             throw new Error("valid was not called");
         }
         let ret = {};
-        for (const k in this.options.fields) {
-            const field = this.options.fields[k];
+        const processField = (k, field) => {
             // check two values
             // store in dbKey format
             // check both fieldName and dbKey and store in dbKey for
@@ -52,7 +51,7 @@ class StructField extends field_1.BaseField {
                 val = obj[dbKey];
             }
             if (val === undefined) {
-                continue;
+                return;
             }
             if (field.format) {
                 // indicate nested so this isn't JSON stringified
@@ -61,6 +60,16 @@ class StructField extends field_1.BaseField {
             else {
                 ret[dbKey] = val;
             }
+        };
+        for (const k in this.options.fields) {
+            const field = this.options.fields[k];
+            processField(k, field);
+            if (field.getDerivedFields) {
+                const derivedFields = field.getDerivedFields(k);
+                for (const k in derivedFields) {
+                    processField(k, derivedFields[k]);
+                }
+            }
         }
         // don't json.stringify if nested or list
         if (nested) {
@@ -114,11 +123,7 @@ class StructField extends field_1.BaseField {
             return false;
         }
         let promises = [];
-        // TODO probably need to support optional fields...
-        let valid = true;
-        for (const k in this.options.fields) {
-            const field = this.options.fields[k];
-            let dbKey = (0, schema_1.getStorageKey)(field, k);
+        const processField = (k, dbKey, field) => {
             let fieldName = (0, names_1.toFieldName)(k);
             let val = obj[fieldName];
             let uniqueKeyField = false;
@@ -145,15 +150,34 @@ class StructField extends field_1.BaseField {
             if (val === undefined || val === null) {
                 // nullable, nothing to do here
                 if (field.nullable) {
-                    continue;
+                    return;
                 }
                 valid = false;
-                break;
+                return false;
             }
             if (!field.valid) {
-                continue;
+                return;
             }
             promises.push(field.valid(val));
+        };
+        // TODO probably need to support optional fields...
+        let valid = true;
+        for (const k in this.options.fields) {
+            const field = this.options.fields[k];
+            let dbKey = (0, schema_1.getStorageKey)(field, k);
+            if (processField(k, dbKey, field) === false) {
+                valid = false;
+            }
+            if (field.getDerivedFields) {
+                const derivedFields = field.getDerivedFields(k);
+                for (const k in derivedFields) {
+                    const derivedField = derivedFields[k];
+                    let dbKey = (0, schema_1.getStorageKey)(derivedField, k);
+                    if (processField(k, dbKey, derivedField) === false) {
+                        valid = false;
+                    }
+                }
+            }
         }
         if (!valid) {
             return valid;