functional-models 3.8.2 → 3.8.4

package/index.d.ts

@@ -10,3 +10,4 @@ export * from './errors';
 export * as errors from './errors';
 export * as orm from './orm';
 export * from './orm';
+export * from './orm/libs';

package/index.js

@@ -49,4 +49,5 @@ __exportStar(require("./errors"), exports);
 exports.errors = __importStar(require("./errors"));
 exports.orm = __importStar(require("./orm"));
 __exportStar(require("./orm"), exports);
+__exportStar(require("./orm/libs"), exports);
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAuB;AACvB,iDAAgC;AAChC,2CAAwB;AACxB,mDAAkC;AAClC,+CAA4B;AAC5B,2DAA0C;AAC1C,+CAA4B;AAC5B,2DAA0C;AAC1C,2CAAwB;AACxB,mDAAkC;AAClC,6CAA4B;AAC5B,wCAAqB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAuB;AACvB,iDAAgC;AAChC,2CAAwB;AACxB,mDAAkC;AAClC,+CAA4B;AAC5B,2DAA0C;AAC1C,+CAA4B;AAC5B,2DAA0C;AAC1C,2CAAwB;AACxB,mDAAkC;AAClC,6CAA4B;AAC5B,wCAAqB;AACrB,6CAA0B"}

package/orm/libs.d.ts

@@ -0,0 +1,10 @@
+import { QueryBuilder, DatastoreValueType, PropertyOptions } from './types';
+/**
+ * Creates multiple property OR queries added to the passed in query builder.
+ * Returns another QueryBuilder.
+ */
+export declare const multipleOrQuery: <T>(queryBuilder: QueryBuilder, propertyKey: string, values: readonly T[], propertyType?: DatastoreValueType, propertyOptions?: PropertyOptions) => QueryBuilder;
+/**
+ * Creates multiple AND queries.
+ */
+export declare const multipleAndQuery: <T>(queryBuilder: QueryBuilder, propertyKey: string, values: readonly T[], propertyType?: DatastoreValueType) => QueryBuilder;

package/orm/libs.js

@@ -0,0 +1,44 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.multipleAndQuery = exports.multipleOrQuery = void 0;
+const flow_js_1 = __importDefault(require("lodash/flow.js"));
+const types_1 = require("./types");
+/**
+ * Creates multiple property OR queries added to the passed in query builder.
+ * Returns another QueryBuilder.
+ */
+const multipleOrQuery = (queryBuilder, propertyKey, values, propertyType, propertyOptions) => {
+    if (values.length === 0) {
+        return queryBuilder;
+    }
+    return (0, flow_js_1.default)(values.map((v, index) => {
+        return (qb) => {
+            const withProperty = qb.property(propertyKey, v, Object.assign(Object.assign({}, (propertyOptions || {})), { type: propertyType || types_1.DatastoreValueType.string }));
+            // Add 'or()' only if this is not the last item
+            return index < values.length - 1 ? withProperty.or() : withProperty;
+        };
+    }))(queryBuilder);
+};
+exports.multipleOrQuery = multipleOrQuery;
+/**
+ * Creates multiple AND queries.
+ */
+const multipleAndQuery = (queryBuilder, propertyKey, values, propertyType) => {
+    if (values.length === 0) {
+        return queryBuilder;
+    }
+    return (0, flow_js_1.default)(values.map((v, index) => {
+        return (qb) => {
+            const withProperty = qb.property(propertyKey, v, {
+                type: propertyType || types_1.DatastoreValueType.string,
+            });
+            // Add 'or()' only if this is not the last item
+            return index < values.length - 1 ? withProperty.and() : withProperty;
+        };
+    }))(queryBuilder);
+};
+exports.multipleAndQuery = multipleAndQuery;
+//# sourceMappingURL=libs.js.map

package/orm/libs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"libs.js","sourceRoot":"","sources":["../../src/orm/libs.ts"],"names":[],"mappings":";;;;;;AAAA,6DAAiC;AACjC,mCAA2E;AAE3E;;;GAGG;AACI,MAAM,eAAe,GAAG,CAC7B,YAA0B,EAC1B,WAAmB,EACnB,MAAoB,EACpB,YAAiC,EACjC,eAAiC,EACnB,EAAE;IAChB,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,YAAY,CAAA;IACrB,CAAC;IAED,OAAO,IAAA,iBAAI,EACT,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QACtB,OAAO,CAAC,EAAgB,EAAE,EAAE;YAC1B,MAAM,YAAY,GAAG,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,kCAC1C,CAAC,eAAe,IAAI,EAAE,CAAC,KAC1B,IAAI,EAAE,YAAY,IAAI,0BAAkB,CAAC,MAAM,IAC/C,CAAA;YACF,+CAA+C;YAC/C,OAAO,KAAK,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAA;QACrE,CAAC,CAAA;IACH,CAAC,CAAC,CACH,CAAC,YAAY,CAAC,CAAA;AACjB,CAAC,CAAA;AAvBY,QAAA,eAAe,mBAuB3B;AAED;;GAEG;AACI,MAAM,gBAAgB,GAAG,CAC9B,YAA0B,EAC1B,WAAmB,EACnB,MAAoB,EACpB,YAAiC,EACnB,EAAE;IAChB,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,YAAY,CAAA;IACrB,CAAC;IAED,OAAO,IAAA,iBAAI,EACT,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QACtB,OAAO,CAAC,EAAgB,EAAE,EAAE;YAC1B,MAAM,YAAY,GAAG,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,EAAE;gBAC/C,IAAI,EAAE,YAAY,IAAI,0BAAkB,CAAC,MAAM;aAChD,CAAC,CAAA;YACF,+CAA+C;YAC/C,OAAO,KAAK,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,YAAY,CAAA;QACtE,CAAC,CAAA;IACH,CAAC,CAAC,CACH,CAAC,YAAY,CAAC,CAAA;AACjB,CAAC,CAAA;AArBY,QAAA,gBAAgB,oBAqB5B"}

