@jskit-ai/crud-server-generator 0.1.46 → 0.1.47

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/crud-server-generator",
-  version: "0.1.46",
+  version: "0.1.47",
   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.37",
-        "@jskit-ai/crud-core": "0.1.46",
-        "@jskit-ai/database-runtime": "0.1.38",
-        "@jskit-ai/http-runtime": "0.1.37",
-        "@jskit-ai/kernel": "0.1.38",
-        "@jskit-ai/realtime": "0.1.37",
-        "@jskit-ai/users-core": "0.1.48",
+        "@jskit-ai/auth-core": "0.1.38",
+        "@jskit-ai/crud-core": "0.1.47",
+        "@jskit-ai/database-runtime": "0.1.39",
+        "@jskit-ai/http-runtime": "0.1.38",
+        "@jskit-ai/kernel": "0.1.39",
+        "@jskit-ai/realtime": "0.1.38",
+        "@jskit-ai/users-core": "0.1.49",
         "@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.46",
+  "version": "0.1.47",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -13,11 +13,11 @@
   },
   "dependencies": {
     "@babel/parser": "^7.29.2",
-    "@jskit-ai/crud-core": "0.1.46",
-    "@jskit-ai/database-runtime": "0.1.38",
-    "@jskit-ai/http-runtime": "0.1.37",
-    "@jskit-ai/kernel": "0.1.38",
-    "@jskit-ai/users-core": "0.1.48",
+    "@jskit-ai/crud-core": "0.1.47",
+    "@jskit-ai/database-runtime": "0.1.39",
+    "@jskit-ai/http-runtime": "0.1.38",
+    "@jskit-ai/kernel": "0.1.39",
+    "@jskit-ai/users-core": "0.1.49",
     "recast": "^0.23.11",
     "typebox": "^1.0.81"
   }

package/src/server/buildTemplateContext.js

@@ -1434,8 +1434,8 @@ function renderRouteWorkspaceSupportImports({ surfaceRequiresWorkspace = true }
   }
 
   return [
-    'import { routeParamsValidator } from "@jskit-ai/users-core/server/validators/routeParamsValidator";',
-    'import { buildWorkspaceInputFromRouteParams } from "@jskit-ai/users-core/server/support/workspaceRouteInput";'
+    'import { routeParamsValidator } from "@jskit-ai/workspaces-core/server/validators/routeParamsValidator";',
+    'import { buildWorkspaceInputFromRouteParams } from "@jskit-ai/workspaces-core/server/support/workspaceRouteInput";'
   ].join("\n");
 }
 
