@imbricate/core 3.8.1 → 3.8.2

package/database/definition.d.ts

@@ -6,24 +6,27 @@
 import { ImbricateAuthor } from "../author/definition";
 import { ImbricateDatabaseSchema } from "./schema";
 export declare enum IMBRICATE_QUERY_COMPARE_CONDITION {
-    EQUAL = "EQUAL"
+    EQUAL = "EQUAL",
+    EXIST = "EXIST"
+}
+export declare enum IMBRICATE_QUERY_ATTRIBUTE {
+    VALUE = "VALUE"
 }
 export declare enum IMBRICATE_QUERY_PROPERTY_CONDITION_TARGET {
     PROPERTY_TYPE = "PROPERTY_TYPE",
     PROPERTY_VALUE = "PROPERTY_VALUE"
 }
-export type ImbricateDocumentQueryPropertyFilterCondition = {
+export type ImbricateDocumentQueryPropertyFilter = {
+    readonly propertyIdentifier: string;
     readonly target: IMBRICATE_QUERY_PROPERTY_CONDITION_TARGET;
+    readonly attribute: IMBRICATE_QUERY_ATTRIBUTE;
     readonly condition: IMBRICATE_QUERY_COMPARE_CONDITION;
     readonly value: any;
 };
-export type ImbricateDocumentQueryPropertyFilter = {
-    readonly propertyIdentifier: string;
-    readonly conditions: ImbricateDocumentQueryPropertyFilterCondition[];
-};
 export type ImbricateDocumentQueryAnnotationFilter = {
     readonly namespace: string;
     readonly identifier: string;
+    readonly attribute: IMBRICATE_QUERY_ATTRIBUTE;
     readonly condition: IMBRICATE_QUERY_COMPARE_CONDITION;
     readonly value: any;
 };

package/database/definition.js

@@ -5,11 +5,16 @@
  * @description Definition
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IMBRICATE_DATABASE_EDIT_TYPE = exports.IMBRICATE_QUERY_PROPERTY_CONDITION_TARGET = exports.IMBRICATE_QUERY_COMPARE_CONDITION = void 0;
+exports.IMBRICATE_DATABASE_EDIT_TYPE = exports.IMBRICATE_QUERY_PROPERTY_CONDITION_TARGET = exports.IMBRICATE_QUERY_ATTRIBUTE = exports.IMBRICATE_QUERY_COMPARE_CONDITION = void 0;
 var IMBRICATE_QUERY_COMPARE_CONDITION;
 (function (IMBRICATE_QUERY_COMPARE_CONDITION) {
     IMBRICATE_QUERY_COMPARE_CONDITION["EQUAL"] = "EQUAL";
+    IMBRICATE_QUERY_COMPARE_CONDITION["EXIST"] = "EXIST";
 })(IMBRICATE_QUERY_COMPARE_CONDITION || (exports.IMBRICATE_QUERY_COMPARE_CONDITION = IMBRICATE_QUERY_COMPARE_CONDITION = {}));
+var IMBRICATE_QUERY_ATTRIBUTE;
+(function (IMBRICATE_QUERY_ATTRIBUTE) {
+    IMBRICATE_QUERY_ATTRIBUTE["VALUE"] = "VALUE";
+})(IMBRICATE_QUERY_ATTRIBUTE || (exports.IMBRICATE_QUERY_ATTRIBUTE = IMBRICATE_QUERY_ATTRIBUTE = {}));
 var IMBRICATE_QUERY_PROPERTY_CONDITION_TARGET;
 (function (IMBRICATE_QUERY_PROPERTY_CONDITION_TARGET) {
     IMBRICATE_QUERY_PROPERTY_CONDITION_TARGET["PROPERTY_TYPE"] = "PROPERTY_TYPE";

package/database/validate.js

@@ -6,6 +6,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateImbricateDocumentQuery = void 0;
+const definition_1 = require("./definition");
 /**
  * Validate imbricate document query
  *
@@ -18,10 +19,10 @@ const validateImbricateDocumentQuery = (query) => {
     if (typeof query !== "object") {
         return "Query must be an object";
     }
-    if (query.limit !== undefined && typeof query.limit !== "number" && query.limit <= 0) {
+    if (query.limit !== undefined && (typeof query.limit !== "number" || query.limit <= 0)) {
         return "Limit must be a number greater than 0 or undefined";
     }
-    if (query.skip !== undefined && typeof query.skip !== "number" && query.skip < 0) {
+    if (query.skip !== undefined && (typeof query.skip !== "number" || query.skip < 0)) {
         return "Skip must be a number greater than or equal to 0 or undefined";
     }
     if (query.propertyFilters !== undefined) {
@@ -32,16 +33,17 @@ const validateImbricateDocumentQuery = (query) => {
             if (typeof filter.propertyIdentifier !== "string") {
                 return "Property identifier must be a string";
             }
-            if (!Array.isArray(filter.conditions)) {
-                return "Conditions must be an array";
+            if (typeof filter.target !== "string"
+                || !Object.values(definition_1.IMBRICATE_QUERY_PROPERTY_CONDITION_TARGET).includes(filter.target)) {
+                return "Target must be a valid target";
             }
-            for (const condition of filter.conditions) {
-                if (typeof condition.target !== "string") {
-                    return "Target must be a string";
-                }
-                if (typeof condition.condition !== "string") {
-                    return "Condition must be a string";
-                }
+            if (typeof filter.attribute !== "string"
+                || !Object.values(definition_1.IMBRICATE_QUERY_ATTRIBUTE).includes(filter.attribute)) {
+                return "Attribute must be a valid attribute";
+            }
+            if (typeof filter.condition !== "string"
+                || !Object.values(definition_1.IMBRICATE_QUERY_COMPARE_CONDITION).includes(filter.condition)) {
+                return "Condition must be a valid condition";
             }
         }
     }
@@ -56,8 +58,13 @@ const validateImbricateDocumentQuery = (query) => {
             if (typeof filter.identifier !== "string") {
                 return "Identifier must be a string";
             }
-            if (typeof filter.condition !== "string") {
-                return "Condition must be a string";
+            if (typeof filter.attribute !== "string"
+                || !Object.values(definition_1.IMBRICATE_QUERY_ATTRIBUTE).includes(filter.attribute)) {
+                return "Attribute must be a valid attribute";
+            }
+            if (typeof filter.condition !== "string"
+                || !Object.values(definition_1.IMBRICATE_QUERY_COMPARE_CONDITION).includes(filter.condition)) {
+                return "Condition must be a valid condition";
             }
         }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@imbricate/core",
   "main": "index.js",
-  "version": "3.8.1",
+  "version": "3.8.2",
   "description": "Imbricate Core, Notebook for Engineers",
   "repository": {
     "type": "git",