@jay-framework/compiler-jay-html 0.15.6 → 0.16.1

package/dist/index.js

@@ -14359,6 +14359,9 @@ function filterContentNodes(childNodes, onlyIfMultiple = false) {
 function textEscape$1(s) {
   return s.replace(/'/g, "\\'");
 }
+function escapeForJsString(s) {
+  return s.replace(/\\/g, "\\\\").replace(/'/g, "\\'").replace(/\n/g, "\\n").replace(/\r/g, "\\r");
+}
 const PROPERTY = 1;
 const BOOLEAN_ATTRIBUTE = 3;
 const propertyMapping = {
@@ -22411,7 +22414,7 @@ function renderServerAttributes(element, context) {
           )
         );
       } else {
-        const escaped = attrValue.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+        const escaped = escapeForJsString(attrValue);
         parts.push(w(indent, `' ${attrCanonical}="${escaped}"'`));
       }
     } else if (attrCanonical === "class") {
@@ -22426,7 +22429,7 @@ function renderServerAttributes(element, context) {
           )
         );
       } else {
-        const escaped = attrValue.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+        const escaped = escapeForJsString(attrValue);
         parts.push(w(indent, `' class="${escaped}"'`));
       }
     } else if (attrCanonical === "style") {
@@ -22443,7 +22446,7 @@ function renderServerAttributes(element, context) {
           )
         );
       } else {
-        const escaped = attrValue.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+        const escaped = escapeForJsString(attrValue);
         parts.push(w(indent, `' style="${escaped}"'`));
       }
     } else {
@@ -22460,7 +22463,7 @@ function renderServerAttributes(element, context) {
           )
         );
       } else {
-        const escaped = attrValue.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+        const escaped = escapeForJsString(attrValue);
         parts.push(w(indent, `' ${attrCanonical}="${escaped}"'`));
       }
     }
@@ -22609,7 +22612,7 @@ function renderServerAttributesAsString(element, context) {
           )
         );
       } else {
-        const escaped = attrValue.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+        const escaped = escapeForJsString(attrValue);
         parts.push(new RenderFragment(`' ${attrCanonical}="${escaped}"'`));
       }
     } else if (attrCanonical === "class") {
@@ -22623,7 +22626,7 @@ function renderServerAttributesAsString(element, context) {
           )
         );
       } else {
-        const escaped = attrValue.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+        const escaped = escapeForJsString(attrValue);
         parts.push(new RenderFragment(`' class="${escaped}"'`));
       }
     } else if (attrCanonical === "style") {
@@ -22639,7 +22642,7 @@ function renderServerAttributesAsString(element, context) {
           )
         );
       } else {
-        const escaped = attrValue.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+        const escaped = escapeForJsString(attrValue);
         parts.push(new RenderFragment(`' style="${escaped}"'`));
       }
     } else {
@@ -22655,7 +22658,7 @@ function renderServerAttributesAsString(element, context) {
           )
         );
       } else {
-        const escaped = attrValue.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+        const escaped = escapeForJsString(attrValue);
         parts.push(new RenderFragment(`' ${attrCanonical}="${escaped}"'`));
       }
     }
@@ -23112,11 +23115,26 @@ function collectImportedAliases(type2, aliases2) {
     collectImportedAliases(type2.itemType, aliases2);
   }
 }
+function containsFileType(type2) {
+  if (isAtomicType(type2))
+    return type2.name === "file";
+  if (isOptionalType(type2))
+    return containsFileType(type2.innerType);
+  if (isArrayType$1(type2))
+    return containsFileType(type2.itemType);
+  if (isRecordType(type2))
+    return containsFileType(type2.itemType);
+  if (isObjectType$1(type2))
+    return Object.values(type2.props).some(containsFileType);
+  return false;
+}
 function renderType(type2, aliasToViewState, indent) {
   if (isOptionalType(type2)) {
     return renderType(type2.innerType, aliasToViewState, indent);
   }
   if (isAtomicType(type2)) {
+    if (type2.name === "file")
+      return "JayFile";
     return type2.name;
   }
   if (isEnumType(type2)) {
@@ -23197,6 +23215,10 @@ function compileAction(actionWithValidations, contractResolver = defaultContract
         `import { ${resolved.viewStateName} } from '${resolved.importPath}';`
       );
     }
+    const usesFileType = containsFileType(action.inputType) || action.outputType && containsFileType(action.outputType);
+    if (usesFileType) {
+      importStatements.push(`import { JayFile } from '@jay-framework/fullstack-component';`);
+    }
     if (importStatements.length > 0) {
       sections.push(importStatements.join("\n"));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/compiler-jay-html",
-  "version": "0.15.6",
+  "version": "0.16.1",
   "description": "",
   "license": "Apache-2.0",
   "main": "dist/index.js",
@@ -34,12 +34,12 @@
   },
   "author": "",
   "dependencies": {
-    "@jay-framework/compiler-analyze-exported-types": "^0.15.6",
-    "@jay-framework/compiler-shared": "^0.15.6",
-    "@jay-framework/component": "^0.15.6",
-    "@jay-framework/logger": "^0.15.6",
-    "@jay-framework/runtime": "^0.15.6",
-    "@jay-framework/secure": "^0.15.6",
+    "@jay-framework/compiler-analyze-exported-types": "^0.16.1",
+    "@jay-framework/compiler-shared": "^0.16.1",
+    "@jay-framework/component": "^0.16.1",
+    "@jay-framework/logger": "^0.16.1",
+    "@jay-framework/runtime": "^0.16.1",
+    "@jay-framework/secure": "^0.16.1",
     "@types/js-yaml": "^4.0.9",
     "change-case": "^4.1.2",
     "js-yaml": "^4.1.0",
@@ -51,8 +51,8 @@
   },
   "devDependencies": {
     "@caiogondim/strip-margin": "^1.0.0",
-    "@jay-framework/4-react": "^0.15.6",
-    "@jay-framework/dev-environment": "^0.15.6",
+    "@jay-framework/4-react": "^0.16.1",
+    "@jay-framework/dev-environment": "^0.16.1",
     "@testing-library/jest-dom": "^6.2.0",
     "@types/js-beautify": "^1",
     "@types/node": "^20.11.5",