functional-models 3.2.1 → 3.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/orm/query.d.ts +3 -15
  2. package/orm/query.js +3 -2
  3. package/orm/query.js.map +1 -1
  4. package/orm/types.d.ts +17 -17
  5. package/orm/types.js +2 -0
  6. package/orm/types.js.map +1 -1
  7. package/package.json +1 -1
package/orm/query.d.ts CHANGED
@@ -77,11 +77,7 @@ declare const textQuery: (key: string, value: string | undefined | null, options
77
77
  value: any;
78
78
  valueType: DatastoreValueType;
79
79
  equalitySymbol: EqualitySymbol;
80
- options: {
81
- caseSensitive?: boolean;
82
- startsWith?: boolean;
83
- endsWith?: boolean;
84
- };
80
+ options: PropertyOptions;
85
81
  }>;
86
82
  /**
87
83
  * A helper query that is number based.
@@ -95,11 +91,7 @@ declare const numberQuery: (key: string, value: number | string | undefined | nu
95
91
  value: any;
96
92
  valueType: DatastoreValueType;
97
93
  equalitySymbol: EqualitySymbol;
98
- options: {
99
- caseSensitive?: boolean;
100
- startsWith?: boolean;
101
- endsWith?: boolean;
102
- };
94
+ options: PropertyOptions;
103
95
  }>;
104
96
  /**
105
97
  * A helper query that is for boolean values.
@@ -112,11 +104,7 @@ declare const booleanQuery: (key: string, value: boolean | undefined | null) =>
112
104
  value: any;
113
105
  valueType: DatastoreValueType;
114
106
  equalitySymbol: EqualitySymbol;
115
- options: {
116
- caseSensitive?: boolean;
117
- startsWith?: boolean;
118
- endsWith?: boolean;
119
- };
107
+ options: PropertyOptions;
120
108
  }>;
121
109
  /**
122
110
  * A useful utility for processing {@link QueryTokens} with a {@link DatastoreAdapter}
package/orm/query.js CHANGED
@@ -97,12 +97,13 @@ const _queryBuilder = (data = undefined) => {
97
97
  * @param options - Additional options for changing this property query.
98
98
  */
99
99
  const property = (key, value, options = {}) => {
100
- const { equalitySymbol = types_1.EqualitySymbol.eq, caseSensitive, startsWith, endsWith, type, } = options;
100
+ const { equalitySymbol = types_1.EqualitySymbol.eq, caseSensitive, startsWith, endsWith, includes, type, } = options;
101
101
  const typeToUse = type || types_1.DatastoreValueType.string;
102
102
  if (!types_1.AllowableEqualitySymbols.includes(equalitySymbol)) {
103
103
  throw new Error(`${equalitySymbol} is not a valid symbol`);
104
104
  }
105
105
  if (equalitySymbol !== types_1.EqualitySymbol.eq &&
106
+ equalitySymbol !== types_1.EqualitySymbol.ne &&
106
107
  typeToUse === types_1.DatastoreValueType.string) {
107
108
  throw new Error(`Cannot use a non = symbol for a string type`);
108
109
  }
@@ -112,7 +113,7 @@ const property = (key, value, options = {}) => {
112
113
  value,
113
114
  valueType: typeToUse,
114
115
  equalitySymbol,
115
- options: Object.assign(Object.assign(Object.assign({}, _objectize('caseSensitive', caseSensitive)), _objectize('startsWith', startsWith)), _objectize('endsWith', endsWith)),
116
+ options: Object.assign(Object.assign(Object.assign(Object.assign({}, _objectize('caseSensitive', caseSensitive)), _objectize('startsWith', startsWith)), _objectize('endsWith', endsWith)), _objectize('includes', includes)),
116
117
  };
117
118
  return propertyEntry;
118
119
  };
