@squiz/db-lib 1.33.1-alpha.4 → 1.33.1-alpha.6

package/.npm/_logs/{2023-05-12T02_45_24_620Z-debug-0.log → 2023-05-15T01_10_19_239Z-debug-0.log}

@@ -1,37 +1,37 @@
 0 verbose cli /usr/local/bin/node /usr/local/bin/npm
 1 info using npm@9.5.0
 2 info using node@v18.15.0
-3 timing npm:load:whichnode Completed in 2ms
+3 timing npm:load:whichnode Completed in 1ms
 4 timing config:load:defaults Completed in 2ms
-5 timing config:load:file:/usr/local/lib/node_modules/npm/npmrc Completed in 1ms
-6 timing config:load:builtin Completed in 1ms
+5 timing config:load:file:/usr/local/lib/node_modules/npm/npmrc Completed in 0ms
+6 timing config:load:builtin Completed in 0ms
 7 timing config:load:cli Completed in 1ms
-8 timing config:load:env Completed in 1ms
+8 timing config:load:env Completed in 2ms
 9 info found workspace root at /builds/developer-experience/cmp
-10 timing config:load:file:/builds/developer-experience/cmp/.npmrc Completed in 0ms
-11 timing config:load:project Completed in 22ms
+10 timing config:load:file:/builds/developer-experience/cmp/.npmrc Completed in 1ms
+11 timing config:load:project Completed in 21ms
 12 timing config:load:file:/root/.npmrc Completed in 1ms
 13 timing config:load:user Completed in 1ms
-14 timing config:load:file:/usr/local/etc/npmrc Completed in 1ms
-15 timing config:load:global Completed in 1ms
+14 timing config:load:file:/usr/local/etc/npmrc Completed in 0ms
+15 timing config:load:global Completed in 0ms
 16 timing config:load:setEnvs Completed in 1ms
-17 timing config:load Completed in 31ms
+17 timing config:load Completed in 29ms
 18 timing npm:load:configload Completed in 31ms
 19 timing npm:load:mkdirpcache Completed in 0ms
-20 timing npm:load:mkdirplogs Completed in 1ms
+20 timing npm:load:mkdirplogs Completed in 0ms
 21 verbose title npm run compile
 22 verbose argv "run" "compile" "--"
-23 timing npm:load:setTitle Completed in 1ms
-24 timing config:load:flatten Completed in 5ms
-25 timing npm:load:display Completed in 6ms
-26 verbose logfile logs-max:10 dir:/builds/developer-experience/cmp/packages/db-lib/.npm/_logs/2023-05-12T02_45_24_620Z-
-27 verbose logfile /builds/developer-experience/cmp/packages/db-lib/.npm/_logs/2023-05-12T02_45_24_620Z-debug-0.log
+23 timing npm:load:setTitle Completed in 2ms
+24 timing config:load:flatten Completed in 4ms
+25 timing npm:load:display Completed in 5ms
+26 verbose logfile logs-max:10 dir:/builds/developer-experience/cmp/packages/db-lib/.npm/_logs/2023-05-15T01_10_19_239Z-
+27 verbose logfile /builds/developer-experience/cmp/packages/db-lib/.npm/_logs/2023-05-15T01_10_19_239Z-debug-0.log
 28 timing npm:load:logFile Completed in 3ms
 29 timing npm:load:timers Completed in 0ms
 30 timing npm:load:configScope Completed in 0ms
-31 timing npm:load Completed in 45ms
+31 timing npm:load Completed in 43ms
 32 silly logfile done cleaning log files
-33 timing command:run Completed in 3618ms
+33 timing command:run Completed in 3406ms
 34 verbose exit 0
-35 timing npm Completed in 3681ms
+35 timing npm Completed in 3462ms
 36 info ok

package/lib/index.js

@@ -56286,6 +56286,62 @@ var require_matrixAssetValidator = __commonJS({
   }
 });
 
