Preserve legacy 'meaning' of properties

NDB sets this for compressed blobs.
remko · Aug 18, 2021 · be1fa12 · be1fa12
1 parent c4f8c72
commit be1fa12
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 37 deletions.
diff --git a/bin/initialize-dev-db.mjs b/bin/initialize-dev-db.mjs
@@ -67,6 +67,12 @@ await call("commit", {
               "eyJuYW1lIjoiZHNhZG1pbiIsInZlcnNpb24iOiIwLjExLjIiLCJzY3JpcHRzIjp7InN0YXJ0Ijoic25vd3BhY2sgZGV2IiwiYnVpbGQiOiJzbm93cGFjayBidWlsZCIsImZvcm1hdCI6InByZXR0aWVyIC0td3JpdGUgXCJzcmMvKiovKi57anMsanN4LHRzLHRzeH1cIiIsImxpbnQiOiJwcmV0dGllciAtLWxvZ2xldmVsIHdhcm4gLS1jaGVjayBcInNyYy8qKi8qLntqcyxqc3gsdHMsdHN4fVwiICYmIHRzYyAtLW5vRW1pdCAmJiBlc2xpbnQgLiIsInRlc3QiOiJqZXN0IiwidGVzdC1jb3ZlcmFnZSI6Implc3QgLS1jb3ZlcmFnZSIsInN0YXJ0LWVtdWxhdG9yIjoiZ2Nsb3VkIC0tcHJvamVjdD1kc2FkbWluLWRldiBiZXRhIGVtdWxhdG9ycyBkYXRhc3RvcmUgc3RhcnQgLS1ob3N0LXBvcnQ9bG9jYWxob3N0OjgwODEgLS1kYXRhLWRpcj1lbXVsYXRvci1kYXRhIiwicHJlcGFyZSI6InNub3dwYWNrIGJ1aWxkIn0sInJlcG9zaXRvcnkiOiJnaXRodWI6cmVta28vZHNhZG1pbiIsImRlcGVuZGVuY2llcyI6eyJodHRwMi1wcm94eSI6Il41LjAuNTMiLCJqc2VzYyI6Il4zLjAuMiIsIm5vZGUtc3RhdGljIjoiXjAuNy4xMSIsInlhcmdzIjoiMTQuMi4zIn0sImRldkRlcGVuZGVuY2llcyI6eyJAYmFiZWwvY29yZSI6Il43LjE0LjYiLCJAYmFiZWwvcHJlc2V0LWVudiI6Il43LjE0LjciLCJAYmFiZWwvcHJlc2V0LXR5cGVzY3JpcHQiOiJeNy4xNC41IiwiQHNub3dwYWNrL3BsdWdpbi1kb3RlbnYiOiJeMi4xLjAiLCJAc25vd3BhY2svcGx1Z2luLXJlYWN0LXJlZnJlc2giOiJeMi41LjAiLCJAc25vd3BhY2svcGx1Z2luLXR5cGVzY3JpcHQiOiJeMS4yLjEiLCJAdHlwZXMvamVzdCI6Il4yNi4wLjIzIiwiQHR5cGVzL2xvZGFzaCI6Il40LjE0LjE3MCIsIkB0eXBlcy9xdWVyeXN0cmluZ2lmeSI6Il4yLjAuMCIsIkB0eXBlcy9yZWFjdCI6Il4xNy4wLjQiLCJAdHlwZXMvcmVhY3QtZG9tIjoiXjE3LjAuMyIsIkB0eXBlcy9yZWFjdC1tb2RhbCI6Il4zLjEyLjAiLCJAdHlwZXMvcmVhY3QtdGFibGUiOiJeNy43LjEiLCJAdHlwZXMvc25vd3BhY2stZW52IjoiXjIuMy4zIiwiQHR5cGVzL3lhcmdzIjoiXjE3LjAuMCIsIkB0eXBlc2NyaXB0LWVzbGludC9lc2xpbnQtcGx1Z2luIjoiXjQuMjcuMCIsIkB0eXBlc2NyaXB0LWVzbGludC9wYXJzZXIiOiJeNC4yNy4wIiwiYXhpb3MiOiJeMC4yMS4xIiwiYmFiZWwtamVzdCI6Il4yNy4wLjUiLCJib290c3RyYXAiOiJeNS4wLjEiLCJjbGFzc25hbWVzIjoiXjIuMy4xIiwiZXNsaW50IjoiXjcuMjkuMCIsImVzbGludC1wbHVnaW4tcHJldHRpZXIiOiJeMy40LjAiLCJlc2xpbnQtcGx1Z2luLXJlYWN0IjoiXjcuMjQuMCIsImVzbGludC1wbHVnaW4tcmVhY3QtaG9va3MiOiJeNC4yLjAiLCJqZXN0IjoiXjI3LjAuNSIsImxvZGFzaCI6Il40LjE3LjIxIiwicGF0aC10by1yZWdleHAiOiJeNi4yLjAiLCJwcmV0dGllciI6Il4yLjIuMSIsInF1ZXJ5c3RyaW5naWZ5IjoiXjIuMi4wIiwicmVhY3QiOiJeMTcuMC4yIiwicmVhY3QtZG9tIjoiXjE3LjAuMiIsInJlYWN0LW1vZGFsIjoiXjMuMTQuMyIsInJlYWN0LXF1ZXJ5IjoiXjMuMTcuMiIsInJlYWN0LXRhYmxlIjoiXjcuNy4wIiwic25vd3BhY2siOiJeMy4zLjciLCJ0eXBlc2NyaXB0IjoiXjQuMy41Iiwid291dGVyIjoiXjIuNy40In0sImZpbGVzIjpbImJ1aWxkIiwiYmluL2RzYWRtaW4uanMiXSwiYmluIjoiLi9iaW4vZHNhZG1pbi5qcyIsImxpY2Vuc2UiOiJNSVQiLCJrZXl3b3JkcyI6WyJnb29nbGUiLCJjbG91ZCIsImRhdGFzdG9yZSIsImVtdWxhdG9yIiwiZ3VpIl19Cg==",
             excludeFromIndexes: true,
           },
+          jsonCompressedBlobProp: {
+            meaning: 22,
+            blobValue:
+              "eJx9VU1v2jAYvu9XRD70UBGHBGg6pEo9bIcddtttXSUneRsMTpzZDh+q+t/32o6BAJ2EgDzv834/dt5JyxogS1JpVjW8JROyBaW5bBGb0jSlGUK6VLwzmizfiTZMGbTpVu46Vm6iCrbIKHouqnPYAxPyJlXDrEOnwBgOKorjneIGoheiVZnc3yf39H2tJ2u9nxiNn/3HC0FHwdsLNyFrAVsQ0Y6pFp/LFWCi/4WJ7u4io0vktvJ7w419Bm0jRxRTGNA2xdr++Ke4lNg+q2GAbZaATHzvMTS9YEYqpNSlkH2FpE7JNZTmaZhijEOJCjAsCmQdVcwwjf8gcmHQaSUxYSeVeRKyZMI+Lh+njymaLDmuuHoK/g7BEnAcHVNwPemPCUGT1BzJB1saN6u+WCpoNjI5LbeCDtoK2pKDW+fKmC6z5e+t0+uCTulihry1Bl1aZIaIlUArK4ixcsMdPKU5igPxA1M1RiLpnGZ0ZsvA3r9dZHkuWAEiKaWr/BVd5/QBnQccm9KAg223R2t+ZTWHDrwOj6SFJYU5JJ3oazt6aYZAGU3p9BZFASsNfr9h5JVnLm4zx0nxMFDb87ODk7WXz2v2YGc0OxmErJgPPLdlpvn0ZPvbgzpoo3hb87eDTz6lZwRXnMuWo2F+YcD2mqNxdmlsMLHwW0uzq6CxYYUYFpCfNxK6jo+Dm53HDiv2SU9R3Vxif54S/xP7ufnWs/wzMkpYgxqx2J5L7ZWVpa44t/34OGSb2y68kNLg/FgX9Gq5pWBa25tMh/ot6rP5hrOvLs2ozDhcLn5k8xuM4zYwwqd2PMlyo4d2HOmq6pEkMJYtr2NmFRuJMWrYu3YeBvfzurJBdLeE49ljxWQBGUnlhJ5rZO7W7HEXf8DzM/5INDZdUIvnztxRHZ8TDOua3snehCZylDJeDm9c2B39JuH9UPA2XE90rckfh6ALTS4s9o1QQqttLT9//MLnDRx2UlUuXC3ty8EpAW9ke9GF69auLNzYE1L3nPz5+PIPAhEwVw==",
+            excludeFromIndexes: true,
+          },
           geoPointProp: {
             geoPointValue: {
               latitude: 50.8798,

diff --git a/package.json b/package.json
@@ -9,6 +9,7 @@
     "test": "jest",
     "test-coverage": "jest --coverage",
     "start-emulator": "gcloud --project=dsadmin-dev beta emulators datastore start --host-port=localhost:8081 --data-dir=emulator-data",
+    "initialize-dev-db": "./bin/initialize-dev-db.mjs",
     "prepare": "snowpack build"
   },
   "repository": "github:remko/dsadmin",

diff --git a/src/api.tsx b/src/api.tsx
@@ -64,7 +64,10 @@ export type GeoPointValue = {
   };
 };
 
-export type PropertyValue = { excludeFromIndexes?: boolean } & (
+export type PropertyValue = {
+  excludeFromIndexes?: boolean;
+  meaning?: number;
+} & (
   | NullPropertyValue
   | BooleanPropertyValue
   | IntegerValue

diff --git a/src/properties.ts b/src/properties.ts
@@ -95,6 +95,7 @@ export function valueType(v: PropertyValue): ValueType {
 
 export type PropertyEditValue = {
   type: ValueType;
+  meaning?: number;
   excludeFromIndexes?: boolean;
   stringValue: string;
   booleanValue: boolean;
@@ -182,82 +183,75 @@ export function valueToEditValue(
   project: string,
   namespace: string | null,
 ): PropertyEditValue {
-  const excludeFromIndexes =
-    v.excludeFromIndexes != null
+  const baseValue = {
+    ...EMPTY_VALUE,
+    ...(v.excludeFromIndexes != null
       ? { excludeFromIndexes: v.excludeFromIndexes }
-      : {};
+      : {}),
+    ...(v.meaning != null ? { meaning: v.meaning } : {}),
+  };
   if ("timestampValue" in v) {
     return {
-      ...EMPTY_VALUE,
+      ...baseValue,
       type: ValueType.Timestamp,
-      ...excludeFromIndexes,
       stringValue: v.timestampValue,
     };
   } else if ("stringValue" in v) {
     return {
-      ...EMPTY_VALUE,
+      ...baseValue,
       type: ValueType.String,
-      ...excludeFromIndexes,
       stringValue: v.stringValue,
     };
   } else if ("keyValue" in v) {
     return {
-      ...EMPTY_VALUE,
+      ...baseValue,
       type: ValueType.Key,
-      ...excludeFromIndexes,
       stringValue: keyToString(v.keyValue, project, namespace),
     };
   } else if ("nullValue" in v) {
     return {
-      ...EMPTY_VALUE,
+      ...baseValue,
       type: ValueType.Null,
-      ...excludeFromIndexes,
     };
   } else if ("booleanValue" in v) {
     return {
-      ...EMPTY_VALUE,
+      ...baseValue,
       type: ValueType.Boolean,
-      ...excludeFromIndexes,
       booleanValue: v.booleanValue,
     };
   } else if ("integerValue" in v) {
     return {
-      ...EMPTY_VALUE,
+      ...baseValue,
       type: ValueType.Integer,
-      ...excludeFromIndexes,
       stringValue: v.integerValue,
     };
   } else if ("doubleValue" in v) {
     return {
-      ...EMPTY_VALUE,
+      ...baseValue,
       type: ValueType.Double,
-      ...excludeFromIndexes,
       stringValue: v.doubleValue + "",
     };
   } else if ("geoPointValue" in v) {
     return {
-      ...EMPTY_VALUE,
+      ...baseValue,
       type: ValueType.GeoPoint,
-      ...excludeFromIndexes,
       geoPointValue: {
         latitude: (v.geoPointValue.latitude ?? 0) + "",
         longitude: (v.geoPointValue.longitude ?? 0) + "",
       },
     };
   } else if ("arrayValue" in v) {
     return {
-      ...EMPTY_VALUE,
+      ...baseValue,
       type: ValueType.Array,
-      ...excludeFromIndexes,
       arrayValue: (v.arrayValue.values || []).map((v) =>
         valueToEditValue(v, project, namespace),
       ),
     };
   } else if ("blobValue" in v) {
     return {
-      ...EMPTY_VALUE,
+      ...baseValue,
       type: ValueType.Blob,
-      ...excludeFromIndexes,
       stringValue: v.blobValue,
     };
   }
@@ -270,10 +264,12 @@ export function valueFromEditValue(
   namespace: string | null,
 ): PropertyValue | null {
   try {
-    const excludeFromIndexes =
-      value.excludeFromIndexes != null
+    const baseValue = {
+      ...(value.excludeFromIndexes != null
         ? { excludeFromIndexes: value.excludeFromIndexes }
-        : {};
+        : {}),
+      ...(value.meaning != null ? { meaning: value.meaning } : {}),
+    };
     switch (value.type) {
       case ValueType.Timestamp:
         try {
@@ -282,55 +278,55 @@ export function valueFromEditValue(
           return null;
         }
         return {
-          ...excludeFromIndexes,
+          ...baseValue,
           timestampValue: value.stringValue,
         };
       case ValueType.String:
         return {
-          ...excludeFromIndexes,
+          ...baseValue,
           stringValue: value.stringValue,
         };
       case ValueType.Key:
         return {
-          ...excludeFromIndexes,
+          ...baseValue,
           keyValue: keyFromString(value.stringValue, project, namespace),
         };
       case ValueType.Integer:
         return {
-          ...excludeFromIndexes,
+          ...baseValue,
           integerValue: parseInteger(value.stringValue),
         };
       case ValueType.Double: {
         return {
-          ...excludeFromIndexes,
+          ...baseValue,
           doubleValue: parseDouble(value.stringValue),
         };
       }
       case ValueType.Blob:
         try {
           b64decode(value.stringValue);
           return {
-            ...excludeFromIndexes,
+            ...baseValue,
             blobValue: value.stringValue,
           };
         } catch (e) {
           return null;
         }
       case ValueType.Null:
         return {
-          ...excludeFromIndexes,
+          ...baseValue,
           nullValue: null,
         };
       case ValueType.Boolean:
         return {
-          ...excludeFromIndexes,
+          ...baseValue,
           booleanValue: value.booleanValue,
         };
       case ValueType.GeoPoint: {
         const latitude = parseDouble(value.geoPointValue.latitude);
         const longitude = parseDouble(value.geoPointValue.longitude);
         return {
-          ...excludeFromIndexes,
+          ...baseValue,
           geoPointValue: {
             ...(latitude === 0 ? {} : { latitude }),
             ...(longitude === 0 ? {} : { longitude }),
@@ -345,7 +341,7 @@ export function valueFromEditValue(
           return null;
         }
         return {
-          ...excludeFromIndexes,
+          ...baseValue,
           arrayValue:
             values.length === 0
               ? {}