@sixb/core 0.1.2 → 0.1.3

package/dist/{chunk-sa4340y1.js → chunk-1ywq4hzk.js}

@@ -1,10 +1,10 @@
 // @bun
 import {
   isSyncDefinition
-} from "./chunk-7pc8b818.js";
+} from "./chunk-c6cfqydk.js";
 import {
   isPipelineDefinition
-} from "./chunk-bh6k3nc6.js";
+} from "./chunk-4p9rh7jj.js";
 import {
   allPredicates,
   anyPredicates,
@@ -20,24 +20,24 @@ import {
 import {
   isAgentDefinition,
   isWorkflowDefinition
-} from "./chunk-0mbx247x.js";
+} from "./chunk-177ed2mp.js";
 import {
   RuntimeError
-} from "./chunk-k9pts48t.js";
+} from "./chunk-3rsf30p4.js";
 import {
   isConnectorDefinition
 } from "./chunk-8m5ejdpn.js";
 import {
   isActionDefinition
-} from "./chunk-c6qd89g5.js";
+} from "./chunk-d6y2wsfg.js";
 import {
   isGroupDefinition,
   isMembershipPolicyDefinition,
   isRoleDefinition
-} from "./chunk-jaj13078.js";
+} from "./chunk-d2adj15j.js";
 import {
   isProjectionDefinition
-} from "./chunk-34bqh420.js";
+} from "./chunk-4z3n1dzt.js";
 
 // src/bootstrap/discovery.ts
 import { readdir } from "fs/promises";

package/dist/{chunk-zg9yryhz.js → chunk-261ag4t4.js}

@@ -3,10 +3,10 @@ import {
   createPrimitiveExecutionRecord,
   ensureExecutionRecord,
   executionRecordInputFromRuntime
-} from "./chunk-8ryen3p3.js";
+} from "./chunk-4aw0jwk0.js";
 import {
   PIPELINE_RUN_FAILURE_CODES
-} from "./chunk-ys1nse2v.js";
+} from "./chunk-xmggaxg4.js";
 import {
   PipelineRunError
 } from "./chunk-cy0n5dms.js";
@@ -15,7 +15,7 @@ import {
 } from "./chunk-dsrkgtnh.js";
 import {
   assertAuthorized
-} from "./chunk-34bqh420.js";
+} from "./chunk-4z3n1dzt.js";
 import {
   createSixbError,
   toSixbFailure

package/dist/{chunk-k9pts48t.js → chunk-3rsf30p4.js}

@@ -13,20 +13,20 @@ import {
   explainObjectQuery,
   facetObjects,
   validateObjectQuery
-} from "./chunk-nnyp53zt.js";
+} from "./chunk-f1cyvnrk.js";
 import {
   ObjectQueryPlanningError
 } from "./chunk-88ppkr54.js";
 import {
   requestAction,
   requestActionAndWait
-} from "./chunk-c6qd89g5.js";
+} from "./chunk-d6y2wsfg.js";
 import {
   normalizeJsonProperties
-} from "./chunk-st4xgxey.js";
+} from "./chunk-ettb0cy4.js";
 import {
   ObjectNotFoundError
-} from "./chunk-ys1nse2v.js";
+} from "./chunk-xmggaxg4.js";
 import {
   linkRefKey,
   telemetryPointKey
@@ -57,7 +57,7 @@ import {
   assertCanAppendTelemetry,
   assertCanEdit,
   assertPrivileged
-} from "./chunk-34bqh420.js";
+} from "./chunk-4z3n1dzt.js";
 import {
   stableJsonStringify
 } from "./chunk-t8t39h7v.js";

package/dist/{chunk-8ryen3p3.js → chunk-4aw0jwk0.js}

@@ -5,7 +5,7 @@ import {
 import {
   createTrustedPrimitiveRuntimeAuthorization,
   getAuthorizationRef
-} from "./chunk-34bqh420.js";
+} from "./chunk-4z3n1dzt.js";
 
 // src/execution/durable.ts
 import { isDeepStrictEqual } from "util";

package/dist/{chunk-bh6k3nc6.js → chunk-4p9rh7jj.js}

