@ostack.tech/ui-kform-scaffolder 0.6.4 → 0.6.5

package/dist/ostack-ui-kform-scaffolder.js

@@ -232,6 +232,24 @@ function scaffoldField(schematic, data) {
     </ControlField>
   `;
 }
+const jsonSerializerKt = "package <%= filePackage %>\n\nimport kotlin.js.JsExport\nimport kotlin.jvm.JvmOverloads\nimport kotlinx.serialization.json.Json\n\n/** Base JSON configuration. */\nprivate val JSON_CONFIG = Json.Default\n/** Pretty JSON configuration. */\nprivate val JSON_CONFIG_PRETTY = Json(JSON_CONFIG) { prettyPrint = true }\n\n/** JSON configuration. */\n@JvmOverloads\nfun jsonConfig(prettyPrint: Boolean = false): Json =\n    if (prettyPrint) JSON_CONFIG_PRETTY else JSON_CONFIG\n\n<%_ if (includeSerializationFormatVersion) { -%>\n/** Version of the serialization format. */\n@JsExport\nconst val <%= formConstant %>_SERIALIZATION_VERSION = 1\n\n<%_ } -%>\n@JsExport\n@JvmOverloads\nfun encode<%= formClass %>ToString(<%= formVar %>: <%= formClass %>, prettyPrint: Boolean = false): String =\n    jsonConfig(prettyPrint).encodeToString(<%= formVar %>)\n\n@JsExport\nfun decode<%= formClass %>FromString(json: String): <%= formClass %> =\n    jsonConfig().decodeFromString(json)\n\n@JvmOverloads\nfun encode<%= formClass %>ExternalContextsToString(externalContexts: <%= formClass %>ExternalContexts, prettyPrint: Boolean = false): String =\n    jsonConfig(prettyPrint).encodeToString(externalContexts)\n\n@JsExport\nfun decode<%= formClass %>ExternalContextsFromString(json: String): <%= formClass %>ExternalContexts =\n    jsonConfig().decodeFromString(json)\n\n@JvmOverloads\nfun encode<%= formClass %>SubmitResponseToString(response: <%= formClass %>SubmitResponse, prettyPrint: Boolean = false): String =\n    jsonConfig(prettyPrint).encodeToString(response)\n\n@JsExport\nfun decode<%= formClass %>SubmitResponseFromString(json: String): <%= formClass %>SubmitResponse =\n    jsonConfig().decodeFromString(json)\n";
+const xmlSerializerKt = "package <%= filePackage %>\n\nimport kotlin.js.JsExport\nimport kotlin.jvm.JvmOverloads\nimport kotlinx.serialization.decodeFromString\nimport kotlinx.serialization.encodeToString\nimport nl.adaptivity.xmlutil.ExperimentalXmlUtilApi\nimport nl.adaptivity.xmlutil.QName\nimport nl.adaptivity.xmlutil.XMLConstants\nimport nl.adaptivity.xmlutil.core.XmlVersion\nimport nl.adaptivity.xmlutil.serialization.DefaultXmlSerializationPolicy\nimport nl.adaptivity.xmlutil.serialization.OutputKind\nimport nl.adaptivity.xmlutil.serialization.XML\nimport nl.adaptivity.xmlutil.serialization.XmlSerializationPolicy\nimport nl.adaptivity.xmlutil.serialization.structure.SafeParentInfo\n\n/** Base XML configuration. */\nprivate val XML_CONFIG = XML {\n    recommended_0_91_0 {\n        xmlVersion = XmlVersion.XML10\n        autoPolymorphic = false\n        encodeDefault = XmlSerializationPolicy.XmlEncodeDefault.NEVER\n    }\n\n    // Set policy on top of the current policy config\n    @OptIn(ExperimentalXmlUtilApi::class)\n    policy =\n        object : DefaultXmlSerializationPolicy(policy) {\n            // Serialize properties as elements instead of attributes by default\n            override val defaultPrimitiveOutputKind: OutputKind = OutputKind.Element\n\n            // Use property names as serial names by default\n            override fun effectiveName(\n                serializerParent: SafeParentInfo,\n                tagParent: SafeParentInfo,\n                outputKind: OutputKind,\n                useName: XmlSerializationPolicy.DeclaredNameInfo,\n            ): QName =\n                useName.annotatedName\n                    ?: serializerParent.elementTypeDescriptor.typeQname\n                    ?: QName(\n                        if (outputKind == OutputKind.Element) tagParent.namespace.namespaceURI\n                        else XMLConstants.NULL_NS_URI,\n                        useName.serialName,\n                    )\n        }\n}\n/** Pretty XML configuration. */\nprivate val XML_CONFIG_PRETTY = XML_CONFIG.copy { indent = 4 }\n\n/** XML configuration. */\n@JvmOverloads\nfun xmlConfig(prettyPrint: Boolean = false): XML =\n    if (prettyPrint) XML_CONFIG_PRETTY else XML_CONFIG\n\n<%_ if (includeSerializationFormatVersion) { -%>\n/** Version of the serialization format. */\n@JsExport\nconst val <%= formConstant %>_SERIALIZATION_VERSION = 1\n\n<%_ } -%>\n@JsExport\n@JvmOverloads\nfun encode<%= formClass %>ToString(<%= formVar %>: <%= formClass %>, prettyPrint: Boolean = false): String =\n    xmlConfig(prettyPrint).encodeToString(<%= formVar %>)\n\n@JsExport\nfun decode<%= formClass %>FromString(xml: String): <%= formClass %> =\n    xmlConfig().decodeFromString(xml)\n\n@JvmOverloads\nfun encode<%= formClass %>ExternalContextsToString(externalContexts: <%= formClass %>ExternalContexts, prettyPrint: Boolean = false): String =\n    xmlConfig(prettyPrint).encodeToString(externalContexts)\n\n@JsExport\nfun decode<%= formClass %>ExternalContextsFromString(xml: String): <%= formClass %>ExternalContexts =\n    xmlConfig().decodeFromString(xml)\n\n@JvmOverloads\nfun encode<%= formClass %>SubmitResponseToString(response: <%= formClass %>SubmitResponse, prettyPrint: Boolean = false): String =\n    xmlConfig(prettyPrint).encodeToString(response)\n\n@JsExport\nfun decode<%= formClass %>SubmitResponseFromString(xml: String): <%= formClass %>SubmitResponse =\n    xmlConfig().decodeFromString(xml)\n";
+const DEFAULT_INCLUDE_SERIALIZATION_FORMAT_VERSION = true;
+function scaffoldSerializer(schematic, data) {
+  const ejsData = {
+    filePackage: data.currentPackage,
+    formVar: camelCase(schematic.name),
+    formClass: schematic.name,
+    formConstant: constantCase(schematic.name),
+    includeSerializationFormatVersion: data.includeSerializationFormatVersion ?? DEFAULT_INCLUDE_SERIALIZATION_FORMAT_VERSION
+  };
+  addEjsTemplateFile(
+    data,
+    `${schematic.name}Serializer.kt`,
+    data.serializationFormat === "xml" ? xmlSerializerKt : jsonSerializerKt,
+    ejsData
+  );
+}
 function arrayify(value) {
   return value == null ? [] : Array.isArray(value) ? value : [value];
 }
@@ -273,38 +291,42 @@ const classSchematicKind = {
     if (data.currentPath !== "/") {
       return baseModel;
     }
-    data.currentFile.imports.add("kotlin.js.ExperimentalJsStatic").add("kotlin.js.JsStatic").add("kotlinx.serialization.EncodeDefault").add("kotlinx.serialization.ExperimentalSerializationApi");
     const classAnnotations = [];
-    const versionAnnotations = [
-      "@EncodeDefault",
-      "@OptIn(ExperimentalSerializationApi::class)"
-    ];
+    let versionProperty = null;
     if (data.serializationFormat === "xml") {
-      data.currentFile.imports.add("nl.adaptivity.xmlutil.serialization.XmlChildrenName").add("nl.adaptivity.xmlutil.serialization.XmlElement").add("nl.adaptivity.xmlutil.serialization.XmlSerialName");
-      const defaultNamespace = `http://${data.currentPackage.split(".").reverse().join(".")}/schema/${(/* @__PURE__ */ new Date()).getFullYear()}`;
+      data.currentFile.imports.add(
+        "nl.adaptivity.xmlutil.serialization.XmlSerialName"
+      );
+      const namespace = data.xmlNamespace ?? `http://${data.currentPackage.split(".").reverse().join(".")}/schema/${(/* @__PURE__ */ new Date()).getFullYear()}`;
       classAnnotations.push(
-        `@XmlSerialName("${schematic.name}", "${defaultNamespace}")`
+        `@XmlSerialName("${schematic.name}", "${namespace}")`
       );
-      versionAnnotations.push("@XmlElement(false)");
-    } else {
-      data.currentFile.imports.add("kotlinx.serialization.SerialName");
-      versionAnnotations.push('@SerialName($$"$version")');
     }
