@sixb/core 0.1.12 → 0.1.14

package/dist/{chunk-7zgecwy1.js → chunk-6x0pqh32.js}

@@ -69,6 +69,17 @@ function schemaJsonSchema(schema, valueTypesById, resolving) {
           required: ["blobId", "digest", "sizeBytes"],
           additionalProperties: false
         };
+      case "userRef":
+        return {
+          type: "object",
+          properties: {
+            type: { type: "string", enum: ["user"] },
+            id: { type: "string", minLength: 1 }
+          },
+          required: ["type", "id"],
+          additionalProperties: false
+        };
+      default:
     }
   }
   if (schema.type === "enum")
@@ -110,4 +121,4 @@ function schemaJsonSchema(schema, valueTypesById, resolving) {
 
 export { schemaRecordToJsonSchema2, schemaFieldsToJsonSchema2 };
 
-//# debugId=A6566067B08891D464756E2164756E21
+//# debugId=5F91F59559F72A6064756E2164756E21

package/dist/{chunk-7zgecwy1.js.map → chunk-6x0pqh32.js.map}

@@ -2,9 +2,9 @@
   "version": 3,
   "sources": ["../src/ontology/json-schema.ts"],
   "sourcesContent": [
-    "import type { JsonObject } from \"../json\"\nimport { OntologyValidationError } from \"./errors\"\nimport type { SchemaOrRef } from \"./refs\"\nimport type { Schema, ValueType } from \"./types\"\n\ntype DeepReadonly<T> = T extends object ? { readonly [K in keyof T]: DeepReadonly<T[K]> } : T\n\nexport interface SchemaJsonField {\n  readonly schema: DeepReadonly<SchemaOrRef>\n  readonly required?: boolean\n  readonly nullable?: boolean\n}\n\n/** Convert a record of Sixb schemas into the strict JSON object schema used by model outputs. */\nexport function schemaRecordToJsonSchema(input: {\n  readonly shape: Readonly<Record<string, DeepReadonly<SchemaOrRef>>>\n  readonly valueTypesById: ReadonlyMap<string, ValueType>\n}): JsonObject {\n  return schemaFieldsToJsonSchema({\n    fields: Object.fromEntries(\n      Object.entries(input.shape).map(([field, schema]) => [field, { schema, required: true }])\n    ),\n    valueTypesById: input.valueTypesById,\n  })\n}\n\n/** Convert configured fields into the strict JSON object schema accepted at runtime. */\nexport function schemaFieldsToJsonSchema(input: {\n  readonly fields: Readonly<Record<string, SchemaJsonField>>\n  readonly valueTypesById: ReadonlyMap<string, ValueType>\n}): JsonObject {\n  const required = Object.entries(input.fields)\n    .filter(([, field]) => field.required === true)\n    .map(([field]) => field)\n  return {\n    type: \"object\",\n    properties: Object.fromEntries(\n      Object.entries(input.fields).map(([fieldId, field]) => {\n        const fieldSchema = schemaOrRefJsonSchema(field.schema, input.valueTypesById, new Set())\n        return [fieldId, field.nullable ? { anyOf: [fieldSchema, { type: \"null\" }] } : fieldSchema]\n      })\n    ),\n    ...(required.length > 0 ? { required } : {}),\n    additionalProperties: false,\n  }\n}\n\nfunction schemaOrRefJsonSchema(\n  schema: DeepReadonly<SchemaOrRef>,\n  valueTypesById: ReadonlyMap<string, ValueType>,\n  resolving: ReadonlySet<string>\n): JsonObject {\n  if (typeof schema !== \"string\" && schema.type === \"objectRef\") {\n    return {\n      type: \"object\",\n      properties: {\n        objectTypeId: { type: \"string\", const: schema.objectTypeId },\n        primaryId: { type: \"string\" },\n      },\n      required: [\"objectTypeId\", \"primaryId\"],\n      additionalProperties: false,\n    }\n  }\n  return schemaJsonSchema(schema, valueTypesById, resolving)\n}\n\nfunction schemaJsonSchema(\n  schema: DeepReadonly<Schema>,\n  valueTypesById: ReadonlyMap<string, ValueType>,\n  resolving: ReadonlySet<string>\n): JsonObject {\n  if (typeof schema === \"string\") {\n    switch (schema) {\n      case \"string\":\n        return { type: \"string\" }\n      case \"integer\":\n        return { type: \"integer\" }\n      case \"double\":\n        return { type: \"number\" }\n      case \"decimal\":\n        return { type: \"string\", pattern: \"^[+-]?\\\\d+(?:\\\\.\\\\d+)?$\" }\n      case \"boolean\":\n        return { type: \"boolean\" }\n      case \"date\":\n        return { type: \"string\", format: \"date\" }\n      case \"timestamp\":\n        return { type: \"string\", format: \"date-time\" }\n      case \"uuid\":\n        return { type: \"string\", format: \"uuid\" }\n      case \"fileRef\":\n        return {\n          type: \"object\",\n          properties: {\n            blobId: { type: \"string\" },\n            digest: { type: \"string\", pattern: \"^sha256:[a-fA-F0-9]{64}$\" },\n            sizeBytes: { type: \"integer\", minimum: 0 },\n            fileName: { type: \"string\" },\n            mediaType: { type: \"string\" },\n            logicalPath: { type: \"string\" },\n          },\n          required: [\"blobId\", \"digest\", \"sizeBytes\"],\n          additionalProperties: false,\n        }\n    }\n  }\n\n  if (schema.type === \"enum\") return { enum: [...schema.values] }\n  if (schema.type === \"array\") {\n    return { type: \"array\", items: schemaJsonSchema(schema.items, valueTypesById, resolving) }\n  }\n  if (schema.type === \"map\") {\n    return {\n      type: \"object\",\n      additionalProperties: schemaJsonSchema(schema.valueSchema, valueTypesById, resolving),\n    }\n  }\n  if (schema.type === \"object\") {\n    const required: string[] = []\n    const properties = Object.fromEntries(\n      Object.entries(schema.properties).map(([fieldId, field]) => {\n        if (field.required) required.push(fieldId)\n        const fieldSchema = schemaJsonSchema(field.schema, valueTypesById, resolving)\n        return [fieldId, field.nullable ? { anyOf: [fieldSchema, { type: \"null\" }] } : fieldSchema]\n      })\n    )\n    return {\n      type: \"object\",\n      properties,\n      ...(required.length > 0 ? { required } : {}),\n      additionalProperties: false,\n    }\n  }\n\n  const valueTypeId = schema.valueTypeId\n  if (resolving.has(valueTypeId)) {\n    throw new OntologyValidationError(\n      `Structured output contains a recursive value type '${valueTypeId}'.`\n    )\n  }\n  const resolved = schema._resolved ?? valueTypesById.get(valueTypeId)?.schema\n  if (!resolved) {\n    throw new OntologyValidationError(\n      `Structured output references unknown value type '${valueTypeId}'.`\n    )\n  }\n  return schemaJsonSchema(resolved, valueTypesById, new Set([...resolving, valueTypeId]))\n}\n"
+    "import type { JsonObject } from \"../json\"\nimport { OntologyValidationError } from \"./errors\"\nimport type { SchemaOrRef } from \"./refs\"\nimport type { Schema, ValueType } from \"./types\"\n\ntype DeepReadonly<T> = T extends object ? { readonly [K in keyof T]: DeepReadonly<T[K]> } : T\n\nexport interface SchemaJsonField {\n  readonly schema: DeepReadonly<SchemaOrRef>\n  readonly required?: boolean\n  readonly nullable?: boolean\n}\n\n/** Convert a record of Sixb schemas into the strict JSON object schema used by model outputs. */\nexport function schemaRecordToJsonSchema(input: {\n  readonly shape: Readonly<Record<string, DeepReadonly<SchemaOrRef>>>\n  readonly valueTypesById: ReadonlyMap<string, ValueType>\n}): JsonObject {\n  return schemaFieldsToJsonSchema({\n    fields: Object.fromEntries(\n      Object.entries(input.shape).map(([field, schema]) => [field, { schema, required: true }])\n    ),\n    valueTypesById: input.valueTypesById,\n  })\n}\n\n/** Convert configured fields into the strict JSON object schema accepted at runtime. */\nexport function schemaFieldsToJsonSchema(input: {\n  readonly fields: Readonly<Record<string, SchemaJsonField>>\n  readonly valueTypesById: ReadonlyMap<string, ValueType>\n}): JsonObject {\n  const required = Object.entries(input.fields)\n    .filter(([, field]) => field.required === true)\n    .map(([field]) => field)\n  return {\n    type: \"object\",\n    properties: Object.fromEntries(\n      Object.entries(input.fields).map(([fieldId, field]) => {\n        const fieldSchema = schemaOrRefJsonSchema(field.schema, input.valueTypesById, new Set())\n        return [fieldId, field.nullable ? { anyOf: [fieldSchema, { type: \"null\" }] } : fieldSchema]\n      })\n    ),\n    ...(required.length > 0 ? { required } : {}),\n    additionalProperties: false,\n  }\n}\n\nfunction schemaOrRefJsonSchema(\n  schema: DeepReadonly<SchemaOrRef>,\n  valueTypesById: ReadonlyMap<string, ValueType>,\n  resolving: ReadonlySet<string>\n): JsonObject {\n  if (typeof schema !== \"string\" && schema.type === \"objectRef\") {\n    return {\n      type: \"object\",\n      properties: {\n        objectTypeId: { type: \"string\", const: schema.objectTypeId },\n        primaryId: { type: \"string\" },\n      },\n      required: [\"objectTypeId\", \"primaryId\"],\n      additionalProperties: false,\n    }\n  }\n  return schemaJsonSchema(schema, valueTypesById, resolving)\n}\n\nfunction schemaJsonSchema(\n  schema: DeepReadonly<Schema>,\n  valueTypesById: ReadonlyMap<string, ValueType>,\n  resolving: ReadonlySet<string>\n): JsonObject {\n  if (typeof schema === \"string\") {\n    switch (schema) {\n      case \"string\":\n        return { type: \"string\" }\n      case \"integer\":\n        return { type: \"integer\" }\n      case \"double\":\n        return { type: \"number\" }\n      case \"decimal\":\n        return { type: \"string\", pattern: \"^[+-]?\\\\d+(?:\\\\.\\\\d+)?$\" }\n      case \"boolean\":\n        return { type: \"boolean\" }\n      case \"date\":\n        return { type: \"string\", format: \"date\" }\n      case \"timestamp\":\n        return { type: \"string\", format: \"date-time\" }\n      case \"uuid\":\n        return { type: \"string\", format: \"uuid\" }\n      case \"fileRef\":\n        return {\n          type: \"object\",\n          properties: {\n            blobId: { type: \"string\" },\n            digest: { type: \"string\", pattern: \"^sha256:[a-fA-F0-9]{64}$\" },\n            sizeBytes: { type: \"integer\", minimum: 0 },\n            fileName: { type: \"string\" },\n            mediaType: { type: \"string\" },\n            logicalPath: { type: \"string\" },\n          },\n          required: [\"blobId\", \"digest\", \"sizeBytes\"],\n          additionalProperties: false,\n        }\n      case \"userRef\":\n        return {\n          type: \"object\",\n          properties: {\n            type: { type: \"string\", enum: [\"user\"] },\n            id: { type: \"string\", minLength: 1 },\n          },\n          required: [\"type\", \"id\"],\n          additionalProperties: false,\n        }\n      default:\n        schema satisfies never\n    }\n  }\n\n  if (schema.type === \"enum\") return { enum: [...schema.values] }\n  if (schema.type === \"array\") {\n    return { type: \"array\", items: schemaJsonSchema(schema.items, valueTypesById, resolving) }\n  }\n  if (schema.type === \"map\") {\n    return {\n      type: \"object\",\n      additionalProperties: schemaJsonSchema(schema.valueSchema, valueTypesById, resolving),\n    }\n  }\n  if (schema.type === \"object\") {\n    const required: string[] = []\n    const properties = Object.fromEntries(\n      Object.entries(schema.properties).map(([fieldId, field]) => {\n        if (field.required) required.push(fieldId)\n        const fieldSchema = schemaJsonSchema(field.schema, valueTypesById, resolving)\n        return [fieldId, field.nullable ? { anyOf: [fieldSchema, { type: \"null\" }] } : fieldSchema]\n      })\n    )\n    return {\n      type: \"object\",\n      properties,\n      ...(required.length > 0 ? { required } : {}),\n      additionalProperties: false,\n    }\n  }\n\n  const valueTypeId = schema.valueTypeId\n  if (resolving.has(valueTypeId)) {\n    throw new OntologyValidationError(\n      `Structured output contains a recursive value type '${valueTypeId}'.`\n    )\n  }\n  const resolved = schema._resolved ?? valueTypesById.get(valueTypeId)?.schema\n  if (!resolved) {\n    throw new OntologyValidationError(\n      `Structured output references unknown value type '${valueTypeId}'.`\n    )\n  }\n  return schemaJsonSchema(resolved, valueTypesById, new Set([...resolving, valueTypeId]))\n}\n"
   ],
-  "mappings": "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",
-  "debugId": "A6566067B08891D464756E2164756E21",
+  "mappings": "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",
+  "debugId": "5F91F59559F72A6064756E2164756E21",
   "names": []
 }