package/orm/query.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/orm/query.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/orm/query.ts"],"names":[],"mappings":";;;;;;AAAA,yDAAgC;AAChC,uDAA8B;AAC9B,mCAoBgB;AAEhB,MAAM,KAAK,GAAG,CAAC,CAAA;AAEf,MAAM,UAAU,GAAG,CAAI,GAAW,EAAE,KAAQ,EAAE,EAAE;IAC9C,OAAO,KAAK;QACV,CAAC,CAAC;YACE,CAAC,GAAG,CAAC,EAAE,KAAK;SACb;QACH,CAAC,CAAC,EAAE,CAAA;AACR,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,CAAC,IAAe,EAAkC,EAAE;IAC1E,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAA;IAC9B,MAAM,WAAW,GAAG,IAAA,cAAI,EAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;IACpD,aAAa;IACb,uCACK,KAAK,GACL,WAAW,EACf;AACH,CAAC,CAAA;AAED,MAAM,KAAK,GAAG,CAAC,IAAe,EAAiB,EAAE;IAC/C,OAAO;QACL,GAAG,EAAE,GAAG,EAAE;YACR,OAAO,aAAa,iCAAM,IAAI,KAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,IAAG,CAAA;QACpE,CAAC;QACD,EAAE,EAAE,GAAG,EAAE;YACP,OAAO,aAAa,iCAAM,IAAI,KAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAG,CAAA;QACnE,CAAC;QACD,OAAO,EAAE,GAAG,EAAE;YACZ,OAAO,IAAI,CAAA;QACb,CAAC;QACD,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE;YACpB,OAAO,eAAe,iCAAM,IAAI,KAAE,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,IAAG,CAAA;QACtD,CAAC;QACD,IAAI,EAAE,CAAC,GAAW,EAAE,KAAK,GAAG,iBAAS,CAAC,GAAG,EAAE,EAAE;YAC3C,OAAO,eAAe,iCAAM,IAAI,KAAE,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAG,CAAA;QAC7D,CAAC;QACD,UAAU,EAAE,CAAC,KAAU,EAAE,EAAE;YACzB,OAAO,eAAe,iCAAM,IAAI,KAAE,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,IAAG,CAAA;QAC9D,CAAC;KACF,CAAA;AACH,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,GAAQ,EAAuC,EAAE;IACpE,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;AAC7B,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,CAAC,IAAe,EAAkB,EAAE;IACrD,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,KAAU,EAAE,OAAyB,EAAE,EAAE;QAC1E,aAAa;QACb,MAAM,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;QACxC,OAAO,KAAK,CAAC,IAAA,eAAK,EAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAC5D,CAAC,CAAA;IAED,MAAM,OAAO,GAAG,CAAC,cAAkC,EAAE,EAAE;QACrD,MAAM,UAAU,GAAG,aAAa,EAAE,CAAA;QAClC,MAAM,MAAM,GAAG,cAAc,CAAC,UAAU,CAAC,CAAA;QACzC,IAAI,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;YACxB,MAAM,WAAW,GAA6B,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAA;YACtE,OAAO,KAAK,CACV,IAAA,eAAK,EAAC,IAAI,EAAE;gBACV,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC;aACtC,CAAC,CACH,CAAA;QACH,CAAC;QACD,aAAa;QACb,OAAO,KAAK,CAAC,IAAA,eAAK,EAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IACzE,CAAC,CAAA;IAED,MAAM,eAAe,GAAG,CACtB,GAAW,EACX,MAAqB,EACrB,EAAE,SAAS,GAAG,0BAAkB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAAE,GAAG,EAAE,EACrE,EAAE;QACF,MAAM,CAAC,GAAG,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC,CAAA;QACnE,OAAO,KAAK,CAAC,IAAA,eAAK,EAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAC5D,CAAC,CAAA;IAED,MAAM,cAAc,GAAG,CACrB,GAAW,EACX,MAAqB,EACrB,EAAE,SAAS,GAAG,0BAAkB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,EAAE,GAAG,EAAE,EACpE,EAAE;QACF,MAAM,CAAC,GAAG,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC,CAAA;QACjE,OAAO,KAAK,CAAC,IAAA,eAAK,EAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAC5D,CAAC,CAAA;IAED,OAAO;QACL,WAAW,EAAE,eAAe;QAC5B,UAAU,EAAE,cAAc;QAC1B,OAAO;QACP,QAAQ,EAAE,WAAW;KACtB,CAAA;AACH,CAAC,CAAA;AAED,MAAM,aAAa,GAAG,CACpB,OAAuC,SAAS,EAClC,EAAE;IAChB,MAAM,OAAO,GAAG,IAAA,eAAK,EACnB;QACE,KAAK,EAAE,EAAE;KACV,EACD,IAAI,CACL,CAAA;IACD,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,CAAA;IACnC,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,CAAA;IACzC,aAAa;IACb,qDACK,OAAO,GACP,QAAQ,KACX,OAAO,EAAE,GAAG,EAAE;YACZ,OAAO,4DACF,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,GAChC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,GAChC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,KACnC,KAAK,EAAE,EAAE,GACG,CAAA;QAChB,CAAC,IACF;AACH,CAAC,CAAA;AAED;;;;;GAKG;AACH,MAAM,QAAQ,GAAG,CACf,GAAW,EACX,KAAU,EACV,UAA2B,EAAE,EACd,EAAE;IACjB,MAAM,EACJ,cAAc,GAAG,sBAAc,CAAC,EAAE,EAClC,aAAa,EACb,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,IAAI,GACL,GAAG,OAAO,CAAA;IACX,MAAM,SAAS,GAAG,IAAI,IAAI,0BAAkB,CAAC,MAAM,CAAA;IACnD,IAAI,CAAC,gCAAwB,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CAAC,GAAG,cAAc,wBAAwB,CAAC,CAAA;IAC5D,CAAC;IACD,IACE,cAAc,KAAK,sBAAc,CAAC,EAAE;QACpC,cAAc,KAAK,sBAAc,CAAC,EAAE;QACpC,SAAS,KAAK,0BAAkB,CAAC,MAAM,EACvC,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;IAChE,CAAC;IAED,MAAM,aAAa,GAAkB;QACnC,IAAI,EAAE,UAAU;QAChB,GAAG;QACH,KAAK;QACL,SAAS,EAAE,SAAS;QACpB,cAAc;QACd,OAAO,8DACF,UAAU,CAAC,eAAe,EAAE,aAAa,CAAC,GAC1C,UAAU,CAAC,YAAY,EAAE,UAAU,CAAC,GACpC,UAAU,CAAC,UAAU,EAAE,QAAQ,CAAC,GAChC,UAAU,CAAC,UAAU,EAAE,QAAQ,CAAC,CACpC;KACF,CAAA;IACD,OAAO,aAAa,CAAA;AACtB,CAAC,CAAA;AAmSC,4BAAQ;AAjSV;;;GAGG;AACH,MAAM,IAAI,GAAG,CAAC,GAAW,EAAqB,EAAE;IAC9C,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;IACrC,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,WAAW,GAAG,sBAAsB,CAAC,CAAA;IACvD,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAoRC,oBAAI;AAlRN;;;;GAIG;AACH,MAAM,IAAI,GAAG,CACX,GAAW,EACX,QAA+B,iBAAS,CAAC,GAAG,EAC7B,EAAE;IACjB,IAAI,KAAK,KAAK,iBAAS,CAAC,GAAG,IAAI,KAAK,KAAK,iBAAS,CAAC,GAAG,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;IACnD,CAAC;IACD,OAAO;QACL,GAAG;QACH,KAAK;KACN,CAAA;AACH,CAAC,CAAA;AAoQC,oBAAI;AAlQN;;;GAGG;AACH,MAAM,UAAU,GAAG,CAAC,KAAU,EAAmB,EAAE;IACjD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AA2PC,gCAAU;AAzPZ;;;;;GAKG;AACH,MAAM,UAAU,GAAG,CACjB,GAAW,EACX,MAAqB,EACrB,UAAuE;IACrE,SAAS,EAAE,0BAAkB,CAAC,IAAI;IAClC,eAAe,EAAE,IAAI;CACtB,EACgB,EAAE;IACnB,MAAM,EAAE,SAAS,GAAG,0BAAkB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,EAAE,GACnE,OAAO,CAAA;IACT,OAAO;QACL,IAAI,EAAE,YAAY;QAClB,GAAG;QACH,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,MAAM;QACpD,SAAS;QACT,OAAO,EAAE;YACP,eAAe;SAChB;KACF,CAAA;AACH,CAAC,CAAA;AAwOC,gCAAU;AAtOZ;;;GAGG;AACH,MAAM,MAAM,GAAG,CAAC,GAAkB,EAAe,EAAE;IACjD,aAAa;IACb,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;AACjC,CAAC,CAAA;AAED;;;;;GAKG;AACH,MAAM,WAAW,GAAG,CAClB,GAAW,EACX,MAAqB,EACrB,UAAwE;IACtE,SAAS,EAAE,0BAAkB,CAAC,IAAI;IAClC,gBAAgB,EAAE,IAAI;CACvB,EACiB,EAAE;IACpB,MAAM,EAAE,SAAS,GAAG,0BAAkB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAAE,GACpE,OAAO,CAAA;IACT,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,GAAG;QACH,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,MAAM;QACpD,SAAS;QACT,OAAO,EAAE;YACP,gBAAgB;SACjB;KACF,CAAA;AACH,CAAC,CAAA;AAmMC,kCAAW;AAjMb;;;GAGG;AACH,MAAM,YAAY,GAAG,GAAiB,EAAE;IACtC,OAAO,aAAa,EAAE,CAAA;AACxB,CAAC,CAAA;AAkLC,oCAAY;AAhLd;;;GAGG;AACH,MAAM,oBAAoB,GAAG,CAAC,KAAU,EAAkB,EAAE;IAC1D,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QAC1B,OAAO,KAAK,CAAA;IACd,CAAC;IACD,OAAO,CACL,KAAK,CAAC,IAAI,KAAK,UAAU;QACzB,KAAK,CAAC,IAAI,KAAK,aAAa;QAC5B,KAAK,CAAC,IAAI,KAAK,YAAY,CAC5B,CAAA;AACH,CAAC,CAAA;AA2KC,oDAAoB;AAzKtB;;;GAGG;AACH,MAAM,YAAY,GAAG,CAAC,KAAU,EAAyB,EAAE;IACzD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,KAAK,CAAA;IACd,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAA;IACd,CAAC;IACD,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAA;IAC3B,OAAO,KAAK,KAAK,KAAK,IAAI,KAAK,KAAK,IAAI,CAAA;AAC1C,CAAC,CAAA;AA2JC,oCAAY;AAzJd;;GAEG;AACH,MAAM,GAAG,GAAG,GAAG,EAAE,CAAC,KAAK,CAAA;AAoJrB,kBAAG;AAlJL;;GAEG;AACH,MAAM,EAAE,GAAG,GAAG,EAAE,CAAC,IAAI,CAAA;AAgJnB,gBAAE;AA9IJ;;;;;GAKG;AACH,MAAM,SAAS,GAAG,CAChB,GAAW,EACX,KAAgC,EAChC,OAAmE,EACnE,EAAE,CACF,QAAQ,CACN,GAAG,EACH,KAAK,EACL,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE;IACzB,cAAc,EAAE,SAAS;IACzB,IAAI,EAAE,0BAAkB,CAAC,MAAM;CAChC,CAAC,CACH,CAAA;AAiID,8BAAS;AA/HX;;;;;GAKG;AACH,MAAM,WAAW,GAAG,CAClB,GAAW,EACX,KAAyC,EACzC,iBAAiC,sBAAc,CAAC,EAAE,EAClD,EAAE,CACF,QAAQ,CAAC,GAAG,EAAE,KAAK,EAAE;IACnB,cAAc;IACd,IAAI,EAAE,0BAAkB,CAAC,MAAM;CAChC,CAAC,CAAA;AAkHF,kCAAW;AAhHb;;;;GAIG;AACH,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,KAAiC,EAAE,EAAE,CACtE,QAAQ,CAAC,GAAG,EAAE,KAAK,EAAE;IACnB,IAAI,EAAE,0BAAkB,CAAC,OAAO;IAChC,cAAc,EAAE,sBAAc,CAAC,EAAE;CAClC,CAAC,CAAA;AAwGF,oCAAY;AAtGd;;;;GAIG;AACH,MAAM,UAAU,GAAG,CAAI,IAAS,EAAS,EAAE;IACzC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3C,OAAO,EAAE,CAAA;IACX,CAAC;IACD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;IAC3D,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;IAClC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAC1B,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,CAAA;IACnC,OAAO,CAAC,KAAK,EAAE,GAAG,UAAU,CAAC,CAAA;AAC/B,CAAC,CAAA;AAuFC,gCAAU;AArFZ,MAAM,mBAAmB,GAAG,CAAC,KAAkB,EAAE,EAAE;IACjD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;QAClC,OAAM;IACR,CAAC;IACD,IAAI,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC;QAChC,OAAM;IACR,CAAC;IACD,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,OAAM;IACR,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,sBAAsB,KAAK,EAAE,CAAC,CAAA;AAChD,CAAC,CAAA;AAED,MAAM,uBAAuB,GAAG,CAAC,CAAgB,EAAE,EAAE;IACnD,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAClB,IAAI,KAAK,KAAK,KAAK,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;IAC7D,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IAC5B,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;IAC3D,CAAC;IACD,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE,CAAC;QAC5C,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;QAC9B,OAAM;IACR,CAAC;IACD,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,CAAC,CAAA;IAC3D,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,CAAC,CAAA;IACzD,IAAI,UAAU,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAA;IACnE,CAAC;IACD,qDAAqD;IACrD,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAA;IACtC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QAC3B,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YAC9B,aAAa;YACb,IAAI,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5B,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAA;YAC9D,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;QAC5D,CAAC;QACD,qBAAqB,CAAC,CAAC,CAAC,CAAA;QACxB,qBAAqB,CAAC,CAAC,CAAC,CAAA;IAC1B,CAAC,CAAC,CAAA;IACF,OAAM;AACR,CAAC,CAAA;AAED,MAAM,qBAAqB,GAAG,CAAC,CAAc,EAAE,EAAE;IAC/C,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACrB,uBAAuB,CAAC,CAAC,CAAC,CAAA;QAC1B,OAAM;IACR,CAAC;IACD,IAAI,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5B,OAAM;IACR,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;AAC7D,CAAC,CAAA;AAED,MAAM,iBAAiB,GAAG,CAAC,MAAiB,EAAE,EAAE;IAC9C,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;IAC3C,CAAC;IACD,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,OAAM;IACR,CAAC;IACD,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACjC,uBAAuB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AACvC,CAAC,CAAA;AAkBC,8CAAiB"}
package/orm/types.d.ts CHANGED
@@ -7,7 +7,8 @@ declare enum EqualitySymbol {
7
7
  lt = "<",
8
8
  lte = "<=",
9
9
  gt = ">",
10
- gte = ">="
10
+ gte = ">=",
11
+ ne = "!="
11
12
  }
