@jskit-ai/crud-server-generator 0.1.58 → 0.1.59

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/crud-server-generator",
-  version: "0.1.58",
+  version: "0.1.59",
   kind: "generator",
   description: "CRUD server generator with routes, actions, and persistence scaffolding.",
   options: {
@@ -151,13 +151,13 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/auth-core": "0.1.49",
-        "@jskit-ai/crud-core": "0.1.58",
-        "@jskit-ai/database-runtime": "0.1.50",
-        "@jskit-ai/http-runtime": "0.1.49",
-        "@jskit-ai/kernel": "0.1.50",
-        "@jskit-ai/realtime": "0.1.49",
-        "@jskit-ai/users-core": "0.1.60",
+        "@jskit-ai/auth-core": "0.1.50",
+        "@jskit-ai/crud-core": "0.1.59",
+        "@jskit-ai/database-runtime": "0.1.51",
+        "@jskit-ai/http-runtime": "0.1.50",
+        "@jskit-ai/kernel": "0.1.51",
+        "@jskit-ai/realtime": "0.1.50",
+        "@jskit-ai/users-core": "0.1.61",
         "@local/${option:namespace|kebab}": "file:packages/${option:namespace|kebab}",
         "typebox": "^1.0.81"
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/crud-server-generator",
-  "version": "0.1.58",
+  "version": "0.1.59",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -13,11 +13,11 @@
   },
   "dependencies": {
     "@babel/parser": "^7.29.2",
-    "@jskit-ai/crud-core": "0.1.58",
-    "@jskit-ai/database-runtime": "0.1.50",
-    "@jskit-ai/http-runtime": "0.1.49",
-    "@jskit-ai/kernel": "0.1.50",
-    "@jskit-ai/users-core": "0.1.60",
+    "@jskit-ai/crud-core": "0.1.59",
+    "@jskit-ai/database-runtime": "0.1.51",
+    "@jskit-ai/http-runtime": "0.1.50",
+    "@jskit-ai/kernel": "0.1.51",
+    "@jskit-ai/users-core": "0.1.61",
     "recast": "^0.23.11",
     "typebox": "^1.0.81"
   }

package/src/server/buildTemplateContext.js

@@ -731,7 +731,7 @@ function renderResourceFieldSchema(column, { forOutput = false } = {}) {
   return schemaExpression;
 }
 
