@tinacms/graphql 1.2.0 → 1.3.1

package/dist/database/level.d.ts

@@ -19,3 +19,10 @@ export declare type BatchOp = PutOp | DelOp;
 export declare const INDEX_KEY_FIELD_SEPARATOR = "\u001D";
 export declare const CONTENT_ROOT_PREFIX = "~";
 export declare const SUBLEVEL_OPTIONS: AbstractSublevelOptions<string, Record<string, any>>;
+export declare class LevelWrapper {
+    private level;
+    constructor(level: Level);
+}
+export declare class LevelProxy {
+    constructor(level: Level);
+}

package/dist/index.es.js

@@ -2427,7 +2427,7 @@ var validateField = async (field) => {
 
 // package.json
 var name = "@tinacms/graphql";
-var version = "1.2.0";
+var version = "1.3.1";
 var main = "dist/index.js";
 var module = "dist/index.es.js";
 var typings = "dist/index.d.ts";
@@ -2749,7 +2749,7 @@ var TinaQueryError = class extends TinaFetchError {
 };
 var TinaParseDocumentError = class extends TinaFetchError {
   constructor(args) {
-    super(`Error Parsing file ${args.file} from collection ${args.collection}. ${auditMessage(args.includeAuditMessage)}`, args);
+    super(`Error parsing file ${args.file} from collection ${args.collection}. ${auditMessage(args.includeAuditMessage)}`, args);
   }
   toString() {
     return super.toString() + "\n OriginalError: \n" + this.originalError.toString();
@@ -2926,6 +2926,40 @@ var SUBLEVEL_OPTIONS = {
   separator: INDEX_KEY_FIELD_SEPARATOR,
   valueEncoding: "json"
 };
+var LevelProxyHandler = {
+  get: function(target, property) {
+    if (!target[property]) {
+      throw new Error(`The property, ${property.toString()}, doesn't exist`);
+    }
+    if (typeof target[property] !== "function") {
+      throw new Error(`The property, ${property.toString()}, is not a function`);
+    }
+    if (property === "get") {
+      return async (...args) => {
+        let result;
+        try {
+          result = await target[property].apply(target, args);
+        } catch (e) {
+          if (e.code !== "LEVEL_NOT_FOUND") {
+            throw e;
+          }
+        }
+        return result;
+      };
+    } else if (property === "sublevel") {
+      return (...args) => {
+        return new Proxy(target[property].apply(target, args), LevelProxyHandler);
+      };
+    } else {
+      return (...args) => target[property].apply(target, args);
+    }
+  }
+};
+var LevelProxy = class {
+  constructor(level) {
+    return new Proxy(level, LevelProxyHandler);
+  }
+};
 
 // src/database/datalayer.ts
 var OP;
@@ -4096,6 +4130,7 @@ ${$_body}`, strippedContent, {
     case ".json":
       return JSON.stringify(strippedContent, null, 2);
     case ".yaml":
+    case ".yml":
       return yaml.safeDump(strippedContent);
     case ".toml":
       return toml.stringify(strippedContent);
@@ -4130,6 +4165,7 @@ var parseFile = (content, format, yupSchema, markdownParseConfig) => {
       }
       return toml.parse(content);
     case ".yaml":
+    case ".yml":
       if (!content) {
         return {};
       }
@@ -4214,14 +4250,7 @@ var Database = class {
       }
       await this.onPut(normalizedPath, stringifiedFile);
       const putOps = makeIndexOpsForDocument(normalizedPath, collection?.name, collectionIndexDefinitions, payload, "put", this.level);
-      let existingItem;
-      try {
-        existingItem = await this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS).get(normalizedPath);
-      } catch (e) {
-        if (e.code !== "LEVEL_NOT_FOUND") {
-          throw e;
-        }
-      }
+      const existingItem = await this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS).get(normalizedPath);
       const delOps = existingItem ? makeIndexOpsForDocument(normalizedPath, collection?.name, collectionIndexDefinitions, existingItem, "del", this.level) : [];
       const ops = [
         ...delOps,
@@ -4253,14 +4282,7 @@ var Database = class {
           }
           await this.onPut(normalizedPath, stringifiedFile);
           const putOps = makeIndexOpsForDocument(normalizedPath, collection, collectionIndexDefinitions, payload, "put", this.level);
-          let existingItem;
-          try {
-            existingItem = await this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS).get(normalizedPath);
-          } catch (e) {
-            if (e.code !== "LEVEL_NOT_FOUND") {
-              throw e;
-            }
-          }
+          const existingItem = await this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS).get(normalizedPath);
           const delOps = existingItem ? makeIndexOpsForDocument(normalizedPath, collection, collectionIndexDefinitions, existingItem, "del", this.level) : [];
           const ops = [
             ...delOps,
@@ -4679,7 +4701,7 @@ var Database = class {
     };
     this.tinaDirectory = config.tinaDirectory || ".tina";
     this.bridge = config.bridge;
-    this.rootLevel = config.level;
+    this.rootLevel = config.level && new LevelProxy(config.level);
     this.indexStatusCallback = config.indexStatusCallback || defaultStatusCallback;
     this.onPut = config.onPut || defaultOnPut;
     this.onDelete = config.onDelete || defaultOnDelete;
@@ -4703,24 +4725,13 @@ var Database = class {
     return { pathsByCollection, nonCollectionPaths, collections };
   }
   async updateDatabaseVersion(version2) {
-    const metadataLevel = await this.rootLevel.sublevel("_metadata", SUBLEVEL_OPTIONS);
+    const metadataLevel = this.rootLevel.sublevel("_metadata", SUBLEVEL_OPTIONS);
     await metadataLevel.put("metadata", { version: version2 });
   }
   async getDatabaseVersion() {
-    const metadataLevel = await this.rootLevel.sublevel("_metadata", SUBLEVEL_OPTIONS);
-    let version2;
-    try {
-      const metadata = await metadataLevel.get("metadata");
-      version2 = metadata.version || version2;
-    } catch (e) {
-      if (e.code !== "LEVEL_NOT_FOUND") {
-        throw e;
-      }
-      if (version2) {
-        await metadataLevel.put("metadata", { version: version2 });
-      }
-    }
-    return version2;
+    const metadataLevel = this.rootLevel.sublevel("_metadata", SUBLEVEL_OPTIONS);
+    const metadata = await metadataLevel.get("metadata");
+    return metadata?.version;
   }
   async initLevel() {
     if (this.level) {
@@ -4729,10 +4740,15 @@ var Database = class {
     if (!this.config.version) {
       this.level = this.rootLevel;
     } else {
-      const version2 = await this.getDatabaseVersion();
-      if (version2) {
-        this.level = this.rootLevel.sublevel(version2, SUBLEVEL_OPTIONS);
+      let version2 = await this.getDatabaseVersion();
+      if (!version2) {
+        version2 = "";
+        await this.updateDatabaseVersion(version2);
       }
+      this.level = this.rootLevel.sublevel(version2, SUBLEVEL_OPTIONS);
+    }
+    if (!this.level) {
+      throw new GraphQLError4("Error initializing LevelDB instance");
     }
   }
   clearCache() {
@@ -4801,18 +4817,12 @@ var _deleteIndexContent = async (database, documentPaths, enequeueOps, collectio
   const rootLevel = database.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS);
   await sequential(documentPaths, async (filepath) => {
     const itemKey = normalizePath(filepath);
-    try {
-      const item = await rootLevel.get(itemKey);
-      if (item) {
-        await enequeueOps([
-          ...makeIndexOpsForDocument(itemKey, collection.name, collectionIndexDefinitions, item, "del", database.level),
-          { type: "del", key: itemKey, sublevel: rootLevel }
-        ]);
-      }
-    } catch (e) {
-      if (e.code !== "LEVEL_NOT_FOUND") {
-        throw e;
-      }
+    const item = await rootLevel.get(itemKey);
+    if (item) {
+      await enequeueOps([
+        ...makeIndexOpsForDocument(itemKey, collection.name, collectionIndexDefinitions, item, "del", database.level),
+        { type: "del", key: itemKey, sublevel: rootLevel }
+      ]);
     }
   });
 };

package/dist/index.js

@@ -2483,7 +2483,7 @@ var validateField = async (field) => {
 
 // package.json
 var name = "@tinacms/graphql";
-var version = "1.2.0";
+var version = "1.3.1";
 var main = "dist/index.js";
 var module2 = "dist/index.es.js";
 var typings = "dist/index.d.ts";
@@ -2798,7 +2798,7 @@ var TinaQueryError = class extends TinaFetchError {
 };
 var TinaParseDocumentError = class extends TinaFetchError {
   constructor(args) {
-    super(`Error Parsing file ${args.file} from collection ${args.collection}. ${auditMessage(args.includeAuditMessage)}`, args);
+    super(`Error parsing file ${args.file} from collection ${args.collection}. ${auditMessage(args.includeAuditMessage)}`, args);
   }
   toString() {
     return super.toString() + "\n OriginalError: \n" + this.originalError.toString();
@@ -2975,6 +2975,40 @@ var SUBLEVEL_OPTIONS = {
   separator: INDEX_KEY_FIELD_SEPARATOR,
   valueEncoding: "json"
 };
+var LevelProxyHandler = {
+  get: function(target, property) {
+    if (!target[property]) {
+      throw new Error(`The property, ${property.toString()}, doesn't exist`);
+    }
+    if (typeof target[property] !== "function") {
+      throw new Error(`The property, ${property.toString()}, is not a function`);
+    }
+    if (property === "get") {
+      return async (...args) => {
+        let result;
+        try {
+          result = await target[property].apply(target, args);
+        } catch (e) {
+          if (e.code !== "LEVEL_NOT_FOUND") {
+            throw e;
+          }
+        }
+        return result;
+      };
+    } else if (property === "sublevel") {
+      return (...args) => {
+        return new Proxy(target[property].apply(target, args), LevelProxyHandler);
+      };
+    } else {
+      return (...args) => target[property].apply(target, args);
+    }
+  }
+};
+var LevelProxy = class {
+  constructor(level) {
+    return new Proxy(level, LevelProxyHandler);
+  }
+};
 
 // src/database/datalayer.ts
 var OP;