12
13
  /**
13
14
  * The value types that map to database types.
@@ -269,21 +270,16 @@ type PropertyQuery = Readonly<{
269
270
  /**
270
271
  * Options for additional matching.
271
272
  */
272
- options: {
273
- /**
274
- * Should this be a case sensitive search. (for text)
275
- */
276
- caseSensitive?: boolean;
277
- /**
278
- * Indicates that the value is a "startsWith" query.
279
- */
280
- startsWith?: boolean;
281
- /**
282
- * Indicates that the value is a "endsWith" query.
283
- */
284
- endsWith?: boolean;
285
- };
273
+ options: PropertyOptions;
286
274
  }>;
275
+ /**
276
+ * A property search for a string value.
277
+ */
278
+ type StringPropertyQuery = PropertyQuery & {
279
+ valueType: DatastoreValueType.string;
280
+ equalitySymbol: EqualitySymbol.eq | EqualitySymbol.ne;
281
+ options: PropertyOptions;
282
+ };
287
283
  /**
288
284
  * A search that looks at dated objects after the given date.
289
285
  * @interface
@@ -384,6 +380,10 @@ type PropertyOptions = {
384
380
  * Is the value a endsWith query?
385
381
  */
386
382
  endsWith?: boolean;
383
+ /**
384
+ * Is the value a includes query?
385
+ */
386
+ includes?: boolean;
387
387
  /**
388
388
  * The type of value
389
389
  */