@@ -1444,7 +1444,7 @@ function renderActionWorkspaceValidatorImport({ surfaceRequiresWorkspace = true
     return "";
   }
 
-  return 'import { workspaceSlugParamsValidator } from "@jskit-ai/users-core/server/validators/routeParamsValidator";';
+  return 'import { workspaceSlugParamsValidator } from "@jskit-ai/workspaces-core/server/validators/routeParamsValidator";';
 }
 
 function renderRouteParamsValidatorLine(operation = "", { surfaceRequiresWorkspace = true } = {}) {

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

@@ -9,8 +9,8 @@ import {
 import {
   recordIdParamsValidator
 } from "@jskit-ai/kernel/shared/validators";
-import { checkRouteVisibility } from "@jskit-ai/users-core/shared/support/usersVisibility";
-import { resolveApiBasePath } from "@jskit-ai/users-core/shared/support/usersApiPaths";
+import { checkRouteVisibility } from "@jskit-ai/kernel/shared/support/visibility";
+import { resolveScopedApiBasePath } from "@jskit-ai/kernel/shared/surface";
 import { actionIds } from "./actionIds.js";
 import { resource } from "../shared/${option:namespace|singular|camel}Resource.js";
 import { LIST_CONFIG } from "./listConfig.js";
@@ -29,9 +29,10 @@ function registerRoutes(
 ) {
   const router = app.make("jskit.http.router");
   const normalizedRouteSurface = normalizeSurfaceId(routeSurface);
-  const routeBase = resolveApiBasePath({
-    surfaceRequiresWorkspace: __JSKIT_CRUD_ROUTE_SURFACE_REQUIRES_WORKSPACE__,
-    relativePath: routeRelativePath
+  const routeBase = resolveScopedApiBasePath({
+    routeBase: __JSKIT_CRUD_ROUTE_SURFACE_REQUIRES_WORKSPACE__ ? "/w/:workspaceSlug" : "/",
+    relativePath: routeRelativePath,
+    strictParams: false
   });
 
   router.register(

package/test/routeInputContracts.test.js

@@ -1,6 +1,6 @@
 import assert from "node:assert/strict";
 import test, { after } from "node:test";
-import { resolveApiBasePath } from "@jskit-ai/users-core/shared/support/usersApiPaths";
+import { resolveScopedApiBasePath } from "@jskit-ai/kernel/shared/surface";
 import { recordIdParamsValidator } from "@jskit-ai/kernel/shared/validators";
 import { createTemplateServerFixture } from "../test-support/templateServerFixture.js";
 
@@ -61,9 +61,10 @@ test("crud routes build create/update action input with explicit payload and pat
     routeRelativePath: "/customers"
   });
 
-  const workspaceRouteBase = resolveApiBasePath({
-    surfaceRequiresWorkspace: true,
-    relativePath: "/customers"
+  const workspaceRouteBase = resolveScopedApiBasePath({
+    routeBase: "/w/:workspaceSlug",
+    relativePath: "/customers",
+    strictParams: false
   });
   const createRoute = findRoute(registeredRoutes, "POST", workspaceRouteBase);
   const updateRoute = findRoute(registeredRoutes, "PATCH", `${workspaceRouteBase}/:recordId`);
@@ -233,9 +234,10 @@ test("crud routes validate route ownership filter values before registering visi
     /must be one of/
   );
 
-  const workspaceRouteBase = resolveApiBasePath({
-    surfaceRequiresWorkspace: true,
-    relativePath: "/customers"
+  const workspaceRouteBase = resolveScopedApiBasePath({
+    routeBase: "/w/:workspaceSlug",
+    relativePath: "/customers",
+    strictParams: false
   });
   const workspaceUserRoute = findRoute(registeredRoutes, "GET", workspaceRouteBase);
 
@@ -268,9 +270,10 @@ test("crud list route forwards normalized query input from list query validators
     routeRelativePath: "/customers"
   });
 
-  const workspaceRouteBase = resolveApiBasePath({
-    surfaceRequiresWorkspace: true,
-    relativePath: "/customers"
+  const workspaceRouteBase = resolveScopedApiBasePath({
+    routeBase: "/w/:workspaceSlug",
+    relativePath: "/customers",
+    strictParams: false
   });
   const listRoute = findRoute(registeredRoutes, "GET", workspaceRouteBase);
   assert.ok(listRoute);
@@ -333,9 +336,10 @@ test("crud view route forwards include query input", async () => {
     routeRelativePath: "/customers"
   });
 
-  const workspaceRouteBase = resolveApiBasePath({
-    surfaceRequiresWorkspace: true,
-    relativePath: "/customers"
+  const workspaceRouteBase = resolveScopedApiBasePath({
+    routeBase: "/w/:workspaceSlug",
+    relativePath: "/customers",
+    strictParams: false
   });
   const viewRoute = findRoute(registeredRoutes, "GET", `${workspaceRouteBase}/:recordId`);
   assert.ok(viewRoute);

package/test-support/templateServerFixture.js

@@ -21,12 +21,12 @@ function buildTemplateReplacements({
 } = {}) {
   const routeWorkspaceSupportImports = surfaceRequiresWorkspace
     ? [
-        'import { routeParamsValidator } from "@jskit-ai/users-core/server/validators/routeParamsValidator";',
-        'import { buildWorkspaceInputFromRouteParams } from "@jskit-ai/users-core/server/support/workspaceRouteInput";'
+        'import { routeParamsValidator } from "@jskit-ai/workspaces-core/server/validators/routeParamsValidator";',
+        'import { buildWorkspaceInputFromRouteParams } from "@jskit-ai/workspaces-core/server/support/workspaceRouteInput";'
       ].join("\n")
     : "";
   const actionWorkspaceValidatorImport = surfaceRequiresWorkspace
-    ? 'import { workspaceSlugParamsValidator } from "@jskit-ai/users-core/server/validators/routeParamsValidator";'
+    ? 'import { workspaceSlugParamsValidator } from "@jskit-ai/workspaces-core/server/validators/routeParamsValidator";'
     : "";
   const actionPermissionSupport = requiresNamedPermissions
     ? [