-function renderResourceValidatorsImport({ needsHtmlTimeSchemas = false, recordIdValidatorImports = [] } = {}) {
+function renderResourceValidatorsImport({ htmlTimeSchemaImports = [], recordIdValidatorImports = [] } = {}) {
   const imports = [
     "normalizeObjectInput",
     "createCursorListValidator"
@@ -741,12 +741,30 @@ function renderResourceValidatorsImport({ needsHtmlTimeSchemas = false, recordId
       imports.push(importName);
     }
   }
-  if (needsHtmlTimeSchemas) {
-    imports.push("HTML_TIME_STRING_SCHEMA", "NULLABLE_HTML_TIME_STRING_SCHEMA");
+  for (const importName of Array.isArray(htmlTimeSchemaImports) ? htmlTimeSchemaImports : []) {
+    if (!imports.includes(importName)) {
+      imports.push(importName);
+    }
   }
   return `import {\n  ${imports.join(",\n  ")}\n} from "@jskit-ai/kernel/shared/validators";`;
 }
 
+function resolveHtmlTimeSchemaImports(columns = []) {
+  const imports = [];
+  for (const column of Array.isArray(columns) ? columns : []) {
+    if (column?.typeKind !== "time") {
+      continue;
+    }
+    const importName = column.nullable === true
+      ? "NULLABLE_HTML_TIME_STRING_SCHEMA"
+      : "HTML_TIME_STRING_SCHEMA";
+    if (!imports.includes(importName)) {
+      imports.push(importName);
+    }
+  }
+  return imports;
+}
+
 function resolveRecordIdValidatorImports(...sources) {
   const imports = ["recordIdSchema"];
   const joinedSource = sources
@@ -1788,7 +1806,7 @@ function buildReplacementsFromSnapshot({
   const needsNullableDateInput = writableColumns.some(
     (column) => column.typeKind === "date" && column.nullable === true
   );
-  const needsHtmlTimeSchemas = resourceColumns.some((column) => column.typeKind === "time");
+  const htmlTimeSchemaImports = resolveHtmlTimeSchemaImports(resourceColumns);
   const needsDate = resourceColumns.some((column) => column.typeKind === "date");
   const needsJson = resourceColumns.some((column) => column.typeKind === "json");
   const needsNormalizeText = resourceColumns.some((column) =>
@@ -1882,7 +1900,7 @@ function buildReplacementsFromSnapshot({
       surfaceRequiresWorkspace
     }),
     __JSKIT_CRUD_RESOURCE_VALIDATORS_IMPORT__: renderResourceValidatorsImport({
-      needsHtmlTimeSchemas,
+      htmlTimeSchemaImports,
       recordIdValidatorImports: resolveRecordIdValidatorImports(
         renderResourceSchemaPropertyLines(outputColumns, {
           forOutput: true

package/test/buildTemplateContext.test.js

@@ -1056,7 +1056,11 @@ test("buildReplacementsFromSnapshot uses shared framework time schemas in genera
 
   assert.match(
     replacements.__JSKIT_CRUD_RESOURCE_VALIDATORS_IMPORT__,
-    /NULLABLE_HTML_TIME_STRING_SCHEMA/
+    /(^|\n)\s*NULLABLE_HTML_TIME_STRING_SCHEMA(,|\n)/m
+  );
+  assert.doesNotMatch(
+    replacements.__JSKIT_CRUD_RESOURCE_VALIDATORS_IMPORT__,
+    /(^|\n)\s*HTML_TIME_STRING_SCHEMA(,|\n)/m
   );
   assert.match(
     replacements.__JSKIT_CRUD_RESOURCE_OUTPUT_SCHEMA_PROPERTIES__,
@@ -1072,6 +1076,54 @@ test("buildReplacementsFromSnapshot uses shared framework time schemas in genera
   );
 });
 
+test("buildReplacementsFromSnapshot imports only the non-nullable time schema when nullable time fields are absent", () => {
+  const snapshot = createSnapshot({
+    tableName: "opening_hours"
+  });
+  const timeColumn = Object.freeze({
+    name: "from_time",
+    key: "fromTime",
+    dataType: "time",
+    columnType: "time",
+    typeKind: "time",
+    nullable: false,
+    hasDefault: false,
+    defaultValue: null,
+    autoIncrement: false,
+    unsigned: false,
+    extra: "",
+    maxLength: null,
+    numericPrecision: null,
+    numericScale: null,
+    enumValues: Object.freeze([])
+  });
+  const replacements = __testables.buildReplacementsFromSnapshot({
+    namespace: "opening-hours",
+    snapshot: {
+      ...snapshot,
+      columns: Object.freeze([...snapshot.columns, timeColumn])
+    },
+    resolvedOwnershipFilter: "workspace_user"
+  });
+
+  assert.match(
+    replacements.__JSKIT_CRUD_RESOURCE_VALIDATORS_IMPORT__,
+    /(^|\n)\s*HTML_TIME_STRING_SCHEMA(,|\n)/m
+  );
+  assert.doesNotMatch(
+    replacements.__JSKIT_CRUD_RESOURCE_VALIDATORS_IMPORT__,
+    /(^|\n)\s*NULLABLE_HTML_TIME_STRING_SCHEMA(,|\n)/m
+  );
+  assert.match(
+    replacements.__JSKIT_CRUD_RESOURCE_OUTPUT_SCHEMA_PROPERTIES__,
+    /fromTime: HTML_TIME_STRING_SCHEMA/
+  );
+  assert.match(
+    replacements.__JSKIT_CRUD_RESOURCE_CREATE_SCHEMA_PROPERTIES__,
+    /fromTime: HTML_TIME_STRING_SCHEMA/
+  );
+});
+
 test("buildReplacementsFromSnapshot only imports record-id validator helpers that the resource actually uses", () => {
   const snapshot = createSnapshot({
     tableName: "pollen_types",