@@ -4138,6 +4172,7 @@ ${$_body}`, strippedContent, {
     case ".json":
       return JSON.stringify(strippedContent, null, 2);
     case ".yaml":
+    case ".yml":
       return import_js_yaml.default.safeDump(strippedContent);
     case ".toml":
       return import_toml.default.stringify(strippedContent);
@@ -4171,6 +4206,7 @@ var parseFile = (content, format, yupSchema, markdownParseConfig) => {
       }
       return import_toml.default.parse(content);
     case ".yaml":
+    case ".yml":
       if (!content) {
         return {};
       }
@@ -4253,14 +4289,7 @@ var Database = class {
       }
       await this.onPut(normalizedPath, stringifiedFile);
       const putOps = makeIndexOpsForDocument(normalizedPath, collection == null ? void 0 : collection.name, collectionIndexDefinitions, payload, "put", this.level);
-      let existingItem;
-      try {
-        existingItem = await this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS).get(normalizedPath);
-      } catch (e) {
-        if (e.code !== "LEVEL_NOT_FOUND") {
-          throw e;
-        }
-      }
+      const existingItem = await this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS).get(normalizedPath);
       const delOps = existingItem ? makeIndexOpsForDocument(normalizedPath, collection == null ? void 0 : collection.name, collectionIndexDefinitions, existingItem, "del", this.level) : [];
       const ops = [
         ...delOps,
@@ -4292,14 +4321,7 @@ var Database = class {
           }
           await this.onPut(normalizedPath, stringifiedFile);
           const putOps = makeIndexOpsForDocument(normalizedPath, collection, collectionIndexDefinitions, payload, "put", this.level);
-          let existingItem;
-          try {
-            existingItem = await this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS).get(normalizedPath);
-          } catch (e) {
-            if (e.code !== "LEVEL_NOT_FOUND") {
-              throw e;
-            }
-          }
+          const existingItem = await this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS).get(normalizedPath);
           const delOps = existingItem ? makeIndexOpsForDocument(normalizedPath, collection, collectionIndexDefinitions, existingItem, "del", this.level) : [];
           const ops = [
             ...delOps,
@@ -4721,7 +4743,7 @@ var Database = class {
     };
     this.tinaDirectory = config.tinaDirectory || ".tina";
     this.bridge = config.bridge;
-    this.rootLevel = config.level;
+    this.rootLevel = config.level && new LevelProxy(config.level);
     this.indexStatusCallback = config.indexStatusCallback || defaultStatusCallback;
     this.onPut = config.onPut || defaultOnPut;
     this.onDelete = config.onDelete || defaultOnDelete;
@@ -4745,24 +4767,13 @@ var Database = class {
     return { pathsByCollection, nonCollectionPaths, collections };
   }
   async updateDatabaseVersion(version2) {
-    const metadataLevel = await this.rootLevel.sublevel("_metadata", SUBLEVEL_OPTIONS);
+    const metadataLevel = this.rootLevel.sublevel("_metadata", SUBLEVEL_OPTIONS);
     await metadataLevel.put("metadata", { version: version2 });
   }
   async getDatabaseVersion() {
-    const metadataLevel = await this.rootLevel.sublevel("_metadata", SUBLEVEL_OPTIONS);
-    let version2;
-    try {
-      const metadata = await metadataLevel.get("metadata");
-      version2 = metadata.version || version2;
-    } catch (e) {
-      if (e.code !== "LEVEL_NOT_FOUND") {
-        throw e;
-      }
-      if (version2) {
-        await metadataLevel.put("metadata", { version: version2 });
-      }
-    }
-    return version2;
+    const metadataLevel = this.rootLevel.sublevel("_metadata", SUBLEVEL_OPTIONS);
+    const metadata = await metadataLevel.get("metadata");
+    return metadata == null ? void 0 : metadata.version;
   }
   async initLevel() {
     if (this.level) {
@@ -4771,10 +4782,15 @@ var Database = class {
     if (!this.config.version) {
       this.level = this.rootLevel;
     } else {
-      const version2 = await this.getDatabaseVersion();
-      if (version2) {
-        this.level = this.rootLevel.sublevel(version2, SUBLEVEL_OPTIONS);
+      let version2 = await this.getDatabaseVersion();
+      if (!version2) {
+        version2 = "";
+        await this.updateDatabaseVersion(version2);
       }
+      this.level = this.rootLevel.sublevel(version2, SUBLEVEL_OPTIONS);
+    }
+    if (!this.level) {
+      throw new import_graphql5.GraphQLError("Error initializing LevelDB instance");
     }
   }
   clearCache() {
@@ -4843,18 +4859,12 @@ var _deleteIndexContent = async (database, documentPaths, enequeueOps, collectio
   const rootLevel = database.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS);
   await sequential(documentPaths, async (filepath) => {
     const itemKey = normalizePath(filepath);
-    try {
-      const item = await rootLevel.get(itemKey);
-      if (item) {
-        await enequeueOps([
-          ...makeIndexOpsForDocument(itemKey, collection.name, collectionIndexDefinitions, item, "del", database.level),
-          { type: "del", key: itemKey, sublevel: rootLevel }
-        ]);
-      }
-    } catch (e) {
-      if (e.code !== "LEVEL_NOT_FOUND") {
-        throw e;
-      }
+    const item = await rootLevel.get(itemKey);
+    if (item) {
+      await enequeueOps([
+        ...makeIndexOpsForDocument(itemKey, collection.name, collectionIndexDefinitions, item, "del", database.level),
+        { type: "del", key: itemKey, sublevel: rootLevel }
+      ]);
     }
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
   "typings": "dist/index.d.ts",
@@ -25,8 +25,8 @@
   "dependencies": {
     "@graphql-tools/relay-operation-optimizer": "^6.4.1",
     "@iarna/toml": "^2.2.5",
-    "@tinacms/mdx": "1.2.0",
-    "@tinacms/schema-tools": "1.3.0",
+    "@tinacms/mdx": "1.3.0",
+    "@tinacms/schema-tools": "1.3.1",
     "abstract-level": "^1.0.3",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
@@ -82,7 +82,7 @@
     "directory": "packages/tina-graphql"
   },
   "devDependencies": {
-    "@tinacms/schema-tools": "1.3.0",
+    "@tinacms/schema-tools": "1.3.1",
     "@tinacms/scripts": "1.0.2",
     "@types/cors": "^2.8.7",
     "@types/estree": "^0.0.50",