@squiz/render-runtime-lib 1.2.1-alpha.79 → 1.2.1-alpha.82

package/lib/index.js

@@ -19873,16 +19873,16 @@ Reference: https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-sso.ht
           return prev;
         }, {});
       }
-      getConnection() {
-        return this.pool.connect();
+      async getConnection() {
+        return await this.pool.connect();
       }
-      async create(value) {
+      async create(value, transactionClient = null) {
         const columns = Object.keys(value).map((a) => `"${this.modelPropertyToSqlColumn[a]}"`).join(", ");
         const values = Object.values(value).map((a, index) => `$${index + 1}`).join(", ");
-        const result = await this.executeQuery(`INSERT INTO ${this.tableName} (${columns}) VALUES (${values}) RETURNING *`, Object.values(value));
+        const result = await this.executeQuery(`INSERT INTO ${this.tableName} (${columns}) VALUES (${values}) RETURNING *`, Object.values(value), transactionClient);
         return result[0];
       }
-      async update(where, newValue) {
+      async update(where, newValue, transactionClient = null) {
         const whereValues = Object.values(where);
         const newValues = Object.values(newValue);
         const setString = Object.keys(newValue).map((a, index) => `"${this.modelPropertyToSqlColumn[a]}" = $${index + 1}`).join(", ");
@@ -19890,17 +19890,19 @@ Reference: https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-sso.ht
         const result = await this.executeQuery(`UPDATE ${this.tableName} 
         SET ${setString} 
         WHERE ${whereString}
-        RETURNING *`, [...Object.values(newValues), ...Object.values(whereValues)]);
+        RETURNING *`, [...Object.values(newValues), ...Object.values(whereValues)], transactionClient);
         return result;
       }
-      async delete(where) {
-        const client = await this.pool.connect();
+      async delete(where, transactionClient = null) {
+        const client = transactionClient ?? await this.getConnection();
         try {
           const whereString = this.createWhereStringFromPartialModel(where);
           const result = await client.query(`DELETE FROM ${this.tableName} WHERE ${whereString}`, Object.values(where));
           return result.rowCount;
         } finally {
-          client.release();
+          if (client && !transactionClient) {
+            client.release();
+          }
         }
       }
       createWhereStringFromPartialModel(values, initialIndex = 0) {
@@ -19914,13 +19916,13 @@ Reference: https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-sso.ht
         }, "");
         return sql;
       }
-      async executeQuery(query, values) {
-        const client = await this.pool.connect();
+      async executeQuery(query, values, transactionClient = null) {
+        const client = transactionClient ?? await this.getConnection();
         try {
           const result = await client.query(query, values);
           return result.rows.map((a) => this.createAndHydrateModel(a));
         } finally {
-          if (client) {
+          if (client && !transactionClient) {
             client.release();
           }
         }
@@ -19945,6 +19947,11 @@ Reference: https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-sso.ht
       WHERE ${this.createWhereStringFromPartialModel(item)}`, Object.values(item));
         return result;
       }
+      async findAll() {
+        const result = await this.executeQuery(`SELECT *
+      FROM ${this.tableName}`, []);
+        return result;
+      }
     };
     var ComponentRepository = class extends AbstractRepository {
       constructor(options) {
@@ -20111,7 +20118,54 @@ Reference: https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-sso.ht
         setTimeout(resolve, timeMs);
       });
     }
-    var migration_list_default = ["20220704054051_initial.sql"];
+    var migration_list_default = ["20220704054051_initial.sql", "20220718172237_adding_component_sets.sql"];
+    var ComponentSet = class {
+      constructor() {
+        this.webPath = "";
+        this.displayName = "";
+        this.envVars = {};
+        this.description = "";
+        this.headers = {};
+      }
+    };
+    var ComponentSetRepository = class extends AbstractRepository {
+      constructor(options) {
+        super(options.repositories, options.pool, "component_set", {
+          webPath: "web_path",
+          displayName: "display_name",
+          description: "description",
+          envVars: "env_vars",
+          headers: "headers"
+        }, ComponentSet);
+      }
+      async getComponentSetByWebPath(webPath) {
+        return this.findOne({ webPath });
+      }
+      async componentSetExists(webPath) {
+        const comp = await this.getComponentSetByWebPath(webPath);
+        return comp != null;
+      }
+    };
+    var ComponentSetComponentVersion = class {
+      constructor() {
+        this.componentSetWebPath = "";
+        this.componentName = "";
+        this.componentVersion = "";
+      }
+    };
+    var ComponentSetComponentVersionRepository = class extends AbstractRepository {
+      constructor(options) {
+        super(options.repositories, options.pool, "component_set_component_version", {
+          componentSetWebPath: "component_set_web_path",
+          componentName: "component_name",
+          componentVersion: "component_version"
+        }, ComponentSetComponentVersion);
+      }
+      async componentSetComponentVersionExists(componentSetWebPath, componentName, componentVersion) {
+        const row = await this.findOne({ componentSetWebPath, componentName, componentVersion });
+        return row != null;
+      }
+    };
     var ConnectionManager2 = class {
       constructor(applicationName, connection, migrationDirectory) {
         this.applicationName = applicationName;
@@ -20132,7 +20186,9 @@ Reference: https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-sso.ht
         });
         this.repositories = {
           component: new ComponentRepository(this),
-          componentVersion: new ComponentVersionRepository(this)
+          componentVersion: new ComponentVersionRepository(this),
+          componentSet: new ComponentSetRepository(this),
+          componentSetComponentVersion: new ComponentSetComponentVersionRepository(this)
         };
       }
       async applyMigrations() {
@@ -20144,6 +20200,22 @@ Reference: https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-sso.ht
         await this.pool.end();
         this.pool.removeAllListeners();
       }
+      async executeInTransaction(func) {
+        const client = await this.pool.connect();
+        try {
+          await client.query("BEGIN");
+          const value = await func(client);
+          await client.query("COMMIT");
+          return value;
+        } catch (e) {
+          await client.query("ROLLBACK");
+          throw e;
+        } finally {
+          if (client) {
+            client.release();
+          }
+        }
+      }
     };
     var import_client_secrets_manager = __toESM2(require_dist_cjs44());
     async function getConnectionInfo2(config) {
@@ -94777,12 +94849,11 @@ router3.get(/([^/]+)\/([^/]+)(.*)/, async (req, res, _next) => {
   const componentName = req.params[0];
   const version = req.params[1];
   const staticFile = req.params[2];
-  const config = ComponentRunner.getConfig();
   const manifestPath = await getManifestPath(componentName, version, isInProductionMode());
   const manifest = await (0, import_component_lib7.loadManifest)(manifestPath);
   if (manifest["static-files"]) {
     const componentStaticFileRoot = manifest["static-files"]["location-root"];
-    const staticFilePath = import_path3.default.join(config.dataMountPoint, componentName, version, componentStaticFileRoot);
+    const staticFilePath = import_path3.default.join(manifestPath, "../", componentStaticFileRoot);
     res.sendFile(staticFile, {
       root: staticFilePath,
       dotfiles: "deny",