@carlonicora/nextjs-jsonapi 1.8.0 → 1.9.0

package/scripts/generate-web-module/templates/components/editor.template.ts

@@ -271,7 +271,7 @@ function generateFormSchema(data: FrontendTemplateData): string {
   // Add name field for Content-extending modules
   if (extendsContent) {
     schemaFields.push(`    name: z.string().min(1, {
-      message: t(\`features.${names.camelCase}.fields.name.error\`),
+      message: t(\`features.${names.camelCase.toLowerCase()}.fields.name.error\`),
     }),`);
   }
 
@@ -283,7 +283,7 @@ function generateFormSchema(data: FrontendTemplateData): string {
         schemaFields.push(`    ${field.name}: z.string().optional(),`);
       } else {
         schemaFields.push(`    ${field.name}: z.string().min(1, {
-      message: t(\`features.${names.camelCase}.fields.${field.name}.error\`),
+      message: t(\`features.${names.camelCase.toLowerCase()}.fields.${field.name}.error\`),
     }),`);
       }
     } else {
@@ -294,6 +294,7 @@ function generateFormSchema(data: FrontendTemplateData): string {
   // Relationship fields
   relationships.forEach((rel) => {
     const fieldId = toCamelCase(rel.variant || rel.name);
+    const fieldIdLower = fieldId.toLowerCase();
     if (rel.variant === AUTHOR_VARIANT) {
       schemaFields.push(`    ${fieldId}: userObjectSchema.refine((data) => data.id && data.id.length > 0, {
       message: t(\`generic.relationships.author.error\`),
@@ -303,7 +304,7 @@ function generateFormSchema(data: FrontendTemplateData): string {
         schemaFields.push(`    ${fieldId}: entityObjectSchema.optional(),`);
       } else {
         schemaFields.push(`    ${fieldId}: entityObjectSchema.refine((data) => data.id && data.id.length > 0, {
-      message: t(\`features.${names.camelCase}.relationships.${fieldId}.error\`),
+      message: t(\`features.${names.camelCase.toLowerCase()}.relationships.${fieldIdLower}.error\`),
     }),`);
       }
       // Add relationship property fields to schema
@@ -503,8 +504,8 @@ function generateFormFields(data: FrontendTemplateData): string {
     formElements.push(`              <FormInput
                 form={form}
                 id="name"
-                name={t(\`features.${names.camelCase}.fields.name.label\`)}
-                placeholder={t(\`features.${names.camelCase}.fields.name.placeholder\`)}
+                name={t(\`features.${names.camelCase.toLowerCase()}.fields.name.label\`)}
+                placeholder={t(\`features.${names.camelCase.toLowerCase()}.fields.name.placeholder\`)}
                 isRequired
               />`);
   }
@@ -516,7 +517,7 @@ function generateFormFields(data: FrontendTemplateData): string {
 
   fieldsToInclude.forEach((field) => {
     if (field.name === "content" || field.isContentField) {
-      formElements.push(`              <FormContainerGeneric form={form} id="${field.name}" name={t(\`features.${names.camelCase}.fields.${field.name}.label\`)}>
+      formElements.push(`              <FormContainerGeneric form={form} id="${field.name}" name={t(\`features.${names.camelCase.toLowerCase()}.fields.${field.name}.label\`)}>
                 <BlockNoteEditorContainer
                   id={form.getValues("id")}
                   type="${names.camelCase}"
@@ -524,7 +525,7 @@ function generateFormFields(data: FrontendTemplateData): string {
                   onChange={(content, isEmpty, hasUnresolvedDiff) => {
                     form.setValue("${field.name}", content);
                   }}
-                  placeholder={t(\`features.${names.camelCase}.fields.${field.name}.placeholder\`)}
+                  placeholder={t(\`features.${names.camelCase.toLowerCase()}.fields.${field.name}.placeholder\`)}
                   bordered
                 />
               </FormContainerGeneric>`);
@@ -533,8 +534,8 @@ function generateFormFields(data: FrontendTemplateData): string {
       formElements.push(`              <FormInput
                 form={form}
                 id="${field.name}"
-                name={t(\`features.${names.camelCase}.fields.${field.name}.label\`)}
-                placeholder={t(\`features.${names.camelCase}.fields.${field.name}.placeholder\`)}${isRequired ? "\n                isRequired" : ""}
+                name={t(\`features.${names.camelCase.toLowerCase()}.fields.${field.name}.label\`)}
+                placeholder={t(\`features.${names.camelCase.toLowerCase()}.fields.${field.name}.placeholder\`)}${isRequired ? "\n                isRequired" : ""}
               />`);
     }
   });
@@ -547,13 +548,14 @@ function generateFormFields(data: FrontendTemplateData): string {
     }
 
     const fieldId = toCamelCase(rel.variant || rel.name);
+    const fieldIdLower = fieldId.toLowerCase();
 
     if (rel.single) {
       formElements.push(`              <${rel.name}Selector
                 id="${fieldId}"
                 form={form}
-                label={t(\`features.${names.camelCase}.relationships.${fieldId}.label\`)}
-                placeholder={t(\`features.${names.camelCase}.relationships.${fieldId}.placeholder\`)}${!rel.nullable ? "\n                isRequired" : ""}
+                label={t(\`features.${names.camelCase.toLowerCase()}.relationships.${fieldIdLower}.label\`)}
+                placeholder={t(\`features.${names.camelCase.toLowerCase()}.relationships.${fieldIdLower}.placeholder\`)}${!rel.nullable ? "\n                isRequired" : ""}
               />`);
       // Add form inputs for relationship property fields
       if (rel.fields && rel.fields.length > 0) {
@@ -564,8 +566,8 @@ function generateFormFields(data: FrontendTemplateData): string {
               formElements.push(`              <FormInput
                 form={form}
                 id="${field.name}"
-                name={t(\`features.${names.camelCase}.relationships.${fieldId}.fields.${field.name}.label\`)}
-                placeholder={t(\`features.${names.camelCase}.relationships.${fieldId}.fields.${field.name}.placeholder\`)}
+                name={t(\`features.${names.camelCase.toLowerCase()}.relationships.${fieldIdLower}.fields.${field.name}.label\`)}
+                placeholder={t(\`features.${names.camelCase.toLowerCase()}.relationships.${fieldIdLower}.fields.${field.name}.placeholder\`)}
                 type="number"${isRequired ? "\n                isRequired" : ""}
               />`);
               break;
@@ -573,7 +575,7 @@ function generateFormFields(data: FrontendTemplateData): string {
               formElements.push(`              <FormCheckbox
                 form={form}
                 id="${field.name}"
-                name={t(\`features.${names.camelCase}.relationships.${fieldId}.fields.${field.name}.label\`)}
+                name={t(\`features.${names.camelCase.toLowerCase()}.relationships.${fieldIdLower}.fields.${field.name}.label\`)}
               />`);
               break;
             case "date":
@@ -581,7 +583,7 @@ function generateFormFields(data: FrontendTemplateData): string {
               formElements.push(`              <FormDatePicker
                 form={form}
                 id="${field.name}"
-                name={t(\`features.${names.camelCase}.relationships.${fieldId}.fields.${field.name}.label\`)}${isRequired ? "\n                isRequired" : ""}
+                name={t(\`features.${names.camelCase.toLowerCase()}.relationships.${fieldIdLower}.fields.${field.name}.label\`)}${isRequired ? "\n                isRequired" : ""}
               />`);
               break;
             case "string":
@@ -590,8 +592,8 @@ function generateFormFields(data: FrontendTemplateData): string {
               formElements.push(`              <FormInput
                 form={form}
                 id="${field.name}"
-                name={t(\`features.${names.camelCase}.relationships.${fieldId}.fields.${field.name}.label\`)}
-                placeholder={t(\`features.${names.camelCase}.relationships.${fieldId}.fields.${field.name}.placeholder\`)}${isRequired ? "\n                isRequired" : ""}
+                name={t(\`features.${names.camelCase.toLowerCase()}.relationships.${fieldIdLower}.fields.${field.name}.label\`)}
+                placeholder={t(\`features.${names.camelCase.toLowerCase()}.relationships.${fieldIdLower}.fields.${field.name}.placeholder\`)}${isRequired ? "\n                isRequired" : ""}
               />`);
               break;
           }

package/scripts/generate-web-module/transformers/i18n-generator.ts

@@ -20,7 +20,7 @@ export function generateI18nKeys(
   fields: FrontendField[],
   relationships: FrontendRelationship[]
 ): I18nKeySet {
-  const lowerModuleName = names.camelCase;
+  const lowerModuleName = names.camelCase.toLowerCase();
 
   // Generate field keys
   const fieldKeys: I18nKeySet["fields"] = {};
@@ -36,7 +36,7 @@ export function generateI18nKeys(
   const relationshipKeys: I18nKeySet["relationships"] = {};
   relationships.forEach((rel) => {
     const effectiveName = rel.variant || rel.name;
-    const effectiveKey = toCamelCase(effectiveName);
+    const effectiveKey = toCamelCase(effectiveName).toLowerCase();
     relationshipKeys[effectiveKey] = {
       label: toTitleCase(effectiveName),
       placeholder: `Select ${toTitleCase(effectiveName).toLowerCase()}`,

package/scripts/generate-web-module/utils/i18n-updater.ts

@@ -52,25 +52,12 @@ export function updateI18n(
     };
   }
 
-  // Check if module already exists in features
-  if (messages.features && messages.features[names.camelCase]) {
-    return {
-      success: true,
-      message: `Module ${names.camelCase} already exists in messages/${language}.json`,
-      alreadyExists: true,
-    };
-  }
-
   // Build the i18n messages for this module
   const moduleMessages = buildI18nMessages(i18nKeys);
+  const lowercaseModuleName = names.camelCase.toLowerCase();
 
-  // Add to features section
-  if (!messages.features) {
-    messages.features = {};
-  }
-  messages.features[names.camelCase] = moduleMessages.features[i18nKeys.moduleName];
-
-  // Add to types section (if not exists)
+  // Always ensure types section is updated (even if features already exist)
+  let typesUpdated = false;
   if (!messages.types) {
     messages.types = {};
   }
@@ -78,7 +65,46 @@ export function updateI18n(
   const lowercasePluralKey = names.pluralCamel.toLowerCase();
   if (typesKey && !messages.types[lowercasePluralKey]) {
     messages.types[lowercasePluralKey] = moduleMessages.types[typesKey];
+    typesUpdated = true;
+  }
+
+  // Check if module already exists in features
+  const featuresAlreadyExist = messages.features && messages.features[lowercaseModuleName];
+
+  if (featuresAlreadyExist) {
+    // Features exist, but we may have added types
+    if (typesUpdated) {
+      if (dryRun) {
+        return {
+          success: true,
+          message: `[DRY RUN] Module ${names.camelCase} exists, would add types.${lowercasePluralKey}`,
+          alreadyExists: true,
+        };
+      }
+
+      // Write updated content (types were added)
+      const updatedContent = JSON.stringify(messages, null, 2);
+      fs.writeFileSync(messagesPath, updatedContent, "utf-8");
+
+      return {
+        success: true,
+        message: `Module ${names.camelCase} exists, added types.${lowercasePluralKey}`,
+        alreadyExists: true,
+      };
+    }
+
+    return {
+      success: true,
+      message: `Module ${names.camelCase} already exists in messages/${language}.json`,
+      alreadyExists: true,
+    };
+  }
+
+  // Add to features section (new module)
+  if (!messages.features) {
+    messages.features = {};
   }
+  messages.features[lowercaseModuleName] = moduleMessages.features[i18nKeys.moduleName];
 
   if (dryRun) {
     return {

package/src/client/JsonApiClient.ts

@@ -3,6 +3,7 @@
 import { JsonApiDataFactory } from "../core/factories/JsonApiDataFactory";
 import { ApiRequestDataTypeInterface } from "../core/interfaces/ApiRequestDataTypeInterface";
 import { ApiResponseInterface } from "../core/interfaces/ApiResponseInterface";
+import { setBootstrapper } from "../core/registry/bootstrapStore";
 import { translateResponse } from "../core/utils/translateResponse";
 import { ModuleWithPermissions } from "../permissions/types";
 import { directFetch } from "./request";
@@ -30,6 +31,7 @@ export function configureClientJsonApi(config: {
 }): void {
   _clientConfig = config;
   if (config.bootstrapper) {
+    setBootstrapper(config.bootstrapper);
     config.bootstrapper();
   }
 }

package/src/client/config.ts

@@ -1,6 +1,7 @@
 "use client";
 
 import { ModuleWithPermissions } from "../permissions/types";
+import { setBootstrapper } from "../core/registry/bootstrapStore";
 
 // Config storage for client-side contexts
 let _clientConfig: {
@@ -23,8 +24,9 @@ export function configureJsonApi(config: {
   additionalHeaders?: Record<string, string>;
 }): void {
   _clientConfig = config;
-  // Call bootstrapper immediately to register all modules
+  // Register and call bootstrapper to register all modules
   if (config.bootstrapper) {
+    setBootstrapper(config.bootstrapper);
     config.bootstrapper();
   }
 }

package/src/components/containers/PageContainer.tsx

@@ -9,7 +9,7 @@ export function PageContainer({ children, testId, className }: PageContainerProp
   return (
     <div className={`flex h-full w-full flex-col`} data-testid={testId}>
       <Header />
-      <main className={cn(`flex w-full flex-1 flex-col gap-y-4 pt-4 pl-4 pr-4`, className)}>{children}</main>
+      <main className={cn(`flex w-full flex-1 flex-col gap-y-4 pt-4 pl-4 pr-4 pb-20`, className)}>{children}</main>
     </div>
   );
 }

package/src/core/registry/ModuleRegistry.ts

@@ -1,5 +1,6 @@
 import { ApiRequestDataTypeInterface } from "../interfaces/ApiRequestDataTypeInterface";
 import { ModuleWithPermissions } from "../../permissions/types";
+import { tryBootstrap, hasBootstrapper } from "./bootstrapStore";
 
 // Foundation module types - defined by LIBRARY
 export interface FoundationModuleDefinitions {
@@ -33,14 +34,34 @@ class ModuleRegistryClass {
   }
 
   get<K extends keyof ModuleDefinitions>(name: K): ModuleDefinitions[K] {
-    const module = this._modules.get(name as string);
+    let module = this._modules.get(name as string);
+
+    // Self-healing: if module not found, try bootstrapping first
     if (!module) {
-      throw new Error(`Module "${String(name)}" not registered. Call bootstrap() first.`);
+      const didBootstrap = tryBootstrap();
+      if (didBootstrap) {
+        // Retry after bootstrap
+        module = this._modules.get(name as string);
+      }
     }
+
+    if (!module) {
+      // Provide helpful error message based on state
+      const hint = hasBootstrapper()
+        ? "Bootstrap was called but module still not found. Check module registration."
+        : "No bootstrapper registered. Ensure configureJsonApi({ bootstrapper }) is called before accessing modules.";
+      throw new Error(`Module "${String(name)}" not registered. ${hint}`);
+    }
+
     return module as ModuleDefinitions[K];
   }
 
   findByName(moduleName: string): ModuleWithPermissions {
+    // Self-healing: try bootstrap if registry is empty
+    if (this._modules.size === 0) {
+      tryBootstrap();
+    }
+
     // Search by module's name property (e.g., "topics", "articles")
     for (const module of this._modules.values()) {
       if ((module as ModuleWithPermissions).name === moduleName) {
@@ -52,7 +73,16 @@ class ModuleRegistryClass {
 
   findByModelName(modelName: string): ModuleWithPermissions {
     // Direct lookup by registry key (e.g., "Article", "Document")
-    const module = this._modules.get(modelName);
+    let module = this._modules.get(modelName);
+
+    // Self-healing: if not found, try bootstrapping
+    if (!module) {
+      const didBootstrap = tryBootstrap();
+      if (didBootstrap) {
+        module = this._modules.get(modelName);
+      }
+    }
+
     if (!module) {
       throw new Error(`Module not found for model: ${modelName}`);
     }

package/src/core/registry/bootstrapStore.ts

@@ -0,0 +1,63 @@
+/**
+ * Centralized bootstrap store accessible from ModuleRegistry.
+ * This file has NO external dependencies to avoid circular imports.
+ *
+ * The bootstrap store allows ModuleRegistry to call the app's bootstrapper
+ * when modules are accessed before bootstrap() was called, providing
+ * self-healing behavior for module evaluation order issues.
+ */
+
+type BootstrapperFn = () => void;
+
+let _bootstrapper: BootstrapperFn | null = null;
+let _bootstrapAttempted = false;
+
+/**
+ * Register the bootstrapper function.
+ * Called by configureJsonApi() from client/config, client/JsonApiClient, or unified/JsonApiRequest.
+ */
+export function setBootstrapper(fn: BootstrapperFn): void {
+  _bootstrapper = fn;
+}
+
+/**
+ * Get the registered bootstrapper function.
+ * Returns null if no bootstrapper has been registered.
+ */
+export function getBootstrapper(): BootstrapperFn | null {
+  return _bootstrapper;
+}
+
+/**
+ * Attempt to run the bootstrapper if one is registered.
+ * Returns true if bootstrapper was executed, false if not available.
+ * Safe to call multiple times - bootstrapper is expected to be idempotent.
+ */
+export function tryBootstrap(): boolean {
+  if (_bootstrapAttempted && !_bootstrapper) {
+    // Already tried and no bootstrapper available
+    return false;
+  }
+  _bootstrapAttempted = true;
+
+  if (_bootstrapper) {
+    _bootstrapper();
+    return true;
+  }
+  return false;
+}
+
+/**
+ * Check if a bootstrapper has been registered.
+ */
+export function hasBootstrapper(): boolean {
+  return _bootstrapper !== null;
+}
+
+/**
+ * Reset the bootstrap store. Useful for testing.
+ */
+export function resetBootstrapStore(): void {
+  _bootstrapper = null;
+  _bootstrapAttempted = false;
+}

package/src/core/registry/index.ts

@@ -1,3 +1,4 @@
 export * from "./DataClassRegistry";
 export * from "./ModuleRegistrar";
 export * from "./ModuleRegistry";
+export * from "./bootstrapStore";

package/src/unified/JsonApiRequest.ts

@@ -2,6 +2,7 @@ import { JsonApiDataFactory } from "../core/factories/JsonApiDataFactory";
 import { ApiData } from "../core/interfaces/ApiData";
 import { ApiRequestDataTypeInterface } from "../core/interfaces/ApiRequestDataTypeInterface";
 import { ApiResponseInterface } from "../core/interfaces/ApiResponseInterface";
+import { setBootstrapper } from "../core/registry/bootstrapStore";
 import { translateResponse } from "../core/utils/translateResponse";
 import { ModuleWithPermissions } from "../permissions/types";
 
@@ -58,8 +59,9 @@ export function configureJsonApi(config: {
   additionalHeaders?: Record<string, string>;
 }): void {
   _staticConfig = config;
-  // Call bootstrapper immediately to register all modules
+  // Register and call bootstrapper to register all modules
   if (config.bootstrapper) {
+    setBootstrapper(config.bootstrapper);
     config.bootstrapper();
   }
 }

package/dist/JsonApiRequest-2OM5NDAW.js

@@ -1,24 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
-
-
-
-
-
-
-
-
-
-var _chunkCKS6SVUKjs = require('./chunk-CKS6SVUK.js');
-require('./chunk-7QVYU63E.js');
-
-
-
-
-
-
-
-
-
-
-exports.JsonApiDelete = _chunkCKS6SVUKjs.JsonApiDelete; exports.JsonApiGet = _chunkCKS6SVUKjs.JsonApiGet; exports.JsonApiPatch = _chunkCKS6SVUKjs.JsonApiPatch; exports.JsonApiPost = _chunkCKS6SVUKjs.JsonApiPost; exports.JsonApiPut = _chunkCKS6SVUKjs.JsonApiPut; exports.configureJsonApi = _chunkCKS6SVUKjs.configureJsonApi; exports.getApiUrl = _chunkCKS6SVUKjs.getApiUrl; exports.getAppUrl = _chunkCKS6SVUKjs.getAppUrl; exports.getTrackablePages = _chunkCKS6SVUKjs.getTrackablePages;
-//# sourceMappingURL=JsonApiRequest-2OM5NDAW.js.map