@@ -462,7 +462,7 @@ type OrmSearch = {
462
462
  /**
463
463
  * Statements that make up the meat of QueryTokens
464
464
  */
465
- type Query = PropertyQuery | DatesAfterQuery | DatesBeforeQuery;
465
+ type Query = PropertyQuery | DatesAfterQuery | DatesBeforeQuery | StringPropertyQuery;
466
466
  /**
467
467
  * A token type that links two queries together.
468
468
  */
@@ -561,4 +561,4 @@ type InnerBuilderV2 = {
561
561
  */
562
562
  property: (key: string, value: any, options?: Partial<PropertyOptions>) => BuilderV2Link;
563
563
  };
564
- export { PropertyQuery, SortStatement, DatesAfterQuery, DatesBeforeQuery, PaginationQuery, MaxMatchStatement, OrmModel, OrmModelInstance, DatastoreAdapter, OrmModelFactory, SaveOverride, DeleteOverride, OrmPropertyConfig, DatastoreSearchResult, OrmValidatorContext, OrmSearchResult, EqualitySymbol, DatastoreValueType, AllowableEqualitySymbols, PropertyOptions, Orm, OrmModelExtensions, OrmModelInstanceExtensions, OrmModelFactoryOptionsExtensions, MinimumOrmModelDefinition, QueryBuilder, BuilderV2Link, SubBuilderFunction, OrmSearch, Query, BooleanQuery, QueryTokens, InnerBuilderV2, SortOrder, };
564
+ export { PropertyQuery, SortStatement, DatesAfterQuery, DatesBeforeQuery, PaginationQuery, MaxMatchStatement, OrmModel, OrmModelInstance, DatastoreAdapter, OrmModelFactory, SaveOverride, DeleteOverride, OrmPropertyConfig, DatastoreSearchResult, OrmValidatorContext, OrmSearchResult, EqualitySymbol, DatastoreValueType, AllowableEqualitySymbols, PropertyOptions, Orm, OrmModelExtensions, OrmModelInstanceExtensions, OrmModelFactoryOptionsExtensions, MinimumOrmModelDefinition, QueryBuilder, BuilderV2Link, SubBuilderFunction, OrmSearch, Query, BooleanQuery, QueryTokens, InnerBuilderV2, SortOrder, StringPropertyQuery, };
package/orm/types.js CHANGED
@@ -16,6 +16,8 @@ var EqualitySymbol;
16
16
  EqualitySymbol["gt"] = ">";
17
17
  // Equal to or greater than
18
18
  EqualitySymbol["gte"] = ">=";
19
+ // Not equal to
20
+ EqualitySymbol["ne"] = "!=";
19
21
  })(EqualitySymbol || (exports.EqualitySymbol = EqualitySymbol = {}));
