@famgia/omnify-typescript 0.0.147 → 0.0.149

package/dist/plugin.cjs

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,19 +15,12 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/plugin.ts
 var plugin_exports = {};
 __export(plugin_exports, {
+  DEFAULTS: () => DEFAULTS,
   LEGACY_DEFAULTS: () => LEGACY_DEFAULTS,
   MODERN_DEFAULTS: () => MODERN_DEFAULTS,
   default: () => typescriptPlugin,
@@ -358,6 +349,10 @@ function resolveDisplayName2(value, options = {}) {
     config: options.localeConfig
   });
 }
+function toPascalCase(value) {
+  const normalized = value.replace(/([a-z])([A-Z])/g, "$1_$2");
+  return normalized.split(/[-_\s]+/).map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join("");
+}
 function toEnumMemberName(value) {
   let result = value.split(/[-_\s]+/).map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join("").replace(/[^a-zA-Z0-9]/g, "");
   if (/^\d/.test(result)) {
@@ -637,7 +632,7 @@ function extractInlineEnums(schemas, options = {}) {
       if (property.type === "Enum") {
         const enumProp = property;
         if (Array.isArray(enumProp.enum) && enumProp.enum.length > 0) {
-          const typeName = `${schema.name}${propName.charAt(0).toUpperCase() + propName.slice(1)}`;
+          const typeName = `${schema.name}${toPascalCase(propName)}`;
           const displayName = resolveDisplayName2(enumProp.displayName, options);
           const hasLabels = enumProp.enum.some((v) => typeof v !== "string" && v.label !== void 0);
           if (hasLabels) {
@@ -666,7 +661,7 @@ function extractInlineEnums(schemas, options = {}) {
       if (property.type === "Select") {
         const selectProp = property;
         if (selectProp.options && selectProp.options.length > 0) {
-          const typeName = `${schema.name}${propName.charAt(0).toUpperCase() + propName.slice(1)}`;
+          const typeName = `${schema.name}${toPascalCase(propName)}`;
           const displayName = resolveDisplayName2(selectProp.displayName, options);
           const hasLabels = selectProp.options.some((v) => typeof v !== "string" && v.label !== void 0);
           if (hasLabels) {
@@ -1063,15 +1058,15 @@ function applyValidationRules(schema, rules, propType) {
   if (!rules) return schema;
   let result = schema;
   if (rules.url) {
-    result = "z.url()";
+    result = "z.string().url()";
   } else if (rules.uuid) {
-    result = "z.uuid()";
+    result = "z.string().uuid()";
   } else if (rules.ip) {
-    result = "z.ip()";
+    result = "z.string().ip()";
   } else if (rules.ipv4) {
-    result = "z.ipv4()";
+    result = 'z.string().ip({ version: "v4" })';
   } else if (rules.ipv6) {
-    result = "z.ipv6()";
+    result = 'z.string().ip({ version: "v6" })';
   }
   const isStringType = ["String", "Text", "MediumText", "LongText", "Password", "Email"].includes(propType);
   if (isStringType) {
@@ -1188,7 +1183,7 @@ function getZodSchemaForType(propDef, fieldName, customTypes) {
       }
       break;
     case "Email":
-      schema = "z.email()";
+      schema = "z.string().email()";
       if (def.maxLength || def.length) {
         schema += `.max(${def.maxLength ?? def.length ?? 255})`;
       }
@@ -1293,9 +1288,9 @@ function generateCompoundTypeSchemas(propName, propDef, customType, options) {
     const format = overrideRules?.format ?? pluginRules?.format;
     let schema = "z.string()";
     if (format === "email") {
-      schema = "z.email()";
+      schema = "z.string().email()";
     } else if (format === "url") {
-      schema = "z.url()";
+      schema = "z.string().url()";
     } else if (format === "phone") {
       schema = "z.string()";
     } else if (format === "postal_code") {
@@ -1800,7 +1795,7 @@ function generateBaseInterfaceFile(schemaName, schemas, options) {
 `);
   }
   if (iface.enumDependencies && iface.enumDependencies.length > 0) {
-    const schemaEnumPrefix = options.schemaEnumImportPrefix ?? (options.enumImportPrefix ? `../${options.enumImportPrefix}` : "../enum");
+    const schemaEnumPrefix = options.schemaEnumImportPrefix ?? (options.enumImportPrefix?.startsWith("@") ? options.enumImportPrefix : options.enumImportPrefix ? `../${options.enumImportPrefix}` : "../enum");
     const pluginEnumNames = new Set(
       options.pluginEnums ? Array.from(options.pluginEnums.keys()) : []
     );
@@ -2149,6 +2144,7 @@ function generateIndexFile(schemas, enums, pluginEnums, typeAliases, options) {
   const ext = getImportExt2(options);
   const isNodeModulesBase = options.baseImportPrefix?.startsWith("@");
   const commonImportPath = isNodeModulesBase ? `${options.baseImportPrefix}/common` : "./common";
+  const i18nImportPath = isNodeModulesBase ? `${options.baseImportPrefix}/i18n` : "./i18n";
   parts.push(`// Common Types
 `);
   parts.push(`export type { LocaleMap, Locale, ValidationRule, DateTimeString, DateString } from '${commonImportPath}${ext}';
@@ -2170,7 +2166,7 @@ function generateIndexFile(schemas, enums, pluginEnums, typeAliases, options) {
 `);
   parts.push(`  getMessages,
 `);
-  parts.push(`} from './i18n${ext}';
+  parts.push(`} from '${i18nImportPath}${ext}';
 
 `);
   const enumPrefix = options.enumImportPrefix ?? "./enum";
@@ -2383,19 +2379,8 @@ Hint: Rename your schema enum to avoid conflict with plugin-provided enums`
 }
 
 // src/plugin.ts
-var import_fs = __toESM(require("fs"), 1);
-var import_path = __toESM(require("path"), 1);
-var import_url = require("url");
-var import_meta = {};
-var __filename = (0, import_url.fileURLToPath)(import_meta.url);
-var __dirname = import_path.default.dirname(__filename);
-var MODERN_DEFAULTS = {
-  modelsPath: "node_modules/.omnify/schemas",
-  stubsPath: false
-};
-var LEGACY_DEFAULTS = {
-  modelsPath: "types/schemas",
-  stubsPath: "omnify"
+var DEFAULTS = {
+  modelsPath: "resources/ts/omnify"
 };
 var TYPESCRIPT_CONFIG_SCHEMA = {
   fields: [
@@ -2403,8 +2388,8 @@ var TYPESCRIPT_CONFIG_SCHEMA = {
       key: "modelsPath",
       type: "path",
       label: "Schemas Output Path",
-      description: 'Directory for generated TypeScript types and Zod schemas. Use "node_modules/.omnify/schemas" for modern mode with @famgia/omnify-react.',
-      default: LEGACY_DEFAULTS.modelsPath,
+      description: "Directory for generated TypeScript types and Zod schemas.",
+      default: DEFAULTS.modelsPath,
       group: "output"
     },
     {
@@ -2414,69 +2399,15 @@ var TYPESCRIPT_CONFIG_SCHEMA = {
       description: "Generate Zod schemas alongside TypeScript types for form validation",
       default: true,
       group: "output"
-    },
-    {
-      key: "stubsPath",
-      type: "path",
-      label: "React Stubs Path",
-      description: "Directory for React utility stubs (hooks, components). Leave empty to disable. Recommended: use @famgia/omnify-react instead.",
-      default: LEGACY_DEFAULTS.stubsPath,
-      group: "output"
     }
   ]
 };
-function isNodeModulesPath(p) {
-  return p.includes("node_modules");
-}
 function resolveOptions(options) {
-  const modelsPath = options?.modelsPath ?? LEGACY_DEFAULTS.modelsPath;
-  const isModernMode = isNodeModulesPath(modelsPath);
-  const defaultStubsPath = isModernMode ? false : LEGACY_DEFAULTS.stubsPath;
   return {
-    modelsPath,
-    generateZodSchemas: options?.generateZodSchemas ?? true,
-    stubsPath: options?.stubsPath ?? defaultStubsPath,
-    isModernMode
+    modelsPath: options?.modelsPath ?? DEFAULTS.modelsPath,
+    generateZodSchemas: options?.generateZodSchemas ?? true
   };
 }
-var STUB_FILES = [
-  // Components
-  {
-    stub: "JapaneseNameField.tsx.stub",
-    output: "components/JapaneseNameField.tsx"
-  },
-  {
-    stub: "JapaneseAddressField.tsx.stub",
-    output: "components/JapaneseAddressField.tsx"
-  },
-  {
-    stub: "JapaneseBankField.tsx.stub",
-    output: "components/JapaneseBankField.tsx"
-  },
-  // Hooks
-  {
-    stub: "use-form-mutation.ts.stub",
-    output: "hooks/use-form-mutation.ts"
-  },
-  // Lib - validation utilities
-  {
-    stub: "zod-i18n.ts.stub",
-    output: "lib/zod-i18n.ts"
-  },
-  {
-    stub: "form-validation.ts.stub",
-    output: "lib/form-validation.ts"
-  },
-  // Rules - Japanese validation rules
-  {
-    stub: "rules/kana.ts.stub",
-    output: "lib/rules/kana.ts"
-  },
-  {
-    stub: "rules/index.ts.stub",
-    output: "lib/rules/index.ts"
-  }
-];
 function typescriptPlugin(options) {
   const resolved = resolveOptions(options);
   return {
@@ -2488,29 +2419,39 @@ function typescriptPlugin(options) {
         name: "typescript-models",
         description: "Generate TypeScript model definitions",
         generate: async (ctx) => {
-          const modelsDir = import_path.default.dirname(resolved.modelsPath);
-          const frontendRoot = modelsDir.replace(/\/src\/.*$/, "");
-          const pluginEnumBase = `${frontendRoot}/node_modules/@omnify-client`;
-          const pluginEnumPath = `${pluginEnumBase}/enum`;
-          const hasPluginEnums = ctx.pluginEnums && ctx.pluginEnums.size > 0;
+          const omnifyBaseDir = "node_modules/@omnify-base";
           const files = generateTypeScript(ctx.schemas, {
             generateZodSchemas: resolved.generateZodSchemas,
             localeConfig: ctx.localeConfig,
             customTypes: ctx.customTypes,
             pluginEnums: ctx.pluginEnums,
-            pluginEnumImportPrefix: "@omnify-client/enum"
+            // All generated files (enums, base) go to @omnify-base - they shouldn't be edited
+            enumImportPrefix: "@omnify-base/enum",
+            pluginEnumImportPrefix: "@omnify-base/enum",
+            baseImportPrefix: "@omnify-base/schemas"
           });
           const outputs = [];
-          if (hasPluginEnums) {
+          const hasOmnifyClientFiles = files.some(
+            (f) => f.category === "enum" || f.category === "plugin-enum" || f.category === "base"
+          );
+          if (hasOmnifyClientFiles) {
             outputs.push({
-              path: `${pluginEnumBase}/package.json`,
+              path: `${omnifyBaseDir}/package.json`,
               content: JSON.stringify({
-                name: "@omnify-client",
+                name: "@omnify-base",
                 version: "0.0.0",
                 private: true,
-                main: "./enum/index.js",
+                type: "module",
                 exports: {
-                  "./enum/*": "./enum/*.js"
+                  // Wildcard exports for TypeScript bundlers (Vite, esbuild, etc.)
+                  "./enum/*": {
+                    types: "./enum/*.ts",
+                    default: "./enum/*.ts"
+                  },
+                  "./schemas/*": {
+                    types: "./schemas/*.ts",
+                    default: "./schemas/*.ts"
+                  }
                 }
               }, null, 2),
               type: "other",
@@ -2519,11 +2460,13 @@ function typescriptPlugin(options) {
           }
           for (const file of files) {
             let outputPath;
-            if (file.category === "plugin-enum") {
-              outputPath = `${pluginEnumPath}/${file.filePath}`;
-            } else if (file.category === "enum") {
-              const enumPath = resolved.modelsPath.replace(/\/schemas\/?$/, "/enum");
-              outputPath = `${enumPath}/${file.filePath}`;
+            if (file.category === "plugin-enum" || file.category === "enum") {
+              outputPath = `${omnifyBaseDir}/enum/${file.filePath}`;
+            } else if (file.category === "base") {
+              const fileName = file.filePath.replace(/^base\//, "");
+              outputPath = `${omnifyBaseDir}/schemas/${fileName}`;
+            } else if (file.overwrite && (file.filePath === "common.ts" || file.filePath === "i18n.ts")) {
+              outputPath = `${omnifyBaseDir}/schemas/${file.filePath}`;
             } else {
               outputPath = `${resolved.modelsPath}/${file.filePath}`;
             }
@@ -2540,74 +2483,21 @@ function typescriptPlugin(options) {
           }
           return outputs;
         }
-      },
-      {
-        name: "typescript-stubs",
-        description: "Generate React utility stubs (hooks, components) - DEPRECATED: use @famgia/omnify-react",
-        generate: async (ctx) => {
-          if (resolved.stubsPath === false) {
-            return [];
-          }
-          if (ctx.logger) {
-            ctx.logger.warn(
-              "Stub generation is deprecated. Consider using @famgia/omnify-react package instead.\n  npm install @famgia/omnify-react\n  Then set stubsPath: false in your config."
-            );
-          }
-          const outputs = [];
-          const stubsDir = import_path.default.join(__dirname, "..", "stubs");
-          for (const { stub, output } of STUB_FILES) {
-            const stubPath = import_path.default.join(stubsDir, stub);
-            if (import_fs.default.existsSync(stubPath)) {
-              const content = import_fs.default.readFileSync(stubPath, "utf-8");
-              outputs.push({
-                path: `${resolved.stubsPath}/${output}`,
-                content,
-                type: "other",
-                skipIfExists: false
-                // Always overwrite - library files should stay in sync
-              });
-            }
-          }
-          outputs.push({
-            path: `${resolved.stubsPath}/components/index.ts`,
-            content: `export { JapaneseNameField, type JapaneseNameFieldProps } from './JapaneseNameField';
-export { JapaneseAddressField, type JapaneseAddressFieldProps } from './JapaneseAddressField';
-export { JapaneseBankField, type JapaneseBankFieldProps } from './JapaneseBankField';
-`,
-            type: "other",
-            skipIfExists: false
-          });
-          outputs.push({
-            path: `${resolved.stubsPath}/hooks/index.ts`,
-            content: `export { useFormMutation } from './use-form-mutation';
-`,
-            type: "other",
-            skipIfExists: false
-          });
-          outputs.push({
-            path: `${resolved.stubsPath}/lib/index.ts`,
-            content: `export { setZodLocale, getZodLocale, getZodMessage } from './zod-i18n';
-export { zodRule, requiredRule } from './form-validation';
-export * from './rules';
-`,
-            type: "other",
-            skipIfExists: false
-          });
-          return outputs;
-        }
       }
     ]
   };
 }
+var MODERN_DEFAULTS = DEFAULTS;
+var LEGACY_DEFAULTS = DEFAULTS;
 function typescriptModern(options) {
   return typescriptPlugin({
     ...options,
-    modelsPath: MODERN_DEFAULTS.modelsPath,
-    stubsPath: MODERN_DEFAULTS.stubsPath
+    modelsPath: options?.modelsPath ?? DEFAULTS.modelsPath
   });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  DEFAULTS,
   LEGACY_DEFAULTS,
   MODERN_DEFAULTS,
   typescriptModern,