@omnifyjp/ts 7.0.1 → 7.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnifyjp/ts",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "description": "TypeScript model type generator from Omnify schemas.json",
   "type": "module",
   "main": "dist/index.js",
@@ -9,7 +9,7 @@
     "omnify-ts": "dist/cli.js"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "node -e \"require('fs').rmSync('dist', { recursive: true, force: true })\" && tsc",
     "dev": "tsc --watch",
     "generate-l12": "node dist/cli.js --config ../../examples/l12/omnify.yaml",
     "test": "vitest run"

package/dist/php/pint-format.d.ts

@@ -1,57 +0,0 @@
-/**
- * Auto-format generated PHP files via Laravel Pint. Issue #100 v5.8.20.
- *
- * Reporter scenario (godx-jp/godx-kintai 2026-04-26 audit): every
- * `omnify generate --force` produces 150+ PHP files that fail Laravel
- * Pint's standard preset (`vendor/bin/pint --test`):
- *
- *   - ordered_imports — `use` statements not alphabetised
- *   - fully_qualified_strict_types — exception types referenced via FQN
- *   - class_attributes_separation — missing blank lines between members
- *   - function_declaration — function-keyword spacing
- *   - unary_operator_spaces — `! \$x` vs `!\$x`
- *   - no_unused_imports — codegen leaves the occasional dangling import
- *   - single_line_empty_body — empty class bodies on multiple lines
- *   - self_static_accessor — `self::` vs `static::` on enums
- *   - blank_line_before_statement — enum `case` separators
- *
- * Auto-detect: when `<rootPath>/vendor/bin/pint` exists, run it on the
- * files we just wrote. Same Pint preset the project's CI already uses,
- * so no risk of formatter drift between codegen and CI checks.
- *
- * Opt-out: future config field; for now `chmod -x vendor/bin/pint` or
- * deleting it disables the auto-run.
- */
-/**
- * Resolve the `vendor/bin/pint` path for the project. Walks up from
- * the first written file until we find a sibling `vendor/bin/pint`,
- * stopping at filesystem root or after 12 levels (defensive against
- * pathological inputs). Returns the absolute path or null.
- */
-export declare function findPintBinary(anyWrittenPhpPath: string): string | null;
-export interface PintFormatResult {
-    ran: boolean;
-    pintPath: string | null;
-    /** Files passed to pint. */
-    formattedCount: number;
-    /** Pint's exit status if it ran. 0 = success. */
-    exitStatus: number | null;
-    /** Captured stderr when pint failed (status != 0). */
-    errorMessage?: string;
-    /**
-     * Why the run did not happen, when `ran` is false. The caller needs the three apart: only
-     * `pint-not-found` is worth telling a human about, and it is the one that silently changes what
-     * gets written to disk (godx-jp/godx-corebooks#108 — 927 files, reproduced).
-     */
-    skipped?: 'no-php-files' | 'opted-out' | 'pint-not-found';
-}
-/**
- * Run Laravel Pint on the given PHP files (absolute paths). No-op if
- * Pint isn't installed in the project. Pint is invoked with `--quiet`
- * so it stays out of the way unless something breaks.
- *
- * Pint takes a list of files (or directories) and formats them in
- * place. It uses the project's `pint.json` config if present, else the
- * Laravel preset.
- */
-export declare function runPintFormat(writtenPhpPaths: string[]): PintFormatResult;

package/dist/php/pint-format.js

