@jskit-ai/crud-server-generator 0.1.119 → 0.1.121

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/crud-server-generator",
-  version: "0.1.119",
+  version: "0.1.121",
   kind: "generator",
   description: "CRUD server generator with routes, actions, and persistence scaffolding.",
   options: {
@@ -160,14 +160,14 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/auth-core": "0.1.110",
-        "@jskit-ai/crud-core": "0.1.119",
-        "@jskit-ai/database-runtime": "0.1.111",
-        "@jskit-ai/http-runtime": "0.1.110",
-        "@jskit-ai/json-rest-api-core": "0.1.56",
-        "@jskit-ai/kernel": "0.1.112",
-        "@jskit-ai/realtime": "0.1.110",
-        "@jskit-ai/resource-crud-core": "0.1.56",
+        "@jskit-ai/auth-core": "0.1.112",
+        "@jskit-ai/crud-core": "0.1.121",
+        "@jskit-ai/database-runtime": "0.1.113",
+        "@jskit-ai/http-runtime": "0.1.112",
+        "@jskit-ai/json-rest-api-core": "0.1.58",
+        "@jskit-ai/kernel": "0.1.114",
+        "@jskit-ai/realtime": "0.1.112",
+        "@jskit-ai/resource-crud-core": "0.1.58",
         "@local/${option:namespace|kebab}": "file:packages/${option:namespace|kebab}"
       },
       dev: {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/crud-server-generator",
-  "version": "0.1.119",
+  "version": "0.1.121",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -13,12 +13,12 @@
   },
   "dependencies": {
     "@babel/parser": "^7.29.2",
-    "@jskit-ai/crud-core": "0.1.119",
-    "@jskit-ai/database-runtime": "0.1.111",
-    "@jskit-ai/http-runtime": "0.1.110",
-    "@jskit-ai/json-rest-api-core": "0.1.56",
-    "@jskit-ai/kernel": "0.1.112",
-    "@jskit-ai/resource-crud-core": "0.1.56",
+    "@jskit-ai/crud-core": "0.1.121",
+    "@jskit-ai/database-runtime": "0.1.113",
+    "@jskit-ai/http-runtime": "0.1.112",
+    "@jskit-ai/json-rest-api-core": "0.1.58",
+    "@jskit-ai/kernel": "0.1.114",
+    "@jskit-ai/resource-crud-core": "0.1.58",
     "recast": "^0.23.11"
   }
 }

package/src/server/buildTemplateContext.js

