zitejs 0.9.69 → 0.9.70

package/dist/cjs/sync/lib.js

@@ -26,8 +26,8 @@ const FIELD_TYPE_MAP = {
     single_select: "string",
     multiple_select: "string[]",
     checkbox: "boolean",
-    date: "string",
-    datetime: "string",
+    date: "string | null",
+    datetime: "string | null",
     attachments: "Array<{ url: string; name?: string }>",
     linked_record: "string | string[]",
     lookup: "unknown",
@@ -54,14 +54,31 @@ const DURATION_FORMAT_EXAMPLES = {
     "h:mm:ss.sss": "1:23:03.000",
 };
 function toPascalCase(name) {
-    return name
+    const pascal = name
         .replace(/[^a-zA-Z0-9]+(.)/g, (_, c) => c.toUpperCase())
-        .replace(/^(.)/, (_, c) => c.toUpperCase());
+        .replace(/^(.)/, (_, c) => c.toUpperCase())
+        // Drop leftover non-alphanumerics (e.g. a trailing ">" from "</p>") so the
+        // sdkName is always a valid identifier in .zite/db.ts.
+        .replace(/[^a-zA-Z0-9]+/g, "");
+    if (!pascal)
+        return "_";
+    return /^[0-9]/.test(pascal) ? `_${pascal}` : pascal; // can't start with a digit
 }
 function toCamelCase(name) {
     const pascal = toPascalCase(name);
     return pascal.charAt(0).toLowerCase() + pascal.slice(1);
 }
+/**
+ * Existing sdkNames are preserved across syncs so user code keeps compiling,
+ * but schemas written before the sanitizer stripped trailing symbols can carry
+ * invalid identifiers (e.g. "timeSeconds)"). Keep an existing name only when
+ * it's a valid identifier; otherwise fall through to recomputing it.
+ */
+function keepValidSdkName(sdkName) {
+    if (!sdkName)
+        return undefined;
+    return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(sdkName) ? sdkName : undefined;
+}
 function tsTypeForSchemaField(def) {
     if (def.type === "single_select" || def.type === "multiple_select") {
         const options = def.template
@@ -104,11 +121,11 @@ function fieldJsdoc(schemaField, table) {
     if (def.type === "date") {
         const tpl = def.template;
         if (tpl.dateFormat)
-            parts.push(`Date-only field (YYYY-MM-DD string), display as "${tpl.dateFormat}" format`);
+            parts.push(`Date-only field (YYYY-MM-DD string), null when unset, display as "${tpl.dateFormat}" format`);
     }
     if (def.type === "datetime") {
         const tpl = def.template;
-        const timeParts = ["Date+time field (ISO 8601 timestamp)"];
+        const timeParts = ["Date+time field (ISO 8601 timestamp), null when unset"];
         if (tpl.dateFormat)
             timeParts.push(`date: ${tpl.dateFormat}`);
         if (tpl.timeFormat)
@@ -192,13 +209,13 @@ function generateSchema(database, existingSchema) {
             const { id: _id, order: _order, ...definition } = field;
             fields.push({
                 id: field.id,
-                sdkName: existing?.sdkName ?? toCamelCase(field.name),
+                sdkName: keepValidSdkName(existing?.sdkName) ?? toCamelCase(field.name),
                 definition,
             });
         }
         tables.push({
             id: table.id,
-            sdkName: existingTable?.sdkName ?? toCamelCase(table.name),
+            sdkName: keepValidSdkName(existingTable?.sdkName) ?? toCamelCase(table.name),
             primaryFieldId: table.primaryFieldId,
             fields,
         });

package/dist/esm/sync/lib.js

@@ -14,8 +14,8 @@ const FIELD_TYPE_MAP = {
     single_select: "string",
     multiple_select: "string[]",
     checkbox: "boolean",
-    date: "string",
-    datetime: "string",
+    date: "string | null",
+    datetime: "string | null",
     attachments: "Array<{ url: string; name?: string }>",
     linked_record: "string | string[]",
     lookup: "unknown",
@@ -42,14 +42,31 @@ const DURATION_FORMAT_EXAMPLES = {
     "h:mm:ss.sss": "1:23:03.000",
 };
 export function toPascalCase(name) {
-    return name
+    const pascal = name
         .replace(/[^a-zA-Z0-9]+(.)/g, (_, c) => c.toUpperCase())
-        .replace(/^(.)/, (_, c) => c.toUpperCase());
+        .replace(/^(.)/, (_, c) => c.toUpperCase())
+        // Drop leftover non-alphanumerics (e.g. a trailing ">" from "</p>") so the
+        // sdkName is always a valid identifier in .zite/db.ts.
+        .replace(/[^a-zA-Z0-9]+/g, "");
+    if (!pascal)
+        return "_";
+    return /^[0-9]/.test(pascal) ? `_${pascal}` : pascal; // can't start with a digit
 }
 export function toCamelCase(name) {
     const pascal = toPascalCase(name);
     return pascal.charAt(0).toLowerCase() + pascal.slice(1);
 }
+/**
+ * Existing sdkNames are preserved across syncs so user code keeps compiling,
+ * but schemas written before the sanitizer stripped trailing symbols can carry
+ * invalid identifiers (e.g. "timeSeconds)"). Keep an existing name only when
+ * it's a valid identifier; otherwise fall through to recomputing it.
+ */
+function keepValidSdkName(sdkName) {
+    if (!sdkName)
+        return undefined;
+    return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(sdkName) ? sdkName : undefined;
+}
 function tsTypeForSchemaField(def) {
     if (def.type === "single_select" || def.type === "multiple_select") {
         const options = def.template
@@ -92,11 +109,11 @@ function fieldJsdoc(schemaField, table) {
     if (def.type === "date") {
         const tpl = def.template;
         if (tpl.dateFormat)
-            parts.push(`Date-only field (YYYY-MM-DD string), display as "${tpl.dateFormat}" format`);
+            parts.push(`Date-only field (YYYY-MM-DD string), null when unset, display as "${tpl.dateFormat}" format`);
     }
     if (def.type === "datetime") {
         const tpl = def.template;
-        const timeParts = ["Date+time field (ISO 8601 timestamp)"];
+        const timeParts = ["Date+time field (ISO 8601 timestamp), null when unset"];
         if (tpl.dateFormat)
             timeParts.push(`date: ${tpl.dateFormat}`);
         if (tpl.timeFormat)
@@ -180,13 +197,13 @@ export function generateSchema(database, existingSchema) {
             const { id: _id, order: _order, ...definition } = field;
             fields.push({
                 id: field.id,
-                sdkName: existing?.sdkName ?? toCamelCase(field.name),
+                sdkName: keepValidSdkName(existing?.sdkName) ?? toCamelCase(field.name),
                 definition,
             });
         }
         tables.push({
             id: table.id,
-            sdkName: existingTable?.sdkName ?? toCamelCase(table.name),
+            sdkName: keepValidSdkName(existingTable?.sdkName) ?? toCamelCase(table.name),
             primaryFieldId: table.primaryFieldId,
             fields,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zitejs",
-  "version": "0.9.69",
+  "version": "0.9.70",
   "description": "The Zite framework — build apps on Zite Database",
   "type": "module",
   "main": "./dist/cjs/index.js",