@squiz/db-lib 1.40.1-alpha.17 → 1.40.1-alpha.18

package/.npm/_logs/{2023-07-19T01_43_48_817Z-debug-0.log → 2023-07-20T22_08_38_377Z-debug-0.log}

@@ -1,7 +1,7 @@
 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 1ms
+3 timing npm:load:whichnode Completed in 2ms
 4 timing config:load:defaults Completed in 2ms
 5 timing config:load:file:/usr/local/lib/node_modules/npm/npmrc Completed in 0ms
 6 timing config:load:builtin Completed in 1ms
@@ -9,29 +9,29 @@
 8 timing config:load:env Completed in 1ms
 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 26ms
+11 timing config:load:project Completed in 32ms
 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
+14 timing config:load:file:/usr/local/etc/npmrc Completed in 0ms
 15 timing config:load:global Completed in 1ms
 16 timing config:load:setEnvs Completed in 1ms
-17 timing config:load Completed in 35ms
-18 timing npm:load:configload Completed in 36ms
-19 timing npm:load:mkdirpcache Completed in 0ms
-20 timing npm:load:mkdirplogs Completed in 1ms
+17 timing config:load Completed in 43ms
+18 timing npm:load:configload Completed in 43ms
+19 timing npm:load:mkdirpcache 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-07-19T01_43_48_817Z-
-27 verbose logfile /builds/developer-experience/cmp/packages/db-lib/.npm/_logs/2023-07-19T01_43_48_817Z-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-07-20T22_08_38_377Z-
+27 verbose logfile /builds/developer-experience/cmp/packages/db-lib/.npm/_logs/2023-07-20T22_08_38_377Z-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 50ms
+31 timing npm:load Completed in 58ms
 32 silly logfile done cleaning log files
-33 timing command:run Completed in 3465ms
+33 timing command:run Completed in 3649ms
 34 verbose exit 0
-35 timing npm Completed in 3525ms
+35 timing npm Completed in 3720ms
 36 info ok

package/lib/index.js

