@tinacms/graphql 0.0.0-20230821165821 → 0.0.0-20230821174732

package/dist/database/index.d.ts

@@ -10,7 +10,7 @@ declare type IndexStatusEvent = {
 declare type IndexStatusCallback = (event: IndexStatusEvent) => Promise<void>;
 export declare type OnPutCallback = (key: string, value: any) => Promise<void>;
 export declare type OnDeleteCallback = (key: string) => Promise<void>;
-export declare type CreateDatabase = {
+export interface DatabaseArgs {
     bridge?: Bridge;
     level: Level;
     onPut?: (key: string, value: any) => Promise<void>;
@@ -18,8 +18,34 @@ export declare type CreateDatabase = {
     tinaDirectory?: string;
     indexStatusCallback?: IndexStatusCallback;
     version?: boolean;
+}
+export interface GitProvider {
+    onPut: (key: string, value: string) => Promise<void>;
+    onDelete: (key: string) => Promise<void>;
+}
+export declare type CreateDatabase = Omit<DatabaseArgs, 'level' | 'onPut' | 'onDelete'> & {
+    databaseAdapter: Level;
+    gitProvider: GitProvider;
+    /**
+     * @deprecated Use databaseAdapter instead
+     */
+    level?: Level;
+    /**
+     * @deprecated Use gitProvider instead
+     */
+    onPut?: OnPutCallback;
+    /**
+     * @deprecated Use gitProvider instead
+     */
+    onDelete?: OnDeleteCallback;
+};
+export declare type CreateLocalDatabaseArgs = Omit<DatabaseArgs, 'level'> & {
+    port?: number;
+    rootPath?: string;
 };
+export declare const createLocalDatabase: (config?: CreateLocalDatabaseArgs) => Database;
 export declare const createDatabase: (config: CreateDatabase) => Database;
+export declare const createDatabaseInternal: (config: DatabaseArgs) => Database;
 /** Options for {@link Database.query} **/
 export declare type QueryOptions = {
     fileExtension?: string;
@@ -33,7 +59,7 @@ export declare type QueryOptions = {
     folder?: string;
 };
 export declare class Database {
-    config: CreateDatabase;
+    config: DatabaseArgs;
     bridge?: Bridge;
     rootLevel: Level;
     level: Level | undefined;
@@ -44,7 +70,7 @@ export declare class Database {
     private tinaSchema;
     private collectionIndexDefinitions;
     private _lookup;
-    constructor(config: CreateDatabase);
+    constructor(config: DatabaseArgs);
     private collectionForPath;
     private getGeneratedFolder;
     private updateDatabaseVersion;

package/dist/index.d.ts

@@ -3,9 +3,10 @@ import { buildDotTinaFiles } from './build';
 export { resolve } from './resolve';
 export { transformDocumentIntoPayload } from './resolver';
 export * from './resolver/error';
-export { createDatabase } from './database';
 export { TinaLevelClient } from './level/tinaLevel';
-export type { QueryOptions, Database, OnDeleteCallback, OnPutCallback, CreateDatabase, } from './database';
+export type { Level } from './database/level';
+export type { QueryOptions, OnDeleteCallback, OnPutCallback, DatabaseArgs, GitProvider, CreateDatabase, } from './database';
+export { Database, createDatabaseInternal, createDatabase, createLocalDatabase, } from './database';
 import type { Config } from '@tinacms/schema-tools';
 export { getChangedFiles, getSha } from './git';
 export { sequential, assertShape } from './util';

package/dist/index.js

@@ -26,6 +26,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   AuditFileSystemBridge: () => AuditFileSystemBridge,
+  Database: () => Database,
   FilesystemBridge: () => FilesystemBridge,
   IsomorphicBridge: () => IsomorphicBridge,
   TinaFetchError: () => TinaFetchError,
@@ -37,6 +38,8 @@ __export(src_exports, {
   buildDotTinaFiles: () => buildDotTinaFiles,
   buildSchema: () => buildSchema,
   createDatabase: () => createDatabase,
+  createDatabaseInternal: () => createDatabaseInternal,
+  createLocalDatabase: () => createLocalDatabase,
   createSchema: () => createSchema,
   getChangedFiles: () => getChangedFiles,
   getSha: () => getSha,
@@ -2585,7 +2588,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.4.24",
+  version: "1.4.23",
   main: "dist/index.js",
   module: "dist/index.mjs",
   typings: "dist/index.d.ts",
@@ -5059,12 +5062,76 @@ var resolve = async ({
   }
 };
 
+// src/level/tinaLevel.ts
+var import_many_level = require("many-level");
+var import_readable_stream = require("readable-stream");
+var import_net = require("net");
+var TinaLevelClient = class extends import_many_level.ManyLevelGuest {
+  constructor(port) {
+    super();
+    this._connected = false;
+    this.port = port || 9e3;
+  }
+  openConnection() {
+    if (this._connected)
+      return;
+    const socket = (0, import_net.connect)(this.port);
+    (0, import_readable_stream.pipeline)(socket, this.createRpcStream(), socket, () => {
+      this._connected = false;
+    });
+    this._connected = true;
+  }
+};
+
 // src/database/index.ts
 var import_path4 = __toESM(require("path"));
 var import_graphql5 = require("graphql");
 var import_micromatch2 = __toESM(require("micromatch"));
 var import_js_sha12 = __toESM(require("js-sha1"));
+var createLocalDatabase = (config) => {
+  const level = new TinaLevelClient(config == null ? void 0 : config.port);
+  level.openConnection();
+  const fsBridge = new FilesystemBridge((config == null ? void 0 : config.rootPath) || process.cwd());
+  return new Database({
+    bridge: fsBridge,
+    ...config || {},
+    level
+  });
+};
 var createDatabase = (config) => {
+  if (config.onPut && config.onDelete) {
+    console.warn(
+      "onPut and onDelete are deprecated. Please use gitProvider.onPut and gitProvider.onDelete instead."
+    );
+  }
+  if (config.level) {
+    console.warn("level is deprecated. Please use databaseAdapter instead.");
+  }
+  if (config.onPut && config.onDelete && config.level && !config.databaseAdapter && !config.gitProvider) {
+    return new Database({
+      ...config,
+      level: config.level
+    });
+  }
+  if (!config.gitProvider) {
+    throw new Error(
+      "createDatabase requires a gitProvider. Please provide a gitProvider."
+    );
+  }
+  if (!config.databaseAdapter) {
+    throw new Error(
+      "createDatabase requires a databaseAdapter. Please provide a databaseAdapter."
+    );
+  }
+  return new Database({
+    ...config,
+    bridge: config.bridge,
+    level: config.databaseAdapter,
+    onPut: config.gitProvider.onPut.bind(config.gitProvider),
+    onDelete: config.gitProvider.onDelete.bind(config.gitProvider)
+  });
+};
+var createDatabaseInternal = (config) => {
   return new Database({
     ...config,
     bridge: config.bridge,
@@ -5134,18 +5201,7 @@ var Database = class {
       if (this.bridge) {
         await this.bridge.put(normalizedPath, stringifiedFile);
       }
-      try {
-        await this.onPut(normalizedPath, stringifiedFile);
-      } catch (e) {
-        throw new import_graphql5.GraphQLError(
-          `Error running onPut hook for ${filepath}: ${e}`,
-          null,
-          null,
-          null,
-          null,
-          e
-        );
-      }
+      await this.onPut(normalizedPath, stringifiedFile);
       const folderTreeBuilder = new FolderTreeBuilder();
       const folderKey = folderTreeBuilder.update(filepath, collection.path || "");
       const putOps = [
@@ -5240,18 +5296,7 @@ var Database = class {
           if (this.bridge) {
             await this.bridge.put(normalizedPath, stringifiedFile);
           }
-          try {
-            await this.onPut(normalizedPath, stringifiedFile);
-          } catch (e) {
-            throw new import_graphql5.GraphQLError(
-              `Error running onPut hook for ${filepath}: ${e}`,
-              null,
-              null,
-              null,
-              null,
-              e
-            );
-          }
+          await this.onPut(normalizedPath, stringifiedFile);
           const folderTreeBuilder = new FolderTreeBuilder();
           const folderKey = folderTreeBuilder.update(
             filepath,
@@ -5314,9 +5359,6 @@ var Database = class {
         }
         return true;
       } catch (error) {
-        if (error instanceof import_graphql5.GraphQLError) {
-          throw error;
-        }
         throw new TinaFetchError(`Error in PUT for ${filepath}`, {
           originalError: error,
           file: filepath,
@@ -5819,18 +5861,7 @@ var Database = class {
       if (this.bridge) {
         await this.bridge.delete((0, import_schema_tools3.normalizePath)(filepath));
       }
-      try {
-        await this.onDelete((0, import_schema_tools3.normalizePath)(filepath));
-      } catch (e) {
-        throw new import_graphql5.GraphQLError(
-          `Error running onDelete hook for ${filepath}: ${e}`,
-          null,
-          null,
-          null,
-          null,
-          e
-        );
-      }
+      await this.onDelete((0, import_schema_tools3.normalizePath)(filepath));
     };
     this._indexAllContent = async (level, schema) => {
       const tinaSchema = await this.getSchema(level, schema);
@@ -6085,27 +6116,6 @@ var _deleteIndexContent = async (database, documentPaths, enqueueOps, collection
   }
 };
 
-// src/level/tinaLevel.ts
-var import_many_level = require("many-level");
-var import_readable_stream = require("readable-stream");
-var import_net = require("net");
-var TinaLevelClient = class extends import_many_level.ManyLevelGuest {
-  constructor(port) {
-    super();
-    this._connected = false;
-    this.port = port || 9e3;
-  }
-  openConnection() {
-    if (this._connected)
-      return;
-    const socket = (0, import_net.connect)(this.port);
-    (0, import_readable_stream.pipeline)(socket, this.createRpcStream(), socket, () => {
-      this._connected = false;
-    });
-    this._connected = true;
-  }
-};
-
 // src/git/index.ts
 var import_isomorphic_git = __toESM(require("isomorphic-git"));
 var import_fs_extra = __toESM(require("fs-extra"));
@@ -6637,6 +6647,7 @@ var buildSchema = async (config, flags) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AuditFileSystemBridge,
+  Database,
   FilesystemBridge,
   IsomorphicBridge,
   TinaFetchError,
@@ -6648,6 +6659,8 @@ var buildSchema = async (config, flags) => {
   buildDotTinaFiles,
   buildSchema,
   createDatabase,
+  createDatabaseInternal,
+  createLocalDatabase,
   createSchema,
   getChangedFiles,
   getSha,

package/dist/index.mjs

@@ -2526,7 +2526,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.4.24",
+  version: "1.4.23",
   main: "dist/index.js",
   module: "dist/index.mjs",
   typings: "dist/index.d.ts",
@@ -4991,12 +4991,76 @@ var resolve = async ({
   }
 };
 
+// src/level/tinaLevel.ts
+import { ManyLevelGuest } from "many-level";
+import { pipeline } from "readable-stream";
+import { connect } from "net";
+var TinaLevelClient = class extends ManyLevelGuest {
+  constructor(port) {
+    super();
+    this._connected = false;
+    this.port = port || 9e3;
+  }
+  openConnection() {
+    if (this._connected)
+      return;
+    const socket = connect(this.port);
+    pipeline(socket, this.createRpcStream(), socket, () => {
+      this._connected = false;
+    });
+    this._connected = true;
+  }
+};
+
 // src/database/index.ts
 import path4 from "path";
 import { GraphQLError as GraphQLError4 } from "graphql";
 import micromatch2 from "micromatch";
 import sha2 from "js-sha1";
+var createLocalDatabase = (config) => {
+  const level = new TinaLevelClient(config?.port);
+  level.openConnection();
+  const fsBridge = new FilesystemBridge(config?.rootPath || process.cwd());
+  return new Database({
+    bridge: fsBridge,
+    ...config || {},
+    level
+  });
+};
 var createDatabase = (config) => {
+  if (config.onPut && config.onDelete) {
+    console.warn(
+      "onPut and onDelete are deprecated. Please use gitProvider.onPut and gitProvider.onDelete instead."
+    );
+  }
+  if (config.level) {
+    console.warn("level is deprecated. Please use databaseAdapter instead.");
+  }
+  if (config.onPut && config.onDelete && config.level && !config.databaseAdapter && !config.gitProvider) {
+    return new Database({
+      ...config,
+      level: config.level
+    });
+  }
+  if (!config.gitProvider) {
+    throw new Error(
+      "createDatabase requires a gitProvider. Please provide a gitProvider."
+    );
+  }
+  if (!config.databaseAdapter) {
+    throw new Error(
+      "createDatabase requires a databaseAdapter. Please provide a databaseAdapter."
+    );
+  }
+  return new Database({
+    ...config,
+    bridge: config.bridge,
+    level: config.databaseAdapter,
+    onPut: config.gitProvider.onPut.bind(config.gitProvider),
+    onDelete: config.gitProvider.onDelete.bind(config.gitProvider)
+  });
+};
+var createDatabaseInternal = (config) => {
   return new Database({
     ...config,
     bridge: config.bridge,
@@ -5066,18 +5130,7 @@ var Database = class {
       if (this.bridge) {
         await this.bridge.put(normalizedPath, stringifiedFile);
       }
-      try {
-        await this.onPut(normalizedPath, stringifiedFile);
-      } catch (e) {
-        throw new GraphQLError4(
-          `Error running onPut hook for ${filepath}: ${e}`,
-          null,
-          null,
-          null,
-          null,
-          e
-        );
-      }
+      await this.onPut(normalizedPath, stringifiedFile);
       const folderTreeBuilder = new FolderTreeBuilder();
       const folderKey = folderTreeBuilder.update(filepath, collection.path || "");
       const putOps = [
@@ -5171,18 +5224,7 @@ var Database = class {
           if (this.bridge) {
             await this.bridge.put(normalizedPath, stringifiedFile);
           }
-          try {
-            await this.onPut(normalizedPath, stringifiedFile);
-          } catch (e) {
-            throw new GraphQLError4(
-              `Error running onPut hook for ${filepath}: ${e}`,
-              null,
-              null,
-              null,
-              null,
-              e
-            );
-          }
+          await this.onPut(normalizedPath, stringifiedFile);
           const folderTreeBuilder = new FolderTreeBuilder();
           const folderKey = folderTreeBuilder.update(
             filepath,
@@ -5245,9 +5287,6 @@ var Database = class {
         }
         return true;
       } catch (error) {
-        if (error instanceof GraphQLError4) {
-          throw error;
-        }
         throw new TinaFetchError(`Error in PUT for ${filepath}`, {
           originalError: error,
           file: filepath,
@@ -5749,18 +5788,7 @@ var Database = class {
       if (this.bridge) {
         await this.bridge.delete(normalizePath(filepath));
       }
-      try {
-        await this.onDelete(normalizePath(filepath));
-      } catch (e) {
-        throw new GraphQLError4(
-          `Error running onDelete hook for ${filepath}: ${e}`,
-          null,
-          null,
-          null,
-          null,
-          e
-        );
-      }
+      await this.onDelete(normalizePath(filepath));
     };
     this._indexAllContent = async (level, schema) => {
       const tinaSchema = await this.getSchema(level, schema);
@@ -6015,27 +6043,6 @@ var _deleteIndexContent = async (database, documentPaths, enqueueOps, collection
   }
 };
 
-// src/level/tinaLevel.ts
-import { ManyLevelGuest } from "many-level";
-import { pipeline } from "readable-stream";
-import { connect } from "net";
-var TinaLevelClient = class extends ManyLevelGuest {
-  constructor(port) {
-    super();
-    this._connected = false;
-    this.port = port || 9e3;
-  }
-  openConnection() {
-    if (this._connected)
-      return;
-    const socket = connect(this.port);
-    pipeline(socket, this.createRpcStream(), socket, () => {
-      this._connected = false;
-    });
-    this._connected = true;
-  }
-};
-
 // src/git/index.ts
 import git from "isomorphic-git";
 import fs from "fs-extra";
@@ -6566,6 +6573,7 @@ var buildSchema = async (config, flags) => {
 };
 export {
   AuditFileSystemBridge,
+  Database,
   FilesystemBridge,
   IsomorphicBridge,
   TinaFetchError,
@@ -6577,6 +6585,8 @@ export {
   buildDotTinaFiles,
   buildSchema,
   createDatabase,
+  createDatabaseInternal,
+  createLocalDatabase,
   createSchema,
   getChangedFiles,
   getSha,

package/dist/resolver/index.d.ts

@@ -52,7 +52,9 @@ export declare class Resolver {
     constructor(init: ResolverConfig);
     resolveCollection: (args: any, collectionName: string, hasDocuments?: boolean) => Promise<{
         fields: TinaField<true>[];
-        templates?: undefined;
+        templates?: undefined; /**
+         * updateDocument, update<Collection>Document
+         */
         label?: string;
         name: string;
         path: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "0.0.0-20230821165821",
+  "version": "0.0.0-20230821174732",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "typings": "dist/index.d.ts",
@@ -24,8 +24,6 @@
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",
-    "@tinacms/mdx": "0.0.0-20230821165821",
-    "@tinacms/schema-tools": "0.0.0-20230821165821",
     "abstract-level": "^1.0.3",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
@@ -47,7 +45,9 @@
     "micromatch": "4.0.5",
     "normalize-path": "^3.0.0",
     "readable-stream": "^4.3.0",
-    "yup": "^0.32.9"
+    "yup": "^0.32.9",
+    "@tinacms/mdx": "1.3.16",
+    "@tinacms/schema-tools": "1.4.10"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -57,8 +57,6 @@
     "directory": "packages/tina-graphql"
   },
   "devDependencies": {
-    "@tinacms/schema-tools": "0.0.0-20230821165821",
-    "@tinacms/scripts": "1.1.2",
     "@types/cors": "^2.8.7",
     "@types/estree": "^0.0.50",
     "@types/express": "^4.17.8",
@@ -81,7 +79,9 @@
     "jest-matcher-utils": "^29.5.0",
     "memory-level": "^1.0.0",
     "nodemon": "2.0.19",
-    "typescript": "4.3.5"
+    "typescript": "4.3.5",
+    "@tinacms/schema-tools": "1.4.10",
+    "@tinacms/scripts": "1.1.2"
   },
   "scripts": {
     "types": "pnpm tsc",