From f3997c6b9678033b1c339c336c77af937bf3f651 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Tue, 23 Apr 2024 22:39:28 -0500
Subject: [PATCH] Added ving/utils/indentify.mjs to help identify various data
 structures in a more consistent way. * Refactored entire code base to use
 ving/utils/indentify.mjs.

---
 components/FormInput.vue             |  18 ++--
 composables/currentUserStore.mjs     |   7 +-
 composables/useDateTime.mjs          |   8 +-
 composables/useVingRecord.mjs        |   7 +-
 docs/change-log.md                   |   2 +
 docs/subsystems/utils.md             |   4 +
 pages/user/login.vue                 |   3 +-
 ving/config.mjs                      |   3 +-
 ving/generator/nuxtpages.mjs         |   3 +-
 ving/generator/vingrecord.mjs        |   3 +-
 ving/record/VingRecord.mjs           |  57 ++++++-----
 ving/record/records/APIKey.mjs       |   3 +-
 ving/record/records/User.mjs         |   7 +-
 ving/schema/helpers.mjs              |  21 +++--
 ving/session.mjs                     |  17 ++--
 ving/tests/Users.vingrecord.test.mjs |  12 +--
 ving/tests/identify.test.mjs         | 128 +++++++++++++++++++++++++
 ving/utils/identify.mjs              | 136 +++++++++++++++++++++++++++
 ving/utils/ouch.mjs                  |   6 +-
 ving/utils/rest.mjs                  |  38 ++++----
 20 files changed, 382 insertions(+), 101 deletions(-)
 create mode 100644 ving/tests/identify.test.mjs
 create mode 100644 ving/utils/identify.mjs

diff --git a/components/FormInput.vue b/components/FormInput.vue
index 5e0d9def..380a9ae3 100644
--- a/components/FormInput.vue
+++ b/components/FormInput.vue
@@ -3,18 +3,18 @@
         <FormLabel :label="label" :id="computedId" />
         <div class="p-inputgroup flex-1">
             <span v-if="prepend" class="p-inputgroup-addon"> {{ prepend }} </span>
-            <InputNumber v-if="type == 'number' && (_.isNumber(val) || _.isNull(val) || _.isUndefined(val))"
+            <InputNumber v-if="type == 'number' && (isNumber(val) || isNull(val) || isUndefined(val))"
                 v-model="val" showButtons :placeholder="placeholder" :name="name" :id="computedId"
                 :autocomplete="autocomplete" :required="required" :inputClass="fieldClass" :step="step"
                 :incrementButtonClass="append ? 'border-noround' : ''"
                 :decrementButtonClass="append ? 'border-noround' : ''" />
-            <Password v-else-if="type == 'password' && (_.isString(val) || _.isNull(val) || _.isUndefined(val))"
+            <Password v-else-if="type == 'password' && (isString(val) || isNull(val) || isUndefined(val))"
                 v-model="val" toggleMask :placeholder="placeholder" :name="name" :id="computedId" :feedback="false"
                 :autocomplete="autocomplete" :required="required" :inputClass="fieldClass" class="w-full" />
-            <Textarea v-else-if="type == 'textarea' && (_.isString(val) || _.isNull(val) || _.isUndefined(val))"
+            <Textarea v-else-if="type == 'textarea' && (isString(val) || isNull(val) || isUndefined(val))"
                 v-model="val" :placeholder="placeholder" :name="name" :id="computedId" :autocomplete="autocomplete"
                 :class="fieldClass + ' border-round'" :required="required" autoResize />
-            <MarkdownInput v-else-if="type == 'markdown' && (_.isString(val) || _.isNull(val) || _.isUndefined(val))"
+            <MarkdownInput v-else-if="type == 'markdown' && (isString(val) || isNull(val) || isUndefined(val))"
                 v-model="val" :placeholder="placeholder" :id="computedId" @change="emit('change')"
                 />
             <SelectInput v-else-if="type == 'select'"
@@ -23,7 +23,7 @@
                 <template v-for="(_, name) in $slots" v-slot:[name]="slotData"><slot :name="name" v-bind="slotData" /></template>
             </SelectInput>
             <InputText
-                v-else-if="['text', 'email'].includes(type) && (_.isString(val) || _.isNull(val) || _.isUndefined(val))"
+                v-else-if="['text', 'email'].includes(type) && (isString(val) || isNull(val) || isUndefined(val))"
                 v-model="val" :placeholder="placeholder" :name="name" :id="computedId" :autocomplete="autocomplete"
                 :class="fieldClass" :required="required" />
             <Message v-else severity="error" :closable="false">
@@ -36,7 +36,7 @@
 </template>
 
 <script setup>