+// ../dx-json-schema-lib/lib/validators/utils/getValidationDataForMatrixUri.js
+var require_getValidationDataForMatrixUri = __commonJS({
+  "../dx-json-schema-lib/lib/validators/utils/getValidationDataForMatrixUri.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.getValidationDataForMatrixUri = void 0;
+    function getValidationDataForMatrixUri(uri) {
+      let validationDataMap = {};
+      const [scheme, path2] = uri.split("://");
+      if (scheme !== "matrix-asset") {
+        const validationData = {
+          message: 'Uri scheme is invalid, must match "matrix-asset"',
+          data: {
+            expected: "matrix-asset",
+            received: scheme
+          }
+        };
+        validationDataMap = {
+          ...validationDataMap,
+          scheme: validationData
+        };
+      }
+      const [identifier, ...assetIdArray] = path2.split("/");
+      const assetId = assetIdArray.join("/");
+      const identifierRegex = /^[a-zA-Z0-9.-]+$/;
+      if (identifierRegex.test(identifier) === false) {
+        validationDataMap = {
+          ...validationDataMap,
+          identifier: {
+            message: "Matrix Identifier has invalid format, must match /^[a-zA-Z0-9.-]+$/",
+            data: {
+              expected: /^[a-zA-Z0-9.-]+$/,
+              received: identifier
+            }
+          }
+        };
+      }
+      const assetIdRegex = /^\d+(?::.+)?$/;
+      if (assetIdRegex.test(assetId) === false) {
+        validationDataMap = {
+          ...validationDataMap,
+          assetId: {
+            message: "Matrix Asset Id has invalid format, must match /^d+(?::.+)?$/",
+            data: {
+              expected: /^\d+(?::.+)?$/,
+              received: assetId
+            }
+          }
+        };
+      }
+      return Object.keys(validationDataMap).length > 0 ? validationDataMap : void 0;
+    }
+    exports2.getValidationDataForMatrixUri = getValidationDataForMatrixUri;
+  }
+});
+
 // ../dx-json-schema-lib/lib/validators/customFormatValidators.js
 var require_customFormatValidators = __commonJS({
   "../dx-json-schema-lib/lib/validators/customFormatValidators.js"(exports2) {
@@ -56294,10 +56350,14 @@ var require_customFormatValidators = __commonJS({
     exports2.customFormatValidators = void 0;
     var SchemaValidationError_1 = require_SchemaValidationError();
     var matrixAssetValidator_1 = require_matrixAssetValidator();
+    var getValidationDataForMatrixUri_1 = require_getValidationDataForMatrixUri();
     exports2.customFormatValidators = {
       "matrix-asset-uri": (core, schema, value) => {
         if ((0, matrixAssetValidator_1.isMatrixAssetUri)(value) === false) {
-          throw new SchemaValidationError_1.SchemaValidationError(`value "${value}" isn't a valid matrix asset uri`);
+          if (typeof value !== "string")
+            throw new SchemaValidationError_1.SchemaValidationError(`matrix asset uri "${value}" isn't a string`);
+          const validationData = (0, getValidationDataForMatrixUri_1.getValidationDataForMatrixUri)(value);
+          throw new SchemaValidationError_1.SchemaValidationError(`matrix asset uri "${value}" isn't a valid matrix asset uri`, void 0, validationData);
         }
         return;
       }
@@ -56385,6 +56445,23 @@ var require_JsonValidationService = __commonJS({
             message: `${value} \`${data.pointer}\` does not match any schema`,
             data
           };
+        },
+        typeError(data) {
+          let value = `${data.value}`;
+          if (data.received == "object") {
+            value = `Object ${JSON.stringify(data.value)}`;
+          }
+          if (data.received == "array") {
+            value = `Array ${JSON.stringify(data.value)}`;
+          }
+          const expected = JSON.stringify(data.expected).replace(/"/g, "`");
+          return {
+            type: "error",
+            name: "TypeError",
+            code: "type-error",
+            message: `Expected \`${value}\` (${data.received}) in \`${data.pointer}\` to be of type ${expected}`,
+            data
+          };
         }
       }
     };
@@ -56493,13 +56570,7 @@ var require_JsonValidationService = __commonJS({
       validateInput(input, inputSchema = this.schema.rootSchema) {
         inputSchema = this.schema.compileSchema(inputSchema);
         const errors = this.schema.validate(input, inputSchema);
-        return this.processValidationResult(errors);
-      }
-      processValidationResult(errors) {
-        if (errors.length > 0) {
-          throw new SchemaValidationError_1.SchemaValidationError(errors.map((a) => a.message).join(",\n"));
-        }
-        return true;
+        return processValidationResult(errors);
       }
       /**
        * Resolve an input object by replacing all resolvable shapes with their resolved values
@@ -56543,43 +56614,43 @@ ${potentialResolutionErrors.join("\n")}`);
         switch (version2) {
           case "v1": {
             const validationResult = v1Schema.validate(manifest);
-            return this.processValidationResult(validationResult);
+            return processValidationResult(validationResult);
           }
           default:
             throw new SchemaValidationError_1.SchemaValidationError("Invalid manifest version");
         }
       }
       validateContentSchema(contentSchema) {
-        return this.processValidationResult(exports2.ComponentInputSchema.validate(contentSchema));
+        return processValidationResult(exports2.ComponentInputSchema.validate(contentSchema));
       }
       validateComponentInput(functionInputSchema, inputValue) {
         const inputSchema = exports2.ComponentInputSchema.compileSchema(functionInputSchema);
         const errors = exports2.ComponentInputSchema.validate(inputValue, inputSchema);
-        return this.processValidationResult(errors);
+        return processValidationResult(errors);
       }
       validateRenderInput(functionInputSchema, inputValue) {
         const inputSchema = exports2.RenderInputSchema.compileSchema(functionInputSchema);
         const errors = exports2.RenderInputSchema.validate(inputValue, inputSchema);
-        return this.processValidationResult(errors);
-      }
-      processValidationResult(errors) {
-        if (errors.length > 0) {
-          const ValidationDataMap = errors.reduce((acc, error) => {
-            var _a;
-            const pointer = (_a = error === null || error === void 0 ? void 0 : error.data) === null || _a === void 0 ? void 0 : _a.pointer;
-            const validationData = {
-              message: error.message,
-              data: error.data
-            };
-            Object.keys(acc).includes(pointer) && Array.isArray(acc[pointer]) ? acc[pointer].push(validationData) : acc[pointer] = [validationData];
-            return acc;
-          }, {});
-          throw new SchemaValidationError_1.SchemaValidationError(errors.map((a) => a.message).join(",\n"), void 0, ValidationDataMap);
-        }
-        return true;
+        return processValidationResult(errors);
       }
     };
     exports2.JsonValidationService = JsonValidationService;
+    function processValidationResult(errors) {
+      if (errors.length > 0) {
+        const ValidationDataMap = errors.reduce((acc, error) => {
+          var _a;
+          const pointer = (_a = error === null || error === void 0 ? void 0 : error.data) === null || _a === void 0 ? void 0 : _a.pointer;
+          const validationData = {
+            message: error.message,
+            data: error.data
+          };
+          Object.keys(acc).includes(pointer) && Array.isArray(acc[pointer]) ? acc[pointer].push(validationData) : acc[pointer] = [validationData];
+          return acc;
+        }, {});
+        throw new SchemaValidationError_1.SchemaValidationError(errors.map((a) => a.message).join(",\n"), void 0, ValidationDataMap);
+      }
+      return true;
+    }
   }
 });