Orm update

.github/workflows/feature.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x, 22.x]
+        node-version: [18.x, 20.x, 22.x, 24.x]
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/ut.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x, 22.x]
+        node-version: [18.x, 20.x, 22.x, 24.x]
 
     steps:
       - uses: actions/checkout@v2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "functional-models",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "description": "Functional models is ooey gooey framework for building and using awesome models EVERYWHERE.",
   "main": "index.js",
   "types": "index.d.ts",

src/orm/query.ts

@@ -159,6 +159,7 @@ const property = (
     caseSensitive,
     startsWith,
     endsWith,
+    includes,
     type,
   } = options
   const typeToUse = type || DatastoreValueType.string
@@ -167,6 +168,7 @@ const property = (
   }
   if (
     equalitySymbol !== EqualitySymbol.eq &&
+    equalitySymbol !== EqualitySymbol.ne &&
     typeToUse === DatastoreValueType.string
   ) {
     throw new Error(`Cannot use a non = symbol for a string type`)
@@ -182,6 +184,7 @@ const property = (
       ..._objectize('caseSensitive', caseSensitive),
       ..._objectize('startsWith', startsWith),
       ..._objectize('endsWith', endsWith),
+      ..._objectize('includes', includes),
     },
   }
   return propertyEntry

src/orm/types.ts

@@ -28,6 +28,8 @@ enum EqualitySymbol {
   gt = '>',
   // Equal to or greater than
   gte = '>=',
+  // Not equal to
+  ne = '!=',
 }
 
 /**
@@ -479,22 +481,18 @@ type PropertyQuery = Readonly<{
   /**
    * Options for additional matching.
    */
-  options: {
-    /**
-     * Should this be a case sensitive search. (for text)
-     */
-    caseSensitive?: boolean
-    /**
-     * Indicates that the value is a "startsWith" query.
-     */
-    startsWith?: boolean
-    /**
-     * Indicates that the value is a "endsWith" query.
-     */
-    endsWith?: boolean
-  }
+  options: PropertyOptions
 }>
 
+/**
+ * A property search for a string value.
+ */
+type StringPropertyQuery = PropertyQuery & {
+  valueType: DatastoreValueType.string
+  equalitySymbol: EqualitySymbol.eq | EqualitySymbol.ne
+  options: PropertyOptions
+}
+
 /**
  * A search that looks at dated objects after the given date.
  * @interface
@@ -601,6 +599,10 @@ type PropertyOptions = {
    * Is the value a endsWith query?
    */
   endsWith?: boolean
+  /**
+   * Is the value a includes query?
+   */
+  includes?: boolean
   /**
    * The type of value
    */
@@ -686,7 +688,11 @@ type OrmSearch = {
 /**
  * Statements that make up the meat of QueryTokens
  */
-type Query = PropertyQuery | DatesAfterQuery | DatesBeforeQuery
+type Query =
+  | PropertyQuery
+  | DatesAfterQuery
+  | DatesBeforeQuery
+  | StringPropertyQuery
 
 /**
  * A token type that links two queries together.
@@ -841,4 +847,5 @@ export {
   QueryTokens,
   InnerBuilderV2,
   SortOrder,
+  StringPropertyQuery,
 }

test/src/orm/query.test.ts

@@ -425,6 +425,13 @@ describe('/src/orm/query.ts', () => {
         })
       }, 'blah is not a valid symbol')
     })
+    it('should NOT throw an exception if the type is string and equalitySymbol is ne', () => {
+      assert.doesNotThrow(() => {
+        property('my-name', 'my-value', {
+          equalitySymbol: EqualitySymbol.ne,
+        })
+      })
+    })
   })
   describe('#and()', () => {
     it('should return AND', () => {