package/dist/{chunk-6ma8dvzc.js → chunk-728fp090.js}

@@ -3,11 +3,16 @@ import {
   MAX_OBJECT_READ_FACETS2,
   isAllowed2,
   assertAuthorized2
-} from "./chunk-bbaa1fet.js";
+} from "./chunk-rzcjp5m2.js";
 import {
   validateSchemaValue2,
-  validatePropertyValue2
-} from "./chunk-vsg0g7h9.js";
+  validatePropertyValue2,
+  isExactSchema,
+  isSortableSchema,
+  isTextSchema,
+  isContainsSchema,
+  queryScalarKindForSchema
+} from "./chunk-d8yes9yx.js";
 import {
   hasVectorProfile2,
   isVectorProfileQuery2,
@@ -19,13 +24,13 @@ import {
   MAX_VECTOR_K,
   vectorConfiguration,
   normalizeVector2
-} from "./chunk-ybhz3j9g.js";
+} from "./chunk-3fpgxpsq.js";
 import {
+  normalizeObjectQuery2,
   ObjectQueryValidationError2,
   ObjectQueryPlanningError2,
-  ObjectQueryExecutionError2,
-  normalizeObjectQuery2
-} from "./chunk-4k53sm9e.js";
+  ObjectQueryExecutionError2
+} from "./chunk-a0073121.js";
 import {
   sameEmbeddingModel
 } from "./chunk-p1683c0v.js";
