@jskit-ai/crud-core 0.1.62 → 0.1.64

package/package.descriptor.mjs

@@ -1,12 +1,14 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/crud-core",
-  version: "0.1.62",
+  version: "0.1.64",
   kind: "runtime",
   description: "Shared CRUD helpers used by CRUD modules.",
   dependsOn: [
+    "@jskit-ai/http-runtime",
     "@jskit-ai/kernel",
     "@jskit-ai/realtime",
+    "@jskit-ai/resource-crud-core",
     "@jskit-ai/shell-web",
     "@jskit-ai/users-core",
     "@jskit-ai/users-web"
@@ -26,7 +28,7 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/crud-core": "0.1.62"
+        "@jskit-ai/crud-core": "0.1.64"
       },
       dev: {}
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/crud-core",
-  "version": "0.1.62",
+  "version": "0.1.64",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -10,8 +10,9 @@
     "./client/composables/createCrudClientSupport": "./src/client/composables/createCrudClientSupport.js",
     "./client/composables/crudClientSupportHelpers": "./src/client/composables/crudClientSupportHelpers.js",
     "./client/composables/useCrudRealtimeInvalidation": "./src/client/composables/useCrudRealtimeInvalidation.js",
-    "./shared/crudFieldMetaSupport": "./src/shared/crudFieldMetaSupport.js",
+    "./shared/crudFieldSupport": "./src/shared/crudFieldSupport.js",
     "./shared/crudNamespaceSupport": "./src/shared/crudNamespaceSupport.js",
+    "./shared/crudResource": "./src/shared/crudResource.js",
     "./server/repositorySupport": "./src/server/repositorySupport.js",
     "./server/resourceRuntime": "./src/server/resourceRuntime/index.js",
     "./server/createHooksToCollectChildren": "./src/server/createHooksToCollectChildren.js",
@@ -22,16 +23,23 @@
     "./server/createCrudServiceFromResource": "./src/server/createCrudServiceFromResource.js",
     "./server/crudModuleConfig": "./src/server/crudModuleConfig.js",
     "./server/listQueryValidators": "./src/server/listQueryValidators.js",
-    "./server/listFilters": "./src/server/listFilters.js"
+    "./server/listFilters": "./src/server/listFilters.js",
+    "./server/routeContracts": "./src/server/routeContracts.js"
   },
   "dependencies": {
     "@tanstack/vue-query": "^5.90.5",
-    "@jskit-ai/database-runtime": "0.1.54",
-    "@jskit-ai/kernel": "0.1.54",
-    "@jskit-ai/realtime": "0.1.53",
-    "@jskit-ai/shell-web": "0.1.53",
-    "@jskit-ai/users-core": "0.1.64",
-    "@jskit-ai/users-web": "0.1.69",
-    "typebox": "^1.0.81"
+    "@jskit-ai/database-runtime": "0.1.56",
+    "@jskit-ai/http-runtime": "0.1.55",
+    "@jskit-ai/kernel": "0.1.56",
+    "json-rest-schema": "1.x.x",
+    "@jskit-ai/realtime": "0.1.55",
+    "@jskit-ai/resource-crud-core": "0.1.1",
+    "@jskit-ai/shell-web": "0.1.55",
+    "@jskit-ai/users-core": "0.1.66",
+    "@jskit-ai/users-web": "0.1.71"
+  },
+  "peerDependencies": {
+    "vue": "^3.5.13",
+    "vue-router": "^5.0.4"
   }
 }

package/src/server/crudModuleConfig.js

@@ -20,6 +20,7 @@ const CRUD_REQUESTED_OWNERSHIP_FILTER_SET = new Set([
   CRUD_REQUESTED_OWNERSHIP_FILTER_AUTO
 ]);
 const CRUD_MODULE_ID = "crud";