-import _ from 'lodash';
+import {isNumber, isString, isNull, isUndefined, isNil} from '#ving/utils/identify.mjs';
 
 
 const props = defineProps({
@@ -87,7 +87,7 @@ let invalidReason = '';
 
 const invalidForm = inject('invalidForm', (a) => { });
 
-const empty = computed(() => _.isNil(props.modelValue) || props.modelValue === '');
+const empty = computed(() => isNil(props.modelValue));
 
 const invalid = computed(() => {
     if (props.required && empty.value) {
@@ -95,12 +95,12 @@ const invalid = computed(() => {
         invalidForm([props.name, true, invalidReason]);
         return true;
     }
-    else if (props.mustMatch !== undefined && props.mustMatch.value !== props.modelValue) {
+    else if (!isUndefined(props.mustMatch) && props.mustMatch.value !== props.modelValue) {
         invalidReason = `${displayName} must match ${props.mustMatch.field}.`;
         invalidForm([props.name, true, invalidReason]);
         return true;
     }
-    else if (props.type == 'email' && !_.isNil(props.modelValue) && !(props.modelValue.toString().match(/.+@.+\..+/))) {
+    else if (props.type == 'email' && !isNil(props.modelValue) && !(props.modelValue.toString().match(/.+@.+\..+/))) {
         invalidReason = `${displayName} doesn't look like an email address.`;
         invalidForm([props.name, true, invalidReason]);
         return true;
diff --git a/composables/currentUserStore.mjs b/composables/currentUserStore.mjs
index 74a08b10..62c721fc 100644
--- a/composables/currentUserStore.mjs
+++ b/composables/currentUserStore.mjs
@@ -1,5 +1,6 @@
 import { defineStore } from 'pinia';
 import ua from 'ua-parser-js';
+import { isObject, isUndefined } from '#ving/utils/identify.mjs';
 
 const query = { includeOptions: true, includeMeta: true, includeLinks: true };
 
@@ -15,7 +16,7 @@ export const useCurrentUserStore = defineStore('currentUser', {
             const response = await useRest(`/api/${restVersion()}/user/whoami`, {
                 query,
             });
-            if (response.data && typeof response.data == 'object') {
+            if (isObject(response.data)) {
                 this.setState(response.data);
             }
             return response;
@@ -95,10 +96,10 @@ export const useCurrentUserStore = defineStore('currentUser', {
             return response;
         },
         async isAuthenticated() {
-            if (this.props?.id === undefined) {
+            if (isUndefined(this.props?.id)) {
                 await this.fetch();
             }
-            return this.props?.id !== undefined;
+            return !isUndefined(this.props?.id);
         },
     },
 });
\ No newline at end of file
diff --git a/composables/useDateTime.mjs b/composables/useDateTime.mjs
index cf7bfdd4..254ea26a 100644
--- a/composables/useDateTime.mjs
+++ b/composables/useDateTime.mjs
@@ -1,5 +1,7 @@
 import { format, parseISO, parseJSON, parse, getUnixTime } from 'date-fns';
 import { ouch } from '#ving/utils/ouch.mjs';
+import { isArray, isString } from '#ving/utils/identify.mjs';
+
 const dt = {
 
     /**
@@ -11,17 +13,17 @@ const dt = {
      * @returns A javascript Date object
      */
     determineDate(input) {
-        if (Array.isArray(input) && typeof input[0] === "string") {
+        if (isArray(input) && isString(input[0])) {
             // date + input pattern
             return parse(input[0], input[1], new Date());
         }
         else if (input instanceof Date) {
             return input;
         }
-        else if (typeof input === 'string' && input.match(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}$/)) {
+        else if (isString(input) && input.match(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}$/)) {
             return parseISO(input);
         }
-        else if (typeof input === 'string' && input.match(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+/)) {
+        else if (isString(input) && input.match(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+/)) {
             return parseJSON(input);
         }
         console.error('Have no idea what type this date is: ', input);
diff --git a/composables/useVingRecord.mjs b/composables/useVingRecord.mjs
index 69aa4736..5448ae19 100644
--- a/composables/useVingRecord.mjs
+++ b/composables/useVingRecord.mjs
@@ -2,6 +2,7 @@ import { defineStore } from 'pinia';
 import { defu } from "defu";
 import { v4 } from 'uuid';
 import { ouch } from '#ving/utils/ouch.mjs';
+import { isObject, isUndefined } from '#ving/utils/identify.mjs';
 
 export default (behavior) => {
     const notify = useNotifyStore();
@@ -104,7 +105,7 @@ export default (behavior) => {
              */
             async delete(options = {}) {
                 let message = "Are you sure?";
-                if (this.props && typeof this.props == 'object' && "name" in this.props) {
+                if (isObject(this.props) && "name" in this.props) {
                     message = "Are you sure you want to delete " + this.props.name + "?";
                 }
                 if (options.skipConfirm || confirm(message)) {
@@ -293,10 +294,10 @@ export default (behavior) => {
              */
             save: function (name, value) {
                 const update = {};
-                if (this.props && value === undefined) {
+                if (this.props && isUndefined(value)) {
                     update[name] = this.props[name];
                 }
-                else if (value !== undefined) {
+                else if (!isUndefined(value)) {
                     update[name] = value;
                 }
                 return this.partialUpdate(update);
diff --git a/docs/change-log.md b/docs/change-log.md
index c4117a3a..e341a5a9 100644
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -11,6 +11,8 @@ outline: deep
 * Implemented: replace axios with ofetch for CLI and jobs #117.
 * Implemented: replace lodash defaultsDeep with defu #118
 * NOTE: You will have to run npm i to get new modules.
+* Added ving/utils/indentify.mjs to help identify various data structures in a more consistent way.
+* Refactored entire code base to use ving/utils/indentify.mjs.
 
 ## 2024-04-22
 * Added MarkdownInput form control component for editing markdown text.
diff --git a/docs/subsystems/utils.md b/docs/subsystems/utils.md
index e352aaa9..5957d054 100644
--- a/docs/subsystems/utils.md
+++ b/docs/subsystems/utils.md
@@ -16,6 +16,10 @@ Provides light wrappers around the javascript `find()` function that throws an e
 
 A bunch of wrappers around node's `fs` library to give you easy to use and terse filesystem functions for checking if a file/folder exists, or reading/writing JSON files, or sanitizing filenames, and more.
 
+### identify
+
+A bunch of utilites to identify whether a variable is an array, or an object or undefined, etc. You can do all this in javascript, but this ensures we do the same tests consistently through-out ving and its shorter to write too.
+
 ### miniHash
 
 Provides a function to give something similar to an MD5 hash, or a SHA1 hash, but returns a shorter string (around 8 characters). This is very useful when you need to be able to disambiguate files or other content, but you also need the resulting string to be shorter than a normal file hash. Note that because it's shorter there is a greater chance of collision, but if you know the risks you can work around them.
diff --git a/pages/user/login.vue b/pages/user/login.vue
index 85fc0775..806554c7 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -53,6 +53,7 @@
 </template>
 
 <script setup>
+import { isString } from '#ving/utils/identify.mjs';
 let login = ref('');
 let password = ref('');
 const config = useRuntimeConfig();
@@ -62,7 +63,7 @@ async function tryLogin() {
     const response = await currentUser.login(login.value, password.value);
     const query = useRoute().query;
     if (!response.error)
-        if (query.redirectAfter && typeof query.redirectAfter == 'string')
+        if (isString(query.redirectAfter))
             await navigateTo(query.redirectAfter)
         else
             await navigateTo('/');
diff --git a/ving/config.mjs b/ving/config.mjs
index d5e13490..09be6974 100644
--- a/ving/config.mjs
+++ b/ving/config.mjs
@@ -1,4 +1,5 @@
 import { readJSON } from '#ving/utils/fs.mjs';
+import { isUndefined } from '#ving/utils/identify.mjs';
 
 let config = undefined;
 /**
@@ -6,7 +7,7 @@ let config = undefined;
  * @returns An object with the contents of `ving.json`
  */
 export const getConfig = async () => {
-    if (config !== undefined)
+    if (!isUndefined(config))
         return config;
     config = await readJSON('./ving.json');
     return config;
diff --git a/ving/generator/nuxtpages.mjs b/ving/generator/nuxtpages.mjs
index 26f9de3f..7f0b9c82 100644
--- a/ving/generator/nuxtpages.mjs
+++ b/ving/generator/nuxtpages.mjs
@@ -1,6 +1,7 @@
 import { getContext, renderTemplate, toFile } from '@featherscloud/pinion';
 import { splitByCase, upperFirst } from 'scule';
 import { stringDefault, booleanDefault, numberDefault } from '#ving/schema/helpers.mjs';
+import { isUndefined } from '#ving/utils/identify.mjs';
 
 const makeWords = (value) => splitByCase(value).join(' ');
 const makeLabel = (value) => upperFirst(splitByCase(value).join(' '));
@@ -66,7 +67,7 @@ const prop2type = (prop) => {
     if (prop.type == 'int') {
         return 'number';
     }
-    if (prop.type == 'string' && (prop.length > 256 || prop.length == undefined)) {
+    if (prop.type == 'string' && (prop.length > 256 || isUndefined(prop.length))) {
         return 'textarea';
     }
     else {
diff --git a/ving/generator/vingrecord.mjs b/ving/generator/vingrecord.mjs
index e5baf3bc..949b9dd3 100644
--- a/ving/generator/vingrecord.mjs
+++ b/ving/generator/vingrecord.mjs
@@ -64,7 +64,7 @@ const describeExample = ({ bare }) => {
           out.meta.bar = 'bar';
       }
       if (params?.include?.extra.includes('foo')) {
-          if (out.extra === undefined) {
+          if (isUndefined(out.extra)) {
               out.extra = {};
           }
           out.extra.foo = 'foo';
@@ -92,6 +92,7 @@ const shortcutQueryExample = ({ bare, name }) => {
 const recordTemplate = ({ name, bare, schema }) =>
     `import { VingRecord, VingKind } from "#ving/record/VingRecord.mjs";
 ${bare ? '' : "import {eq} from '#ving/drizzle/orm.mjs';"}
+${bare ? '' : "import { isUndefined } from '#ving/utils/identify.mjs';"}
 
 /** Management of individual ${name}s.
  * @class
diff --git a/ving/record/VingRecord.mjs b/ving/record/VingRecord.mjs
index fc216d87..bbb403fe 100644
--- a/ving/record/VingRecord.mjs
+++ b/ving/record/VingRecord.mjs
@@ -1,6 +1,6 @@
 import { findVingSchema } from '#ving/schema/map.mjs';
 import ving from '#ving/index.mjs';
-import _ from 'lodash';
+import { isObject, isUndefined, isNil, isNull } from '#ving/utils/identify.mjs';
 import { eq, asc, desc, and, ne, sql, getTableName, count, sum, avg, min, max } from '#ving/drizzle/orm.mjs';
 import { stringDefault, booleanDefault, numberDefault, dateDefault } from '#ving/schema/helpers.mjs';
 
@@ -17,7 +17,7 @@ export const enum2options = (enums, labels) => {
     const options = [];
     let i = 0
     for (let value of enums) {
-        const label = (labels !== undefined && labels[i] !== undefined) ? labels[i] : value.toString();
+        const label = (!isUndefined(labels) && !isUndefined(labels[i])) ? labels[i] : value.toString();
         options.push({
             value,
             label,
@@ -169,19 +169,19 @@ export class VingRecord {
     async describe(params = {}) {
         const currentUser = params.currentUser;
         const include = params.include || {};
-        const isOwner = currentUser !== undefined && await this.isOwner(currentUser);
+        const isOwner = !isUndefined(currentUser) && await this.isOwner(currentUser);
         const schema = findVingSchema(getTableName(this.table));
         let out = { props: {} };
         out.props.id = this.get('id');
-        if (include !== undefined && include.links) {
+        if (include?.links) {
             const vingConfig = await ving.getConfig();
             out.links = { base: { href: `/api/${vingConfig.rest.version}/${schema.kind?.toLowerCase()}`, methods: ['GET', 'POST'] } };
             out.links.self = { href: `${out.links.base.href}/${this.#props.id}`, methods: ['GET', 'PUT', 'DELETE'] };
         }
-        if (include !== undefined && include.options) {
+        if (include?.options) {
             out.options = await this.propOptions(params);
         }
-        if (include !== undefined && include.meta) {
+        if (include?.meta) {
             out.meta = {
                 kind: schema.kind,
                 isOwner,
@@ -190,7 +190,7 @@ export class VingRecord {
                 out.meta.deleted = true;
             }
         }
-        if (include !== undefined && include.related && include.related.length) {
+        if (include?.related?.length) {
             out.related = {};
         }
         if (this.warnings?.length) {
@@ -202,9 +202,9 @@ export class VingRecord {
             // determine field visibility
             const roles = [...field.view, ...field.edit];
             const visible = roles.includes('public')
-                || (include !== undefined && include.private)
+                || (include?.private)
                 || (roles.includes('owner') && isOwner)
-                || (currentUser !== undefined && currentUser.isaRole(roles));
+                || (currentUser?.isaRole(roles));
             if (!visible) continue;
 
             const fieldName = field.name.toString();
@@ -213,18 +213,18 @@ export class VingRecord {
             out.props[field.name] = this.#props[field.name];
 
             // links 
-            if (typeof out.links === 'object'
+            if (isObject(out.links)
                 && include.links
                 && field.relation
-                && typeof out.links.self === 'object'
+                && isObject(out.links.self)
             ) {
                 let lower = field.relation.name.toLowerCase();
                 out.links[lower] = { href: `${out.links.self.href}/${lower}`, methods: ['GET'] };
             }
 
             // related
-            if (typeof out.related === 'object'
-                && include.related !== undefined
+            if (isObject(out.related)
+                && !isUndefined(include.related)
                 && field.relation
                 && ['parent', 'sibling'].includes(field.relation.type)
                 && include.related.includes(field.relation.name)
@@ -285,7 +285,7 @@ export class VingRecord {
      * @returns Whether or not the passed in user owns this record or not
      */
     async isOwner(currentUser) {
-        if (currentUser === undefined)
+        if (isUndefined(currentUser))
             return false;
         const schema = findVingSchema(getTableName(this.table));
         for (let owner of schema.owner) {
@@ -354,7 +354,7 @@ export class VingRecord {
         const schema = findVingSchema(getTableName(this.table));
         const prop = ving.findObject(schema.props, obj => obj.relation?.name == name);
         const kind = await ving.useKind(prop.relation.kind);
-        if (kind.table[prop.name] == undefined)
+        if (isUndefined(kind.table[prop.name]))
             ving.log('VingRecord').error(`${schema.kind} has an invalid virtual prop name called ${name}`);
         kind.propDefaults.push({
             prop: prop.name,
@@ -385,13 +385,13 @@ export class VingRecord {
         const options = {};
         const currentUser = params.currentUser;
         const include = params.include || {};
-        const isOwner = currentUser !== undefined && await this.isOwner(currentUser);
+        const isOwner = !isUndefined(currentUser) && await this.isOwner(currentUser);
         for (const prop of findVingSchema(getTableName(this.table)).props) {
             const roles = [...prop.view, ...prop.edit];
             const visible = roles.includes('public')
-                || (include !== undefined && include.private)
+                || (include?.private)
                 || (roles.includes('owner') && (isOwner || all))
-                || (currentUser !== undefined && currentUser.isaRole(roles));
+                || (currentUser?.isaRole(roles));
             if (!visible)
                 continue;
             if ((prop.type == 'enum' || prop.type == 'boolean') && prop.enums && prop.enums.length > 0) {
@@ -474,24 +474,23 @@ export class VingRecord {
      */
     async setPostedProps(params, currentUser) {
         const schema = findVingSchema(getTableName(this.table));
-        const isOwner = currentUser !== undefined && await this.isOwner(currentUser);
+        const isOwner = !isUndefined(currentUser) && await this.isOwner(currentUser);
 
         for (const field of schema.props) {
             const fieldName = field.name.toString();
             const param = params[field.name];
             const roles = [...field.edit];
-            const editable = (roles.includes('owner') && (isOwner || !this.isInserted))
-                || (currentUser !== undefined && currentUser.isaRole(roles));
+            const editable = (roles.includes('owner') && (isOwner || !this.isInserted)) || (currentUser?.isaRole(roles));
             if (!editable) {
                 continue;
             }
-            if (param === undefined || (field.relation && field.relation.type != 'parent')) {
+            if (isUndefined(param) || (field.relation && field.relation.type != 'parent')) {
                 continue;
             }
             if (param === '' && field.required) {
                 throw ving.ouch(441, `${fieldName} is required.`, fieldName);
             }
-            if (field.name !== undefined && param !== undefined) {
+            if (!isUndefined(field.name) && !isUndefined(param)) {
                 if (field.unique) {
                     const query = this.db.select({ count: sql`count(*)`.as('count') }).from(this.table);
                     let where = eq(this.table[field.name], params[field.name]);
@@ -504,7 +503,7 @@ export class VingRecord {
                         throw ving.ouch(409, `${field.name.toString()} must be unique, but ${params[field.name]} has already been used.`, field.name)
                     }
                 }
-                if (param !== null) {
+                if (!isNull(param)) {
                     this.set(field.name, param);
                     if (field.relation && field.relation.type == 'parent') {
                         const parent = await this.parent(field.relation.name);
@@ -530,9 +529,9 @@ export class VingRecord {
     testCreationProps(params) {
         const schema = findVingSchema(getTableName(this.table));
         for (const prop of schema.props) {
-            if (!prop.required || prop.type == 'virtual' || (prop.default !== undefined && prop.default !== '') || prop.relation)
+            if (!prop.required || prop.type == 'virtual' || !isNil(prop.default) || prop.relation)
                 continue;
-            if (params[prop.name] !== undefined && params[prop.name] != '')
+            if (!isNil(params[prop.name]))
                 continue;
             const fieldName = prop.name.toString();
             throw ving.ouch(441, `${fieldName} is required.`, fieldName);
@@ -778,7 +777,7 @@ export class VingKind {
             }
             orderBy = cols;
         }
-        const itemsPerPage = params.itemsPerPage === undefined || params.itemsPerPage > 100 || params.itemsPerPage < 1 ? 10 : params.itemsPerPage;
+        const itemsPerPage = isUndefined(params?.itemsPerPage) || params?.itemsPerPage > 100 || params?.itemsPerPage < 1 ? 10 : params.itemsPerPage;
         const page = params.page || 1;
         const maxItems = params.maxItems || 100000000000;
         const itemsUpToThisPage = itemsPerPage * page;
@@ -974,9 +973,9 @@ export class VingKind {
             output[item.prop] = item.value;
         }
         for (const prop of findVingSchema(getTableName(this.table)).props) {
-            if (props && props[prop.name] !== undefined)
+            if (props && !isUndefined(props[prop.name]))
                 output[prop.name] = props[prop.name]
-            else if (output[prop.name] !== undefined) // the value was set above
+            else if (!isUndefined(output[prop.name])) // the value was set above
                 continue;
             else if (prop.type == 'string' || prop.type == 'enum')
                 output[prop.name] = stringDefault(prop)
diff --git a/ving/record/records/APIKey.mjs b/ving/record/records/APIKey.mjs
index 62ae0308..90c6a45c 100644
--- a/ving/record/records/APIKey.mjs
+++ b/ving/record/records/APIKey.mjs
@@ -1,4 +1,5 @@
 import { VingRecord, VingKind } from "#ving/record/VingRecord.mjs";
+import { isNil } from '#ving/utils/identify.mjs';
 
 /** Management of individual API Keys for developer access to the API.
  * @class
@@ -16,7 +17,7 @@ export class APIKeyRecord extends VingRecord {
      * @returns `true`
      */
     async testSecret(secret) {
-        if (secret == undefined || secret == '')
+        if (isNil(secret))
             throw ouch(441, 'You must specify a secret.');
         if (this.get('privateKey') != secret)
             throw ouch(454, 'Secret does not match.');
diff --git a/ving/record/records/User.mjs b/ving/record/records/User.mjs
index f704be04..0ba867fe 100644
--- a/ving/record/records/User.mjs
+++ b/ving/record/records/User.mjs
@@ -4,6 +4,7 @@ import bcrypt from 'bcryptjs';
 import { useCache } from '#ving/cache.mjs';
 import { ouch } from '#ving/utils/ouch.mjs';
 import { eq } from '#ving/drizzle/orm.mjs';
+import { isUndefined, isNil } from '#ving/utils/identify.mjs';
 
 /** Management of individual Users.
  * @class
@@ -88,9 +89,9 @@ export class UserRecord extends RoleMixin(VingRecord) {
      * @returns `true` if it passes, or `false` if it fails to pass
      */
     async testPassword(password) {
-        if (this.get('password') == undefined)
+        if (isNil(this.get('password')))
             throw ouch(400, 'User has no password, you must log in via another provider.');
-        if (password == undefined || password == '')
+        if (isNil(password))
             throw ouch(441, 'You must specify a password.');
         let passed = false;
         if (this.get('passwordType') == 'bcrypt')
@@ -141,7 +142,7 @@ export class UserRecord extends RoleMixin(VingRecord) {
        * @see VingRecord.setPostedProps()
        */
     async setPostedProps(params, currentUser) {
-        if (params.password && (currentUser === undefined || await this.isOwner(currentUser))) {
+        if (params.password && (isUndefined(currentUser) || await this.isOwner(currentUser))) {
             await this.setPassword(params.password);
         }
         if (params.email != this.get('email')) {
diff --git a/ving/schema/helpers.mjs b/ving/schema/helpers.mjs
index c99dfb7b..2102a84b 100644
--- a/ving/schema/helpers.mjs
+++ b/ving/schema/helpers.mjs
@@ -1,6 +1,7 @@
 import { v4 } from 'uuid';
 import { z } from 'zod';
 export const uuid = v4;
+import { isFunction, isString, isNumber, isBoolean } from '#ving/utils/identify.mjs';
 
 /**
  * Interrogates the schema and returns a default value for a string prop as defined in the `default`
@@ -9,11 +10,11 @@ export const uuid = v4;
  * @returns a string default
  */
 export const stringDefault = (prop, skipFunc = false) => {
-    if (typeof prop.default == 'string')
+    if (isString(prop.default))
         return prop.default;
-    if (!skipFunc && typeof prop.default == 'function') {
+    if (!skipFunc && isFunction(prop.default)) {
         const value = prop.default();
-        if (typeof value == 'string')
+        if (isString(value))
             return value;
     }
     return '';
@@ -26,11 +27,11 @@ export const stringDefault = (prop, skipFunc = false) => {
  * @returns a number default
  */
 export const numberDefault = (prop, skipFunc = false) => {
-    if (typeof prop.default == 'number')
+    if (isNumber(prop.default))
         return prop.default;
-    if (!skipFunc && typeof prop.default == 'function') {
+    if (!skipFunc && isFunction(prop.default)) {
         const value = prop.default();
-        if (typeof value == 'number')
+        if (isNumber(value))
             return value;
     }
     return 0;
@@ -43,11 +44,11 @@ export const numberDefault = (prop, skipFunc = false) => {
  * @returns a boolean default
  */
 export const booleanDefault = (prop, skipFunc = false) => {
-    if (typeof prop.default == 'boolean')
+    if (isBoolean(prop.default))
         return prop.default;
-    if (!skipFunc && typeof prop.default == 'function') {
+    if (!skipFunc && isFunction(prop.default)) {
         const value = prop.default();
-        if (typeof value == 'boolean')
+        if (isBoolean(value))
             return value;
     }
     return false;
@@ -63,7 +64,7 @@ export const booleanDefault = (prop, skipFunc = false) => {
 export const dateDefault = (prop, skipFunc = false) => {
     if (prop.default instanceof Date)
         return prop.default;
-    if (!skipFunc && typeof prop.default == 'function') {
+    if (!skipFunc && isFunction(prop.default)) {
         const value = prop.default();
         if (value instanceof Date)
             return value;
diff --git a/ving/session.mjs b/ving/session.mjs
index da437539..37ca7db7 100644
--- a/ving/session.mjs
+++ b/ving/session.mjs
@@ -3,6 +3,7 @@ import { ouch } from '#ving/utils/ouch.mjs';
 import { RoleMixin, RoleOptions } from '#ving/record/mixins/Role.mjs';
 import { useCache } from '#ving/cache.mjs';
 import { v4 } from 'uuid';
+import { isUndefined } from '#ving/utils/identify.mjs';
 
 const version = 2;
 
@@ -66,10 +67,10 @@ class ProtoSession {
      * @returns a `APIKeyRecord` instance
      */
     async apiKey(apiKeyObj) {
-        if (apiKeyObj !== undefined) {
+        if (!isUndefined(apiKeyObj)) {
             return this.#apiKeyObj = apiKeyObj;
         }
-        if (this.#apiKeyObj !== undefined) {
+        if (!isUndefined(this.#apiKeyObj)) {
             return this.#apiKeyObj;
         }
         const apikeys = await useKind('APIKey');
@@ -83,15 +84,15 @@ class ProtoSession {
      * @returns a `UserRecord` instance
      */
     async user(userObj) {
-        if (userObj !== undefined) {
+        if (!isUndefined(userObj)) {
             return this.#userObj = userObj;
         }
-        if (this.#userObj !== undefined) {
+        if (!isUndefined(this.#userObj)) {
             return this.#userObj;
         }
         const users = await useKind('User');
         this.#userObj = await users.find(this.#props.id);
-        if (this.#userObj == undefined) {
+        if (isUndefined(this.#userObj)) {
             await this.end();
             throw ouch(404, `The user ${this.#props.id} no longer exists.`);
         }
@@ -138,7 +139,7 @@ class ProtoSession {
                 userId: this.get('id'),
             }
         };
-        if ('include' in params && params.include !== undefined) {
+        if ('include' in params && !isUndefined(params.include)) {
             if (params.include.related && params.include.related.length) {
                 out.related = {
                     user: await (await this.user()).describe(params)
@@ -192,7 +193,7 @@ class ProtoSession {
      */
     static async fetch(id) {
         const data = await useCache().get('session-' + id);
-        if (data !== undefined && data.version == version) {
+        if (data?.version == version) {
             return new Session(data.props, data.type, data.apiKeyId, id);
         }
         throw ouch(401, 'Session expired.');
@@ -211,7 +212,7 @@ export class Session extends RoleMixin(ProtoSession) { }
  * @throws 401 if the session does not exist
  */
 export const testSession = (session) => {
-    if (session === undefined) {
+    if (isUndefined(session)) {
         throw ouch(401, 'Session expired.');
     }
 }
\ No newline at end of file
diff --git a/ving/tests/Users.vingrecord.test.mjs b/ving/tests/Users.vingrecord.test.mjs
index 94440f91..66efb76b 100644
--- a/ving/tests/Users.vingrecord.test.mjs
+++ b/ving/tests/Users.vingrecord.test.mjs
@@ -46,10 +46,10 @@ describe('Users', async () => {
         const description = await captain.describe({ currentUser: captain, include: { links: true, options: true, meta: true } });
         expect(description.meta?.displayName).toBe('captain');
         expect(description.props.username).toBe('captain');
-        if (description.links !== undefined) {
+        if (description?.links) {
             expect(description.links.base.href).toBe(`/api/${vingConfig.rest.version}/user`);
         }
-        if (description.options !== undefined) {
+        if (description?.options) {
             expect(description.options.useAsDisplayName).toBeTypeOf('object');
             expect(Object.keys(description.options).length).toBe(5);
         }
@@ -64,10 +64,10 @@ describe('Users', async () => {
         expect(description.meta?.displayName).toBe('captain');
         expect(description.props.username).toBe('captain');
         expect(description.props.admin).toBe(false);
-        if (description.links !== undefined) {
+        if (description?.links) {
             expect(description.links.base.href).toBe(`/api/${vingConfig.rest.version}/user`);
         }
-        if (description.options !== undefined) {
+        if (description?.options) {
             expect(description.options.useAsDisplayName).toBeTypeOf('object');
             expect(Object.keys(description.options).length).toBe(5);
         }
@@ -77,11 +77,11 @@ describe('Users', async () => {
         expect(description.meta?.displayName).toBe('warden');
         expect(description.props.username).toBe(undefined);
         expect(description.props.admin).toBe(undefined);
-        if (description.links !== undefined) {
+        if (description?.links) {
             expect(description.links.base.href).toBe(`/api/${vingConfig.rest.version}/user`);
         }
         expect(description.options).toEqual({});
-        if (description.options !== undefined) {
+        if (description?.options) {
             expect(Object.keys(description.options).length).toBe(0);
         }
     });
diff --git a/ving/tests/identify.test.mjs b/ving/tests/identify.test.mjs
new file mode 100644
index 00000000..d2eb2058
--- /dev/null
+++ b/ving/tests/identify.test.mjs
@@ -0,0 +1,128 @@
+import { test, expect } from "vitest";
+import { isArray, isBoolean, isFunction, isNil, isNull, isNumber, isObject, isString, isUndefined } from '#ving/utils/identify.mjs';
+
+test('isArray', () => {
+    expect(isArray([0, 1])).toBe(true);
+    expect(isArray({ foo: 'bar' })).toBe(false);
+    expect(isArray(1)).toBe(false);
+    expect(isArray(0)).toBe(false);
+    expect(isArray(true)).toBe(false);
+    expect(isArray(false)).toBe(false);
+    expect(isArray('1')).toBe(false);
+    expect(isArray(undefined)).toBe(false);
+    expect(isArray('')).toBe(false);
+    expect(isArray(null)).toBe(false);
+    expect(isArray(() => { })).toBe(false);
+});
+
+test('isBoolean', () => {
+    expect(isBoolean([0, 1])).toBe(false);
+    expect(isBoolean({ foo: 'bar' })).toBe(false);
+    expect(isBoolean(1)).toBe(false);
+    expect(isBoolean(0)).toBe(false);
+    expect(isBoolean(true)).toBe(true);
+    expect(isBoolean(false)).toBe(true);
+    expect(isBoolean('1')).toBe(false);
+    expect(isBoolean(undefined)).toBe(false);
+    expect(isBoolean('')).toBe(false);
+    expect(isBoolean(null)).toBe(false);
+    expect(isBoolean(() => { })).toBe(false);
+});
+
+test('isFunction', () => {
+    expect(isFunction([0, 1])).toBe(false);
+    expect(isFunction({ foo: 'bar' })).toBe(false);
+    expect(isFunction(1)).toBe(false);
+    expect(isFunction(0)).toBe(false);
+    expect(isFunction(true)).toBe(false);
+    expect(isFunction(false)).toBe(false);
+    expect(isFunction('1')).toBe(false);
+    expect(isFunction(undefined)).toBe(false);
+    expect(isFunction('')).toBe(false);
+    expect(isFunction(null)).toBe(false);
+    expect(isFunction(() => { })).toBe(true);
+});
+
+test('isNil', () => {
+    expect(isNil([0, 1])).toBe(false);
+    expect(isNil({ foo: 'bar' })).toBe(false);
+    expect(isNil(1)).toBe(false);
+    expect(isNil(0)).toBe(false);
+    expect(isNil(true)).toBe(false);
+    expect(isNil(false)).toBe(false);
+    expect(isNil('1')).toBe(false);
+    expect(isNil(undefined)).toBe(true);
+    expect(isNil('')).toBe(true);
+    expect(isNil(null)).toBe(true);
+    expect(isNil(() => { })).toBe(false);
+});
+
+test('isNull', () => {
+    expect(isNull([0, 1])).toBe(false);
+    expect(isNull({ foo: 'bar' })).toBe(false);
+    expect(isNull(1)).toBe(false);
+    expect(isNull(0)).toBe(false);
+    expect(isNull(true)).toBe(false);
+    expect(isNull(false)).toBe(false);
+    expect(isNull('1')).toBe(false);
+    expect(isNull(undefined)).toBe(false);
+    expect(isNull('')).toBe(false);
+    expect(isNull(null)).toBe(true);
+    expect(isNull(() => { })).toBe(false);
+});
+
+test('isNumber', () => {
+    expect(isNumber([0, 1])).toBe(false);
+    expect(isNumber({ foo: 'bar' })).toBe(false);
+    expect(isNumber(1)).toBe(true);
+    expect(isNumber(0)).toBe(true);
+    expect(isNumber(true)).toBe(false);
+    expect(isNumber(false)).toBe(false);
+    expect(isNumber('1')).toBe(false);
+    expect(isNumber(undefined)).toBe(false);
+    expect(isNumber('')).toBe(false);
+    expect(isNumber(null)).toBe(false);
+    expect(isNumber(() => { })).toBe(false);
+});
+
+test('isObject', () => {
+    expect(isObject([0, 1])).toBe(false);
+    expect(isObject({ foo: 'bar' })).toBe(true);
+    expect(isObject(1)).toBe(false);
+    expect(isObject(0)).toBe(false);
+    expect(isObject(true)).toBe(false);
+    expect(isObject(false)).toBe(false);
+    expect(isObject('1')).toBe(false);
+    expect(isObject(undefined)).toBe(false);
+    expect(isObject('')).toBe(false);
+    expect(isObject(null)).toBe(false);
+    expect(isObject(() => { })).toBe(false);
+});
+
+test('isString', () => {
+    expect(isString([0, 1])).toBe(false);
+    expect(isString({ foo: 'bar' })).toBe(false);
+    expect(isString(1)).toBe(false);
+    expect(isString(0)).toBe(false);
+    expect(isString(true)).toBe(false);
+    expect(isString(false)).toBe(false);
+    expect(isString('1')).toBe(true);
+    expect(isString(undefined)).toBe(false);
+    expect(isString('')).toBe(true);
+    expect(isString(null)).toBe(false);
+    expect(isString(() => { })).toBe(false);
+});
+
+test('isUndefined', () => {
+    expect(isUndefined([0, 1])).toBe(false);
+    expect(isUndefined({ foo: 'bar' })).toBe(false);
+    expect(isUndefined(1)).toBe(false);
+    expect(isUndefined(0)).toBe(false);
+    expect(isUndefined(true)).toBe(false);
+    expect(isUndefined(false)).toBe(false);
+    expect(isUndefined('1')).toBe(false);
+    expect(isUndefined(undefined)).toBe(true);
+    expect(isUndefined('')).toBe(false);
+    expect(isUndefined(null)).toBe(false);
+    expect(isUndefined(() => { })).toBe(false);
+});
\ No newline at end of file
diff --git a/ving/utils/identify.mjs b/ving/utils/identify.mjs
new file mode 100644
index 00000000..68e62071
--- /dev/null
+++ b/ving/utils/identify.mjs
@@ -0,0 +1,136 @@
+/**
+     * Checks if `value` is classified as an `Array` object.
+     *
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is an array, else `false`.
+     * @example
+     *
+     * isArray([1, 2, 3]); // => true
+     *
+     * isArray(document.body.children); // => false
+     *
+     * isArray('abc'); // => false
+     */
+export const isArray = Array.isArray;
+
+/**
+     * Checks if `value` is classified as a boolean primative.
+     *
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a boolean, else `false`.
+     * @example
+     *
+     * isBoolean(false); // => true
+     * 
+     * isBoolean(true); // => true
+     *
+     * isBoolean(null) // => false
+     */
+
+export const isBoolean = (value) => value === true || value === false;
+
+/**
+     * Checks if `value` is a function.
+     *
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a function, else `false`.
+     * @example
+     *
+     * isFunction(() => {})); // => true
+     *     
+     * isFunction(1); // => false
+     */
+export const isFunction = (value) => typeof value == 'function';
+
+/**
+     * Checks if `value` is `null` or `undefined` or `''`.
+     *
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is nullish, else `false`.
+     * @example
+     *
+     * isNil(null); // => true
+     *
+     * isNil(undefined); // => true
+     * 
+     * isNil(''); // => true
+     *
+     * isNil(0); // => false
+     * 
+     * isNil(false); // => false
+     *
+     * isNil('foo'); // => false
+     */
+export const isNil = (value) => value == null || value === '';
+
+/**
+     * Checks if `value` is `null`.
+     *
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is `null`, else `false`.
+     * @example
+     *
+     * isNull(null); // => true
+     *
+     * isNull(undefined); // => false
+     */
+export const isNull = (value) => value === null;
+
+
+/**
+     * Checks if `value` is classified as a `Number` primitive or object.
+     *
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a number, else `false`.
+     * @example
+     *
+     * isNumber(3); // => true
+     *
+     * isNumber('3'); // => false
+     */
+export const isNumber = (value) => typeof value == 'number';
+
+/**
+     * Checks if `value` is the
+     * [language type](http://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types)
+     * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
+     *
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is an object, else `false`.
+     * @example
+     *
+     * isObject({}); // => true
+     *
+     * isObject([1, 2, 3]); // => false
+     *
+     * isObject(null); // => false
+     * 
+     * isObject(() => {}); // => false
+     */
+export const isObject = (value) => value != null && typeof value == 'object' && !isArray(value);
+
+/**
+     * Checks if `value` is classified as a `String` primitive or object.
+     *
+     * @param {*} value The value to check.
+     * @returns {boolean} Returns `true` if `value` is a string, else `false`.
+     * @example
+     *
+     * isString('abc'); // => true
+     *
+     * isString(1); // => false
+     */
+export const isString = (value) => typeof value == 'string';
+
+/**
+    * Checks if `value` is `undefined`.
+    *
+    * @param {*} value The value to check.
+    * @returns {boolean} Returns `true` if `value` is `undefined`, else `false`.
+    * @example
+    *
+    * isUndefined(void 0); // => true
+    *
+    * isUndefined(null); // => false
+    */
+export const isUndefined = (value) => value === undefined;
\ No newline at end of file
diff --git a/ving/utils/ouch.mjs b/ving/utils/ouch.mjs
index 7051cb6d..768c19c9 100644
--- a/ving/utils/ouch.mjs
+++ b/ving/utils/ouch.mjs
@@ -1,5 +1,5 @@
 import { createError } from 'h3';
-import _ from 'lodash';
+import { isObject, isString } from '#ving/utils/identify.mjs';
 
 /**
  * The list of error codes matching a basic message that `ouch` supports to give an HTTP status message. An unknown code will result in a `500` status message
@@ -34,10 +34,10 @@ const errorCodes = {
  */
 export const ouch = (code, error, data) => {
     let message = '';
-    if (_.isString(error)) {
+    if (isString(error)) {
         message = error;
     }
-    else if (_.isObject(error) && 'message' in error && _.isString(error.message)) {
+    else if (isObject(error) && 'message' in error && isString(error.message)) {
         message = error.message;
     }
     else {
diff --git a/ving/utils/rest.mjs b/ving/utils/rest.mjs
index fe80d417..6c862fd1 100644
--- a/ving/utils/rest.mjs
+++ b/ving/utils/rest.mjs
@@ -1,7 +1,7 @@
 import { like, eq, and, or, gt, lt, gte, lte, ne } from '#ving/drizzle/orm.mjs';
 import { getQuery, readBody } from 'h3';
 import { ouch } from '#ving/utils/ouch.mjs';
-import _ from 'lodash';
+import { isObject, isArray, isString, isUndefined, isNil } from '#ving/utils/identify.mjs';
 
 /**
  * Formatting of ingested data to make it match the SQL data where it will be stored. It 
@@ -39,7 +39,7 @@ export const describeListWhere = (event, filter) => {
     const query = getQuery(event);
     if (query.search) {
         for (const column of filter.queryable) {
-            if (where === undefined) {
+            if (isUndefined(where)) {
                 where = like(column, `%${query.search}%`);
             }
             else {
@@ -98,7 +98,7 @@ export const describeListWhere = (event, filter) => {
         }
     }
     for (const item of ands) {
-        if (where === undefined) {
+        if (isUndefined(where)) {
             where = item;
         }
         else {
@@ -116,11 +116,11 @@ export const describeListWhere = (event, filter) => {
  * @throws 441 if a field is required and is undefined or empty
  */
 export const testRequired = (list, params) => {
-    if (params === undefined) {
+    if (isUndefined(params)) {
         throw ouch(400, 'No params detected.');
     }
     for (const field of list) {
-        if (!(field in params) || params[field] === undefined || params[field] == '') {
+        if (!(field in params) || isNil(params[field])) {
             throw ouch(441, `${field} is required.`, field);
         }
     }
@@ -162,28 +162,28 @@ export const obtainSessionIfRole = (event, role) => {
 export const includeParams = (event) => {
     const params = getQuery(event);
     const include = { options: false, links: false, related: [], extra: [], meta: false };
-    if ('includeOptions' in params && params.includeOptions !== undefined && params.includeOptions !== null && !Array.isArray(params.includeOptions)) {
+    if ('includeOptions' in params && !isNil(params.includeOptions) && !isArray(params.includeOptions)) {
         include.options = /^true$/i.test(params.includeOptions);
     }
-    if ('includeLinks' in params && params.includeLinks !== undefined && params.includeLinks !== null && !Array.isArray(params.includeLinks)) {
+    if ('includeLinks' in params && !isNil(params.includeLinks) && !isArray(params.includeLinks)) {
         include.links = true;
     }
-    if ('includeMeta' in params && params.includeMeta !== undefined && params.includeMeta !== null && !Array.isArray(params.includeMeta)) {
+    if ('includeMeta' in params && !isNil(params.includeMeta) && !isArray(params.includeMeta)) {
         include.meta = true;
     }
-    if ('includeRelated' in params && params.includeRelated !== undefined && params.includeRelated !== null) {
-        if (Array.isArray(params.includeRelated)) {
+    if ('includeRelated' in params && !isNil(params.includeRelated)) {
+        if (isArray(params.includeRelated)) {
             include.related = params.includeRelated;
         }
-        else if (include.related !== undefined) {
+        else if (!isUndefined(include.related)) {
             include.related.push(params.includeRelated);
         }
     }
-    if ('includeExtra' in params && params.includeExtra !== undefined && params.includeExtra !== null) {
-        if (Array.isArray(params.includeExtra)) {
+    if ('includeExtra' in params && !isNil(params.includeExtra)) {
+        if (isArray(params.includeExtra)) {
             include.extra = params.includeExtra;
         }
-        else if (include.extra !== undefined) {
+        else if (!isUndefined(include.extra)) {
             include.extra.push(params.includeExtra);
         }
     }
@@ -213,16 +213,16 @@ export const describeListParams = (event, session) => {
 export const pagingParams = (event) => {
     const params = getQuery(event);
     const paging = { itemsPerPage: 10, page: 1, sortBy: ['createdAt'], sortOrder: 'asc' };
-    if (params !== undefined) {
+    if (!isUndefined(params)) {
         if (params.itemsPerPage)
             paging.itemsPerPage = Number(params.itemsPerPage);
         if (params.page)
             paging.page = Number(params.page);
-        if (params.sortBy && _.isString(params.sortBy))
+        if (params.sortBy && isString(params.sortBy))
             paging.sortBy = [params.sortBy];
-        if (params.sortBy && _.isArray(params.sortBy))
+        if (params.sortBy && isArray(params.sortBy))
             paging.sortBy = params.sortBy;
-        if (params.sortOrder && _.isString(params.sortOrder) && ['asc', 'desc'].includes(params.sortOrder))
+        if (params.sortOrder && isString(params.sortOrder) && ['asc', 'desc'].includes(params.sortOrder))
             paging.sortOrder = params.sortOrder;
     }
     return paging;
@@ -236,7 +236,7 @@ export const pagingParams = (event) => {
  */
 export const getBody = async (event) => {
     const body = await readBody(event);
-    if (body === undefined || (body && _.isObjectLike(body)))
+    if (isUndefined(body) || (body && isObject(body)))
         return body;
     throw ouch(400, 'Malformed body JSON. Perhaps you have a dangling comma.');
 }
\ No newline at end of file