@stonecrop/nuxt 0.16.5 → 0.16.6

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@stonecrop/nuxt",
   "configKey": "stonecrop",
-  "version": "0.16.5",
+  "version": "0.16.6",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "unknown"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stonecrop/nuxt",
-  "version": "0.16.5",
+  "version": "0.16.6",
   "description": "Nuxt module for Stonecrop",
   "repository": {
     "type": "git",
@@ -45,18 +45,18 @@
     "pathe": "^2.0.3",
     "pinia": "^3.0.4",
     "prompts": "^2.4.2",
-    "@stonecrop/casl-middleware": "0.16.5",
-    "@stonecrop/aform": "0.16.5",
-    "@stonecrop/atable": "0.16.5",
-    "@stonecrop/code-editor": "0.16.5",
-    "@stonecrop/desktop": "0.16.5",
-    "@stonecrop/graphql-middleware": "0.16.5",
-    "@stonecrop/node-editor": "0.16.5",
-    "@stonecrop/graphql-client": "0.16.5",
-    "@stonecrop/schema": "0.16.5",
-    "@stonecrop/nuxt-grafserv": "0.16.5",
-    "@stonecrop/stonecrop": "0.16.5",
-    "@stonecrop/themes": "0.16.5"
+    "@stonecrop/aform": "0.16.6",
+    "@stonecrop/desktop": "0.16.6",
+    "@stonecrop/casl-middleware": "0.16.6",
+    "@stonecrop/graphql-client": "0.16.6",
+    "@stonecrop/code-editor": "0.16.6",
+    "@stonecrop/graphql-middleware": "0.16.6",
+    "@stonecrop/node-editor": "0.16.6",
+    "@stonecrop/schema": "0.16.6",
+    "@stonecrop/nuxt-grafserv": "0.16.6",
+    "@stonecrop/stonecrop": "0.16.6",
+    "@stonecrop/themes": "0.16.6",
+    "@stonecrop/atable": "0.16.6"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
@@ -103,7 +103,7 @@
     "prepublish": "rushx dev:prepare && nuxt-module-build build",
     "test": "vitest run",
     "test:coverage": "vitest run --coverage.enabled --coverage.provider=istanbul",
-    "test:types": "vue-tsc --noEmit -p tsconfig.runtime.json && cd playground && vue-tsc --noEmit && cd ../fullstack && vue-tsc --noEmit",
+    "test:types": "vue-tsc --noEmit -p tsconfig.runtime.json && cd playground && vue-tsc --noEmit && cd ../fullstack && vue-tsc --noEmit && vue-tsc --noEmit -p server/tsconfig.json",
     "test:ui": "vitest --ui",
     "test:watch": "vitest watch"
   }

package/templates/Project.json

@@ -4,6 +4,7 @@
 	"fields": [
 		{
 			"fieldname": "id",
+			"primaryKey": true,
 			"label": "ID",
 			"component": "ATextInput",
 			"mode": "display"

package/templates/Task.json

@@ -4,6 +4,7 @@
 	"fields": [
 		{
 			"fieldname": "id",
+			"primaryKey": true,
 			"label": "ID",
 			"component": "ATextInput",
 			"mode": "display"

package/templates/resolvers.ts

@@ -19,6 +19,7 @@
 
 import { constant, lambda, loadOne, object } from 'grafast'
 import { getMeta, getAllMeta, applyGuardedTransition } from '@stonecrop/graphql-middleware'
+import { getPrimaryKeyField } from '@stonecrop/schema'
 import type { DoctypeMeta } from '@stonecrop/schema'
 import { projects, tasks, type Project, type Task } from './data'
 
@@ -57,10 +58,36 @@ export function formatDoctypeMeta(meta: DoctypeMeta) {
 // Record helpers — read/write the in-memory Maps by doctype
 // ============================================================
 
-function getRecord(doctype: string, id: string): Project | Task | null {
+/**
+ * The field an incoming `stonecropRecord(id:)` argument is matched against.
+ *
+ * Part of the adapter contract — see test/adapter-conformance.test.ts, which runs the same
+ * expectations against every host. A doctype that declares a `primaryKey` is keyed by that
+ * field; the client resolves the same field via `@stonecrop/schema`'s `getRecordIdentity`,
+ * so an adapter that ignores the declaration looks records up by a key the client never sent.
+ *
+ * The `id` fallback covers doctypes that declare no `primaryKey`. Every doctype in this repo now
+ * declares one, enforced by test/doctype-fixtures.test.ts, so in-repo the fallback is inert.
+ * It stays for consumer doctypes that have not adopted the rule: the Postgres adapter refuses
+ * those outright (`data: null`), and this host stays permissive. The conformance suite records
+ * that difference rather than asserting one answer.
+ */
+export function recordLookupField(meta: DoctypeMeta): string {
+	return getPrimaryKeyField(meta.fields)?.fieldname ?? 'id'
+}
+
+function getRecord(doctype: string, id: string, lookupField = 'id'): Project | Task | null {
 	const d = doctype.toLowerCase()
-	if (d === 'project') return projects.get(id) ?? null
-	if (d === 'task') return tasks.get(id) ?? null
+	const store = d === 'project' ? projects : d === 'task' ? tasks : null
+	if (!store) return null
+	if (lookupField === 'id') return store.get(id) ?? null
+	// A natural key is not the Map key, so the store is scanned. Values are compared as
+	// strings because the `id` argument arrives from GraphQL as `String!`. Only primitives
+	// are usable keys — stringifying an object would compare "[object Object]".
+	for (const record of store.values()) {
+		const value: unknown = Reflect.get(record, lookupField)
+		if ((typeof value === 'string' || typeof value === 'number') && String(value) === id) return record
+	}
 	return null
 }
 
@@ -117,10 +144,13 @@ export const resolvers = {
 
 			stonecropRecord(_: unknown, { $doctype, $id, $options }: any) {
 				return loadOne(object({ doctype: $doctype, id: $id, options: $options }), async (specs: readonly any[]) => {
-					return specs.map(spec => ({
-						data: getRecord(spec.doctype, spec.id),
-						doctype: spec.doctype,
-					}))
+					return specs.map(spec => {
+						const meta = getMeta(spec.doctype)
+						return {
+							data: meta ? getRecord(spec.doctype, spec.id, recordLookupField(meta)) : null,
+							doctype: spec.doctype,
+						}
+					})
 				})
 			},