@tinacms/cli 2.4.2 → 2.4.3

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

@@ -1,6 +1,6 @@
 import type { Collection, TinaField, ContentFrontmatterFormat } from '@tinacms/schema-tools';
-export declare const stringifyLabel: (label: string) => string;
-export declare const stringifyLabelWithField: (label: string) => string;
+import { stringifyLabel, stringifyLabelWithField } from './util/naming';
+export { stringifyLabel, stringifyLabelWithField };
 export declare const generateAllTemplates: ({ pathToForestryConfig, }: {
     pathToForestryConfig: string;
 }) => Promise<Map<string, {

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

@@ -3,9 +3,9 @@ import { TinaField } from '@tinacms/schema-tools';
  * This function is used to replace the internal code with the actual code
  *
  * EX:
- *  __TINA_INTERNAL__:::...fields::: => ...fields
+ *  <marker>...fields()<marker> => ...fields()
  *
- * or __TINA_INTERNAL__:::fields::: => fields
+ * or <marker>fields()<marker> => fields()
  */
 export declare const addVariablesToCode: (codeWithTinaPrefix: string) => {
     code: string;

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

@@ -11,8 +11,8 @@ export declare const stringifyTemplateName: (name: string, template: 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">>>;
-    name: z.ZodString;
-    label: z.ZodString;
+    name: z.ZodEffects<z.ZodString, string, string>;
+    label: z.ZodEffects<z.ZodString, string, string>;
     default: z.ZodOptional<z.ZodAny>;
     template: z.ZodOptional<z.ZodString>;
     config: z.ZodOptional<z.ZodObject<{
@@ -104,7 +104,7 @@ interface ForestryFieldType extends ForestryFieldWithoutFieldType {
     fields?: ForestryFieldType[];
 }
 declare const FrontmatterTemplateSchema: z.ZodObject<{
-    label: z.ZodString;
+    label: z.ZodEffects<z.ZodString, string, string>;
     hide_body: z.ZodOptional<z.ZodBoolean>;
     fields: z.ZodOptional<z.ZodArray<z.ZodType<ForestryFieldType, z.ZodTypeDef, ForestryFieldType>, "many">>;
 }, "strip", z.ZodTypeAny, {

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

@@ -0,0 +1,3 @@
+export declare const stringifyLabel: (label: string) => string;
+export declare const stringifyLabelWithField: (label: string) => string;
+export declare const isForestrySafeString: (value: string) => boolean;

package/dist/index.js

@@ -2,7 +2,7 @@
 import { Cli, Builtins } from "clipanion";
 
 // package.json
-var version = "2.4.2";
+var version = "2.4.3";
 
 // src/next/commands/dev-command/index.ts
 import path10 from "path";
@@ -5106,14 +5106,26 @@ var ErrorSingleton = class _ErrorSingleton {
   }
 };
 
+// src/cmds/forestry-migrate/util/naming.ts
+var stringifyLabel = (label) => {
+  return label.replace(/[^a-zA-Z0-9]/g, "_").toLowerCase();
+};
+var stringifyLabelWithField = (label) => {
+  const labelString = stringifyLabel(label);
+  return `${labelString}Fields`;
+};
+var isForestrySafeString = (value) => !/[\x00\r\n]/.test(value);
+
 // src/cmds/forestry-migrate/util/codeTransformer.ts
+import crypto3 from "crypto";
 import { format } from "prettier";
 import TsParser from "prettier/parser-typescript.js";
+var INTERNAL_NONCE = crypto3.randomBytes(16).toString("hex");
+var MARKER_OPEN = `__TINA_INTERNAL_${INTERNAL_NONCE}__:::`;
+var MARKER_CLOSE = `:::__TINA_INTERNAL_${INTERNAL_NONCE}__`;
+var MARKER_REGEX = new RegExp(`"${MARKER_OPEN}(.*?)${MARKER_CLOSE}"`, "g");
 var addVariablesToCode = (codeWithTinaPrefix) => {
-  const code = codeWithTinaPrefix.replace(
-    /"__TINA_INTERNAL__:::(.*?):::"/g,
-    "$1"
-  );
+  const code = codeWithTinaPrefix.replace(MARKER_REGEX, "$1");
   return { code };
 };
 var makeFieldsWithInternalCode = ({
@@ -5123,10 +5135,10 @@ var makeFieldsWithInternalCode = ({
   spread
 }) => {
   if (hasBody) {
-    return [bodyField, `__TINA_INTERNAL__:::...${field}():::`];
+    return [bodyField, `${MARKER_OPEN}...${field}()${MARKER_CLOSE}`];
   } else {
-    if (spread) return `__TINA_INTERNAL__:::...${field}():::`;
-    return `__TINA_INTERNAL__:::${field}():::`;
+    if (spread) return `${MARKER_OPEN}...${field}()${MARKER_CLOSE}`;
+    return `${MARKER_OPEN}${field}()${MARKER_CLOSE}`;
   }
 };
 var makeTemplateFile = async ({
@@ -5187,6 +5199,9 @@ var stringifyTemplateName = (name2, template) => {
     return newName;
   }
 };
+var forestrySafeString = z2.string().refine(isForestrySafeString, {
+  message: "Forestry name/label contains an unexpected control character"
+});
 var forestryConfigSchema = z2.object({
   sections: z2.array(
     z2.object({
@@ -5228,8 +5243,8 @@ var forestryFieldWithoutField = z2.object({
     z2.literal("color")
   ]),
   template_types: z2.array(z2.string()).optional().nullable(),
-  name: z2.string(),
-  label: z2.string(),
+  name: forestrySafeString,
+  label: forestrySafeString,
   default: z2.any().optional(),
   template: z2.string().optional(),
   config: z2.object({
@@ -5260,7 +5275,7 @@ var forestryField = z2.lazy(
   })
 );
 var FrontmatterTemplateSchema = z2.object({
-  label: z2.string(),
+  label: forestrySafeString,
   hide_body: z2.boolean().optional(),
   fields: z2.array(forestryField).optional()
 });
@@ -5531,13 +5546,6 @@ var BODY_FIELD = {
   description: "This is the markdown body",
   isBody: true
 };
-var stringifyLabel = (label) => {
-  return label.replace(/[^a-zA-Z0-9]/g, "_").toLowerCase();
-};
-var stringifyLabelWithField = (label) => {
-  const labelString = stringifyLabel(label);
-  return `${labelString}Fields`;
-};
 var transformForestryMatchToTinaMatch = (match) => {
   const newMatch = match.replace(" ", "").replace(/\.?(mdx|md|json|yaml|yml|toml)/g, "")?.replace(/\..*$/g, "")?.replace("{}", "");
   if (match !== newMatch) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tinacms/cli",
   "type": "module",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -92,12 +92,12 @@
     "vite": "^4.5.9",
     "yup": "^1.6.1",
     "zod": "^3.24.2",
-    "@tinacms/app": "2.5.2",
+    "@tinacms/app": "2.5.3",
     "@tinacms/graphql": "2.4.3",
-    "@tinacms/search": "1.2.17",
-    "tinacms": "3.8.4",
     "@tinacms/metrics": "2.1.0",
-    "@tinacms/schema-tools": "2.8.1"
+    "@tinacms/schema-tools": "2.8.1",
+    "@tinacms/search": "1.2.17",
+    "tinacms": "3.9.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"