@stonecrop/nuxt 0.16.4 → 0.16.6

package/dist/module.d.mts

@@ -87,7 +87,8 @@ interface ModuleOptions {
      */
     theme?: string | false;
 }
+declare const STONECROP_PACKAGES: string[];
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions, ModuleOptions, false>;
 
-export { _default as default };
+export { STONECROP_PACKAGES, _default as default };
 export type { ModuleOptions, ParsedDoctype, RouteStrategyFn };

package/dist/module.json

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

package/dist/module.mjs

@@ -7,6 +7,8 @@ const { resolve } = createResolver(import.meta.url);
 const STONECROP_PACKAGES = [
   "@stonecrop/aform",
   "@stonecrop/atable",
+  "@stonecrop/code-editor",
+  "@stonecrop/desktop",
   "@stonecrop/stonecrop",
   "@stonecrop/node-editor",
   "@stonecrop/utilities",
@@ -251,4 +253,4 @@ const module$1 = defineNuxtModule({
   }
 });
 
-export { module$1 as default };
+export { STONECROP_PACKAGES, module$1 as default };

package/dist/runtime/app/components/DocBuilderFieldsPanel.vue

@@ -70,14 +70,14 @@
 								<input
 									type="text"
 									:value="str(row.__field[p.key])"
-									:disabled="!!p.identity && isLocked(row.__field)"
+									:disabled="isIdentity(p.key) && isLocked(row.__field)"
 									@input="update(row.__realIndex, p.key, value($event) || void 0)" />
 							</label>
 							<label v-for="p in SELECT_PROPS" :key="p.key" class="field-prop">
 								<span>{{ p.label }}</span>
 								<select
 									:value="str(row.__field[p.key])"
-									:disabled="!!p.identity && isLocked(row.__field)"
+									:disabled="isIdentity(p.key) && isLocked(row.__field)"
 									@change="update(row.__realIndex, p.key, value($event) || void 0)">
 									<option value="">—</option>
 									<option v-for="o in p.options" :key="o" :value="o">{{ o }}</option>
@@ -87,7 +87,7 @@
 								<input
 									type="checkbox"
 									:checked="bool(row.__field[p.key])"
-									:disabled="!!p.identity && isLocked(row.__field)"
+									:disabled="isIdentity(p.key) && isLocked(row.__field)"
 									@change="update(row.__realIndex, p.key, checked($event) || void 0)" />
 								<span>{{ p.label }}</span>
 							</label>
@@ -96,7 +96,7 @@
 								<input
 									type="text"
 									:value="jsonStr(row.__field[p.key])"
-									:disabled="!!p.identity && isLocked(row.__field)"
+									:disabled="isIdentity(p.key) && isLocked(row.__field)"
 									:class="{ 'json-invalid': jsonErrors[`${row.__realIndex}:${p.key}`] }"
 									@change="updateJson(row.__realIndex, p.key, value($event))" />
 							</label>
@@ -127,11 +127,13 @@
 
 <script setup>
 import { ATable, ARow } from "@stonecrop/atable";
-import { CANONICAL_COMPONENTS } from "@stonecrop/schema";
+import { CANONICAL_COMPONENTS, INTROSPECTED_IDENTITY_PROPS } from "@stonecrop/schema";
 import { computed, nextTick, ref, useId } from "vue";
+const IDENTITY_PROPS = new Set(INTROSPECTED_IDENTITY_PROPS);
+const isIdentity = (key) => IDENTITY_PROPS.has(key);
 const componentListId = useId();
 const TEXT_PROPS = [
-  { key: "doctype", label: "Link target", identity: true },
+  { key: "doctype", label: "Link target" },
   { key: "width", label: "Width" },
   { key: "mask", label: "Mask" },
   { key: "format", label: "Format" },
@@ -143,19 +145,18 @@ const SELECT_PROPS = [
   {
     key: "cardinality",
     label: "Cardinality",
-    options: ["atMostOne", "one", "noneOrMany", "atLeastOne"],
-    identity: true
+    options: ["atMostOne", "one", "noneOrMany", "atLeastOne"]
   }
 ];
 const BOOL_PROPS = [
   { key: "readOnly", label: "Read only" },
   { key: "hidden", label: "Hidden" },
   { key: "edit", label: "Editable in table" },
-  { key: "primaryKey", label: "Primary key", identity: true },
+  { key: "primaryKey", label: "Primary key" },
   { key: "computed", label: "Computed (no DB column)" }
 ];
 const JSON_PROPS = [
-  { key: "options", label: "Options", identity: true },
+  { key: "options", label: "Options" },
   { key: "default", label: "Default" }
 ];
 const FIELD_COLUMNS = [

package/dist/types.d.mts

@@ -1,3 +1,3 @@
-export { default } from './module.mjs'
+export { type STONECROP_PACKAGES, default } from './module.mjs'
 
 export { type ModuleOptions, type ParsedDoctype, type RouteStrategyFn } from './module.mjs'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stonecrop/nuxt",
-  "version": "0.16.4",
+  "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/atable": "0.16.4",
-    "@stonecrop/aform": "0.16.4",
-    "@stonecrop/casl-middleware": "0.16.4",
-    "@stonecrop/code-editor": "0.16.4",
-    "@stonecrop/desktop": "0.16.4",
-    "@stonecrop/graphql-middleware": "0.16.4",
-    "@stonecrop/nuxt-grafserv": "0.16.4",
-    "@stonecrop/graphql-client": "0.16.4",
-    "@stonecrop/schema": "0.16.4",
-    "@stonecrop/stonecrop": "0.16.4",
-    "@stonecrop/themes": "0.16.4",
-    "@stonecrop/node-editor": "0.16.4"
+    "@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/src/cli/installers/frontend.ts

@@ -10,6 +10,7 @@ import consola from 'consola'
 import { addDependencies } from '../utils/package'
 import { updateNuxtConfig } from '../utils/config'
 import { loadTemplate } from '../utils/templates'
+import { STONECROP_PACKAGES } from '../../module'
 
 export interface FrontendInstallerOptions {
 	cwd: string
@@ -60,15 +61,11 @@ export async function installFrontend(options: FrontendInstallerOptions): Promis
 			// This is required because the packages use vite-plugin-lib-inject-css which adds
 			// CSS imports to the JavaScript bundles. Node.js ESM loader doesn't understand .css files,
 			// so we need Nitro to bundle these packages (allowing Vite to process the CSS)
+			// Shares the module's list rather than restating it: the two previously disagreed
+			// (this one had `desktop` but not `themes`; the module's had the reverse), so a
+			// scaffolded app and the module inlined different sets.
 			nitroConfig: {
-				externalsInline: [
-					'@stonecrop/aform',
-					'@stonecrop/atable',
-					'@stonecrop/stonecrop',
-					'@stonecrop/node-editor',
-					'@stonecrop/utilities',
-					'@stonecrop/desktop',
-				],
+				externalsInline: [...STONECROP_PACKAGES],
 			},
 			css: ['@stonecrop/desktop/styles'],
 		})

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,
+						}
+					})
 				})
 			},