@tinacms/cli 0.60.23 → 0.60.24

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # tinacms-cli
 
+## 0.60.24
+
+### Patch Changes
+
+- 2ef5a1f33: Use media config from the schema in the local media server
+- 2ef5a1f33: Uses new `schema.config` when resolving media/asset urls
+- b348f8b6b: Experimental isomorphic git bridge implementation
+- b46e9a481: Fixed issue where child process would start before parent
+- fb73fb355: Renames syncFolder to a mediaRoot when configuring Repo-Based Media
+- 7b77fe1b5: Add a default TinaMediaStore for repo-based media
+- 3e4b3ea7e: media manage uses relieve dir paths
+- 99a13024d: Enables paging for local media manager
+- Updated dependencies [2ef5a1f33]
+- Updated dependencies [2ef5a1f33]
+- Updated dependencies [b348f8b6b]
+- Updated dependencies [fb73fb355]
+- Updated dependencies [4daf15b36]
+  - @tinacms/graphql@0.61.0
+  - @tinacms/datalayer@0.2.0
+  - @tinacms/schema-tools@0.0.6
+  - @tinacms/metrics@0.0.3
+
 ## 0.60.23
 
 ### Patch Changes

package/dist/cmds/start-server/index.d.ts

@@ -1,25 +1,26 @@
 /**
-Copyright 2021 Forestry.io Holdings, Inc.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+ Copyright 2021 Forestry.io Holdings, Inc.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
 interface Options {
     port?: number;
     command?: string;
     watchFolders?: string[];
     experimentalData?: boolean;
+    isomorphicGitBridge?: boolean;
     noWatch?: boolean;
     noSDK: boolean;
     noTelemetry: boolean;
     verbose?: boolean;
     dev?: boolean;
 }
-export declare function startServer(_ctx: any, next: any, { port, noWatch, experimentalData, noSDK, noTelemetry, watchFolders, verbose, dev, }: Options): Promise<void>;
+export declare function startServer(_ctx: any, next: any, { port, noWatch, experimentalData, isomorphicGitBridge, noSDK, noTelemetry, watchFolders, verbose, dev, }: Options): Promise<void>;
 export {};

package/dist/index.js

@@ -60,9 +60,9 @@ var __toModule = (module2) => {
 // pnp:/home/runner/work/tinacms/tinacms/.yarn/cache/dotenv-npm-16.0.1-d99e72bb95-e97e94476c.zip/node_modules/dotenv/lib/main.js
 var require_main = __commonJS({
   "pnp:/home/runner/work/tinacms/tinacms/.yarn/cache/dotenv-npm-16.0.1-d99e72bb95-e97e94476c.zip/node_modules/dotenv/lib/main.js"(exports, module2) {
-    var fs6 = require("fs");
+    var fs7 = require("fs");
     var path4 = require("path");
-    var os = require("os");
+    var os2 = require("os");
     var LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/mg;
     function parse2(src) {
       const obj = {};
@@ -87,7 +87,7 @@ var require_main = __commonJS({
       console.log(`[dotenv][DEBUG] ${message}`);
     }
     function _resolveHome(envPath) {
-      return envPath[0] === "~" ? path4.join(os.homedir(), envPath.slice(1)) : envPath;
+      return envPath[0] === "~" ? path4.join(os2.homedir(), envPath.slice(1)) : envPath;
     }
     function config(options) {
       let dotenvPath = path4.resolve(process.cwd(), ".env");
@@ -103,7 +103,7 @@ var require_main = __commonJS({
         }
       }
       try {
-        const parsed = DotenvModule.parse(fs6.readFileSync(dotenvPath, { encoding }));
+        const parsed = DotenvModule.parse(fs7.readFileSync(dotenvPath, { encoding }));
         Object.keys(parsed).forEach(function(key) {
           if (!Object.prototype.hasOwnProperty.call(process.env, key)) {
             process.env[key] = parsed[key];
@@ -197,36 +197,61 @@ var init_media = __esm({
     import_path6 = __toModule(require("path"));
     init_utils();
     MediaModel = class {
-      constructor({ publicFolder, syncFolder }) {
-        this.syncFolder = syncFolder;
+      constructor({ publicFolder, mediaRoot }) {
+        this.mediaRoot = mediaRoot;
         this.publicFolder = publicFolder;
       }
       async listMedia(args) {
         try {
-          const folderPath = (0, import_path6.join)(this.publicFolder, this.syncFolder, args.searchPath);
+          const folderPath = (0, import_path6.join)(this.publicFolder, this.mediaRoot, args.searchPath);
           const searchPath = parseMediaFolder(args.searchPath);
           const filesStr = await import_fs_extra5.default.readdir(folderPath);
           const filesProm = filesStr.map(async (file) => {
             const filePath = (0, import_path6.join)(folderPath, file);
             const stat = await import_fs_extra5.default.stat(filePath);
             let src = `/${file}`;
+            const isFile = stat.isFile();
+            if (!isFile) {
+              return {
+                isFile,
+                size: stat.size,
+                src,
+                filename: file
+              };
+            }
             if (searchPath) {
               src = `/${searchPath}${src}`;
             }
-            if (this.syncFolder) {
-              src = `/${this.syncFolder}${src}`;
+            if (this.mediaRoot) {
+              src = `/${this.mediaRoot}${src}`;
             }
             return {
+              isFile,
               size: stat.size,
-              fileName: file,
               src,
-              isFile: stat.isFile()
+              filename: file
             };
           });
-          const files = await Promise.all(filesProm);
+          const offset = Number(args.cursor) || 0;
+          const limit = Number(args.limit) || 20;
+          const rawItems = await Promise.all(filesProm);
+          const sortedItems = rawItems.sort((a, b) => {
+            if (a.isFile && !b.isFile) {
+              return 1;
+            }
+            if (!a.isFile && b.isFile) {
+              return -1;
+            }
+            return 0;
+          });
+          const limitItems = sortedItems.slice(offset, offset + limit);
+          const files = limitItems.filter((x) => x.isFile);
+          const directories = limitItems.filter((x) => !x.isFile).map((x) => x.src);
+          const cursor = rawItems.length > offset + limit ? String(offset + limit) : null;
           return {
-            files: files.filter((x) => x.isFile),
-            directories: files.filter((x) => !x.isFile).map((x) => x.src)
+            files,
+            directories,
+            cursor
           };
         } catch (error) {
           console.error(error);
@@ -239,7 +264,7 @@ var init_media = __esm({
       }
       async deleteMedia(args) {
         try {
-          const file = (0, import_path6.join)(this.publicFolder, this.syncFolder, args.searchPath);
+          const file = (0, import_path6.join)(this.publicFolder, this.mediaRoot, args.searchPath);
           await import_fs_extra5.default.stat(file);
           await import_fs_extra5.default.remove(file);
           return { ok: true };
@@ -261,7 +286,7 @@ var init_routes = __esm({
     import_multer = __toModule(require("multer"));
     init_media();
     createMediaRouter = (config) => {
-      const mediaFolder = (0, import_path7.join)(process.cwd(), config.publicFolder, config.syncFolder);
+      const mediaFolder = (0, import_path7.join)(process.cwd(), config.publicFolder, config.mediaRoot);
       const storage = import_multer.default.diskStorage({
         destination: function(req, file, cb) {
           cb(null, mediaFolder);
@@ -276,18 +301,22 @@ var init_routes = __esm({
       const mediaRouter = (0, import_express.Router)();
       mediaRouter.get("/list/*", async (req, res) => {
         const folder = req.params[0];
+        const cursor = req.query.cursor;
+        const limit = req.query.limit;
         const media = await mediaModel.listMedia({
-          searchPath: folder
+          searchPath: folder,
+          cursor,
+          limit
         });
         res.json(media);
       });
-      mediaRouter.delete("/delete/*", async (req, res) => {
+      mediaRouter.delete("/*", async (req, res) => {
         const file = req.params[0];
         const didDelete = await mediaModel.deleteMedia({ searchPath: file });
         res.json(didDelete);
       });
-      mediaRouter.post("/upload/*", upload.single("file"), function(req, res, next) {
-        res.json({ ok: true });
+      mediaRouter.post("/upload/*", upload.single("file"), function(req, res) {
+        res.json({ success: true });
       });
       return mediaRouter;
     };
@@ -348,7 +377,7 @@ var init_server = __esm({
       const mediaPaths = ((_c = (_b = (_a = schema == null ? void 0 : schema.schema) == null ? void 0 : _a.config) == null ? void 0 : _b.media) == null ? void 0 : _c.tina) || {};
       app.use("/media", createMediaRouter({
         publicFolder: parseMediaFolder((mediaPaths == null ? void 0 : mediaPaths.publicFolder) || ""),
-        syncFolder: parseMediaFolder((mediaPaths == null ? void 0 : mediaPaths.syncFolder) || "")
+        mediaRoot: parseMediaFolder((mediaPaths == null ? void 0 : mediaPaths.mediaRoot) || "")
       }));
       return server;
     };
@@ -384,7 +413,7 @@ var commander = __toModule(require("commander"));
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/package.json
 var name = "@tinacms/cli";
-var version = "0.60.23";
+var version = "0.60.24";
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/query-gen/attachSchema.ts
 var import_graphql = __toModule(require("@tinacms/graphql"));
@@ -1904,13 +1933,77 @@ var AsyncLock = class {
 var import_metrics3 = __toModule(require("@tinacms/metrics"));
 var import_chalk6 = __toModule(require("chalk"));
 var import_chokidar = __toModule(require("chokidar"));
+var import_fs_extra6 = __toModule(require("fs-extra"));
+var import_ini = __toModule(require("ini"));
+var import_os = __toModule(require("os"));
 var import_path8 = __toModule(require("path"));
 var lock = new AsyncLock();
 var gqlPackageFile = require.resolve("@tinacms/graphql");
+var resolveGitRoot = async () => {
+  const pathParts = process.cwd().split(import_path8.default.sep);
+  while (true) {
+    const pathToGit = pathParts.join(import_path8.default.sep);
+    if (await import_fs_extra6.default.pathExists(import_path8.default.join(pathToGit, ".git"))) {
+      return pathToGit;
+    }
+    if (!pathParts.length) {
+      throw new Error("Unable to locate your .git folder (required for isomorphicGitBridge)");
+    }
+    pathParts.pop();
+  }
+};
+async function makeIsomorphicOptions(fsBridge) {
+  var _a, _b, _c, _d;
+  const gitRoot = await resolveGitRoot();
+  const options = {
+    gitRoot,
+    author: {
+      name: "",
+      email: ""
+    },
+    onPut: async (filepath, data) => {
+      await fsBridge.put(filepath, data);
+    },
+    onDelete: async (filepath) => {
+      await fsBridge.delete(filepath);
+    }
+  };
+  const userGitConfig = `${import_os.default.homedir()}${import_path8.default.sep}.gitconfig`;
+  if (await import_fs_extra6.default.pathExists(userGitConfig)) {
+    const config = import_ini.default.parse(await import_fs_extra6.default.readFile(userGitConfig, "utf-8"));
+    if ((_a = config["user"]) == null ? void 0 : _a["name"]) {
+      options.author.name = config["user"]["name"];
+    }
+    if ((_b = config["user"]) == null ? void 0 : _b["email"]) {
+      options.author.email = config["user"]["email"];
+    }
+  }
+  let repoGitConfig = void 0;
+  if (!options.author.name) {
+    repoGitConfig = import_ini.default.parse(await import_fs_extra6.default.readFile(`${gitRoot}/.git/config`, "utf-8"));
+    if ((_c = repoGitConfig["user"]) == null ? void 0 : _c["name"]) {
+      options.author.name = repoGitConfig["user"]["name"];
+    }
+    if (!options.author.name) {
+      throw new Error('Unable to determine user.name from git config. Hint: `git config --global user.name "John Doe"`');
+    }
+  }
+  if (!options.author.email) {
+    repoGitConfig = repoGitConfig || import_ini.default.parse(await import_fs_extra6.default.readFile(`${gitRoot}/.git/config`, "utf-8"));
+    if ((_d = repoGitConfig["user"]) == null ? void 0 : _d["email"]) {
+      options.author.email = repoGitConfig["user"]["email"];
+    }
+    if (!options.author.email) {
+      throw new Error("Unable to determine user.email from git config. Hint: `git config --global user.email johndoe@example.com`");
+    }
+  }
+  return options;
+}
 async function startServer(_ctx, next, {
   port = 4001,
   noWatch,
   experimentalData,
+  isomorphicGitBridge: isomorphicGitBridge2,
   noSDK,
   noTelemetry,
   watchFolders,
@@ -1925,10 +2018,12 @@ async function startServer(_ctx, next, {
       name: "tinacms:cli:server:start:invoke"
     }
   });
+  const fsBridge = new import_datalayer3.FilesystemBridge(rootPath2);
+  const isomorphicOptions = isomorphicGitBridge2 && await makeIsomorphicOptions(fsBridge);
   if (!process.env.CI && !noWatch) {
     await resetGeneratedFolder();
   }
-  const bridge = new import_datalayer3.FilesystemBridge(rootPath2);
+  const bridge = isomorphicGitBridge2 ? new import_datalayer3.IsomorphicBridge(rootPath2, isomorphicOptions) : fsBridge;
   const store = experimentalData ? new import_datalayer3.LevelStore(rootPath2) : new import_datalayer3.FilesystemStore({ rootPath: rootPath2 });
   const shouldBuild = bridge.supportsBuilding();
   const database = await (0, import_graphql11.createDatabase)({ store, bridge });
@@ -1944,6 +2039,9 @@ async function startServer(_ctx, next, {
         await store.open();
       }
       const cliFlags = [];
+      if (isomorphicGitBridge2) {
+        cliFlags.push("isomorphicGitBridge");
+      }
       const database2 = await (0, import_graphql11.createDatabase)({ store, bridge });
       await compileSchema(null, null, { verbose, dev });
       const schema = await (0, import_graphql11.buildSchema)(rootPath2, database2, cliFlags);
@@ -1955,50 +2053,6 @@ async function startServer(_ctx, next, {
       lock.disable();
     }
   };
-  const state = {
-    server: null,
-    sockets: []
-  };
-  let isReady = false;
-  const start = async () => {
-    await lock.promise;
-    const s = (init_server3(), server_exports);
-    state.server = await s.default(database);
-    state.server.listen(port, () => {
-      const altairUrl = `http://localhost:${port}/altair/`;
-      const cmsUrl = `[your-development-url]/admin`;
-      if (verbose)
-        logger.info(`Started Filesystem GraphQL server on port: ${port}`);
-      logger.info(`Visit the GraphQL playground at ${import_chalk6.default.underline.blueBright(altairUrl)}
-or`);
-      logger.info(`Enter the CMS at ${import_chalk6.default.underline.blueBright(cmsUrl)} 
-`);
-    });
-    state.server.on("error", function(e) {
-      if (e.code === "EADDRINUSE") {
-        logger.error(dangerText(`Port 4001 already in use`));
-        process.exit();
-      }
-      throw e;
-    });
-    state.server.on("connection", (socket) => {
-      state.sockets.push(socket);
-    });
-  };
-  const restart = async () => {
-    logger.info("restarting local server...");
-    delete require.cache[gqlPackageFile];
-    state.sockets.forEach((socket) => {
-      if (socket.destroyed === false) {
-        socket.destroy();
-      }
-    });
-    state.sockets = [];
-    state.server.close(() => {
-      logger.info("Server closed");
-      start();
-    });
-  };
   const foldersToWatch = (watchFolders || []).map((x) => import_path8.default.join(rootPath2, x));
   if (!noWatch && !process.env.CI) {
     import_chokidar.default.watch([
@@ -2030,9 +2084,9 @@ or`);
         try {
           if (shouldBuild) {
             await build2(noSDK);
-            if (isReady) {
-              restart();
-            }
+          }
+          if (isReady) {
+            await restart();
           }
         } catch (e) {
           handleServerErrors(e);
@@ -2050,6 +2104,50 @@ or`);
       await build2(noSDK);
     }
   }
+  const state = {
+    server: null,
+    sockets: []
+  };
+  let isReady = false;
+  const start = async () => {
+    await lock.promise;
+    const s = (init_server3(), server_exports);
+    state.server = await s.default(database);
+    state.server.listen(port, () => {
+      const altairUrl = `http://localhost:${port}/altair/`;
+      const cmsUrl = `[your-development-url]/admin`;
+      if (verbose)
+        logger.info(`Started Filesystem GraphQL server on port: ${port}`);
+      logger.info(`Visit the GraphQL playground at ${import_chalk6.default.underline.blueBright(altairUrl)}
+or`);
+      logger.info(`Enter the CMS at ${import_chalk6.default.underline.blueBright(cmsUrl)} 
+`);
+    });
+    state.server.on("error", function(e) {
+      if (e.code === "EADDRINUSE") {
+        logger.error(dangerText(`Port 4001 already in use`));
+        process.exit();
+      }
+      throw e;
+    });
+    state.server.on("connection", (socket) => {
+      state.sockets.push(socket);
+    });
+  };
+  const restart = async () => {
+    logger.info("restarting local server...");
+    delete require.cache[gqlPackageFile];
+    state.sockets.forEach((socket) => {
+      if (socket.destroyed === false) {
+        socket.destroy();
+      }
+    });
+    state.sockets = [];
+    state.server.close(() => {
+      logger.info("Server closed");
+      start();
+    });
+  };
   if (!noWatch && !process.env.CI) {
     import_chokidar.default.watch([gqlPackageFile]).on("ready", async () => {
       isReady = true;
@@ -2182,6 +2280,10 @@ var experimentalDatalayer = {
   name: "--experimentalData",
   description: "Build the server with additional data querying capabilities"
 };
+var isomorphicGitBridge = {
+  name: "--isomorphicGitBridge",
+  description: "Enable Isomorphic Git Bridge Implementation"
+};
 var schemaFileType = {
   name: "--schemaFileType [fileType]",
   description: "The file type to use for the Tina schema"
@@ -2231,6 +2333,7 @@ var baseCmds = [
       startServerPortOption,
       subCommand,
       experimentalDatalayer,
+      isomorphicGitBridge,
       noWatchOption,
       noSDKCodegenOption,
       noTelemetryOption,
@@ -2246,6 +2349,7 @@ var baseCmds = [
     options: [
       subCommand,
       experimentalDatalayer,
+      isomorphicGitBridge,
       noTelemetryOption,
       verboseOption,
       developmentOption
@@ -2255,18 +2359,28 @@ var baseCmds = [
   {
     command: CMD_COMPILE_MODELS,
     description: "Compile schema into static files for the server",
-    options: [experimentalDatalayer, noTelemetryOption],
+    options: [experimentalDatalayer, isomorphicGitBridge, noTelemetryOption],
     action: (options) => chain([compileSchema], options)
   },
   {
     command: CMD_GEN_TYPES,
     description: "Generate a GraphQL query for your site's schema, (and optionally Typescript types)",
-    options: [experimentalDatalayer, noSDKCodegenOption, noTelemetryOption],
+    options: [
+      experimentalDatalayer,
+      isomorphicGitBridge,
+      noSDKCodegenOption,
+      noTelemetryOption
+    ],
     action: (options) => chain([attachSchema, genTypes], options)
   },
   {
     command: INIT,
-    options: [experimentalDatalayer, noTelemetryOption, schemaFileType],
+    options: [
+      experimentalDatalayer,
+      isomorphicGitBridge,
+      noTelemetryOption,
+      schemaFileType
+    ],
     description: "Add Tina Cloud to an existing project",
     action: (options) => chain([
       checkDeps,

package/dist/server/models/media.d.ts

@@ -12,10 +12,12 @@ limitations under the License.
 */
 interface MediaArgs {
     searchPath: string;
+    cursor?: string;
+    limit?: string;
 }
 interface File {
     src: string;
-    fileName: string;
+    filename: string;
     size: number;
 }
 interface ListMediaRes {
@@ -26,7 +28,7 @@ interface ListMediaRes {
 }
 export interface PathConfig {
     publicFolder: string;
-    syncFolder: string;
+    mediaRoot: string;
 }
 declare type SuccessRecord = {
     ok: true;
@@ -36,8 +38,8 @@ declare type SuccessRecord = {
 };
 export declare class MediaModel {
     readonly publicFolder: string;
-    readonly syncFolder: string;
-    constructor({ publicFolder, syncFolder }: PathConfig);
+    readonly mediaRoot: string;
+    constructor({ publicFolder, mediaRoot }: PathConfig);
     listMedia(args: MediaArgs): Promise<ListMediaRes>;
     deleteMedia(args: MediaArgs): Promise<SuccessRecord>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "0.60.23",
+  "version": "0.60.24",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -21,7 +21,7 @@
     ]
   },
   "devDependencies": {
-    "@tinacms/scripts": "0.50.8",
+    "@tinacms/scripts": "0.50.9",
     "@types/clear": "0.1.0",
     "@types/cors": "2.8.5",
     "@types/express": "^4.17.7",
@@ -58,10 +58,10 @@
     "@graphql-codegen/visitor-plugin-common": "^2.4.0",
     "@graphql-tools/graphql-file-loader": "^7.2.0",
     "@graphql-tools/load": "^7.3.2",
-    "@tinacms/datalayer": "0.1.1",
-    "@tinacms/graphql": "0.60.8",
+    "@tinacms/datalayer": "0.2.0",
+    "@tinacms/graphql": "0.61.0",
     "@tinacms/metrics": "0.0.3",
-    "@tinacms/schema-tools": "0.0.5",
+    "@tinacms/schema-tools": "0.0.6",
     "@yarnpkg/esbuild-plugin-pnp": "^2.0.1-rc.3",
     "add": "^2.0.6",
     "ajv": "^6.12.3",
@@ -80,6 +80,7 @@
     "fast-glob": "^3.2.4",
     "fs-extra": "^9.0.1",
     "graphql": "^15.1.0",
+    "ini": "^3.0.0",
     "js-yaml": "^4.0.0",
     "lodash": "^4.17.19",
     "lodash.get": "^4.4.2",