@seedprotocol/sdk 0.7.4 → 0.7.5-next.871.g8788c94

package/dist/{syncDbWithEas-CRpnkq00.js → syncDbWithEas-BmJXqfgN.js}

@@ -1,16 +1,16 @@
-import { E as BaseDb, r as modelUids, s as models, X as normalizePublisher, A as seeds, Y as getAllAddressesFromDb, Z as scheduleBulkFilesDownloadFromEasSync, _ as EAS_SEED_DATA_SYNCED_TO_DB_EVENT, $ as generateId, a0 as normalizeHexAddress, C as versions, m as metadata, K as getPropertyIdForModelAndName, L as resolveItemModelFileId, n as normalizeDataType, a1 as listRelationEasPropertyName, a2 as easPropertyNameForPublish, a3 as toMetadataPropertyName, a4 as getItemStoragePropertiesForModel } from './BasePathResolver-DrzGVH9L.js';
-import { r as resolveModelForSyncedSeed, s as skipSeedOnAmbiguousModel } from './resolveModelForSyncedSeed-RUsgAZXG.js';
+import { n as normalizeDataType, ac as INTERNAL_DATA_TYPES, B as BaseDb, s as modelUids, t as models, J as nameMatchLevels, ah as normalizePublisher, C as seeds, ai as getAllAddressesFromDb, aj as loadNameMatchLevels, ak as scheduleBulkFilesDownloadFromEasSync, ag as EAS_SEED_DATA_SYNCED_TO_DB_EVENT, al as generateId, am as normalizeHexAddress, F as versions, m as metadata, L as getPropertyIdForModelAndName, N as resolveItemModelFileId, ad as listRelationEasPropertyName, ae as easPropertyNameForPublish, an as toMetadataPropertyName, ao as getItemStoragePropertiesForModel } from './BasePathResolver-B-fK7_N_.js';
+import { r as resolveModelForSyncedSeed, s as skipSeedOnAmbiguousModel } from './resolveModelForSyncedSeed-CAKAJgr6.js';
 import { camelCase } from 'lodash-es';
-import { easName, matchEasName, getSeedsFromSchemaUids, getItemVersionsFromEas, partitionByRefAttester, getItemPropertiesFromEas, BaseEasClient, GET_SEEDS, pickLatestPropertyAttestationsByRefAndSchema, setSchemaUidForSchemaDefinition } from '@seedprotocol/eas';
+import { decodeEasNumber, isNumericEasType, easName, matchEasName, getSeedsFromSchemaUids, getItemVersionsFromEas, partitionByRefAttester, getItemPropertiesFromEas, BaseEasClient, GET_SEEDS, pickLatestPropertyAttestationsByRefAndSchema, setSchemaUidForSchemaDefinition, isNameMatchLevel } from '@seedprotocol/eas';
 import pluralize from 'pluralize';
 import { eq, inArray, and, or, isNull, ne, isNotNull } from 'drizzle-orm';
 import { modelPropertiesToObject } from './model-oHA3YhOd.js';
 import { parseEasPropertyMetadata, parseEasRelationPropertyName } from '@seedprotocol/query';
-import { a as chunkValues, r as rowsPerInsert, b as getGetAdditionalSyncAddresses, s as selectInBatches, w as writeInBatches } from './Item-BUUFuywT.js';
-import { u as updateSeedRevokedAt } from './updateSeedRevokedAt-DtTPSzpM.js';
-import { getModelSchemasFromEas } from './eas-Dq5Kx_Nd.js';
-import { w as waitForEasReadChain, a as assertLocalDbChain } from './ClientManager-Dfu4jcgm.js';
-import { e as emitAcrossTabs } from './tabEvents-nBUq_1u1.js';
+import { k as chunkValues, r as rowsPerInsert, l as getGetAdditionalSyncAddresses, s as selectInBatches, w as writeInBatches } from './Item-BDmsdNTQ.js';
+import { u as updateSeedRevokedAt } from './updateSeedRevokedAt-DkLSDwUX.js';
+import { getModelSchemasFromEas } from './eas-BcXZ2hIn.js';
+import { w as waitForEasReadChain, d as assertLocalDbChain } from './ClientManager-C7VkO5Hg.js';
+import { e as emitAcrossTabs } from './tabEvents-DXun7vdK.js';
 import 'debug';
 import '@seedprotocol/arweave';
 import 'xstate';
