@withone/cli 1.37.0 → 1.37.1

package/dist/index.js

@@ -5267,6 +5267,80 @@ function runShellHook(command, events) {
   });
 }
 
+// src/lib/sync/transform.ts
+import { spawn as spawn3 } from "child_process";
+var TRANSFORM_TIMEOUT_MS = 6e4;
+async function transformRecords(command, records) {
+  const input = JSON.stringify(records);
+  return new Promise((resolve) => {
+    const child = spawn3("sh", ["-c", command], {
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    let stdout = "";
+    let stderr = "";
+    child.stdout.on("data", (chunk) => {
+      stdout += chunk.toString();
+    });
+    child.stderr.on("data", (chunk) => {
+      stderr += chunk.toString();
+    });
+    const timer = setTimeout(() => {
+      try {
+        child.kill();
+      } catch {
+      }
+      if (!isAgentMode()) {
+        process.stderr.write(`  Transform timed out after ${TRANSFORM_TIMEOUT_MS / 1e3}s \u2014 using original records
+`);
+      }
+      resolve(null);
+    }, TRANSFORM_TIMEOUT_MS);
+    child.on("exit", (code) => {
+      clearTimeout(timer);
+      if (stderr.trim() && !isAgentMode()) {
+        process.stderr.write(`  Transform stderr: ${stderr.trim()}
+`);
+      }
+      if (code !== 0) {
+        if (!isAgentMode()) {
+          process.stderr.write(`  Transform exited with code ${code} \u2014 using original records
+`);
+        }
+        resolve(null);
+        return;
+      }
+      try {
+        const parsed = JSON.parse(stdout.trim());
+        if (!Array.isArray(parsed)) {
+          if (!isAgentMode()) {
+            process.stderr.write(`  Transform returned non-array JSON \u2014 using original records
+`);
+          }
+          resolve(null);
+          return;
+        }
+        resolve(parsed);
+      } catch {
+        if (!isAgentMode()) {
+          process.stderr.write(`  Transform returned invalid JSON \u2014 using original records
+`);
+        }
+        resolve(null);
+      }
+    });
+    child.on("error", (err) => {
+      clearTimeout(timer);
+      if (!isAgentMode()) {
+        process.stderr.write(`  Transform failed to start: ${err.message} \u2014 using original records
+`);
+      }
+      resolve(null);
+    });
+    child.stdin.write(input);
+    child.stdin.end();
+  });
+}
+
 // src/lib/sync/enrich.ts
 var DEFAULT_CONCURRENCY = 5;
 var MAX_RETRIES = 3;
@@ -5356,7 +5430,7 @@ function pickFields(obj, fields) {
   }
   return result;
 }
-async function enrichPhase(api, db, config2, model, idField, connectionKey, platform) {
+async function enrichPhase(api, db, config2, model, idField, connectionKey, platform, ctx = {}) {
   const startTime = Date.now();
   const tsField = config2.timestampField ?? "_enriched_at";
   const safeTable = model.replace(/[^a-zA-Z0-9_]/g, "_");
@@ -5404,6 +5478,7 @@ async function enrichPhase(api, db, config2, model, idField, connectionKey, plat
     );
     let batchHitRateLimit = false;
     const now = (/* @__PURE__ */ new Date()).toISOString();
+    const pending = [];
     for (let j = 0; j < results.length; j++) {
       const result = results[j];
       const row = batch[j];
@@ -5418,28 +5493,7 @@ async function enrichPhase(api, db, config2, model, idField, connectionKey, plat
         }
         const merged = config2.merge !== false ? deepMerge(row, enrichedData) : { ...enrichedData, [idField]: id };
         merged[tsField] = now;
-        const setClauses = [];
-        const values = [];
-        for (const [key, val] of Object.entries(merged)) {
-          if (key === idField) continue;
-          setClauses.push(`"${key}" = ?`);
-          values.push(prepareValue2(val));
-        }
-        values.push(prepareValue2(id));
-        if (setClauses.length > 0) {
-          const existingCols = new Set(db.prepare(`PRAGMA table_info("${safeTable}")`).all().map((c) => c.name));
-          for (const [key, val] of Object.entries(merged)) {
-            if (!existingCols.has(key)) {
-              const colType = detectColumnType2(val);
-              db.exec(`ALTER TABLE "${safeTable}" ADD COLUMN "${key}" ${colType}`);
-              existingCols.add(key);
-            }
-          }
-          db.prepare(
-            `UPDATE "${safeTable}" SET ${setClauses.join(", ")} WHERE "${safeIdField}" = ?`
-          ).run(...values);
-        }
-        enriched++;
+        pending.push({ merged, id });
       } else if (result.status === "fulfilled" && result.value === null) {
         rateLimited++;
         skipped++;
@@ -5448,6 +5502,62 @@ async function enrichPhase(api, db, config2, model, idField, connectionKey, plat
         skipped++;
       }
     }
+    let writes = pending;
+    if (ctx.transform && pending.length > 0) {
+      const transformed = await transformRecords(ctx.transform, pending.map((p10) => p10.merged));
+      if (transformed) {
+        const byId = /* @__PURE__ */ new Map();
+        for (const r of transformed) byId.set(r[idField], r);
+        writes = [];
+        for (const p10 of pending) {
+          const t = byId.get(p10.id);
+          if (!t) continue;
+          if (!t[tsField]) t[tsField] = now;
+          writes.push({ merged: t, id: p10.id });
+        }
+      }
+    }
+    const hookEvents = [];
+    for (const { merged, id } of writes) {
+      if (ctx.exclude && ctx.exclude.length > 0) {
+        stripExcludedFields(merged, ctx.exclude);
+      }
+      if (ctx.identityKey) {
+        const raw = getByDotPath2(merged, ctx.identityKey);
+        if (raw !== null && raw !== void 0) {
+          merged._identity = String(raw).toLowerCase().trim();
+        }
+      }
+      const setClauses = [];
+      const values = [];
+      for (const [key, val] of Object.entries(merged)) {
+        if (key === idField) continue;
+        setClauses.push(`"${key}" = ?`);
+        values.push(prepareValue2(val));
+      }
+      values.push(prepareValue2(id));
+      if (setClauses.length > 0) {
+        const existingCols = new Set(db.prepare(`PRAGMA table_info("${safeTable}")`).all().map((c) => c.name));
+        for (const [key, val] of Object.entries(merged)) {
+          if (!existingCols.has(key)) {
+            const colType = detectColumnType2(val);
+            db.exec(`ALTER TABLE "${safeTable}" ADD COLUMN "${key}" ${colType}`);
+            existingCols.add(key);
+          }
+        }
+        db.prepare(
+          `UPDATE "${safeTable}" SET ${setClauses.join(", ")} WHERE "${safeIdField}" = ?`
+        ).run(...values);
+      }
+      enriched++;
+      if (ctx.onUpdate || ctx.onChange) {
+        hookEvents.push({ type: "update", platform, model, record: merged, timestamp: now });
+      }
+    }
+    if (hookEvents.length > 0) {
+      const hook = ctx.onUpdate || ctx.onChange;
+      if (hook) await fireHooks(hook, hookEvents);
+    }
     if (batchHitRateLimit) {
       concurrency = Math.max(1, Math.floor(concurrency / 2));
       if (!isAgentMode()) {
@@ -5527,80 +5637,6 @@ function detectColumnType2(value) {
   return "TEXT";
 }
 
-// src/lib/sync/transform.ts
-import { spawn as spawn3 } from "child_process";
-var TRANSFORM_TIMEOUT_MS = 6e4;
-async function transformRecords(command, records) {
-  const input = JSON.stringify(records);
-  return new Promise((resolve) => {
-    const child = spawn3("sh", ["-c", command], {
-      stdio: ["pipe", "pipe", "pipe"]
-    });
-    let stdout = "";
-    let stderr = "";
-    child.stdout.on("data", (chunk) => {
-      stdout += chunk.toString();
-    });
-    child.stderr.on("data", (chunk) => {
-      stderr += chunk.toString();
-    });
-    const timer = setTimeout(() => {
-      try {
-        child.kill();
-      } catch {
-      }
-      if (!isAgentMode()) {
-        process.stderr.write(`  Transform timed out after ${TRANSFORM_TIMEOUT_MS / 1e3}s \u2014 using original records
-`);
-      }
-      resolve(null);
-    }, TRANSFORM_TIMEOUT_MS);
-    child.on("exit", (code) => {
-      clearTimeout(timer);
-      if (stderr.trim() && !isAgentMode()) {
-        process.stderr.write(`  Transform stderr: ${stderr.trim()}
-`);
-      }
-      if (code !== 0) {
-        if (!isAgentMode()) {
-          process.stderr.write(`  Transform exited with code ${code} \u2014 using original records
-`);
-        }
-        resolve(null);
-        return;
-      }
-      try {
-        const parsed = JSON.parse(stdout.trim());
-        if (!Array.isArray(parsed)) {
-          if (!isAgentMode()) {
-            process.stderr.write(`  Transform returned non-array JSON \u2014 using original records
-`);
-          }
-          resolve(null);
-          return;
-        }
-        resolve(parsed);
-      } catch {
-        if (!isAgentMode()) {
-          process.stderr.write(`  Transform returned invalid JSON \u2014 using original records
-`);
-        }
-        resolve(null);
-      }
-    });
-    child.on("error", (err) => {
-      clearTimeout(timer);
-      if (!isAgentMode()) {
-        process.stderr.write(`  Transform failed to start: ${err.message} \u2014 using original records
-`);
-      }
-      resolve(null);
-    });
-    child.stdin.write(input);
-    child.stdin.end();
-  });
-}
-
 // src/lib/sync/runner.ts
 var MAX_RETRIES_PER_PAGE = 3;
 var DEFAULT_SINCE_DAYS = 90;
@@ -6000,11 +6036,22 @@ async function syncModel(api, profile, options) {
         model,
         profile.idField,
         profile.connectionKey,
-        platform
+        platform,
+        {
+          transform: profile.transform,
+          exclude: profile.exclude,
+          identityKey: profile.identityKey,
+          onInsert: profile.onInsert,
+          onUpdate: profile.onUpdate,
+          onChange: profile.onChange
+        }
       );
       enrichedTotal = enrichResult.enriched;
       enrichSkipped = enrichResult.skipped;
       enrichRateLimited = enrichResult.rateLimited;
+      if (hasHooks && (profile.onUpdate || profile.onChange)) {
+        hooksUpdated += enrichResult.enriched;
+      }
       if (enrichResult.enriched > 0) {
         rebuildFtsIndex(db, model);
       }
@@ -8509,6 +8556,8 @@ The transform can be any command: \`jq\`, \`python3\`, a bash script, or \`one f
 
 **Pipeline order:** fetch \u2192 enrich \u2192 transform \u2192 **exclude** \u2192 create table \u2192 schema evolution \u2192 upsert \u2192 hooks
 
+Transform, exclude, identityKey, and hooks all fire in **both** phases. In Phase 1 they run on the raw list page; in Phase 2 they run again on the merged (list + enriched) record so that transforms can extract columns from fields that only appear after enrichment. Phase 2 fires \`onUpdate\`/\`onChange\` for every row it writes \u2014 \`onInsert\` is Phase-1-only because the row already exists in SQL by the time enrichment runs.
+
 ## Cross-Platform Identity
 
 Add \`identityKey\` to a sync profile to extract a stable cross-platform identifier (e.g. email) into a normalized \`_identity\` column:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@withone/cli",
-  "version": "1.37.0",
+  "version": "1.37.1",
   "description": "CLI for managing One",
   "type": "module",
   "files": [