@@ -86,10 +86,10 @@ function resolveInternalRouteOption(options = {}) {
   if (!Object.prototype.hasOwnProperty.call(options, "internal")) {
     return false;
   }
-  if (options.internal === "" || options.internal === true) {
+  if (options.internal === undefined || options.internal === true) {
     return true;
   }
-  if (options.internal === false) {
+  if (options.internal === "" || options.internal == null || options.internal === false) {
     return false;
   }
   return normalizeBoolean(options.internal);
@@ -1736,6 +1736,11 @@ function renderRouteParamsValidatorLine(operation = "", { surfaceRequiresWorkspa
   return "      params: recordRouteParamsValidator,";
 }
 
+function renderOptionalTemplateLine(line = "") {
+  const renderedLine = String(line || "").trimEnd();
+  return renderedLine ? `\n${renderedLine}` : "";
+}
+
 function renderRouteInputLines(operation = "", { surfaceRequiresWorkspace = true } = {}) {
   const normalizedOperation = normalizeCrudOperation(operation, "CRUD route input operation");
   const lines = [];
@@ -1926,26 +1931,36 @@ function buildReplacementsFromSnapshot({
     __JSKIT_CRUD_ROUTE_WORKSPACE_SUPPORT_IMPORTS__: renderRouteWorkspaceSupportImports({
       surfaceRequiresWorkspace
     }),
-    __JSKIT_CRUD_ROUTE_INTERNAL_LINE__: routeInternal === true ? "      internal: true," : "",
+    __JSKIT_CRUD_ROUTE_INTERNAL_LINE__: routeInternal === true ? "\n      internal: true," : "",
     __JSKIT_CRUD_ROUTE_CONTRACTS_RESOURCE_ARGS__: surfaceRequiresWorkspace ? ",\n  routeParamsValidator" : "",
     __JSKIT_CRUD_ROUTE_VALIDATOR_CONSTANTS__: renderRouteValidatorConstants({
       surfaceRequiresWorkspace
     }),
-    __JSKIT_CRUD_LIST_ROUTE_PARAMS_VALIDATOR_LINE__: renderRouteParamsValidatorLine("list", {
-      surfaceRequiresWorkspace
-    }),
-    __JSKIT_CRUD_VIEW_ROUTE_PARAMS_VALIDATOR_LINE__: renderRouteParamsValidatorLine("view", {
-      surfaceRequiresWorkspace
-    }),
-    __JSKIT_CRUD_CREATE_ROUTE_PARAMS_VALIDATOR_LINE__: renderRouteParamsValidatorLine("create", {
-      surfaceRequiresWorkspace
-    }),
-    __JSKIT_CRUD_UPDATE_ROUTE_PARAMS_VALIDATOR_LINE__: renderRouteParamsValidatorLine("update", {
-      surfaceRequiresWorkspace
-    }),
-    __JSKIT_CRUD_DELETE_ROUTE_PARAMS_VALIDATOR_LINE__: renderRouteParamsValidatorLine("delete", {
-      surfaceRequiresWorkspace
-    }),
+    __JSKIT_CRUD_LIST_ROUTE_PARAMS_VALIDATOR_LINE__: renderOptionalTemplateLine(
+      renderRouteParamsValidatorLine("list", {
+        surfaceRequiresWorkspace
+      })
+    ),
+    __JSKIT_CRUD_VIEW_ROUTE_PARAMS_VALIDATOR_LINE__: renderOptionalTemplateLine(
+      renderRouteParamsValidatorLine("view", {
+        surfaceRequiresWorkspace
+      })
+    ),
+    __JSKIT_CRUD_CREATE_ROUTE_PARAMS_VALIDATOR_LINE__: renderOptionalTemplateLine(
+      renderRouteParamsValidatorLine("create", {
+        surfaceRequiresWorkspace
+      })
+    ),
+    __JSKIT_CRUD_UPDATE_ROUTE_PARAMS_VALIDATOR_LINE__: renderOptionalTemplateLine(
+      renderRouteParamsValidatorLine("update", {
+        surfaceRequiresWorkspace
+      })
+    ),
+    __JSKIT_CRUD_DELETE_ROUTE_PARAMS_VALIDATOR_LINE__: renderOptionalTemplateLine(
+      renderRouteParamsValidatorLine("delete", {
+        surfaceRequiresWorkspace
+      })
+    ),
     __JSKIT_CRUD_LIST_ROUTE_INPUT_LINES__: renderRouteInputLines("list", {
       surfaceRequiresWorkspace
     }),

package/templates/src/local-package/server/registerRoutes.js

@@ -37,15 +37,13 @@ function registerRoutes(
     routeBase,
     {
       auth: "required",
-      surface: normalizedRouteSurface,
-__JSKIT_CRUD_ROUTE_INTERNAL_LINE__
+      surface: normalizedRouteSurface,__JSKIT_CRUD_ROUTE_INTERNAL_LINE__
       visibility: checkRouteVisibility(routeOwnershipFilter),
       meta: {
         tags: ["crud"],
         summary: "List records."
       },
-      ...listRouteContract,
-__JSKIT_CRUD_LIST_ROUTE_PARAMS_VALIDATOR_LINE__
+      ...listRouteContract,__JSKIT_CRUD_LIST_ROUTE_PARAMS_VALIDATOR_LINE__
     },
     async function (request, reply) {
       const listInput = {
@@ -64,15 +62,13 @@ __JSKIT_CRUD_LIST_ROUTE_INPUT_LINES__
     `${routeBase}/:recordId`,
     {
       auth: "required",
-      surface: normalizedRouteSurface,
-__JSKIT_CRUD_ROUTE_INTERNAL_LINE__
+      surface: normalizedRouteSurface,__JSKIT_CRUD_ROUTE_INTERNAL_LINE__
       visibility: checkRouteVisibility(routeOwnershipFilter),
       meta: {
         tags: ["crud"],
         summary: "View a record."
       },
-      ...viewRouteContract,
-__JSKIT_CRUD_VIEW_ROUTE_PARAMS_VALIDATOR_LINE__
+      ...viewRouteContract,__JSKIT_CRUD_VIEW_ROUTE_PARAMS_VALIDATOR_LINE__
     },
     async function (request, reply) {
       const response = await request.executeAction({
@@ -90,15 +86,13 @@ __JSKIT_CRUD_VIEW_ROUTE_INPUT_LINES__
     routeBase,
     {
       auth: "required",
-      surface: normalizedRouteSurface,
-__JSKIT_CRUD_ROUTE_INTERNAL_LINE__
+      surface: normalizedRouteSurface,__JSKIT_CRUD_ROUTE_INTERNAL_LINE__
       visibility: checkRouteVisibility(routeOwnershipFilter),
       meta: {
         tags: ["crud"],
         summary: "Create a record."
       },
-      ...createRouteContract,
-__JSKIT_CRUD_CREATE_ROUTE_PARAMS_VALIDATOR_LINE__
+      ...createRouteContract,__JSKIT_CRUD_CREATE_ROUTE_PARAMS_VALIDATOR_LINE__
     },
     async function (request, reply) {
       const response = await request.executeAction({
@@ -116,15 +110,13 @@ __JSKIT_CRUD_CREATE_ROUTE_INPUT_LINES__
     `${routeBase}/:recordId`,
     {
       auth: "required",
-      surface: normalizedRouteSurface,
-__JSKIT_CRUD_ROUTE_INTERNAL_LINE__
+      surface: normalizedRouteSurface,__JSKIT_CRUD_ROUTE_INTERNAL_LINE__
       visibility: checkRouteVisibility(routeOwnershipFilter),
       meta: {
         tags: ["crud"],
         summary: "Update a record."
       },
-      ...updateRouteContract,
-__JSKIT_CRUD_UPDATE_ROUTE_PARAMS_VALIDATOR_LINE__
+      ...updateRouteContract,__JSKIT_CRUD_UPDATE_ROUTE_PARAMS_VALIDATOR_LINE__
     },
     async function (request, reply) {
       const response = await request.executeAction({
@@ -142,15 +134,13 @@ __JSKIT_CRUD_UPDATE_ROUTE_INPUT_LINES__
     `${routeBase}/:recordId`,
     {
       auth: "required",
-      surface: normalizedRouteSurface,
-__JSKIT_CRUD_ROUTE_INTERNAL_LINE__
+      surface: normalizedRouteSurface,__JSKIT_CRUD_ROUTE_INTERNAL_LINE__
       visibility: checkRouteVisibility(routeOwnershipFilter),
       meta: {
         tags: ["crud"],
         summary: "Delete a record."
       },
-      ...deleteRouteContract,
-__JSKIT_CRUD_DELETE_ROUTE_PARAMS_VALIDATOR_LINE__
+      ...deleteRouteContract,__JSKIT_CRUD_DELETE_ROUTE_PARAMS_VALIDATOR_LINE__
     },
     async function (request, reply) {
       const response = await request.executeAction({

package/test/buildTemplateContext.test.js

@@ -256,7 +256,8 @@ test("buildReplacementsFromSnapshot renders an internal route line only when req
   });
 
   assert.equal(publicReplacements.__JSKIT_CRUD_ROUTE_INTERNAL_LINE__, "");
-  assert.equal(internalReplacements.__JSKIT_CRUD_ROUTE_INTERNAL_LINE__, "      internal: true,");
+  assert.equal(internalReplacements.__JSKIT_CRUD_ROUTE_INTERNAL_LINE__, "\n      internal: true,");
+  assert.equal(publicReplacements.__JSKIT_CRUD_LIST_ROUTE_PARAMS_VALIDATOR_LINE__, "\n      params: routeParamsValidator,");
 });
 
 test("resolveInternalRouteOption rejects invalid internal flag values instead of silently generating public routes", () => {
@@ -266,8 +267,12 @@ test("resolveInternalRouteOption rejects invalid internal flag values instead of
   );
 });
 
-test("resolveInternalRouteOption treats an empty-string flag presence as true", () => {
-  assert.equal(__testables.resolveInternalRouteOption({ internal: "" }), true);
+test("resolveInternalRouteOption does not confuse descriptor defaults with explicit internal flags", () => {
+  assert.equal(__testables.resolveInternalRouteOption({}), false);
+  assert.equal(__testables.resolveInternalRouteOption({ internal: "" }), false);
+  assert.equal(__testables.resolveInternalRouteOption({ internal: false }), false);
+  assert.equal(__testables.resolveInternalRouteOption({ internal: undefined }), true);
+  assert.equal(__testables.resolveInternalRouteOption({ internal: true }), true);
   assert.equal(__testables.resolveInternalRouteOption({ internal: "true" }), true);
   assert.equal(__testables.resolveInternalRouteOption({ internal: "false" }), false);
 });
@@ -326,7 +331,7 @@ test("buildReplacementsFromSnapshot builds deterministic template replacement pa
   assert.match(replacements.__JSKIT_CRUD_LIST_ACTION_INPUT__, /workspaceSlugParamsValidator,/);
   assert.equal(
     replacements.__JSKIT_CRUD_VIEW_ROUTE_PARAMS_VALIDATOR_LINE__,
-    "      params: recordRouteParamsValidator,"
+    "\n      params: recordRouteParamsValidator,"
   );
   assert.match(
     replacements.__JSKIT_CRUD_ROUTE_VALIDATOR_CONSTANTS__,
@@ -402,7 +407,7 @@ test("buildReplacementsFromSnapshot omits named permissions and role grants when
   assert.equal(replacements.__JSKIT_CRUD_LIST_ROUTE_PARAMS_VALIDATOR_LINE__, "");
   assert.equal(
     replacements.__JSKIT_CRUD_VIEW_ROUTE_PARAMS_VALIDATOR_LINE__,
-    "      params: recordRouteParamsValidator,"
+    "\n      params: recordRouteParamsValidator,"
   );
   assert.equal(
     replacements.__JSKIT_CRUD_VIEW_ROUTE_INPUT_LINES__,
@@ -1057,6 +1062,9 @@ test("crud actions and routes templates derive cursor validation and route contr
   assert.match(registerRoutesTemplateSource, /createCrudJsonApiRouteContracts/);
   assert.match(registerRoutesTemplateSource, /const \{\s+listRouteContract,\s+viewRouteContract,\s+createRouteContract,\s+updateRouteContract,\s+deleteRouteContract,\s+recordRouteParamsValidator\s+\} = createCrudJsonApiRouteContracts\(\{/s);
   assert.match(registerRoutesTemplateSource, /resource__JSKIT_CRUD_ROUTE_CONTRACTS_RESOURCE_ARGS__/);
+  assert.match(registerRoutesTemplateSource, /surface: normalizedRouteSurface,__JSKIT_CRUD_ROUTE_INTERNAL_LINE__\n      visibility:/);
+  assert.match(registerRoutesTemplateSource, /\.\.\.listRouteContract,__JSKIT_CRUD_LIST_ROUTE_PARAMS_VALIDATOR_LINE__\n    \},/);
+  assert.doesNotMatch(registerRoutesTemplateSource, /surface: normalizedRouteSurface,\n__JSKIT_CRUD_ROUTE_INTERNAL_LINE__/);
   assert.doesNotMatch(registerRoutesTemplateSource, /wrapResponse/);
   assert.match(registerRoutesTemplateSource, /reply\.code\(204\)\.send\(response\);/);
   assert.doesNotMatch(registerRoutesTemplateSource, /withStandardErrorResponses/);