@tinacms/datalayer 0.1.1 → 0.2.2

package/dist/index.js

@@ -51,7 +51,7 @@ var __toModule = (module2) => {
   return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/datalayer/src/index.ts
+// src/index.ts
 __export(exports, {
   AuditFileSystemBridge: () => AuditFileSystemBridge,
   AuditFilesystemStore: () => AuditFilesystemStore,
@@ -60,6 +60,7 @@ __export(exports, {
   FilesystemBridge: () => FilesystemBridge,
   FilesystemStore: () => FilesystemStore,
   INDEX_KEY_FIELD_SEPARATOR: () => INDEX_KEY_FIELD_SEPARATOR,
+  IsomorphicBridge: () => IsomorphicBridge,
   LevelStore: () => LevelStore,
   OP: () => OP,
   atob: () => atob,
@@ -72,7 +73,7 @@ __export(exports, {
   makeStringEscaper: () => makeStringEscaper
 });
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/datalayer/src/database/bridge/filesystem.ts
+// src/database/bridge/filesystem.ts
 var import_fs_extra = __toModule(require("fs-extra"));
 var import_fast_glob = __toModule(require("fast-glob"));
 var import_path = __toModule(require("path"));
@@ -81,9 +82,9 @@ var FilesystemBridge = class {
   constructor(rootPath) {
     this.rootPath = rootPath || "";
   }
-  async glob(pattern) {
+  async glob(pattern, extension) {
     const basePath = import_path.default.join(this.rootPath, ...pattern.split("/"));
-    const items = await (0, import_fast_glob.default)(import_path.default.join(basePath, "**", "/*").replace(/\\/g, "/"), {
+    const items = await (0, import_fast_glob.default)(import_path.default.join(basePath, "**", `/*${extension}`).replace(/\\/g, "/"), {
       dot: true
     });
     const posixRootPath = (0, import_normalize_path.default)(this.rootPath);
@@ -108,23 +109,347 @@ var FilesystemBridge = class {
   }
 };
 var AuditFileSystemBridge = class extends FilesystemBridge {
-  async put(_filepath, _data) {
+  async put(filepath, data) {
+    if ([
+      ".tina/__generated__/_lookup.json",
+      ".tina/__generated__/_schema.json",
+      ".tina/__generated__/_graphql.json"
+    ].includes(filepath)) {
+      return super.put(filepath, data);
+    }
     return;
   }
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/datalayer/src/database/store/filesystem.ts
+// src/database/bridge/isomorphic.ts
+var import_isomorphic_git = __toModule(require("isomorphic-git"));
 var import_fs_extra2 = __toModule(require("fs-extra"));
+var import_glob_parent = __toModule(require("glob-parent"));
+var import_normalize_path2 = __toModule(require("normalize-path"));
+var import_graphql = __toModule(require("graphql"));
+var flat = typeof Array.prototype.flat === "undefined" ? (entries) => entries.reduce((acc, x) => acc.concat(x), []) : (entries) => entries.flat();
+var toUint8Array = (buf) => {
+  const ab = new ArrayBuffer(buf.length);
+  const view = new Uint8Array(ab);
+  for (let i = 0; i < buf.length; ++i) {
+    view[i] = buf[i];
+  }
+  return view;
+};
+var IsomorphicBridge = class {
+  constructor(rootPath, {
+    gitRoot,
+    author,
+    committer,
+    fsModule = import_fs_extra2.default,
+    commitMessage = "Update from GraphQL client",
+    ref,
+    onPut,
+    onDelete
+  }) {
+    this.cache = {};
+    this.rootPath = rootPath;
+    this.gitRoot = gitRoot;
+    this.relativePath = rootPath.slice(this.gitRoot.length).replace(/\\/g, "/");
+    if (this.relativePath.startsWith("/")) {
+      this.relativePath = this.relativePath.slice(1);
+    }
+    this.fsModule = fsModule;
+    this.author = author;
+    this.committer = committer || author;
+    this.isomorphicConfig = {
+      dir: (0, import_normalize_path2.default)(this.gitRoot),
+      fs: this.fsModule
+    };
+    this.ref = ref;
+    this.commitMessage = commitMessage;
+    this.onPut = onPut || (() => {
+    });
+    this.onDelete = onDelete || (() => {
+    });
+  }
+  getAuthor() {
+    return __spreadProps(__spreadValues({}, this.author), {
+      timestamp: Math.round(new Date().getTime() / 1e3),
+      timezoneOffset: 0
+    });
+  }
+  getCommitter() {
+    return __spreadProps(__spreadValues({}, this.committer), {
+      timestamp: Math.round(new Date().getTime() / 1e3),
+      timezoneOffset: 0
+    });
+  }
+  async listEntries({
+    pattern,
+    entry,
+    path: path4,
+    results
+  }) {
+    const treeResult = await import_isomorphic_git.default.readTree(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+      oid: entry.oid,
+      cache: this.cache
+    }));
+    const children = [];
+    for (const childEntry of treeResult.tree) {
+      const childPath = path4 ? `${path4}/${childEntry.path}` : childEntry.path;
+      if (childEntry.type === "tree") {
+        children.push(childEntry);
+      } else {
+        if (childPath.startsWith(pattern)) {
+          results.push(childPath);
+        }
+      }
+    }
+    for (const childEntry of children) {
+      const childPath = path4 ? `${path4}/${childEntry.path}` : childEntry.path;
+      await this.listEntries({
+        pattern,
+        entry: childEntry,
+        path: childPath,
+        results
+      });
+    }
+  }
+  async resolvePathEntries(path4, ref) {
+    let pathParts = path4.split("/");
+    const result = await import_isomorphic_git.default.walk(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+      map: async (filepath, [head]) => {
+        if (head._fullpath === "." || path4.startsWith(filepath)) {
+          return head;
+        }
+      },
+      cache: this.cache,
+      trees: [import_isomorphic_git.default.TREE({ ref })]
+    }));
+    const pathEntries = flat(result);
+    if (pathParts.indexOf(".") === -1) {
+      pathParts = [".", ...pathParts];
+    }
+    while (pathParts.length > pathEntries.length) {
+      pathEntries.push(null);
+    }
+    return { pathParts, pathEntries };
+  }
+  async updateTreeHierarchy(existingOid, updatedOid, path4, type, pathEntries, pathParts) {
+    const lastIdx = pathEntries.length - 1;
+    const parentEntry = pathEntries[lastIdx];
+    const parentPath = pathParts[lastIdx];
+    let parentOid;
+    let tree;
+    const mode = type === "blob" ? "100644" : "040000";
+    if (parentEntry) {
+      parentOid = await parentEntry.oid();
+      const treeResult = await import_isomorphic_git.default.readTree(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+        oid: parentOid,
+        cache: this.cache
+      }));
+      tree = existingOid ? treeResult.tree.map((entry) => {
+        if (entry.path === path4) {
+          entry.oid = updatedOid;
+        }
+        return entry;
+      }) : [
+        ...treeResult.tree,
+        {
+          oid: updatedOid,
+          type,
+          path: path4,
+          mode
+        }
+      ];
+    } else {
+      tree = [
+        {
+          oid: updatedOid,
+          type,
+          path: path4,
+          mode
+        }
+      ];
+    }
+    const updatedParentOid = await import_isomorphic_git.default.writeTree(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+      tree
+    }));
+    if (lastIdx === 0) {
+      return updatedParentOid;
+    } else {
+      return await this.updateTreeHierarchy(parentOid, updatedParentOid, parentPath, "tree", pathEntries.slice(0, lastIdx), pathParts.slice(0, lastIdx));
+    }
+  }
+  async commitTree(treeSha, ref) {
+    const commitSha = await import_isomorphic_git.default.writeCommit(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+      commit: {
+        tree: treeSha,
+        parent: [
+          await import_isomorphic_git.default.resolveRef(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+            ref
+          }))
+        ],
+        message: this.commitMessage,
+        author: this.getAuthor(),
+        committer: this.getCommitter()
+      }
+    }));
+    await import_isomorphic_git.default.writeRef(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+      ref,
+      value: commitSha,
+      force: true
+    }));
+  }
+  async getRef() {
+    if (this.ref) {
+      return this.ref;
+    }
+    const ref = await import_isomorphic_git.default.currentBranch(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+      fullname: true
+    }));
+    if (!ref) {
+      throw new import_graphql.GraphQLError(`Unable to determine current branch from HEAD`, null, null, null, null, null, {});
+    }
+    this.ref = ref;
+    return ref;
+  }
+  async glob(pattern, extension) {
+    const ref = await this.getRef();
+    const parent = (0, import_glob_parent.default)(this.qualifyPath(pattern));
+    const { pathParts, pathEntries } = await this.resolvePathEntries(parent, ref);
+    const leafEntry = pathEntries[pathEntries.length - 1];
+    const entryPath = pathParts[pathParts.length - 1];
+    const parentEntry = pathEntries[pathEntries.length - 2];
+    let treeEntry;
+    let parentPath;
+    if (parentEntry) {
+      const treeResult = await import_isomorphic_git.default.readTree(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+        oid: await parentEntry.oid(),
+        cache: this.cache
+      }));
+      treeEntry = treeResult.tree.find((entry) => entry.path === entryPath);
+      parentPath = pathParts.slice(1, pathParts.length).join("/");
+    } else {
+      treeEntry = {
+        type: "tree",
+        oid: await leafEntry.oid()
+      };
+      parentPath = "";
+    }
+    const results = [];
+    await this.listEntries({
+      pattern: this.qualifyPath(pattern),
+      entry: treeEntry,
+      path: parentPath,
+      results
+    });
+    return results.map((path4) => this.unqualifyPath(path4)).filter((path4) => path4.endsWith(extension));
+  }
+  supportsBuilding() {
+    return true;
+  }
+  async delete(filepath) {
+    const ref = await this.getRef();
+    const { pathParts, pathEntries } = await this.resolvePathEntries(this.qualifyPath(filepath), ref);
+    let oidToRemove;
+    let ptr = pathEntries.length - 1;
+    while (ptr >= 1) {
+      const leafEntry = pathEntries[ptr];
+      const nodePath = pathParts[ptr];
+      if (leafEntry) {
+        oidToRemove = oidToRemove || await leafEntry.oid();
+        const parentEntry = pathEntries[ptr - 1];
+        const existingOid = await parentEntry.oid();
+        const treeResult = await import_isomorphic_git.default.readTree(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+          oid: existingOid,
+          cache: this.cache
+        }));
+        const updatedTree = treeResult.tree.filter((value) => value.path !== nodePath);
+        if (updatedTree.length === 0) {
+          ptr -= 1;
+          continue;
+        }
+        const updatedTreeOid = await import_isomorphic_git.default.writeTree(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+          tree: updatedTree
+        }));
+        const updatedRootTreeOid = await this.updateTreeHierarchy(existingOid, updatedTreeOid, pathParts[ptr - 1], "tree", pathEntries.slice(0, ptr - 1), pathParts.slice(0, ptr - 1));
+        await this.commitTree(updatedRootTreeOid, ref);
+        break;
+      } else {
+        throw new import_graphql.GraphQLError(`Unable to resolve path: ${filepath}`, null, null, null, null, null, { status: 404 });
+      }
+    }
+    if (oidToRemove) {
+      await import_isomorphic_git.default.updateIndex(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+        filepath: this.qualifyPath(filepath),
+        force: true,
+        remove: true,
+        oid: oidToRemove,
+        cache: this.cache
+      }));
+    }
+    await this.onDelete(filepath);
+  }
+  qualifyPath(filepath) {
+    return this.relativePath ? `${this.relativePath}/${filepath}` : filepath;
+  }
+  unqualifyPath(filepath) {
+    return this.relativePath ? filepath.slice(this.relativePath.length + 1) : filepath;
+  }
+  async get(filepath) {
+    const ref = await this.getRef();
+    const oid = await import_isomorphic_git.default.resolveRef(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+      ref
+    }));
+    const { blob } = await import_isomorphic_git.default.readBlob(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+      oid,
+      filepath: this.qualifyPath(filepath),
+      cache: this.cache
+    }));
+    return Buffer.from(blob).toString("utf8");
+  }
+  async putConfig(filepath, data) {
+    await this.put(filepath, data);
+  }
+  async put(filepath, data) {
+    const ref = await this.getRef();
+    const { pathParts, pathEntries } = await this.resolvePathEntries(this.qualifyPath(filepath), ref);
+    const blobUpdate = toUint8Array(Buffer.from(data));
+    let existingOid;
+    const leafEntry = pathEntries[pathEntries.length - 1];
+    const nodePath = pathParts[pathParts.length - 1];
+    if (leafEntry) {
+      existingOid = await leafEntry.oid();
+      const hash = await import_isomorphic_git.default.hashBlob({ object: blobUpdate });
+      if (hash.oid === existingOid) {
+        await this.onPut(filepath, data);
+        return;
+      }
+    }
+    const updatedOid = await import_isomorphic_git.default.writeBlob(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+      blob: blobUpdate
+    }));
+    const updatedRootSha = await this.updateTreeHierarchy(existingOid, updatedOid, nodePath, "blob", pathEntries.slice(0, pathEntries.length - 1), pathParts.slice(0, pathParts.length - 1));
+    await this.commitTree(updatedRootSha, ref);
+    await import_isomorphic_git.default.updateIndex(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+      filepath: this.qualifyPath(filepath),
+      add: true,
+      oid: updatedOid,
+      cache: this.cache
+    }));
+    await this.onPut(filepath, data);
+  }
+};
+
+// src/database/store/filesystem.ts
+var import_fs_extra3 = __toModule(require("fs-extra"));
 var import_fast_glob2 = __toModule(require("fast-glob"));
 var import_path2 = __toModule(require("path"));
