@famgia/omnify-typescript 0.0.53 → 0.0.55

package/dist/index.cjs

@@ -62,10 +62,10 @@ var TYPE_MAP = {
   Text: "string",
   MediumText: "string",
   LongText: "string",
-  Date: "string",
+  Date: "DateString",
   Time: "string",
-  DateTime: "string",
-  Timestamp: "string",
+  DateTime: "DateTimeString",
+  Timestamp: "DateTimeString",
   Json: "unknown",
   Email: "string",
   Password: "string",
@@ -272,14 +272,14 @@ function schemaToInterface(schema, allSchemas, options = {}) {
     properties.push(
       {
         name: "created_at",
-        type: "string",
+        type: "DateTimeString",
         optional: true,
         readonly: options.readonly ?? true,
         comment: "Creation timestamp"
       },
       {
         name: "updated_at",
-        type: "string",
+        type: "DateTimeString",
         optional: true,
         readonly: options.readonly ?? true,
         comment: "Last update timestamp"
@@ -289,7 +289,7 @@ function schemaToInterface(schema, allSchemas, options = {}) {
   if (schema.options?.softDelete) {
     properties.push({
       name: "deleted_at",
-      type: "string",
+      type: "DateTimeString",
       optional: true,
       readonly: options.readonly ?? true,
       comment: "Soft delete timestamp"
@@ -850,19 +850,7 @@ function formatRulesFile(schemaName, rules) {
  * DO NOT EDIT - This file is automatically generated and will be overwritten.
  */
 
-`);
-  parts.push(`export interface LocaleMap { [locale: string]: string; }
-
-`);
-  parts.push(`export interface ValidationRule {
-  required?: boolean;
-  type?: 'string' | 'number' | 'email' | 'url' | 'integer';
-  min?: number;
-  max?: number;
-  len?: number;
-  pattern?: RegExp;
-  message: LocaleMap;
-}
+import type { LocaleMap, ValidationRule } from '../common.js';
 
 `);
   parts.push(`/** Display name for ${schemaName} */
@@ -964,7 +952,8 @@ function generateRulesFiles(schemas, options = {}) {
 
 // src/generator.ts
 var DEFAULT_OPTIONS = {
-  readonly: true,
+  readonly: false,
+  // Changed: interfaces should be mutable for forms/mutations
   strictNullChecks: true
 };
 function generateBaseHeader() {
@@ -986,26 +975,76 @@ function generateModelHeader(schemaName) {
 
 `;
 }
+function generateUtilityTypes(schemaName, schema) {
+  const parts = [];
+  const excludeFields = [];
+  if (schema.options?.id !== false) {
+    excludeFields.push("'id'");
+  }
+  if (schema.options?.timestamps !== false) {
+    excludeFields.push("'created_at'", "'updated_at'");
+  }
+  if (schema.options?.softDelete) {
+    excludeFields.push("'deleted_at'");
+  }
+  const omitType = excludeFields.length > 0 ? `Omit<${schemaName}, ${excludeFields.join(" | ")}>` : schemaName;
+  parts.push(`
+/** For creating new ${schemaName} (POST requests) */`);
+  parts.push(`
+export type ${schemaName}Create = ${omitType};
+`);
+  parts.push(`
+/** For updating ${schemaName} (PUT/PATCH requests) */`);
+  parts.push(`
+export type ${schemaName}Update = Partial<${schemaName}Create>;
+`);
+  return parts.join("");
+}
+function needsDateTimeImports(iface) {
+  let dateTime = false;
+  let date = false;
+  for (const prop of iface.properties) {
+    if (prop.type === "DateTimeString" || prop.type.includes("DateTimeString")) {
+      dateTime = true;
+    }
+    if (prop.type === "DateString" || prop.type.includes("DateString")) {
+      date = true;
+    }
+  }
+  return { dateTime, date };
+}
 function generateBaseInterfaceFile(schemaName, schemas, options) {
   const interfaces = generateInterfaces(schemas, options);
   const iface = interfaces.find((i) => i.name === schemaName);
-  if (!iface) {
+  const schema = schemas[schemaName];
+  if (!iface || !schema) {
     throw new Error(`Interface not found for schema: ${schemaName}`);
   }
   const parts = [generateBaseHeader()];
+  const dateImports = needsDateTimeImports(iface);
+  const commonImports = [];
+  if (dateImports.dateTime) commonImports.push("DateTimeString");
+  if (dateImports.date) commonImports.push("DateString");
+  if (commonImports.length > 0) {
+    parts.push(`import type { ${commonImports.join(", ")} } from '../common.js';
+`);
+  }
   if (iface.dependencies && iface.dependencies.length > 0) {
     for (const dep of iface.dependencies) {
       parts.push(`import type { ${dep} } from './${dep}.js';
 `);
     }
     parts.push("\n");
+  } else if (commonImports.length > 0) {
+    parts.push("\n");
   }
   parts.push(formatInterface(iface));
   parts.push("\n");
+  parts.push(generateUtilityTypes(schemaName, schema));
   return {
     filePath: `base/${schemaName}.ts`,
     content: parts.join(""),
-    types: [schemaName],
+    types: [schemaName, `${schemaName}Create`, `${schemaName}Update`],
     overwrite: true
   };
 }
@@ -1060,8 +1099,59 @@ function generateModelFile(schemaName) {
     // Never overwrite user models
   };
 }
-function generateIndexFile(schemas, enums, typeAliases) {
+function generateCommonFile(options) {
+  const locales = options.localeConfig?.locales ?? ["ja", "en"];
+  const localeUnion = locales.map((l) => `'${l}'`).join(" | ");
+  const content = `${generateBaseHeader()}
+/**
+ * Locale map for multi-language support.
+ */
+export interface LocaleMap {
+  [locale: string]: string;
+}
+
+/**
+ * Supported locales in this project.
+ */
+export type Locale = ${localeUnion};
+
+/**
+ * Ant Design compatible validation rule.
+ */
+export interface ValidationRule {
+  required?: boolean;
+  type?: 'string' | 'number' | 'email' | 'url' | 'integer' | 'array' | 'object';
+  min?: number;
+  max?: number;
+  len?: number;
+  pattern?: RegExp;
+  message: string;
+}
+
+/**
+ * ISO 8601 date-time string.
+ */
+export type DateTimeString = string;
+
+/**
+ * ISO 8601 date string (YYYY-MM-DD).
+ */
+export type DateString = string;
+`;
+  return {
+    filePath: "common.ts",
+    content,
+    types: ["LocaleMap", "Locale", "ValidationRule", "DateTimeString", "DateString"],
+    overwrite: true
+  };
+}
+function generateIndexFile(schemas, enums, typeAliases, options) {
   const parts = [generateBaseHeader()];
+  parts.push(`// Common Types
+`);
+  parts.push(`export type { LocaleMap, Locale, ValidationRule, DateTimeString, DateString } from './common.js';
+
+`);
   if (enums.length > 0 || typeAliases.length > 0) {
     parts.push(`// Enums
 `);
@@ -1099,13 +1189,34 @@ function generateIndexFile(schemas, enums, typeAliases) {
     }
     parts.push("\n");
   }
-  parts.push(`// Models
+  parts.push(`// Models (with Create/Update utility types)
 `);
   for (const schema of Object.values(schemas)) {
     if (schema.kind === "enum") continue;
     if (schema.options?.hidden === true) continue;
     parts.push(`export type { ${schema.name} } from './${schema.name}.js';
 `);
+    parts.push(`export type { ${schema.name}Create, ${schema.name}Update } from './base/${schema.name}.js';
+`);
+  }
+  if (options.generateRules) {
+    parts.push(`
+// Validation Rules
+`);
+    for (const schema of Object.values(schemas)) {
+      if (schema.kind === "enum") continue;
+      if (schema.options?.hidden === true) continue;
+      parts.push(`export {
+`);
+      parts.push(`  get${schema.name}Rules,
+`);
+      parts.push(`  get${schema.name}DisplayName,
+`);
+      parts.push(`  get${schema.name}PropertyDisplayName,
+`);
+      parts.push(`} from './rules/${schema.name}.rules.js';
+`);
+    }
   }
   return {
     filePath: "index.ts",
@@ -1139,7 +1250,8 @@ function generateTypeScript(schemas, options = {}) {
     const rulesFiles = generateRulesFiles(schemas, opts);
     files.push(...rulesFiles);
   }
-  files.push(generateIndexFile(schemas, enums, typeAliases));
+  files.push(generateCommonFile(opts));
+  files.push(generateIndexFile(schemas, enums, typeAliases, opts));
   return files;
 }
 // Annotate the CommonJS export names for ESM import in node: