@omnifyjp/ts 1.3.0 → 1.3.2

package/dist/generator.js

@@ -54,18 +54,18 @@ function generateBaseInterfaceFile(schemaName, schemas, options) {
     if (dateImports.date)
         commonImports.push('DateString');
     if (commonImports.length > 0) {
-        parts.push(`import type { ${commonImports.join(', ')} } from '../common.js';\n`);
+        parts.push(`import type { ${commonImports.join(', ')} } from '../common';\n`);
     }
     // Enum imports (schema enums + plugin enums are all in ../enum/)
     if (iface.enumDependencies && iface.enumDependencies.length > 0) {
         for (const enumName of iface.enumDependencies) {
-            parts.push(`import { ${enumName} } from '../enum/${enumName}.js';\n`);
+            parts.push(`import { ${enumName} } from '../enum/${enumName}';\n`);
         }
     }
     // Dependency imports (other schema interfaces in base/)
     if (iface.dependencies && iface.dependencies.length > 0) {
         for (const dep of iface.dependencies) {
-            parts.push(`import type { ${dep} } from './${dep}.js';\n`);
+            parts.push(`import type { ${dep} } from './${dep}';\n`);
         }
         parts.push('\n');
     }
@@ -170,7 +170,7 @@ function generateIndexFile(schemas, schemaEnums, pluginEnums, typeAliases) {
     const parts = [generateBaseHeader()];
     // Common types
     parts.push(`// Common Types\n`);
-    parts.push(`export type { LocaleMap, Locale, DateTimeString, DateString } from './common.js';\n\n`);
+    parts.push(`export type { LocaleMap, Locale, DateTimeString, DateString } from './common';\n\n`);
     // I18n
     parts.push(`// i18n (Internationalization)\n`);
     parts.push(`export {\n`);
@@ -180,7 +180,7 @@ function generateIndexFile(schemas, schemaEnums, pluginEnums, typeAliases) {
     parts.push(`  validationMessages,\n`);
     parts.push(`  getMessage,\n`);
     parts.push(`  getMessages,\n`);
-    parts.push(`} from './i18n.js';\n\n`);
+    parts.push(`} from './i18n';\n\n`);
     // Schema enums
     if (schemaEnums.length > 0) {
         parts.push(`// Schema Enums\n`);
@@ -191,7 +191,7 @@ function generateIndexFile(schemas, schemaEnums, pluginEnums, typeAliases) {
             parts.push(`  is${enumDef.name},\n`);
             parts.push(`  get${enumDef.name}Label,\n`);
             parts.push(`  get${enumDef.name}Extra,\n`);
-            parts.push(`} from './enum/${enumDef.name}.js';\n`);
+            parts.push(`} from './enum/${enumDef.name}';\n`);
         }
         parts.push('\n');
     }
@@ -205,7 +205,7 @@ function generateIndexFile(schemas, schemaEnums, pluginEnums, typeAliases) {
             parts.push(`  is${enumDef.name},\n`);
             parts.push(`  get${enumDef.name}Label,\n`);
             parts.push(`  get${enumDef.name}Extra,\n`);
-            parts.push(`} from './enum/${enumDef.name}.js';\n`);
+            parts.push(`} from './enum/${enumDef.name}';\n`);
         }
         parts.push('\n');
     }
@@ -219,7 +219,7 @@ function generateIndexFile(schemas, schemaEnums, pluginEnums, typeAliases) {
             parts.push(`  is${alias.name},\n`);
             parts.push(`  get${alias.name}Label,\n`);
             parts.push(`  get${alias.name}Extra,\n`);
-            parts.push(`} from './enum/${alias.name}.js';\n`);
+            parts.push(`} from './enum/${alias.name}';\n`);
         }
         parts.push('\n');
     }
@@ -231,7 +231,7 @@ function generateIndexFile(schemas, schemaEnums, pluginEnums, typeAliases) {
         if (schema.options?.hidden === true)
             continue;
         const lowerName = schema.name.charAt(0).toLowerCase() + schema.name.slice(1);
-        parts.push(`export type { ${schema.name}, ${schema.name}Create, ${schema.name}Update } from './${schema.name}.js';\n`);
+        parts.push(`export type { ${schema.name}, ${schema.name}Create, ${schema.name}Update } from './${schema.name}';\n`);
         parts.push(`export {\n`);
         parts.push(`  ${lowerName}Schemas,\n`);
         parts.push(`  ${lowerName}CreateSchema,\n`);
@@ -240,7 +240,7 @@ function generateIndexFile(schemas, schemaEnums, pluginEnums, typeAliases) {
         parts.push(`  get${schema.name}Label,\n`);
         parts.push(`  get${schema.name}FieldLabel,\n`);
         parts.push(`  get${schema.name}FieldPlaceholder,\n`);
-        parts.push(`} from './${schema.name}.js';\n`);
+        parts.push(`} from './${schema.name}';\n`);
     }
     return {
         filePath: 'index.ts',

package/dist/i18n-generator.js

@@ -80,7 +80,7 @@ export function generateI18nFileContent(options) {
         }
     }
     const messagesJson = JSON.stringify(filteredMessages, null, 2);
-    return `import type { LocaleMap } from './common.js';
+    return `import type { LocaleMap } from './common';
 
 /**
  * Default locale for this project.

package/dist/php/model-generator.js

@@ -23,9 +23,12 @@ export function generateModels(reader, config) {
     return files;
 }
 function generateForSchema(name, schema, reader, config) {
+    const properties = (schema.properties ?? {});
+    const options = schema.options ?? {};
+    const hasNestedSet = detectNestedSet(options, properties);
     return [
         generateBaseModel(name, schema, reader, config),
-        generateUserModel(name, config),
+        generateUserModel(name, config, hasNestedSet),
     ];
 }
 function generateBaseModel(name, schema, reader, config) {
@@ -40,7 +43,9 @@ function generateBaseModel(name, schema, reader, config) {
     const isAuthenticatable = options['authenticatable'] ?? false;
     const hasSoftDelete = options.softDelete ?? false;
     const hasTimestamps = options.timestamps ?? false;
-    const hasNestedSet = options['nestedSet'] ?? false;
+    // NodeTrait is added to the user-editable Model, not BaseModel
+    const hasNestedSet = false;
+    const nestedSetParentColumn = null;
     const translatableFields = reader.getTranslatableFields(name);
     const hasTranslatable = translatableFields.length > 0;
     const primaryKey = options['primaryKey'] ?? 'id';
@@ -60,6 +65,7 @@ function generateBaseModel(name, schema, reader, config) {
     const casts = buildCasts(properties, expandedProperties, propertyOrder);
     const relations = buildRelations(name, properties, propertyOrder, modelNamespace, reader);
     const accessors = buildAccessors(expandedProperties);
+    const nestedSetMethod = buildNestedSetParentIdMethod(nestedSetParentColumn);
     let keyTypeSection = '';
     if (idType === 'Uuid' || idType === 'Ulid' || idType === 'String') {
         keyTypeSection = `
@@ -156,16 +162,29 @@ ${appends}    ];
         return [
 ${casts}        ];
     }
-${relations}${accessors}
+${relations}${accessors}${nestedSetMethod}
 }
 `;
     return baseFile(`${config.models.basePath}/${modelName}BaseModel.php`, content);
 }
-function generateUserModel(name, config) {
+function generateUserModel(name, config, hasNestedSet = false) {
     const modelName = toPascalCase(name);
     const modelNamespace = config.models.namespace;
     const baseNamespace = config.models.baseNamespace;
     const factoryNamespace = config.factories.namespace;
+    const nestedSetNamespace = config.nestedset.namespace;
+    const imports = [
+        `use ${baseNamespace}\\${modelName}BaseModel;`,
+        `use ${factoryNamespace}\\${modelName}Factory;`,
+        `use Illuminate\\Database\\Eloquent\\Factories\\HasFactory;`,
+    ];
+    if (hasNestedSet) {
+        imports.push(`use ${nestedSetNamespace}\\NodeTrait;`);
+    }
+    const traits = ['    use HasFactory;'];
+    if (hasNestedSet) {
+        traits.push('    use NodeTrait;');
+    }
     const content = `<?php
 
 /**
@@ -176,16 +195,14 @@ function generateUserModel(name, config) {
 
 namespace ${modelNamespace};
 
-use ${baseNamespace}\\${modelName}BaseModel;
-use ${factoryNamespace}\\${modelName}Factory;
-use Illuminate\\Database\\Eloquent\\Factories\\HasFactory;
+${imports.join('\n')}
 
 /**
  * ${modelName} — add project-specific model logic here.
  */
 class ${modelName} extends ${modelName}BaseModel
 {
-    use HasFactory;
+${traits.join('\n')}
 
     /**
      * Create a new factory instance for the model.
@@ -461,6 +478,50 @@ class ${modelName} extends Package${modelName}
 `;
     return userFile(`${config.models.path}/${modelName}.php`, content);
 }
+/**
+ * Detect whether a schema uses nested set (tree structure).
+ * Checks both the explicit `nestedSet: true` option and the presence of
+ * nested set columns (_lft, _rgt, parent_id / _parent_id) in properties.
+ */
+function detectNestedSet(options, properties) {
+    if (options['nestedSet'] === true)
+        return true;
+    const propNames = Object.keys(properties);
+    const hasLft = propNames.some(p => p === '_lft' || p === 'lft');
+    const hasRgt = propNames.some(p => p === '_rgt' || p === 'rgt');
+    const hasParent = propNames.some(p => p === 'parent_id' || p === '_parent_id' || p === 'parentId' || p === 'parent');
+    return hasLft && hasRgt && hasParent;
+}
+/**
+ * Detect the parent ID column name for nested set models.
+ * Returns the column name if it differs from the default 'parent_id', or null.
+ */
+function detectNestedSetParentColumn(properties) {
+    const propNames = Object.keys(properties);
+    // Check for non-standard parent_id column names
+    if (propNames.includes('_parent_id'))
+        return '_parent_id';
+    if (propNames.includes('parent_id') || propNames.includes('parentId') || propNames.includes('parent'))
+        return null;
+    return null;
+}
+/**
+ * Build the getParentIdName() method override for nested set models
+ * that use a non-standard parent_id column name.
+ */
+function buildNestedSetParentIdMethod(parentColumn) {
+    if (!parentColumn)
+        return '';
+    return `
+    /**
+     * Get the column name for the parent ID.
+     */
+    public function getParentIdName(): string
+    {
+        return '${parentColumn}';
+    }
+`;
+}
 function fullNameAccessor(prefix, suffix, fields, separator) {
     const methodName = 'get' + toPascalCase(prefix) + suffix + 'Attribute';
     const fieldAccess = fields.map(f => `$this->${f}`).join(', ');

package/dist/zod-generator.js

@@ -489,7 +489,7 @@ export function formatZodModelFile(schemaName) {
  */
 
 import { z } from 'zod';
-import type { ${schemaName} as ${schemaName}Base } from './base/${schemaName}.js';
+import type { ${schemaName} as ${schemaName}Base } from './base/${schemaName}';
 import {
   base${schemaName}Schemas,
   base${schemaName}CreateSchema,
@@ -498,7 +498,7 @@ import {
   get${schemaName}Label,
   get${schemaName}FieldLabel,
   get${schemaName}FieldPlaceholder,
-} from './base/${schemaName}.js';
+} from './base/${schemaName}';
 
 // ============================================================================
 // Types (extend or re-export)

package/package.json

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