nodester 0.7.16 → 0.7.18

package/lib/models/mixins.js

@@ -218,7 +218,13 @@ async function _updateOne(
 ) {
 	try {
 		const include = opts.include ?? [];
-		let instance = await this.findOne({ where, include });
+		const hasValidWhere = where && Object.keys(where).length > 0 && Object.values(where).every(val => val !== undefined);
+		let instance = null;
+
+		if (hasValidWhere) {
+			instance = await this.findOne({ where, include });
+		}
+
 		let isNewRecord = false;
 
 		if (!instance) {
@@ -285,7 +291,10 @@ async function _updateOne(
 						}
 						return associatedModel.updateOne(
 							where,
-							singleData,
+							{
+								...singleData,
+								[foreignKey]: instance.id
+							},
 							associationUpdateOpts
 						)
 					});
@@ -305,12 +314,18 @@ async function _updateOne(
 					}
 					else {
 						// Note: for now we are only able to work with a model with single PrimaryKey:
-						const where = {
-							[pkField]: includeData[pkField]
+						const where = {}
+						if (includeData[pkField] !== undefined && includeData[pkField] !== null) {
+							where[pkField] = includeData[pkField];
+						} else {
+							where[foreignKey] = instance.id;
 						}
 						fullInstanceData[association] = await associatedModel.updateOne(
 							where,
-							includeData,
+							{
+								...includeData,
+								[foreignKey]: instance.id
+							},
 							associationUpdateOpts
 						);
 					}

package/lib/utils/sanitizations.util.js

@@ -8,27 +8,59 @@
 
 module.exports = {
 	UUID: _UUID,
+	UUIDV1: _UUID,
+	UUIDV4: _UUID,
 
 	CHAR: _STRING,
 	VARCHAR: _STRING,
 	STRING: _STRING,
 	TEXT: _TEXT,
+	CITEXT: _STRING,
+	TSVECTOR: _STRING,
+
+	// Network address types are stored as strings.
+	CIDR: _STRING,
+	INET: _STRING,
+	MACADDR: _STRING,
 
 	ENUM: _ENUM,
 
 	NUMBER: _NUMBER,
+	DECIMAL: _NUMBER,
 
 	INT: _INTEGER,
 	INTEGER: _INTEGER,
 	BIGINT: _INTEGER,
+	TINYINT: _INTEGER,
+	SMALLINT: _INTEGER,
+	MEDIUMINT: _INTEGER,
+
+	FLOAT: _FLOAT,
+	REAL: _FLOAT,
+	DOUBLE: _FLOAT,
 
 	BOOLEAN: _BOOLEAN,
 
 	DATE: _DATE,
 	DATETIME: _DATE,
+	NOW: _DATE,
+	DATEONLY: _DATEONLY,
+	TIME: _TIME,
 
 	JSON: _JSON,
-	JSONTYPE: _JSON
+	JSONTYPE: _JSON,
+	JSONB: _JSON,
+	// Geometry/Geography accept GeoJSON objects, HSTORE accepts key/value objects.
+	GEOMETRY: _JSON,
+	GEOGRAPHY: _JSON,
+	HSTORE: _JSON,
+
+	ARRAY: _ARRAY,
+	RANGE: _ARRAY,
+
+	BLOB: _BLOB,
+
+	VIRTUAL: _VIRTUAL
 }
 
 function _UUID(value=undefined, options={ fallback:undefined }) {
@@ -104,6 +136,11 @@ function _INTEGER(value=undefined, options={ fallback:undefined, min:undefined,
 	return num === undefined ? options?.fallback : parseInt(num);
 }
 
+function _FLOAT(value=undefined, options={ fallback:undefined, min:undefined, max:undefined }) {
+	const num = _NUMBER(value, { fallback:undefined, min:options?.min, max:options?.max });
+	return num === undefined ? options?.fallback : parseFloat(num);
+}
+
 function _BOOLEAN(value=undefined, options={ fallback:undefined }) {
 	try {
 		// If clear boolean.
@@ -152,6 +189,89 @@ function _DATE(value=undefined, options={ fallback:undefined }) {
 }
 
 
+function _DATEONLY(value=undefined, options={ fallback:undefined }) {
+	try {
+		const type = Object.prototype.toString.call(value);
+
+		switch(type) {
+			case('[object Date]'): {
+				if (isNaN(value.valueOf()))
+					throw new Error('Not a date');
+
+				// Normalize to a date-only string (YYYY-MM-DD).
+				return value.toISOString().slice(0, 10);
+			}
+			case('[object String]'): {
+				const check = new Date(value);
+				if (isNaN(check.valueOf()))
+					throw new Error('Not a date');
+
+				// Normalize to a date-only string (YYYY-MM-DD).
+				return check.toISOString().slice(0, 10);
+			}
+			default:
+				break;
+		}
+
+		throw new Error('Not a date');
+	}
+	catch(ex) {
+		return options?.fallback;
+	}
+}
+
+
+function _TIME(value=undefined, options={ fallback:undefined }) {
+	try {
+		if (typeof value !== 'string')
+			throw new Error(`Not a time string`);
+
+		return value;
+	}
+	catch(ex) {
+		return options?.fallback;
+	}
+}
+
+
+function _ARRAY(value=undefined, options={ fallback:undefined }) {
+	try {
+		if (Array.isArray(value))
+			return value;
+
+		// Allow a JSON-encoded array string.
+		if (typeof value === 'string') {
+			const parsed = JSON.parse(value);
+			if (Array.isArray(parsed))
+				return parsed;
+		}
+
+		throw new Error(`Not an Array`);
+	}
+	catch(ex) {
+		return options?.fallback;
+	}
+}
+
+
+function _BLOB(value=undefined, options={ fallback:undefined }) {
+	try {
+		if (Buffer.isBuffer(value) || typeof value === 'string')
+			return value;
+
+		throw new Error(`Not a Buffer or String`);
+	}
+	catch(ex) {
+		return options?.fallback;
+	}
+}
+
+
+function _VIRTUAL(value=undefined, options={ fallback:undefined }) {
+	return value === undefined ? options?.fallback : value;
+}
+
+
 function _JSON(value=undefined, options={ fallback:undefined }) {
 	try {
 		if (typeof value === 'string')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodester",
-  "version": "0.7.16",
+  "version": "0.7.18",
   "description": "A versatile REST framework for Node.js",
   "directories": {
     "docs": "docs",