@tinacms/cli 0.61.0 → 0.61.3

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

@@ -20,6 +20,11 @@ export declare const compileClient: (ctx: any, next: any, options: {
     verbose?: boolean;
     dev?: boolean;
 }) => Promise<any>;
+export declare const compileFile: (ctx: any, _next: any, options: {
+    schemaFileType?: string;
+    verbose?: boolean;
+    dev?: boolean;
+}, fileName: string) => Promise<{}>;
 export declare const compileSchema: (ctx: any, _next: any, options: {
     schemaFileType?: string;
     verbose?: boolean;

package/dist/index.js

@@ -293,7 +293,7 @@ var commander = __toModule(require("commander"));
 
 // package.json
 var name = "@tinacms/cli";
-var version = "0.61.0";
+var version = "0.61.3";
 
 // src/cmds/audit/audit.ts
 var import_graphql = __toModule(require("@tinacms/graphql"));
@@ -1152,6 +1152,9 @@ var chain = async (cmds, options) => {
 // src/cmds/baseCmds.ts
 var import_chalk7 = __toModule(require("chalk"));
 
+// src/cmds/compile/index.ts
+var _ = __toModule(require("lodash"));
+
 // src/cmds/start-server/errors/index.ts
 var import_graphql3 = __toModule(require("@tinacms/graphql"));
 var BuildSchemaError = class extends Error {
@@ -1313,12 +1316,6 @@ var getPath = ({
   }
   return inputFile;
 };
-var getSchemaPath = ({ projectDir }) => {
-  const filename = "schema";
-  const allowedTypes = ["js", "jsx", "ts", "tsx"];
-  const errorMessage = "Must provide a `.tina/schema.{ts,js,tsx,jsx}`";
-  return getPath({ projectDir, filename, allowedTypes, errorMessage });
-};
 var getClientPath = ({ projectDir }) => {
   const filename = "client";
   const allowedTypes = ["js", "ts"];
@@ -1332,19 +1329,18 @@ var resetGeneratedFolder = async ({
   usingTs
 }) => {
   try {
-    await import_fs_extra3.default.rm(tinaGeneratedPath, {
-      recursive: true
-    });
+    await import_fs_extra3.default.emptyDir(tinaGeneratedPath);
   } catch (e) {
     console.log(e);
   }
-  await import_fs_extra3.default.mkdir(tinaGeneratedPath);
+  await import_fs_extra3.default.mkdirp(tinaGeneratedPath);
   const ext = usingTs ? "ts" : "js";
   await import_fs_extra3.default.writeFile(import_path4.default.join(tinaGeneratedPath, `types.${ext}`), `
 export const queries = (client)=>({})
 `);
   await import_fs_extra3.default.writeFile(import_path4.default.join(tinaGeneratedPath, `client.${ext}`), `
-export const client = {}
+export const client = ()=>{}
+export default client
 `);
   await import_fs_extra3.default.outputFile(import_path4.default.join(tinaGeneratedPath, ".gitignore"), `db
 client.ts
@@ -1429,7 +1425,7 @@ var compileClient = async (ctx, next, options) => {
   }
   return next();
 };
-var compileSchema = async (ctx, _next, options) => {
+var compileFile = async (ctx, _next, options, fileName) => {
   const root2 = ctx.rootPath;
   if (!root2) {
     throw new Error("ctx.rootPath has not been attached");
@@ -1437,15 +1433,14 @@ var compileSchema = async (ctx, _next, options) => {
   const tinaPath = import_path4.default.join(root2, ".tina");
   const tsConfigPath = import_path4.default.join(root2, "tsconfig.json");
   const tinaGeneratedPath = import_path4.default.join(tinaPath, "__generated__");
-  const tinaTempPath = import_path4.default.join(tinaGeneratedPath, "temp_schema");
-  const tinaConfigPath = import_path4.default.join(tinaGeneratedPath, "config");
+  const tinaTempPath = import_path4.default.join(tinaGeneratedPath, `temp_${fileName}`);
   const packageJSONFilePath = import_path4.default.join(root2, "package.json");
   if (!options.schemaFileType) {
     const usingTs = await import_fs_extra3.default.pathExists(tsConfigPath);
     options = __spreadProps(__spreadValues({}, options), { schemaFileType: usingTs ? "ts" : "js" });
   }
   if (options.verbose) {
-    logger.info(logText("Compiling Schema..."));
+    logger.info(logText(`Compiling ${fileName}...`));
   }
   const { schemaFileType: requestedSchemaFileType = "ts" } = options;
   const schemaFileType2 = (requestedSchemaFileType === "ts" || requestedSchemaFileType === "tsx") && "ts" || (requestedSchemaFileType === "js" || requestedSchemaFileType === "jsx") && "js";
@@ -1457,11 +1452,16 @@ var compileSchema = async (ctx, _next, options) => {
   }
   let schemaExists = true;
   try {
-    getSchemaPath({ projectDir: tinaPath });
+    getPath({
+      projectDir: tinaPath,
+      filename: fileName,
+      allowedTypes: ["js", "jsx", "tsx", "ts"],
+      errorMessage: `Must provide a ${fileName}.{js,jsx,tsx,ts}`
+    });
   } catch {
     schemaExists = false;
   }
-  if (!schemaExists) {
+  if (!schemaExists && fileName === "schema") {
     logger.info(dangerText(`
       .tina/schema.${schemaFileType2} not found, Creating one for you...
       See Documentation: https://tina.io/docs/tina-cloud/cli/#getting-started"
@@ -1475,8 +1475,13 @@ var compileSchema = async (ctx, _next, options) => {
     if (!process.env.NODE_ENV) {
       define["process.env.NODE_ENV"] = options.dev ? '"development"' : '"production"';
     }
-    const inputFile = getSchemaPath({ projectDir: tinaPath });
-    await transpile(inputFile, "schema.js", tinaTempPath, options.verbose, define, packageJSONFilePath);
+    const inputFile = getPath({
+      projectDir: tinaPath,
+      filename: fileName,
+      allowedTypes: ["js", "jsx", "tsx", "ts"],
+      errorMessage: `Must provide a ${fileName}.{js,jsx,tsx,ts}`
+    });
+    await transpile(inputFile, `${fileName}.js`, tinaTempPath, options.verbose, define, packageJSONFilePath);
   } catch (e) {
     await cleanup({ tinaTempPath });
     throw new BuildSchemaError(e);
@@ -1486,11 +1491,10 @@ var compileSchema = async (ctx, _next, options) => {
       delete require.cache[require.resolve(key)];
     }
   });
+  let returnObject = {};
   try {
-    const schemaFunc = require(import_path4.default.join(tinaTempPath, "schema.js"));
-    const schemaObject = schemaFunc.default;
-    ctx.schema = schemaObject;
-    await import_fs_extra3.default.outputFile(import_path4.default.join(tinaConfigPath, "schema.json"), JSON.stringify(schemaObject, null, 2));
+    const schemaFunc = require(import_path4.default.join(tinaTempPath, `${fileName}.js`));
+    returnObject = schemaFunc.default;
     await cleanup({ tinaTempPath });
   } catch (e) {
     await cleanup({ tinaTempPath });
@@ -1501,6 +1505,25 @@ var compileSchema = async (ctx, _next, options) => {
     }
     throw new ExecuteSchemaError(e);
   }
+  return returnObject;
+};
+var compileSchema = async (ctx, _next, options) => {
+  const root2 = ctx.rootPath;
+  const tinaPath = import_path4.default.join(root2, ".tina");
+  const tinaGeneratedPath = import_path4.default.join(tinaPath, "__generated__");
+  const tinaConfigPath = import_path4.default.join(tinaGeneratedPath, "config");
+  let schema = await compileFile(ctx, _next, options, "schema");
+  try {
+    const config = await compileFile(ctx, _next, options, "config");
+    const configCopy = _.cloneDeep(config);
+    delete configCopy.schema;
+    if (config == null ? void 0 : config.schema) {
+      schema = __spreadProps(__spreadValues({}, config.schema), { config: configCopy });
+    }
+  } catch (e) {
+  }
+  ctx.schema = schema;
+  await import_fs_extra3.default.outputFile(import_path4.default.join(tinaConfigPath, `schema.json`), JSON.stringify(schema, null, 2));
 };
 var transpile = async (inputFile, outputFile, tempDir, verbose, define, packageJSONFilePath) => {
   if (verbose)
@@ -1913,6 +1936,30 @@ async function makeIsomorphicOptions(fsBridge) {
   return options;
 }
 
+// src/buildTina/index.ts
+var import_app = __toModule(require("@tinacms/app"));
+
+// src/utils/spinner.ts
+var import_cli_spinner = __toModule(require("cli-spinner"));
+async function spin({
+  waitFor,
+  text
+}) {
+  const spinner = new import_cli_spinner.Spinner({
+    text: `${text} %s`,
+    stream: process.stderr,
+    onTick: function(msg) {
+      this.clearLine(this.stream);
+      this.stream.write(msg);
+    }
+  });
+  spinner.setSpinnerString("\u280B\u2819\u2839\u2838\u283C\u2834\u2826\u2827\u2807\u280F");
+  spinner.start();
+  const res = await waitFor();
+  spinner.stop();
+  return res;
+}
+
 // src/buildTina/index.ts
 var buildSetupCmdBuild = async (ctx, next, opts) => {
   const rootPath2 = ctx.rootPath;
@@ -2000,6 +2047,7 @@ var build2 = async ({
   noSDK,
   skipIndex
 }) => {
+  var _a, _b;
   const rootPath2 = ctx.rootPath;
   if (!rootPath2) {
     throw new Error("Root path has not been attached");
@@ -2032,6 +2080,21 @@ var build2 = async ({
     }, {
       local
     });
+    if ((_b = (_a = ctx.schema) == null ? void 0 : _a.config) == null ? void 0 : _b.build) {
+      await spin({
+        text: "Building static site",
+        waitFor: async () => {
+          var _a2, _b2, _c, _d, _e, _f;
+          await (0, import_app.viteBuild)({
+            local,
+            rootPath: rootPath2,
+            outputFolder: (_c = (_b2 = (_a2 = ctx.schema) == null ? void 0 : _a2.config) == null ? void 0 : _b2.build) == null ? void 0 : _c.outputFolder,
+            publicFolder: (_f = (_e = (_d = ctx.schema) == null ? void 0 : _d.config) == null ? void 0 : _e.build) == null ? void 0 : _f.publicFolder
+          });
+        }
+      });
+      console.log("\nDone building static site");
+    }
   } catch (error) {
     throw error;
   } finally {
@@ -2444,7 +2507,7 @@ var baseCmds = [
     ],
     action: (options) => chain([
       attachPath,
-      async (ctx, next, _) => {
+      async (ctx, next, _2) => {
         logger.warn(warnText("server:start will be deprecated in the future, please use `tinacms dev` instead"));
         next();
       },

package/dist/lib/getPath.d.ts

@@ -10,9 +10,17 @@ 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 GetPathParams {
+    projectDir: string;
+    filename: string;
+    allowedTypes: string[];
+    errorMessage: string;
+}
+export declare const getPath: ({ projectDir, filename, allowedTypes, errorMessage, }: GetPathParams) => any;
 export declare const getSchemaPath: ({ projectDir }: {
     projectDir: string;
 }) => any;
 export declare const getClientPath: ({ projectDir }: {
     projectDir: string;
 }) => any;
+export {};

package/dist/utils/spinner.d.ts

@@ -10,6 +10,7 @@ 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.
 */
-export declare function spin<T>({ waitFor }: {
+export declare function spin<T>({ waitFor, text, }: {
     waitFor: () => Promise<T>;
+    text: string;
 }): Promise<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "0.61.0",
+  "version": "0.61.3",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -21,7 +21,7 @@
     ]
   },
   "devDependencies": {
-    "@tinacms/scripts": "0.50.9",
+    "@tinacms/scripts": "0.51.0",
     "@types/clear": "0.1.0",
     "@types/cli-spinner": "^0.2.1",
     "@types/cors": "2.8.5",
@@ -52,10 +52,11 @@
     "@graphql-codegen/visitor-plugin-common": "^2.4.0",
     "@graphql-tools/graphql-file-loader": "^7.2.0",
     "@graphql-tools/load": "^7.3.2",
+    "@tinacms/app": "0.0.5",
     "@tinacms/datalayer": "0.2.2",
-    "@tinacms/graphql": "0.62.0",
+    "@tinacms/graphql": "0.63.1",
     "@tinacms/metrics": "0.0.3",
-    "@tinacms/schema-tools": "0.0.9",
+    "@tinacms/schema-tools": "0.1.0",
     "add": "^2.0.6",
     "ajv": "^6.12.3",
     "altair-express-middleware": "4.0.6",