@@ -274,6 +279,7 @@ function predicateScalarOperation(predicate) {
     case "eq":
     case "neq":
     case "in":
+    case "contains":
       return "equality";
     case "lt":
     case "lte":
@@ -696,8 +702,9 @@ function validatePredicate(predicate, shape, admissionState, path, ctx) {
         addIssue2(ctx, path, "invalid_exists_value", "Predicate 'exists' value must be boolean");
       }
       return predicate;
-    case "contains":
-      resolveAndValidatePredicateProperty(predicate.propertyId, predicate.op, shape, path, ctx);
+    case "contains": {
+      const { scalarKind: _authoredScalarKind, ...authoredPredicate } = predicate;
+      const scalarKind = resolveAndValidatePredicateProperty(predicate.propertyId, predicate.op, shape, path, ctx);
       validateContainsValue(predicate.propertyId, predicate.value, shape, path, ctx);
       admitProperty(ctx, {
         state: admissionState,
@@ -705,7 +712,12 @@ function validatePredicate(predicate, shape, admissionState, path, ctx) {
         use: "filter",
         path
       });
-      return predicate;
+      return {
+        ...authoredPredicate,
+        value: normalizeObjectQueryValue(predicate.value, scalarKind),
+        ...scalarKind ? { scalarKind } : {}
+      };
+    }
   }
 }
 function resolveAndValidatePredicateProperty(propertyId, op, shape, path, ctx) {
@@ -736,10 +748,31 @@ function resolveAndValidatePredicateProperty(propertyId, op, shape, path, ctx) {
       addIssue2(ctx, path, "operator_not_supported_for_schema", `Predicate 'contains' cannot be used with property '${propertyId}' on '${objectType.id}' because its schema is not string, array, or map`);
     }
   }