@@ -20185,8 +20185,17 @@ var require_errorMiddleware = __commonJS({
     exports2.errorMiddleware = void 0;
     function errorMiddleware(error, req, res, _next) {
       const statusCode = error.statusCode || 500;
-      error.message = (error === null || error === void 0 ? void 0 : error.message) || "An error occurred with no additional information available";
+      if (!error.message) {
+        error.message = "An error occurred with no additional information available";
+      }
       res = res.setHeader("cache-control", "no-cache, no-store, max-age=0");
+      if (error.name === "ZodError") {
+        req.log.error(`Caught validation error for ${req.path}:`, error.issues);
+        return res.status(400).json({
+          message: "Validation failed",
+          details: error.issues
+        });
+      }
       if ((error === null || error === void 0 ? void 0 : error.name) === "ComponentError") {
         req.log.error({
           message: error,
@@ -50302,118 +50311,6 @@ var require_manifestSchemas = __commonJS({
   }
 });
 
-// ../dx-json-schema-lib/lib/pageContents/v1/pageContents.js
-var require_pageContents = __commonJS({
-  "../dx-json-schema-lib/lib/pageContents/v1/pageContents.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-  }
-});
-
-// ../dx-json-schema-lib/lib/pageContents/pageContentsModels.js
-var require_pageContentsModels = __commonJS({
-  "../dx-json-schema-lib/lib/pageContents/pageContentsModels.js"(exports2) {
-    "use strict";
-    var __createBinding2 = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
-      if (k2 === void 0)
-        k2 = k;
-      var desc = Object.getOwnPropertyDescriptor(m, k);
-      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-        desc = { enumerable: true, get: function() {
-          return m[k];
-        } };
-      }
-      Object.defineProperty(o, k2, desc);
-    } : function(o, m, k, k2) {
-      if (k2 === void 0)
-        k2 = k;
-      o[k2] = m[k];
-    });
-    var __setModuleDefault2 = exports2 && exports2.__setModuleDefault || (Object.create ? function(o, v) {
-      Object.defineProperty(o, "default", { enumerable: true, value: v });
-    } : function(o, v) {
-      o["default"] = v;
-    });
-    var __importStar2 = exports2 && exports2.__importStar || function(mod) {
-      if (mod && mod.__esModule)
-        return mod;
-      var result = {};
-      if (mod != null) {
-        for (var k in mod)
-          if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
-            __createBinding2(result, mod, k);
-      }
-      __setModuleDefault2(result, mod);
-      return result;
-    };
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.v1 = void 0;
-    exports2.v1 = __importStar2(require_pageContents());
-  }
-});
-
-// ../dx-json-schema-lib/lib/pageContents/v1/pageContents.json
-var require_pageContents2 = __commonJS({
-  "../dx-json-schema-lib/lib/pageContents/v1/pageContents.json"(exports2, module2) {
-    module2.exports = {
-      $schema: "http://json-schema.org/draft-07/schema#",
-      type: "object",
-      properties: {
-        id: {
-          type: "string"
-        },
-        name: {
-          type: "string"
-        },
-        layouts: {
-          type: "array",
-          items: {
-            $ref: "#/definitions/layout"
-          }
-        }
-      },
-      required: ["name", "layouts"],
-      definitions: {
-        layout: {
-          type: "object",
-          properties: {
-            schemaName: {
-              type: "string"
-            },
-            content: {
-              type: "object",
-              properties: {
-                contentItemId: {
-                  type: "string"
-                }
-              },
-              required: ["contentItemId"],
-              additionalProperties: false
-            }
-          },
-          required: ["schemaName", "content"],
-          additionalProperties: false
-        }
-      },
-      additionalProperties: false
-    };
-  }
-});
-
-// ../dx-json-schema-lib/lib/pageContents/pageContentsSchemas.js
-var require_pageContentsSchemas = __commonJS({
-  "../dx-json-schema-lib/lib/pageContents/pageContentsSchemas.js"(exports2) {
-    "use strict";
-    var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
-      return mod && mod.__esModule ? mod : { "default": mod };
-    };
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.v1 = void 0;
-    var pageContents_json_1 = __importDefault2(require_pageContents2());
-    exports2.v1 = pageContents_json_1.default;
-  }
-});
-
 // ../dx-json-schema-lib/lib/formatted-text/v1/formattedText.js
 var require_formattedText = __commonJS({
   "../dx-json-schema-lib/lib/formatted-text/v1/formattedText.js"(exports2) {
@@ -50552,19 +50449,20 @@ var require_formattedText2 = __commonJS({
           additionalProperties: false,
           properties: {
             type: { const: "component" },
-            schemaName: { type: "string" },
+            componentId: {
+              type: "string"
+            },
             componentSet: { type: "string" },
-            content: {
+            contentItem: {
               type: "object",
               title: "ContentItemReference",
               properties: {
-                contentItemId: { type: "string" }
+                id: { type: "string" }
               },
-              required: ["contentItemId"],
-              additionalProperties: false
+              required: []
             }
           },
-          required: ["type", "schemaName", "componentSet"]
+          required: ["type", "componentSet", "componentId"]
         },
         FormattedTextLinkToMatrixAsset: {
           type: "object",
@@ -56691,7 +56589,7 @@ var require_JsonValidationService = __commonJS({
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.JsonValidationService = exports2.JSONSchemaService = exports2.ManifestV1MetaSchema = exports2.PageContentsMetaSchema = exports2.RenderInputMetaSchema = exports2.ComponentInputMetaSchema = exports2.RenderInputSchema = exports2.ComponentInputSchema = void 0;
+    exports2.JsonValidationService = exports2.JSONSchemaService = exports2.ManifestV1MetaSchema = exports2.RenderInputMetaSchema = exports2.ComponentInputMetaSchema = exports2.RenderInputSchema = exports2.ComponentInputSchema = void 0;
     var json_query_1 = __importDefault2(require_jsonQuery());
     var DxComponentInputSchema_json_1 = __importDefault2(require_DxComponentInputSchema());
     var DxComponentIcons_json_1 = __importDefault2(require_DxComponentIcons());
@@ -56699,7 +56597,6 @@ var require_JsonValidationService = __commonJS({
     var MatrixAssetSchema_json_1 = __importDefault2(require_MatrixAssetSchema());
     var Draft_07_json_1 = __importDefault2(require_Draft_07());
     var formattedText_json_1 = __importDefault2(require_formattedText2());
-    var pageContents_json_1 = __importDefault2(require_pageContents2());
     var v1_json_1 = __importDefault2(require_v12());
     var JobV1_json_1 = __importDefault2(require_JobV12());
     var SchemaValidationError_1 = require_SchemaValidationError();
@@ -56827,7 +56724,6 @@ var require_JsonValidationService = __commonJS({
     exports2.RenderInputMetaSchema = {
       root: Draft_07_json_1.default
     };
-    exports2.PageContentsMetaSchema = new json_schema_library_1.Draft07(pageContents_json_1.default, defaultConfig);
     exports2.ManifestV1MetaSchema = {
       root: v1_json_1.default,
       remotes: {
@@ -56943,9 +56839,6 @@ ${potentialResolutionErrors.join("\n")}`);
         const errors = exports2.RenderInputSchema.validate(inputValue, inputSchema);
         return processValidationResult(errors);
       }
-      validatePageContents(pageContents) {
-        return processValidationResult(exports2.PageContentsMetaSchema.validate(pageContents));
-      }
     };
     exports2.JsonValidationService = JsonValidationService;
     function processValidationResult(errors) {
@@ -57375,11 +57268,9 @@ var require_lib5 = __commonJS({
           __createBinding2(exports3, m, p);
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.SUB_SCHEMAS = exports2.FORMATTED_TEXT_SCHEMAS = exports2.FORMATTED_TEXT_MODELS = exports2.PAGE_CONTENT_SCHEMAS = exports2.PAGE_CONTENTS_MODELS = exports2.MANIFEST_SCHEMAS = exports2.MANIFEST_MODELS = void 0;
+    exports2.SUB_SCHEMAS = exports2.FORMATTED_TEXT_SCHEMAS = exports2.FORMATTED_TEXT_MODELS = exports2.MANIFEST_SCHEMAS = exports2.MANIFEST_MODELS = void 0;
     exports2.MANIFEST_MODELS = __importStar2(require_manifestModels());
     exports2.MANIFEST_SCHEMAS = __importStar2(require_manifestSchemas());
-    exports2.PAGE_CONTENTS_MODELS = __importStar2(require_pageContentsModels());
-    exports2.PAGE_CONTENT_SCHEMAS = __importStar2(require_pageContentsSchemas());
     exports2.FORMATTED_TEXT_MODELS = __importStar2(require_formattedTextModels());
     exports2.FORMATTED_TEXT_SCHEMAS = __importStar2(require_formattedTextSchemas());
     __exportStar2(require_resolveFormattedTextNodes(), exports2);
@@ -70725,6 +70616,7 @@ var require_formattedTextToHtmlString = __commonJS({
     exports2.buildFontClasses = exports2.buildAttributesString = exports2.formattedTextToHtmlString = exports2.formattedTextToHtmlStringResolvers = void 0;
     var dx_json_schema_lib_1 = require_lib5();
     var axios_1 = __importDefault2(require_axios());
+    var error_1 = require_error();
     exports2.formattedTextToHtmlStringResolvers = {
       tag: async (node) => buildTagHTML(node),
       text: async (node) => node.value,
@@ -70808,21 +70700,20 @@ var require_formattedTextToHtmlString = __commonJS({
     exports2.buildFontClasses = buildFontClasses;
     function buildComponentRenderUrl(node) {
       var _a;
-      const [baseUrl, namespace, name, version2] = getComponentDetails(node.schemaName);
+      if (node.componentId === void 0) {
+        throw new error_1.InternalServerError("component node could not be resolved to html as schemaName was undefined");
+      }
+      if (process.env.COMPONENT_RENDER_SERVICE_URL === void 0) {
+        throw new error_1.InternalServerError("component node could not be resolved as render service url was undefined");
+      }
+      const baseUrl = process.env.COMPONENT_RENDER_SERVICE_URL;
       let query = `_componentSet=${node.componentSet}`;
-      if ((_a = node.content) === null || _a === void 0 ? void 0 : _a.contentItemId.length) {
-        query = query.concat(`&_contentItemId=${node.content.contentItemId}`);
+      if ((_a = node.contentItem) === null || _a === void 0 ? void 0 : _a.id) {
+        query += `&_contentItemId=${node.contentItem.id}`;
       }
-      const renderUrl = `${baseUrl}/r/${namespace}/${name}/${version2}?${query}`;
+      const renderUrl = `${baseUrl}/r/${node.componentId}?${query}`;
       return renderUrl;
     }
-    function getComponentDetails(str) {
-      const baseUrl = str.split("/d/")[0];
-      const sections = str.split("/");
-      const lastThreeSections = sections.slice(-3);
-      const [namespace, version2, name] = lastThreeSections;
-      return [baseUrl, namespace, version2, name];
-    }
   }
 });