20
22
  /**
21
23
  * The value types that map to database types.
package/orm/types.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/orm/types.ts"],"names":[],"mappings":";;;AAgBA;;GAEG;AACH,IAAK,cAWJ;AAXD,WAAK,cAAc;IACjB,SAAS;IACT,0BAAQ,CAAA;IACR,YAAY;IACZ,0BAAQ,CAAA;IACR,wBAAwB;IACxB,4BAAU,CAAA;IACV,eAAe;IACf,0BAAQ,CAAA;IACR,2BAA2B;IAC3B,4BAAU,CAAA;AACZ,CAAC,EAXI,cAAc,8BAAd,cAAc,QAWlB;AAED;;GAEG;AACH,IAAK,kBAMJ;AAND,WAAK,kBAAkB;IACrB,uCAAiB,CAAA;IACjB,uCAAiB,CAAA;IACjB,mCAAa,CAAA;IACb,uCAAiB,CAAA;IACjB,yCAAmB,CAAA;AACrB,CAAC,EANI,kBAAkB,kCAAlB,kBAAkB,QAMtB;AAED;;GAEG;AACH,MAAM,wBAAwB,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;AA6wB5D,4DAAwB;AAtM1B;;GAEG;AACH,IAAK,SAGJ;AAHD,WAAK,SAAS;IACZ,wBAAW,CAAA;IACX,wBAAW,CAAA;AACb,CAAC,EAHI,SAAS,yBAAT,SAAS,QAGb"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/orm/types.ts"],"names":[],"mappings":";;;AAgBA;;GAEG;AACH,IAAK,cAaJ;AAbD,WAAK,cAAc;IACjB,SAAS;IACT,0BAAQ,CAAA;IACR,YAAY;IACZ,0BAAQ,CAAA;IACR,wBAAwB;IACxB,4BAAU,CAAA;IACV,eAAe;IACf,0BAAQ,CAAA;IACR,2BAA2B;IAC3B,4BAAU,CAAA;IACV,eAAe;IACf,2BAAS,CAAA;AACX,CAAC,EAbI,cAAc,8BAAd,cAAc,QAalB;AAED;;GAEG;AACH,IAAK,kBAMJ;AAND,WAAK,kBAAkB;IACrB,uCAAiB,CAAA;IACjB,uCAAiB,CAAA;IACjB,mCAAa,CAAA;IACb,uCAAiB,CAAA;IACjB,yCAAmB,CAAA;AACrB,CAAC,EANI,kBAAkB,kCAAlB,kBAAkB,QAMtB;AAED;;GAEG;AACH,MAAM,wBAAwB,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;AAixB5D,4DAAwB;AA1M1B;;GAEG;AACH,IAAK,SAGJ;AAHD,WAAK,SAAS;IACZ,wBAAW,CAAA;IACX,wBAAW,CAAA;AACb,CAAC,EAHI,SAAS,yBAAT,SAAS,QAGb"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "functional-models",
3
- "version": "3.2.1",
3
+ "version": "3.3.0",
4
4
  "description": "Functional models is ooey gooey framework for building and using awesome models EVERYWHERE.",
5
5
  "main": "index.js",
6
6
  "types": "index.d.ts",