-    return annotate(
-      classAnnotations,
-      `${baseModel} ${code`
-        {
-            ${annotate(versionAnnotations, `internal var version = ${constantCase(schematic.name)}_SERIALIZATION_VERSION`)}
-
-            companion object {
-                @OptIn(ExperimentalJsStatic::class)
-                @JsStatic
-                fun createInitialValue(externalContexts: ${schematic.name}ExternalContexts) =
-                    externalContexts.initialValue ?: ${schematic.name}()
+    if (data.includeSerializationFormatVersion ?? DEFAULT_INCLUDE_SERIALIZATION_FORMAT_VERSION) {
+      data.currentFile.imports.add("kotlinx.serialization.EncodeDefault").add("kotlinx.serialization.ExperimentalSerializationApi");
+      const versionAnnotations = [
+        "@EncodeDefault",
+        "@OptIn(ExperimentalSerializationApi::class)"
+      ];
+      if (data.serializationFormat === "xml") {
+        data.currentFile.imports.add(
+          "nl.adaptivity.xmlutil.serialization.XmlElement"
+        );
+        versionAnnotations.push("@XmlElement(false)");
+      } else {
+        data.currentFile.imports.add("kotlinx.serialization.SerialName");
+        versionAnnotations.push('@SerialName($$"$version")');
+      }
+      versionProperty = annotate(
+        versionAnnotations,
+        `internal var version = ${constantCase(schematic.name)}_SERIALIZATION_VERSION`
+      );
+    }
+    return annotate(classAnnotations, baseModel) + (versionProperty ? ` ${code`
+            {
+                ${versionProperty}
             }
-        }
-      `}`
-    );
+          `}` : "");
   },
   scaffoldField: (schematic, data) => {
     data.currentFile.imports.push(
@@ -753,7 +775,6 @@ function scaffoldAppComponentFile(schematic, data) {
     { moduleName: "@ostack.tech/ui-kform", name: localeVar },
     { moduleName: "@ostack.tech/ui-kform", name: "IssuesPanel" },
     { moduleName: "react", name: "useMemo" },
-    { moduleName: data.kmpModuleName, name: schematic.name },
     { moduleName: data.kmpModuleName, name: `${schematic.name}FormMode` },
     { moduleName: data.kmpModuleName, name: `${schematic.name}Schema` },
     { moduleName: `./api/reportError.ts`, name: "reportError" },
@@ -774,10 +795,11 @@ function scaffoldAppComponentFile(schematic, data) {
       return (
         <FormApp
           schema={${schematic.name}Schema.get()}
-          initialValue={useMemo(
-            () => ${schematic.name}.createInitialValue(externalContexts),
-            [externalContexts],
-          )}
+          initialValue={
+            externalContexts.mode !== ${schematic.name}FormMode.NEW
+              ? externalContexts.initialValue
+              : undefined
+          }
           externalContexts={useMemo(
             () => ktMapToObject(externalContexts.toMap()),
             [externalContexts],
@@ -1436,22 +1458,6 @@ function scaffoldResponses(schematic, data) {
     ejsData
   );
 }
-const jsonSerializerKt = "package <%= filePackage %>\n\nimport kotlin.js.JsExport\nimport kotlin.jvm.JvmOverloads\nimport kotlinx.serialization.json.Json\n\n/** Base JSON configuration. */\nprivate val JSON_CONFIG = Json.Default\n/** Pretty JSON configuration. */\nprivate val JSON_CONFIG_PRETTY = Json(JSON_CONFIG) { prettyPrint = true }\n\n/** JSON configuration. */\n@JvmOverloads\nfun jsonConfig(prettyPrint: Boolean = false): Json =\n    if (prettyPrint) JSON_CONFIG_PRETTY else JSON_CONFIG\n\n/** Version of the serialization format. */\n@JsExport\nconst val <%= formConstant %>_SERIALIZATION_VERSION = 1\n\n@JsExport\n@JvmOverloads\nfun encode<%= formClass %>ToString(<%= formVar %>: <%= formClass %>, prettyPrint: Boolean = false): String =\n    jsonConfig(prettyPrint).encodeToString(<%= formVar %>)\n\n@JsExport\nfun decode<%= formClass %>FromString(json: String): <%= formClass %> =\n    jsonConfig().decodeFromString(json)\n\n@JvmOverloads\nfun encode<%= formClass %>ExternalContextsToString(externalContexts: <%= formClass %>ExternalContexts, prettyPrint: Boolean = false): String =\n    jsonConfig(prettyPrint).encodeToString(externalContexts)\n\n@JsExport\nfun decode<%= formClass %>ExternalContextsFromString(json: String): <%= formClass %>ExternalContexts =\n    jsonConfig().decodeFromString(json)\n\n@JvmOverloads\nfun encode<%= formClass %>SubmitResponseToString(response: <%= formClass %>SubmitResponse, prettyPrint: Boolean = false): String =\n    jsonConfig(prettyPrint).encodeToString(response)\n\n@JsExport\nfun decode<%= formClass %>SubmitResponseFromString(json: String): <%= formClass %>SubmitResponse =\n    jsonConfig().decodeFromString(json)\n";
-const xmlSerializerKt = "package <%= filePackage %>\n\nimport kotlin.js.JsExport\nimport kotlin.jvm.JvmOverloads\nimport kotlinx.serialization.decodeFromString\nimport kotlinx.serialization.encodeToString\nimport nl.adaptivity.xmlutil.ExperimentalXmlUtilApi\nimport nl.adaptivity.xmlutil.QName\nimport nl.adaptivity.xmlutil.XMLConstants\nimport nl.adaptivity.xmlutil.core.XmlVersion\nimport nl.adaptivity.xmlutil.serialization.DefaultXmlSerializationPolicy\nimport nl.adaptivity.xmlutil.serialization.OutputKind\nimport nl.adaptivity.xmlutil.serialization.XML\nimport nl.adaptivity.xmlutil.serialization.XmlSerializationPolicy\nimport nl.adaptivity.xmlutil.serialization.structure.SafeParentInfo\n\n/** Base XML configuration. */\nprivate val XML_CONFIG = XML {\n    recommended_0_91_0 {\n        xmlVersion = XmlVersion.XML10\n        autoPolymorphic = false\n        encodeDefault = XmlSerializationPolicy.XmlEncodeDefault.NEVER\n    }\n\n    // Set policy on top of the current policy config\n    @OptIn(ExperimentalXmlUtilApi::class)\n    policy =\n        object : DefaultXmlSerializationPolicy(policy) {\n            // Serialize properties as elements instead of attributes by default\n            override val defaultPrimitiveOutputKind: OutputKind = OutputKind.Element\n\n            // Use property names as serial names by default\n            override fun effectiveName(\n                serializerParent: SafeParentInfo,\n                tagParent: SafeParentInfo,\n                outputKind: OutputKind,\n                useName: XmlSerializationPolicy.DeclaredNameInfo,\n            ): QName =\n                useName.annotatedName\n                    ?: serializerParent.elementTypeDescriptor.typeQname\n                    ?: QName(\n                        if (outputKind == OutputKind.Element) tagParent.namespace.namespaceURI\n                        else XMLConstants.NULL_NS_URI,\n                        useName.serialName,\n                    )\n        }\n}\n/** Pretty XML configuration. */\nprivate val XML_CONFIG_PRETTY = XML_CONFIG.copy { indent = 4 }\n\n/** XML configuration. */\n@JvmOverloads\nfun xmlConfig(prettyPrint: Boolean = false): XML =\n    if (prettyPrint) XML_CONFIG_PRETTY else XML_CONFIG\n\n/** Version of the serialization format. */\n@JsExport\nconst val <%= formConstant %>_SERIALIZATION_VERSION = 1\n\n@JsExport\n@JvmOverloads\nfun encode<%= formClass %>ToString(<%= formVar %>: <%= formClass %>, prettyPrint: Boolean = false): String =\n    xmlConfig(prettyPrint).encodeToString(<%= formVar %>)\n\n@JsExport\nfun decode<%= formClass %>FromString(xml: String): <%= formClass %> =\n    xmlConfig().decodeFromString(xml)\n\n@JvmOverloads\nfun encode<%= formClass %>ExternalContextsToString(externalContexts: <%= formClass %>ExternalContexts, prettyPrint: Boolean = false): String =\n    xmlConfig(prettyPrint).encodeToString(externalContexts)\n\n@JsExport\nfun decode<%= formClass %>ExternalContextsFromString(xml: String): <%= formClass %>ExternalContexts =\n    xmlConfig().decodeFromString(xml)\n\n@JvmOverloads\nfun encode<%= formClass %>SubmitResponseToString(response: <%= formClass %>SubmitResponse, prettyPrint: Boolean = false): String =\n    xmlConfig(prettyPrint).encodeToString(response)\n\n@JsExport\nfun decode<%= formClass %>SubmitResponseFromString(xml: String): <%= formClass %>SubmitResponse =\n    xmlConfig().decodeFromString(xml)\n";
-function scaffoldSerializer(schematic, data) {
-  const ejsData = {
-    filePackage: data.currentPackage,
-    formVar: camelCase(schematic.name),
-    formClass: schematic.name,
-    formConstant: constantCase(schematic.name)
-  };
-  addEjsTemplateFile(
-    data,
-    `${schematic.name}Serializer.kt`,
-    data.serializationFormat === "xml" ? xmlSerializerKt : jsonSerializerKt,
-    ejsData
-  );
-}
 const indexScss = '@use "@ostack.tech/ui/scss" as ostack-ui;\n@use "@ostack.tech/ui-kform/scss" as ostack-ui-kform;\n';
 function scaffoldStyles(_schematic, data) {
   addTemplateFile(data, "index.scss", indexScss);
@@ -1471,7 +1477,7 @@ function scaffoldViteProject(schematic, data) {
     formId: kebabCase(schematic.name),
     formClass: schematic.name,
     formTitle: capitalCase(schematic.name),
-    ostackUiVersion: "0.6.4",
+    ostackUiVersion: "0.6.5",
     kFormVersion: "0.31.6",
     dependencyVersions: JSON.parse('{"@eslint/js":"^9.39.1","@fortawesome/fontawesome-svg-core":"^7.1.0","@fortawesome/free-brands-svg-icons":"^7.1.0","@fortawesome/free-regular-svg-icons":"^7.1.0","@fortawesome/free-solid-svg-icons":"^7.1.0","@ostack.tech/kform":"~0.31.6","@ostack.tech/kform-react":"~0.31.6","@ostack.tech/kform-scaffolder":"~0.31.6","@storybook/addon-docs":"^10.1.5","@storybook/addon-links":"^10.1.5","@storybook/react-vite":"^10.1.5","@types/node":"^22.19.2","@types/react":"^19.2.7","@types/react-dom":"^19.2.3","@vitejs/plugin-react":"^5.1.2","change-case":"^5.4.4","cpy-cli":"^6.0.0","date-fns":"^4.1.0","eslint":"^9.39.1","eslint-config-prettier":"^10.1.8","eslint-plugin-prettier":"^5.5.4","eslint-plugin-react-hooks":"^7.0.1","eslint-plugin-react-refresh":"^0.4.24","eslint-plugin-simple-import-sort":"^12.1.1","eslint-plugin-storybook":"^10.1.5","globals":"^16.5.0","happy-dom":"^20.0.11","lint-staged":"^16.2.7","prettier":"^3.7.4","prettier-plugin-jsdoc":"^1.8.0","react":"^19.2.1","react-dom":"^19.2.1","rimraf":"^6.1.2","sass-embedded":"^1.93.3","simple-git-hooks":"^2.13.1","storybook":"^10.1.5","terser":"^5.44.1","tslib":"^2.8.1","typescript":"~5.9.3","typescript-eslint":"^8.49.0","vite":"^7.2.7","vite-plugin-dts":"^4.5.4","vitest":"^4.0.15","zustand":"^5.0.9"}'),
     externalContextsData: data.serializationFormat === "json" ? "{}" : `<${schematic.name}ExternalContexts />`,
@@ -1550,6 +1556,7 @@ function SchematicBuilder({
 export {
   DEFAULT_ACTIVE_PATH_SEARCH_PARAM,
   DEFAULT_API_BASE_PATH,
+  DEFAULT_INCLUDE_SERIALIZATION_FORMAT_VERSION,
   DEFAULT_JVM_TOOLCHAIN_VERSION,
   DEFAULT_LOCALE,
   DEFAULT_NODEJS_VERSION,