prostgles-server 3.0.109 → 3.0.111

package/dist/JSONBValidation/validate_jsonb_schema_sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate_jsonb_schema_sql.d.ts","sourceRoot":"","sources":["../../lib/JSONBValidation/validate_jsonb_schema_sql.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,wBAAwB,yBAAmC,CAAC;AACzE,eAAO,MAAM,yBAAyB,QA+VrC,CAAC"}
+{"version":3,"file":"validate_jsonb_schema_sql.d.ts","sourceRoot":"","sources":["../../lib/JSONBValidation/validate_jsonb_schema_sql.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,wBAAwB,yBAAmC,CAAC;AACzE,eAAO,MAAM,yBAAyB,QAyYrC,CAAC"}

package/dist/JSONBValidation/validate_jsonb_schema_sql.js

@@ -44,7 +44,7 @@ BEGIN
   IF ARRAY[jsonb_schema] <@ allowed_types THEN
     schema = jsonb_build_object('type', jsonb_schema);
   /* { "type": ... } */ 
-  ELSIF BTRIM(jsonb_schema) ILIKE '{%' THEN
+  ELSIF BTRIM(replace(jsonb_schema,E'\n','')) ILIKE '{%' THEN
     schema = jsonb_schema::JSONB;
   ELSE
     RAISE EXCEPTION $$Invalid schema. Expecting 'typename' or { "type": "typename" } but received: %, %$$, jsonb_schema, path USING HINT = path, COLUMN = colname; 
@@ -72,6 +72,46 @@ BEGIN
       RAISE EXCEPTION 'Data not in allowed enum list (%), %', schema->'enum', path USING HINT = path, COLUMN = colname; 
     END IF;
 
+  ELSIF schema ? 'lookup' THEN
+    IF NOT ${exports.VALIDATE_SCHEMA_FUNCNAME}(
+      $sch$ 
+        { 
+          "oneOfType": [
+            { 
+              "type": { "enum": ["schema"] },
+              "object": { "enum": ["table", "column"] },
+              "isArray": { "type": "boolean", "optional": true },
+              "filter": { "optional": true, "type": "any" }
+            },
+            { 
+              "type": { "enum": ["data"] },
+              "table": "string",
+              "column": "string",
+              "isArray": { "type": "boolean", "optional": true },
+              "filter": { "optional": true, "type": "any" },
+              "isFullRow": { "optional": true, "type": {
+                "displayColumns": { "optional": true, "type": "string[]" },
+                "searchColumns": { "optional": true, "type": "string[]" }
+              }},
+              "showInRowCard": { "optional": true, "type": "any" }
+            }    
+          ]
+        }
+      $sch$, 
+      schema->'lookup', 
+      checked_path || '.schema'::TEXT
+    ) THEN
+      
+      RETURN FALSE;
+    END IF;
+
+
+    RETURN ${exports.VALIDATE_SCHEMA_FUNCNAME}(
+      CASE WHEN (schema->'lookup'->'isArray')::BOOLEAN THEN 'any[]' ELSE 'any' END,
+      data,
+      checked_path
+    );
+
   ELSIF schema ? 'type' THEN    
     
     IF jsonb_typeof(schema->'type') = 'string' THEN
@@ -164,17 +204,14 @@ BEGIN
         SELECT key, value
         FROM jsonb_each(schema->'type')
       LOOP
+
         optional = COALESCE((sub_schema.value->>'optional')::BOOLEAN, FALSE);
         IF NOT (data ? sub_schema.key) THEN
-          
           IF NOT optional THEN
             RAISE EXCEPTION 'Types not matching. Required property (%) is missing. %',sub_schema.key , path USING HINT = path, COLUMN = colname; 
-          ELSE
-            RETURN true; 
           END IF;
-        END IF;
 
-        IF NOT ${exports.VALIDATE_SCHEMA_FUNCNAME}(
+        ELSIF NOT ${exports.VALIDATE_SCHEMA_FUNCNAME}(
           -- sub_schema.value::TEXT, 
           CASE WHEN jsonb_typeof(sub_schema.value) = 'string' THEN TRIM(both '"' from sub_schema.value::TEXT) ELSE sub_schema.value::TEXT END,
           data->sub_schema.key, 
@@ -184,6 +221,8 @@ BEGIN
         END IF;
 
       END LOOP;
+
+      RETURN TRUE;
     ELSE 
       RAISE EXCEPTION 'Unexpected schema.type ( % ), %',jsonb_typeof(schema->'type'), path USING HINT = path, COLUMN = colname; 
     END IF; 
@@ -354,5 +393,8 @@ SELECT ${exports.VALIDATE_SCHEMA_FUNCNAME}('{ "type": { "a": { "enum": ["a"] } }
 
 SELECT ${exports.VALIDATE_SCHEMA_FUNCNAME}('{ "arrayOfType": { "a": { "enum": ["a"] } } }', '[{ "a": "a"}]');
 
+
+SELECT ${exports.VALIDATE_SCHEMA_FUNCNAME}('{ "lookup": { "type": "data", "table": "tblName", "column": "colName" } }', '{}');
+
 `;
 //# sourceMappingURL=validate_jsonb_schema_sql.js.map

package/dist/JSONBValidation/validate_jsonb_schema_sql.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate_jsonb_schema_sql.js","sourceRoot":"","sources":["../../lib/JSONBValidation/validate_jsonb_schema_sql.ts"],"names":[],"mappings":";;;AAAA,kEAA+D;AAGlD,QAAA,wBAAwB,GAAG,uBAAgC,CAAC;AAC5D,QAAA,yBAAyB,GAAG;;;IAGrC,6BAAa,CAAC,kCAAkC;;;4BAGxB,gCAAwB;;6BAEvB,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAkFlC,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAiF1B,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA8B5B,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;eA4BtB,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6EAgCsC,gCAAwB;;;;;;oEAMjC,gCAAwB;;;;;;;;;;;;;;;sBAetE,gCAAwB;;;;;;;;;;;;SAYrC,gCAAwB;;;;;;SAMxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;SAIxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;;;;;;;;;;;;;SAgBxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;;SAKxB,gCAAwB;;SAExB,gCAAwB;;SAExB,gCAAwB;;CAEhC,CAAC"}
+{"version":3,"file":"validate_jsonb_schema_sql.js","sourceRoot":"","sources":["../../lib/JSONBValidation/validate_jsonb_schema_sql.ts"],"names":[],"mappings":";;;AAAA,kEAA+D;AAGlD,QAAA,wBAAwB,GAAG,uBAAgC,CAAC;AAC5D,QAAA,yBAAyB,GAAG;;;IAGrC,6BAAa,CAAC,kCAAkC;;;4BAGxB,gCAAwB;;6BAEvB,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA8DxC,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAiCxB,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;mBA2BlB,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oBA8EvB,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAgC/B,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;eA4BtB,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6EAgCsC,gCAAwB;;;;;;oEAMjC,gCAAwB;;;;;;;;;;;;;;;sBAetE,gCAAwB;;;;;;;;;;;;SAYrC,gCAAwB;;;;;;SAMxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;SAIxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;;;;;;;;;;;;;SAgBxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;;SAKxB,gCAAwB;;SAExB,gCAAwB;;SAExB,gCAAwB;;;SAGxB,gCAAwB;;CAEhC,CAAC"}

package/lib/JSONBValidation/validate_jsonb_schema_sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate_jsonb_schema_sql.d.ts","sourceRoot":"","sources":["validate_jsonb_schema_sql.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,wBAAwB,yBAAmC,CAAC;AACzE,eAAO,MAAM,yBAAyB,QA+VrC,CAAC"}
+{"version":3,"file":"validate_jsonb_schema_sql.d.ts","sourceRoot":"","sources":["validate_jsonb_schema_sql.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,wBAAwB,yBAAmC,CAAC;AACzE,eAAO,MAAM,yBAAyB,QAyYrC,CAAC"}

package/lib/JSONBValidation/validate_jsonb_schema_sql.js

@@ -44,7 +44,7 @@ BEGIN
   IF ARRAY[jsonb_schema] <@ allowed_types THEN
     schema = jsonb_build_object('type', jsonb_schema);
   /* { "type": ... } */ 
-  ELSIF BTRIM(jsonb_schema) ILIKE '{%' THEN
+  ELSIF BTRIM(replace(jsonb_schema,E'\n','')) ILIKE '{%' THEN
     schema = jsonb_schema::JSONB;
   ELSE
     RAISE EXCEPTION $$Invalid schema. Expecting 'typename' or { "type": "typename" } but received: %, %$$, jsonb_schema, path USING HINT = path, COLUMN = colname; 
@@ -72,6 +72,46 @@ BEGIN
       RAISE EXCEPTION 'Data not in allowed enum list (%), %', schema->'enum', path USING HINT = path, COLUMN = colname; 
     END IF;
 
+  ELSIF schema ? 'lookup' THEN
+    IF NOT ${exports.VALIDATE_SCHEMA_FUNCNAME}(
+      $sch$ 
+        { 
+          "oneOfType": [
+            { 
+              "type": { "enum": ["schema"] },
+              "object": { "enum": ["table", "column"] },
+              "isArray": { "type": "boolean", "optional": true },
+              "filter": { "optional": true, "type": "any" }
+            },
+            { 
+              "type": { "enum": ["data"] },
+              "table": "string",
+              "column": "string",
+              "isArray": { "type": "boolean", "optional": true },
+              "filter": { "optional": true, "type": "any" },
+              "isFullRow": { "optional": true, "type": {
+                "displayColumns": { "optional": true, "type": "string[]" },
+                "searchColumns": { "optional": true, "type": "string[]" }
+              }},
+              "showInRowCard": { "optional": true, "type": "any" }
+            }    
+          ]
+        }
+      $sch$, 
+      schema->'lookup', 
+      checked_path || '.schema'::TEXT
+    ) THEN
+      
+      RETURN FALSE;
+    END IF;
+
+
+    RETURN ${exports.VALIDATE_SCHEMA_FUNCNAME}(
+      CASE WHEN (schema->'lookup'->'isArray')::BOOLEAN THEN 'any[]' ELSE 'any' END,
+      data,
+      checked_path
+    );
+
   ELSIF schema ? 'type' THEN    
     
     IF jsonb_typeof(schema->'type') = 'string' THEN
@@ -164,17 +204,14 @@ BEGIN
         SELECT key, value
         FROM jsonb_each(schema->'type')
       LOOP
+
         optional = COALESCE((sub_schema.value->>'optional')::BOOLEAN, FALSE);
         IF NOT (data ? sub_schema.key) THEN
-          
           IF NOT optional THEN
             RAISE EXCEPTION 'Types not matching. Required property (%) is missing. %',sub_schema.key , path USING HINT = path, COLUMN = colname; 
-          ELSE
-            RETURN true; 
           END IF;
-        END IF;
 
-        IF NOT ${exports.VALIDATE_SCHEMA_FUNCNAME}(
+        ELSIF NOT ${exports.VALIDATE_SCHEMA_FUNCNAME}(
           -- sub_schema.value::TEXT, 
           CASE WHEN jsonb_typeof(sub_schema.value) = 'string' THEN TRIM(both '"' from sub_schema.value::TEXT) ELSE sub_schema.value::TEXT END,
           data->sub_schema.key, 
@@ -184,6 +221,8 @@ BEGIN
         END IF;
 
       END LOOP;
+
+      RETURN TRUE;
     ELSE 
       RAISE EXCEPTION 'Unexpected schema.type ( % ), %',jsonb_typeof(schema->'type'), path USING HINT = path, COLUMN = colname; 
     END IF; 
@@ -354,4 +393,7 @@ SELECT ${exports.VALIDATE_SCHEMA_FUNCNAME}('{ "type": { "a": { "enum": ["a"] } }
 
 SELECT ${exports.VALIDATE_SCHEMA_FUNCNAME}('{ "arrayOfType": { "a": { "enum": ["a"] } } }', '[{ "a": "a"}]');
 
+
+SELECT ${exports.VALIDATE_SCHEMA_FUNCNAME}('{ "lookup": { "type": "data", "table": "tblName", "column": "colName" } }', '{}');
+
 `;

package/lib/JSONBValidation/validate_jsonb_schema_sql.ts

@@ -43,7 +43,7 @@ BEGIN
   IF ARRAY[jsonb_schema] <@ allowed_types THEN
     schema = jsonb_build_object('type', jsonb_schema);
   /* { "type": ... } */ 
-  ELSIF BTRIM(jsonb_schema) ILIKE '{%' THEN
+  ELSIF BTRIM(replace(jsonb_schema,E'\n','')) ILIKE '{%' THEN
     schema = jsonb_schema::JSONB;
   ELSE
     RAISE EXCEPTION $$Invalid schema. Expecting 'typename' or { "type": "typename" } but received: %, %$$, jsonb_schema, path USING HINT = path, COLUMN = colname; 
@@ -71,6 +71,46 @@ BEGIN
       RAISE EXCEPTION 'Data not in allowed enum list (%), %', schema->'enum', path USING HINT = path, COLUMN = colname; 
     END IF;
 
+  ELSIF schema ? 'lookup' THEN
+    IF NOT ${VALIDATE_SCHEMA_FUNCNAME}(
+      $sch$ 
+        { 
+          "oneOfType": [
+            { 
+              "type": { "enum": ["schema"] },
+              "object": { "enum": ["table", "column"] },
+              "isArray": { "type": "boolean", "optional": true },
+              "filter": { "optional": true, "type": "any" }
+            },
+            { 
+              "type": { "enum": ["data"] },
+              "table": "string",
+              "column": "string",
+              "isArray": { "type": "boolean", "optional": true },
+              "filter": { "optional": true, "type": "any" },
+              "isFullRow": { "optional": true, "type": {
+                "displayColumns": { "optional": true, "type": "string[]" },
+                "searchColumns": { "optional": true, "type": "string[]" }
+              }},
+              "showInRowCard": { "optional": true, "type": "any" }
+            }    
+          ]
+        }
+      $sch$, 
+      schema->'lookup', 
+      checked_path || '.schema'::TEXT
+    ) THEN
+      
+      RETURN FALSE;
+    END IF;
+
+
+    RETURN ${VALIDATE_SCHEMA_FUNCNAME}(
+      CASE WHEN (schema->'lookup'->'isArray')::BOOLEAN THEN 'any[]' ELSE 'any' END,
+      data,
+      checked_path
+    );
+
   ELSIF schema ? 'type' THEN    
     
     IF jsonb_typeof(schema->'type') = 'string' THEN
@@ -163,17 +203,14 @@ BEGIN
         SELECT key, value
         FROM jsonb_each(schema->'type')
       LOOP
+
         optional = COALESCE((sub_schema.value->>'optional')::BOOLEAN, FALSE);
         IF NOT (data ? sub_schema.key) THEN
-          
           IF NOT optional THEN
             RAISE EXCEPTION 'Types not matching. Required property (%) is missing. %',sub_schema.key , path USING HINT = path, COLUMN = colname; 
-          ELSE
-            RETURN true; 
           END IF;
-        END IF;
 
-        IF NOT ${VALIDATE_SCHEMA_FUNCNAME}(
+        ELSIF NOT ${VALIDATE_SCHEMA_FUNCNAME}(
           -- sub_schema.value::TEXT, 
           CASE WHEN jsonb_typeof(sub_schema.value) = 'string' THEN TRIM(both '"' from sub_schema.value::TEXT) ELSE sub_schema.value::TEXT END,
           data->sub_schema.key, 
@@ -183,6 +220,8 @@ BEGIN
         END IF;
 
       END LOOP;
+
+      RETURN TRUE;
     ELSE 
       RAISE EXCEPTION 'Unexpected schema.type ( % ), %',jsonb_typeof(schema->'type'), path USING HINT = path, COLUMN = colname; 
     END IF; 
@@ -353,4 +392,7 @@ SELECT ${VALIDATE_SCHEMA_FUNCNAME}('{ "type": { "a": { "enum": ["a"] } } }', '{
 
 SELECT ${VALIDATE_SCHEMA_FUNCNAME}('{ "arrayOfType": { "a": { "enum": ["a"] } } }', '[{ "a": "a"}]');
 
+
+SELECT ${VALIDATE_SCHEMA_FUNCNAME}('{ "lookup": { "type": "data", "table": "tblName", "column": "colName" } }', '{}');
+
 `;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "3.0.109",
+  "version": "3.0.111",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -40,7 +40,7 @@
     "check-disk-space": "^3.3.1",
     "file-type": "^17.1.4",
     "pg-promise": "^11.3.0",
-    "prostgles-types": "^3.0.29",
+    "prostgles-types": "^3.0.38",
     "sharp": "^0.31.0"
   },
   "devDependencies": {

package/tests/client/PID.txt

@@ -1 +1 @@
-198543
+20896

package/tests/server/package-lock.json

@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "3.0.108",
+      "version": "3.0.110",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.272.0",
@@ -32,7 +32,7 @@
         "check-disk-space": "^3.3.1",
         "file-type": "^17.1.4",
         "pg-promise": "^11.3.0",
-        "prostgles-types": "^3.0.29",
+        "prostgles-types": "^3.0.38",
         "sharp": "^0.31.0"
       },
       "devDependencies": {
@@ -1527,7 +1527,7 @@
         "eslint": "^8.35.0",
         "file-type": "^17.1.4",
         "pg-promise": "^11.3.0",
-        "prostgles-types": "^3.0.29",
+        "prostgles-types": "^3.0.38",
         "sharp": "^0.31.0",
         "typescript": "^4.9.5"
       }