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

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.60",
   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.51",
+        "@jskit-ai/crud-core": "0.1.60",
+        "@jskit-ai/database-runtime": "0.1.52",
+        "@jskit-ai/http-runtime": "0.1.51",
+        "@jskit-ai/kernel": "0.1.52",
+        "@jskit-ai/realtime": "0.1.51",
+        "@jskit-ai/users-core": "0.1.62",
         "@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.60",
   "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.60",
+    "@jskit-ai/database-runtime": "0.1.52",
+    "@jskit-ai/http-runtime": "0.1.51",
+    "@jskit-ai/kernel": "0.1.52",
+    "@jskit-ai/users-core": "0.1.62",
     "recast": "^0.23.11",
     "typebox": "^1.0.81"
   }

package/src/server/buildTemplateContext.js

@@ -392,6 +392,7 @@ function resolveColumnKey(column, idColumn) {
 }
 
 const NUMERIC_CHECK_CONSTRAINT_PATTERN = /(?:`([^`]+)`|([A-Za-z_][A-Za-z0-9_]*))\s*(>=|>|<=|<)\s*(-?\d+(?:\.\d+)?)/g;
+const NUMERIC_CHECK_CONSTRAINT_BETWEEN_PATTERN = /(?:`([^`]+)`|([A-Za-z_][A-Za-z0-9_]*))\s+between\s+(-?\d+(?:\.\d+)?)\s+and\s+(-?\d+(?:\.\d+)?)/gi;
 
 function normalizeNumericBoundValue(value, scale = null) {
   const parsed = Number(value);
@@ -452,6 +453,83 @@ function applyUpperBound(current = null, candidate = null) {
   return current;
 }
 
+function applyNumericConstraintBound(target = {}, column = null, operator = "", rawValue = null) {
+  if (!column || !Number.isFinite(rawValue)) {
+    return;
+  }
+
+  if (operator === ">=" || operator === ">") {
+    let candidate = null;
+    if (operator === ">=") {
+      candidate = {
+        value: normalizeNumericBoundValue(rawValue, column.numericScale),
+        exclusive: false
+      };
+    } else {
+      const exclusiveStep = resolveNumericExclusiveStep(column);
+      if (exclusiveStep != null) {
+        candidate = {
+          value: normalizeNumericBoundValue(rawValue + exclusiveStep, column.numericScale),
+          exclusive: false
+        };
+      } else {
+        candidate = {
+          value: normalizeNumericBoundValue(rawValue, column.numericScale),
+          exclusive: true
+        };
+      }
+    }
+
+    const nextBound = applyLowerBound(
+      target.minimum != null || target.exclusiveMinimum != null
+        ? {
+            value: target.minimum ?? target.exclusiveMinimum,
+            exclusive: target.exclusiveMinimum != null
+          }
+        : null,
+      candidate
+    );
+    target.minimum = nextBound?.exclusive === true ? null : nextBound?.value ?? null;
+    target.exclusiveMinimum = nextBound?.exclusive === true ? nextBound?.value ?? null : null;
+    return;
+  }
+
+  if (operator === "<=" || operator === "<") {
+    let candidate = null;
+    if (operator === "<=") {
+      candidate = {
+        value: normalizeNumericBoundValue(rawValue, column.numericScale),
+        exclusive: false
+      };
+    } else {
+      const exclusiveStep = resolveNumericExclusiveStep(column);
+      if (exclusiveStep != null) {
+        candidate = {
+          value: normalizeNumericBoundValue(rawValue - exclusiveStep, column.numericScale),
+          exclusive: false
+        };
+      } else {
+        candidate = {
+          value: normalizeNumericBoundValue(rawValue, column.numericScale),
+          exclusive: true
+        };
+      }
+    }
+
+    const nextBound = applyUpperBound(
+      target.maximum != null || target.exclusiveMaximum != null
+        ? {
+            value: target.maximum ?? target.exclusiveMaximum,
+            exclusive: target.exclusiveMaximum != null
+          }
+        : null,
+      candidate
+    );
+    target.maximum = nextBound?.exclusive === true ? null : nextBound?.value ?? null;
+    target.exclusiveMaximum = nextBound?.exclusive === true ? nextBound?.value ?? null : null;
+  }
+}
+
 function resolveColumnNumericBounds(snapshot = {}) {
   const byColumnName = new Map();
   const columns = Array.isArray(snapshot.columns) ? snapshot.columns : [];
@@ -487,6 +565,22 @@ function resolveColumnNumericBounds(snapshot = {}) {
       continue;
     }
 
+    let betweenMatch = null;
+    while ((betweenMatch = NUMERIC_CHECK_CONSTRAINT_BETWEEN_PATTERN.exec(clause)) != null) {
+      const columnName = String(betweenMatch[1] || betweenMatch[2] || "");
+      const lowerValue = Number(betweenMatch[3]);
+      const upperValue = Number(betweenMatch[4]);
+      const column = numericColumnsByName.get(columnName) || null;
+      if (!column || !Number.isFinite(lowerValue) || !Number.isFinite(upperValue)) {
+        continue;
+      }
+
+      const target = getColumnBounds(columnName);
+      applyNumericConstraintBound(target, column, ">=", lowerValue);
+      applyNumericConstraintBound(target, column, "<=", upperValue);
+    }
+    NUMERIC_CHECK_CONSTRAINT_BETWEEN_PATTERN.lastIndex = 0;
+
     let match = null;
     while ((match = NUMERIC_CHECK_CONSTRAINT_PATTERN.exec(clause)) != null) {
       const columnName = String(match[1] || match[2] || "");
@@ -498,76 +592,7 @@ function resolveColumnNumericBounds(snapshot = {}) {
       }
 
       const target = getColumnBounds(columnName);
-      if (operator === ">=" || operator === ">") {
-        let candidate = null;
-        if (operator === ">=") {
-          candidate = {
-            value: normalizeNumericBoundValue(rawValue, column.numericScale),
-            exclusive: false
-          };
-        } else {
-          const exclusiveStep = resolveNumericExclusiveStep(column);
-          if (exclusiveStep != null) {
-            candidate = {
-              value: normalizeNumericBoundValue(rawValue + exclusiveStep, column.numericScale),
-              exclusive: false
-            };
-          } else {
-            candidate = {
-              value: normalizeNumericBoundValue(rawValue, column.numericScale),
-              exclusive: true
-            };
-          }
-        }
-
-        const nextBound = applyLowerBound(
-          target.minimum != null || target.exclusiveMinimum != null
-            ? {
-                value: target.minimum ?? target.exclusiveMinimum,
-                exclusive: target.exclusiveMinimum != null
-              }
-            : null,
-          candidate
-        );
-        target.minimum = nextBound?.exclusive === true ? null : nextBound?.value ?? null;
-        target.exclusiveMinimum = nextBound?.exclusive === true ? nextBound?.value ?? null : null;
-        continue;
-      }
-
-      if (operator === "<=" || operator === "<") {
-        let candidate = null;
-        if (operator === "<=") {
-          candidate = {
-            value: normalizeNumericBoundValue(rawValue, column.numericScale),
-            exclusive: false
-          };
-        } else {
-          const exclusiveStep = resolveNumericExclusiveStep(column);
-          if (exclusiveStep != null) {
-            candidate = {
-              value: normalizeNumericBoundValue(rawValue - exclusiveStep, column.numericScale),
-              exclusive: false
-            };
-          } else {
-            candidate = {
-              value: normalizeNumericBoundValue(rawValue, column.numericScale),
-              exclusive: true
-            };
-          }
-        }
-
-        const nextBound = applyUpperBound(
-          target.maximum != null || target.exclusiveMaximum != null
-            ? {
-                value: target.maximum ?? target.exclusiveMaximum,
-                exclusive: target.exclusiveMaximum != null
-              }
-            : null,
-          candidate
-        );
-        target.maximum = nextBound?.exclusive === true ? null : nextBound?.value ?? null;
-        target.exclusiveMaximum = nextBound?.exclusive === true ? nextBound?.value ?? null : null;
-      }
+      applyNumericConstraintBound(target, column, operator, rawValue);
     }
     NUMERIC_CHECK_CONSTRAINT_PATTERN.lastIndex = 0;
   }
@@ -731,7 +756,7 @@ function renderResourceFieldSchema(column, { forOutput = false } = {}) {
   return schemaExpression;
 }
 
-function renderResourceValidatorsImport({ needsHtmlTimeSchemas = false, recordIdValidatorImports = [] } = {}) {
+function renderResourceValidatorsImport({ htmlTimeSchemaImports = [], recordIdValidatorImports = [] } = {}) {
   const imports = [
     "normalizeObjectInput",
     "createCursorListValidator"
@@ -741,12 +766,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 +1831,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 +1925,7 @@ function buildReplacementsFromSnapshot({
       surfaceRequiresWorkspace
     }),
     __JSKIT_CRUD_RESOURCE_VALIDATORS_IMPORT__: renderResourceValidatorsImport({
-      needsHtmlTimeSchemas,
+      htmlTimeSchemaImports,
       recordIdValidatorImports: resolveRecordIdValidatorImports(
         renderResourceSchemaPropertyLines(outputColumns, {
           forOutput: true

package/test/buildTemplateContext.test.js

@@ -808,13 +808,35 @@ test("resolveScaffoldColumns derives resource numeric bounds from check constrai
     enumValues: Object.freeze([])
   });
 
+  const severityColumn = Object.freeze({
+    name: "severity",
+    key: "severity",
+    dataType: "tinyint",
+    columnType: "tinyint unsigned",
+    typeKind: "integer",
+    nullable: true,
+    hasDefault: false,
+    defaultValue: null,
+    autoIncrement: false,
+    unsigned: true,
+    extra: "",
+    maxLength: null,
+    numericPrecision: 3,
+    numericScale: 0,
+    datetimePrecision: null,
+    characterSetName: "",
+    collationName: "",
+    enumValues: Object.freeze([])
+  });
+
   const scaffoldColumns = __testables.resolveScaffoldColumns({
     ...snapshot,
     columns: Object.freeze([
       snapshot.columns[0],
       inputWeightColumn,
       batchedDailySequenceColumn,
-      moistureLevelColumn
+      moistureLevelColumn,
+      severityColumn
     ]),
     checkConstraints: Object.freeze([
       Object.freeze({
@@ -828,6 +850,10 @@ test("resolveScaffoldColumns derives resource numeric bounds from check constrai
       Object.freeze({
         name: "chk_batches_moisture_level",
         clause: "`moisture_level` is null or `moisture_level` >= 0 and `moisture_level` <= 100"
+      }),
+      Object.freeze({
+        name: "chk_pet_notes_severity",
+        clause: "`severity` is null or `severity` between 1 and 10"
       })
     ])
   });
@@ -835,6 +861,7 @@ test("resolveScaffoldColumns derives resource numeric bounds from check constrai
   const inputWeight = scaffoldColumns.find((column) => column.name === "input_weight");
   const batchedDailySequence = scaffoldColumns.find((column) => column.name === "batched_daily_sequence");
   const moistureLevel = scaffoldColumns.find((column) => column.name === "moisture_level");
+  const severity = scaffoldColumns.find((column) => column.name === "severity");
 
   assert.equal(
     __testables.renderResourceFieldSchema(inputWeight),
@@ -848,6 +875,10 @@ test("resolveScaffoldColumns derives resource numeric bounds from check constrai
     __testables.renderResourceFieldSchema(moistureLevel),
     "Type.Union([Type.Number({ minimum: 0, maximum: 100 }), Type.Null()])"
   );
+  assert.equal(
+    __testables.renderResourceFieldSchema(severity),
+    "Type.Union([Type.Integer({ minimum: 1, maximum: 10 }), Type.Null()])"
+  );
 });
 
 test("buildReplacementsFromSnapshot normalizes nullable temporal inputs without invalid date errors", () => {
@@ -1056,7 +1087,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 +1107,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",