@teamkeel/functions-runtime 0.455.2 → 0.457.0

package/dist/index.cjs

@@ -208,7 +208,10 @@ var KeelCamelCasePlugin = class {
   }
   constructor(opt) {
     this.opt = opt;
-    this.CamelCasePlugin = new import_kysely2.CamelCasePlugin(opt);
+    this.CamelCasePlugin = new import_kysely2.CamelCasePlugin({
+      ...opt,
+      underscoreBeforeDigits: true
+    });
   }
   transformQuery(args) {
     return this.CamelCasePlugin.transformQuery(args);
@@ -1049,17 +1052,30 @@ var import_kysely4 = require("kysely");
 
 // src/casing.js
 var import_change_case = require("change-case");
+var splitRegexp = [
+  /([a-z0-9])([A-Z])/g,
+  /([A-Z])([A-Z][a-z])/g,
+  /([a-zA-Z])([0-9])/g
+];
+function camelCaseTransform(input, index) {
+  if (index === 0) return input.toLowerCase();
+  const firstChar = input.charAt(0);
+  const lowerChars = input.substr(1).toLowerCase();
+  return `${firstChar.toUpperCase()}${lowerChars}`;
+}
+__name(camelCaseTransform, "camelCaseTransform");
+function snakeCase(str) {
+  return (0, import_change_case.snakeCase)(str, { splitRegexp });
+}
+__name(snakeCase, "snakeCase");
+function camelCase(str) {
+  return (0, import_change_case.camelCase)(str, { transform: camelCaseTransform, splitRegexp });
+}
+__name(camelCase, "camelCase");
 function camelCaseObject(obj = {}) {
   const r = {};
   for (const key of Object.keys(obj)) {
-    r[(0, import_change_case.camelCase)(key, {
-      transform: camelCaseTransform,
-      splitRegexp: [
-        /([a-z0-9])([A-Z])/g,
-        /([A-Z])([A-Z][a-z])/g,
-        /([a-zA-Z])([0-9])/g
-      ]
-    })] = obj[key];
+    r[camelCase(key)] = obj[key];
   }
   return r;
 }
@@ -1067,29 +1083,16 @@ __name(camelCaseObject, "camelCaseObject");
 function snakeCaseObject(obj) {
   const r = {};
   for (const key of Object.keys(obj)) {
-    r[(0, import_change_case.snakeCase)(key, {
-      splitRegexp: [
-        /([a-z0-9])([A-Z])/g,
-        /([A-Z])([A-Z][a-z])/g,
-        /([a-zA-Z])([0-9])/g
-      ]
-    })] = obj[key];
+    r[snakeCase(key)] = obj[key];
   }
   return r;
 }
 __name(snakeCaseObject, "snakeCaseObject");
 function upperCamelCase(s) {
-  s = (0, import_change_case.camelCase)(s);
+  s = camelCase(s);
   return s[0].toUpperCase() + s.substring(1);
 }
 __name(upperCamelCase, "upperCamelCase");
-function camelCaseTransform(input, index) {
-  if (index === 0) return input.toLowerCase();
-  const firstChar = input.charAt(0);
-  const lowerChars = input.substr(1).toLowerCase();
-  return `${firstChar.toUpperCase()}${lowerChars}`;
-}
-__name(camelCaseTransform, "camelCaseTransform");
 
 // src/TimePeriod.js
 var TimePeriod = class _TimePeriod {
@@ -1238,14 +1241,14 @@ function applyWhereConditions(context7, qb, where = {}) {
   const conf = context7.tableConfig();
   for (const key of Object.keys(where)) {
     const v = where[key];
-    if (conf && conf[(0, import_change_case.snakeCase)(key)]) {
-      const rel = conf[(0, import_change_case.snakeCase)(key)];
+    if (conf && conf[snakeCase(key)]) {
+      const rel = conf[snakeCase(key)];
       context7.withJoin(rel.referencesTable, () => {
         qb = applyWhereConditions(context7, qb, v);
       });
       continue;
     }
-    const fieldName = `${context7.tableAlias()}.${(0, import_change_case.snakeCase)(key)}`;
+    const fieldName = `${context7.tableAlias()}.${snakeCase(key)}`;
     if (Object.prototype.toString.call(v) !== "[object Object]") {
       const operator = v === null || Array.isArray(v) ? import_kysely4.sql`is not distinct from` : "=";
       qb = qb.where(fieldName, operator, import_kysely4.sql`${v}`);
@@ -1291,7 +1294,7 @@ function applyOffset(context7, qb, offset) {
 __name(applyOffset, "applyOffset");
 function applyOrderBy(context7, qb, tableName, orderBy = {}) {
   Object.entries(orderBy).forEach(([key, sortOrder]) => {
-    qb = qb.orderBy(`${tableName}.${(0, import_change_case.snakeCase)(key)}`, sortOrder.toLowerCase());
+    qb = qb.orderBy(`${tableName}.${snakeCase(key)}`, sortOrder.toLowerCase());
   });
   return qb;
 }
@@ -1305,7 +1308,7 @@ function applyJoins(context7, qb, where) {
   }
   const srcTable = context7.tableAlias();
   for (const key of Object.keys(where)) {
-    const rel = conf[(0, import_change_case.snakeCase)(key)];
+    const rel = conf[snakeCase(key)];
     if (!rel) {
       continue;
     }
@@ -1745,7 +1748,7 @@ var QueryBuilder = class _QueryBuilder {
       const cursor = isBackward ? params.before : params.after;
       if (cursor) {
         const primaryField = orderByFields[0];
-        const primaryFieldCol = (0, import_change_case.snakeCase)(primaryField.field);
+        const primaryFieldCol = snakeCase(primaryField.field);
         const cursorLookup = await db.selectFrom((qb) => this._db.as(this._tableName)).select([primaryFieldCol, "id"]).where(`${this._tableName}.id`, "=", cursor).limit(1).executeTakeFirst();
         if (cursorLookup) {
           const primaryValue = cursorLookup[primaryFieldCol];
@@ -1823,7 +1826,7 @@ var QueryBuilder = class _QueryBuilder {
       } else if (limit != null && results.length === limit && results.length > 0) {
         const lastResult = results[results.length - 1];
         const primaryField = orderByFields[0];
-        const primaryFieldCol = (0, import_change_case.snakeCase)(primaryField.field);
+        const primaryFieldCol = snakeCase(primaryField.field);
         const primaryValue = lastResult[primaryField.field];
         const lastId = lastResult.id;
         const primaryOp = primaryField.direction === "asc" ? ">" : "<";
@@ -2377,7 +2380,7 @@ var TaskAPI = class _TaskAPI {
    */
   constructor(taskName, tableConfigMap = {}, identity = null, authToken = null) {
     this._taskName = taskName;
-    this._tableName = (0, import_change_case.snakeCase)(taskName);
+    this._tableName = snakeCase(taskName);
     this._tableConfigMap = tableConfigMap;
     this._identity = identity;
     this._authToken = authToken;
@@ -4301,15 +4304,18 @@ function createFlowContext(runId, data, action, callback, element, spanId, ctx)
           const failedSteps = past.filter(
             (step) => step.status === "FAILED" /* FAILED */
           );
+          const runningSteps = past.filter(
+            (step) => step.status === "RUNNING" /* RUNNING */
+          );
           if (newSteps.length > 1) {
             throw new Error("Multiple NEW steps found for the same step");
           }
           if (completedSteps.length > 1) {
             throw new Error("Multiple completed steps found for the same step");
           }
-          if (completedSteps.length > 1 && newSteps.length > 1) {
+          if (completedSteps.length === 1 && newSteps.length === 1) {
             throw new Error(
-              "Multiple completed and new steps found for the same step"
+              "Found both a completed and a pending NEW step for the same step"
             );
           }
           if (completedSteps.length === 1) {
@@ -4319,9 +4325,15 @@ function createFlowContext(runId, data, action, callback, element, spanId, ctx)
           }
           if (newSteps.length === 1) {
             let result = null;
-            await db.updateTable("keel.flow_step").set({
+            const claimed = await db.updateTable("keel.flow_step").set({
+              status: "RUNNING" /* RUNNING */,
               startTime: /* @__PURE__ */ new Date()
-            }).where("id", "=", newSteps[0].id).returningAll().executeTakeFirst();
+            }).where("id", "=", newSteps[0].id).where("status", "=", "NEW" /* NEW */).returning("id").executeTakeFirst();
+            if (!claimed) {
+              span.setAttribute(KEEL_INTERNAL_ATTR, KEEL_INTERNAL_CHILDREN);
+              span.setAttribute("step.status", "RUNNING" /* RUNNING */);
+              throw new StepCreatedDisrupt();
+            }
             try {
               const stepArgs = {
                 attempt: failedSteps.length + 1,
@@ -4359,6 +4371,11 @@ function createFlowContext(runId, data, action, callback, element, spanId, ctx)
             span.setAttribute("step.status", "COMPLETED" /* COMPLETED */);
             return result;
           }
+          if (runningSteps.length >= 1) {
+            span.setAttribute(KEEL_INTERNAL_ATTR, KEEL_INTERNAL_CHILDREN);
+            span.setAttribute("step.status", "RUNNING" /* RUNNING */);
+            throw new StepCreatedDisrupt();
+          }
           await insertNewStep(db, runId, name, options.stage);
           span.setAttribute(KEEL_INTERNAL_ATTR, KEEL_INTERNAL_CHILDREN);
           span.setAttribute("step.status", "NEW" /* NEW */);