+const WORKSPACE_CAPABLE_TENANCY_MODES = new Set(["personal", "workspaces"]);
 
 function asRecord(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) {
@@ -227,11 +228,30 @@ function resolveCrudSurfacePolicy(
 
 function resolveCrudSurfacePolicyFromAppConfig(sourceConfig = {}, appConfig = {}, options = {}) {
   const config = asRecord(appConfig);
-  return resolveCrudSurfacePolicy(sourceConfig, {
-    ...asRecord(options),
-    surfaceDefinitions: config.surfaceDefinitions,
-    defaultSurfaceId: config.surfaceDefaultId
-  });
+  const requestedSurfaceId = normalizeSurfaceId(asRecord(sourceConfig).surface);
+  const fallbackSurfaceId = normalizeSurfaceId(config.surfaceDefaultId);
+  const resolvedSurfaceId = requestedSurfaceId || fallbackSurfaceId;
+
+  try {
+    return resolveCrudSurfacePolicy(sourceConfig, {
+      ...asRecord(options),
+      surfaceDefinitions: config.surfaceDefinitions,
+      defaultSurfaceId: config.surfaceDefaultId
+    });
+  } catch (error) {
+    const normalizedTenancyMode = normalizeText(config.tenancyMode).toLowerCase();
+    const message = String(error?.message || "");
+    if (
+      message.includes("cannot resolve surface") &&
+      (resolvedSurfaceId === "admin" || resolvedSurfaceId === "app") &&
+      WORKSPACE_CAPABLE_TENANCY_MODES.has(normalizedTenancyMode)
+    ) {
+      error.message = `${message} Workspace-capable tenancy mode "${normalizedTenancyMode}" usually requires ` +
+        '@jskit-ai/workspaces-core, which defines the "app" and "admin" surfaces. ' +
+        "Install that package or add matching surface definitions in config/public.js.";
+    }
+    throw error;
+  }
 }
 
 function resolveCrudConfigsFromModules(modulesSource = {}) {

package/src/server/fieldAccess.js

@@ -1,34 +1,8 @@
 import { AppError } from "@jskit-ai/kernel/server/runtime/errors";
+import { resolveCrudFieldSchemaProperties } from "@jskit-ai/kernel/shared/support/crudFieldContract";
 import { normalizeObject, normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
 import { normalizeObjectInput } from "@jskit-ai/kernel/shared/validators/inputNormalization";
 
-function isSchemaNullable(schema = {}) {
-  if (!schema || typeof schema !== "object" || Array.isArray(schema)) {
-    return false;
-  }
-
-  const schemaType = schema.type;
-  if (typeof schemaType === "string" && normalizeText(schemaType).toLowerCase() === "null") {
-    return true;
-  }
-  if (Array.isArray(schemaType)) {
-    const hasNullType = schemaType.some((entry) => normalizeText(entry).toLowerCase() === "null");
-    if (hasNullType) {
-      return true;
-    }
-  }
-
-  const variants = [];
-  if (Array.isArray(schema.anyOf)) {
-    variants.push(...schema.anyOf);
-  }
-  if (Array.isArray(schema.oneOf)) {
-    variants.push(...schema.oneOf);
-  }
-
-  return variants.some((entry) => isSchemaNullable(entry));
-}
-
 function normalizeFieldSet(value, { context = "crudFieldAccess", label = "field list" } = {}) {
   if (value == null || value === "*") {
     return null;
@@ -73,17 +47,13 @@ function resolveWriteMode(fieldAccess = {}, { context = "crudFieldAccess" } = {}
 }
 
 function buildOutputFieldRules(resource = {}) {
-  const viewOutputSchema = resource?.operations?.view?.outputValidator?.schema;
-  if (!viewOutputSchema || typeof viewOutputSchema !== "object" || Array.isArray(viewOutputSchema)) {
+  const outputProperties = resolveCrudFieldSchemaProperties(resource?.operations?.view?.output, {
+    context: "crudFieldAccess resource.operations.view.output"
+  });
+  if (Object.keys(outputProperties).length < 1) {
     return null;
   }
 
-  const outputProperties = normalizeObject(viewOutputSchema.properties);
-  const requiredFields = new Set(
-    (Array.isArray(viewOutputSchema.required) ? viewOutputSchema.required : [])
-      .map((entry) => normalizeText(entry))
-      .filter(Boolean)
-  );
   const fieldRules = new Map();
 
   for (const [fieldKey, fieldSchemaRaw] of Object.entries(outputProperties)) {
@@ -96,8 +66,8 @@ function buildOutputFieldRules(resource = {}) {
     fieldRules.set(
       normalizedFieldKey,
       Object.freeze({
-        required: requiredFields.has(normalizedFieldKey),
-        nullable: isSchemaNullable(fieldSchema),
+        required: fieldSchema.required === true,
+        nullable: fieldSchema.nullable === true,
         hasDefault: Object.hasOwn(fieldSchema, "default"),
         defaultValue: fieldSchema.default
       })
@@ -210,7 +180,7 @@ function applyReadableFieldPolicyToRecord(record, allowedFields, outputRules = n
     }
 
     throw new Error(
-      `${context} cannot redact required non-nullable field "${fieldKey}" without schema.default.`
+      `${context} cannot redact required non-nullable field "${fieldKey}" without a default value.`
     );
   }
 
@@ -233,7 +203,7 @@ function createCrudFieldAccessRuntime(resource = {}, { context = "crudFieldAcces
       return null;
     }
     if (!outputRules) {
-      throw new TypeError(`${context} requires resource.operations.view.outputValidator.schema for fieldAccess.readable.`);
+      throw new TypeError(`${context} requires resource.operations.view.output for fieldAccess.readable.`);
     }
 
     return allowedFields;