@@ -8,7 +8,7 @@ import {
 } from "./chunk-a31h57d5.js";
 import {
   PipelineError
-} from "./chunk-zg9yryhz.js";
+} from "./chunk-261ag4t4.js";
 
 // src/lake-storage/sql-transforms.ts
 var SQL_DIALECT = {

package/dist/{chunk-34bqh420.js → chunk-4z3n1dzt.js}

@@ -775,6 +775,19 @@ function validateProjectionsAtStartup(projections, ontology, datasetsById) {
       throw new ProjectionValidationError(`${prefix}: unknown object type "${projection.objectTypeId}"`);
     }
     const datasetColumnNames = new Set(dataset.schema.columns.map((column) => column.name));
+    const conflictResolution = projection.conflictResolution ?? { strategy: "editsWin" };
+    if (conflictResolution.strategy === "mostRecent") {
+      const sourceTimestamp = dataset.schema.columns.find((column) => column.name === conflictResolution.sourceTimestamp);
+      if (!sourceTimestamp) {
+        throw new ProjectionValidationError(`${prefix}: source timestamp "${conflictResolution.sourceTimestamp}" references unknown ` + `dataset column on dataset "${projection.datasetId}"`);
+      }
+      if (sourceTimestamp.type !== "timestamp") {
+        throw new ProjectionValidationError(`${prefix}: source timestamp "${conflictResolution.sourceTimestamp}" must reference a ` + `timestamp dataset column`);
+      }
+      if (sourceTimestamp.nullable === true) {
+        throw new ProjectionValidationError(`${prefix}: source timestamp "${conflictResolution.sourceTimestamp}" must reference a ` + `non-null timestamp dataset column`);
+      }
+    }
     const propertyIds = new Set(objectType.properties.map((p) => p.id));
     for (const [propId, columnName] of Object.entries(projection.properties)) {
       if (!propertyIds.has(propId)) {
@@ -964,33 +977,49 @@ function buildObjectProjection(id, objectType) {
         properties(mapping) {
           const propertyMapping = mapping;
           validatePropertyMapping(objectType, propertyMapping);
-          const definition = {
-            _tag: "ObjectProjectionDefinition",
+          return objectProjectionBuilder({
             id,
-            objectTypeId: objectType.id,
+            objectType,
             datasetId,
-            properties: { ...propertyMapping },
-            links: {}
-          };
-          return Object.assign(definition, {
-            withLinks(linkMapping) {
-              const loweredLinkMapping = lowerForeignKeyMapping(linkMapping);
-              const validatedLinks = validateAndLowerLinkMapping(objectType, loweredLinkMapping, propertyMapping);
-              return {
-                _tag: "ObjectProjectionDefinition",
-                id,
-                objectTypeId: objectType.id,
-                datasetId,
-                properties: { ...propertyMapping },
-                links: validatedLinks
-              };
-            }
+            propertyMapping,
+            links: {},
+            conflictResolution: { strategy: "editsWin" }
           });
         }
       };
     }
   };
 }
+function objectProjectionBuilder(input) {
+  const definition = {
+    _tag: "ObjectProjectionDefinition",
+    id: input.id,
+    objectTypeId: input.objectType.id,
+    datasetId: input.datasetId,
+    properties: { ...input.propertyMapping },
+    links: { ...input.links },
+    conflictResolution: { ...input.conflictResolution }
+  };
+  return Object.assign(definition, {
+    withLinks(linkMapping) {
+      const loweredLinkMapping = lowerForeignKeyMapping(linkMapping);
+      const validatedLinks = validateAndLowerLinkMapping(input.objectType, loweredLinkMapping, input.propertyMapping);
+      return objectProjectionBuilder({ ...input, links: validatedLinks });
+    },
+    resolveConflicts(resolution) {
+      validateConflictResolution(resolution);
+      return objectProjectionBuilder({
+        ...input,
+        conflictResolution: resolution
+      });
+    }
+  });
+}
+function validateConflictResolution(resolution) {
+  if (resolution.strategy === "editsWin")
+    return;
+  assertNonEmpty2(resolution.sourceTimestamp, "source timestamp field");
+}
 function buildTelemetryProjection(id, propertyToken) {
   assertNonEmpty2(id, "id");
   validateTelemetryProjectionProperty(propertyToken);
@@ -1103,7 +1132,16 @@ function buildLinkProjection(id, linkToken) {
 function isObjectProjectionDefinition(value) {
   if (!isRecord(value))
     return false;
-  return value._tag === "ObjectProjectionDefinition" && typeof value.id === "string" && typeof value.objectTypeId === "string" && typeof value.datasetId === "string" && isRecord(value.properties) && isRecord(value.links);
+  return value._tag === "ObjectProjectionDefinition" && typeof value.id === "string" && typeof value.objectTypeId === "string" && typeof value.datasetId === "string" && isRecord(value.properties) && isRecord(value.links) && isSourceEditConflictResolution(value.conflictResolution);
+}
+function isSourceEditConflictResolution(value) {
+  if (value === undefined)
+    return true;
+  if (!isRecord(value) || typeof value.strategy !== "string")
+    return false;
+  if (value.strategy === "editsWin")
+    return value.sourceTimestamp === undefined;
+  return value.strategy === "mostRecent" && typeof value.sourceTimestamp === "string";
 }
 function isLinkProjectionDefinition(value) {
   if (!isRecord(value))
@@ -1165,4 +1203,4 @@ function emptyGrantIndex() {
 }
 export { ProjectionValidationError, computeProjectionOwnership, validateProjectionOwnership, validateTelemetryProjectionFieldMapping, validateProjectionsAtStartup, defineProjection, fromForeignKey, isObjectProjectionDefinition, isLinkProjectionDefinition, isTelemetryProjectionDefinition, isProjectionDefinition, projectionTargetOf, GRANT_KINDS, grantKindOf, createPrincipalRuntimeAuthorization, createAgentRuntimeAuthorization, createDisabledRuntimeAuthorization, createTrustedPrimitiveRuntimeAuthorization, getAuthorizationRef, resolveExecutionScopeAuthorization, AuthorizationError, evaluate, isAllowed, assertAuthorized, assertCanEdit, assertCanAppendTelemetry, assertCanManageConnector, assertPrivileged, assertProviderAccess, isApplicationAccessControlled, canAccessApplication, canViewEvent, resolveRoleGrants, resolveAuthorizationContext, canViewActionRun, canViewWorkflowRun, canViewWorkflowIntervention, canViewPipelineRun, canViewProjectionRun, canViewProjection, emptyGrantIndex };
 
-//# debugId=EA88C5F91530A04564756E2164756E21
+//# debugId=07A883C0450D0C9064756E2164756E21