@omnifyjp/ts 8.0.7 → 8.1.1

package/README.md

@@ -26,7 +26,9 @@ Per model with `options.service` or `options.api` (in `<output>/base/`):
 - **`<Model>QueryKeys.ts`** — TanStack Query key factory per model
 - **`<Model>Hooks.ts`** — React Query hooks (`useList`, `useDetail`,
   `useCreate`, `useUpdate`, `useDelete`, `useRestore`) with auto-invalidation
-  and toast notifications via `sonner`
+  and toast notifications via `sonner` (configurable with `hooks.toastImport`,
+  or skipped with `hooks.enable: false` — see
+  [`docs/reference/typescript-hooks.md`](../../docs/reference/typescript-hooks.md))
 
 Plus shared infrastructure at the codegen output root:
 

package/dist/cli.js

@@ -113,6 +113,7 @@ function resolveFromConfig(configPath) {
         tsPlatform: tsConfig?.platform,
         tsAuth: tsConfig?.auth,
         tsEnumStyle: tsConfig?.enumStyle,
+        tsHooks: tsConfig?.hooks,
         laravelEnabled,
         laravelOverrides,
     };
@@ -125,6 +126,11 @@ program
     .option('-i, --input <spec>', 'schemas.json source: local path, http(s) URL, or npm package spec (overrides config)')
     .option('-o, --output <path>', 'Output directory for TypeScript (overrides config)')
     .option('--force', 'Force regeneration of auto-generated files', false)
+    .option('--platform <platform>', 'TypeScript target platform with --input/--output: web | expo')
+    .option('--auth <auth>', 'Auth strategy with --input/--output: cookie | secureStore')
+    .option('--enum-style <style>', 'Enum emission style with --input/--output: enum | const')
+    .option('--toast-import <module>', 'Module the generated hooks import `toast` from (default "sonner")')
+    .option('--no-hooks', 'Skip generating {Entity}Hooks.ts')
     .option('--frozen-lockfile', 'Fail if remote input differs from .omnify/input.lock.json (CI mode)', false)
     .option('--update', 'Force re-fetch of remote input and refresh the lockfile', false)
     .action(async (opts) => {
@@ -134,6 +140,7 @@ program
     let tsPlatform;
     let tsAuth;
     let tsEnumStyle;
+    let tsHooks;
     let laravelEnabled = false;
     let laravelOverrides;
     let configDir = process.cwd();
@@ -142,6 +149,19 @@ program
         // passed through unchanged so URLs/npm specs work too.
         inputSpec = opts.input;
         tsOutput = resolve(opts.output);
+        // The workspace dispatcher calls this mode once per TypeScript target
+        // and has no config file to point at, so the target's options arrive
+        // as flags. Before these flags existed every workspace target silently
+        // generated with the web/cookie/enum/"sonner" defaults.
+        tsPlatform = opts.platform;
+        tsAuth = opts.auth;
+        tsEnumStyle = opts.enumStyle;
+        if (opts.toastImport !== undefined || opts.hooks === false) {
+            tsHooks = {
+                ...(opts.hooks === false ? { enable: false } : {}),
+                ...(opts.toastImport !== undefined ? { toastImport: opts.toastImport } : {}),
+            };
+        }
     }
     else {
         // Read from omnify.yaml
@@ -159,6 +179,7 @@ program
         tsPlatform = resolved.tsPlatform;
         tsAuth = resolved.tsAuth;
         tsEnumStyle = resolved.tsEnumStyle;
+        tsHooks = resolved.tsHooks;
         laravelEnabled = resolved.laravelEnabled;
         laravelOverrides = resolved.laravelOverrides;
     }
@@ -187,6 +208,7 @@ program
             platform: tsPlatform,
             auth: tsAuth,
             enumStyle: tsEnumStyle,
+            hooks: tsHooks,
         });
         mkdirSync(join(tsOutput, 'base'), { recursive: true });
         mkdirSync(join(tsOutput, 'enum'), { recursive: true });

package/dist/generator.d.ts

@@ -20,6 +20,13 @@ export interface GenerateExtraConfig {
     auth?: 'cookie' | 'secureStore';
     /** Enum emission style — see GeneratorOptions.enumStyle. Issue #103. */
     enumStyle?: 'enum' | 'const';
+    /** Hooks layer (`{Entity}Hooks.ts`). Issue #327. */
+    hooks?: {
+        /** false skips `{Entity}Hooks.ts` entirely. Defaults to true. */
+        enable?: boolean;
+        /** Module the hooks import `toast` from. Defaults to "sonner". */
+        toastImport?: string;
+    };
 }
 /**
  * Generate all TypeScript files from schemas.json input.

package/dist/generator.js

@@ -538,7 +538,9 @@ export function generateTypeScript(input, extra) {
     // Only for schemas with options.api or options.service.
     files.push(...generateTsServices(schemas, options));
     files.push(...generateTsQueryKeys(schemas));
-    files.push(...generateTsHooks(schemas));
+    if (extra?.hooks?.enable !== false) {
+        files.push(...generateTsHooks(schemas, { toastImport: extra?.hooks?.toastImport }));
+    }
     // React Native / Expo query setup (issue #63)
     if (options.platform === 'expo') {
         files.push(generateRnQuerySetup(options.auth ?? 'secureStore'));

package/dist/interface-generator.js

@@ -42,6 +42,7 @@ const TYPE_MAP = {
     Timestamp: 'DateTimeString',
     Json: 'unknown',
     Email: 'string',
+    Char: 'string',
     Password: 'string',
     Enum: 'string',
     Select: 'string',

package/dist/metadata-generator.js

@@ -21,7 +21,7 @@ import { formatTsObjectKey, tsObjectLiteral } from './ts-literal.js';
 // ---------------------------------------------------------------------------
 const TEXT_TYPES = new Set(['Text', 'MediumText', 'LongText']);
 const STRING_TYPES = new Set([
-    'String', 'Email', 'Password', 'Phone', 'Slug', 'Url', 'Uuid',
+    'String', 'Char', 'Email', 'Password', 'Phone', 'Slug', 'Url', 'Uuid',
 ]);
 const NUMBER_TYPES = new Set([
     'TinyInt', 'Int', 'BigInt', 'Float', 'Decimal',

package/dist/php/faker-mapper.js

@@ -13,6 +13,8 @@ export function toFaker(propName, property, schemas = {}) {
         return null;
     switch (type) {
         case 'String': return stringFaker(propName, snakeName, property);
+        // Fixed-length: exactly `length` characters, as a CHAR column holds (#319).
+        case 'Char': return `'${snakeName}' => fake()->regexify('[A-Z]{${property['length'] ?? 255}}'),`;
         case 'Email': return `'${snakeName}' => fake()->unique()->safeEmail(),`;
         case 'Password': return `'${snakeName}' => bcrypt('password'),`;
         case 'Int':

package/dist/php/openapi-generator.js

@@ -339,6 +339,7 @@ function propertyToOpenApi(propName, prop, reader) {
 function toOpenApiType(type) {
     switch (type) {
         case 'String':
+        case 'Char':
         case 'Slug':
         case 'Phone':
         case 'Text':

package/dist/php/schema-reader.js

@@ -4,7 +4,7 @@
 export class SchemaReader {
     data;
     constructor(data) {
-        this.data = data;
+        this.data = normalizeEnumValues(data);
     }
     static fromData(data) {
         return new SchemaReader(data);
@@ -371,3 +371,51 @@ export class SchemaReader {
         return fields;
     }
 }
+/**
+ * Bring enum values into the one shape every PHP generator reads (#322).
+ *
+ * The schema language accepts both forms in both places — `values: [draft]`
+ * and `values: [{value: draft, label: …}]` on a `kind: enum` schema, and the
+ * same two on an inline `enum:` property — and schemas.json carries them as
+ * written. The PHP generators were each written against one form: enum
+ * classes read `value.value` (so the README's plain-string example crashed),
+ * inline-enum rules interpolate the entry itself (so an object became
+ * `[object Object]`). Normalising here, once, keeps them from disagreeing.
+ */
+function normalizeEnumValues(data) {
+    if (!data.schemas)
+        return data;
+    const schemas = {};
+    for (const [name, schema] of Object.entries(data.schemas)) {
+        let next = schema;
+        const rawValues = schema.values;
+        if (Array.isArray(rawValues) && rawValues.some(v => typeof v === 'string')) {
+            next = {
+                ...next,
+                values: rawValues.map(v => (typeof v === 'string' ? { value: v } : v)),
+            };
+        }
+        const props = schema.properties;
+        if (props) {
+            let changed = false;
+            const nextProps = {};
+            for (const [propName, prop] of Object.entries(props)) {
+                const rawEnum = prop.enum;
+                if (Array.isArray(rawEnum) && rawEnum.some(v => typeof v !== 'string')) {
+                    changed = true;
+                    nextProps[propName] = {
+                        ...prop,
+                        enum: rawEnum.map(v => (typeof v === 'string' ? v : String(v?.value ?? ''))),
+                    };
+                }
+                else {
+                    nextProps[propName] = prop;
+                }
+            }
+            if (changed)
+                next = { ...next, properties: nextProps };
+        }
+        schemas[name] = next;
+    }
+    return { ...data, schemas };
+}

package/dist/php/type-mapper.js

@@ -67,6 +67,7 @@ export function toPhpDocType(type, nullable = false) {
     let phpType;
     switch (type) {
         case 'String':
+        case 'Char':
         case 'Email':
         case 'Password':
         case 'Text':
@@ -108,7 +109,7 @@ export function toPhpDocType(type, nullable = false) {
 }
 /** Type categories for rule applicability. */
 const STRING_TYPES = new Set([
-    'String', 'Email', 'Password', 'Text', 'MediumText', 'LongText',
+    'String', 'Char', 'Email', 'Password', 'Text', 'MediumText', 'LongText',
     'Slug', 'Url', 'Phone', 'Uuid',
 ]);
 const NUMERIC_TYPES = new Set(['Int', 'BigInt', 'TinyInt', 'Float', 'Decimal']);
@@ -148,6 +149,7 @@ export function toStoreRules(property, tableName, fkRuleType = 'integer') {
     }
     switch (type) {
         case 'String':
+        case 'Char':
         case 'Slug':
         case 'Url':
         case 'Phone': {

package/dist/ts-hooks-generator.d.ts

@@ -7,4 +7,12 @@
  * notifications and cache invalidation.
  */
 import type { SchemaDefinition, TypeScriptFile } from './types.js';
-export declare function generateTsHooks(schemas: Record<string, SchemaDefinition>): TypeScriptFile[];
+export interface TsHooksOptions {
+    /**
+     * Module the generated hooks import `toast` from. Defaults to "sonner".
+     * Point it at a design-system wrapper (e.g. "@godxjp/ui") whose Toaster
+     * listens to its own copy of sonner. Issue #327.
+     */
+    toastImport?: string;
+}
+export declare function generateTsHooks(schemas: Record<string, SchemaDefinition>, hooksOptions?: TsHooksOptions): TypeScriptFile[];

package/dist/ts-hooks-generator.js

@@ -6,11 +6,9 @@
  * that returns TanStack Query hooks (useQuery + useMutation) with toast
  * notifications and cache invalidation.
  */
-// ---------------------------------------------------------------------------
-// Public API
-// ---------------------------------------------------------------------------
-export function generateTsHooks(schemas) {
+export function generateTsHooks(schemas, hooksOptions = {}) {
     const files = [];
+    const toastImport = hooksOptions.toastImport || 'sonner';
     for (const [name, schema] of Object.entries(schemas)) {
         if (schema.kind === 'enum')
             continue;
@@ -18,14 +16,14 @@ export function generateTsHooks(schemas) {
             continue;
         if (!schema.options?.api && !schema.options?.service)
             continue;
-        files.push(generateHooksFile(name, schema));
+        files.push(generateHooksFile(name, schema, toastImport));
     }
     return files;
 }
 // ---------------------------------------------------------------------------
 // Per-schema generator
 // ---------------------------------------------------------------------------
-function generateHooksFile(name, schema) {
+function generateHooksFile(name, schema, toastImport) {
     const hasSoftDelete = schema.options?.softDelete ?? false;
     const hasRestore = schema.options?.api?.restore ?? hasSoftDelete;
     const restoreHook = hasRestore ? `
@@ -46,7 +44,7 @@ function generateHooksFile(name, schema) {
  * @generated by omnify
  */
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { toast } from "sonner";
+import { toast } from ${JSON.stringify(toastImport)};
 import type { ${name}Filters, ${name}BaseServiceType } from "./${name}Service";
 import type { create${name}QueryKeys } from "./${name}QueryKeys";
 

package/dist/zod-generator.js

@@ -50,7 +50,7 @@ function autoDerivePlaceholder(label, locales) {
 }
 /** Type categories for Zod rule applicability. */
 const ZOD_STRING_TYPES = new Set([
-    'String', 'Email', 'Password', 'Text', 'MediumText', 'LongText',
+    'String', 'Char', 'Email', 'Password', 'Text', 'MediumText', 'LongText',
     'Slug', 'Url', 'Phone', 'Uuid',
 ]);
 const ZOD_NUMERIC_TYPES = new Set(['Int', 'BigInt', 'TinyInt', 'Float', 'Decimal']);
@@ -172,6 +172,7 @@ function getZodSchemaForType(propDef, _fieldName, options) {
     }
     switch (propDef.type) {
         case 'String':
+        case 'Char':
         case 'Text':
         case 'MediumText':
         case 'LongText':

package/package.json

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