@tinacms/graphql 2.4.2 → 2.4.4

package/dist/database/datalayer.d.ts

@@ -41,6 +41,7 @@ export type IndexDefinition = {
 export type PadDefinition = {
     fillString: string;
     maxLength: number;
+    decimalPrecision?: number;
 };
 export type FilterOperand = string | number | boolean | string[] | number[];
 export type FilterCondition = {
@@ -53,6 +54,8 @@ export declare const REFS_COLLECTIONS_SORT_KEY = "__refs__";
 export declare const REFS_REFERENCE_FIELD = "__tina_ref__";
 export declare const REFS_PATH_FIELD = "__tina_ref_path__";
 export declare const DEFAULT_NUMERIC_LPAD = 4;
+export declare const DEFAULT_NUMERIC_DECIMAL_PRECISION = 3;
+export declare const DEFAULT_NUMERIC_PAD: PadDefinition;
 export declare const coerceFilterChainOperands: (filterChain: (BinaryFilter | TernaryFilter)[], escapeString?: StringEscaper) => (BinaryFilter | TernaryFilter)[];
 export declare const makeFilter: ({ filterChain, }: {
     filterChain?: (BinaryFilter | TernaryFilter)[];

package/dist/index.js

@@ -3028,14 +3028,31 @@ var validateField = async (field) => {
   });
   await schema.validate(field);
   const validField = await schema.cast(field);
+  assertCheckboxGroupIsList(validField);
   return validField;
 };
+var assertCheckboxGroupIsList = (field) => {
+  if (field.ui?.component === "checkbox-group" && !field.list) {
+    throw new Error(
+      `Field "${field.name}" uses "checkbox-group" without list: true at ${field.namespace.join(
+        "."
+      )}. Add list: true or use "select" instead.`
+    );
+  }
+  if (field.type === "object" || field.type === "rich-text") {
+    const nested = [
+      ...field.type === "object" ? field.fields ?? [] : [],
+      ...(field.templates ?? []).flatMap((template) => template.fields ?? [])
+    ];
+    nested.forEach(assertCheckboxGroupIsList);
+  }
+};
 
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
   type: "module",
-  version: "2.4.2",
+  version: "2.4.4",
   main: "dist/index.js",
   module: "./dist/index.js",
   files: [
@@ -3808,14 +3825,39 @@ var REFS_COLLECTIONS_SORT_KEY = "__refs__";
 var REFS_REFERENCE_FIELD = "__tina_ref__";
 var REFS_PATH_FIELD = "__tina_ref_path__";
 var DEFAULT_NUMERIC_LPAD = 4;
+var DEFAULT_NUMERIC_DECIMAL_PRECISION = 3;
+var DEFAULT_NUMERIC_PAD = {
+  fillString: "0",
+  maxLength: DEFAULT_NUMERIC_LPAD + 1 + DEFAULT_NUMERIC_DECIMAL_PRECISION,
+  decimalPrecision: DEFAULT_NUMERIC_DECIMAL_PRECISION
+};
+var ensureUTC = (value) => {
+  const s = String(value);
+  if (s.includes("T") && !/[Zz]|[+-]\d{2}:\d{2}$/.test(s)) {
+    return `${s}Z`;
+  }
+  return s;
+};
+var parseDatetimeUTC = (value) => {
+  const n = Number(value);
+  const d = Number.isNaN(n) ? new Date(ensureUTC(String(value))) : new Date(n);
+  return Number.isNaN(d.getTime()) ? String(value) : d.toISOString();
+};
+var padValue = (val, pad) => {
+  if (pad.decimalPrecision !== void 0) {
+    const n = Number(val);
+    if (!Number.isNaN(n)) {
+      return n.toFixed(pad.decimalPrecision).padStart(pad.maxLength, pad.fillString);
+    }
+  }
+  return String(val).padStart(pad.maxLength, pad.fillString);
+};
 var applyPadding = (input, pad) => {
   if (pad) {
     if (Array.isArray(input)) {
-      return input.map(
-        (val) => String(val).padStart(pad.maxLength, pad.fillString)
-      );
+      return input.map((val) => padValue(val, pad));
     } else {
-      return String(input).padStart(pad.maxLength, pad.fillString);
+      return padValue(input, pad);
     }
   }
   return input;
@@ -3854,7 +3896,7 @@ var makeKeyForField = (definition, data, stringEscaper2, maxStringLength = 100)
       const rawValue = data[field.name];
       let resolvedValue;
       if (field.type === "datetime") {
-        resolvedValue = String(new Date(rawValue).getTime());
+        resolvedValue = parseDatetimeUTC(rawValue);
       } else {
         if (field.type === "string") {
           const escapedString = stringEscaper2(rawValue);
@@ -3885,23 +3927,23 @@ var coerceFilterChainOperands = (filterChain, escapeString = stringEscaper) => {
         if (filter.leftOperand !== void 0) {
           result.push({
             ...filter,
-            rightOperand: new Date(filter.rightOperand).getTime(),
-            leftOperand: new Date(
+            rightOperand: parseDatetimeUTC(filter.rightOperand),
+            leftOperand: parseDatetimeUTC(
               filter.leftOperand
-            ).getTime()
+            )
           });
         } else {
           if (Array.isArray(filter.rightOperand)) {
             result.push({
               ...filter,
               rightOperand: filter.rightOperand.map(
-                (operand) => new Date(operand).getTime()
+                (operand) => parseDatetimeUTC(operand)
               )
             });
           } else {
             result.push({
               ...filter,
-              rightOperand: new Date(filter.rightOperand).getTime()
+              rightOperand: parseDatetimeUTC(filter.rightOperand)
             });
           }
         }
@@ -4046,13 +4088,11 @@ var makeFilter = ({
       } else if (dataType === "datetime") {
         operands = resolvedValues.map((resolvedValue) => {
           if (isList) {
-            return resolvedValue.map((listValue) => {
-              const coerced2 = new Date(listValue).getTime();
-              return isNaN(coerced2) ? Number(listValue) : coerced2;
-            });
+            return resolvedValue.map(
+              (listValue) => parseDatetimeUTC(listValue)
+            );
           }
-          const coerced = new Date(resolvedValue).getTime();
-          return isNaN(coerced) ? Number(resolvedValue) : coerced;
+          return parseDatetimeUTC(resolvedValue);
         });
       } else if (dataType === "boolean") {
         operands = resolvedValues.map((resolvedValue) => {
@@ -4138,7 +4178,7 @@ var makeFilterChain = ({
         rightOperand: filterExpression[key1],
         operator: inferOperatorFromFilter(key1),
         type: _type,
-        pad: _type === "number" ? { fillString: "0", maxLength: DEFAULT_NUMERIC_LPAD } : void 0
+        pad: _type === "number" ? DEFAULT_NUMERIC_PAD : void 0
       });
     } else if (key1 && key2) {
       const leftFilterOperator = getFilterOperator(filterExpression, "gt") || getFilterOperator(filterExpression, "gte") || getFilterOperator(filterExpression, "after") || void 0;
@@ -4161,7 +4201,7 @@ var makeFilterChain = ({
           leftOperator: inferOperatorFromFilter(leftFilterOperator),
           rightOperator: inferOperatorFromFilter(rightFilterOperator),
           type: _type,
-          pad: _type === "number" ? { fillString: "0", maxLength: DEFAULT_NUMERIC_LPAD } : void 0
+          pad: _type === "number" ? DEFAULT_NUMERIC_PAD : void 0
         });
       } else {
         throw new Error(
@@ -7292,7 +7332,7 @@ var Database = class {
                       name: field.name,
                       type: field.type,
                       list: !!field.list,
-                      pad: field.type === "number" ? { fillString: "0", maxLength: DEFAULT_NUMERIC_LPAD } : void 0
+                      pad: field.type === "number" ? DEFAULT_NUMERIC_PAD : void 0
                     }
                   ]
                 };
@@ -7308,7 +7348,8 @@ var Database = class {
                     return {
                       name: indexField.name,
                       type: field?.type,
-                      list: !!field?.list
+                      list: !!field?.list,
+                      pad: field?.type === "number" ? DEFAULT_NUMERIC_PAD : void 0
                     };
                   })
                 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tinacms/graphql",
   "type": "module",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "main": "dist/index.js",
   "module": "./dist/index.js",
   "files": [
@@ -43,8 +43,8 @@
     "normalize-path": "^3.0.0",
     "readable-stream": "^4.7.0",
     "yup": "^1.6.1",
-    "@tinacms/schema-tools": "2.8.0",
-    "@tinacms/mdx": "2.1.5"
+    "@tinacms/mdx": "2.1.6",
+    "@tinacms/schema-tools": "2.8.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -72,7 +72,7 @@
     "vite": "^4.5.9",
     "vitest": "^0.32.4",
     "zod": "^3.24.2",
-    "@tinacms/schema-tools": "2.8.0",
+    "@tinacms/schema-tools": "2.8.1",
     "@tinacms/scripts": "1.6.1"
   },
   "scripts": {