-  if (op === "exists" || op === "contains")
+  if (op === "exists")
     return;
+  if (op === "contains")
+    return resolveArrayItemScalarKind(schemas, ctx);
   return resolveCommonQueryScalarKind(schemas, propertyId, path, ctx);
 }
+function resolveArrayItemScalarKind(schemas, ctx) {
+  const kinds = new Set;
+  for (const schema of schemas) {
+    if (typeof schema === "string" || schema.type !== "array")
+      return;
+    const items = resolveValueTypeRefs(schema.items, ctx.valueTypesById);
+    kinds.add(items ? queryScalarKindForSchema(items) : undefined);
+  }
+  return kinds.size === 1 ? [...kinds][0] : undefined;
+}
+function resolveValueTypeRefs(schema, valueTypesById, seen = new Set) {
+  if (typeof schema === "string" || schema.type !== "valueTypeRef")
+    return schema;
+  if (seen.has(schema.valueTypeId))
+    return;
+  seen.add(schema.valueTypeId);
+  const resolved = schema._resolved ?? valueTypesById.get(schema.valueTypeId)?.schema;
+  return resolved ? resolveValueTypeRefs(resolved, valueTypesById, seen) : undefined;
+}
 function normalizeObjectQueryValue(value, scalarKind) {
   if (scalarKind !== "decimal" || typeof value !== "string")
     return value;
@@ -760,13 +793,6 @@ function resolveCommonQueryScalarKind(schemas, propertyId, path, ctx) {
   addIssue2(ctx, path, "incompatible_property_scalar_kinds", `Property '${propertyId}' resolves to incompatible scalar schemas: ${[...resolvedKinds].join(", ")}`);
   return;
 }
-function queryScalarKindForSchema(schema) {
-  if (typeof schema === "string")
-    return schema === "fileRef" ? undefined : schema;
-  if (schema.type === "enum")
-    return schema.valueType === "integer" ? "integer" : "string";
-  return;
-}
 function validatePredicateValue(propertyId, value, shape, path, ctx) {
   for (const { objectType, property } of getPropertiesForResult(propertyId, shape, path, ctx, {
     reportMissing: false
@@ -786,7 +812,7 @@ function validateContainsValue(propertyId, value, shape, path, ctx) {
     if (!schema)
       continue;
     if (typeof schema === "string") {
-      if (schema === "string" || schema === "uuid") {
+      if (isContainsSchema(schema)) {
         if (typeof value !== "string") {
           addIssue2(ctx, path, "invalid_contains_value", `Predicate 'contains' value for '${objectType.id}.${property.id}' must be a string`);
         }
@@ -1203,25 +1229,6 @@ function resolveSchema(schema, valueTypesById, seenValueTypeIds = new Set) {
 function isPrimaryExactPredicate(property, op) {
   return property.primary === true && (op === "eq" || op === "in");
 }
-function isTextSchema(schema) {
-  if (schema === "string")
-    return true;
-  return typeof schema !== "string" && schema.type === "enum" && schema.valueType === "string";
-}
-function isExactSchema(schema) {
-  if (typeof schema === "string")
-    return schema !== "fileRef";
-  return schema.type === "enum";
-}
-function isSortableSchema(schema) {
-  if (typeof schema === "string") {
-    return schema === "string" || schema === "uuid" || schema === "integer" || schema === "double" || schema === "decimal" || schema === "date" || schema === "timestamp";
-  }
-  return schema.type === "enum";
-}
-function isContainsSchema(schema) {
-  return schema === "string" || schema === "uuid" || typeof schema !== "string" && (schema.type === "array" || schema.type === "map");
-}
 function keyForTypeIds(typeIds) {
   return uniqueStrings(typeIds).sort().join("\x00");
 }
@@ -1906,15 +1913,15 @@ function matchesPredicate(row, predicate) {
       return predicate.value ? exists : !exists;
     }
     case "contains":
-      return containsValue(row.properties[predicate.propertyId], predicate.value);
+      return containsValue(row.properties[predicate.propertyId], predicate.value, predicate.scalarKind);
   }
 }
-function containsValue(actual, expected) {
+function containsValue(actual, expected, itemScalarKind) {
   if (typeof actual === "string" && typeof expected === "string") {
     return actual.includes(expected);
   }
   if (Array.isArray(actual)) {
-    return actual.some((item) => queryScalarValuesEqual(item, expected));
+    return actual.some((item) => queryScalarValuesEqual(item, expected, itemScalarKind));
   }
   if (isPlainObject(actual) && typeof expected === "string") {
     return Object.hasOwn(actual, expected);
@@ -2455,4 +2462,4 @@ async function hydrateLinkQueryObjects(projectId, selected, links, storage) {
 }
 export { planObjectQuery2, validateObjectQuery2, validateObjectQueryWithAdmission, collectObjectQueryValidationIssues2, resolveObjectQueryResultShape2, executeObjectQuery2, countObjects2, existsObjects2, facetObjects2, validateObjectFacetRequests, explainObjectQuery2, preflightObjectQueryLinks, executeObjectQueryLinks2 };
 
-//# debugId=822E01D76051F29664756E2164756E21
+//# debugId=E8797FF7D0E5083164756E2164756E21