@omnifyjp/ts 1.1.1 → 1.1.3

package/dist/cli.js

@@ -71,7 +71,7 @@ program
     .option('-c, --config <path>', 'Path to omnify.yaml (default: ./omnify.yaml)')
     .option('-i, --input <path>', 'Path to schemas.json (overrides config)')
     .option('-o, --output <path>', 'Output directory for TypeScript (overrides config)')
-    .option('--force', 'Overwrite user-editable model files', false)
+    .option('--force', 'Force regeneration of auto-generated files', false)
     .action((opts) => {
     let inputPath;
     let tsEnabled = true;
@@ -126,7 +126,7 @@ program
                 filePath = join(tsOutput, file.filePath);
             }
             mkdirSync(dirname(filePath), { recursive: true });
-            if (!file.overwrite && existsSync(filePath) && !opts.force) {
+            if (!file.overwrite && existsSync(filePath)) {
                 tsSkipped++;
                 continue;
             }
@@ -157,7 +157,7 @@ program
         for (const file of phpFiles) {
             const filePath = resolve(configDir, file.path);
             mkdirSync(dirname(filePath), { recursive: true });
-            if (!file.overwrite && existsSync(filePath) && !opts.force) {
+            if (!file.overwrite && existsSync(filePath)) {
                 phpSkipped++;
                 continue;
             }

package/dist/php/model-generator.js

@@ -42,20 +42,23 @@ function generateBaseModel(name, schema, reader, config) {
     const hasTimestamps = options.timestamps ?? false;
     const translatableFields = reader.getTranslatableFields(name);
     const hasTranslatable = translatableFields.length > 0;
-    const imports = buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable, hasTranslatable, properties);
+    const primaryKey = options['primaryKey'] ?? 'id';
+    const rawId = options.id;
+    const idType = typeof rawId === 'string' ? rawId : 'BigInt';
+    const isCompositeKey = primaryKey.includes(',');
+    const needsUuidTrait = !isCompositeKey && idType === 'Uuid';
+    const needsUlidTrait = !isCompositeKey && idType === 'Ulid';
+    const imports = buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable, hasTranslatable, properties, needsUuidTrait, needsUlidTrait);
     const docProperties = buildDocProperties(properties, expandedProperties, propertyOrder);
     const baseClass = isAuthenticatable ? 'Authenticatable' : 'BaseModel';
     const implementsClause = hasTranslatable ? ' implements TranslatableContract' : '';
-    const traits = buildTraits(hasSoftDelete, isAuthenticatable, hasTranslatable);
+    const traits = buildTraits(hasSoftDelete, isAuthenticatable, hasTranslatable, needsUuidTrait, needsUlidTrait);
     const fillable = buildFillable(properties, expandedProperties, propertyOrder);
     const hidden = buildHidden(properties, expandedProperties, propertyOrder);
     const appends = buildAppends(expandedProperties);
     const casts = buildCasts(properties, expandedProperties, propertyOrder);
     const relations = buildRelations(name, properties, propertyOrder, modelNamespace, reader);
     const accessors = buildAccessors(expandedProperties);
-    const primaryKey = options['primaryKey'] ?? 'id';
-    const rawId = options.id;
-    const idType = typeof rawId === 'string' ? rawId : 'BigInt';
     let keyTypeSection = '';
     if (idType === 'Uuid' || idType === 'Ulid' || idType === 'String') {
         keyTypeSection = `
@@ -161,11 +164,13 @@ function generateUserModel(name, config) {
     const modelName = toPascalCase(name);
     const modelNamespace = config.models.namespace;
     const baseNamespace = config.models.baseNamespace;
+    const factoryNamespace = config.factories.namespace;
     const content = `<?php
 
 namespace ${modelNamespace};
 
 use ${baseNamespace}\\${modelName}BaseModel;
+use ${factoryNamespace}\\${modelName}Factory;
 use Illuminate\\Database\\Eloquent\\Factories\\HasFactory;
 
 /**
@@ -186,17 +191,31 @@ class ${modelName} extends ${modelName}BaseModel
         parent::__construct($attributes);
     }
 
+    /**
+     * Create a new factory instance for the model.
+     */
+    protected static function newFactory(): ${modelName}Factory
+    {
+        return ${modelName}Factory::new();
+    }
+
     // Add your custom methods here
 }
 `;
     return userFile(`${config.models.path}/${modelName}.php`, content);
 }
-function buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable, hasTranslatable, properties) {
+function buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable, hasTranslatable, properties, needsUuidTrait = false, needsUlidTrait = false) {
     const lines = [];
     if (isAuthenticatable) {
         lines.push('use Illuminate\\Foundation\\Auth\\User as Authenticatable;');
         lines.push('use Illuminate\\Notifications\\Notifiable;');
     }
+    if (needsUuidTrait) {
+        lines.push('use Illuminate\\Database\\Eloquent\\Concerns\\HasUuids;');
+    }
+    if (needsUlidTrait) {
+        lines.push('use Illuminate\\Database\\Eloquent\\Concerns\\HasUlids;');
+    }
     // Always include all relation types for simplicity (matching PHP)
     const allRelationTypes = ['BelongsTo', 'HasMany', 'HasOne', 'BelongsToMany', 'MorphTo', 'MorphOne', 'MorphMany', 'MorphToMany'];
     for (const type of allRelationTypes) {
@@ -248,9 +267,13 @@ function buildDocProperties(properties, expandedProperties, propertyOrder) {
     }
     return lines.length === 0 ? '' : lines.join('\n') + '\n';
 }
-function buildTraits(hasSoftDelete, isAuthenticatable, hasTranslatable) {
+function buildTraits(hasSoftDelete, isAuthenticatable, hasTranslatable, needsUuidTrait = false, needsUlidTrait = false) {
     const lines = [];
     lines.push('    use HasLocalizedDisplayName;');
+    if (needsUuidTrait)
+        lines.push('    use HasUuids;');
+    if (needsUlidTrait)
+        lines.push('    use HasUlids;');
     if (isAuthenticatable)
         lines.push('    use Notifiable;');
     if (hasSoftDelete)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnifyjp/ts",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "TypeScript model type generator from Omnify schemas.json",
   "type": "module",
   "main": "dist/index.js",