@@ -1,102 +0,0 @@
-/**
- * Auto-format generated PHP files via Laravel Pint. Issue #100 v5.8.20.
- *
- * Reporter scenario (godx-jp/godx-kintai 2026-04-26 audit): every
- * `omnify generate --force` produces 150+ PHP files that fail Laravel
- * Pint's standard preset (`vendor/bin/pint --test`):
- *
- *   - ordered_imports — `use` statements not alphabetised
- *   - fully_qualified_strict_types — exception types referenced via FQN
- *   - class_attributes_separation — missing blank lines between members
- *   - function_declaration — function-keyword spacing
- *   - unary_operator_spaces — `! \$x` vs `!\$x`
- *   - no_unused_imports — codegen leaves the occasional dangling import
- *   - single_line_empty_body — empty class bodies on multiple lines
- *   - self_static_accessor — `self::` vs `static::` on enums
- *   - blank_line_before_statement — enum `case` separators
- *
- * Auto-detect: when `<rootPath>/vendor/bin/pint` exists, run it on the
- * files we just wrote. Same Pint preset the project's CI already uses,
- * so no risk of formatter drift between codegen and CI checks.
- *
- * Opt-out: future config field; for now `chmod -x vendor/bin/pint` or
- * deleting it disables the auto-run.
- */
-import { existsSync, statSync } from 'node:fs';
-import { spawnSync } from 'node:child_process';
-import { dirname, join } from 'node:path';
-/**
- * Resolve the `vendor/bin/pint` path for the project. Walks up from
- * the first written file until we find a sibling `vendor/bin/pint`,
- * stopping at filesystem root or after 12 levels (defensive against
- * pathological inputs). Returns the absolute path or null.
- */
-export function findPintBinary(anyWrittenPhpPath) {
-    let cur = dirname(anyWrittenPhpPath);
-    for (let i = 0; i < 12; i++) {
-        const candidate = join(cur, 'vendor', 'bin', 'pint');
-        if (existsSync(candidate)) {
-            try {
-                const st = statSync(candidate);
-                if (st.isFile())
-                    return candidate;
-            }
-            catch {
-                // ignore stat errors and keep climbing
-            }
-        }
-        const parent = dirname(cur);
-        if (parent === cur)
-            break;
-        cur = parent;
-    }
-    return null;
-}
-/**
- * Run Laravel Pint on the given PHP files (absolute paths). No-op if
- * Pint isn't installed in the project. Pint is invoked with `--quiet`
- * so it stays out of the way unless something breaks.
- *
- * Pint takes a list of files (or directories) and formats them in
- * place. It uses the project's `pint.json` config if present, else the
- * Laravel preset.
- */
-export function runPintFormat(writtenPhpPaths) {
-    if (writtenPhpPaths.length === 0) {
-        return { ran: false, pintPath: null, formattedCount: 0, exitStatus: null, skipped: 'no-php-files' };
-    }
-    // Opt-out (#174). The auto-run hides what the generators actually emit: a
-    // template that Pint rewrites looks fine here and produces churn in every
-    // project where Pint is absent or does not run. `OMNIFY_NO_PINT=1` is how
-    // the repo's own fixture check measures the raw output.
-    if (process.env.OMNIFY_NO_PINT === '1') {
-        return { ran: false, pintPath: null, formattedCount: 0, exitStatus: null, skipped: 'opted-out' };
-    }
-    // Resolution walks up from a written file. Trying only the first one makes
-    // it depend on emission order — a single file outside the Laravel root and
-    // the whole run goes unformatted, silently. Try each until one resolves.
-    const pintPath = writtenPhpPaths.reduce((found, path) => found ?? findPintBinary(path), null);
-    if (!pintPath) {
-        return { ran: false, pintPath: null, formattedCount: 0, exitStatus: null, skipped: 'pint-not-found' };
-    }
-    // Pint's working dir should be the Laravel project root (where
-    // composer.json + pint.json live). The pint binary is at
-    // `<projectRoot>/vendor/bin/pint`, so projectRoot is two parents up.
-    const projectRoot = dirname(dirname(dirname(pintPath)));
-    // Pass each file as its own arg. Pint accepts multiple file/dir
-    // arguments; capping the batch is unnecessary up to a few hundred
-    // files (well under the OS arg limit).
-    const result = spawnSync(pintPath, ['--quiet', ...writtenPhpPaths], {
-        cwd: projectRoot,
-        stdio: ['ignore', 'pipe', 'pipe'],
-        encoding: 'utf-8',
-    });
-    const exitStatus = result.status ?? null;
-    return {
-        ran: true,
-        pintPath,
-        formattedCount: writtenPhpPaths.length,
-        exitStatus,
-        errorMessage: exitStatus !== 0 ? (result.stderr || result.stdout || undefined) : undefined,
-    };
-}

package/dist/prettier-format.d.ts