package/orm/validation.js

@@ -45,7 +45,7 @@ const _doUniqueCheck = (query, instance, instanceData, buildErrorMessage) => __a
  */
 const uniqueTogether = (propertyKeyArray) => {
     const _uniqueTogether = (instance, instanceData, options) => __awaiter(void 0, void 0, void 0, function* () {
-        if (options.noOrmValidation) {
+        if (options === null || options === void 0 ? void 0 : options.noOrmValidation) {
             return undefined;
         }
         const properties = propertyKeyArray.map(key => {

package/orm/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/orm/validation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uDAA8B;AAS9B,mCAAsC;AAStC,MAAM,cAAc,GAAG,CACrB,KAAgB,EAChB,QAA6B,EAC7B,YAA0B,EAC1B,iBAAyD,EACd,EAAE;IAC7C,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAA;IACjC,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACzC,MAAM,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAA;IAC9C,2CAA2C;IAC3C,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;QACtB,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,MAAM,GAAG,GAA8B,MAAM,OAAO,CAAC,GAAG,CACtD,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC,CACrD,CAAA;IACD,2BAA2B;IAC3B,aAAa;IACb,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,kBAAkB,EAAE,CAAC,cAAc,CAAC,CAAA;IAC1E,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE,CAAC;QAC9C,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnB,8FAA8F;QAC9F,+DAA+D;QAC/D,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,UAAU,CAAC,EAAE,CAAC;YACpC,OAAO,SAAS,CAAA;QAClB,CAAC;IACH,CAAC;IACD,OAAO,iBAAiB,EAAE,CAAA;AAC5B,CAAC,CAAA,CAAA;AAED;;;GAGG;AACH,MAAM,cAAc,GAAG,CACrB,gBAAmC,EAKnC,EAAE;IACF,MAAM,eAAe,GAAG,CACtB,QAA6B,EAC7B,YAA0B,EAC1B,OAA4B,EAC5B,EAAE;QACF,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;YAC5B,OAAO,SAAS,CAAA;QAClB,CAAC;QACD,MAAM,UAAU,GAAG,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC5C,aAAa;YACb,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;QACF,MAAM,KAAK,GAAG,IAAA,cAAI,EAChB,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE;YACrC,OAAO,CAAC,CAAC,EAAE;gBACT,4DAA4D;gBAC5D,IAAI,KAAK,GAAG,CAAC,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;oBACnC,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAA;gBACzD,CAAC;gBACD,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC,GAAG,EAAE,CAAA;YAC/D,CAAC,CAAA;QACH,CAAC,CAAC,CACH,CAAC,IAAA,oBAAY,GAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAA;QACnC,OAAO,cAAc,CAAI,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,EAAE;YAC3D,OAAO,gBAAgB,CAAC,MAAM,GAAG,CAAC;gBAChC,CAAC,CAAC,GAAG,gBAAgB,CAAC,IAAI,CACtB,GAAG,CACJ,mDAAmD;gBACtD,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,0CAA0C,CAAA;QACtE,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA,CAAA;IACD,OAAO,eAAe,CAAA;AACxB,CAAC,CAAA;AAkCgB,wCAAc;AAhC/B;;;;GAIG;AACH,MAAM,MAAM,GAAG,CACb,WAAmB,EAKnB,EAAE;IACF,MAAM,OAAO,GAIT,CAAC,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE;QAC7C,OAAO,cAAc,CAAI,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,CAAC,CAAA;IAC1E,CAAC,CAAA;IACD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAYQ,wBAAM;AAVf;;;GAGG;AACH,MAAM,wBAAwB,GAAG,CAAC,EAChC,eAAe,GAAG,KAAK,GACxB,EAAuB,EAAE,CAAC,CAAC;IAC1B,eAAe;CAChB,CAAC,CAAA;AAE+B,4DAAwB"}
+{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/orm/validation.ts"],"names":[],"mappings":"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"}

package/package.json

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