-var import_normalize_path2 = __toModule(require("normalize-path"));
+var import_normalize_path3 = __toModule(require("normalize-path"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/datalayer/src/database/util.ts
+// src/database/util.ts
 var import_gray_matter = __toModule(require("gray-matter"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/datalayer/src/util.ts
+// src/util.ts
 var yup = __toModule(require("yup"));
-var import_graphql = __toModule(require("graphql"));
+var import_graphql2 = __toModule(require("graphql"));
 var sequential = async (items, callback) => {
   const accum = [];
   if (!items) {
@@ -149,7 +474,7 @@ function assertShape(value, yupSchema, errorMessage) {
     shape.validateSync(value);
   } catch (e) {
     const message = errorMessage || `Failed to assertShape - ${e.message}`;
-    throw new import_graphql.GraphQLError(message, null, null, null, null, null, {
+    throw new import_graphql2.GraphQLError(message, null, null, null, null, null, {
       stack: e.stack
     });
   }
@@ -161,7 +486,7 @@ var btoa = (string) => {
   return Buffer.from(string).toString("base64");
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/datalayer/src/database/util.ts
+// src/database/util.ts
 var stringifyFile = (content, format, keepTemplateKey) => {
   switch (format) {
     case ".markdown":
@@ -216,7 +541,7 @@ var parseFile = (content, format, yupSchema) => {
   }
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/datalayer/src/database/store/filesystem.ts
+// src/database/store/filesystem.ts
 var FilesystemStore = class {
   async clear() {
   }
@@ -225,14 +550,14 @@ var FilesystemStore = class {
   constructor({ rootPath }) {
     this.rootPath = rootPath || "";
   }
-  async query(queryOptions) {
+  async query(_queryOptions) {
     throw new Error(`Unable to perform query for Filesystem store`);
   }
   async seed() {
     throw new Error(`Seeding data is not possible for Filesystem store`);
   }
   async get(filepath) {
-    return parseFile(await import_fs_extra2.default.readFileSync(import_path2.default.join(this.rootPath, filepath)).toString(), import_path2.default.extname(filepath), (yup2) => yup2.object());
+    return parseFile(await import_fs_extra3.default.readFileSync(import_path2.default.join(this.rootPath, filepath)).toString(), import_path2.default.extname(filepath), (yup2) => yup2.object());
   }
   supportsSeeding() {
     return false;
@@ -240,12 +565,12 @@ var FilesystemStore = class {
   supportsIndexing() {
     return false;
   }
-  async glob(pattern, callback) {
+  async glob(pattern, callback, extension) {
     const basePath = import_path2.default.join(this.rootPath, ...pattern.split("/"));
-    const itemsRaw = await (0, import_fast_glob2.default)(import_path2.default.join(basePath, "**", "/*").replace(/\\/g, "/"), {
+    const itemsRaw = await (0, import_fast_glob2.default)(import_path2.default.join(basePath, "**", `/*${extension}`).replace(/\\/g, "/"), {
       dot: true
     });
-    const posixRootPath = (0, import_normalize_path2.default)(this.rootPath);
+    const posixRootPath = (0, import_normalize_path3.default)(this.rootPath);
     const items = itemsRaw.map((item) => {
       return item.replace(posixRootPath, "").replace(/^\/|\/$/g, "");
     });
@@ -258,14 +583,14 @@ var FilesystemStore = class {
     }
   }
   async put(filepath, data, options) {
-    await import_fs_extra2.default.outputFileSync(import_path2.default.join(this.rootPath, filepath), stringifyFile(data, import_path2.default.extname(filepath), options.keepTemplateKey));
+    await import_fs_extra3.default.outputFileSync(import_path2.default.join(this.rootPath, filepath), stringifyFile(data, import_path2.default.extname(filepath), options.keepTemplateKey));
   }
   async open() {
   }
   async close() {
   }
   async delete(filepath) {
-    await import_fs_extra2.default.remove(import_path2.default.join(this.rootPath, filepath));
+    await import_fs_extra3.default.remove(import_path2.default.join(this.rootPath, filepath));
   }
 };
 var AuditFilesystemStore = class extends FilesystemStore {
@@ -274,7 +599,7 @@ var AuditFilesystemStore = class extends FilesystemStore {
   }
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/datalayer/src/database/store/index.ts
+// src/database/store/index.ts
 var import_jsonpath_plus = __toModule(require("jsonpath-plus"));
 var DEFAULT_COLLECTION_SORT_KEY = "__filepath__";
 var INDEX_KEY_FIELD_SEPARATOR = "#";
@@ -603,11 +928,12 @@ var makeFilterSuffixes = (filterChain, index) => {
     return {};
   }
 };
-var makeKeyForField = (definition, data, stringEscaper) => {
+var makeKeyForField = (definition, data, stringEscaper, maxStringLength = 100) => {
   const valueParts = [];
   for (const field of definition.fields) {
-    if (field.name in data) {
-      const resolvedValue = String(field.type === "datetime" ? new Date(data[field.name]).getTime() : field.type === "string" ? stringEscaper(data[field.name]) : data[field.name]);
+    if (field.name in data && data[field.name] !== void 0 && data[field.name] !== null) {
+      const rawValue = data[field.name];
+      const resolvedValue = String(field.type === "datetime" ? new Date(rawValue).getTime() : field.type === "string" ? stringEscaper(rawValue) : rawValue).substring(0, maxStringLength);
       valueParts.push(applyPadding(resolvedValue, field.pad));
     } else {
       return null;
@@ -616,7 +942,7 @@ var makeKeyForField = (definition, data, stringEscaper) => {
   return valueParts.join(INDEX_KEY_FIELD_SEPARATOR);
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/datalayer/src/database/store/level.ts
+// src/database/store/level.ts
 var import_path3 = __toModule(require("path"));
 var import_level = __toModule(require("level"));
 var import_levelup = __toModule(require("levelup"));
@@ -825,6 +1151,7 @@ var LevelStore = class {
   FilesystemBridge,
   FilesystemStore,
   INDEX_KEY_FIELD_SEPARATOR,
+  IsomorphicBridge,
   LevelStore,
   OP,
   atob,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/datalayer",
-  "version": "0.1.1",
+  "version": "0.2.2",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -17,11 +17,6 @@
       }
     ]
   },
-  "scripts": {
-    "types": "yarn tsc",
-    "build": "echo \"Run `yarn build` from the root of the repository instead\"",
-    "test": "jest --passWithNoTests"
-  },
   "dependencies": {
     "@octokit/auth-app": "^2.6.0",
     "@octokit/graphql": "^4.5.6",
@@ -29,8 +24,10 @@
     "encoding-down": "^7.1.0",
     "fast-glob": "^3.2.5",
     "fs-extra": "^9.0.1",
+    "glob-parent": "^6.0.2",
     "graphql": "^15.3.0",
     "gray-matter": "^4.0.2",
+    "isomorphic-git": "^1.10.3",
     "js-yaml": "^3.14.0",
     "jsonpath-plus": "^6.0.1",
     "level": "^7.0.1",
@@ -50,7 +47,7 @@
     "directory": "packages/@tinacms/datalayer"
   },
   "devDependencies": {
-    "@tinacms/scripts": "0.50.7",
+    "@tinacms/scripts": "0.50.9",
     "@types/fs-extra": "^9.0.2",
     "@types/jest": "^27.4.1",
     "@types/js-yaml": "^3.12.5",
@@ -65,6 +62,11 @@
     "jest-diff": "27.0.6",
     "jest-file-snapshot": "^0.5.0",
     "jest-matcher-utils": "27.0.6",
-    "typescript": "^4.3.5"
+    "typescript": "4.3.5"
+  },
+  "scripts": {
+    "types": "pnpm tsc",
+    "build": "tinacms-scripts build",
+    "test": "jest --passWithNoTests"
   }
 }