@rvoh/psychic 3.0.5 → 3.1.1

package/dist/cjs/src/cli/helpers/PackageManager.js

@@ -32,4 +32,14 @@ export default class PackageManager {
                 return `${this.packageManager} ${cmd}`;
         }
     }
+    static exec(cmd) {
+        switch (this.packageManager) {
+            case 'npm':
+                return `npm exec -- ${cmd}`;
+            case 'yarn':
+                return `yarn ${cmd}`;
+            default:
+                return `${this.packageManager} exec ${cmd}`;
+        }
+    }
 }

package/dist/cjs/src/generate/helpers/reduxBindings/writeInitializer.js

@@ -1,6 +1,7 @@
 import { camelize, pascalize } from '@rvoh/dream/utils';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
+import PackageManager from '../../../cli/helpers/PackageManager.js';
 import psychicPath from '../../../helpers/path/psychicPath.js';
 export default async function writeInitializer({ exportName }) {
     const pascalized = pascalize(exportName);
@@ -22,6 +23,7 @@ export default async function writeInitializer({ exportName }) {
         await fs.mkdir(destDir, { recursive: true });
     }
     const filePath = path.join('.', 'src', 'conf', 'openapi', `${camelized}.openapi-codegen.json`);
+    const execCmd = PackageManager.exec(`rtk-query-codegen-openapi ${filePath}`);
     const contents = `\
 import { DreamCLI } from '@rvoh/dream/system'
 import { PsychicApp } from '@rvoh/psychic'
@@ -31,7 +33,7 @@ export default function initialize${pascalized}(psy: PsychicApp) {
   psy.on('cli:sync', async () => {
     if (AppEnv.isDevelopmentOrTest) {
       await DreamCLI.logger.logProgress(\`[${camelized}] syncing...\`, async () => {
-        await DreamCLI.spawn('npx @rtk-query/codegen-openapi ${filePath}', {
+        await DreamCLI.spawn('${execCmd}', {
           onStdout: message => {
             DreamCLI.logger.logContinueProgress(\`[${camelized}]\` + ' ' + message, {
               logPrefixColor: 'green',

package/dist/cjs/src/generate/helpers/syncOpenapiTypescript/generateInitializer.js

@@ -1,6 +1,7 @@
 import { hyphenize } from '@rvoh/dream/utils';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
+import PackageManager from '../../../cli/helpers/PackageManager.js';
 import psychicPath from '../../../helpers/path/psychicPath.js';
 export default async function generateInitializer(openapiFilepath, outfile, initializerFilename) {
     if (!/\.d\.ts$/.test(outfile))
@@ -15,6 +16,7 @@ export default async function generateInitializer(openapiFilepath, outfile, init
     catch {
         await fs.mkdir(destDir, { recursive: true });
     }
+    const execCmd = PackageManager.exec(`openapi-typescript ${openapiFilepath} -o ${outfile}`);
     const contents = `\
 import { DreamCLI } from '@rvoh/dream/system'
 import { PsychicApp } from "@rvoh/psychic"
@@ -24,7 +26,7 @@ export default (psy: PsychicApp) => {
   psy.on('cli:sync', async () => {
     if (AppEnv.isDevelopmentOrTest) {
       await DreamCLI.logger.logProgress(\`[${hyphenized}] extracting types from ${openapiFilepath} to ${outfile}...\`, async () => {
-        await DreamCLI.spawn('npx openapi-typescript ${openapiFilepath} -o ${outfile}')
+        await DreamCLI.spawn('${execCmd}')
       })
     }
   })

package/dist/cjs/src/generate/helpers/zustandBindings/generateStoreFromSdk.js

@@ -0,0 +1,74 @@
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+/**
+ * Reads the generated sdk.gen.ts file, extracts exported function names,
+ * and generates a store.gen.ts file with Zustand stores wrapping each
+ * SDK function.
+ *
+ * This is called during `psy sync` after @hey-api/openapi-ts has generated
+ * the SDK, so that the store stays in sync with the API.
+ */
+export default async function generateZustandStoreFromSdk(outputDir) {
+    const sdkPath = path.join(outputDir, 'sdk.gen.ts');
+    const storePath = path.join(outputDir, 'store.gen.ts');
+    let sdkContents;
+    try {
+        sdkContents = (await fs.readFile(sdkPath)).toString();
+    }
+    catch {
+        return; // sdk.gen.ts doesn't exist yet, nothing to generate from
+    }
+    const functionNames = extractExportedFunctionNames(sdkContents);
+    if (functionNames.length === 0)
+        return;
+    const storeLines = functionNames.map(name => {
+        const hookName = 'use' + name.charAt(0).toUpperCase() + name.slice(1);
+        return `export const ${hookName} = createSdkStore(sdk.${name})`;
+    });
+    const contents = `\
+// This file is auto-generated during sync — do not edit
+import { create } from 'zustand'
+import * as sdk from './sdk.gen'
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type SdkFn = (...args: any[]) => Promise<{ data?: any; error?: any }>
+
+interface SdkStore<TData, TArgs extends unknown[]> {
+  data: TData | undefined
+  error: unknown
+  isLoading: boolean
+  fetch: (...args: TArgs) => Promise<TData | undefined>
+  reset: () => void
+}
+
+function createSdkStore<T extends SdkFn>(fn: T) {
+  type TData = Awaited<ReturnType<T>>['data']
+  return create<SdkStore<TData, Parameters<T>>>()((set) => ({
+    data: undefined as TData | undefined,
+    error: undefined as unknown,
+    isLoading: false,
+
+    fetch: async (...args: Parameters<T>) => {
+      set({ isLoading: true, error: undefined })
+      const { data, error } = await (fn as SdkFn)(...args)
+      set({ data, error, isLoading: false })
+      return data as TData | undefined
+    },
+
+    reset: () => set({ data: undefined, error: undefined, isLoading: false }),
+  }))
+}
+
+${storeLines.join('\n')}
+`;
+    await fs.writeFile(storePath, contents);
+}
+function extractExportedFunctionNames(sdkContents) {
+    const names = [];
+    const pattern = /export const (\w+)\s*=/g;
+    let match;
+    while ((match = pattern.exec(sdkContents)) !== null) {
+        names.push(match[1]);
+    }
+    return names;
+}

package/dist/cjs/src/generate/helpers/zustandBindings/printFinalStepsMessage.js

@@ -8,17 +8,19 @@ export default function printFinalStepsMessage(opts) {
     const usageLine = colorize(`  const { data, error } = await getAdminCities()`, {
         color: 'green',
     });
-    const zustandLine = colorize(`  const { data } = await getAdminCities()
-    set({ cities: data?.results })`, { color: 'green' });
+    const storeImportLine = colorize(`+ import { useGetAdminCities } from '${opts.outputDir}/store.gen'`, {
+        color: 'green',
+    });
     DreamCLI.logger.log(`
 Finished generating @hey-api/openapi-ts bindings for your application.
 
 First, you will need to be sure to sync, so that the typed API functions
-are generated from your openapi schema:
+and Zustand store are generated from your openapi schema:
 
   pnpm psy sync
 
-This will generate typed API functions and types in ${opts.outputDir}/
+This will generate typed API functions in ${opts.outputDir}/sdk.gen.ts
+and a Zustand store in ${opts.outputDir}/store.gen.ts
 
 To use the generated API, first import the client config at your app's
 entry point to configure the base URL and credentials:
@@ -32,16 +34,11 @@ ${sdkImportLine}
 // all functions are fully typed with request params and response types
 ${usageLine}
 
-To use with a Zustand store:
+Or use the auto-generated Zustand store hooks for state management:
 
-import { create } from 'zustand'
-${sdkImportLine}
+${storeImportLine}
 
-const useCitiesStore = create((set) => ({
-  cities: [],
-  fetchCities: async () => {
-${zustandLine}
-  },
-}))
+// each hook provides { data, error, isLoading, fetch, reset }
+const { data, isLoading, fetch } = useGetAdminCities()
 `, { logPrefix: '' });
 }

package/dist/cjs/src/generate/helpers/zustandBindings/writeInitializer.js

@@ -1,36 +1,26 @@
 import { camelize, pascalize } from '@rvoh/dream/utils';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
+import PackageManager from '../../../cli/helpers/PackageManager.js';
 import psychicPath from '../../../helpers/path/psychicPath.js';
 export default async function writeInitializer({ exportName, schemaFile, outputDir, }) {
     const pascalized = pascalize(exportName);
     const camelized = camelize(exportName);
+    const execCmd = PackageManager.exec(`openapi-ts -i ${schemaFile} -o ${outputDir}`);
     const destDir = path.join(psychicPath('conf'), 'initializers', 'openapi');
     const initializerFilename = `${camelized}.ts`;
     const initializerPath = path.join(destDir, initializerFilename);
-    try {
-        await fs.access(initializerPath);
-        return; // early return if the file already exists
-    }
-    catch {
-        // noop
-    }
-    try {
-        await fs.access(destDir);
-    }
-    catch {
-        await fs.mkdir(destDir, { recursive: true });
-    }
     const contents = `\
 import { DreamCLI } from '@rvoh/dream/system'
 import { PsychicApp } from '@rvoh/psychic'
+import { generateZustandStoreFromSdk } from '@rvoh/psychic/system'
 import AppEnv from '../../AppEnv.js'
 
 export default function initialize${pascalized}(psy: PsychicApp) {
   psy.on('cli:sync', async () => {
     if (AppEnv.isDevelopmentOrTest) {
       await DreamCLI.logger.logProgress(\`[${camelized}] syncing...\`, async () => {
-        await DreamCLI.spawn('npx @hey-api/openapi-ts -i ${schemaFile} -o ${outputDir}', {
+        await DreamCLI.spawn('${execCmd}', {
           onStdout: message => {
             DreamCLI.logger.logContinueProgress(\`[${camelized}]\` + ' ' + message, {
               logPrefixColor: 'green',
@@ -38,9 +28,28 @@ export default function initialize${pascalized}(psy: PsychicApp) {
           },
         })
       })
+
+      await DreamCLI.logger.logProgress(\`[${camelized}] generating zustand store...\`, async () => {
+        await generateZustandStoreFromSdk('${outputDir}')
+      })
     }
   })
 }\
 `;
+    try {
+        const existingContents = (await fs.readFile(initializerPath)).toString();
+        if (existingContents === contents) {
+            return; // early return if the file already matches exactly
+        }
+    }
+    catch {
+        // noop — file doesn't exist yet
+    }
+    try {
+        await fs.access(destDir);
+    }
+    catch {
+        await fs.mkdir(destDir, { recursive: true });
+    }
     await fs.writeFile(initializerPath, contents);
 }

package/dist/cjs/src/generate/openapi/zustandBindings.js

@@ -14,6 +14,7 @@ import writeInitializer from '../helpers/zustandBindings/writeInitializer.js';
  * * generates the client config file if it does not exist
  * * generates an initializer, which taps into the sync hooks
  *   to automatically run the @hey-api/openapi-ts CLI util
+ *   and generate a zustand store from the SDK output
  * * prints a helpful message, instructing devs on the final
  *   steps for using the generated typed API functions
  *   within their client application.

package/dist/cjs/src/openapi-renderer/SerializerOpenapiRenderer.js

@@ -139,13 +139,16 @@ export default class SerializerOpenapiRenderer {
                         const openapi = attribute.options.openapi;
                         newlyReferencedSerializers = allSerializersFromHandWrittenOpenapi(openapi);
                         let target;
+                        let delegatedAssociationOptional = false;
                         if (attributeType === 'delegatedAttribute' && DataTypeForOpenapi?.isDream) {
                             const source = DataTypeForOpenapi;
-                            // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-                            const associatedModelOrModels = source['getAssociationMetadata'](attribute.targetName)?.modelCB();
+                            const association = source['getAssociationMetadata'](attribute.targetName);
+                            const associatedModelOrModels = association?.modelCB();
                             target = Array.isArray(associatedModelOrModels)
                                 ? associatedModelOrModels[0]
                                 : associatedModelOrModels;
+                            delegatedAssociationOptional = !!association
+                                ?.optional;
                         }
                         else if (attributeType === 'delegatedAttribute') {
                             target = undefined;
@@ -153,11 +156,36 @@ export default class SerializerOpenapiRenderer {
                         else {
                             target = DataTypeForOpenapi;
                         }
-                        accumulator[outputAttributeName] = allSerializersToRefsInOpenapi(target?.isDream
+                        const resolvedSchema = allSerializersToRefsInOpenapi(target?.isDream
                             ? dreamColumnOpenapiShape(this.serializer.globalName, target, attribute.name, openapi, {
                                 suppressResponseEnums: this.suppressResponseEnums,
                             })
                             : openapiShorthandToOpenapi(openapi));
+                        const optional = attributeType === 'delegatedAttribute' &&
+                            (attribute.options.optional ?? delegatedAssociationOptional);
+                        if (optional && !openapiSchemaIncludesNull(resolvedSchema)) {
+                            const schemaRecord = resolvedSchema;
+                            if (typeof schemaRecord.type === 'string') {
+                                accumulator[outputAttributeName] = {
+                                    ...schemaRecord,
+                                    type: [schemaRecord.type, 'null'],
+                                };
+                            }
+                            else if (Array.isArray(schemaRecord.type)) {
+                                accumulator[outputAttributeName] = {
+                                    ...schemaRecord,
+                                    type: [...schemaRecord.type, 'null'],
+                                };
+                            }
+                            else {
+                                accumulator[outputAttributeName] = {
+                                    anyOf: [resolvedSchema, NULL_OBJECT_OPENAPI],
+                                };
+                            }
+                        }
+                        else {
+                            accumulator[outputAttributeName] = resolvedSchema;
+                        }
                         return accumulator;
                     }
                     /////////////////////////////////////////////
@@ -375,3 +403,16 @@ function descendantSerializers(serializer, alreadyExtractedDescendantSerializers
 // throws an error)
 class CallingSerializersThrewError extends Error {
 }
+function openapiSchemaIncludesNull(schema) {
+    if (typeof schema !== 'object' || schema === null)
+        return false;
+    const schemaRecord = schema;
+    if (Array.isArray(schemaRecord.type) && schemaRecord.type.includes('null'))
+        return true;
+    if (schemaRecord.type === 'null')
+        return true;
+    if (Array.isArray(schemaRecord.anyOf) &&
+        schemaRecord.anyOf.some((member) => openapiSchemaIncludesNull(member)))
+        return true;
+    return false;
+}

package/dist/cjs/src/package-exports/system.js

@@ -1,3 +1,4 @@
+export { default as generateZustandStoreFromSdk } from '../generate/helpers/zustandBindings/generateStoreFromSdk.js';
 export { default as PsychicBin } from '../bin/index.js';
 export { default as PsychicLogos } from '../cli/helpers/PsychicLogos.js';
 export { default as PsychicCLI } from '../cli/index.js';

package/dist/esm/src/cli/helpers/PackageManager.js

@@ -32,4 +32,14 @@ export default class PackageManager {
                 return `${this.packageManager} ${cmd}`;
         }
     }
+    static exec(cmd) {
+        switch (this.packageManager) {
+            case 'npm':
+                return `npm exec -- ${cmd}`;
+            case 'yarn':
+                return `yarn ${cmd}`;
+            default:
+                return `${this.packageManager} exec ${cmd}`;
+        }
+    }
 }

package/dist/esm/src/generate/helpers/reduxBindings/writeInitializer.js

@@ -1,6 +1,7 @@
 import { camelize, pascalize } from '@rvoh/dream/utils';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
+import PackageManager from '../../../cli/helpers/PackageManager.js';
 import psychicPath from '../../../helpers/path/psychicPath.js';
 export default async function writeInitializer({ exportName }) {
     const pascalized = pascalize(exportName);
@@ -22,6 +23,7 @@ export default async function writeInitializer({ exportName }) {
         await fs.mkdir(destDir, { recursive: true });
     }
     const filePath = path.join('.', 'src', 'conf', 'openapi', `${camelized}.openapi-codegen.json`);
+    const execCmd = PackageManager.exec(`rtk-query-codegen-openapi ${filePath}`);
     const contents = `\
 import { DreamCLI } from '@rvoh/dream/system'
 import { PsychicApp } from '@rvoh/psychic'
@@ -31,7 +33,7 @@ export default function initialize${pascalized}(psy: PsychicApp) {
   psy.on('cli:sync', async () => {
     if (AppEnv.isDevelopmentOrTest) {
       await DreamCLI.logger.logProgress(\`[${camelized}] syncing...\`, async () => {
-        await DreamCLI.spawn('npx @rtk-query/codegen-openapi ${filePath}', {
+        await DreamCLI.spawn('${execCmd}', {
           onStdout: message => {
             DreamCLI.logger.logContinueProgress(\`[${camelized}]\` + ' ' + message, {
               logPrefixColor: 'green',

package/dist/esm/src/generate/helpers/syncOpenapiTypescript/generateInitializer.js

@@ -1,6 +1,7 @@
 import { hyphenize } from '@rvoh/dream/utils';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
+import PackageManager from '../../../cli/helpers/PackageManager.js';
 import psychicPath from '../../../helpers/path/psychicPath.js';
 export default async function generateInitializer(openapiFilepath, outfile, initializerFilename) {
     if (!/\.d\.ts$/.test(outfile))
@@ -15,6 +16,7 @@ export default async function generateInitializer(openapiFilepath, outfile, init
     catch {
         await fs.mkdir(destDir, { recursive: true });
     }
+    const execCmd = PackageManager.exec(`openapi-typescript ${openapiFilepath} -o ${outfile}`);
     const contents = `\
 import { DreamCLI } from '@rvoh/dream/system'
 import { PsychicApp } from "@rvoh/psychic"
@@ -24,7 +26,7 @@ export default (psy: PsychicApp) => {
   psy.on('cli:sync', async () => {
     if (AppEnv.isDevelopmentOrTest) {
       await DreamCLI.logger.logProgress(\`[${hyphenized}] extracting types from ${openapiFilepath} to ${outfile}...\`, async () => {
-        await DreamCLI.spawn('npx openapi-typescript ${openapiFilepath} -o ${outfile}')
+        await DreamCLI.spawn('${execCmd}')
       })
     }
   })

package/dist/esm/src/generate/helpers/zustandBindings/generateStoreFromSdk.js

@@ -0,0 +1,74 @@
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+/**
+ * Reads the generated sdk.gen.ts file, extracts exported function names,
+ * and generates a store.gen.ts file with Zustand stores wrapping each
+ * SDK function.
+ *
+ * This is called during `psy sync` after @hey-api/openapi-ts has generated
+ * the SDK, so that the store stays in sync with the API.
+ */
+export default async function generateZustandStoreFromSdk(outputDir) {
+    const sdkPath = path.join(outputDir, 'sdk.gen.ts');
+    const storePath = path.join(outputDir, 'store.gen.ts');
+    let sdkContents;
+    try {
+        sdkContents = (await fs.readFile(sdkPath)).toString();
+    }
+    catch {
+        return; // sdk.gen.ts doesn't exist yet, nothing to generate from
+    }
+    const functionNames = extractExportedFunctionNames(sdkContents);
+    if (functionNames.length === 0)
+        return;
+    const storeLines = functionNames.map(name => {
+        const hookName = 'use' + name.charAt(0).toUpperCase() + name.slice(1);
+        return `export const ${hookName} = createSdkStore(sdk.${name})`;
+    });
+    const contents = `\
+// This file is auto-generated during sync — do not edit
+import { create } from 'zustand'
+import * as sdk from './sdk.gen'
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type SdkFn = (...args: any[]) => Promise<{ data?: any; error?: any }>
+
+interface SdkStore<TData, TArgs extends unknown[]> {
+  data: TData | undefined
+  error: unknown
+  isLoading: boolean
+  fetch: (...args: TArgs) => Promise<TData | undefined>
+  reset: () => void
+}
+
+function createSdkStore<T extends SdkFn>(fn: T) {
+  type TData = Awaited<ReturnType<T>>['data']
+  return create<SdkStore<TData, Parameters<T>>>()((set) => ({
+    data: undefined as TData | undefined,
+    error: undefined as unknown,
+    isLoading: false,
+
+    fetch: async (...args: Parameters<T>) => {
+      set({ isLoading: true, error: undefined })
+      const { data, error } = await (fn as SdkFn)(...args)
+      set({ data, error, isLoading: false })
+      return data as TData | undefined
+    },
+
+    reset: () => set({ data: undefined, error: undefined, isLoading: false }),
+  }))
+}
+
+${storeLines.join('\n')}
+`;
+    await fs.writeFile(storePath, contents);
+}
+function extractExportedFunctionNames(sdkContents) {
+    const names = [];
+    const pattern = /export const (\w+)\s*=/g;
+    let match;
+    while ((match = pattern.exec(sdkContents)) !== null) {
+        names.push(match[1]);
+    }
+    return names;
+}

package/dist/esm/src/generate/helpers/zustandBindings/printFinalStepsMessage.js

@@ -8,17 +8,19 @@ export default function printFinalStepsMessage(opts) {
     const usageLine = colorize(`  const { data, error } = await getAdminCities()`, {
         color: 'green',
     });
-    const zustandLine = colorize(`  const { data } = await getAdminCities()
-    set({ cities: data?.results })`, { color: 'green' });
+    const storeImportLine = colorize(`+ import { useGetAdminCities } from '${opts.outputDir}/store.gen'`, {
+        color: 'green',
+    });
     DreamCLI.logger.log(`
 Finished generating @hey-api/openapi-ts bindings for your application.
 
 First, you will need to be sure to sync, so that the typed API functions
-are generated from your openapi schema:
+and Zustand store are generated from your openapi schema:
 
   pnpm psy sync
 
-This will generate typed API functions and types in ${opts.outputDir}/
+This will generate typed API functions in ${opts.outputDir}/sdk.gen.ts
+and a Zustand store in ${opts.outputDir}/store.gen.ts
 
 To use the generated API, first import the client config at your app's
 entry point to configure the base URL and credentials:
@@ -32,16 +34,11 @@ ${sdkImportLine}
 // all functions are fully typed with request params and response types
 ${usageLine}
 
-To use with a Zustand store:
+Or use the auto-generated Zustand store hooks for state management:
 
-import { create } from 'zustand'
-${sdkImportLine}
+${storeImportLine}
 
-const useCitiesStore = create((set) => ({
-  cities: [],
-  fetchCities: async () => {
-${zustandLine}
-  },
-}))
+// each hook provides { data, error, isLoading, fetch, reset }
+const { data, isLoading, fetch } = useGetAdminCities()
 `, { logPrefix: '' });
 }

package/dist/esm/src/generate/helpers/zustandBindings/writeInitializer.js

@@ -1,36 +1,26 @@
 import { camelize, pascalize } from '@rvoh/dream/utils';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
+import PackageManager from '../../../cli/helpers/PackageManager.js';
 import psychicPath from '../../../helpers/path/psychicPath.js';
 export default async function writeInitializer({ exportName, schemaFile, outputDir, }) {
     const pascalized = pascalize(exportName);
     const camelized = camelize(exportName);
+    const execCmd = PackageManager.exec(`openapi-ts -i ${schemaFile} -o ${outputDir}`);
     const destDir = path.join(psychicPath('conf'), 'initializers', 'openapi');
     const initializerFilename = `${camelized}.ts`;
     const initializerPath = path.join(destDir, initializerFilename);
-    try {
-        await fs.access(initializerPath);
-        return; // early return if the file already exists
-    }
-    catch {
-        // noop
-    }
-    try {
-        await fs.access(destDir);
-    }
-    catch {
-        await fs.mkdir(destDir, { recursive: true });
-    }
     const contents = `\
 import { DreamCLI } from '@rvoh/dream/system'
 import { PsychicApp } from '@rvoh/psychic'
+import { generateZustandStoreFromSdk } from '@rvoh/psychic/system'
 import AppEnv from '../../AppEnv.js'
 
 export default function initialize${pascalized}(psy: PsychicApp) {
   psy.on('cli:sync', async () => {
     if (AppEnv.isDevelopmentOrTest) {
       await DreamCLI.logger.logProgress(\`[${camelized}] syncing...\`, async () => {
-        await DreamCLI.spawn('npx @hey-api/openapi-ts -i ${schemaFile} -o ${outputDir}', {
+        await DreamCLI.spawn('${execCmd}', {
           onStdout: message => {
             DreamCLI.logger.logContinueProgress(\`[${camelized}]\` + ' ' + message, {
               logPrefixColor: 'green',
@@ -38,9 +28,28 @@ export default function initialize${pascalized}(psy: PsychicApp) {
           },
         })
       })
+
+      await DreamCLI.logger.logProgress(\`[${camelized}] generating zustand store...\`, async () => {
+        await generateZustandStoreFromSdk('${outputDir}')
+      })
     }
   })
 }\
 `;
+    try {
+        const existingContents = (await fs.readFile(initializerPath)).toString();
+        if (existingContents === contents) {
+            return; // early return if the file already matches exactly
+        }
+    }
+    catch {
+        // noop — file doesn't exist yet
+    }
+    try {
+        await fs.access(destDir);
+    }
+    catch {
+        await fs.mkdir(destDir, { recursive: true });
+    }
     await fs.writeFile(initializerPath, contents);
 }

package/dist/esm/src/generate/openapi/zustandBindings.js

@@ -14,6 +14,7 @@ import writeInitializer from '../helpers/zustandBindings/writeInitializer.js';
  * * generates the client config file if it does not exist
  * * generates an initializer, which taps into the sync hooks
  *   to automatically run the @hey-api/openapi-ts CLI util
+ *   and generate a zustand store from the SDK output
  * * prints a helpful message, instructing devs on the final
  *   steps for using the generated typed API functions
  *   within their client application.

package/dist/esm/src/openapi-renderer/SerializerOpenapiRenderer.js

@@ -139,13 +139,16 @@ export default class SerializerOpenapiRenderer {
                         const openapi = attribute.options.openapi;
                         newlyReferencedSerializers = allSerializersFromHandWrittenOpenapi(openapi);
                         let target;
+                        let delegatedAssociationOptional = false;
                         if (attributeType === 'delegatedAttribute' && DataTypeForOpenapi?.isDream) {
                             const source = DataTypeForOpenapi;
-                            // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-                            const associatedModelOrModels = source['getAssociationMetadata'](attribute.targetName)?.modelCB();
+                            const association = source['getAssociationMetadata'](attribute.targetName);
+                            const associatedModelOrModels = association?.modelCB();
                             target = Array.isArray(associatedModelOrModels)
                                 ? associatedModelOrModels[0]
                                 : associatedModelOrModels;
+                            delegatedAssociationOptional = !!association
+                                ?.optional;
                         }
                         else if (attributeType === 'delegatedAttribute') {
                             target = undefined;
@@ -153,11 +156,36 @@ export default class SerializerOpenapiRenderer {
                         else {
                             target = DataTypeForOpenapi;
                         }
-                        accumulator[outputAttributeName] = allSerializersToRefsInOpenapi(target?.isDream
+                        const resolvedSchema = allSerializersToRefsInOpenapi(target?.isDream
                             ? dreamColumnOpenapiShape(this.serializer.globalName, target, attribute.name, openapi, {
                                 suppressResponseEnums: this.suppressResponseEnums,
                             })
                             : openapiShorthandToOpenapi(openapi));
+                        const optional = attributeType === 'delegatedAttribute' &&
+                            (attribute.options.optional ?? delegatedAssociationOptional);
+                        if (optional && !openapiSchemaIncludesNull(resolvedSchema)) {
+                            const schemaRecord = resolvedSchema;
+                            if (typeof schemaRecord.type === 'string') {
+                                accumulator[outputAttributeName] = {
+                                    ...schemaRecord,
+                                    type: [schemaRecord.type, 'null'],
+                                };
+                            }
+                            else if (Array.isArray(schemaRecord.type)) {
+                                accumulator[outputAttributeName] = {
+                                    ...schemaRecord,
+                                    type: [...schemaRecord.type, 'null'],
+                                };
+                            }
+                            else {
+                                accumulator[outputAttributeName] = {
+                                    anyOf: [resolvedSchema, NULL_OBJECT_OPENAPI],
+                                };
+                            }
+                        }
+                        else {
+                            accumulator[outputAttributeName] = resolvedSchema;
+                        }
                         return accumulator;
                     }
                     /////////////////////////////////////////////
@@ -375,3 +403,16 @@ function descendantSerializers(serializer, alreadyExtractedDescendantSerializers
 // throws an error)
 class CallingSerializersThrewError extends Error {
 }
+function openapiSchemaIncludesNull(schema) {
+    if (typeof schema !== 'object' || schema === null)
+        return false;
+    const schemaRecord = schema;
+    if (Array.isArray(schemaRecord.type) && schemaRecord.type.includes('null'))
+        return true;
+    if (schemaRecord.type === 'null')
+        return true;
+    if (Array.isArray(schemaRecord.anyOf) &&
+        schemaRecord.anyOf.some((member) => openapiSchemaIncludesNull(member)))
+        return true;
+    return false;
+}

package/dist/esm/src/package-exports/system.js

@@ -1,3 +1,4 @@
+export { default as generateZustandStoreFromSdk } from '../generate/helpers/zustandBindings/generateStoreFromSdk.js';
 export { default as PsychicBin } from '../bin/index.js';
 export { default as PsychicLogos } from '../cli/helpers/PsychicLogos.js';
 export { default as PsychicCLI } from '../cli/index.js';

package/dist/types/src/cli/helpers/PackageManager.d.ts

@@ -4,4 +4,5 @@ export default class PackageManager {
         dev?: boolean;
     }): string;
     static run(cmd: string): string;
+    static exec(cmd: string): string;
 }

package/dist/types/src/generate/helpers/zustandBindings/generateStoreFromSdk.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Reads the generated sdk.gen.ts file, extracts exported function names,
+ * and generates a store.gen.ts file with Zustand stores wrapping each
+ * SDK function.
+ *
+ * This is called during `psy sync` after @hey-api/openapi-ts has generated
+ * the SDK, so that the store stays in sync with the API.
+ */
+export default function generateZustandStoreFromSdk(outputDir: string): Promise<void>;

package/dist/types/src/generate/openapi/zustandBindings.d.ts

@@ -8,6 +8,7 @@
  * * generates the client config file if it does not exist
  * * generates an initializer, which taps into the sync hooks
  *   to automatically run the @hey-api/openapi-ts CLI util
+ *   and generate a zustand store from the SDK output
  * * prints a helpful message, instructing devs on the final
  *   steps for using the generated typed API functions
  *   within their client application.

package/dist/types/src/package-exports/system.d.ts

@@ -1,3 +1,4 @@
+export { default as generateZustandStoreFromSdk } from '../generate/helpers/zustandBindings/generateStoreFromSdk.js';
 export { default as PsychicBin } from '../bin/index.js';
 export { default as PsychicLogos } from '../cli/helpers/PsychicLogos.js';
 export { default as PsychicCLI } from '../cli/index.js';

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic",
   "description": "Typescript web framework",
-  "version": "3.0.5",
+  "version": "3.1.1",
   "author": "RVOHealth",
   "repository": {
     "type": "git",
@@ -75,7 +75,7 @@
     "@koa/cors": "^5.0.0",
     "@koa/etag": "^5.0.2",
     "@koa/router": "^15.3.0",
-    "@rvoh/dream": "^2.4.0",
+    "@rvoh/dream": "^2.6.0",
     "@types/koa": "^3.0.1",
     "@types/koa-bodyparser": "^4.3.12",
     "@types/koa-conditional-get": "^2.0.3",
@@ -92,7 +92,7 @@
     "@koa/cors": "^5.0.0",
     "@koa/etag": "^5.0.2",
     "@koa/router": "^15.3.1",
-    "@rvoh/dream": "^2.4.0",
+    "@rvoh/dream": "^2.6.0",
     "@rvoh/dream-spec-helpers": "^2.1.1",
     "@rvoh/psychic-spec-helpers": "3.0.0",
     "@types/koa": "^3.0.1",