@tinacms/cli 1.2.1 → 1.3.0

package/dist/cmds/audit/audit.d.ts

@@ -1,9 +1,9 @@
 /**
 
 */
-import type { Database, TinaCloudCollection } from '@tinacms/graphql';
+import type { Database, Collection } from '@tinacms/graphql';
 declare type AuditArgs = {
-    collection: TinaCloudCollection;
+    collection: Collection<true>;
     database: Database;
     rootPath: string;
     documents: {

package/dist/cmds/compile/index.d.ts

@@ -2,7 +2,7 @@
 
 */
 import { Platform } from 'esbuild';
-import type { TinaCloudSchema } from '@tinacms/graphql';
+import type { Schema } from '@tinacms/graphql';
 export declare const resetGeneratedFolder: ({ tinaGeneratedPath, usingTs, isBuild, }: {
     tinaGeneratedPath: string;
     usingTs: boolean;
@@ -21,4 +21,4 @@ export declare const compileSchema: (options: {
     rootPath: string;
 }) => Promise<any>;
 export declare const transpile: (inputFile: any, outputFile: any, tempDir: any, verbose: any, define: any, packageJSONFilePath: string, platform?: Platform) => Promise<void>;
-export declare const defineSchema: (config: TinaCloudSchema) => TinaCloudSchema;
+export declare const defineSchema: (config: Schema) => Schema<false>;

package/dist/cmds/forestry-migrate/index.d.ts

@@ -1,14 +1,14 @@
 /**
 
 */
-import type { TinaCloudCollection, TinaFieldInner } from '@tinacms/schema-tools';
+import type { Collection, TinaField } from '@tinacms/schema-tools';
 export declare const generateAllCollections: ({ rootPath, }: {
     rootPath: string;
 }) => Promise<Map<string, {
-    fields: TinaFieldInner<false>[];
+    fields: TinaField[];
     templateObj: any;
 }>>;
 export declare const generateCollections: ({ forestryPath, rootPath, }: {
     forestryPath: string;
     rootPath: string;
-}) => Promise<TinaCloudCollection<false>[]>;
+}) => Promise<Collection<false>[]>;

package/dist/cmds/forestry-migrate/util/index.d.ts

@@ -2,8 +2,15 @@
 
 */
 import z from 'zod';
-import type { TinaFieldInner } from '@tinacms/schema-tools';
-export declare const stringifyName: (name: string, template: string) => string;
+import type { TinaField } from '@tinacms/schema-tools';
+export declare const getTinaFieldsFromName: (name: string) => {
+    name: string;
+    nameOverride: string;
+} | {
+    name: string;
+    nameOverride?: undefined;
+};
+export declare const stringifyTemplateName: (name: string, template: string) => string;
 declare const forestryFieldWithoutField: z.ZodObject<{
     type: z.ZodUnion<[z.ZodLiteral<"text">, z.ZodLiteral<"datetime">, z.ZodLiteral<"list">, z.ZodLiteral<"file">, z.ZodLiteral<"image_gallery">, z.ZodLiteral<"textarea">, z.ZodLiteral<"tag_list">, z.ZodLiteral<"number">, z.ZodLiteral<"boolean">, z.ZodLiteral<"field_group">, z.ZodLiteral<"field_group_list">, z.ZodLiteral<"select">, z.ZodLiteral<"include">, z.ZodLiteral<"blocks">, z.ZodLiteral<"color">]>;
     template_types: z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>;
@@ -114,13 +121,13 @@ export declare const transformForestryFieldsToTinaFields: ({ fields, rootPath, t
     rootPath: string;
     template: string;
     skipBlocks?: boolean;
-}) => TinaFieldInner<false>[];
+}) => TinaField<false>[];
 export declare const getFieldsFromTemplates: (_args: {
     tem: string;
     rootPath: string;
     skipBlocks?: boolean;
 }) => {
-    fields: TinaFieldInner<false>[];
+    fields: TinaField[];
     templateObj: any;
     template: {
         label?: string;

package/dist/cmds/query-gen/genTypes.d.ts

@@ -2,10 +2,10 @@
 
 */
 import { GraphQLSchema } from 'graphql';
-import { TinaCloudSchema } from '@tinacms/schema-tools';
+import { Schema } from '@tinacms/schema-tools';
 export declare const TINA_HOST = "content.tinajs.io";
 export declare function genClient({ tinaSchema, usingTs, rootPath, }: {
-    tinaSchema: TinaCloudSchema<false>;
+    tinaSchema: Schema;
     usingTs?: boolean;
     rootPath: string;
 }, options: any): Promise<string>;

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

@@ -4,7 +4,7 @@
 import type { Bridge } from '@tinacms/datalayer';
 import type { Database } from '@tinacms/graphql';
 import { ConfigBuilder } from '../../buildTina';
-import type { TinaCloudSchema } from '@tinacms/schema-tools';
+import type { Schema } from '@tinacms/schema-tools';
 interface Options {
     port?: number;
     command?: string;
@@ -22,6 +22,6 @@ export declare function startServer(ctx: {
     database: Database;
     bridge: Bridge;
     usingTs: boolean;
-    schema?: TinaCloudSchema<false>;
+    schema?: Schema;
 }, next: any, { port, noWatch, noSDK, noTelemetry, watchFolders, verbose, dev, }: Options): Promise<void>;
 export {};

package/dist/cmds/statusChecks/checkClientInformation.d.ts

@@ -1,9 +1,6 @@
-/**
-
-*/
 import type { Bridge } from '@tinacms/datalayer';
 import type { Database } from '@tinacms/graphql';
-import type { TinaCloudSchema } from '@tinacms/schema-tools';
+import type { Schema } from '@tinacms/schema-tools';
 import { ConfigBuilder } from '../../buildTina';
 export declare const checkClientInfo: (ctx: {
     builder: ConfigBuilder;
@@ -11,9 +8,25 @@ export declare const checkClientInfo: (ctx: {
     database: Database;
     bridge: Bridge;
     usingTs: boolean;
-    schema?: TinaCloudSchema<false>;
+    schema?: Schema;
     apiUrl: string;
     isSelfHostedDatabase: boolean;
 }, next: any, _options: {
     verbose?: boolean;
 }) => Promise<any>;
+export declare const fetchRemoteGraphqlSchema: ({ url, token, }: {
+    url: string;
+    token?: string;
+}) => Promise<any>;
+export declare const checkGraphqlSchema: (ctx: {
+    builder: ConfigBuilder;
+    rootPath: string;
+    database: Database;
+    bridge: Bridge;
+    usingTs: boolean;
+    schema?: Schema;
+    apiUrl: string;
+    isSelfHostedDatabase: boolean;
+}, next: any, _options: {
+    verbose?: boolean;
+}) => Promise<void>;

package/dist/cmds/statusChecks/waitForIndexing.d.ts

@@ -1,9 +1,9 @@
 /**
 
 */
-import { TinaCloudSchema } from '@tinacms/schema-tools';
+import { Schema } from '@tinacms/schema-tools';
 export declare const waitForDB: (ctx: {
-    schema?: TinaCloudSchema<true>;
+    schema?: Schema<true>;
     apiUrl: string;
     isSelfHostedDatabase?: boolean;
 }, next: any, options: {

package/dist/index.d.ts

@@ -1,6 +1,3 @@
-/**
-
-*/
 export { defineSchema } from './cmds/compile';
-export type { TinaCloudSchema, TinaSchema, TinaCloudCollection, TinaCollection, TinaField, TinaTemplate, } from '@tinacms/graphql';
+export type { Schema, TinaSchema, Collection, TinaTemplate, } from '@tinacms/graphql';
 export declare function init(args: any): Promise<void>;

package/dist/index.js

@@ -304,7 +304,7 @@ var commander = __toModule(require("commander"));
 
 // package.json
 var name = "@tinacms/cli";
-var version = "1.2.1";
+var version = "1.3.0";
 
 // src/cmds/audit/audit.ts
 var import_graphql = __toModule(require("@tinacms/graphql"));
@@ -2065,13 +2065,27 @@ var ErrorSingleton = class {
 
 // src/cmds/forestry-migrate/util/index.ts
 var errorSingletonInstance = ErrorSingleton.getInstance();
-var stringifyName = (name2, template) => {
-  const testRegex = /^[a-zA-Z0-9_]*$/;
-  const updateRegex = /[^a-zA-Z0-9]/g;
-  if (testRegex.test(name2)) {
+var NAME_TEST_REGEX = /^[a-zA-Z0-9_]*$/;
+var NAME_UPDATE_REGEX = /[^a-zA-Z0-9]/g;
+var getTinaFieldsFromName = (name2) => {
+  if (name2 == "id") {
+    return { name: "custom_id", nameOverride: "id" };
+  } else {
+    if (NAME_TEST_REGEX.test(name2)) {
+      return { name: name2 };
+    } else {
+      return {
+        name: name2.replace(NAME_UPDATE_REGEX, "_"),
+        nameOverride: name2
+      };
+    }
+  }
+};
+var stringifyTemplateName = (name2, template) => {
+  if (NAME_TEST_REGEX.test(name2)) {
     return name2;
   } else {
-    const newName = name2.replace(updateRegex, "_");
+    const newName = name2.replace(NAME_UPDATE_REGEX, "_");
     errorSingletonInstance.addErrorName({ name: name2, newName, template });
     return newName;
   }
@@ -2161,98 +2175,98 @@ var transformForestryFieldsToTinaFields = ({
     let field;
     switch (forestryField2.type) {
       case "text":
-        field = {
-          type: "string",
-          name: stringifyName(forestryField2.name, template),
+        field = __spreadProps(__spreadValues({
+          type: "string"
+        }, getTinaFieldsFromName(forestryField2.name)), {
           label: forestryField2.label
-        };
+        });
         break;
       case "textarea":
-        field = {
-          type: "string",
-          name: stringifyName(forestryField2.name, template),
+        field = __spreadProps(__spreadValues({
+          type: "string"
+        }, getTinaFieldsFromName(forestryField2.name)), {
           label: forestryField2.label,
           ui: {
             component: "textarea"
           }
-        };
+        });
         break;
       case "datetime":
-        field = {
-          type: forestryField2.type,
-          name: stringifyName(forestryField2.name, template),
+        field = __spreadProps(__spreadValues({
+          type: forestryField2.type
+        }, getTinaFieldsFromName(forestryField2.name)), {
           label: forestryField2.label
-        };
+        });
         break;
       case "number":
-        field = {
-          type: "number",
-          name: stringifyName(forestryField2.name, template),
+        field = __spreadProps(__spreadValues({
+          type: "number"
+        }, getTinaFieldsFromName(forestryField2.name)), {
           label: forestryField2.label
-        };
+        });
         break;
       case "boolean":
-        field = {
-          type: "boolean",
-          name: stringifyName(forestryField2.name, template),
+        field = __spreadProps(__spreadValues({
+          type: "boolean"
+        }, getTinaFieldsFromName(forestryField2.name)), {
           label: forestryField2.label
-        };
+        });
         break;
       case "color":
-        field = {
-          type: "string",
-          name: stringifyName(forestryField2.name, template),
+        field = __spreadProps(__spreadValues({
+          type: "string"
+        }, getTinaFieldsFromName(forestryField2.name)), {
           label: forestryField2.label,
           ui: {
             component: "color"
           }
-        };
+        });
         break;
       case "file":
-        field = {
-          type: "image",
-          name: stringifyName(forestryField2.name || "image", template),
+        field = __spreadProps(__spreadValues({
+          type: "image"
+        }, getTinaFieldsFromName(forestryField2.name)), {
           label: forestryField2.label
-        };
+        });
         break;
       case "select":
         if ((_a = forestryField2.config) == null ? void 0 : _a.options) {
-          field = {
-            type: "string",
-            name: stringifyName(forestryField2.name, template),
+          field = __spreadProps(__spreadValues({
+            type: "string"
+          }, getTinaFieldsFromName(forestryField2.name)), {
             label: forestryField2.label,
             options: ((_b = forestryField2.config) == null ? void 0 : _b.options) || []
-          };
+          });
         } else {
           logger.info(warnText(`Warning in template ${template}.yaml . "select" field migration has only been implemented for simple select. Other versions of select have not been implemented yet. To make your \`${forestryField2.name}\` field work, you will need to manually add it to your schema.`));
         }
         break;
       case "list":
-        field = {
-          type: "string",
-          name: stringifyName(forestryField2.name, template),
+        field = __spreadProps(__spreadValues({
+          type: "string"
+        }, getTinaFieldsFromName(forestryField2.name)), {
           label: forestryField2.label,
           list: true
-        };
+        });
         if ((_c = forestryField2.config) == null ? void 0 : _c.options) {
           field.options = forestryField2.config.options;
         }
         break;
       case "tag_list":
-        field = {
-          type: "string",
-          name: stringifyName(forestryField2.name, template),
+        field = __spreadProps(__spreadValues({
+          type: "string"
+        }, getTinaFieldsFromName(forestryField2.name)), {
           label: forestryField2.label,
           list: true,
           ui: {
             component: "tags"
           }
-        };
+        });
         break;
       case "field_group":
-        field = {
-          type: "object",
-          name: stringifyName(forestryField2.name, template),
+        field = __spreadProps(__spreadValues({
+          type: "object"
+        }, getTinaFieldsFromName(forestryField2.name)), {
           label: forestryField2.label,
           fields: transformForestryFieldsToTinaFields({
             fields: forestryField2.fields,
@@ -2260,12 +2274,12 @@ var transformForestryFieldsToTinaFields = ({
             template,
             skipBlocks
           })
-        };
+        });
         break;
       case "field_group_list":
-        field = {
-          type: "object",
-          name: stringifyName(forestryField2.name, template),
+        field = __spreadProps(__spreadValues({
+          type: "object"
+        }, getTinaFieldsFromName(forestryField2.name)), {
           label: forestryField2.label,
           list: true,
           fields: transformForestryFieldsToTinaFields({
@@ -2274,7 +2288,7 @@ var transformForestryFieldsToTinaFields = ({
             rootPath: rootPath2,
             skipBlocks
           })
-        };
+        });
         break;
       case "blocks":
         if (skipBlocks)
@@ -2289,17 +2303,17 @@ var transformForestryFieldsToTinaFields = ({
           const t = {
             fields: fields2,
             label: template2.label,
-            name: stringifyName(tem, tem)
+            name: stringifyTemplateName(tem, tem)
           };
           templates.push(t);
         });
-        field = {
+        field = __spreadProps(__spreadValues({
           type: "object",
           list: true,
-          label: forestryField2.label,
-          name: stringifyName(forestryField2.name, template),
+          label: forestryField2.label
+        }, getTinaFieldsFromName(forestryField2.name)), {
           templates
-        };
+        });
         break;
       case "image_gallery":
       case "include":
@@ -2992,6 +3006,8 @@ var attachDatabase = async (ctx, next, _options) => {
 
 // src/cmds/statusChecks/checkClientInformation.ts
 var import_progress2 = __toModule(require("progress"));
+var import_graphql12 = __toModule(require("graphql"));
+var import_core2 = __toModule(require("@graphql-inspector/core"));
 var import_schema_tools2 = __toModule(require("@tinacms/schema-tools"));
 async function request(args) {
   const headers = new Headers();
@@ -3064,6 +3080,56 @@ var checkClientInfo = async (ctx, next, _options) => {
   }
   next();
 };
+var fetchRemoteGraphqlSchema = async ({
+  url,
+  token
+}) => {
+  const headers = new Headers();
+  if (token) {
+    headers.append("X-API-KEY", token);
+  }
+  const body = JSON.stringify({ query: (0, import_graphql12.getIntrospectionQuery)(), variables: {} });
+  headers.append("Content-Type", "application/json");
+  const res = await fetch(url, {
+    method: "POST",
+    headers,
+    body
+  });
+  const data = await res.json();
+  return data == null ? void 0 : data.data;
+};
+var checkGraphqlSchema = async (ctx, next, _options) => {
+  var _a;
+  const bar = new import_progress2.default("Checking local GraphQL Schema matches server. :prog", 1);
+  const config2 = (_a = ctx.schema) == null ? void 0 : _a.config;
+  const token = config2.token;
+  const url = ctx.apiUrl;
+  const remoteSchema = await fetchRemoteGraphqlSchema({
+    url,
+    token
+  });
+  const remoteGqlSchema = (0, import_graphql12.buildClientSchema)(remoteSchema);
+  const localSchemaDocument = await ctx.database.getGraphQLSchemaFromBridge();
+  const localGraphqlSchema = (0, import_graphql12.buildSchema)((0, import_graphql12.print)(localSchemaDocument));
+  const diffResult = await (0, import_core2.diff)(localGraphqlSchema, remoteGqlSchema);
+  if (diffResult.length === 0) {
+    bar.tick({
+      prog: "\u2705"
+    });
+  } else {
+    bar.tick({
+      prog: "\u274C"
+    });
+    let errorMessage = `The local GraphQL schema doesn't match the remote GraphQL schema. Please push up your changes to Github to update your remote GraphQL schema.`;
+    if (config2 == null ? void 0 : config2.branch) {
+      errorMessage += `
+
+Additional info: Branch: ${config2.branch}, Client ID: ${config2.clientId} `;
+    }
+    throw new Error(errorMessage);
+  }
+  next();
+};
 
 // src/cmds/baseCmds.ts
 var CMD_START_SERVER = "server:start";
@@ -3212,6 +3278,7 @@ var baseCmds = [
       buildSetupCmdBuild,
       buildCmdBuild,
       checkClientInfo,
+      checkGraphqlSchema,
       waitForDB,
       indexIntoSelfHostedDatabase
     ], options)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -21,7 +21,7 @@
     ]
   },
   "devDependencies": {
-    "@tinacms/scripts": "1.0.2",
+    "@tinacms/scripts": "1.0.3",
     "@types/clear": "0.1.0",
     "@types/cli-spinner": "^0.2.1",
     "@types/cors": "2.8.5",
@@ -50,13 +50,14 @@
     "@graphql-codegen/typescript-generic-sdk": "^2.1.4",
     "@graphql-codegen/typescript-operations": "^2.1.4",
     "@graphql-codegen/visitor-plugin-common": "^2.4.0",
+    "@graphql-inspector/core": "^4.0.0",
     "@graphql-tools/graphql-file-loader": "^7.2.0",
     "@graphql-tools/load": "^7.3.2",
-    "@tinacms/app": "1.1.0",
-    "@tinacms/datalayer": "1.1.2",
-    "@tinacms/graphql": "1.3.1",
+    "@tinacms/app": "1.1.2",
+    "@tinacms/datalayer": "1.1.4",
+    "@tinacms/graphql": "1.3.3",
     "@tinacms/metrics": "1.0.2",
-    "@tinacms/schema-tools": "1.3.1",
+    "@tinacms/schema-tools": "1.3.3",
     "ajv": "^6.12.3",
     "altair-express-middleware": "4.0.6",
     "auto-bind": "^4.0.0",
@@ -78,8 +79,8 @@
     "lodash": "^4.17.19",
     "lodash.get": "^4.4.2",
     "log4js": "^6.4.0",
-    "memory-level": "^1.0.0",
     "many-level": "^2.0.0",
+    "memory-level": "^1.0.0",
     "minimatch": "^5.1.2",
     "multer": "1.4.5-lts.1",
     "normalize-path": "^3.0.0",