@eide/uniformgen 0.1.4 → 0.1.5

package/dist/commands/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"AAgEA,UAAU,WAAW;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,wBAAsB,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAyX9D"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"AAgEA,UAAU,WAAW;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,wBAAsB,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAmY9D"}

package/dist/commands/sync.js

@@ -69,10 +69,21 @@ export async function sync(options) {
     if (entityModels.length > 0) {
         const modelsDir = join(config.output.types, 'models');
         for (const model of entityModels) {
-            files.push({
-                path: join(modelsDir, `${model.key}.ts`),
-                content: generateEntityModelTypes(model, entityModels),
-            });
+            try {
+                files.push({
+                    path: join(modelsDir, `${model.key}.ts`),
+                    content: generateEntityModelTypes(model, entityModels),
+                });
+            }
+            catch (error) {
+                console.error(chalk.red(`\nError generating types for model: ${model.key}`));
+                console.error(chalk.gray(`  Model name: ${model.name}`));
+                console.error(chalk.gray(`  Fields: ${model.fields?.length ?? 0}`));
+                if (model.fields?.length > 0) {
+                    console.error(chalk.gray(`  Field keys: ${model.fields.map(f => f.key).join(', ')}`));
+                }
+                throw error;
+            }
         }
         files.push({
             path: join(modelsDir, 'index.ts'),

package/dist/generators/admin/queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../../../src/generators/admin/queries.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAIlE;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,WAAW,EAClB,UAAU,EAAE,WAAW,EAAE,GACxB,MAAM,CA0VR;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,WAAW,EAClB,UAAU,EAAE,WAAW,EAAE,GACxB,MAAM,CAkJR"}
+{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../../../src/generators/admin/queries.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAIlE;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,WAAW,EAClB,UAAU,EAAE,WAAW,EAAE,GACxB,MAAM,CA4VR;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,WAAW,EAClB,UAAU,EAAE,WAAW,EAAE,GACxB,MAAM,CAmJR"}

package/dist/generators/admin/queries.js

@@ -22,12 +22,14 @@ export function generateAdminQueriesReact(model, _allModels) {
     const pluralName = model.pluralName
         ? toCamelCase(model.pluralName.replace(/\s+/g, ''))
         : `${camelName}s`;
+    // Use model.name with fallback for JSDoc comments
+    const displayName = model.name ?? model.key;
     const lines = [];
     // File header
     lines.push(`/**`);
-    lines.push(` * ${model.name} - Admin Query Hooks`);
+    lines.push(` * ${displayName} - Admin Query Hooks`);
     lines.push(` *`);
-    lines.push(` * React hooks for querying ${model.name} records in admin UIs.`);
+    lines.push(` * React hooks for querying ${displayName} records in admin UIs.`);
     lines.push(` *`);
     lines.push(` * @generated by UniformGen - DO NOT EDIT MANUALLY`);
     lines.push(` */`);
@@ -52,7 +54,7 @@ export function generateAdminQueriesReact(model, _allModels) {
     lines.push(`} from './types/${model.key}.js';`);
     lines.push('');
     // List result interface
-    lines.push(`/** List result for ${model.name} records */`);
+    lines.push(`/** List result for ${displayName} records */`);
     lines.push(`export interface ${typeName}ListResult {`);
     lines.push(`  items: ${typeName}Record[];`);
     lines.push(`  total: number;`);
@@ -231,7 +233,7 @@ export function generateAdminQueriesReact(model, _allModels) {
     lines.push('');
     // use{Model}Records hook
     lines.push(`/**`);
-    lines.push(` * List ${model.name} records with optional filtering`);
+    lines.push(` * List ${displayName} records with optional filtering`);
     lines.push(` *`);
     lines.push(` * @example`);
     lines.push(` * const { ${pluralName}, loading } = use${typeName}Records({`);
@@ -281,7 +283,7 @@ export function generateAdminQueriesReact(model, _allModels) {
     lines.push('');
     // use{Model}Record hook
     lines.push(`/**`);
-    lines.push(` * Get a single ${model.name} record with all variants`);
+    lines.push(` * Get a single ${displayName} record with all variants`);
     lines.push(` *`);
     lines.push(` * @example`);
     lines.push(` * const { ${camelName}, loading } = use${typeName}Record('record-id');`);
@@ -309,7 +311,7 @@ export function generateAdminQueriesReact(model, _allModels) {
     lines.push('');
     // use{Model}Versions hook
     lines.push(`/**`);
-    lines.push(` * Get version history for a ${model.name} variant`);
+    lines.push(` * Get version history for a ${displayName} variant`);
     lines.push(` *`);
     lines.push(` * @example`);
     lines.push(` * const { versions, loading } = use${typeName}Versions('variant-id', { limit: 10 });`);
@@ -349,12 +351,13 @@ export function generateAdminQueriesRemix(model, _allModels) {
         return '';
     }
     const typeName = toPascalCase(model.key);
+    const displayName = model.name ?? model.key;
     const lines = [];
     // File header
     lines.push(`/**`);
-    lines.push(` * ${model.name} - Admin Query Functions`);
+    lines.push(` * ${displayName} - Admin Query Functions`);
     lines.push(` *`);
-    lines.push(` * Server-side functions for querying ${model.name} records.`);
+    lines.push(` * Server-side functions for querying ${displayName} records.`);
     lines.push(` * Use in Remix loaders or Hydrogen server functions.`);
     lines.push(` *`);
     lines.push(` * @generated by UniformGen - DO NOT EDIT MANUALLY`);
@@ -384,7 +387,7 @@ export function generateAdminQueriesRemix(model, _allModels) {
     lines.push(`}`);
     lines.push('');
     // List result interface
-    lines.push(`/** List result for ${model.name} records */`);
+    lines.push(`/** List result for ${displayName} records */`);
     lines.push(`export interface ${typeName}ListResult {`);
     lines.push(`  items: ${typeName}Record[];`);
     lines.push(`  total: number;`);
@@ -438,7 +441,7 @@ export function generateAdminQueriesRemix(model, _allModels) {
     lines.push(`// ============================================================================`);
     lines.push('');
     lines.push(`/**`);
-    lines.push(` * List ${model.name} records`);
+    lines.push(` * List ${displayName} records`);
     lines.push(` */`);
     lines.push(`export async function list${typeName}Records(`);
     lines.push(`  client: GraphQLClient,`);
@@ -454,7 +457,7 @@ export function generateAdminQueriesRemix(model, _allModels) {
     lines.push(`}`);
     lines.push('');
     lines.push(`/**`);
-    lines.push(` * Get a single ${model.name} record with variants`);
+    lines.push(` * Get a single ${displayName} record with variants`);
     lines.push(` */`);
     lines.push(`export async function get${typeName}Record(client: GraphQLClient, id: string): Promise<${typeName}RecordWithVariants | null> {`);
     lines.push(`  const result = await client.request<{ entityRecord: any }>(GET_${typeName.toUpperCase()}_RECORD, { id });`);
@@ -462,7 +465,7 @@ export function generateAdminQueriesRemix(model, _allModels) {
     lines.push(`}`);
     lines.push('');
     lines.push(`/**`);
-    lines.push(` * Get version history for a ${model.name} variant`);
+    lines.push(` * Get version history for a ${displayName} variant`);
     lines.push(` */`);
     lines.push(`export async function get${typeName}Versions(`);
     lines.push(`  client: GraphQLClient,`);

package/dist/generators/documents/entity-models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entity-models.d.ts","sourceRoot":"","sources":["../../../src/generators/documents/entity-models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAGlE;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,CAkFvE"}
+{"version":3,"file":"entity-models.d.ts","sourceRoot":"","sources":["../../../src/generators/documents/entity-models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAGlE;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,CAmFvE"}

package/dist/generators/documents/entity-models.js

@@ -8,7 +8,8 @@ export function generateEntityModelDocuments(model) {
     const pluralName = model.pluralName
         ? toPascalCase(model.pluralName.replace(/\s+/g, ''))
         : `${typeName}s`;
-    return `# Generated GraphQL operations for ${model.name}
+    const displayName = model.name ?? model.key;
+    return `# Generated GraphQL operations for ${displayName}
 # @generated by UniformGen - DO NOT EDIT MANUALLY
 
 fragment ${typeName}Fields on EntityRecord {

package/dist/utils/field-mapping.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"field-mapping.d.ts","sourceRoot":"","sources":["../../src/utils/field-mapping.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,eAAO,MAAM,qBAAqB,aA+BhC,CAAC;AAEH;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CA2G1D,CAAC;AAEF;;GAEG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,GAAG,CAAA;CAAE,EACtC,IAAI,GAAE,QAAQ,GAAG,OAAkB,GAClC,MAAM,CAgDR;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,GAAG,CAAA;CAAE,CAAC,GAC7C,GAAG,CAAC,MAAM,CAAC,CAmBb;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,GAAG,CAAA;CAAE,CAAC,GAC7C,GAAG,CAAC,MAAM,CAAC,CAmBb;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAGhD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAUtD;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,UAAU,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,GAAG,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACpE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CA4EjE"}
+{"version":3,"file":"field-mapping.d.ts","sourceRoot":"","sources":["../../src/utils/field-mapping.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,eAAO,MAAM,qBAAqB,aA+BhC,CAAC;AAEH;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CA2G1D,CAAC;AAEF;;GAEG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,GAAG,CAAA;CAAE,EACtC,IAAI,GAAE,QAAQ,GAAG,OAAkB,GAClC,MAAM,CAsDR;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,GAAG,CAAA;CAAE,CAAC,GAC7C,GAAG,CAAC,MAAM,CAAC,CAmBb;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,GAAG,CAAA;CAAE,CAAC,GAC7C,GAAG,CAAC,MAAM,CAAC,CAmBb;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAG/C;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIhD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAWtD;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,UAAU,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,GAAG,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACpE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CAqFjE"}

package/dist/utils/field-mapping.js

@@ -151,6 +151,11 @@ export const FIELD_TYPE_MAPPING = {
  * Get TypeScript type for a field
  */
 export function getFieldType(field, mode = 'output') {
+    // Defensive null check
+    if (!field?.type) {
+        console.warn(`Field has no type, defaulting to 'unknown'`);
+        return 'unknown';
+    }
     const mapping = FIELD_TYPE_MAPPING[field.type];
     // If not a primitive type, it's an inline schema reference
     if (!mapping) {
@@ -238,12 +243,16 @@ export function getInlineSchemaReferences(fields) {
  * Convert field ID to camelCase
  */
 export function toCamelCase(str) {
+    if (!str)
+        return 'unknown';
     return str.replace(/[-_]([a-z])/g, (_, letter) => letter.toUpperCase());
 }
 /**
  * Convert field ID to PascalCase
  */
 export function toPascalCase(str) {
+    if (!str)
+        return 'Unknown';
     const camel = toCamelCase(str);
     return camel.charAt(0).toUpperCase() + camel.slice(1);
 }
@@ -253,6 +262,8 @@ export function toPascalCase(str) {
  * Prefixes with underscore if name starts with a number.
  */
 export function sanitizeFieldName(name) {
+    if (!name)
+        return '_unknown';
     // Replace all non-alphanumeric and non-underscore characters with underscores
     let sanitized = name.replace(/[^a-zA-Z0-9_]/g, '_');
     // If starts with a number, prefix with underscore
@@ -267,10 +278,13 @@ export function sanitizeFieldName(name) {
  */
 export function generateFieldDef(field) {
     const parts = [];
-    // Required properties
-    parts.push(`key: '${field.key}'`);
-    parts.push(`type: '${field.type}'`);
-    parts.push(`label: '${field.label.replace(/'/g, "\\'")}'`);
+    // Required properties (with defensive null checks)
+    const fieldKey = field.key ?? 'unknown';
+    const fieldType = field.type ?? 'text';
+    const fieldLabel = field.label ?? field.key ?? 'Unknown';
+    parts.push(`key: '${fieldKey}'`);
+    parts.push(`type: '${fieldType}'`);
+    parts.push(`label: '${fieldLabel.replace(/'/g, "\\'")}'`);
     // Optional properties
     if (field.required) {
         parts.push('required: true');
@@ -301,7 +315,12 @@ export function generateFieldDef(field) {
     if ((field.type === 'select' || field.type === 'multiselect') && field.options?.options) {
         const options = field.options.options;
         const optionsStr = options
-            .map((o) => `{ label: '${o.label.replace(/'/g, "\\'")}', value: '${o.value.replace(/'/g, "\\'")}' }`)
+            .filter((o) => o.value !== undefined) // Skip options without values
+            .map((o) => {
+            const label = (o.label ?? o.value ?? '').replace(/'/g, "\\'");
+            const value = (o.value ?? '').replace(/'/g, "\\'");
+            return `{ label: '${label}', value: '${value}' }`;
+        })
             .join(', ');
         parts.push(`options: [${optionsStr}]`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eide/uniformgen",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Type-safe code generator for Foir - generates TypeScript types and GraphQL operations from your project schemas",
   "type": "module",
   "publishConfig": {