@@ -23,12 +23,51 @@ import '@noble/hashes/sha3';
 import '@noble/hashes/utils';
 import 'rxjs';
 
+/**
+ * Whether an attestation's EAS type fits a local property (ADR 0008 "property types must agree",
+ * ADR 0010). The type publish writes for the property always fits. A Number also takes every
+ * integer type (older SDKs published `uint8`, other SDKs may use `uint256` or `int256`) and a
+ * `string` whose value is numeric, which is what keeps a Text value out of a Number property that
+ * shares its EAS schema. An attestation with no type, or a property with no known type, fits.
+ */
+function easTypeFitsProperty(dataType, easType, value) {
+    if (!easType)
+        return true;
+    const local = normalizeDataType(dataType);
+    if (local === 'Number') {
+        return isNumericEasType(easType) || (easType === 'string' && decodeEasNumber(value) !== undefined);
+    }
+    const expected = INTERNAL_DATA_TYPES[local]?.eas;
+    return !expected || expected === easType;
+}
+/**
+ * The value to store for a synced attestation, given the local property's type: a Number as its
+ * decimal string, a Date published as Unix seconds as an ISO string, and any other integer value
+ * as its decimal string instead of the indexer's `{ type: 'BigNumber', hex }`. Undefined: a
+ * Number or Date value that doesn't decode.
+ */
+function syncedPropertyValue(dataType, easType, value) {
+    const local = dataType ? normalizeDataType(dataType) : undefined;
+    if (local === 'Number')
+        return decodeEasNumber(value);
+    if (local === 'Date' && isNumericEasType(easType)) {
+        const seconds = decodeEasNumber(value);
+        if (seconds === undefined)
+            return undefined;
+        const date = new Date(Number(seconds) * 1000);
+        return Number.isNaN(date.getTime()) ? undefined : date.toISOString();
+    }
+    if (isNumericEasType(easType) && typeof value !== 'string')
+        return decodeEasNumber(value) ?? value;
+    return value;
+}
+
 // Dynamic import to break circular dependency: Model -> BaseItem -> ... -> getModelSchemas -> Model
 // import { Model } from '@/Model/Model'
 const schemaStringToModelRecord = new Map();
 const getModelSchemas = async () => {
     // Dynamic import to break circular dependency
-    const _mod_0 = await import('./errors-DdWbxb_n.js');
+    const _mod_0 = await import('./errors-CCMxedOB.js');
     const _ns_0 = _mod_0.h;
     const modelMod = _ns_0;
     const { Model } = modelMod;
@@ -73,7 +112,13 @@ const getModelSchemas = async () => {
         if (record.name !== 'Seed')
             byName.set(record.name, record);
     }
-    const candidates = [...byName.values()].map((record) => ({ value: record, name: record.name }));
+    // ADR 0009: each model's name matches at its own nameMatch level.
+    const levels = await nameMatchLevels(appDb);
+    const candidates = [...byName.values()].map((record) => ({
+        value: record,
+        name: record.name,
+        level: levels.model(record.name),
+    }));
     const matchModelRecord = (schemaString) => {
         if (!schemaString.startsWith('bytes32 '))
             return undefined;
@@ -157,7 +202,7 @@ const RELATION_DATA_TYPES = new Set(['Relation', 'Image', 'File', 'Html']);
  * relations), so related seeds are still followed for discovery. Undefined: the name matches
  * several local properties equally well, and the attestation is skipped.
  */
-const resolveSyncedPropertyName = (easPropertyName, value, modelSchema) => {
+const resolveSyncedPropertyName = (easPropertyName, value, modelSchema, easType) => {
     const internal = easPropertyName === 'storage_transaction_id' || easPropertyName === 'storage_provider_transaction_id';
     if (modelSchema && !internal) {
         const candidates = Object.entries(modelSchema).map(([key, def]) => {
@@ -169,6 +214,8 @@ const resolveSyncedPropertyName = (easPropertyName, value, modelSchema) => {
                 value: { key, def, isListRelation, isSingleRef },
                 name: easPropertyNameForPublish(key, { ...def, name: key }),
                 relation: isListRelation || isSingleRef,
+                // ADR 0009: set by modelSchemaForSyncedProperty from the schema file.
+                level: isNameMatchLevel(def?.nameMatch) ? def.nameMatch : undefined,
             };
         });
         const match = matchEasName(easPropertyName, candidates);
@@ -180,6 +227,11 @@ const resolveSyncedPropertyName = (easPropertyName, value, modelSchema) => {
         }
         if (match.kind === 'match') {
             const { key, def, isListRelation, isSingleRef } = match.value;
+            // ADR 0008/0010: property types must agree. A mismatch is this property's, refused.
+            if (!easTypeFitsProperty(def?.dataType, easType, value)) {
+                console.warn(`[item/events] [syncDbWithEas] EAS property "${easPropertyName}" is ${easType}, which doesn't fit local property "${key}" (${def?.dataType}); skipping it`);
+                return undefined;
+            }
             if (isListRelation) {
                 return { propertyName: key, isRelation: true, isList: true, refSeedType: def?.ref ? easName(def.ref) : undefined };
             }
@@ -190,7 +242,12 @@ const resolveSyncedPropertyName = (easPropertyName, value, modelSchema) => {
                     isList: false,
                 };
             }
-            return { propertyName: key, isRelation: false, isList: false };
+            return { propertyName: key, isRelation: false, isList: false, dataType: normalizeDataType(def?.dataType) };
+        }
+        // A name one of the model's properties would match at a looser level than its nameMatch
+        // allows is that property's, refused (ADR 0009): don't store it under a name of its own.
+        if (matchEasName(easPropertyName, candidates.map((c) => ({ ...c, level: 'fuzzy' }))).kind !== 'none') {
+            return undefined;
         }
     }
     if (!isRelationPropertyName(easPropertyName)) {
@@ -215,14 +272,22 @@ const modelSchemaForSyncedProperty = async (Model, property, state) => {
         return undefined;
     const seedLocalId = state.seedUidToLocalId.get(seedUid);
     const model = await skipSeedOnAmbiguousModel({ seedLocalId, seedUid }, 'easSync.metadata', async () => resolveSyncedSeedModel(Model, modelType, { seedLocalId, seedUid }));
-    return model?.properties ? modelPropertiesToObject(model.properties) : undefined;
+    if (!model?.properties)
+        return undefined;
+    // Each property's nameMatch level (ADR 0009), for resolveSyncedPropertyName.
+    const levels = await nameMatchLevels();
+    const schema = modelPropertiesToObject(model.properties);
+    for (const [key, def] of Object.entries(schema)) {
+        schema[key] = { ...def, nameMatch: levels.property(model.modelName ?? '', key, model.id) };
+    }
+    return schema;
 };
 /**
  * Seed UIDs that relation properties point at. Collected from every property the run fetched, not
  * only newly stored ones, so related seeds are refreshed (new versions, revocations) on each sync.
  */
 const collectRelatedSeedUids = async (properties, state) => {
-    const _mod_1 = await import('./errors-DdWbxb_n.js');
+    const _mod_1 = await import('./errors-CCMxedOB.js');
     const _ns_1 = _mod_1.h;
     const { Model } = _ns_1;
     for (const property of properties) {
@@ -279,7 +344,7 @@ const isSqlEscapedAttestationRaw = (stored, fresh) => {
  * of HTMLPage have. A name matching no local model, or several, is kept as it is.
  */
 const localModelType = async (easModelName) => {
-    const _mod_2 = await import('./errors-DdWbxb_n.js');
+    const _mod_2 = await import('./errors-CCMxedOB.js');
     const _ns_2 = _mod_2.h;
     const { Model } = _ns_2;
     try {
@@ -677,7 +742,7 @@ const resolveSyncedSeedModel = async (Model, modelType, seed) => {
 const insertSyncedProperties = async ({ newProperties, itemSeeds, state, }) => {
     const { seedUidToLocalId, seedUidToModelType, versionUidToLocalId, versionUidToSeedUid } = state;
     // Dynamic import to break circular dependency
-    const _mod_3 = await import('./errors-DdWbxb_n.js');
+    const _mod_3 = await import('./errors-CCMxedOB.js');
     const _ns_3 = _mod_3.h;
     const modelMod = _ns_3;
     const { Model } = modelMod;
@@ -725,7 +790,7 @@ const insertSyncedProperties = async ({ newProperties, itemSeeds, state, }) => {
         const modelType = seedUidToModelType.get(seedUid);
         const modelSchema = await modelSchemaForSyncedProperty(Model, property, state);
         // ADR 0008: the local property this EAS name stands for, and whether it's a relation.
-        const resolvedName = resolveSyncedPropertyName(propertyNameSnake, propertyMetadata.value, modelSchema);
+        const resolvedName = resolveSyncedPropertyName(propertyNameSnake, propertyMetadata.value, modelSchema, easDataType);
         if (!resolvedName)
             continue;
         const { propertyName, isRelation, isList } = resolvedName;
@@ -735,10 +800,13 @@ const insertSyncedProperties = async ({ newProperties, itemSeeds, state, }) => {
         if (isRelation && !isList && relationValuesToExclude.includes(propertyMetadata.value)) {
             continue;
         }
-        let propertyValue = propertyMetadata.value;
-        if (typeof propertyValue !== 'string') {
-            propertyValue = JSON.stringify(propertyValue);
+        // ADR 0010: numeric values decoded (Number as a decimal string, Date as ISO).
+        const decodedValue = syncedPropertyValue(resolvedName.dataType, easDataType, propertyMetadata.value);
+        if (decodedValue === undefined) {
+            console.warn(`[item/events] [syncDbWithEas] EAS property "${propertyNameSnake}" has a value that isn't a valid ${resolvedName.dataType}; skipping it`);
+            continue;
         }
+        const propertyValue = typeof decodedValue === 'string' ? decodedValue : JSON.stringify(decodedValue);
         if (isRelation && !isList) {
             const relatedSeed = itemSeeds.find((seed) => seed.id === propertyMetadata.value);
             if (relatedSeed && relatedSeed.schema && relatedSeed.schema.schemaNames) {
@@ -906,6 +974,8 @@ const runSyncFromEas = async (options) => {
     // Never mix attestations from two chains in one local DB.
     await assertLocalDbChain();
     const appDb = BaseDb.getAppDb();
+    // ADR 0009: this run matches names at the levels the stored schema files set now.
+    await loadNameMatchLevels(appDb);
     const { matchModelRecord } = await getModelSchemas();
     const modelSchemas = await getModelSchemasFromEas();
     const schemaUids = [];
@@ -957,7 +1027,7 @@ const runSyncFromEas = async (options) => {
     await getRelatedSeedsAndVersions(state);
     scheduleBulkFilesDownloadFromEasSync(addresses);
     try {
-        const _mod_4 = await import('./Item-BUUFuywT.js');
+        const _mod_4 = await import('./Item-BDmsdNTQ.js');
         const _ns_4 = _mod_4.a6;
         const itemMod = _ns_4;
         await itemMod.Item.rehydrateCachedItemsFromDbAfterEasSync();
@@ -970,4 +1040,4 @@ const runSyncFromEas = async (options) => {
 };
 
 export { VERSION_INSERT_BATCH, isSqlEscapedAttestationRaw, runSyncFromEas };
-//# sourceMappingURL=syncDbWithEas-CRpnkq00.js.map
+//# sourceMappingURL=syncDbWithEas-BmJXqfgN.js.map