@@ -1,23 +0,0 @@
-/**
- * Auto-format generated TypeScript files via the consuming project's Prettier.
- * Issue omnify-jp/omnify-go#211 (mirrors php/pint-format.ts).
- */
-/**
- * Resolve `node_modules/.bin/prettier` by walking up from a written `.ts` file.
- */
-export declare function findPrettierBinary(anyWrittenTsPath: string): string | null;
-/** Directory containing the `node_modules` that owns this Prettier binary. */
-export declare function prettierProjectRoot(prettierPath: string): string;
-export interface PrettierFormatResult {
-    ran: boolean;
-    prettierPath: string | null;
-    formattedCount: number;
-    exitStatus: number | null;
-    errorMessage?: string;
-    skipped?: 'no-ts-files' | 'opted-out' | 'prettier-not-found';
-}
-/**
- * Run the project's Prettier on the given TypeScript files (absolute paths).
- * Silent no-op when Prettier is not installed; never throws.
- */
-export declare function runPrettierFormat(writtenTsPaths: string[]): PrettierFormatResult;

package/dist/prettier-format.js

@@ -1,102 +0,0 @@
-/**
- * Auto-format generated TypeScript files via the consuming project's Prettier.
- * Issue omnify-jp/omnify-go#211 (mirrors php/pint-format.ts).
- */
-import { existsSync, statSync } from 'node:fs';
-import { spawnSync } from 'node:child_process';
-import { dirname, join } from 'node:path';
-/** Max file paths per Prettier invocation (stay under typical ARG_MAX). */
-const PRETTIER_BATCH_SIZE = 100;
-/**
- * Resolve `node_modules/.bin/prettier` by walking up from a written `.ts` file.
- */
-export function findPrettierBinary(anyWrittenTsPath) {
-    let cur = dirname(anyWrittenTsPath);
-    for (let i = 0; i < 12; i++) {
-        const candidate = join(cur, 'node_modules', '.bin', 'prettier');
-        if (existsSync(candidate)) {
-            try {
-                const st = statSync(candidate);
-                if (st.isFile())
-                    return candidate;
-            }
-            catch {
-                // ignore stat errors and keep climbing
-            }
-        }
-        const parent = dirname(cur);
-        if (parent === cur)
-            break;
-        cur = parent;
-    }
-    return null;
-}
-/** Directory containing the `node_modules` that owns this Prettier binary. */
-export function prettierProjectRoot(prettierPath) {
-    return dirname(dirname(dirname(prettierPath)));
-}
-function runPrettierBatch(prettierPath, projectRoot, files) {
-    const result = spawnSync(prettierPath, ['--write', ...files], {
-        cwd: projectRoot,
-        stdio: ['ignore', 'pipe', 'pipe'],
-        encoding: 'utf-8',
-    });
-    const exitStatus = result.status ?? null;
-    return {
-        exitStatus,
-        errorMessage: exitStatus !== 0 ? (result.stderr || result.stdout || undefined) : undefined,
-    };
-}
-/**
- * Run the project's Prettier on the given TypeScript files (absolute paths).
- * Silent no-op when Prettier is not installed; never throws.
- */
-export function runPrettierFormat(writtenTsPaths) {
-    if (writtenTsPaths.length === 0) {
-        return {
-            ran: false,
-            prettierPath: null,
-            formattedCount: 0,
-            exitStatus: null,
-            skipped: 'no-ts-files',
-        };
-    }
-    if (process.env.OMNIFY_NO_PRETTIER === '1') {
-        return {
-            ran: false,
-            prettierPath: null,
-            formattedCount: 0,
-            exitStatus: null,
-            skipped: 'opted-out',
-        };
-    }
-    const prettierPath = writtenTsPaths.reduce((found, path) => found ?? findPrettierBinary(path), null);
-    if (!prettierPath) {
-        return {
-            ran: false,
-            prettierPath: null,
-            formattedCount: 0,
-            exitStatus: null,
-            skipped: 'prettier-not-found',
-        };
-    }
-    const projectRoot = prettierProjectRoot(prettierPath);
-    let exitStatus = 0;
-    let errorMessage;
-    for (let i = 0; i < writtenTsPaths.length; i += PRETTIER_BATCH_SIZE) {
-        const batch = writtenTsPaths.slice(i, i + PRETTIER_BATCH_SIZE);
-        const batchResult = runPrettierBatch(prettierPath, projectRoot, batch);
-        if (batchResult.exitStatus !== 0) {
-            exitStatus = batchResult.exitStatus;
-            errorMessage = batchResult.errorMessage;
-            break;
-        }
-    }
-    return {
-        ran: true,
-        prettierPath,
-        formattedCount: writtenTsPaths.length,
-        exitStatus,
-        errorMessage,
-    };
-}