@squiz/render-runtime-lib 1.2.1-alpha.95 → 1.2.1-alpha.96

package/lib/migrations/20220704054051_initial.sql

@@ -1,17 +1,21 @@
 -- CreateTable
-CREATE TABLE "component" (
-    "name" VARCHAR(128) NOT NULL,
 
-    CONSTRAINT "component_pkey" PRIMARY KEY ("name")
-);
+CREATE TABLE "component" ( "name" VARCHAR(128) NOT NULL,
+CONSTRAINT "component_pkey" PRIMARY KEY ("name"));
 
 -- CreateTable
-CREATE TABLE "component_version" (
-    "component_name" VARCHAR(128) NOT NULL,
-    "version" VARCHAR(128) NOT NULL,
 
-    CONSTRAINT "component_version_pkey" PRIMARY KEY ("component_name","version")
+CREATE TABLE "component_version" ( 
+  "component_name" VARCHAR(128) NOT NULL,
+  "version" VARCHAR(128) NOT NULL,
+  CONSTRAINT "component_version_pkey" PRIMARY KEY ("component_name",
+  "version")
 );
 
 -- AddForeignKey
-ALTER TABLE "component_version" ADD CONSTRAINT "component_version_component_name_fkey" FOREIGN KEY ("component_name") REFERENCES "component"("name") ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE "component_version" ADD CONSTRAINT "component_version_component_name_fkey"
+FOREIGN KEY ("component_name") REFERENCES "component"("name") ON
+DELETE CASCADE ON
+UPDATE CASCADE;
+

package/lib/test/helpers/stack.d.ts

@@ -1,4 +1,6 @@
 import supertest from 'supertest';
 import { type RenderRuntimeConfig } from '../../';
+import { Logger } from '@squiz/cmp-logger-lib';
+export declare const testLogger: Logger;
 export declare function getTestConfig(port: number): RenderRuntimeConfig;
 export declare function getTestServer(): supertest.SuperTest<supertest.Test>;

package/lib/webserver/app.d.ts

@@ -1,3 +1,4 @@
 import { type Express } from 'express';
+import { Logger } from '@squiz/cmp-logger-lib';
 import { ComponentConnectionManager } from '@squiz/component-db-lib';
-export declare function setupApp(db?: ComponentConnectionManager): Express;
+export declare function setupApp(logger: Logger, db?: ComponentConnectionManager): Express;

package/lib/webserver/index.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 import { type Server } from 'http';
+import { Logger } from '@squiz/cmp-logger-lib';
 import { ComponentConnectionManager } from '@squiz/component-db-lib';
 export interface WebserverConfig {
     port?: number;
@@ -15,7 +16,7 @@ export declare class Webserver {
     private static config;
     static get(): Server;
     static getConfig(): WebserverConfig;
-    static start(config: Omit<WebserverConfig, 'compiledConfig'>, db?: ComponentConnectionManager, compiledConfig?: Record<string, string>): Promise<Server>;
+    static start(config: Omit<WebserverConfig, 'compiledConfig'>, logger: Logger, db?: ComponentConnectionManager, compiledConfig?: Record<string, string>): Promise<Server>;
     static stop(): void;
     private static mergeConfig;
 }

package/lib/worker/worker-root.js

@@ -23300,17 +23300,18 @@ var require_errorMiddleware = __commonJS({
       const statusCode = error.statusCode || 500;
       const message = (error === null || error === void 0 ? void 0 : error.message) || "An error occurred with no additional information available";
       if (error instanceof error_1.ComponentError) {
-        req.log.fields.area = "component";
-        req.log.fields["function-name"] = error.functionName;
-        req.log.fields["component-name"] = error.componentName;
-        req.log.fields["component-version"] = error.componentVersion;
-        req.log.fields["set-name"] = error.setName;
-        if (req.log.fields["log-command"] === void 0) {
-          req.log.fields["log-command"] = "exception-handler";
-        }
-        req.log.error({ err: error.error }, message);
+        req.log.error({
+          area: "component",
+          "function-name": error.functionName,
+          "component-name": error.componentName,
+          "component-version": error.componentVersion,
+          "set-name": error.setName,
+          "log-command": "exception-handler",
+          err: error.error,
+          message
+        });
       } else if (error instanceof Error) {
-        req.log.error(error, message);
+        req.log.error({ error, message });
       } else {
         req.log.error(message);
       }
@@ -40935,7 +40936,7 @@ var require_ComponentSetService = __commonJS({
               envVars: componentSet.envVars,
               headers: componentSet.headers
             }, client);
-            await this.saveComponentSetComponets(componentSet.webPath, componentSet.components, client);
+            await this.saveComponentSetComponents(componentSet.webPath, componentSet.components, client);
             return set;
           });
           const savedSet = await this.getComponentSet(createdSet.webPath);
@@ -40970,7 +40971,7 @@ var require_ComponentSetService = __commonJS({
               await this.db.repositories.componentSet.update({ webPath }, values, client);
             }
             if (data.components !== void 0) {
-              await this.saveComponentSetComponets(webPath, data.components, client);
+              await this.saveComponentSetComponents(webPath, data.components, client);
             }
           });
           return this.getComponentSet(webPath);
@@ -41003,7 +41004,7 @@ var require_ComponentSetService = __commonJS({
           components: components !== null && components !== void 0 ? components : {}
         };
       }
-      async saveComponentSetComponets(webPath, components, client = null) {
+      async saveComponentSetComponents(webPath, components, client = null) {
         const existingComponents = [];
         Object.entries(await this.getExistingComponents(webPath)).forEach(([cn, cvs]) => {
           cvs.forEach((cv) => {