@omnifyjp/ts 1.2.6 → 1.3.0

package/dist/cli.js

@@ -53,6 +53,7 @@ function resolveFromConfig(configPath) {
         factory: laravelConfig?.factory,
         provider: laravelConfig?.provider,
         policy: laravelConfig?.policy,
+        nestedset: laravelConfig?.nestedset,
     } : undefined;
     return {
         input: resolve(configDir, schemasPath),

package/dist/php/model-generator.js

@@ -40,6 +40,7 @@ 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;
     const translatableFields = reader.getTranslatableFields(name);
     const hasTranslatable = translatableFields.length > 0;
     const primaryKey = options['primaryKey'] ?? 'id';
@@ -48,11 +49,11 @@ function generateBaseModel(name, schema, reader, config) {
     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 imports = buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable, hasTranslatable, properties, needsUuidTrait, needsUlidTrait, hasNestedSet, config.nestedset.namespace);
     const docProperties = buildDocProperties(properties, expandedProperties, propertyOrder);
     const baseClass = isAuthenticatable ? 'Authenticatable' : 'BaseModel';
     const implementsClause = hasTranslatable ? ' implements TranslatableContract' : '';
-    const traits = buildTraits(hasSoftDelete, isAuthenticatable, hasTranslatable, needsUuidTrait, needsUlidTrait);
+    const traits = buildTraits(hasSoftDelete, isAuthenticatable, hasTranslatable, needsUuidTrait, needsUlidTrait, hasNestedSet);
     const fillable = buildFillable(properties, expandedProperties, propertyOrder);
     const hidden = buildHidden(properties, expandedProperties, propertyOrder);
     const appends = buildAppends(expandedProperties);
@@ -199,7 +200,7 @@ class ${modelName} extends ${modelName}BaseModel
 `;
     return userFile(`${config.models.path}/${modelName}.php`, content);
 }
-function buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable, hasTranslatable, properties, needsUuidTrait = false, needsUlidTrait = false) {
+function buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable, hasTranslatable, properties, needsUuidTrait = false, needsUlidTrait = false, hasNestedSet = false, nestedSetNamespace = 'Aimeos\\Nestedset') {
     const lines = [];
     if (isAuthenticatable) {
         lines.push('use Illuminate\\Foundation\\Auth\\User as Authenticatable;');
@@ -222,6 +223,9 @@ function buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable
     if (hasSoftDelete) {
         lines.push('use Illuminate\\Database\\Eloquent\\SoftDeletes;');
     }
+    if (hasNestedSet) {
+        lines.push(`use ${nestedSetNamespace}\\NodeTrait;`);
+    }
     if (hasTranslatable) {
         lines.push('use Astrotomic\\Translatable\\Contracts\\Translatable as TranslatableContract;');
         lines.push('use Astrotomic\\Translatable\\Translatable;');
@@ -262,7 +266,7 @@ function buildDocProperties(properties, expandedProperties, propertyOrder) {
     }
     return lines.length === 0 ? '' : lines.join('\n') + '\n';
 }
-function buildTraits(hasSoftDelete, isAuthenticatable, hasTranslatable, needsUuidTrait = false, needsUlidTrait = false) {
+function buildTraits(hasSoftDelete, isAuthenticatable, hasTranslatable, needsUuidTrait = false, needsUlidTrait = false, hasNestedSet = false) {
     const lines = [];
     lines.push('    use HasLocalizedDisplayName;');
     if (needsUuidTrait)
@@ -271,6 +275,8 @@ function buildTraits(hasSoftDelete, isAuthenticatable, hasTranslatable, needsUui
         lines.push('    use HasUlids;');
     if (isAuthenticatable)
         lines.push('    use Notifiable;');
+    if (hasNestedSet)
+        lines.push('    use NodeTrait;');
     if (hasSoftDelete)
         lines.push('    use SoftDeletes;');
     if (hasTranslatable)

package/dist/php/types.d.ts

@@ -17,6 +17,10 @@ export interface LaravelPathOverride {
     path?: string;
     namespace?: string;
 }
+/** Nested set package configuration. */
+export interface NestedSetOverride {
+    namespace?: string;
+}
 /** Overrides from codegen.laravel YAML config (all optional). */
 export interface LaravelCodegenOverrides {
     model?: LaravelPathOverride;
@@ -25,6 +29,7 @@ export interface LaravelCodegenOverrides {
     factory?: LaravelPathOverride;
     provider?: LaravelPathOverride;
     policy?: LaravelPathOverride;
+    nestedset?: NestedSetOverride;
 }
 /** PHP codegen configuration (resolved with defaults). */
 export interface PhpConfig {
@@ -60,6 +65,9 @@ export interface PhpConfig {
         path: string;
         basePath: string;
     };
+    nestedset: {
+        namespace: string;
+    };
 }
 /**
  * Derive full PHP config from optional overrides.

package/dist/php/types.js

@@ -40,6 +40,7 @@ export function derivePhpConfig(overrides) {
     const providerNs = overrides?.provider?.namespace ?? pathToNamespace(providerPath);
     const policyPath = overrides?.policy?.path ?? DEFAULT_POLICY_PATH;
     const policyNs = overrides?.policy?.namespace ?? pathToNamespace(policyPath);
+    const nestedsetNs = overrides?.nestedset?.namespace ?? 'Aimeos\\Nestedset';
     return {
         models: {
             namespace: modelNs,
@@ -73,5 +74,8 @@ export function derivePhpConfig(overrides) {
             path: policyPath,
             basePath: `${policyPath}/Base`,
         },
+        nestedset: {
+            namespace: nestedsetNs,
+        },
     };
 }

package/dist/types.d.ts

@@ -87,6 +87,7 @@ export interface SchemaOptions {
     readonly timestamps?: boolean;
     readonly softDelete?: boolean;
     readonly hidden?: boolean;
+    readonly nestedSet?: boolean;
     readonly tableName?: string;
     readonly indexes?: readonly unknown[];
     readonly unique?: readonly unknown[];

package/package.json

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